Author: objectiser Date: 2011-08-26 08:12:03 -0400 (Fri, 26 Aug 2011) New Revision: 1451 Modified: branches/RiftSaw-2.3.x/console/identity/src/main/resources/bpel-users.properties branches/RiftSaw-2.3.x/docs/docbook/userguide/src/main/en-US/module/admin.xml branches/RiftSaw-2.3.x/samples/quickstart/management/readme.txt branches/RiftSaw-2.3.x/samples/quickstart/management/src/org/jboss/riftsaw/management/ManagementClient.java trunk/console/identity/src/main/resources/bpel-users.properties trunk/docs/docbook/userguide/src/main/en-US/module/admin.xml trunk/samples/quickstart/management/readme.txt trunk/samples/quickstart/management/src/org/jboss/riftsaw/management/ManagementClient.java Log: SOA-3307 - sort out issue where default username of admin/password was conflicting with SOA-P defaults of admin/admin, and also explain in the readme how to change the username/password if appropriate. Modified: branches/RiftSaw-2.3.x/console/identity/src/main/resources/bpel-users.properties =================================================================== --- branches/RiftSaw-2.3.x/console/identity/src/main/resources/bpel-users.properties 2011-08-23 13:45:43 UTC (rev 1450) +++ branches/RiftSaw-2.3.x/console/identity/src/main/resources/bpel-users.properties 2011-08-26 12:12:03 UTC (rev 1451) @@ -1 +1 @@ -admin=password \ No newline at end of file +admin=admin \ No newline at end of file Modified: branches/RiftSaw-2.3.x/docs/docbook/userguide/src/main/en-US/module/admin.xml =================================================================== --- branches/RiftSaw-2.3.x/docs/docbook/userguide/src/main/en-US/module/admin.xml 2011-08-23 13:45:43 UTC (rev 1450) +++ branches/RiftSaw-2.3.x/docs/docbook/userguide/src/main/en-US/module/admin.xml 2011-08-26 12:12:03 UTC (rev 1451) @@ -64,7 +64,7 @@ <para> The default username is <emphasis>admin</emphasis> with password - <emphasis>password</emphasis>. + <emphasis>admin</emphasis>. </para> <para> Modified: branches/RiftSaw-2.3.x/samples/quickstart/management/readme.txt =================================================================== --- branches/RiftSaw-2.3.x/samples/quickstart/management/readme.txt 2011-08-23 13:45:43 UTC (rev 1450) +++ branches/RiftSaw-2.3.x/samples/quickstart/management/readme.txt 2011-08-26 12:12:03 UTC (rev 1451) @@ -3,6 +3,11 @@ This is a simple example to demonstrate the management APIs that are exposed as RESTful services. +The code in the src folder has been hardcoded to use the default username 'admin' and password 'admin'. +If the username and/or password have been changed, then the code will need to be updated with the +appropriate details. To check whether the username and password work correctly, simply log in to the +BPEL console at: http://localhost:8080/bpel-console + Before running this example, it is necessary to create some appropriate information upon which to issue the management commands. Therefore go to $RiftSaw/samples/quickstart/simple_correlation folder, and run the following commands: Modified: branches/RiftSaw-2.3.x/samples/quickstart/management/src/org/jboss/riftsaw/management/ManagementClient.java =================================================================== --- branches/RiftSaw-2.3.x/samples/quickstart/management/src/org/jboss/riftsaw/management/ManagementClient.java 2011-08-23 13:45:43 UTC (rev 1450) +++ branches/RiftSaw-2.3.x/samples/quickstart/management/src/org/jboss/riftsaw/management/ManagementClient.java 2011-08-26 12:12:03 UTC (rev 1451) @@ -48,7 +48,7 @@ public void showAllDefinitions() throws Exception { System.out.println("-----------------------------"); System.out.println("Get all of process definitions: "); - String result = getDataFromService(definitions_url, "GET", "admin", "password"); + String result = getDataFromService(definitions_url, "GET", "admin", "admin"); System.out.println("-----------------------------"); System.out.println("Marshall the Json data into java class."); @@ -68,7 +68,7 @@ String instances_url = "http://localhost:8080/gwt-console-server/rs/process/definition" + "/" + encodedId + "/instances"; System.out.println("-----------------------------"); System.out.println("Get active process instances from process definition of : " + processId ); - String result = getDataFromService(instances_url, "GET", "admin", "password"); + String result = getDataFromService(instances_url, "GET", "admin", "admin"); System.out.println("-----------------------------"); System.out.println("Marshall the Json data into java class."); @@ -96,7 +96,7 @@ System.out.println("-----------------------------"); System.out.println("Get historic process instances from process definition of : " + processId ); - String result = getDataFromService(search_url, "GET", "admin", "password"); + String result = getDataFromService(search_url, "GET", "admin", "admin"); System.out.println("-----------------------------"); System.out.println("Marshall the Json data into java class."); Modified: trunk/console/identity/src/main/resources/bpel-users.properties =================================================================== --- trunk/console/identity/src/main/resources/bpel-users.properties 2011-08-23 13:45:43 UTC (rev 1450) +++ trunk/console/identity/src/main/resources/bpel-users.properties 2011-08-26 12:12:03 UTC (rev 1451) @@ -1 +1 @@ -admin=password \ No newline at end of file +admin=admin \ No newline at end of file Modified: trunk/docs/docbook/userguide/src/main/en-US/module/admin.xml =================================================================== --- trunk/docs/docbook/userguide/src/main/en-US/module/admin.xml 2011-08-23 13:45:43 UTC (rev 1450) +++ trunk/docs/docbook/userguide/src/main/en-US/module/admin.xml 2011-08-26 12:12:03 UTC (rev 1451) @@ -64,7 +64,7 @@ <para> The default username is <emphasis>admin</emphasis> with password - <emphasis>password</emphasis>. + <emphasis>admin</emphasis>. </para> <para> Modified: trunk/samples/quickstart/management/readme.txt =================================================================== --- trunk/samples/quickstart/management/readme.txt 2011-08-23 13:45:43 UTC (rev 1450) +++ trunk/samples/quickstart/management/readme.txt 2011-08-26 12:12:03 UTC (rev 1451) @@ -3,6 +3,11 @@ This is a simple example to demonstrate the management APIs that are exposed as RESTful services. +The code in the src folder has been hardcoded to use the default username 'admin' and password 'admin'. +If the username and/or password have been changed, then the code will need to be updated with the +appropriate details. To check whether the username and password work correctly, simply log in to the +BPEL console at: http://localhost:8080/bpel-console + Before running this example, it is necessary to create some appropriate information upon which to issue the management commands. Therefore go to $RiftSaw/samples/quickstart/simple_correlation folder, and run the following commands: Modified: trunk/samples/quickstart/management/src/org/jboss/riftsaw/management/ManagementClient.java =================================================================== --- trunk/samples/quickstart/management/src/org/jboss/riftsaw/management/ManagementClient.java 2011-08-23 13:45:43 UTC (rev 1450) +++ trunk/samples/quickstart/management/src/org/jboss/riftsaw/management/ManagementClient.java 2011-08-26 12:12:03 UTC (rev 1451) @@ -48,7 +48,7 @@ public void showAllDefinitions() throws Exception { System.out.println("-----------------------------"); System.out.println("Get all of process definitions: "); - String result = getDataFromService(definitions_url, "GET", "admin", "password"); + String result = getDataFromService(definitions_url, "GET", "admin", "admin"); System.out.println("-----------------------------"); System.out.println("Marshall the Json data into java class."); @@ -68,7 +68,7 @@ String instances_url = "http://localhost:8080/gwt-console-server/rs/process/definition" + "/" + encodedId + "/instances"; System.out.println("-----------------------------"); System.out.println("Get active process instances from process definition of : " + processId ); - String result = getDataFromService(instances_url, "GET", "admin", "password"); + String result = getDataFromService(instances_url, "GET", "admin", "admin"); System.out.println("-----------------------------"); System.out.println("Marshall the Json data into java class."); @@ -96,7 +96,7 @@ System.out.println("-----------------------------"); System.out.println("Get historic process instances from process definition of : " + processId ); - String result = getDataFromService(search_url, "GET", "admin", "password"); + String result = getDataFromService(search_url, "GET", "admin", "admin"); System.out.println("-----------------------------"); System.out.println("Marshall the Json data into java class.");