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/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>
