summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalina Jasinska <kalina.jasinska@gmail.com>2013-09-06 14:07:41 (GMT)
committer Kalina Jasinska <kalina.jasinska@gmail.com>2013-09-06 14:07:41 (GMT)
commitdc9747ef3458ff5a695227c30f8adf338e9b8878 (patch)
treedd1a865b0535d128a12eca81b4033988a25ae35c
parent013b1b6507ac7e7defdbb3628f742022beb056bd (diff)
downloadQCG-Data-dc9747ef3458ff5a695227c30f8adf338e9b8878.zip
QCG-Data-dc9747ef3458ff5a695227c30f8adf338e9b8878.tar.gz
QCG-Data-dc9747ef3458ff5a695227c30f8adf338e9b8878.tar.bz2
Changes in interface of login dialog, login as guest removed, changed labels, order of fields changed
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form296
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java774
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java3
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java2
-rw-r--r--idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg-logo-large-color1.pngbin24000 -> 26081 bytes
-rw-r--r--idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg-logo-large-color2.pngbin0 -> 28124 bytes
-rw-r--r--idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg_logo.pngbin0 -> 27615 bytes
-rw-r--r--idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg_logo_data_logo.pngbin0 -> 27615 bytes
8 files changed, 563 insertions, 512 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form
index 4042fc2..92df872 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form
@@ -22,12 +22,20 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,19,0,0,2,-87"/>
+ <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,104,0,0,2,-85"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="pnlLoginInfo">
+ <Properties>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[600, 300]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[600, 300]"/>
+ </Property>
+ </Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
@@ -38,7 +46,9 @@
<SubComponents>
<Component class="javax.swing.JLabel" name="lblHost">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Host:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[40, 14]"/>
</Property>
@@ -52,30 +62,29 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="15" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JTextField" name="txtHost">
<Properties>
<Property name="columns" type="int" value="30"/>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="null"/>
- </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="15" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblPort">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Port:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="16" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -86,17 +95,19 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="16" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblZone">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Zone:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="17" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -109,17 +120,19 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="3" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="17" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblResource">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Resource:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="18" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -129,17 +142,19 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="4" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="18" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblUserName">
<Properties>
- <Property name="text" type="java.lang.String" value="User Name:"/>
+ <Property name="horizontalAlignment" type="int" value="11"/>
+ <Property name="text" type="java.lang.String" value="User name:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -152,17 +167,19 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="5" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblPassword">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Password:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -175,14 +192,14 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="6" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="3" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Container class="javax.swing.JPanel" name="jPanel1">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="22" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="23" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
@@ -205,24 +222,17 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkGuestLoginActionPerformed"/>
</Events>
</Component>
- <Component class="javax.swing.JCheckBox" name="chkProxyLogin">
- <Properties>
- <Property name="text" type="java.lang.String" value="Use GSI"/>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkProxyLoginActionPerformed"/>
- </Events>
- </Component>
</SubComponents>
</Container>
<Component class="javax.swing.JLabel" name="lblLoginMode">
<Properties>
- <Property name="horizontalAlignment" type="int" value="4"/>
- <Property name="text" type="java.lang.String" value="Login Mode:"/>
+ <Property name="horizontalAlignment" type="int" value="11"/>
+ <Property name="text" type="java.lang.String" value="Login mode:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="21" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="22" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -238,41 +248,45 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="21" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="22" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="21" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblProxy">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Proxy location:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="9" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="21" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JTextField" name="txtProxy">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="9" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="21" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblCerts">
<Properties>
- <Property name="text" type="java.lang.String" value="Certificates location:"/>
+ <Property name="horizontalAlignment" type="int" value="11"/>
+ <Property name="text" type="java.lang.String" value="CA certificates:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="11" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="20" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JTextField" name="txtCerts">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="11" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="20" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -285,7 +299,7 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="2" gridY="9" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="2" gridY="21" gridWidth="1" gridHeight="1" fill="0" ipadX="1" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -298,17 +312,7 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="2" gridY="11" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JLabel" name="lblCertMode">
- <Properties>
- <Property name="text" type="java.lang.String" value="Certificate mode:"/>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="2" gridY="20" gridWidth="1" gridHeight="1" fill="0" ipadX="1" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -320,78 +324,23 @@
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
- <SubComponents>
- <Component class="javax.swing.JRadioButton" name="btnProxyCertKeyPair">
- <Properties>
- <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
- <ComponentRef name="btngrpProxySource"/>
- </Property>
- <Property name="text" type="java.lang.String" value="cert/key pair"/>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnProxyCertKeyPairActionPerformed"/>
- </Events>
- </Component>
- <Component class="javax.swing.JRadioButton" name="btnProxyP12">
- <Properties>
- <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
- <ComponentRef name="btngrpProxySource"/>
- </Property>
- <Property name="text" type="java.lang.String" value="p12 certificate"/>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnProxyP12ActionPerformed"/>
- </Events>
- </Component>
- <Component class="javax.swing.JRadioButton" name="btnProxyBrowser">
- <Properties>
- <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
- <ComponentRef name="btngrpProxySource"/>
- </Property>
- <Property name="text" type="java.lang.String" value="certificate in browser"/>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnProxyBrowserActionPerformed"/>
- </Events>
- </Component>
- <Component class="javax.swing.JRadioButton" name="btnProxyFile">
- <Properties>
- <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
- <ComponentRef name="btngrpProxySource"/>
- </Property>
- <Property name="text" type="java.lang.String" value="proxy file"/>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnProxyFileActionPerformed"/>
- </Events>
- </Component>
- <Component class="javax.swing.JRadioButton" name="btnProxyKeyFS">
- <Properties>
- <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
- <ComponentRef name="btngrpProxySource"/>
- </Property>
- <Property name="text" type="java.lang.String" value="KeyFS"/>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnProxyKeyFSActionPerformed"/>
- </Events>
- </Component>
- </SubComponents>
</Container>
<Component class="javax.swing.JTextField" name="txtKeyLocation">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="10" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="7" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblKeyLocation">
<Properties>
- <Property name="text" type="java.lang.String" value="Key location:"/>
+ <Property name="horizontalAlignment" type="int" value="11"/>
+ <Property name="text" type="java.lang.String" value="Key:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="10" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="7" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -404,24 +353,27 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="2" gridY="10" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="2" gridY="7" gridWidth="1" gridHeight="1" fill="0" ipadX="1" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblP12CertificateLocation">
<Properties>
- <Property name="text" type="java.lang.String" value="P12 Certificate location:"/>
+ <Property name="horizontalAlignment" type="int" value="11"/>
+ <Property name="text" type="java.lang.String" value="Certificate:"/>
+ <Property name="toolTipText" type="java.lang.String" value=""/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="7" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JTextField" name="txtP12CertificateLocation">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="7" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="4" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -434,17 +386,19 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="2" gridY="7" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="2" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="1" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblCertPassP12">
<Properties>
- <Property name="text" type="java.lang.String" value="Certificate password:"/>
+ <Property name="horizontalAlignment" type="int" value="11"/>
+ <Property name="text" type="java.lang.String" value="Password:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="12" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -457,24 +411,26 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="12" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="5" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblPEMCertificateLocation">
<Properties>
- <Property name="text" type="java.lang.String" value="PEM Certificate location:"/>
+ <Property name="horizontalAlignment" type="int" value="11"/>
+ <Property name="text" type="java.lang.String" value="Certificate:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="8" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JTextField" name="txtPEMCertificateLocation">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="8" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="6" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -487,17 +443,19 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="2" gridY="8" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="2" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="1" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lbllBrowserCombo">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Selected browser:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="14" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="9" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -510,17 +468,19 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="15" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="10" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblBrowserPass">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Browser password:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="15" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="10" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -540,17 +500,19 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="14" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="9" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="10" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lbllCertCombo">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Selected certificate:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="16" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="11" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -570,30 +532,41 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="16" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="11" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="10" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="btnCheckCertsInBrowser">
<Properties>
<Property name="text" type="java.lang.String" value="Access..."/>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[81, 23]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[81, 23]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[81, 23]"/>
+ </Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnCheckCertsInBrowserActionPerformed"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="2" gridY="15" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="2" gridY="10" gridWidth="1" gridHeight="1" fill="0" ipadX="1" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblCertPassPEM">
<Properties>
- <Property name="text" type="java.lang.String" value="Key password:"/>
+ <Property name="horizontalAlignment" type="int" value="11"/>
+ <Property name="text" type="java.lang.String" value="Password:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="13" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="8" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -606,17 +579,19 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="13" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="8" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblLdapKeyPass">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Key password:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="19" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="14" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -629,18 +604,20 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="19" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="14" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblPLGRIDUserName">
<Properties>
- <Property name="text" type="java.lang.String" value="PLGRID User Name:"/>
+ <Property name="horizontalAlignment" type="int" value="11"/>
+ <Property name="text" type="java.lang.String" value="PLGRID user name:"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="17" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="12" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -653,17 +630,19 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="17" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="12" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblplgridpass">
<Properties>
- <Property name="text" type="java.lang.String" value="PLGRID Password:"/>
+ <Property name="horizontalAlignment" type="int" value="11"/>
+ <Property name="text" type="java.lang.String" value="PLGRID password:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="18" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="13" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -676,7 +655,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="18" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="13" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -689,18 +668,55 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="20" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="19" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="lblKeyfsLifetime">
<Properties>
+ <Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Proxy lifetime (hours):"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
+ <Property name="alignmentX" type="float" value="1.0"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="20" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="19" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JLabel" name="lblLoginType">
+ <Properties>
+ <Property name="horizontalAlignment" type="int" value="11"/>
+ <Property name="text" type="java.lang.String" value="Login type:"/>
+ <Property name="alignmentX" type="float" value="1.0"/>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="22" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JComboBox" name="comboLoginType">
+ <Properties>
+ <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+ <StringArray count="6">
+ <StringItem index="0" value="Login/password"/>
+ <StringItem index="1" value="PEM certificate and key"/>
+ <StringItem index="2" value="P12 certificate"/>
+ <StringItem index="3" value="Browser keystore"/>
+ <StringItem index="4" value="Proxy file"/>
+ <StringItem index="5" value="PLGRID KeyFS"/>
+ </StringArray>
+ </Property>
+ <Property name="toolTipText" type="java.lang.String" value="Authentication mode used at login"/>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="comboLoginTypeActionPerformed"/>
+ </Events>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="1" ipadX="3" ipadY="0" insetsTop="0" insetsLeft="2" insetsBottom="0" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -755,7 +771,7 @@
</Container>
<Component class="javax.swing.JLabel" name="lblLogin">
<Properties>
- <Property name="text" type="java.lang.String" value="Please log in to your iDrop data grid"/>
+ <Property name="text" type="java.lang.String" value="Please log in to your QCG-Data grid"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
index 86e50b7..f3eca1d 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
@@ -65,6 +65,7 @@ public class LoginDialog extends JDialog {
return loginTrialSuccesful;
}
// Indexes of gsi modes used in properties to store users choice
+ static final int NO_CERTIFICATE_MODE = 0;
static final int PEM_MODE = 1;
static final int P12_MODE = 2;
static final int BROWSER_MODE = 3;
@@ -198,15 +199,7 @@ public class LoginDialog extends JDialog {
if (keyLoc != null) {
txtKeyLocation.setText(keyLoc);
}
- // Read gsi mode from properties (p12, PEM, browser, proxy file)
- String certMode = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_CERT_LOGIN_MODE);
- try {
- int certModeNum = Integer.parseInt(certMode);
- setSelectedModeFields(certModeNum);
- } catch (Exception ex) {
- Logger.getLogger(LoginDialog.class.getName()).log(Level.WARNING, null, ex);
- }
- //
+
txtPort.setText(port);
String zone = idropCore.getIdropConfig().getPropertyForKey(
IdropConfigurationService.ACCOUNT_CACHE_ZONE);
@@ -217,33 +210,24 @@ public class LoginDialog extends JDialog {
String username = idropCore.getIdropConfig().getPropertyForKey(
IdropConfigurationService.ACCOUNT_CACHE_USER_NAME);
txtUserName.setText(username);
-
+
String plgridusername = idropCore.getIdropConfig().getPropertyForKey(
IdropConfigurationService.ACCOUNT_CACHE_PLGRID_USERNAME);
txtPLGRIDUserName.setText(plgridusername);
String save = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_USER_SAVE_PASS);
boolean saveP = "true".equals(save);
- boolean autoGsi = false;
- String gsi = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_USER_AUTO_GSI);
- autoGsi = "true".equals(gsi);
-
- hideAdvancedViewFields();
- hideProxyLoginFields();
-
- if (autoGsi) {
- hideNormalLoginFields();
- showProxyLoginFields();
- chkProxyLogin.setSelected(true);
- String gsiMode = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_CERT_LOGIN_MODE);
- try {
- int gsiModeNum = Integer.parseInt(gsiMode);
- setSelectedModeFields(gsiModeNum);
- showProxyChoosenModeFields();
- } catch (Exception e) {
- }
- }
+ String loginTypeMode = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_LOGIN_TYPE);
+ try {
+ int modeNum = Integer.parseInt(loginTypeMode);
+ setSelectedModeFields(modeNum);
+ showChoosenModeFields();
+ } catch (Exception e) {
+ setSelectedModeFields(NO_CERTIFICATE_MODE);
+ showChoosenModeFields();
+ }
+
if (saveP) {
String savedPassword = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_USER_PASSWORD);
password.setText(savedPassword);
@@ -259,17 +243,22 @@ public class LoginDialog extends JDialog {
String plgkeypassword = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_PLGRID_KEY_PASSWORD);
plgridpass.setText(plgpassword);
ldapKeyPassword.setText(plgkeypassword);
-
+
if (tryToLogin) {
loginTrialSuccesful = !processLogin();
}
}
+ hideAdvancedViewFields();
//if location not set - show field to set it
if (!CAfilesConfigured || txtCerts.getText() == null || "".equals(txtCerts.getText())) {
txtCerts.setVisible(true);
lblCerts.setVisible(true);
btnCerts.setVisible(true);
}
+ // hide unused components
+ comboLoginMode.setVisible(false);
+ lblLoginMode.setVisible(false);
+ chkGuestLogin.setVisible(false);
}
private void loginUsingPreset() {
@@ -358,14 +347,15 @@ public class LoginDialog extends JDialog {
sb.append("/home/");
sb.append(txtUserName.getText());
- if (chkGuestLogin.isSelected()) {
- irodsAccount = IRODSAccount.instanceForAnonymous(
- presetHost, presetPort, "", presetZone,
- presetResource);
- } else if (chkProxyLogin.isSelected()) {
+// if (chkGuestLogin.isSelected()) {
+// irodsAccount = IRODSAccount.instanceForAnonymous(
+// presetHost, presetPort, "", presetZone,
+// presetResource);
+// } else
+ if (comboLoginType.getSelectedIndex() != NO_CERTIFICATE_MODE) {
GSSCredential gssCred = getGssCredential();
- if(gssCred == null){
+ if (gssCred == null) {
throw new Exception();
}
GSIIRODSAccount acc = GSIIRODSAccount.instance(presetHost, presetPort, gssCred, presetResource);
@@ -383,15 +373,16 @@ public class LoginDialog extends JDialog {
sb.append("/home/");
sb.append(txtUserName.getText());
- if (chkGuestLogin.isSelected()) {
- irodsAccount = IRODSAccount.instanceForAnonymous(txtHost
- .getText().trim(), Integer.parseInt(txtPort
- .getText().trim()), "", txtZone.getText().trim(),
- txtResource.getText().trim());
- } else if (chkProxyLogin.isSelected()) {
+// if (chkGuestLogin.isSelected()) {
+// irodsAccount = IRODSAccount.instanceForAnonymous(txtHost
+// .getText().trim(), Integer.parseInt(txtPort
+// .getText().trim()), "", txtZone.getText().trim(),
+// txtResource.getText().trim());
+// } else
+ if (comboLoginType.getSelectedIndex() != NO_CERTIFICATE_MODE) {
// TODO
GSSCredential gssCred = getGssCredential();
- if(gssCred == null){
+ if (gssCred == null) {
throw new Exception();
}
@@ -483,14 +474,8 @@ public class LoginDialog extends JDialog {
idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.ACCOUNT_CACHE_PROXY_LOCATION, txtProxy.getText());
idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.ACCOUNT_CACHE_CERTIFICATES_LOCATION, txtCerts.getText());
- if (chkProxyLogin.isSelected()) {
- idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.ACCOUNT_CACHE_USER_AUTO_GSI, "true");
- idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.ACCOUNT_CACHE_CERT_LOGIN_MODE, "" + getSelectedModeFieldNum());
- } else {
- idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.ACCOUNT_CACHE_USER_AUTO_GSI, "false");
- idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.ACCOUNT_CACHE_CERT_LOGIN_MODE, "-1");
- }
-
+ idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.ACCOUNT_CACHE_LOGIN_TYPE, "" + getSelectedModeFieldNum());
+
// Save in properties: paths to certificates, key and gsi mode
idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.ACCOUNT_CACHE_CERT_PEM_LOCATION, txtPEMCertificateLocation.getText());
idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.ACCOUNT_CACHE_KEY_PEM_LOCATION, txtKeyLocation.getText());
@@ -598,7 +583,6 @@ public class LoginDialog extends JDialog {
jPanel1 = new javax.swing.JPanel();
chkAdvancedLogin = new javax.swing.JCheckBox();
chkGuestLogin = new javax.swing.JCheckBox();
- chkProxyLogin = new javax.swing.JCheckBox();
lblLoginMode = new javax.swing.JLabel();
comboLoginMode = new javax.swing.JComboBox();
lblProxy = new javax.swing.JLabel();
@@ -607,13 +591,7 @@ public class LoginDialog extends JDialog {
txtCerts = new javax.swing.JTextField();
btnProxy = new javax.swing.JButton();
btnCerts = new javax.swing.JButton();
- lblCertMode = new javax.swing.JLabel();
jPanel2 = new javax.swing.JPanel();
- btnProxyCertKeyPair = new javax.swing.JRadioButton();
- btnProxyP12 = new javax.swing.JRadioButton();
- btnProxyBrowser = new javax.swing.JRadioButton();
- btnProxyFile = new javax.swing.JRadioButton();
- btnProxyKeyFS = new javax.swing.JRadioButton();
txtKeyLocation = new javax.swing.JTextField();
lblKeyLocation = new javax.swing.JLabel();
btnKeyLocation = new javax.swing.JButton();
@@ -642,6 +620,8 @@ public class LoginDialog extends JDialog {
plgridpass = new javax.swing.JPasswordField();
txtKeyfsLifetime = new javax.swing.JTextField();
lblKeyfsLifetime = new javax.swing.JLabel();
+ lblLoginType = new javax.swing.JLabel();
+ comboLoginType = new javax.swing.JComboBox();
pnlToolbar = new javax.swing.JPanel();
chkRememberPass = new javax.swing.JCheckBox();
btnOK = new javax.swing.JButton();
@@ -650,48 +630,64 @@ public class LoginDialog extends JDialog {
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+ pnlLoginInfo.setMinimumSize(new java.awt.Dimension(600, 300));
+ pnlLoginInfo.setPreferredSize(new java.awt.Dimension(600, 300));
pnlLoginInfo.setLayout(new java.awt.GridBagLayout());
+ lblHost.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
lblHost.setText("Host:");
+ lblHost.setAlignmentX(1.0F);
lblHost.setMaximumSize(new java.awt.Dimension(40, 14));
lblHost.setMinimumSize(new java.awt.Dimension(30, 14));
lblHost.setPreferredSize(null);
lblHost.setRequestFocusEnabled(false);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
+ gridBagConstraints.gridy = 15;
+ gridBagConstraints.ipadx = 3;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblHost, gridBagConstraints);
txtHost.setColumns(30);
- txtHost.setPreferredSize(null);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 1;
+ gridBagConstraints.gridy = 15;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(txtHost, gridBagConstraints);
+ lblPort.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
lblPort.setText("Port:");
+ lblPort.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 2;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
+ gridBagConstraints.gridy = 16;
+ gridBagConstraints.ipadx = 3;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblPort, gridBagConstraints);
txtPort.setColumns(30);
txtPort.setText("1247");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 2;
+ gridBagConstraints.gridy = 16;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(txtPort, gridBagConstraints);
+ lblZone.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
lblZone.setText("Zone:");
+ lblZone.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 3;
+ gridBagConstraints.gridy = 17;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblZone, gridBagConstraints);
@@ -699,30 +695,42 @@ public class LoginDialog extends JDialog {
txtZone.setPreferredSize(null);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 3;
+ gridBagConstraints.gridy = 17;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(txtZone, gridBagConstraints);
+ lblResource.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
lblResource.setText("Resource:");
+ lblResource.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 4;
+ gridBagConstraints.gridy = 18;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblResource, gridBagConstraints);
txtResource.setColumns(30);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 4;
+ gridBagConstraints.gridy = 18;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(txtResource, gridBagConstraints);
- lblUserName.setText("User Name:");
+ lblUserName.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ lblUserName.setText("User name:");
+ lblUserName.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 5;
+ gridBagConstraints.gridy = 2;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblUserName, gridBagConstraints);
@@ -730,15 +738,21 @@ public class LoginDialog extends JDialog {
txtUserName.setPreferredSize(null);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 5;
+ gridBagConstraints.gridy = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(txtUserName, gridBagConstraints);
+ lblPassword.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
lblPassword.setText("Password:");
+ lblPassword.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 6;
+ gridBagConstraints.gridy = 3;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblPassword, gridBagConstraints);
@@ -746,9 +760,12 @@ public class LoginDialog extends JDialog {
password.setPreferredSize(null);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 6;
+ gridBagConstraints.gridy = 3;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(password, gridBagConstraints);
chkAdvancedLogin.setText("Advanced Login Settings");
@@ -768,24 +785,18 @@ public class LoginDialog extends JDialog {
});
jPanel1.add(chkGuestLogin);
- chkProxyLogin.setText("Use GSI");
- chkProxyLogin.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- chkProxyLoginActionPerformed(evt);
- }
- });
- jPanel1.add(chkProxyLogin);
-
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 22;
+ gridBagConstraints.gridy = 23;
pnlLoginInfo.add(jPanel1, gridBagConstraints);
- lblLoginMode.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
- lblLoginMode.setText("Login Mode:");
+ lblLoginMode.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ lblLoginMode.setText("Login mode:");
+ lblLoginMode.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 21;
+ gridBagConstraints.gridy = 22;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblLoginMode, gridBagConstraints);
@@ -793,33 +804,49 @@ public class LoginDialog extends JDialog {
comboLoginMode.setToolTipText("Authentication mode used at login");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 21;
+ gridBagConstraints.gridy = 22;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(comboLoginMode, gridBagConstraints);
+ lblProxy.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
lblProxy.setText("Proxy location:");
+ lblProxy.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 9;
+ gridBagConstraints.gridy = 21;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblProxy, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 9;
+ gridBagConstraints.gridy = 21;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(txtProxy, gridBagConstraints);
- lblCerts.setText("Certificates location:");
+ lblCerts.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ lblCerts.setText("CA certificates:");
+ lblCerts.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 11;
+ gridBagConstraints.gridy = 20;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblCerts, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 11;
+ gridBagConstraints.gridy = 20;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
+ gridBagConstraints.ipadx = 3;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(txtCerts, gridBagConstraints);
btnProxy.setText("Choose...");
@@ -830,7 +857,8 @@ public class LoginDialog extends JDialog {
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
- gridBagConstraints.gridy = 9;
+ gridBagConstraints.gridy = 21;
+ gridBagConstraints.ipadx = 1;
pnlLoginInfo.add(btnProxy, gridBagConstraints);
btnCerts.setText("Choose...");
@@ -841,71 +869,27 @@ public class LoginDialog extends JDialog {
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
- gridBagConstraints.gridy = 11;
+ gridBagConstraints.gridy = 20;
+ gridBagConstraints.ipadx = 1;
pnlLoginInfo.add(btnCerts, gridBagConstraints);
-
- lblCertMode.setText("Certificate mode:");
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
- pnlLoginInfo.add(lblCertMode, gridBagConstraints);
-
- btngrpProxySource.add(btnProxyCertKeyPair);
- btnProxyCertKeyPair.setText("cert/key pair");
- btnProxyCertKeyPair.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- btnProxyCertKeyPairActionPerformed(evt);
- }
- });
- jPanel2.add(btnProxyCertKeyPair);
-
- btngrpProxySource.add(btnProxyP12);
- btnProxyP12.setText("p12 certificate");
- btnProxyP12.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- btnProxyP12ActionPerformed(evt);
- }
- });
- jPanel2.add(btnProxyP12);
-
- btngrpProxySource.add(btnProxyBrowser);
- btnProxyBrowser.setText("certificate in browser");
- btnProxyBrowser.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- btnProxyBrowserActionPerformed(evt);
- }
- });
- jPanel2.add(btnProxyBrowser);
-
- btngrpProxySource.add(btnProxyFile);
- btnProxyFile.setText("proxy file");
- btnProxyFile.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- btnProxyFileActionPerformed(evt);
- }
- });
- jPanel2.add(btnProxyFile);
-
- btngrpProxySource.add(btnProxyKeyFS);
- btnProxyKeyFS.setText("KeyFS");
- btnProxyKeyFS.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- btnProxyKeyFSActionPerformed(evt);
- }
- });
- jPanel2.add(btnProxyKeyFS);
-
pnlLoginInfo.add(jPanel2, new java.awt.GridBagConstraints());
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 10;
+ gridBagConstraints.gridy = 7;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
+ gridBagConstraints.ipadx = 3;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(txtKeyLocation, gridBagConstraints);
- lblKeyLocation.setText("Key location:");
+ lblKeyLocation.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ lblKeyLocation.setText("Key:");
+ lblKeyLocation.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 10;
+ gridBagConstraints.gridy = 7;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblKeyLocation, gridBagConstraints);
@@ -917,19 +901,28 @@ public class LoginDialog extends JDialog {
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
- gridBagConstraints.gridy = 10;
+ gridBagConstraints.gridy = 7;
+ gridBagConstraints.ipadx = 1;
pnlLoginInfo.add(btnKeyLocation, gridBagConstraints);
- lblP12CertificateLocation.setText("P12 Certificate location:");
+ lblP12CertificateLocation.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ lblP12CertificateLocation.setText("Certificate:");
+ lblP12CertificateLocation.setToolTipText("");
+ lblP12CertificateLocation.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 7;
+ gridBagConstraints.gridy = 4;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblP12CertificateLocation, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 7;
+ gridBagConstraints.gridy = 4;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(txtP12CertificateLocation, gridBagConstraints);
btnP12CertificateLocation.setText("Choose...");
@@ -940,13 +933,17 @@ public class LoginDialog extends JDialog {
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
- gridBagConstraints.gridy = 7;
+ gridBagConstraints.gridy = 4;
+ gridBagConstraints.ipadx = 1;
pnlLoginInfo.add(btnP12CertificateLocation, gridBagConstraints);
- lblCertPassP12.setText("Certificate password:");
+ lblCertPassP12.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ lblCertPassP12.setText("Password:");
+ lblCertPassP12.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 12;
+ gridBagConstraints.gridy = 5;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblCertPassP12, gridBagConstraints);
@@ -954,21 +951,31 @@ public class LoginDialog extends JDialog {
certpassP12.setPreferredSize(null);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 12;
+ gridBagConstraints.gridy = 5;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(certpassP12, gridBagConstraints);
- lblPEMCertificateLocation.setText("PEM Certificate location:");
+ lblPEMCertificateLocation.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ lblPEMCertificateLocation.setText("Certificate:");
+ lblPEMCertificateLocation.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 8;
+ gridBagConstraints.gridy = 6;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblPEMCertificateLocation, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 8;
+ gridBagConstraints.gridy = 6;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(txtPEMCertificateLocation, gridBagConstraints);
btnPEMCertificateLocation.setText("Choose...");
@@ -979,13 +986,17 @@ public class LoginDialog extends JDialog {
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
- gridBagConstraints.gridy = 8;
+ gridBagConstraints.gridy = 6;
+ gridBagConstraints.ipadx = 1;
pnlLoginInfo.add(btnPEMCertificateLocation, gridBagConstraints);
+ lbllBrowserCombo.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
lbllBrowserCombo.setText("Selected browser:");
+ lbllBrowserCombo.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 14;
+ gridBagConstraints.gridy = 9;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lbllBrowserCombo, gridBagConstraints);
@@ -993,15 +1004,21 @@ public class LoginDialog extends JDialog {
browserpass.setPreferredSize(null);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 15;
+ gridBagConstraints.gridy = 10;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(browserpass, gridBagConstraints);
+ lblBrowserPass.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
lblBrowserPass.setText("Browser password:");
+ lblBrowserPass.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 15;
+ gridBagConstraints.gridy = 10;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblBrowserPass, gridBagConstraints);
@@ -1013,14 +1030,20 @@ public class LoginDialog extends JDialog {
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 14;
+ gridBagConstraints.gridy = 9;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(cmbBrowsers, gridBagConstraints);
+ lbllCertCombo.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
lbllCertCombo.setText("Selected certificate:");
+ lbllCertCombo.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 16;
+ gridBagConstraints.gridy = 11;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lbllCertCombo, gridBagConstraints);
@@ -1032,11 +1055,17 @@ public class LoginDialog extends JDialog {
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 16;
+ gridBagConstraints.gridy = 11;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(cmbCertificates, gridBagConstraints);
btnCheckCertsInBrowser.setText("Access...");
+ btnCheckCertsInBrowser.setMaximumSize(new java.awt.Dimension(81, 23));
+ btnCheckCertsInBrowser.setMinimumSize(new java.awt.Dimension(81, 23));
+ btnCheckCertsInBrowser.setPreferredSize(new java.awt.Dimension(81, 23));
btnCheckCertsInBrowser.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnCheckCertsInBrowserActionPerformed(evt);
@@ -1044,13 +1073,17 @@ public class LoginDialog extends JDialog {
});
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
- gridBagConstraints.gridy = 15;
+ gridBagConstraints.gridy = 10;
+ gridBagConstraints.ipadx = 1;
pnlLoginInfo.add(btnCheckCertsInBrowser, gridBagConstraints);
- lblCertPassPEM.setText("Key password:");
+ lblCertPassPEM.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ lblCertPassPEM.setText("Password:");
+ lblCertPassPEM.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 13;
+ gridBagConstraints.gridy = 8;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblCertPassPEM, gridBagConstraints);
@@ -1058,15 +1091,21 @@ public class LoginDialog extends JDialog {
certpassPEM.setPreferredSize(null);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 13;
+ gridBagConstraints.gridy = 8;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(certpassPEM, gridBagConstraints);
+ lblLdapKeyPass.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
lblLdapKeyPass.setText("Key password:");
+ lblLdapKeyPass.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 19;
+ gridBagConstraints.gridy = 14;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblLdapKeyPass, gridBagConstraints);
@@ -1074,16 +1113,22 @@ public class LoginDialog extends JDialog {
ldapKeyPassword.setPreferredSize(null);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 19;
+ gridBagConstraints.gridy = 14;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(ldapKeyPassword, gridBagConstraints);
- lblPLGRIDUserName.setText("PLGRID User Name:");
+ lblPLGRIDUserName.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ lblPLGRIDUserName.setText("PLGRID user name:");
lblPLGRIDUserName.setToolTipText("");
+ lblPLGRIDUserName.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 17;
+ gridBagConstraints.gridy = 12;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblPLGRIDUserName, gridBagConstraints);
@@ -1091,15 +1136,21 @@ public class LoginDialog extends JDialog {
txtPLGRIDUserName.setPreferredSize(null);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 17;
+ gridBagConstraints.gridy = 12;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(txtPLGRIDUserName, gridBagConstraints);
- lblplgridpass.setText("PLGRID Password:");
+ lblplgridpass.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ lblplgridpass.setText("PLGRID password:");
+ lblplgridpass.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 18;
+ gridBagConstraints.gridy = 13;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblplgridpass, gridBagConstraints);
@@ -1107,28 +1158,64 @@ public class LoginDialog extends JDialog {
plgridpass.setPreferredSize(null);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 18;
+ gridBagConstraints.gridy = 13;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(plgridpass, gridBagConstraints);
txtKeyfsLifetime.setColumns(30);
txtKeyfsLifetime.setPreferredSize(null);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 20;
+ gridBagConstraints.gridy = 19;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
pnlLoginInfo.add(txtKeyfsLifetime, gridBagConstraints);
+ lblKeyfsLifetime.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
lblKeyfsLifetime.setText("Proxy lifetime (hours):");
lblKeyfsLifetime.setToolTipText("");
+ lblKeyfsLifetime.setAlignmentX(1.0F);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 20;
+ gridBagConstraints.gridy = 19;
+ gridBagConstraints.ipadx = 3;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
pnlLoginInfo.add(lblKeyfsLifetime, gridBagConstraints);
+ lblLoginType.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ lblLoginType.setText("Login type:");
+ lblLoginType.setAlignmentX(1.0F);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 1;
+ gridBagConstraints.ipadx = 3;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_END;
+ pnlLoginInfo.add(lblLoginType, gridBagConstraints);
+
+ comboLoginType.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Login/password", "PEM certificate and key", "P12 certificate", "Browser keystore", "Proxy file", "PLGRID KeyFS" }));
+ comboLoginType.setToolTipText("Authentication mode used at login");
+ comboLoginType.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ comboLoginTypeActionPerformed(evt);
+ }
+ });
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 1;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipadx = 3;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 2);
+ pnlLoginInfo.add(comboLoginType, gridBagConstraints);
+
getContentPane().add(pnlLoginInfo, java.awt.BorderLayout.CENTER);
pnlToolbar.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT, 2, 5));
@@ -1164,7 +1251,7 @@ public class LoginDialog extends JDialog {
getContentPane().add(pnlToolbar, java.awt.BorderLayout.SOUTH);
- lblLogin.setText("Please log in to your iDrop data grid");
+ lblLogin.setText("Please log in to your QCG-Data grid");
getContentPane().add(lblLogin, java.awt.BorderLayout.PAGE_START);
pack();
@@ -1174,21 +1261,6 @@ public class LoginDialog extends JDialog {
// TODO add your handling code here:
}//GEN-LAST:event_chkRememberPassActionPerformed
- private void chkProxyLoginActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chkProxyLoginActionPerformed
- if (chkProxyLogin.isSelected()) {
- chkGuestLogin.setSelected(false);
- //hide username/pass
- hideForGuestLogin();
- showProxyLoginFields();
- //Shows proper fields for choosen gsi mode (p12/pem/browser/proxy file)
- showProxyChoosenModeFields();
- } else {
- //show username/password
- showWhenGuestLogin();
- hideProxyLoginFields();
- }
- }//GEN-LAST:event_chkProxyLoginActionPerformed
-
private void btnProxyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnProxyActionPerformed
final JFileChooser chooser = new JFileChooser();
chooser.setFileHidingEnabled(false);
@@ -1228,43 +1300,6 @@ public class LoginDialog extends JDialog {
}
}//GEN-LAST:event_btnP12CertificateLocationActionPerformed
- private void btnProxyCertKeyPairActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnProxyCertKeyPairActionPerformed
-// show proper fields when using PEM pair to authenticate user
- hideCertP12Fields();
- hideCertInBrowserFields();
- hideProxyFileFields();
- hideKeyFSFields();
- showCertKeyPairFields();
- }//GEN-LAST:event_btnProxyCertKeyPairActionPerformed
-
- private void btnProxyP12ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnProxyP12ActionPerformed
-// show proper fields when using p12 certificate to authenticate user
- hideCertKeyPairFields();
- hideCertInBrowserFields();
- hideProxyFileFields();
- hideKeyFSFields();
- showCertP12Fields();
- }//GEN-LAST:event_btnProxyP12ActionPerformed
-
- private void btnProxyBrowserActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnProxyBrowserActionPerformed
-// show proper fields when using credentials from browser to authenticate user
- hideCertKeyPairFields();
- hideCertP12Fields();
- hideProxyFileFields();
- hideKeyFSFields();
- showCertInBrowserFields();
- fillBrowserComboBox();
- }//GEN-LAST:event_btnProxyBrowserActionPerformed
-
- private void btnProxyFileActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnProxyFileActionPerformed
-// show proper fields when using proxy file to authenticate user
- hideCertKeyPairFields();
- hideCertP12Fields();
- hideCertInBrowserFields();
- hideKeyFSFields();
- showProxyFileFields();
- }//GEN-LAST:event_btnProxyFileActionPerformed
-
private void btnPEMCertificateLocationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnPEMCertificateLocationActionPerformed
//get path of certificate file when using PEM pair to authenticate user
final JFileChooser chooser = new JFileChooser();
@@ -1289,13 +1324,9 @@ public class LoginDialog extends JDialog {
}
}//GEN-LAST:event_btnCheckCertsInBrowserActionPerformed
- private void btnProxyKeyFSActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnProxyKeyFSActionPerformed
- hideCertP12Fields();
- hideCertInBrowserFields();
- hideProxyFileFields();
- hideCertKeyPairFields();
- showKeyFSFields();
- }//GEN-LAST:event_btnProxyKeyFSActionPerformed
+ private void comboLoginTypeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboLoginTypeActionPerformed
+ showChoosenModeFields();
+ }//GEN-LAST:event_comboLoginTypeActionPerformed
private void chkAdvancedLoginActionPerformed(
final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_chkAdvancedLoginActionPerformed
@@ -1309,14 +1340,14 @@ public class LoginDialog extends JDialog {
private void chkGuestLoginActionPerformed(
final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_chkGuestLoginActionPerformed
- if (chkGuestLogin.isSelected()) {
- chkProxyLogin.setSelected(false);
- hideProxyLoginFields();
- hideForGuestLogin();
-
- } else {
- showWhenGuestLogin();
- }
+// if (chkGuestLogin.isSelected()) {
+// chkProxyLogin.setSelected(false);
+// hideProxyLoginFields();
+// hideForGuestLogin();
+//
+// } else {
+// showWhenGuestLogin();
+// }
}// GEN-LAST:event_chkGuestLoginActionPerformed
private void btnOKActionPerformed(final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnOKActionPerformed
@@ -1336,25 +1367,19 @@ public class LoginDialog extends JDialog {
private javax.swing.JButton btnP12CertificateLocation;
private javax.swing.JButton btnPEMCertificateLocation;
private javax.swing.JButton btnProxy;
- private javax.swing.JRadioButton btnProxyBrowser;
- private javax.swing.JRadioButton btnProxyCertKeyPair;
- private javax.swing.JRadioButton btnProxyFile;
- private javax.swing.JRadioButton btnProxyKeyFS;
- private javax.swing.JRadioButton btnProxyP12;
private javax.swing.ButtonGroup btngrpProxySource;
private javax.swing.JPasswordField certpassP12;
private javax.swing.JPasswordField certpassPEM;
private javax.swing.JCheckBox chkAdvancedLogin;
private javax.swing.JCheckBox chkGuestLogin;
- private javax.swing.JCheckBox chkProxyLogin;
private javax.swing.JCheckBox chkRememberPass;
private javax.swing.JComboBox cmbBrowsers;
private javax.swing.JComboBox cmbCertificates;
private javax.swing.JComboBox comboLoginMode;
+ private javax.swing.JComboBox comboLoginType;
private javax.swing.JPanel jPanel1;
private javax.swing.JPanel jPanel2;
private javax.swing.JLabel lblBrowserPass;
- private javax.swing.JLabel lblCertMode;
private javax.swing.JLabel lblCertPassP12;
private javax.swing.JLabel lblCertPassPEM;
private javax.swing.JLabel lblCerts;
@@ -1364,6 +1389,7 @@ public class LoginDialog extends JDialog {
private javax.swing.JLabel lblLdapKeyPass;
private javax.swing.JLabel lblLogin;
private javax.swing.JLabel lblLoginMode;
+ private javax.swing.JLabel lblLoginType;
private javax.swing.JLabel lblP12CertificateLocation;
private javax.swing.JLabel lblPEMCertificateLocation;
private javax.swing.JLabel lblPLGRIDUserName;
@@ -1415,6 +1441,9 @@ public class LoginDialog extends JDialog {
lblCerts.setVisible(true);
txtCerts.setVisible(true);
btnCerts.setVisible(true);
+
+ lblKeyfsLifetime.setVisible(true);
+ txtKeyfsLifetime.setVisible(true);
}
private void hideAdvancedViewFields() {
@@ -1430,6 +1459,9 @@ public class LoginDialog extends JDialog {
lblCerts.setVisible(false);
txtCerts.setVisible(false);
btnCerts.setVisible(false);
+
+ lblKeyfsLifetime.setVisible(false);
+ txtKeyfsLifetime.setVisible(false);
}
private void hideForGuestLogin() {
@@ -1446,34 +1478,6 @@ public class LoginDialog extends JDialog {
txtUserName.setVisible(true);
lblPassword.setVisible(true);
password.setVisible(true);
- lblLoginMode.setVisible(true);//symetric
- comboLoginMode.setVisible(true);
- }
-
- private void showProxyLoginFields() {
- //show buttngroup to let user choose a way to authenticate
- btnProxyBrowser.setVisible(true);
- btnProxyCertKeyPair.setVisible(true);
- btnProxyFile.setVisible(true);
- btnProxyP12.setVisible(true);
- lblCertMode.setVisible(true);
- btnProxyKeyFS.setVisible(true);
- }
-
- private void hideProxyLoginFields() {
- btnProxyBrowser.setVisible(false);
- btnProxyCertKeyPair.setVisible(false);
- btnProxyFile.setVisible(false);
- btnProxyP12.setVisible(false);
- lblCertMode.setVisible(false);
- btnProxyKeyFS.setVisible(false);
- hideCertKeyPairFields();
- hideCertP12Fields();
- hideCertInBrowserFields();
- hideProxyFileFields();
- hideKeyFSFields();
- // lblPassword.setVisible(true);
- // password.setVisible(true);
}
private void hideCertKeyPairFields() {
@@ -1557,8 +1561,6 @@ public class LoginDialog extends JDialog {
txtPLGRIDUserName.setVisible(false);
lblplgridpass.setVisible(false);
plgridpass.setVisible(false);
- txtKeyfsLifetime.setVisible(false);
- lblKeyfsLifetime.setVisible(false);
}
private void showKeyFSFields() {
@@ -1568,8 +1570,6 @@ public class LoginDialog extends JDialog {
txtPLGRIDUserName.setVisible(true);
lblplgridpass.setVisible(true);
plgridpass.setVisible(true);
- txtKeyfsLifetime.setVisible(true);
- lblKeyfsLifetime.setVisible(true);
}
/*
* Set selected the proper radiobutton depending the number of mode
@@ -1577,56 +1577,49 @@ public class LoginDialog extends JDialog {
*/
private void setSelectedModeFields(int num) {
- switch (num) {
+ comboLoginType.setSelectedIndex(num);
+ }
+
+ private int getSelectedModeFieldNum() {
+ return comboLoginType.getSelectedIndex();
+ }
+
+ private void hideAllFields() {
+ hideForGuestLogin();
+ hideCertKeyPairFields();
+ hideCertP12Fields();
+ hideCertInBrowserFields();
+ hideProxyFileFields();
+ hideKeyFSFields();
+ }
+
+ private void showChoosenModeFields() {
+ switch (comboLoginType.getSelectedIndex()) {
+ case NO_CERTIFICATE_MODE:
+ hideAllFields();
+ showWhenGuestLogin();
+ break;
case PEM_MODE:
- btnProxyCertKeyPair.setSelected(true);
+ hideAllFields();
+ showCertKeyPairFields();
break;
case P12_MODE:
- btnProxyP12.setSelected(true);
+ hideAllFields();
+ showCertP12Fields();
break;
case BROWSER_MODE:
- btnProxyBrowser.setSelected(true);
+ hideAllFields();
+ showCertInBrowserFields();
+ fillBrowserComboBox();
break;
case PROXY_MODE:
- btnProxyFile.setSelected(true);
+ hideAllFields();
+ showProxyFileFields();
break;
case KEYFS_MODE:
- btnProxyKeyFS.setSelected(true);
+ hideAllFields();
+ showKeyFSFields();
break;
-
- }
- }
-
- private int getSelectedModeFieldNum() {
- if (btnProxyCertKeyPair.isSelected()) {
- return PEM_MODE;
- }
- if (btnProxyP12.isSelected()) {
- return P12_MODE;
- }
- if (btnProxyBrowser.isSelected()) {
- return BROWSER_MODE;
- }
- if (btnProxyFile.isSelected()) {
- return PROXY_MODE;
- }
- if (btnProxyKeyFS.isSelected()) {
- return KEYFS_MODE;
- }
- return -1; //old option used as default
- }
-
- private void showProxyChoosenModeFields() {
- if (btnProxyCertKeyPair.isSelected()) {
- showCertKeyPairFields();
- } else if (btnProxyP12.isSelected()) {
- showCertP12Fields();
- } else if (btnProxyBrowser.isSelected()) {
- showCertInBrowserFields();
- } else if (btnProxyFile.isSelected()) {
- showProxyFileFields();
- } else if (btnProxyKeyFS.isSelected()) {
- showKeyFSFields();
}
}
/*
@@ -1637,49 +1630,59 @@ public class LoginDialog extends JDialog {
private GSSCredential getGssCredential() throws GlobusCredentialException, GSSException {
// should it be possinble to change by user?
int proxyLifetimeSeconds = 1000;
- if (btnProxyFile.isSelected()) {
- //a it was previously
- String proxyFilePath = txtProxy.getText();
- GlobusCredential globusCred = new GlobusCredential(proxyFilePath);
- return new GlobusGSSCredentialImpl(globusCred, GSSCredential.INITIATE_AND_ACCEPT);
- } else if (btnProxyCertKeyPair.isSelected()) {
- String pemCert = txtPEMCertificateLocation.getText();
- String pemKey = txtKeyLocation.getText();
- return GssUtil.createCredentialFromCertKeyPassTime(pemCert, pemKey, new String(certpassPEM.getPassword()), proxyLifetimeSeconds, GSIConstants.GSI_3_IMPERSONATION_PROXY);
- } else if (btnProxyP12.isSelected()) {
- String p12Cert = txtP12CertificateLocation.getText();
- //convert p12 to pem pair
- String certPath = IDROP_HOME + File.separator + "usercert.pem";
- String keyPath = IDROP_HOME + File.separator + "userkey.pem";
- try {
- CertificateConverter.PKCS12ToPem(p12Cert, certpassP12.getText());
- } catch (Exception ex) {
- log.error("Error during certificate conversion." + ex.getMessage());
- }
- return GssUtil.createCredentialFromCertKeyPassTime(certPath, keyPath, new String(certpassP12.getPassword()), proxyLifetimeSeconds, GSIConstants.GSI_3_IMPERSONATION_PROXY);
- } else if (btnProxyBrowser.isSelected()) {
- String dn = (String) cmbCertificates.getSelectedItem();
- X509Certificate browserCert = getSelectedCertificateFromBrowser(dn);
- PrivateKey browserKey = getSelectedKeyFromBrowser(dn);
- String emptyPass = "";
- GssUtil.createCredentialFromCertKeyPassTime(browserCert, browserKey, emptyPass, proxyLifetimeSeconds, GSIConstants.GSI_3_IMPERSONATION_PROXY);
- } else if (btnProxyKeyFS.isSelected()) {
- try {
- int hours = 10;
+
+ switch (comboLoginType.getSelectedIndex()) {
+ case NO_CERTIFICATE_MODE:
+
+ break;
+ case PEM_MODE:
+ String pemCert = txtPEMCertificateLocation.getText();
+ String pemKey = txtKeyLocation.getText();
+ return GssUtil.createCredentialFromCertKeyPassTime(pemCert, pemKey,
+ new String(certpassPEM.getPassword()), proxyLifetimeSeconds, GSIConstants.GSI_3_IMPERSONATION_PROXY);
+ case P12_MODE:
+ String p12Cert = txtP12CertificateLocation.getText();
+ //convert p12 to pem pair
+ String certPath = IDROP_HOME + File.separator + "usercert.pem";
+ String keyPath = IDROP_HOME + File.separator + "userkey.pem";
try {
- hours = Integer.parseInt(txtKeyfsLifetime.getText());
+ CertificateConverter.PKCS12ToPem(p12Cert, certpassP12.getText());
} catch (Exception ex) {
+ log.error("Error during certificate conversion." + ex.getMessage());
}
- String proxyFilePath = importCredentialsFromKeyFS(txtPLGRIDUserName.getText(), plgridpass.getText(), ldapKeyPassword.getText(), hours);
- if(proxyFilePath == null){
- return null;
+ return GssUtil.createCredentialFromCertKeyPassTime(certPath, keyPath,
+ new String(certpassP12.getPassword()), proxyLifetimeSeconds, GSIConstants.GSI_3_IMPERSONATION_PROXY);
+
+ case BROWSER_MODE:
+ String dn = (String) cmbCertificates.getSelectedItem();
+ X509Certificate browserCert = getSelectedCertificateFromBrowser(dn);
+ PrivateKey browserKey = getSelectedKeyFromBrowser(dn);
+ String emptyPass = "";
+ GssUtil.createCredentialFromCertKeyPassTime(browserCert,
+ browserKey, emptyPass, proxyLifetimeSeconds, GSIConstants.GSI_3_IMPERSONATION_PROXY);
+
+ case PROXY_MODE:
+ String proxyFileP = txtProxy.getText();
+ GlobusCredential globusC = new GlobusCredential(proxyFileP);
+ return new GlobusGSSCredentialImpl(globusC, GSSCredential.INITIATE_AND_ACCEPT);
+ case KEYFS_MODE:
+ try {
+ int hours = 10;
+ try {
+ hours = Integer.parseInt(txtKeyfsLifetime.getText());
+ } catch (Exception ex) {
+ }
+ String proxyFilePath = importCredentialsFromKeyFS(txtPLGRIDUserName.getText(), plgridpass.getText(), ldapKeyPassword.getText(), hours);
+ if (proxyFilePath == null) {
+ return null;
+ }
+ GlobusCredential globusCred = new GlobusCredential(proxyFilePath);
+ return new GlobusGSSCredentialImpl(globusCred, GSSCredential.INITIATE_AND_ACCEPT);
+ } catch (IOException ex) {
+ log.error("Importing and using proxy from keyFS failed", ex);
}
- GlobusCredential globusCred = new GlobusCredential(proxyFilePath);
- return new GlobusGSSCredentialImpl(globusCred, GSSCredential.INITIATE_AND_ACCEPT);
- } catch (IOException ex) {
- log.error("Importing and using proxy from keyFS failed", ex);
- }
}
+
return null;
}
/*
@@ -1702,10 +1705,11 @@ public class LoginDialog extends JDialog {
JSch jsch = new JSch();
String keypass = keyPasword;
- if (keypass == null) {
+ if (keypass == null || "".equals(keypass)) {
keypass = password;
}
String command = "echo " + keypass + " | grid-proxy-init -valid " + hours + ":0 -cert " + certName + " -key " + keyName + " -out " + outName + " -pwstdin";
+ String commandRemove = "rm " + outName;
try {
java.util.Properties config = new java.util.Properties();
@@ -1753,10 +1757,42 @@ public class LoginDialog extends JDialog {
Channel channel2 = session.openChannel("sftp");
channel2.connect();
ChannelSftp c = (ChannelSftp) channel2;
-// wyrzucac proxy z srwera po sciagnieciu
c.get(outName, userHomeDir);
result = IDROP_HOME + "/" + proxyFileName;
channel2.disconnect();
+ log.info("Removing proxy from remote.");
+ Channel channel3 = session.openChannel("exec");
+ ((ChannelExec) channel3).setCommand(commandRemove);
+ channel3.connect();
+
+ in = channel3.getInputStream();
+ channel3.connect();
+
+ while (true) {
+ count++;
+ if (count > 60) {
+ break;
+ }
+ while (in.available() > 0) {
+ int i = in.read(tmp, 0, 1024);
+ if (i < 0) {
+ break;
+ }
+ }
+ if (channel3.isClosed()) {
+ log.info("exit-status: " + channel.getExitStatus());
+ break;
+ }
+ try {
+ Thread.sleep(1000);
+ } catch (Exception ee) {
+ }
+ }
+ if (channel3.getExitStatus() != 0) {
+ log.error("Proxy removal failed.");
+ }
+ channel3.disconnect();
+
session.disconnect();
} catch (SftpException ex) {
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java
index 677654d..c0831ef 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java
@@ -40,13 +40,12 @@ public interface IdropConfigurationService {
// for GSI
public static final String ACCOUNT_CACHE_PROXY_LOCATION = "irods.account.gsi.proxy.location";
public static final String ACCOUNT_CACHE_CERTIFICATES_LOCATION = "irods.account.gsi.certificates.location";
- public static final String ACCOUNT_CACHE_USER_AUTO_GSI = "irods.account.autogsi";
public static final String ACCOUNT_CACHE_CERT_PEM_LOCATION = "irods.account.gsi.cert.pem.location";
public static final String ACCOUNT_CACHE_KEY_PEM_LOCATION = "irods.account.gsi.key.pem.location";
public static final String ACCOUNT_CACHE_CERT_P12_LOCATION = "irods.account.gsi.cert.p12.location";
public static final String ACCOUNT_CACHE_CERT_P12_PASSWORD = "irods.account.gsi.cert.p12.password";
public static final String ACCOUNT_CACHE_CERT_PEM_PASSWORD = "irods.account.gsi.cert.pem.password";
- public static final String ACCOUNT_CACHE_CERT_LOGIN_MODE = "irods.account.gsi.cert.login.mode";
+ public static final String ACCOUNT_CACHE_LOGIN_TYPE = "irods.account.gsi.login.type";
public static final String ACCOUNT_CACHE_PLGRID_USERNAME = "irods.account.gsi.plgrid.username";
public static final String ACCOUNT_CACHE_PLGRID_PASSWORD = "irods.account.gsi.plgrid.password";
public static final String ACCOUNT_CACHE_PLGRID_KEY_PASSWORD = "irods.account.gsi.plgrid.key.password";
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
index bc3281c..c59d7ee 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
@@ -1,5 +1,5 @@
package org.irods.jargon.idrop.desktop.systraygui.utils;
public final class Version {
public static String VERSION="2.0.1-SNAPSHOT";
- public static String BUILD_TIME="20130829-1603";
+ public static String BUILD_TIME="20130906-1559";
}
diff --git a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg-logo-large-color1.png b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg-logo-large-color1.png
index aba6538..9c3023d 100644
--- a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg-logo-large-color1.png
+++ b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg-logo-large-color1.png
Binary files differ
diff --git a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg-logo-large-color2.png b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg-logo-large-color2.png
new file mode 100644
index 0000000..0447e30
--- /dev/null
+++ b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg-logo-large-color2.png
Binary files differ
diff --git a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg_logo.png b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg_logo.png
new file mode 100644
index 0000000..67b285d
--- /dev/null
+++ b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg_logo.png
Binary files differ
diff --git a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg_logo_data_logo.png b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg_logo_data_logo.png
new file mode 100644
index 0000000..67b285d
--- /dev/null
+++ b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/images/qcg_logo_data_logo.png
Binary files differ