Just minor updates, nothing serious :)

Author: Peter Firmstone

.gitignore

@@ -367,4 +367,9 @@
 /qa/nbbuild.xml
 /qa/nbproject/
 /JGDMS/jgdms-platform/nbproject/
-/JGDMS/jgdms-osgi-proxy-bundle-provider/target/
+/JGDMS/jgdms-osgi-proxy-bundle-provider/target/
+/qa/.result7.txt.swp
+/qa/result-3.txt
+/qa/result-1.txt
+/qa/result-2.txt
+/qa/results-4.txt

common.xml

@@ -414,7 +414,7 @@
         <sequential>
             <genkey keypass="@{target}pw" keystore="@{dir}/@{target}.keystore"
                     sigalg="SHA256withRSA" keyalg="RSA" storetype="pkcs12"
-                    validity="1800" alias="@{target}" storepass="@{target}pw"
+                    validity="3600" alias="@{target}" storepass="@{target}pw"
                     dname="CN=@{dname}" />
             <exec executable="keytool" failonerror="true">
                 <!--

qa/build.xml

@@ -85,7 +85,7 @@
     <property name="harness.props" location="${src.dir}/org/apache/river/test/resources/qaHarness.prop"/>
     <!--possible values: any combination of jrmp,jeri,jsse,http,https,kerberos,none
         default: none -->
-    <property name="harness.configs" value="jsse,jeri"/>
+    <property name="harness.configs" value="jsse"/>
     <!-- possible values: activatable,transient,persistent
         default: transient -->
     <property name="harness.servicemode" value="activatable"/>
@@ -494,7 +494,7 @@
         <zip basedir="${result.dir}" file="${result.zip}" />
     </target>
 
-    <target name="run" depends="harness-runtime">
+    <target name="run" depends="james-brown">
         <property name="run.categories"
                 value="id,loader,policyprovider,locatordiscovery,activation,config,discoverymanager,joinmanager,url,iiop,jrmp,reliability,thread,renewalmanager,constraint,export,lookupdiscovery,servicediscovery,io,security,lookupservice,renewalservice,eventmailbox,jeri,start,discoveryservice,discoveryproviders,javaspace,txnmanager,stress"/>
         <antcall target="run-categories"/>

qa/src/org/apache/river/qa/resources/qaDefaults.properties

@@ -5,6 +5,10 @@ file.ext=jar
 #file.ext=jar.pack.gz
 bouncy-jce.jar=bcprov-jdk15on-1.59.jar
 bouncy-jsse.jar=bctls-jdk15on-1.59.jar
+#corba-iiop.jar=glassfish-corba-omgapi-4.2.1.jar
+#corba-iiop-impl.jar=glassfish-corba-orb-4.2.1.jar
+javax-transaction.jar=javax.transaction-api-1.3.jar
+corba-iiop.jar=openjdk-orb-8.1.4.Final.jar
 activation.jar=jgdms-activation-${river.version}.jar
 platform.jar=jgdms-platform-${river.version}.jar
 collections.jar=jgdms-collections-${river.version}.jar
@@ -397,7 +401,6 @@ org.apache.river.qa.harness.actdeathdelay=5
 org.apache.river.qa.harness.globalvmargs=\
 -ea,\
 -esa,\
--Djava.security.debug=logincontext,\
 -Djava.net.preferIPv6Addresses=true,\
 -Dsun.net.maxDatagramSockets=1024,\
 -DHOST=${HOST},\
@@ -493,7 +496,11 @@ $:${org.apache.river.jsk.home}$/lib$/${destroy.jar}\
 $:${org.apache.river.jsk.home}$/lib$/${jsk.url.jar}\
 $:${org.apache.river.jsk.home}$/lib$/${bouncy-jce.jar}\
 $:${org.apache.river.jsk.home}$/lib$/${bouncy-jsse.jar}\
