payara · Pandrex247 · Jul 20, 2017 · Jul 19, 2017
diff --git a/appserver/tests/embedded/web/web-api/src/main/resources/cacerts.jks b/appserver/tests/embedded/web/web-api/src/main/resources/cacerts.jks
diff --git a/appserver/tests/quicklook/admincli/src/test/admincli/ExistStatusTests.java b/appserver/tests/quicklook/admincli/src/test/admincli/ExistStatusTests.java
@@ -52,7 +52,7 @@ public class ExistStatusTests {
     @Test
     public void createJDBCPool() throws Exception {
 //        System.out.println(ASADMIN);
-        cmd = ASADMIN + " create-jdbc-connection-pool --port 5048 " +
+        cmd = ASADMIN + " create-jdbc-connection-pool --port 4848 " +
             "--datasourceclassname=org.apache.derby.jdbc.ClientDataSource --property " +
             "DatabaseName=sun-appserv-samples:PortNumber=1527:serverName=localhost:Password=APP:User=APP QLJdbcPool";
 
@@ -63,16 +63,16 @@ public void createJDBCPool() throws Exception {
     @Test(dependsOnMethods = { "createJDBCPool" })
     public void pingJDBCPool() throws Exception {
 //      extra ping of DerbyPool to create sun-appserv-samples DB.
-        cmd = ASADMIN + " ping-connection-pool --port 5048 DerbyPool";
+        cmd = ASADMIN + " ping-connection-pool --port 4848 DerbyPool";
         RtExec.execute(cmd);
-        cmd1 = ASADMIN + " ping-connection-pool --port 5048 QLJdbcPool";
+        cmd1 = ASADMIN + " ping-connection-pool --port 4848 QLJdbcPool";
         execReturn = RtExec.execute(cmd1);
         Assert.assertEquals(execReturn, true, "Ping jdbc connection pool failed ...");
     }
 
     @Test(dependsOnMethods = { "pingJDBCPool" })
     public void deleteJDBCPool() throws Exception {
-        cmd = ASADMIN + " delete-jdbc-connection-pool --port 5048 QLJdbcPool";
+        cmd = ASADMIN + " delete-jdbc-connection-pool --port 4848 QLJdbcPool";
         execReturn = RtExec.execute(cmd);
         Assert.assertEquals(execReturn, true, "Delete jdbc connection pool failed ...");
     }

diff --git a/appserver/tests/quicklook/admincli/testng.xml b/appserver/tests/quicklook/admincli/testng.xml
@@ -43,10 +43,10 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 
 <suite name="QuickLookTests" verbose="2" >
-  <parameter name="admin.url" value="http://localhost:5048/__asadmin"/>
+  <parameter name="admin.url" value="http://localhost:4848/__asadmin"/>
   <parameter name="admin.user" value="admin"/>
   <parameter name="admin.password" value=""/>
-  <parameter name="admin.console.url" value="http://localhost:5048/"/>
+  <parameter name="admin.console.url" value="http://localhost:4848/"/>
   <parameter name="resources.xml.relative.path" value="admin/resources/resources.xml"/>
 
 

diff --git a/appserver/tests/quicklook/amx/testng.xml b/appserver/tests/quicklook/amx/testng.xml
@@ -44,7 +44,7 @@
 
 <suite name="QuickLookTests" verbose="2" >
   <parameter name="amx.debug" value="true"/>
-  <parameter name="amx.rmiport" value="5086"/>
+  <parameter name="amx.rmiport" value="8686"/>
   <parameter name="resources.xml.relative.path" value="resources/resources.xml"/>
 
   <test name="amx_tests">

diff --git a/appserver/tests/quicklook/build.properties b/appserver/tests/quicklook/build.properties
@@ -41,8 +41,8 @@
 #Edit these values for specific glassfish instance
 deploy.platform=v3
 glassfish.http.host=localhost
-glassfish.http.port=5080
-glassfish.admin.port=5048
+glassfish.http.port=8080
+glassfish.admin.port=4848
 #glassfish.home=/v3/glassfish4/glassfish
 v3=true
 

diff --git a/appserver/tests/quicklook/build.xml b/appserver/tests/quicklook/build.xml
@@ -616,17 +616,17 @@
         <arg value="/c"/>
         <arg value="${glassfish.home}\bin\asadmin.bat"/>
         <arg value="start-domain"/>
-	<arg value="domain2"/>
+	<arg value="test-domain"/>
     </exec>
     <waitfor maxwait="30" maxwaitunit="second" checkevery="500">
-        <http url="http://localhost:5048/"/>
+        <http url="http://localhost:4848/"/>
     </waitfor> 
 </target>
 
 <target name="start-server-felix-unix" if="isUnix">
     <exec executable="${glassfish.home}/bin/asadmin">
         <arg value="start-domain"/>
-	<arg value="domain2"/>
+	<arg value="test-domain"/>
     </exec>
 </target>
 

diff --git a/appserver/tests/quicklook/cluster/clustersetup/src/test/clustersetup/ClusterSetupTest.java b/appserver/tests/quicklook/cluster/clustersetup/src/test/clustersetup/ClusterSetupTest.java
@@ -73,12 +73,12 @@ public void createClusterTest() throws Exception{
     @Test(dependsOnMethods = { "createClusterTest" })
     public void createInstanceTest() throws Exception{
         report(tn + "create-local-instance1", asadmin("create-local-instance",
-                "--cluster", cname, "--node","localhost-domain2","--systemproperties",
+                "--cluster", cname, "--node","localhost-test-domain","--systemproperties",
                 "HTTP_LISTENER_PORT=18080:HTTP_SSL_LISTENER_PORT=18181:IIOP_SSL_LISTENER_PORT=13800:" +
                 "IIOP_LISTENER_PORT=13700:JMX_SYSTEM_CONNECTOR_PORT=17676:IIOP_SSL_MUTUALAUTH_PORT=13801:" +
                 "JMS_PROVIDER_PORT=18686:ASADMIN_LISTENER_PORT=14848", i1name));
         retStatus = report(tn + "create-local-instance2", asadmin("create-local-instance",
-                "--cluster", cname, "--node","localhost-domain2","--systemproperties",
+                "--cluster", cname, "--node","localhost-test-domain","--systemproperties",
                 "HTTP_LISTENER_PORT=28080:HTTP_SSL_LISTENER_PORT=28181:IIOP_SSL_LISTENER_PORT=23800:" +
                 "IIOP_LISTENER_PORT=23700:JMX_SYSTEM_CONNECTOR_PORT=27676:IIOP_SSL_MUTUALAUTH_PORT=23801:" +
                 "JMS_PROVIDER_PORT=28686:ASADMIN_LISTENER_PORT=24848", i2name));
@@ -88,8 +88,8 @@ public void createInstanceTest() throws Exception{
     @Test(dependsOnMethods = { "createInstanceTest" })
     public void startInstanceTest() throws Exception{
         // start the instances
-        report(tn + "start-local-instance1", asadmin("start-local-instance", "--node","localhost-domain2",i1name));
-        report(tn + "start-local-instance2", asadmin("start-local-instance", "--node","localhost-domain2",i2name));
+        report(tn + "start-local-instance1", asadmin("start-local-instance", "--node","localhost-test-domain",i1name));
+        report(tn + "start-local-instance2", asadmin("start-local-instance", "--node","localhost-test-domain",i2name));
         System.out.println("Waiting for 5 sec...");
 	Thread.currentThread().sleep(5000);
         // check that the instances are there

diff --git a/...tests/quicklook/cluster/clusterteardown/src/test/clusterteardown/ClusterTeardownTest.java b/...tests/quicklook/cluster/clusterteardown/src/test/clusterteardown/ClusterTeardownTest.java
@@ -61,10 +61,10 @@ protected String getTestDescription() {
         // previously deleteInstanceTest would never say boo no matter what happened...
     @Test
     public void deleteInstanceTest() throws Exception{
-        AsadminReturn ar1 = asadminWithOutput("stop-local-instance", "--node","localhost-domain2","--kill", i1name);
-        AsadminReturn ar2 = asadminWithOutput("stop-local-instance", "--node","localhost-domain2","--kill", i2name);
-        AsadminReturn ar3 = asadminWithOutput("delete-local-instance", "--node","localhost-domain2",i1name);
-        AsadminReturn ar4 = asadminWithOutput("delete-local-instance", "--node","localhost-domain2",i2name);
+        AsadminReturn ar1 = asadminWithOutput("stop-local-instance", "--node","localhost-test-domain","--kill", i1name);
+        AsadminReturn ar2 = asadminWithOutput("stop-local-instance", "--node","localhost-test-domain","--kill", i2name);
+        AsadminReturn ar3 = asadminWithOutput("delete-local-instance", "--node","localhost-test-domain",i1name);
+        AsadminReturn ar4 = asadminWithOutput("delete-local-instance", "--node","localhost-test-domain",i2name);
 
         report(tn + "stop-local-instance1", ar1.returnValue);
         report(tn + "stop-local-instance2", ar2.returnValue);

diff --git a/appserver/tests/quicklook/ejb/cmp/metadata/RosterSchema.dbschema b/appserver/tests/quicklook/ejb/cmp/metadata/RosterSchema.dbschema
@@ -44,7 +44,7 @@
 <OBJECT CLASS="com.sun.forte4j.modules.dbmodel.SchemaElement" ID="com.sun.forte4j.modules.dbmodel.SchemaElement335787804">
   <versionNo>2</versionNo>
   <impl>
-    <OBJECT CLASS="com.sun.forte4j.modules.dbmodel.jdbcimpl.SchemaElementImpl" ID="com.sun.forte4j.modules.dbmodel.jdbcimpl.SchemaElementImpl4508150">
+    <OBJECT CLASS="com.sun.forte4j.modules.dbmodel.jdbcimpl.SchemaElementImpl" ID="com.sun.forte4j.modules.dbmodel.jdbcimpl.SchemaElementImpl4808150">
       <element>
         <OBJECT REFERENCE="com.sun.forte4j.modules.dbmodel.SchemaElement335787804"/>
       </element>
@@ -1240,7 +1240,7 @@
             </ARRAY>
           </_template>
           <owner>
-            <OBJECT REFERENCE="com.sun.forte4j.modules.dbmodel.jdbcimpl.SchemaElementImpl4508150"/>
+            <OBJECT REFERENCE="com.sun.forte4j.modules.dbmodel.jdbcimpl.SchemaElementImpl4808150"/>
           </owner>
         </OBJECT>
       </tables>

diff --git a/appserver/tests/quicklook/ejb/mdb/src/test/mdb/MDBTests.java b/appserver/tests/quicklook/ejb/mdb/src/test/mdb/MDBTests.java
@@ -58,15 +58,15 @@ public class MDBTests {
     @Parameters({ "BATCH_FILE1" })
     @Test
     public void createJMSRscTest(String batchFile1) throws Exception {
-        cmd = ASADMIN + " multimode --port 5048 --file " + cwd + File.separator + batchFile1;
+        cmd = ASADMIN + " multimode --port 4848 --file " + cwd + File.separator + batchFile1;
         execReturn = RtExec.execute(cmd);
         Assert.assertEquals(execReturn, true, "Create JMS resource failed ...");
     }
 
     @Parameters({ "MDB_APP_DIR" })
     @Test(dependsOnMethods = { "createJMSRscTest" })
     public void deployJMSAppTest(String mdbAppDir) throws Exception {
-        cmd = ASADMIN + " deploy --port 5048 --retrieve=" + cwd + File.separator + mdbAppDir
+        cmd = ASADMIN + " deploy --port 4848 --retrieve=" + cwd + File.separator + mdbAppDir
                 + " " + cwd + File.separator + mdbAppDir + mdbApp + ".ear ";
         execReturn = RtExec.execute(cmd);
         Assert.assertEquals(execReturn, true, "Deploy the mdb app failed ... ");
@@ -75,23 +75,23 @@ public void deployJMSAppTest(String mdbAppDir) throws Exception {
     @Parameters({ "MDB_APP_DIR" })
     @Test(dependsOnMethods = { "deployJMSAppTest" })
     public void runJMSAppTest(String mdbAppDir) throws Exception {
-        cmd = APPCLIENT+ " -targetserver"+" localhost:5037"+" -client "+ cwd + File.separator +mdbAppDir+mdbApp+"Client.jar "
+        cmd = APPCLIENT+ " -targetserver"+" localhost:3700"+" -client "+ cwd + File.separator +mdbAppDir+mdbApp+"Client.jar "
            + "-name ejb-ejb30-hello-mdb-client " ;
         execReturn = RtExec.execute(cmd);
         Assert.assertEquals(execReturn, true, "Run appclient against JMS APP failed ...");
     }
 
     @Test(dependsOnMethods = { "runJMSAppTest" }) 
     public void undeployJMSAppTest() throws Exception {
-        cmd = ASADMIN + " undeploy --port 5048 " + mdbApp;
+        cmd = ASADMIN + " undeploy --port 4848 " + mdbApp;
         execReturn = RtExec.execute(cmd);
         Assert.assertEquals(execReturn, true, "UnDeploy the mdb app failed ... ");
     }
 
     @Parameters({ "BATCH_FILE2" })
     @Test(dependsOnMethods = { "undeployJMSAppTest" }) 
     public void deleteJMSRscTest(String batchFile2) throws Exception {
-        cmd = ASADMIN + " multimode --port 5048 --file " + cwd + File.separator + batchFile2;
+        cmd = ASADMIN + " multimode --port 4848 --file " + cwd + File.separator + batchFile2;
         execReturn = RtExec.execute(cmd);
         Assert.assertEquals(execReturn, true, "Delete JMD Resource failed ...");
     }

diff --git a/appserver/tests/quicklook/ejb/remoteview/src/test/RemoteViewTestNG.java b/appserver/tests/quicklook/ejb/remoteview/src/test/RemoteViewTestNG.java
@@ -127,9 +127,9 @@ private static Properties jndiProperties() {
         jndiProps.put("java.naming.factory.initial", "com.sun.enterprise.naming.impl.SerialInitContextFactory");
         jndiProps.put("java.naming.factory.url.pkgs", "com.sun.enterprise.naming");
         jndiProps.put("java.naming.factory.state", "com.sun.corba.ee.impl.presentation.rmi.JNDIStateFactoryImpl");
-        jndiProps.put("java.naming.provider.url", "iiop://localhost:5037");
+        jndiProps.put("java.naming.provider.url", "iiop://localhost:3700");
         jndiProps.setProperty("org.omg.CORBA.ORBInitialHost", "127.0.0.1");
-        jndiProps.setProperty("org.omg.CORBA.ORBInitialPort", "5037");
+        jndiProps.setProperty("org.omg.CORBA.ORBInitialPort", "3700");
         return jndiProps;
     }
 }
diff --git a/appserver/tests/quicklook/gfproject/utils.xml b/appserver/tests/quicklook/gfproject/utils.xml
@@ -61,7 +61,7 @@
 
     <property file="../build.properties"/>
 
-    <property name="server.log.path" location="${glassfish.home}/domains/domain2/logs/server.log"/>
+    <property name="server.log.path" location="${glassfish.home}/domains/test-domain/logs/server.log"/>
     <property name="log.msg.excl.path" location="gfproject/log_msg_excl.txt"/>
     <tempfile property="log.msg.tmp.path" destdir="../test-output" prefix="server_log_filtered" deleteonexit="true"/>
 

diff --git a/appserver/tests/quicklook/gfproject/v2-config.properties b/appserver/tests/quicklook/gfproject/v2-config.properties
@@ -38,18 +38,18 @@
 # holder.
 #
 
-admin.port=5048
+admin.port=4848
 admin.host=localhost
 admin.password=adminadmin
 admin.user=admin
 ##Please mention complete qualified path
 glassfish.home=C:\\Sun\\v2\\glassfish
 deploy.platform=v2
 glassfish.http.host=localhost
-glassfish.http.port=5080
-glassfish.https.port=5080
-glassfish.https.port=5081
-admin.domain=domain2
+glassfish.http.port=8080
+glassfish.https.port=8080
+glassfish.https.port=8081
+admin.domain=test-domain
 admin.domain.dir=${glassfish.home}/domains
 orb.port=3700
 ssl.password=changeit

diff --git a/appserver/tests/quicklook/gfproject/v3-config.properties b/appserver/tests/quicklook/gfproject/v3-config.properties
@@ -38,17 +38,17 @@
 # holder.
 #
 
-admin.port=5048
+admin.port=4848
 admin.host=localhost
 admin.password=
 admin.user=admin
 glassfish.home=C:\\Sun\\v3\\glassfish
 deploy.platform=v3
 glassfish.http.host=localhost
-glassfish.http.port=5080
-glassfish.https.port=5080
-glassfish.https.port=5081
-admin.domain=domain2
+glassfish.http.port=8080
+glassfish.https.port=8080
+glassfish.https.port=8081
+admin.domain=test-domain
 admin.domain.dir=${glassfish.home}/domains
 orb.port=3737
 ssl.password=changeit