[glassfish-script~gf-install:89] Throws exception if domain creation fails due to port check fails.

[patbos@kenai.com]

Project:    glassfish-script
Repository: gf-install
Revision:   89
Author:     patbos
Date:       2011-10-20 18:26:13 UTC
Link:       

Log Message:
------------
Throws exception if domain creation fails due to port check fails.
Fixed password file to if V3 deprecation of key.


Revisions:
----------
89


Modified Paths:
---------------
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/PasswordFile.java
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/AuthCommand.java
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/CreateDomainCommand.java
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/Command.java
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/CreateFileUserCommand.java
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/CreatePasswordAlias.java


Diffs:
------
Index: 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/PasswordFile.java
===================================================================
--- 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/PasswordFile.java
        (revision 88)
+++ 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/PasswordFile.java
        (revision 89)
@@ -25,10 +25,14 @@
 
     private File file;
 
-    public PasswordFile(String masterPassword, String adminPassword, String 
aliasPassword, String userPassword) throws IOException {
+    public PasswordFile(String masterPassword, String adminPassword, String 
aliasPassword, String userPassword, Version version) throws IOException {
         file = File.createTempFile("pass", "gf");
         BufferedWriter writer = new BufferedWriter(new 
OutputStreamWriter(new FileOutputStream(file, false)));
-        writer.write("AS_ADMIN_ADMINPASSWORD=" + adminPassword);
+        if (version.equals(Version.V3)) {
+            writer.write("AS_ADMIN_PASSWORD=" + adminPassword);
+        } else {
+            writer.write("AS_ADMIN_ADMINPASSWORD=" + adminPassword);
+        }
         writer.newLine();
         writer.write("AS_ADMIN_MASTERPASSWORD=" + masterPassword);
         writer.newLine();
Index: 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/CreateDomainCommand.java
===================================================================
--- 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/CreateDomainCommand.java
 (revision 88)
+++ 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/CreateDomainCommand.java
 (revision 89)
@@ -171,6 +171,14 @@
         }
 
         addArg(name);
-        return executeCommand().getReturnCode();
+        int code = executeCommand().getReturnCode();
+        if (code != 0) {
+            if (getErrors().size() > 0) {
+                throw new CommandException("Error creating domain: " + 
getErrors().get(0));
+            } else {
+                throw new CommandException("Error creating domain");
+            }
+        }
+        return code;
     }
 }
Index: 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/Command.java
===================================================================
--- 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/Command.java
     (revision 88)
+++ 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/Command.java
     (revision 89)
@@ -33,6 +33,7 @@
 
     private static final int PROCESS_LOOP_SLEEP_MILLIS = 100;
 
+    private List<String> errors = new ArrayList<String>();
 
     protected GlassFishEnvironment environment;
 
@@ -105,6 +106,9 @@
         return escaped;
     }
 
+    public List<String> getErrors() {
+        return errors;
+    }
 
     protected CommandResult executeCommand() throws CommandException {
         try {
@@ -187,7 +191,7 @@
             BufferedReader errReader = new BufferedReader(new 
InputStreamReader(process.getErrorStream()));
 
             List<String> output = new ArrayList<String>();
-            List<String> errors = new ArrayList<String>();
+            //List<String> errors = new ArrayList<String>();
 
             int exit;
             do {
Index: 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/CreatePasswordAlias.java
===================================================================
--- 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/CreatePasswordAlias.java
 (revision 88)
+++ 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/CreatePasswordAlias.java
 (revision 89)
@@ -44,7 +44,7 @@
 
     public Object execute() throws CommandException {
         try {
-            PasswordFile file = new 
PasswordFile(environment.getMasterAdminPassword(), 
environment.getAdminPassword(), password, null);
+            PasswordFile file = new 
PasswordFile(environment.getMasterAdminPassword(), 
environment.getAdminPassword(), password, null, environment.getVersion());
             setPasswordFile(file);
             addArg(alias);
             return executeCommand();
Index: 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/AuthCommand.java
===================================================================
--- 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/AuthCommand.java
 (revision 88)
+++ 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/AuthCommand.java
 (revision 89)
@@ -44,7 +44,7 @@
             addParam("interactive", false);
             if (!environment.isUselocalAuth()) {
                 if (passwordFile == null) {
-                    passwordFile = new 
PasswordFile(environment.getMasterAdminPassword(), 
environment.getAdminPassword(), null, null);
+                    passwordFile = new 
PasswordFile(environment.getMasterAdminPassword(), 
environment.getAdminPassword(), null, null, environment.getVersion());
                 }
                 addParam("user", environment.getAdminUsername());
                 addParam("passwordfile", passwordFile.getLocation());
Index: 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/CreateFileUserCommand.java
===================================================================
--- 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/CreateFileUserCommand.java
       (revision 88)
+++ 
trunk/glassfish-asadmin-api/src/main/java/se/glassfish/asadmin/api/command/CreateFileUserCommand.java
       (revision 89)
@@ -48,7 +48,7 @@
 
     public Object execute() throws CommandException {
         try {
-            PasswordFile file = new 
PasswordFile(environment.getMasterAdminPassword(), 
environment.getAdminPassword(), null, password);
+            PasswordFile file = new 
PasswordFile(environment.getMasterAdminPassword(), 
environment.getAdminPassword(), null, password, environment.getVersion());
             setPasswordFile(file);
             if (groups != null) {
                 addParam("groups", groups);