-$:${org.apache.river.jsk.home}$/lib$/${policy.writer.jar}
+$:${org.apache.river.jsk.home}$/lib$/${policy.writer.jar}\
+$:${org.apache.river.jsk.home}$/lib$/${javax-transaction.jar}\
+$:${org.apache.river.jsk.home}$/lib$/${corba-iiop.jar}
+#\
+#$:${org.apache.river.jsk.home}$/lib$/${corba-iiop-impl.jar}
 #$:${org.apache.river.jsk.home}$/lib$/tools.jar
 # Alternate test classpath, for tests that don't use <testJar>
 #
@@ -515,7 +522,11 @@ $:${org.apache.river.jsk.home}$/lib$/${destroy.jar}\
 $:${org.apache.river.jsk.home}$/lib$/${jsk.url.jar}\
 $:${org.apache.river.jsk.home}$/lib$/${bouncy-jce.jar}\
 $:${org.apache.river.jsk.home}$/lib$/${bouncy-jsse.jar}\
-$:${org.apache.river.jsk.home}$/lib$/${policy.writer.jar}
+$:${org.apache.river.jsk.home}$/lib$/${policy.writer.jar}\
+$:${org.apache.river.jsk.home}$/lib$/${javax-transaction.jar}\
+$:${org.apache.river.jsk.home}$/lib$/${corba-iiop.jar}
+#\
+#$:${org.apache.river.jsk.home}$/lib$/${corba-iiop-impl.jar}
 
 #
 # Services run with server vm; test runs with client vm

qa/src/org/apache/river/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java

@@ -235,31 +235,31 @@ static void checkPermissions(Policy policy,
 	for (int i = 0; i < fail.length; i++) {
 	    if (pc.implies(fail[i])) {
 		throw new TestException(fail[i] + " implied by " + cs);
-	    }
-	}
+            }
+        }
 
 	ProtectionDomain pd = new ProtectionDomain(cs, null, null, null);
 	pc = policy.getPermissions(pd);
 	for (int i = 0; i < pass.length; i++) {
 	    if (!pc.implies(pass[i])) {
 		throw new TestException(pass[i] + " not implied by " + cs);
-	    }
-	}
+            }
+        }
 	for (int i = 0; i < fail.length; i++) {
 	    if (pc.implies(fail[i])) {
 		throw new TestException(fail[i] + " implied by " + cs);
-	    }
-	}
+            }
+        }
 
 	for (int i = 0; i < pass.length; i++) {
 	    if (!policy.implies(pd, pass[i])) {
 		throw new TestException(pass[i] + " not implied by " + cs);
-	    }
-	}
+            }
+        }
 	for (int i = 0; i < fail.length; i++) {
 	    if (policy.implies(pd, fail[i])) {
 		throw new TestException(fail[i] + " implied by " + cs);
-	    }
-	}
+            }
+        }
     }
 }

qa/src/org/apache/river/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.td

@@ -6,8 +6,7 @@ testClasspath=${altClasspath}$:<file:lib/qa1-start-tests.jar>
 testPolicyfile=SubPoliciesTest.0.policy
 
 #testjvmargs=\
-#-Xdebug,\
-#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\
+#-agentlib:jdwp=transport=dt_shmem+,address=shmem+,server=y+,suspend=y,\
 #${testjvmargs}
 
 #!!!! the next two lines are wrong

qa/src/org/apache/river/test/resources/qa1.logging

@@ -278,7 +278,7 @@ org.apache.river.outrigger.transactions.level = SEVERE
 org.apache.river.example.browser.level = SEVERE
 
 # For the test harness, tests, and infrastructure.
-org.apache.river.qa.harness.level = CONFIG
+org.apache.river.qa.harness.level = FINE
 org.apache.river.qa.harness.test.level = SEVERE
 org.apache.river.qa.harness.service.level = SEVERE
 org.apache.river.qa.harness.config.level = SEVERE