← Back to branch summary

~ubuntu-branches/ubuntu/maverick/eucalyptus/maverick

« back to all changes in this revision

Viewing changes to clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/EucalyptusWebInterface.java

  • Committer: Bazaar Package Importer
  • Author(s): Dave Walker (Daviey)
  • Date: 2010-07-21 17:27:10 UTC
  • mfrom: (1.1.38 upstream)
  • Revision ID: james.westby@ubuntu.com-20100721172710-7xv07dmdqgivc3t9
Tags: 2.0~bzr1211-0ubuntu1
https://launchpad.net/bugs/597330
https://launchpad.net/bugs/595421
* New major upstream version merge, 2.0 (r1211).
* debian/patches/:
  - 01-wsdl-stubs.patch, debian/wsdl.md5sums: wsdl stubs updated.
  - 02-Makefile.patch: Updated to reflect new code layout.
  - 07-local_support_euca_conf-in.patch: Updated to reflect new code layout.
  - 08-ubuntu-default-networking.patch: Refreshed.
  - 09-small-128-192MB.patch: Updated to point to new location.
  - 10-disable-iscsi.patch: Refreshed.
  - 11-state-cleanup-memleakfix.patch: Removed, fixed upstream.
  - 15-fix-default-ramdisk.patch: Updated to point to new location.
  - 16-kvm_libvirt_xml_default_use_kvm.patch: Updated to reflect changes.
  - 17-fix_walrus_OOM_errors.patch: Removed, fixed upstream.
  - 18-priv_security.patch: Updated to reflect upstream changes.
  - 20-brute-force-webui.patch: Updated to reflect upstream changes. 
  - 21-eucalyptus-1.7-with-gwt-1.6.4.patch: New patch, allows 
    eucalyptus-1.7 to be built against gwt 1.6.4. Based on patch courtesy 
    of Dmitrii Zagorodnov, upstream. (LP: #597330)
* debian/eucalyptus-java-common.links: 
  - Changed symlink for groovy, point to groovy.all.jar, making compatiable 
    with groovy versions >1.7. (LP: #595421)
  - Added ant.jar & jetty-rewrite-handler.jar as they are now required.
* debian/control
  - & debian/build-jars: Added libjavassist-java and libjetty-extra-java as 
    build dependencies.
  - Added libjetty-extra-java as a dependency of eucalyptus-java-common
* The binary resulting jar's have been renamed from eucalyptus-*-1.6.2.jar
  to eucalyptus-*-main.jar:    
  - debian/eucalyptus-cc.upstart
  - debian/eucalyptus-cloud.install
  - debian/eucalyptus-common.eucalyptus.upstart
  - debian/eucalyptus-java-common.install
  - debian/eucalyptus-network.upstart
  - debian/eucalyptus-sc.install
  - debian/eucalyptus-walrus.install
* debian/eucalyptus-java-common.install: New upstream jars that have been
  installed:
  - eucalyptus-db-hsqldb-ext-main.jar
  - eucalyptus-component-main.jar
* debian/control:
  - Updated Standards Version to 3.8.4 (no change)
  - Updated the upstream Homepage to: http://open.eucalyptus.com/
  - Changed Vcs-Bzr to reflect new location of Ubuntu hosted development branch.
  - Made the Build Dependency of groovy and the binary eucalyptus-java-common
    package depend on version >=1.7.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/EucalyptusWebInterface.java
488
488
                }
489
489
                } else {
490
490
                        newUser = false;
491
 
                        oldPassword = userToEdit.getBCryptedPassword();
 
491
                        oldPassword = userToEdit.getPassword();
492
492
            isAdminChecked = userToEdit.isAdministrator();
493
493
            showSkipConfirmed = !userToEdit.isConfirmed();
494
494
            skipConfirmationChecked = userToEdit.isConfirmed();
549
549
        g1.setWidget( i, 0, new Label( "Password:" ) );
550
550
        g1.getCellFormatter().setHorizontalAlignment(i, 0, HasHorizontalAlignment.ALIGN_RIGHT);
551
551
        final PasswordTextBox cleartextPassword1_box = new PasswordTextBox();
552
 
                cleartextPassword1_box.setText (userToEdit.getBCryptedPassword());
 
552
                cleartextPassword1_box.setText (userToEdit.getPassword());
553
553
        cleartextPassword1_box.setWidth ("180");
554
554
                if ( (! admin && ! newUser ) || userToEdit.isAdministrator().booleanValue()) {
555
555
                        cleartextPassword1_box.setEnabled (false);
560
560
        g1.setWidget( i, 0, new Label( "Password, again:" ) );
561
561
        g1.getCellFormatter().setHorizontalAlignment(i, 0, HasHorizontalAlignment.ALIGN_RIGHT);
562
562
        final PasswordTextBox cleartextPassword2_box = new PasswordTextBox();
563
 
                cleartextPassword2_box.setText (userToEdit.getBCryptedPassword());
 
563
                cleartextPassword2_box.setText (userToEdit.getPassword());
564
564
        cleartextPassword2_box.setWidth("180");
565
565
                if ( ( ! admin && ! newUser ) || userToEdit.isAdministrator().booleanValue()) {
566
566
                        cleartextPassword2_box.setEnabled (false);
742
742
                            emailAddress_box.getText(),
743
743
                            encryptedPassword);
744
744
                    if ( admin ) {
745
 
                        userToSave.setIsAdministrator( userIsAdmin.isChecked());
 
745
                        userToSave.setAdministrator( userIsAdmin.isChecked());
746
746
                        if ( showSkipConfirmed ) {
747
747
                            previousSkipConfirmation = skipConfirmation.isChecked(); // remember value for the future
748
 
                            userToSave.setIsConfirmed(previousSkipConfirmation);
 
748
                            userToSave.setConfirmed(previousSkipConfirmation);
749
749
                        }
750
750
                    }
751
751
                    if ( telephoneNumber_box.getText().length() > 0 )
797
797
                                if (loggedInUser.getUserName().equals(userToSave.getUserName())) {
798
798
                                    loggedInUser.setRealName(userToSave.getRealName());
799
799
                                    loggedInUser.setEmail(userToSave.getEmail());
800
 
                                    loggedInUser.setBCryptedPassword(userToSave.getBCryptedPassword());
 
800
                                    loggedInUser.setPassword(userToSave.getPassword());
801
801
                                    loggedInUser.setTelephoneNumber(userToSave.getTelephoneNumber());
802
802
                                    loggedInUser.setAffiliation(userToSave.getAffiliation());
803
803
                                    loggedInUser.setProjectDescription(userToSave.getProjectDescription());
1629
1629
                                        Window.open(GWT.getModuleBaseURL() +
1630
1630
                                                "getX509?user=" + loggedInUser.getUserName() +
1631
1631
                                                "&keyValue=" + loggedInUser.getUserName() +
1632
 
                                                "&code=" + loggedInUser.getCertificateCode(),
 
1632
                                                "&code=" + loggedInUser.getToken(),
1633
1633
                                                "_self", "");
1634
1634
                                }
1635
1635
                });
