Changeset 10299

Timestamp:

2005-07-25T16:36:00+12:00 (19 years ago)

Author:

kjdon

Message:

made this more general - now specify what user and pword properties should be set

File:

• trunk/gsdl3/src/java/org/greenstone/anttasks/MyGetUserAndPassword.java (modified) (7 diffs)

trunk/gsdl3/src/java/org/greenstone/anttasks/MyGetUserAndPassword.java

@@ -26 +26 @@
 /** A new ant task to prompt the user for username and password.
  * To use this task, the compiled class must be put in the classpath. add a taskdef line to the build.xml:
- * <taskdef name="getuserandpassword" classname="MyGetUserAndPassword" />
+ * <taskdef name="getuserandpassword" classname="org.greenstone.anttasks.MyGetUserAndPassword" />
  * and call it like the following:
- *  <getuserandpassword message="a message to display at the top of the dialog"
- * username="if the username is already specified" if="property name" unless="property name"/>
+ *  <getuserandpassword 
+ *       message="a message to display at the top of the dialog" 
+ *       userproperty="the name of the username property to set" 
+ *       pwordproperty="the name of the password property to set" 
+ *       username="default value for username (optional)" 
+ *       if="property name (optional)" 
+ *       unless="property name (optional)"/>
  * the if and unless attributes are used to control whether this task runs or not. If the 'if' attribute is set, the task will only run if the specified property is defined. If the unless attribute is set, the task will only run if the property is not defined.
 */
@@ -37 +42 @@
     
     private String message = null;
-    
+    private String user_property = null;
+    private String pword_property = null;
     private String username = null;
     private String password = null;
@@ -60 +66 @@
     }
 
+    public void setPwordproperty(String p_prop) {
+    pword_property = p_prop;
+    }
+    
     /** specify a property name - the task will only execute if this property is not set */
     public void setUnless(String property) {
@@ -72 +82 @@
     }
 
+    public void setUserproperty(String u_prop) {
+    user_property = u_prop;
+    }
     public void execute() throws org.apache.tools.ant.BuildException {
     
@@ -77 +90 @@
         return;
     }
+    if (user_property == null || pword_property == null) {
+        throw new org.apache.tools.ant.BuildException("userproperty and pwordproperty attributes must be specified");
+    }
+    
     JFrame hiddenFrame = new JFrame("Username and Password Hidden Frame");
     final JDialog dialog = new JDialog(hiddenFrame, "Username and Password", true);
@@ -167 +184 @@
     }
     
-    getProject().setProperty("proxy.username", username);
-    getProject().setProperty("proxy.password", password);
+    getProject().setProperty(user_property, username);
+    getProject().setProperty(pword_property, password);
     
     
@@ -208 +225 @@
     MyGetUserAndPassword task = new MyGetUserAndPassword();
     task.setMessage("hi there kath");
+    task.setUserproperty("username");
+    task.setPwordproperty("password");
     task.execute();