derby2100-diff.txt contains the patch for converting the prepStmt test to Junit. The test is now called PrepareStatementTest.java. While prepStmt only ran in the client/server suites, the new test now runs in both embedded and client/server. However, I have chosen to place the new test in the derbynet directory since its test cases are mostly testing border cases that are mainly relevant to client/server.
In addition to the new test, the patch contains the changes needed to remove the old test and its associated master files. The patch also contains a change to AllPackages.java in order to run the derbynet suite only once. (I found that an entry for this suite had been added twice.)
I have run the Junit All suite with no errors and verified that the new test was run. I have also run derbyall with no errors and verified that the old test was not run.