2214
2214
        parent.add(vpanel);
2215
2215
        int nusers = usersList.size();
2216
2216
        if (nusers>0) {
2217
 
            Hyperlink sort_button = new Hyperlink( sortSymbol, true, null );
 
2217
            Anchor sort_button = new Anchor( sortSymbol, true);
2218
2218
                        sort_button.setStyleName ("euca-small-text");
2219
2219
                        sort_button.addClickListener( new ClickListener() {
2220
2220
                                public void onClick(Widget sender) {
2289
2289
                        }
2290
2290
                        ops.add(act_button);
2291
2291
 
2292
 
                                        Hyperlink del_button = new Hyperlink( "Delete", null );
 
2292
                                        Anchor del_button = new Anchor ( "Delete" );
2293
2293
                                        del_button.setStyleName ("euca-action-link");
2294
2294
                                        del_button.addClickListener( new ClickListener() {
2295
2295
                                                public void onClick(Widget sender) {
2731
2731
                        label_box.setStyleName("euca-greeting-pending");
2732
2732
 
2733
2733
                        loggedInUser.setEmail( emailAddress_box.getText() );
2734
 
                        loggedInUser.setBCryptedPassword(GWTUtils.md5(newCleartextPassword1_box.getText()));
 
2734
                        loggedInUser.setPassword(GWTUtils.md5(newCleartextPassword1_box.getText()));
2735
2735
 
2736
2736
                        EucalyptusWebBackend.App.getInstance().updateUserRecord(
2737
2737
                                        sessionId,