Nabble - MuleForge Dev

[galaxy-dev] [2114] branches/product_cleanup/web/src/main/webapp: More reorg

2009-12-17T15:44:32Z

[2114] branches/product_cleanup/web/src/main/webapp: More reorg

Revision: 2114
Author: dandiep
Date: 2009-12-17 17:44:32 -0600 (Thu, 17 Dec 2009)

Log Message

More reorg

Modified Paths

branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java
branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml
branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml
branches/product_cleanup/web/src/test/java/org/mule/galaxy/web/Main.java

Added Paths

branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/ArtifactTypeForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/ArtifactTypeListPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexDeleteForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexListPanel.java
branches/product_cleanup/web/src/main/webapp/css/
branches/product_cleanup/web/src/main/webapp/css/classic/
branches/product_cleanup/web/src/main/webapp/css/classic/datasourcetest.css
branches/product_cleanup/web/src/main/webapp/css/classic/deploy.css
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/animated_reset.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_form_delete.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_form_edit.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_form_magnify.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_link.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_view_list.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/arrow_right.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/arrow_undo.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/brick.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/brick_delete.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bricks.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bricks_grey.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/browser_galeon.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bug_edit.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bullet_arrow_down.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bullet_go.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/computer.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_eject_blue.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_pause_blue.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_play_blue.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_repeat_blue.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_rewind_blue.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_stop_blue.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/cup_delete.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/cup_go.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/database_key.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/database_lightning.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/database_table.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/emoticon_wink.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/folder_delete.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/folder_explore.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/lightbulb.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/lightning.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/magnifier.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/magnifier_zoom_in.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/magnifier_zoom_out.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/package_green.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/page_white_c.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/page_white_cup.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/page_white_put.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/page_world.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/pill.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/progerssbar_editnplace.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/progressbar_indefinite.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_0.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_1.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_2.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_3.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_4.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_5.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_a.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_a0.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_b.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_b0.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/reset.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/script_code_red.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/script_delete.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/script_gear.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/script_go.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/scroll_arrow_left.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/scroll_arrow_right.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/table_lightning.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/tag_blue.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/transmit_blue.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/transmit_error.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/wrench.gif
branches/product_cleanup/web/src/main/webapp/css/classic/gifs/wrench_orange.gif
branches/product_cleanup/web/src/main/webapp/js/
branches/product_cleanup/web/src/main/webapp/js/Tooltip.js
branches/product_cleanup/web/src/main/webapp/js/areascroller.js
branches/product_cleanup/web/src/main/webapp/js/behaviour.js
branches/product_cleanup/web/src/main/webapp/js/builder.js
branches/product_cleanup/web/src/main/webapp/js/controls.js
branches/product_cleanup/web/src/main/webapp/js/datasourcetest.js
branches/product_cleanup/web/src/main/webapp/js/dragdrop.js
branches/product_cleanup/web/src/main/webapp/js/effects.js
branches/product_cleanup/web/src/main/webapp/js/func.js
branches/product_cleanup/web/src/main/webapp/js/prototype.js
branches/product_cleanup/web/src/main/webapp/js/scriptaculous.js
branches/product_cleanup/web/src/main/webapp/js/slider.js

Diff

Modified: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java (2113 => 2114)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java	2009-12-17 18:20:34 UTC (rev 2113)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java	2009-12-17 23:44:32 UTC (rev 2114)
@@ -57,6 +57,7 @@
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.rpc.ServiceDefTarget;
@@ -71,6 +72,7 @@
  */
 public class Galaxy {
 
+    private String firstPage = "browse";
     private SecurityServiceAsync securityService;
     private HeartbeatServiceAsync heartbeatService;
     private AdminServiceAsync adminService;
@@ -165,11 +167,13 @@
         
         plugins = appInfo.getPluginTabs();
         userManagementSupported = appInfo.isUserManagementSupported();
-        loadTabs(Galaxy.this);
+        adminPanel = createAdministrationPanel();
         
         for (GalaxyModule module : modules) {
             module.initialize(Galaxy.this);
         }
+        
+        loadTabs(Galaxy.this);
         showFirstPage();
     }
     
@@ -289,7 +293,6 @@
     protected void loadAdminTab() {
         if (showAdminTab(user)) {
             adminTabIndex = pageManager.createTab("Administration", "admin", administrationConstants.admin_TabTip());
-            adminPanel = createAdministrationPanel();
             pageManager.createPageInfo("admin", adminPanel, adminTabIndex);
         }
     }
@@ -325,6 +328,9 @@
     }
 
     protected void showFirstPage() {
+        ///Remove the loading message
+        DOM.setInnerHTML(RootPanel.get("loading-msg").getElement(), "");
+        
         // Show the initial screen.
         String initToken = History.getToken();
         if (initToken.length() > 0) {
@@ -335,8 +341,8 @@
     }
 
     
-    private String getFirstPage() {
-        return "admin";
+    protected String getFirstPage() {
+        return firstPage;
     }
 
     /**
@@ -419,4 +425,8 @@
     public void setMessageAndGoto(String successToken, String successMessage) {
         pageManager.setMessageAndGoto(successToken, successMessage);
     }
+
+    public void setFirstPage(String firstPage) {
+        this.firstPage = firstPage;
+    }
 }
\ No newline at end of file

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java (2113 => 2114)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java	2009-12-17 18:20:34 UTC (rev 2113)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java	2009-12-17 23:44:32 UTC (rev 2114)
@@ -21,17 +21,20 @@
 import com.google.gwt.user.client.rpc.ServiceDefTarget;
 
 public class RepositoryModule implements GalaxyModule {
-    private Galaxy galaxy;
+    protected Galaxy galaxy;
     private PropertyInterfaceManager propertyInterfaceManager = new PropertyInterfaceManager();
-    private RepositoryConstants repositoryConstants;
+    protected RepositoryConstants repositoryConstants;
     private RegistryServiceAsync registryService;
     private int repositoryTabIndex = 0;
     private boolean showTypeSystem = true;
     
     public void initialize(Galaxy galaxy) {
         this.galaxy = galaxy;
-        this.repositoryConstants = (RepositoryConstants) GWT.create(RepositoryConstants.class);
-
+        
+        if (repositoryConstants == null) {
+            this.repositoryConstants = (RepositoryConstants) GWT.create(RepositoryConstants.class);
+        }
+        
         createService();
         loadRepositoryTab();
         addAdministrationMenuItems();

Added: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/ArtifactTypeForm.java (0 => 2114)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/ArtifactTypeForm.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/ArtifactTypeForm.java	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,111 @@
+package org.mule.galaxy.repository.client.admin;
+
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WArtifactType;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationForm;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
+import org.mule.galaxy.web.client.util.QNameListBox;
+import org.mule.galaxy.web.client.util.StringListBox;
+
+import com.extjs.gxt.ui.client.event.Listener;
+import com.extjs.gxt.ui.client.event.MessageBoxEvent;
+import com.extjs.gxt.ui.client.widget.Dialog;
+import com.extjs.gxt.ui.client.widget.MessageBox;
+import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.TextBox;
+
+public class ArtifactTypeForm extends AbstractAdministrationForm {
+
+    private WArtifactType artifactType;
+    private TextBox descriptionTB;
+    private QNameListBox docTypesLB;
+    private TextBox mediaTypeTB;
+    private StringListBox extsLB;
+    private final RegistryServiceAsync registryService;
+
+    public ArtifactTypeForm(AdministrationPanel adminPanel, RegistryServiceAsync registryService) {
+        super(adminPanel,
+                "artifact-types",
+                "Artifact type was saved.",
+                "Artifact type was deleted.", null);
+        this.registryService = registryService;
+    }
+
+    protected void addFields(FlexTable table) {
+        table.setText(0, 0, "Description:");
+        table.setText(1, 0, "Media Type:");
+        table.setText(2, 0, "Document Types:");
+        table.setText(3, 0, "File Extensions:");
+
+        descriptionTB = new TextBox();
+        descriptionTB.setText(artifactType.getDescription());
+        table.setWidget(0, 1, descriptionTB);
+
+        mediaTypeTB = new TextBox();
+        mediaTypeTB.setText(artifactType.getMediaType());
+        table.setWidget(1, 1, mediaTypeTB);
+
+        docTypesLB = new QNameListBox(artifactType.getDocumentTypes());
+        table.setWidget(2, 1, docTypesLB);
+
+        extsLB = new StringListBox(artifactType.getFileExtensions());
+        table.setWidget(3, 1, extsLB);
+
+        styleHeaderColumn(table);
+    }
+
+    public String getTitle() {
+        if (newItem) {
+            return "Add Artifact Type";
+        } else {
+            return "Edit Artifact Type";
+        }
+    }
+
+    protected void fetchItem(String id) {
+        registryService.getArtifactType(id, getFetchCallback());
+    }
+
+    protected void initializeItem(Object o) {
+        this.artifactType = (WArtifactType) o;
+    }
+
+    protected void initializeNewItem() {
+        this.artifactType = new WArtifactType();
+    }
+
+    protected void save() {
+        super.save();
+
+        artifactType.setMediaType(mediaTypeTB.getText());
+        artifactType.setDocumentTypes(docTypesLB.getItems());
+        artifactType.setDescription(descriptionTB.getText());
+        artifactType.setFileExtensions(extsLB.getItems());
+
+        registryService.saveArtifactType(artifactType, getSaveCallback());
+    }
+
+    protected void delete() {
+
+        final Listener<MessageBoxEvent> l = new Listener<MessageBoxEvent>() {
+            public void handleEvent(MessageBoxEvent ce) {
+                com.extjs.gxt.ui.client.widget.button.Button btn = ce.getButtonClicked();
+
+                if (Dialog.YES.equals(btn.getItemId())) {
+                    ArtifactTypeForm.super.delete();
+                    registryService.deleteArtifactType(artifactType.getId(), getDeleteCallback());
+                }
+            }
+        };
+
+        MessageBox.confirm("Confirm", "Are you sure you want to delete artifact type " + artifactType.getDescription() + "?", l);
+    }
+
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+
+        docTypesLB.setEnabled(enabled);
+    }
+
+
+}
Property changes on: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/ArtifactTypeForm.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/ArtifactTypeListPanel.java (0 => 2114)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/ArtifactTypeListPanel.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/ArtifactTypeListPanel.java	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,144 @@
+package org.mule.galaxy.repository.client.admin;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WArtifactType;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationComposite;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
+import org.mule.galaxy.web.client.util.FauxLinkRenderer;
+import org.mule.galaxy.web.client.util.ListCellRenderer;
+import org.mule.galaxy.web.rpc.AbstractCallback;
+
+import com.extjs.gxt.ui.client.data.BeanModel;
+import com.extjs.gxt.ui.client.data.BeanModelFactory;
+import com.extjs.gxt.ui.client.data.BeanModelLookup;
+import com.extjs.gxt.ui.client.event.BaseEvent;
+import com.extjs.gxt.ui.client.event.Events;
+import com.extjs.gxt.ui.client.event.GridEvent;
+import com.extjs.gxt.ui.client.event.Listener;
+import com.extjs.gxt.ui.client.store.ListStore;
+import com.extjs.gxt.ui.client.store.Store;
+import com.extjs.gxt.ui.client.widget.ContentPanel;
+import com.extjs.gxt.ui.client.widget.form.StoreFilterField;
+import com.extjs.gxt.ui.client.widget.grid.ColumnConfig;
+import com.extjs.gxt.ui.client.widget.grid.ColumnModel;
+import com.extjs.gxt.ui.client.widget.grid.Grid;
+import com.extjs.gxt.ui.client.widget.grid.RowNumberer;
+import com.extjs.gxt.ui.client.widget.toolbar.FillToolItem;
+import com.extjs.gxt.ui.client.widget.toolbar.ToolBar;
+import com.google.gwt.user.client.History;
+
+public class ArtifactTypeListPanel extends AbstractAdministrationComposite {
+
+    private final RegistryServiceAsync registryService;
+
+    public ArtifactTypeListPanel(AdministrationPanel a, RegistryServiceAsync registryService) {
+        super(a);
+        this.registryService = registryService;
+    }
+
+    @Override
+    public void doShowPage() {
+        super.doShowPage();
+
+        registryService.getArtifactTypes(new AbstractCallback<Collection<WArtifactType>>(adminPanel) {
+
+            public void onSuccess(Collection<WArtifactType> artifactTypes) {
+                showArtifactTypes(artifactTypes);
+            }
+
+        });
+
+    }
+
+    protected void showArtifactTypes(Collection<WArtifactType> artifactTypes) {
+        ContentPanel cp = new ContentPanel();
+        cp.setHeading("Artifact Types");
+        cp.setBodyBorder(false);
+        cp.setStyleName("x-panel-container-full");
+        cp.setAutoWidth(true);
+
+        BeanModelFactory factory = BeanModelLookup.get().getFactory(WArtifactType.class);
+
+        List<BeanModel> list = factory.createModel(artifactTypes);
+        final ListStore<BeanModel> store = new ListStore<BeanModel>();
+        store.add(list);
+
+        RowNumberer r = new RowNumberer();
+        List<ColumnConfig> columns = new ArrayList<ColumnConfig>();
+        columns.add(r);
+
+        ColumnConfig dConfig = new ColumnConfig("description", "Description", 200);
+        dConfig.setRenderer(new FauxLinkRenderer());
+        columns.add(dConfig);
+
+        columns.add(new ColumnConfig("mediaType", "Media Types", 200));
+
+        ColumnConfig docConfig = new ColumnConfig("documentTypes", "Document Type", 300);
+        docConfig.setRenderer(new ListCellRenderer(true));
+        columns.add(docConfig);
+
+        ColumnModel cm = new ColumnModel(columns);
+
+        Grid grid = new Grid<BeanModel>(store, cm);
+        grid.addPlugin(r);
+        grid.setAutoWidth(true);
+        grid.setAutoExpandColumn("documentTypes");
+        grid.addListener(Events.CellClick, new Listener<BaseEvent>() {
+            public void handleEvent(BaseEvent be) {
+                GridEvent ge = (GridEvent) be;
+                WArtifactType s = store.getAt(ge.getRowIndex()).getBean();
+
+                History.newItem("artifact-types/" + s.getId());
+            }
+        });
+
+        cp.add(grid);
+
+        // search filter
+        StoreFilterField<BeanModel> filter = new StoreFilterField<BeanModel>() {
+            @Override
+            protected boolean doSelect(Store<BeanModel> store, BeanModel parent,
+                                       BeanModel record, String property, String filter) {
+
+                String description = record.get("description");
+                description = description.toLowerCase();
+
+                String mediaType = record.get("mediaType");
+                mediaType = mediaType.toLowerCase();
+
+                ArrayList dt = record.get("documentTypes");
+                String documentTypes = dt.toString();
+                documentTypes = documentTypes.toLowerCase();
+
+
+                if (description.indexOf(filter.toLowerCase()) != -1 ||
+                        mediaType.indexOf(filter.toLowerCase()) != -1 ||
+                        documentTypes.indexOf(filter.toLowerCase()) != -1) {
+                    return true;
+                }
+                return false;
+            }
+        };
+
+        filter.setName("Search");
+        filter.setFieldLabel("Search");
+        filter.setWidth(300);
+        filter.setTriggerStyle("x-form-search-trigger");
+        filter.setStyleName("x-form-search-field");
+        // Bind the filter field to your grid store (grid.getStore())
+        filter.bind(store);
+
+        ToolBar toolbar = new ToolBar();
+        toolbar.add(filter);
+        toolbar.add(new FillToolItem());
+        toolbar.add(createToolbarHistoryButton("New", "artifact-types/new"));
+        cp.setTopComponent(toolbar);
+
+        panel.add(cp);
+
+    }
+}
Property changes on: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/ArtifactTypeListPanel.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexDeleteForm.java (0 => 2114)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexDeleteForm.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexDeleteForm.java	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,102 @@
+package org.mule.galaxy.repository.client.admin;
+
+import java.util.List;
+
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WIndex;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationComposite;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
+import org.mule.galaxy.web.client.util.ConfirmDialog;
+import org.mule.galaxy.web.client.util.ConfirmDialogAdapter;
+import org.mule.galaxy.web.client.util.LightBox;
+import org.mule.galaxy.web.rpc.AbstractCallback;
+
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.RadioButton;
+import com.google.gwt.user.client.ui.VerticalPanel;
+
+public class IndexDeleteForm extends AbstractAdministrationComposite {
+
+    private RadioButton yesButton;
+    private RadioButton noButton;
+    private final RegistryServiceAsync registryService;
+
+    public IndexDeleteForm(AdministrationPanel a, RegistryServiceAsync registryService) {
+        super(a);
+        this.registryService = registryService;
+    }
+
+    @Override
+    public void showPage(List params) {
+        String indexId = (String) params.get(0);
+        
+        registryService.getIndex(indexId, new AbstractCallback(adminPanel) {
+
+            public void onSuccess(Object index) {
+                showIndex((WIndex) index);
+            }
+            
+        });
+    }
+
+    protected void showIndex(final WIndex index) {
+        panel.clear();
+        panel.add(createPrimaryTitle("Delete Index '" + index.getDescription() + "'"));
+        
+        VerticalPanel vertical = new VerticalPanel();
+        vertical.setStyleName("deleteIndexPanel");
+        
+        vertical.add(new Label("Would you like to delete the properties on artifacts that are "
+                               + "associated with this index?"));
+           
+        yesButton = new RadioButton("deleteIndex", "Yes");
+        vertical.add(yesButton);
+        
+        noButton = new RadioButton("deleteIndex", "No");
+        vertical.add(noButton);
+        
+        Button deleteButton = new Button("Delete");
+        deleteButton.addClickHandler(new ClickHandler() {
+
+            public void onClick(ClickEvent w) {
+                delete(index);
+            }
+            
+        });
+        vertical.add(deleteButton);
+        
+        panel.add(vertical);
+    }
+
+    protected void delete(final WIndex index) {
+        adminPanel.clearErrorMessage();
+        
+        if (!yesButton.getValue() && !noButton.getValue()) {
+            adminPanel.setMessage("You must select either yes or no.");
+            return;
+        }
+        
+        final ConfirmDialog dialog = new ConfirmDialog(new ConfirmDialogAdapter() {
+            public void onConfirm() {
+                registryService.deleteIndex(index.getId(), yesButton.getValue(), getDeleteCallback());
+            }
+        }, "Are you sure you want to delete Index " + index.getDescription() + "?");
+        new LightBox(dialog).show();
+    }
+
+
+    protected AsyncCallback getDeleteCallback() {
+        return new AbstractCallback(adminPanel) {
+
+            public void onSuccess(Object arg0) {
+                adminPanel.getGalaxy().setMessageAndGoto("indexes", "Index was deleted.");
+            }
+            
+        };
+    }
+
+}
Property changes on: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexDeleteForm.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexForm.java (0 => 2114)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexForm.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexForm.java	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,220 @@
+package org.mule.galaxy.repository.client.admin;
+
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WIndex;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationForm;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
+import org.mule.galaxy.web.client.util.QNameListBox;
+
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
+import com.google.gwt.user.client.History;
+import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.ListBox;
+import com.google.gwt.user.client.ui.TextArea;
+import com.google.gwt.user.client.ui.TextBox;
+
+public class IndexForm extends AbstractAdministrationForm {
+
+    private WIndex index;
+    private TextBox mediaTypeTB;
+    private TextArea xqueryExpressionTA;
+    private TextBox propertyTB;
+    private ListBox languageList;
+    private TextBox xpathExpressionTB;
+    private ListBox resultTypeLB;
+    private QNameListBox docTypesLB;
+    private TextBox descriptionTB;
+    private RegistryServiceAsync registryService;
+
+    public IndexForm(AdministrationPanel adminPanel, RegistryServiceAsync registryService) {
+        super(adminPanel, "indexes", "Index was saved.", "Index was deleted.", null);
+        this.registryService = registryService;
+    }
+    
+    protected void addFields(final FlexTable table) {
+        table.setText(0, 0, "Description:");
+        table.setText(1, 0, "Result Type:");
+        table.setText(2, 0, "Media Type:");
+        table.setText(3, 0, "Document Types:");
+        table.setText(4, 0, "Language:");
+        
+        descriptionTB = new TextBox();
+        descriptionTB.setText(index.getDescription());
+        table.setWidget(0, 1, descriptionTB);
+        
+        resultTypeLB = new ListBox();
+        resultTypeLB.addItem("String");
+        resultTypeLB.addItem("QName");
+        table.setWidget(1, 1, resultTypeLB);
+        
+        if (index.getResultType() == null || index.getResultType().equals("String")) {
+            resultTypeLB.setSelectedIndex(0);
+        } else {
+            resultTypeLB.setSelectedIndex(1);
+        }
+        
+        mediaTypeTB = new TextBox();
+        mediaTypeTB.setText(index.getMediaType());
+        table.setWidget(2, 1, mediaTypeTB);
+        
+        docTypesLB = new QNameListBox(index.getDocumentTypes());
+
+        table.setWidget(3, 1, docTypesLB);
+        
+        languageList = new ListBox();
+        languageList.addItem("XPath");
+        languageList.addItem("XQuery");
+//        languageList.addItem("Groovy");
+
+        String indexer = index.getIndexer();
+        if (indexer == null || indexer.equalsIgnoreCase("XPath")) {
+            setupXPath(table);
+        } else if (indexer.equalsIgnoreCase("Groovy")) {
+            setupGroovy(table);
+        }  else {
+            setupXQuery(table);
+        }
+        
+        languageList.addChangeHandler(new ChangeHandler() {
+
+            public void onChange(ChangeEvent sender) {
+                String value = languageList.getValue(languageList.getSelectedIndex());
+                
+                if (value.equalsIgnoreCase("XPath")) {
+                    setupXPath(table);
+                } else if (value.equalsIgnoreCase("Groovy")) {
+                    setupGroovy(table);
+                }  else {
+                    setupXQuery(table);
+                }
+            }
+            
+        });
+        
+        table.setWidget(4, 1, languageList);
+
+        styleHeaderColumn(table);
+    }
+
+
+    protected void fetchItem(String id) {
+        registryService.getIndex(id, getFetchCallback());
+    }
+
+    public String getTitle() {
+        if (newItem) {
+            return "Add Index";
+        } else {
+            return "Edit Index: " + index.getDescription();
+        }
+    }
+
+    protected void initializeItem(Object o) {
+        this.index = (WIndex) o;
+    }
+
+    protected void initializeNewItem() {
+        this.index = new WIndex();
+    }
+
+    protected void setupXQuery(FlexTable table) {
+        clearConfiguration(table);
+        
+        propertyTB = new TextBox();
+        propertyTB.setText(index.getProperty());
+        table.setText(5, 0, "Property Name:");
+        table.setWidget(5, 1, propertyTB);
+        
+        xqueryExpressionTA = new TextArea();
+        xqueryExpressionTA.setVisibleLines(15);
+        xqueryExpressionTA.setCharacterWidth(80);
+        
+        languageList.setSelectedIndex(1);
+        xqueryExpressionTA.setText(index.getExpression());
+        table.setText(6, 0, "XQuery Expression:");
+        table.setWidget(6, 1, xqueryExpressionTA);
+    }
+
+    private void clearConfiguration(FlexTable table) {
+        for (int i = 5; i < table.getRowCount(); i++) {
+            table.removeRow(i);
+        }
+    }
+
+    protected void setupGroovy(FlexTable table) {
+        TextArea groovyExpressionTA = new TextArea();
+        groovyExpressionTA.setVisibleLines(15);
+        groovyExpressionTA.setCharacterWidth(80);
+        xqueryExpressionTA.setText(index.getExpression());
+        table.setText(5, 0, "Groovy Script:");
+        table.setWidget(5, 1, xqueryExpressionTA);
+    }
+
+    protected void setupXPath(FlexTable table) {
+        propertyTB = new TextBox();
+        propertyTB.setText(index.getProperty());
+        table.setText(5, 0, "Property Name:");
+        table.setWidget(5, 1, propertyTB);
+
+        xpathExpressionTB = new TextBox();
+        xpathExpressionTB.setVisibleLength(80);
+        
+        languageList.setSelectedIndex(0);
+        xpathExpressionTB.setText(index.getExpression());
+        table.setText(6, 0, "XPath Expression:");
+        table.setWidget(6, 1, xpathExpressionTB);
+    }
+
+    protected void save() {
+        super.save();
+        
+        RegistryServiceAsync svc = registryService;
+        
+        index.setProperty(propertyTB.getText());
+        index.setMediaType(mediaTypeTB.getText());
+        index.setDescription(descriptionTB.getText());
+        index.setResultType(resultTypeLB.getValue(resultTypeLB.getSelectedIndex()));
+        
+        String language = languageList.getValue(languageList.getSelectedIndex()).toLowerCase();
+        index.setIndexer(language);
+        if ("xpath".equals(language)) {
+            index.setExpression(xpathExpressionTB.getText());
+        } else {
+            index.setExpression(xqueryExpressionTA.getText());
+        }
+        // TODO Groovy index
+        
+        
+        index.setDocumentTypes(docTypesLB.getItems());
+        
+        // validation
+        
+        if (!assertValid(index.getProperty(), "property name")) return;
+        
+        if (index.getProperty().indexOf(' ') != -1) {
+            adminPanel.setMessage("The index property name cannot contain spaces.");
+            setEnabled(true);
+            return;
+        }
+
+        if (!assertValid(index.getDescription(), "name")) return;
+        if (!assertValid(index.getExpression(), "expression")) return;
+
+        svc.saveIndex(index, getSaveCallback());
+    }
+
+    private boolean assertValid(String value, String name) {
+        if (value == null || value.equals("") ) {
+            adminPanel.setMessage("You must supply an index " + name + " .");
+            setEnabled(true);
+            return false;
+        }
+        return true;
+    }
+
+    protected void delete() {
+        History.newItem("index-delete_" + index.getId());
+    }
+
+}
Property changes on: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexForm.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexListPanel.java (0 => 2114)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexListPanel.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexListPanel.java	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,164 @@
+package org.mule.galaxy.repository.client.admin;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WIndex;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationComposite;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
+import org.mule.galaxy.web.client.util.FauxLinkRenderer;
+import org.mule.galaxy.web.rpc.AbstractCallback;
+
+import com.extjs.gxt.ui.client.data.BeanModel;
+import com.extjs.gxt.ui.client.data.BeanModelFactory;
+import com.extjs.gxt.ui.client.data.BeanModelLookup;
+import com.extjs.gxt.ui.client.data.ModelData;
+import com.extjs.gxt.ui.client.event.BaseEvent;
+import com.extjs.gxt.ui.client.event.Events;
+import com.extjs.gxt.ui.client.event.GridEvent;
+import com.extjs.gxt.ui.client.event.Listener;
+import com.extjs.gxt.ui.client.store.ListStore;
+import com.extjs.gxt.ui.client.store.Store;
+import com.extjs.gxt.ui.client.widget.ContentPanel;
+import com.extjs.gxt.ui.client.widget.form.StoreFilterField;
+import com.extjs.gxt.ui.client.widget.grid.ColumnConfig;
+import com.extjs.gxt.ui.client.widget.grid.ColumnData;
+import com.extjs.gxt.ui.client.widget.grid.ColumnModel;
+import com.extjs.gxt.ui.client.widget.grid.Grid;
+import com.extjs.gxt.ui.client.widget.grid.GridCellRenderer;
+import com.extjs.gxt.ui.client.widget.grid.RowNumberer;
+import com.extjs.gxt.ui.client.widget.toolbar.FillToolItem;
+import com.extjs.gxt.ui.client.widget.toolbar.ToolBar;
+import com.google.gwt.user.client.History;
+
+public class IndexListPanel extends AbstractAdministrationComposite {
+
+    private final RegistryServiceAsync registryService;
+
+    public IndexListPanel(AdministrationPanel a, RegistryServiceAsync registryService) {
+        super(a);
+        this.registryService = registryService;
+    }
+
+    @Override
+    public void doShowPage() {
+        super.doShowPage();
+
+        registryService.getIndexes(new AbstractCallback<Collection<WIndex>>(adminPanel) {
+
+            public void onSuccess(Collection<WIndex> indexes) {
+                showIndexes(indexes);
+            }
+
+        });
+
+    }
+
+    private void showIndexes(Collection<WIndex> indexes) {
+
+        ContentPanel cp = new ContentPanel();
+        cp.setHeading("Indexes");
+        cp.setBodyBorder(false);
+        cp.setStyleName("x-panel-container-full");
+        cp.setAutoWidth(true);
+
+        BeanModelFactory factory = BeanModelLookup.get().getFactory(WIndex.class);
+
+        List<BeanModel> list = factory.createModel(indexes);
+        final ListStore<BeanModel> store = new ListStore<BeanModel>();
+        store.add(list);
+
+        RowNumberer r = new RowNumberer();
+        List<ColumnConfig> columns = new ArrayList<ColumnConfig>();
+        columns.add(r);
+
+        ColumnConfig dConfig = new ColumnConfig("description", "Index", 300);
+        dConfig.setRenderer(new FauxLinkRenderer());
+        columns.add(dConfig);
+
+        ColumnConfig typeConfig = new ColumnConfig("indexer", "Language", 300);
+        typeConfig.setRenderer(new GridCellRenderer<ModelData>() {
+            public Object render(ModelData model, String property, ColumnData config, int rowIndex, int colIndex, ListStore<ModelData> modelDataListStore, Grid<ModelData> modelDataGrid) {
+                String val = model.get(property);
+                if ("xpath".equalsIgnoreCase(val)) {
+                    return "XPath";
+                } else if ("xquery".equalsIgnoreCase(val)) {
+                    return "XQuery";
+
+                } else if ("groovy".equalsIgnoreCase(val)) {
+                    return "Groovy";
+                }
+                return val;
+            }
+        });
+        columns.add(typeConfig);
+        columns.add(new ColumnConfig("resultType", "Query Type", 100));
+
+        ColumnModel cm = new ColumnModel(columns);
+
+        Grid grid = new Grid<BeanModel>(store, cm);
+        grid.setStripeRows(true);
+        grid.addPlugin(r);
+        grid.setAutoWidth(true);
+        grid.addListener(Events.CellClick, new Listener<BaseEvent>() {
+            public void handleEvent(BaseEvent be) {
+                GridEvent ge = (GridEvent) be;
+                WIndex s = store.getAt(ge.getRowIndex()).getBean();
+
+                // don't link on this type
+                if (!("org.mule.galaxy.impl.index.GroovyIndexer".equalsIgnoreCase(s.getIndexer()))) {
+                    History.newItem("indexes/" + s.getId());
+                }
+            }
+        });
+
+        cp.add(grid);
+
+        // search filter
+        StoreFilterField<BeanModel> filter = new StoreFilterField<BeanModel>() {
+            @Override
+            protected boolean doSelect(Store<BeanModel> store, BeanModel parent,
+                                       BeanModel record, String property, String filter) {
+
+                String description = record.get("description");
+                description = description.toLowerCase();
+
+                String resultType = record.get("resultType");
+                resultType = resultType.toLowerCase();
+
+                String indexer = record.get("indexer");
+                indexer = indexer.toLowerCase();
+
+                if (description.indexOf(filter.toLowerCase()) != -1 ||
+                        resultType.indexOf(filter.toLowerCase()) != -1 ||
+                        indexer.indexOf(filter.toLowerCase()) != -1) {
+                    return true;
+                }
+                return false;
+            }
+        };
+
+        filter.setName("Search");
+        filter.setFieldLabel("Search");
+        filter.setWidth(300);
+        filter.setTriggerStyle("x-form-search-trigger");
+        filter.setStyleName("x-form-search-field");
+        // Bind the filter field to your grid store (grid.getStore())
+        filter.bind(store);
+
+        ToolBar toolbar = new ToolBar();
+        toolbar.add(filter);
+        toolbar.add(new FillToolItem());
+        toolbar.add(createToolbarHistoryButton("New", "indexes/new"));
+        cp.setTopComponent(toolbar);
+
+        panel.add(cp);
+
+    }
+
+}
+
+
+
Property changes on: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/IndexListPanel.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml (2113 => 2114)

--- branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml	2009-12-17 18:20:34 UTC (rev 2113)
+++ branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml	2009-12-17 23:44:32 UTC (rev 2114)
@@ -8,22 +8,7 @@
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
     http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
     http://abdera.apache.org http://abdera.apache.org/schemas/abdera-spring.xsd">
-    
 
-    <bean id="coreGwtModule" class="org.mule.galaxy.web.GwtModule">
-      <property name="core" value="true"/>
-      <property name="name" value="org.mule.galaxy.repository.Repository"/>
-      <property name="rpcServices">
-        <map>
-          <entry key="/galaxyService.rpc" value-ref="galaxyService" />
-          <entry key="/securityService.rpc" value-ref="gwtSecurityService" />
-          <entry key="/heartbeat.rpc" value-ref="heartbeatService"/>
-          <entry key="/admin.rpc" value-ref="adminService"/>
-          <entry key="/registry.rpc" value-ref="gwtRegistry" />
-        </map>
-      </property>
-    </bean>
-    
     <bean id="gwtRegistry" class="org.mule.galaxy.repository.RegistryServiceImpl">
       <property name="registry" ref="registry"/>
       <property name="artifactTypeDao" ref="artifactTypeDao"/>

Modified: branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml (2113 => 2114)

--- branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml	2009-12-17 18:20:34 UTC (rev 2113)
+++ branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml	2009-12-17 23:44:32 UTC (rev 2114)
@@ -23,6 +23,7 @@
           <entry key="/securityService.rpc" value-ref="gwtSecurityService" />
           <entry key="/heartbeat.rpc" value-ref="heartbeatService"/>
           <entry key="/admin.rpc" value-ref="adminService"/>
+          <entry key="/registry.rpc" value-ref="gwtRegistry" />
         </map>
       </property>
     </bean>

Added: branches/product_cleanup/web/src/main/webapp/css/classic/datasourcetest.css (0 => 2114)

--- branches/product_cleanup/web/src/main/webapp/css/classic/datasourcetest.css	                        (rev 0)
+++ branches/product_cleanup/web/src/main/webapp/css/classic/datasourcetest.css	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,279 @@
+div.dataSourceTestMenu, div.dataSourceTestContent {
+    clear: both;
+}
+
+li#connect {
+    float: left;
+    background: url( "gifs/database_key.gif" ) top left no-repeat;
+}
+
+li#executeSql {
+    float: left;
+    background: url( "gifs/database_lightning.gif" ) top left no-repeat;
+}
+
+li#showHistory {
+    float: left;
+    background: url( "gifs/script_go.gif" ) top left no-repeat;
+}
+
+li#hideHistory {
+    float: left;
+    background: url( "gifs/script_delete.gif" ) top left no-repeat;
+}
+
+li#showOptions {
+    float: left;
+    background: url( "gifs/application_form_edit.gif" ) top left no-repeat;
+}
+
+li#hideOptions {
+    float: left;
+    background: url( "gifs/application_form_delete.gif" ) top left no-repeat;
+}
+
+li#wrap {
+    float: right;
+    padding-top: 10px;
+    background: url( "gifs/arrow_undo.gif" ) center left no-repeat;
+}
+
+li#nowrap {
+    float: right;
+    padding-top: 10px;
+    background: url( "gifs/arrow_right.gif" ) center left no-repeat;
+}
+
+#sqlForm {
+    margin: 0;
+    padding: 0;
+}
+
+#sql {
+    font-family: 'Lucida Sans Typewriter', 'Courier New', monospace;
+    font-size: 100%;
+    width: 99%;
+    border: none;
+    overflow: auto;
+    margin: 0;
+    padding: 2px 0px 2px 5px;
+    height: 100px;
+    background-color: #fff;
+}
+
+div#sqlDragHandle {
+    background: #ddd;
+    cursor: n-resize;
+    height: 3px;
+    margin-top: 0px; /* for IE */
+    font-size: 0px;
+    line-height: 0px;
+}
+
+div#sqlDragHandle:hover {
+    background: #000;
+}
+
+h3 {
+    float: left;
+    height: 2em;
+    margin: 0;
+    padding: 10px 0 5px 2px;
+}
+
+div#outputHolder {
+    padding: 0;
+    margin: 0;
+}
+
+#sqlResultsWrapper {
+    clear: both;
+}
+
+#sqlResultsContainer {
+    margin: 0;
+    padding: 0;
+    width: 99%;
+    overflow: hidden;
+}
+
+#rowsAffected {
+    margin: 0 0 5px 0;
+    padding: 0;
+    float: left;
+    color: #4f6b72;
+    text-align: left;
+}
+
+#sqlResultTbl {
+    border-left: 1px solid #C1DAD7;
+    padding: 0;
+    margin: 0;
+    clear: both;
+}
+
+#sqlResultTbl td {
+    white-space: nowrap;
+}
+
+#pagebanner {
+    color: #4f6b72;
+    float: left;
+    padding: 0 0 0 5px;
+    margin: 0;
+}
+
+#pagelinks {
+    color: #4f6b72;
+    float: left;
+    padding: 0 0 0 5px;
+    margin: 0;
+}
+
+#pagelinks a:link, #pagelinks a:visited {
+    color: #40659B;
+    border-bottom: 1px none;
+}
+
+#pagelinks td a:hover, #pagelinks td:hover a {
+    color: #003366;
+    border-bottom: 1px dashed #bbb;
+}
+
+.ajax_activity {
+    float: right;
+    width: 50%;
+    height: 2em;
+    padding: 0px 20px 5px 20px;
+    margin: 0;
+    background-position: left center;
+    font-size: 95%;
+}
+
+#rs_rowsAffected, #rs_pagebanner, #rs_pagelinks {
+    display: none;
+}
+
+#queryHistoryContainer {
+    margin: 5px 0 0 0;
+    clear: both;
+    width: 100%;
+}
+
+#queryHistoryBorder {
+    margin: 0;
+    padding: 0;
+    border: 1px solid #ccc;
+    clear: both;
+}
+
+#queryHistoryHolder {
+    margin: 0;
+    padding: 0;
+    clear: both;
+    overflow: auto;
+    width: 100%;
+}
+
+#queryHistoryHolder ul {
+    margin: 5px 5px 5px 5px;
+    padding: 0;
+    list-style: none;
+    /*overflow: hidden;*/
+    width: 99%;
+}
+
+#queryHistoryHolder ul li {
+    padding: 0;
+    margin: 5px 0;
+}
+
+#queryHistoryHolder ul a {
+    display: block;
+}
+
+#queryHistoryHolder ul a:link, #queryHistoryHolder ul a:visited {
+    color: #40659B;
+    text-decoration: none;
+    padding-left: 10px;
+    padding-right: 10px;
+    border: 1px solid #fff;
+}
+
+#queryHistoryHolder ul a:hover, #queryHistoryHolder ul a:hover a {
+    background-color: #F0F8FF;
+    color: #000;
+    border: 1px solid #ccc;
+}
+
+#historyEmpty {
+    margin: 5px 5px 5px 10px;;
+    padding: 0;
+}
+
+div#historyDragHandle {
+    background: #ddd;
+    cursor: n-resize;
+    height: 3px;
+    margin-top: 0px; /* for IE */
+    font-size: 0px;
+    line-height: 0px;
+}
+
+div#historyDragHandle:hover {
+    background: #000;
+}
+
+.txtInput {
+    border: 1px solid #ccc;
+    padding: 0 0 0 3px;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+}
+
+dl#optionsDL {
+    clear: both;
+    padding: 10px 0 0 0;
+    margin: 0;
+    list-style: none;
+}
+
+dl#optionsDL dt {
+    margin: 0;
+    padding: 0 5px 0 0;
+    float: left;
+}
+
+dl#optionsDL dd {
+    margin: 0;
+    padding: 0 10px 0 0;
+    float: left;
+}
+
+dl#sqlDL {
+    clear: both;
+    padding: 0;
+    margin: 0;
+    list-style: none;
+}
+
+dl#sqlDL dt {
+    margin: 0;
+    padding: 0;
+}
+
+dl#sqlDL dd {
+    margin: 0;
+    padding: 0;
+}
+
+#sqlContainer {
+    border: 1px solid #ccc;
+}
+
+#h3Container {
+    clear: both;
+}
+
+#sqlResultsHeader {
+    clear: both;
+}
Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/datasourcetest.css
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native

Added: branches/product_cleanup/web/src/main/webapp/css/classic/deploy.css (0 => 2114)

--- branches/product_cleanup/web/src/main/webapp/css/classic/deploy.css	                        (rev 0)
+++ branches/product_cleanup/web/src/main/webapp/css/classic/deploy.css	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,56 @@
+div.deploy {
+    padding: 10px 10px 10px 10px;
+    margin: 0 0 10 0;
+    border: 1px solid #ccc;
+    vertical-align: middle;
+    min-width: 700px;
+}
+
+div.deploy div.deployDescription {
+    padding: 5px 50px 15px 0px;
+}
+
+div.deploy .deployLabel {
+    border: 1px dashed white;
+    padding: 0px 5px 0px 5px;
+    background: darkorange;
+    color: white;
+    font-weight: bold;
+
+}
+
+div.deploy .submit {
+    text-align: right;
+    padding-top: 15px;
+    padding-right: 30px;
+}
+
+div.deploy .submit input.b {
+    font-size: 90%;
+    font-weight: bold;
+    padding: 2 4 2 4;
+    border: 1px solid darkorange;
+    background: white;
+    color: rgb( 230, 44, 0 );
+}
+
+div#deployScenario1 {
+    background-color: #FFFFE0;
+    margin-bottom: 10px;
+}
+
+.cb input {
+    margin-left: 0;
+}
+
+em {
+    color: rgb( 204, 0, 0 );
+    font-weight: bold;
+    font-style: normal;
+}
+
+.deploy dl dd {
+    margin: 0;
+    padding: 0 0 1em 0;
+    line-height: 1.5em;
+}
\ No newline at end of file
Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/deploy.css
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/animated_reset.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/animated_reset.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_form_delete.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_form_delete.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_form_edit.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_form_edit.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_form_magnify.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_form_magnify.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_link.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_link.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_view_list.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/application_view_list.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/arrow_right.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/arrow_right.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/arrow_undo.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/arrow_undo.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/brick.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/brick.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/brick_delete.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/brick_delete.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bricks.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bricks.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bricks_grey.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bricks_grey.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/browser_galeon.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/browser_galeon.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bug_edit.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bug_edit.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bullet_arrow_down.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bullet_arrow_down.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bullet_go.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/bullet_go.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/computer.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/computer.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_eject_blue.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_eject_blue.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_pause_blue.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_pause_blue.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_play_blue.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_play_blue.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_repeat_blue.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_repeat_blue.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_rewind_blue.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_rewind_blue.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_stop_blue.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/control_stop_blue.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/cup_delete.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/cup_delete.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/cup_go.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/cup_go.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/database_key.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/database_key.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/database_lightning.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/database_lightning.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/database_table.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/database_table.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/emoticon_wink.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/emoticon_wink.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/folder_delete.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/folder_delete.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/folder_explore.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/folder_explore.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/lightbulb.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/lightbulb.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/lightning.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/lightning.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/magnifier.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/magnifier.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/magnifier_zoom_in.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/magnifier_zoom_in.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/magnifier_zoom_out.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/magnifier_zoom_out.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/package_green.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/package_green.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/page_white_c.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/page_white_c.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/page_white_cup.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/page_white_cup.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/page_white_put.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/page_white_put.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/page_world.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/page_world.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/pill.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/pill.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/progerssbar_editnplace.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/progerssbar_editnplace.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/progressbar_indefinite.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/progressbar_indefinite.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_0.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_0.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_1.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_1.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_2.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_2.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_3.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_3.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_4.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_4.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_5.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_5.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_a.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_a.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_a0.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_a0.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_b.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_b.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_b0.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/rb_b0.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/reset.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/reset.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/script_code_red.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/script_code_red.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/script_delete.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/script_delete.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/script_gear.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/script_gear.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/script_go.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/script_go.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/scroll_arrow_left.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/scroll_arrow_left.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/scroll_arrow_right.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/scroll_arrow_right.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/table_lightning.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/table_lightning.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/tag_blue.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/tag_blue.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/transmit_blue.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/transmit_blue.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/transmit_error.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/transmit_error.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/wrench.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/wrench.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/wrench_orange.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/css/classic/gifs/wrench_orange.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Added: branches/product_cleanup/web/src/main/webapp/js/Tooltip.js (0 => 2114)

--- branches/product_cleanup/web/src/main/webapp/js/Tooltip.js	                        (rev 0)
+++ branches/product_cleanup/web/src/main/webapp/js/Tooltip.js	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,589 @@
+/**
+ * Tooltip.js
+ *
+ * Advanced Tooltip class
+ *
+ * WARNING: Due to an IE bug, Tooltips will NOT display on top of a <select> element.
+ *
+ * @copyright Davey Shafik (c) 2005 All Rights Reserved
+ * @authors Davey Shafik <davey@...>
+ * @version 0.6.0
+ * @license MIT-style <http://tooltip.crtx.org/LICENSE>
+ * @todo Fix accessibility, make it possible to tab in/out of tooltips, and look into CSS Voice stuff
+ * @todo Add ability to change the events *per* Tooltip
+ */
+
+/**
+ * Add an Array.contains() method, mimics PHPs in_array() function
+ */
+
+Array.prototype.contains = function (value)
+{
+    for (var i = 0; i < this.length; i++) {
+        if (this[i] == value) {
+            return true;
+        }
+    }
+    return false;
+}
+
+/**
+ * Tooltip Object definition
+ */
+var Tooltip = {
+    /**
+     * @var string|Array An event name or an array of event names on which to trigger showing the Tooltip
+     */
+    showEvent: "click",
+
+    /**
+     * @var string|Array An event name or an array of event names on which to trigger hiding the Tooltip
+     */
+    hideEvent: "click",
+
+    /**
+     * @var float Duration of the fade events, in seconds
+     * @author Idea contributed by Richard Thomas <cyberlot@...>
+     */
+    fade: 0.5,
+
+    /**
+     * @var string Close Link Text
+     */
+    closeText: "Close",
+
+    /**
+     * @var function Set the method which will be called for showing the tooltip
+     */
+    showMethod: Effect.Appear,
+
+    /**
+     * @var function Set the method which will be called for hiding the tooltip
+     */
+    hideMethod: Effect.Fade,
+
+    /**
+     * @var boolean Whether the Tooltip should follow the mouse or not. Warning: Cheesy!
+     */
+    autoFollowMouse: false,
+
+    /**
+     * @var integer If set, the Tooltip will automatically hide after X seconds
+     *
+     * When followMouse is true, the mouseout event does not trigger the hide callback
+     * till X has passed. This is to allow the user to move a little off the element -
+     * which is especially useful when it's an inline element such as a link.
+     */
+    autoHideTimeout: 40,
+
+    /**
+     * @var boolean Allow user to click anywhere to hide current tooltip
+     */
+    autoHideClick: true,
+
+    /**
+     * @var boolean If set to true, the Tooltip will be displayed (static) at the current Mouse Cursor location.
+     */
+    autoMoveToCursor: true,
+
+    /**
+     * @const int Indicate that the current tooltip should be used
+     */
+    CURRENT_TOOLTIP: 1,
+
+    /**
+     * @var object Currently shown Tooltip
+     */
+    _current: false,
+
+    /**
+     * Initial Setup
+     *
+     * Find all standard tooltips and auto-initialize them
+     *
+     * @return void
+     */
+    setup: function ()
+    {
+        match_class = new RegExp("^(.*)\s?tooltip\s?(.*)$", 'i');
+        match_for = new RegExp("^.*\s?for_(.*)\s?.*$", 'i');
+        var divs = document.getElementsByTagName('div');
+        var for_result;
+        if (divs.length > 0) {
+            // Automatically register the mouseout event if followMouse = true and autoHideTimeout is being used
+            if (Tooltip.autoFollowMouse && Tooltip.autoHideTimeout) {
+                Tooltip.hideEvent[Tooltip.hideEvent.length] = "mouseout";
+            }
+
+            if (Tooltip.autoHideClick) {
+                Tooltip._attachEvent(document.getElementsByTagName("body").item(0), "clickanywhere");
+            }
+
+            for (var i = 0; i < divs.length; i++) {
+                if (divs.item(i).className.match(match_class)) {
+                    for_result = divs.item(i).className.match(match_for);
+                    if (for_result && for_result.length > 0) {
+                        if (document.getElementById(for_result[1])) {
+                            var activator = document.getElementById(for_result[1]);
+                        }
+                    } else {
+                        var foundPrevious = false;
+                        var activator = divs.item(i);
+                        while (foundPrevious == false && activator) {
+                            activator = activator.previousSibling;
+                            if (activator && activator.tagName) {
+                                foundPrevious = true;
+                                break;
+                            }
+                        }
+                    }
+                    if (activator) {
+                        activator.Tooltip = divs.item(i);
+                        if (!activator.id) {
+                            activator.id = "tt" + i;
+                        }
+                        activator.Tooltip.activator = activator.id;
+                        Tooltip.init(activator);
+                        // Just in case you need to access the activator from the Tooltip (i.e. a "Close" button)
+                    }
+
+
+
+                }
+            }
+        }
+    },
+
+
+    /**
+     * Initiate an Activator/Tooltip for events and display
+     *
+     * @param activator DomElement The element to which the Tooltip show/hide events are attached
+     * @return void
+     */
+    init: function (activator)
+    {
+        var tooltip = activator.Tooltip;
+        activator.Tooltip.style.visibility = "hidden";
+
+        Tooltip._attachEvent(activator, "toggle");
+
+
+        // Remove Link Hrefs
+        if (activator.tagName.toLowerCase() == "a") {
+            try {
+                activator.removeAttribute("href");
+                activator.style.cursor = (document.links[0].style.cursor.length > 0) ? document.links[0].style.cursor : "pointer";
+            }
+            catch (e) {
+                //DEBUG alert(e.message);
+            }
+        }
+
+        // Make sure the Tooltip is on top, only works if the element has position: absolute; in the CSS
+        tooltip.style.zIndex = "1000";
+
+        if (Tooltip.autoFollowMouse != true && Tooltip.closeText ) {
+            // Create the <p><a href="#">Close</a></p> and add it to the Tooltip
+
+            // <p> element
+            var p = document.createElement('p');
+
+            // <p> styles
+            p.style.textAlign = "right";
+            p.style.padding.padding = "0";
+            p.style.margin = "0";
+
+            // <p> class name
+            p.className = "close";
+
+            // <a> element
+            var link = document.createElement('a');
+
+            // Set the Tooltip var to the tooltip element
+            link.Tooltip = tooltip;
+
+            link.style.cursor = "pointer";
+
+            // Add the click handler
+            Tooltip._attachEvent(link, "click");
+
+            // "Close" text node
+            var close = document.createTextNode(Tooltip.closeText);
+
+            // Append the text to the <a> element
+            link.appendChild(close);
+
+            // Append the <a> to the <p> element
+            p.appendChild(link);
+
+            // Stick the entire thing on the end of the Tooltip
+            tooltip.appendChild(p, tooltip.firstChild);
+        }
+    },
+
+    /**
+     * Manually add a Tooltip
+     *
+     * When passed an Activator and Tooltip element or ID, it is setup as a Tooltip
+     *
+     * @param activator Activator Element or ID, this is the element that activates the Tooltip
+     * @param tooltip Tooltip Element or ID, this is the Tooltip element itself that is shown/hidden
+     */
+    add: function (activator, tooltip)
+    {
+        if (typeof activator == 'string') {
+            activator = document.getElementById(activator);
+        }
+        if (typeof tooltip == 'string') {
+            tooltip = document.getElementById(tooltip);
+        }
+
+        activator.Tooltip = tooltip;
+        Tooltip.init(activator);
+    },
+
+    /**
+     * Toggle the Tooltip
+         *
+         * Shows or Hides the Tooltip
+         *
+         * @param activator Activator Element
+         * @return void
+     */
+
+    toggle: function (activator, event, directHit)
+    {
+        try {
+            if (activator == 1) {
+                activator = document.getElementById(window._currentTT);
+            }
+        }
+        catch (e) { }
+
+        if (Tooltip.autoHideClick && event.type == "click") {
+            var close_class = new RegExp("^(.*)\s?close\s?(.*)$", 'i');
+            var tooltip_class = new RegExp("^(.*)\s?tooltip\s?(.*)$", 'i');
+            if (event.srcElement) {
+                var node = event.srcElement;
+            } else if (event.fromElement) {
+                var node = event.fromElement;
+            } else if (event.target) {
+                var node = event.target;
+            }
+            if (node.className == null  || !node.className.match(close_class)) {
+                var isWithinTooltip = false;
+                while (!isWithinTooltip && node.parentNode) {
+                    // Check if the parent is a close element first, if so, we can break
+                    // and we still want to close the tooltip
+                    if (node.className && node.className.match(close_class)) {
+                        break;
+                    }
+                    if (node.className && node.className != null && node.className.match(tooltip_class)) {
+                        isWithinTooltip = true;
+                        break;
+                    }
+                    node = node.parentNode;
+                }
+            }
+
+            if (isWithinTooltip) {
+                return false;
+            }
+        }
+
+        try {
+            if (directHit && (activator.Tooltip.style.visibility == 'hidden' || activator.Tooltip.style.display == 'none')) {
+                Tooltip._show(activator, event);
+            } else {
+                Tooltip._hide(activator, event);
+            }
+        }
+        catch (e) {
+            try {
+                Tooltip._hide(activator, event);
+            }
+            catch (e) { }
+        }
+        event.cancelBubble = true;
+        try {
+            event.stopPropagation();
+        }
+        catch (e) { }
+
+        return false;
+    },
+
+    /**
+     * Show the Tooltip
+     *
+     * Displays the Tooltip and sets the hide events up. You should never need to call this manually.
+     *
+     * @param activator Activator Element
+    * @private
+     * @return void
+     */
+    _show: function (activator, event, ignore_event)
+    {
+        if (Tooltip.autoHideClick && window._currentTT ) {
+            Tooltip._hide(document.getElementById(window._currentTT), event, true);
+        }
+
+        window._currentTT = activator.id;
+
+        if (ignore_event == true || typeof Tooltip.showEvent == "string" || Tooltip.showEvent.constructor && Tooltip.showEvent.constructor == Array && Tooltip.showEvent.contains(event.type)) {
+            activator.Tooltip.isVisible = true;
+         if (Tooltip.autoFollowMouse || Tooltip.autoMoveToCursor) {
+            Tooltip._follow(activator, event);
+         }
+            try {
+                if (typeof Effect) {
+                    Element.setOpacity(activator.Tooltip, 0.1);
+                    activator.Tooltip.style.visibility = "visible";
+                    Tooltip.showMethod(activator.Tooltip, {duration:Tooltip.fade});
+                } else {
+                    activator.Tooltip.style.visibility = "visible";
+                }
+            }
+            catch (e) {
+                try {
+                    activator.Tooltip.style.visibility = "visible";
+                }
+                catch (e) {
+                    //DEBUG alert(tooltip.id);
+                }
+            }
+            if (Tooltip.autoFollowMouse) {
+                Tooltip._attachEvent(activator, "follow");
+            }
+
+            if (Tooltip.autoHideTimeout && !Tooltip.autoFollowMouse) {
+                activator.timer = setTimeout(function () {
+                                            try {
+                                                Tooltip.hideMethod(activator.Tooltip, {duration:Tooltip.fade});
+                                            }
+                                            catch (e) {
+                                                activator.Tooltip.style.visibility = "hidden"; }
+                                            }, Tooltip.autoHideTimeout * 1000);
+            }
+
+            return;
+        }
+    },
+
+    /**
+     * Hide the Tooltip
+     *
+     * Hides the Tooltip and sets the show events up. You should never need to call this manually.
+     *
+     * @param activator Activator Element
+         * @private
+     * @return void
+     */
+    _hide: function (activator, event, ignore_event)
+    {
+        if (!activator) {
+            return;
+        }
+
+        event = event.type;
+
+        var tooltip = activator.Tooltip;
+        // We need to defer this
+        if (event == "mouseout" && Tooltip.autoFollowMouse) {
+            activator.timer = setTimeout(function () {
+                                            try {
+                                                Tooltip.hideMethod(tooltip, {duration:Tooltip.fade});
+                                            }
+                                            catch (e) {
+                                                activator.Tooltip.style.visibility = "hidden"; }
+                                            }, Tooltip.autoHideTimeout * 1000);
+        } else if (ignore_event == true || ((typeof Tooltip.hideEvent == "string" && Tooltip.hideEvent == event) || Tooltip.hideEvent.constructor && Tooltip.hideEvent.constructor == Array && Tooltip.hideEvent.contains(event))) {
+            activator.Tooltip.isVisible = false;
+            if( tooltip.style.visibility == 'vidible' || activator.Tooltip.style.display != 'none') {
+                try {
+                    Tooltip.hideMethod(tooltip, {duration:Tooltip.fade});
+                }
+                catch (e) {
+                    activator.Tooltip.style.visibility = "hidden";
+                }
+
+                if (Tooltip.autoFollowMouse) {
+                    Tooltip._removeEvent(activator, "follow");
+                }
+            }
+
+            if (activator.timer) {
+                clearTimeout(activator.timer);
+            }
+            window._currentTT = false;
+
+            return;
+        }
+    },
+
+    _follow: function (activator, event)
+    {
+      if (activator.timer) {
+          try {
+             clearTimeout(activator.timer);
+         }
+         catch (e) { }
+      }
+
+        var winWidth, winHeight, d=document;
+        if (typeof window.innerWidth!='undefined') {
+            winWidth = window.innerWidth;
+            winHeight = window.innerHeight;
+        } else {
+            if (d.documentElement && typeof d.documentElement.clientWidth!='undefined' && d.documentElement.clientWidth!=0) {
+                winWidth = d.documentElement.clientWidth
+                winHeight = d.documentElement.clientHeight
+            } else {
+                if (d.body && typeof d.body.clientWidth!='undefined') {
+                    winWidth = d.body.clientWidth
+                    winHeight = d.body.clientHeight
+                }
+            }
+        }
+
+        var tooltipWidth, tooltipHeight;
+        if (activator.Tooltip.currentStyle) {
+            tooltipWidth = activator.Tooltip.currentStyle.width;
+            tooltipHeight = activator.Tooltip.currentStyle.height;
+        } else if (window.getComputedStyle) {
+            tooltipWidth = window.getComputedStyle(activator.Tooltip, null).width;
+            tooltipHeight = window.getComputedStyle(activator.Tooltip, null).height;
+        }
+
+      activator.Tooltip.style.position = "absolute";
+
+        if (event.pageY) {
+            var top = event.pageY;
+            var left = event.pageX;
+        } else if (event.clientY) {
+            // put an If here instead, ?: doesn't seem to work
+            if (document.body.scrollTop > document.documentElement.scrollTop) {
+                var top = event.clientY + document.body.scrollTop;
+            } else {
+                var top = event.clientY + document.documentElement.scrollTop;
+            }
+
+            if (document.body.scrollLeft > document.documentElement.scrollLeft) {
+                var left = event.clientX + document.body.scrollLeft;
+            } else {
+                var left = event.clientX + document.documentElement.scrollLeft;
+            }
+        }
+
+        // Make sure the Tooltip doesn't go off the page. The 1.2 comes from Trial and error.
+        // We don't track the height, its possible (and much more common) that the height of an item will be more than the browser pane
+        if ((left + parseInt(tooltipWidth)) > winWidth) {
+            left = winWidth - parseInt(tooltipWidth) * 1.2;
+        }
+
+        activator.Tooltip.style.top = top + "px";
+        activator.Tooltip.style.left = left + "px";
+    },
+
+    /**
+     * Attach show/hide/load events
+     *
+     * This method removes any existing events first
+     * in case show/hide are the same.
+     *
+     * @param element Element to which events should be attached
+     * @param event Event for which events are being registered. One of show/hide/load/click.
+     */
+
+    _attachEvent: function (element, event)
+    {
+        var i;
+        var events = new Array();
+        if (event == "toggle") {
+            if (Tooltip.showEvent.constructor && Tooltip.showEvent.constructor == Array) {
+                for (i = 0; i < Tooltip.showEvent.length; i++) {
+                    events.push(Tooltip.showEvent[i]);
+                    if (element.addEventListener) {
+                        element.addEventListener(Tooltip.showEvent[i], function (e) { Tooltip.toggle(element, e, true); return false; }, false);
+                    } else if (element.attachEvent) {
+                        element.attachEvent('on' + Tooltip.showEvent[i], function (e) { Tooltip.toggle(element, e, true); return false; });
+                    }
+                }
+            } else {
+                events.push(Tooltip.showEvent);
+                if (element.addEventListener) {
+                    element.addEventListener(Tooltip.showEvent, function (e) { Tooltip.toggle(element, e, true); return false; }, false);
+                } else if (element.attachEvent) {
+                    element.attachEvent('on' + Tooltip.showEvent, function (e) { Tooltip.toggle(element, e, true); return false; });
+                }
+            }
+
+            if (Tooltip.hideEvent.constructor && Tooltip.hideEvent.constructor == Array) {
+                for (i = 0; i < Tooltip.hideEvent.length; i++) {
+                    if (!events.contains(Tooltip.hideEvent[i])) {
+                        events.push(Tooltip.hideEvent[i]);
+                        if (element.addEventListener) {
+                            element.addEventListener(Tooltip.hideEvent[i], function (e) { Tooltip.toggle(element, e, true); return false; }, false);
+                        } else if (element.attachEvent) {
+                            element.attachEvent('on' + Tooltip.hideEvent[i], function (e) { Tooltip.toggle(element, e, true); return false; });
+                        }
+                    }
+                }
+            } else {
+                if (!events.contains(Tooltip.hideEvent)) {
+                    events.push(Tooltip.hideEvent);
+                    if (element.addEventListener) {
+                        element.addEventListener(Tooltip.hideEvent, function (e) { Tooltip.toggle(element, e, false); return false; }, false);
+                    } else if (element.attachEvent) {
+                        element.attachEvent('on' + Tooltip.hideEvent, function (e) { Tooltip.toggle(element, e, false); return false; });
+                    }
+                }
+            }
+        } else if (event == "load") {
+            if (element.addEventListener) {
+                element.addEventListener("load", function () { Tooltip.setup(); }, false);
+            } else if (element.attachEvent) {
+                element.attachEvent('on' + "load", function () { Tooltip.setup(); });
+            }
+        } else if (event == "click") {
+            if (element.addEventListener) {
+                element.addEventListener("click", function (e) { Tooltip.toggle(element, e, true); }, false);
+            } else if (element.attachEvent) {
+                element.attachEvent('on' + "click", function (e) { Tooltip.toggle(element, e, true); });
+            }
+        } else if (event == "follow") {
+            if (element.addEventListener) {
+                element.addEventListener("mousemove", function (e) { Tooltip._follow(element, e); }, false);
+            }  else {
+                element.attachEvent('onmousemove', function (e) { Tooltip._follow(element, e);  });
+            }
+        } else if (event == "clickanywhere") {
+            if (element.addEventListener) {
+                element.addEventListener("click", function (e) { Tooltip.toggle(Tooltip.CURRENT_TOOLTIP, e, false); }, false);
+            }  else {
+                element.attachEvent('onclick', function (e) { Tooltip.toggle(Tooltip.CURRENT_TOOLTIP, e, false);  });
+            }
+        }
+    },
+
+    _removeEvent: function (element, event)
+    {
+        try {
+            if (event == "follow") {
+                if (element.addEventListener) {
+                    element.removeEventListener("mousemove", function (e) { Tooltip._follow(element, e); }, false);
+                } else {
+                    element.dettachEvent('onmousemove', function (e) { Tooltip._follow(element, e); });
+                }
+            }
+        }
+        catch (e) {}
+    }
+}
+
+// Start the Tooltips in motion
+try {
+    Tooltip._attachEvent(window, 'load');
+}
+catch (e) { }
Property changes on: branches/product_cleanup/web/src/main/webapp/js/Tooltip.js
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native

Added: branches/product_cleanup/web/src/main/webapp/js/areascroller.js (0 => 2114)

--- branches/product_cleanup/web/src/main/webapp/js/areascroller.js	                        (rev 0)
+++ branches/product_cleanup/web/src/main/webapp/js/areascroller.js	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,75 @@
+Effect.Scroll = Class.create();
+Object.extend(Object.extend(Effect.Scroll.prototype, Effect.Base.prototype), {
+    initialize: function(element, options) {
+        this.element = $(element);
+        this.direction = options && options.direction ? options.direction : 'right';
+        this.pps = options && options.pps ? options.pps : 100;
+
+        var options = Object.extend({
+            duration: (this.element.scrollWidth - this.element.scrollLeft) / this.pps
+        }, arguments[1] || {});
+
+
+        this.start(options);
+    },
+    setup: function() {
+        this.scrollStart = this.element.scrollLeft;
+        this.delta = this.element.scrollWidth;
+    },
+    update: function(position) {
+        if (this.direction == 'right')
+            this.element.scrollLeft = this.scrollStart + (position * this.delta);
+        else
+            this.element.scrollLeft = this.scrollStart - (position * this.delta);
+    }
+});
+
+
+var rightScroller;
+var leftScroller;
+
+function setupScrollers(container) {
+    var containerID = container;
+    var r = {
+        '#right_scroller': function(e) {
+            e.onmouseover = function(e) {
+                if (leftScroller) leftScroller.cancel();
+                rightScroller = new Effect.Scroll(containerID, {pps: 100, direction: 'right'});
+            }
+            e.onmouseout = function(e) {
+                if (rightScroller) {
+                    rightScroller.cancel();
+                }
+            }
+            e.onmousedown = function(e) {
+                if (rightScroller) rightScroller.cancel();
+                rightScroller = new Effect.Scroll(containerID, {pps: 1000, direction: 'right'});
+            }
+            e.onmouseup = function(e) {
+                if (rightScroller) rightScroller.cancel();
+                rightScroller = new Effect.Scroll(containerID, {pps: 100, direction: 'right'});
+            }
+        },
+        '#left_scroller': function(e) {
+            e.onmouseover = function(e) {
+                if (rightScroller) rightScroller.cancel();
+                leftScroller = new Effect.Scroll(containerID, {pps: 100, direction: 'left'});
+            }
+            e.onmouseout = function(e) {
+                if (leftScroller) {
+                    leftScroller.cancel();
+                }
+            }
+            e.onmousedown = function(e) {
+                if (leftScroller) leftScroller.cancel();
+                leftScroller = new Effect.Scroll(containerID, {pps: 1000, direction: 'left'});
+            }
+            e.onmouseup = function(e) {
+                if (leftScroller) leftScroller.cancel();
+                leftScroller = new Effect.Scroll(containerID, {pps: 100, direction: 'left'});
+            }
+        }
+    }
+
+    Behaviour.register(r);
+}
Property changes on: branches/product_cleanup/web/src/main/webapp/js/areascroller.js
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native

Added: branches/product_cleanup/web/src/main/webapp/js/behaviour.js (0 => 2114)

--- branches/product_cleanup/web/src/main/webapp/js/behaviour.js	                        (rev 0)
+++ branches/product_cleanup/web/src/main/webapp/js/behaviour.js	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,254 @@
+/*
+   Behaviour v1.1 by Ben Nolan, June 2005. Based largely on the work
+   of Simon Willison (see comments by Simon below).
+
+   Description:
+
+       Uses css selectors to apply javascript behaviours to enable
+       unobtrusive javascript in html documents.
+
+   Usage:   
+   
+    var myrules = {
+        'b.someclass' : function(element){
+            element.onclick = function(){
+                alert(this.innerHTML);
+            }
+        },
+        '#someid u' : function(element){
+            element.onmouseover = function(){
+                this.innerHTML = "BLAH!";
+            }
+        }
+    };
+
+    Behaviour.register(myrules);
+
+    // Call Behaviour.apply() to re-apply the rules (if you
+    // update the dom, etc).
+
+   License:
+   
+       This file is entirely BSD licensed.
+
+   More information:
+
+       http://ripcord.co.nz/behaviour/
+   
+*/   
+
+var Behaviour = {
+    list : new Array,
+
+    register : function(sheet){
+        Behaviour.list.push(sheet);
+    },
+
+    start : function(){
+        Behaviour.addLoadEvent(function(){
+            Behaviour.apply();
+        });
+    },
+
+    apply : function(){
+        for (h=0;sheet=Behaviour.list[h];h++){
+            for (selector in sheet){
+                list = document.getElementsBySelector(selector);
+
+                if (!list){
+                    continue;
+                }
+
+                for (i=0;element=list[i];i++){
+                    sheet[selector](element);
+                }
+            }
+        }
+    },
+
+    addLoadEvent : function(func){
+        var oldonload = window.onload;
+
+        if (typeof window.onload != 'function') {
+            window.onload = func;
+        } else {
+            window.onload = function() {
+                oldonload();
+                func();
+            }
+        }
+    }
+}
+
+Behaviour.start();
+
+/*
+   The following code is Copyright (C) Simon Willison 2004.
+
+   document.getElementsBySelector(selector)
+   - returns an array of element objects from the current document
+     matching the CSS selector. Selectors can contain element names, 
+     class names and ids and can be nested. For example:
+     
+       elements = document.getElementsBySelect('div#main p a.external')
+     
+     Will return an array of all 'a' elements with 'external' in their 
+     class attribute that are contained inside 'p' elements that are 
+     contained inside the 'div' element which has id="main"
+
+   New in version 0.4: Support for CSS2 and CSS3 attribute selectors:
+   See http://www.w3.org/TR/css3-selectors/#attribute-selectors
+
+   Version 0.4 - Simon Willison, March 25th 2003
+   -- Works in Phoenix 0.5, Mozilla 1.3, Opera 7, Internet Explorer 6, Internet Explorer 5 on Windows
+   -- Opera 7 fails 
+*/
+
+function getAllChildren(e) {
+  // Returns all children of element. Workaround required for IE5/Windows. Ugh.
+  return e.all ? e.all : e.getElementsByTagName('*');
+}
+
+document.getElementsBySelector = function(selector) {
+  // Attempt to fail gracefully in lesser browsers
+  if (!document.getElementsByTagName) {
+    return new Array();
+  }
+  // Split selector in to tokens
+  var tokens = selector.split(' ');
+  var currentContext = new Array(document);
+  for (var i = 0; i < tokens.length; i++) {
+    token = tokens[i].replace(/^\s+/,'').replace(/\s+$/,'');;
+    if (token.indexOf('#') > -1) {
+      // Token is an ID selector
+      var bits = token.split('#');
+      var tagName = bits[0];
+      var id = bits[1];
+      var element = document.getElementById(id);
+      if (tagName && element.nodeName.toLowerCase() != tagName) {
+        // tag with that ID not found, return false
+        return new Array();
+      }
+      // Set currentContext to contain just this element
+      currentContext = new Array(element);
+      continue; // Skip to next token
+    }
+    if (token.indexOf('.') > -1) {
+      // Token contains a class selector
+      var bits = token.split('.');
+      var tagName = bits[0];
+      var className = bits[1];
+      if (!tagName) {
+        tagName = '*';
+      }
+      // Get elements matching tag, filter them for class selector
+      var found = new Array;
+      var foundCount = 0;
+      for (var h = 0; h < currentContext.length; h++) {
+        var elements;
+        if (tagName == '*') {
+            elements = getAllChildren(currentContext[h]);
+        } else {
+            elements = currentContext[h].getElementsByTagName(tagName);
+        }
+        for (var j = 0; j < elements.length; j++) {
+          found[foundCount++] = elements[j];
+        }
+      }
+      currentContext = new Array;
+      var currentContextIndex = 0;
+      for (var k = 0; k < found.length; k++) {
+        if (found[k].className && found[k].className.match(new RegExp('\\b'+className+'\\b'))) {
+          currentContext[currentContextIndex++] = found[k];
+        }
+      }
+      continue; // Skip to next token
+    }
+    // Code to deal with attribute selectors
+    if (token.match(/^(\w*)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/)) {
+      var tagName = RegExp.$1;
+      var attrName = RegExp.$2;
+      var attrOperator = RegExp.$3;
+      var attrValue = RegExp.$4;
+      if (!tagName) {
+        tagName = '*';
+      }
+      // Grab all of the tagName elements within current context
+      var found = new Array;
+      var foundCount = 0;
+      for (var h = 0; h < currentContext.length; h++) {
+        var elements;
+        if (tagName == '*') {
+            elements = getAllChildren(currentContext[h]);
+        } else {
+            elements = currentContext[h].getElementsByTagName(tagName);
+        }
+        for (var j = 0; j < elements.length; j++) {
+          found[foundCount++] = elements[j];
+        }
+      }
+      currentContext = new Array;
+      var currentContextIndex = 0;
+      var checkFunction; // This function will be used to filter the elements
+      switch (attrOperator) {
+        case '=': // Equality
+          checkFunction = function(e) { return (e.getAttribute(attrName) == attrValue); };
+          break;
+        case '~': // Match one of space seperated words 
+          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('\\b'+attrValue+'\\b'))); };
+          break;
+        case '|': // Match start with value followed by optional hyphen
+          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('^'+attrValue+'-?'))); };
+          break;
+        case '^': // Match starts with value
+          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) == 0); };
+          break;
+        case '$': // Match ends with value - fails with "Warning" in Opera 7
+          checkFunction = function(e) { return (e.getAttribute(attrName).lastIndexOf(attrValue) == e.getAttribute(attrName).length - attrValue.length); };
+          break;
+        case '*': // Match ends with value
+          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) > -1); };
+          break;
+        default :
+          // Just test for existence of attribute
+          checkFunction = function(e) { return e.getAttribute(attrName); };
+      }
+      currentContext = new Array;
+      var currentContextIndex = 0;
+      for (var k = 0; k < found.length; k++) {
+        if (checkFunction(found[k])) {
+          currentContext[currentContextIndex++] = found[k];
+        }
+      }
+      // alert('Attribute Selector: '+tagName+' '+attrName+' '+attrOperator+' '+attrValue);
+      continue; // Skip to next token
+    }
+    
+    if (!currentContext[0]){
+        return;
+    }
+    
+    // If we get here, token is JUST an element (not a class or ID selector)
+    tagName = token;
+    var found = new Array;
+    var foundCount = 0;
+    for (var h = 0; h < currentContext.length; h++) {
+      var elements = currentContext[h].getElementsByTagName(tagName);
+      for (var j = 0; j < elements.length; j++) {
+        found[foundCount++] = elements[j];
+      }
+    }
+    currentContext = found;
+  }
+  return currentContext;
+}
+
+/* That revolting regular expression explained 
+/^(\w+)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/
+  \---/  \---/\-------------/    \-------/
+    |      |         |               |
+    |      |         |           The value
+    |      |    ~,|,^,$,* or =
+    |   Attribute 
+   Tag
+*/
Property changes on: branches/product_cleanup/web/src/main/webapp/js/behaviour.js
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native

Added: branches/product_cleanup/web/src/main/webapp/js/builder.js (0 => 2114)

--- branches/product_cleanup/web/src/main/webapp/js/builder.js	                        (rev 0)
+++ branches/product_cleanup/web/src/main/webapp/js/builder.js	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,136 @@
+// script.aculo.us builder.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+var Builder = {
+  NODEMAP: {
+    AREA: 'map',
+    CAPTION: 'table',
+    COL: 'table',
+    COLGROUP: 'table',
+    LEGEND: 'fieldset',
+    OPTGROUP: 'select',
+    OPTION: 'select',
+    PARAM: 'object',
+    TBODY: 'table',
+    TD: 'table',
+    TFOOT: 'table',
+    TH: 'table',
+    THEAD: 'table',
+    TR: 'table'
+  },
+  // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,
+  //       due to a Firefox bug
+  node: function(elementName) {
+    elementName = elementName.toUpperCase();
+
+    // try innerHTML approach
+    var parentTag = this.NODEMAP[elementName] || 'div';
+    var parentElement = document.createElement(parentTag);
+    try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+      parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
+    } catch(e) {}
+    var element = parentElement.firstChild || null;
+
+    // see if browser added wrapping tags
+    if(element && (element.tagName.toUpperCase() != elementName))
+      element = element.getElementsByTagName(elementName)[0];
+
+    // fallback to createElement approach
+    if(!element) element = document.createElement(elementName);
+
+    // abort if nothing could be created
+    if(!element) return;
+
+    // attributes (or text)
+    if(arguments[1])
+      if(this._isStringOrNumber(arguments[1]) ||
+        (arguments[1] instanceof Array) ||
+        arguments[1].tagName) {
+          this._children(element, arguments[1]);
+        } else {
+          var attrs = this._attributes(arguments[1]);
+          if(attrs.length) {
+            try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+              parentElement.innerHTML = "<" +elementName + " " +
+                attrs + "></" + elementName + ">";
+            } catch(e) {}
+            element = parentElement.firstChild || null;
+            // workaround firefox 1.0.X bug
+            if(!element) {
+              element = document.createElement(elementName);
+              for(attr in arguments[1])
+                element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
+            }
+            if(element.tagName.toUpperCase() != elementName)
+              element = parentElement.getElementsByTagName(elementName)[0];
+          }
+        }
+
+    // text, or array of children
+    if(arguments[2])
+      this._children(element, arguments[2]);
+
+     return $(element);
+  },
+  _text: function(text) {
+     return document.createTextNode(text);
+  },
+
+  ATTR_MAP: {
+    'className': 'class',
+    'htmlFor': 'for'
+  },
+
+  _attributes: function(attributes) {
+    var attrs = [];
+    for(attribute in attributes)
+      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
+          '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'&quot;') + '"');
+    return attrs.join(" ");
+  },
+  _children: function(element, children) {
+    if(children.tagName) {
+      element.appendChild(children);
+      return;
+    }
+    if(typeof children=='object') { // array can hold nodes and text
+      children.flatten().each( function(e) {
+        if(typeof e=='object')
+          element.appendChild(e);
+        else
+          if(Builder._isStringOrNumber(e))
+            element.appendChild(Builder._text(e));
+      });
+    } else
+      if(Builder._isStringOrNumber(children))
+        element.appendChild(Builder._text(children));
+  },
+  _isStringOrNumber: function(param) {
+    return(typeof param=='string' || typeof param=='number');
+  },
+  build: function(html) {
+    var element = this.node('div');
+    $(element).update(html.strip());
+    return element.down();
+  },
+  dump: function(scope) {
+    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope
+
+    var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
+      "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
+      "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
+      "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
+      "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
+      "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
+
+    tags.each( function(tag){
+      scope[tag] = function() {
+        return Builder.node.apply(Builder, [tag].concat($A(arguments)));
+      };
+    });
+  }
+};
\ No newline at end of file
Property changes on: branches/product_cleanup/web/src/main/webapp/js/builder.js
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native

Added: branches/product_cleanup/web/src/main/webapp/js/controls.js (0 => 2114)

--- branches/product_cleanup/web/src/main/webapp/js/controls.js	                        (rev 0)
+++ branches/product_cleanup/web/src/main/webapp/js/controls.js	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,965 @@
+// script.aculo.us controls.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2008 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+//           (c) 2005-2008 Jon Tirsen (http://www.tirsen.com)
+// Contributors:
+//  Richard Livsey
+//  Rahul Bhargava
+//  Rob Wills
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+// Autocompleter.Base handles all the autocompletion functionality
+// that's independent of the data source for autocompletion. This
+// includes drawing the autocompletion menu, observing keyboard
+// and mouse events, and similar.
+//
+// Specific autocompleters need to provide, at the very least,
+// a getUpdatedChoices function that will be invoked every time
+// the text inside the monitored textbox changes. This method
+// should get the text for which to provide autocompletion by
+// invoking this.getToken(), NOT by directly accessing
+// this.element.value. This is to allow incremental tokenized
+// autocompletion. Specific auto-completion logic (AJAX, etc)
+// belongs in getUpdatedChoices.
+//
+// Tokenized incremental autocompletion is enabled automatically
+// when an autocompleter is instantiated with the 'tokens' option
+// in the options parameter, e.g.:
+// new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' });
+// will incrementally autocomplete with a comma as the token.
+// Additionally, ',' in the above example can be replaced with
+// a token array, e.g. { tokens: [',', '\n'] } which
+// enables autocompletion on multiple tokens. This is most
+// useful when one of the tokens is \n (a newline), as it
+// allows smart autocompletion after linebreaks.
+
+if(typeof Effect == 'undefined')
+  throw("controls.js requires including script.aculo.us' effects.js library");
+
+var Autocompleter = { };
+Autocompleter.Base = Class.create({
+  baseInitialize: function(element, update, options) {
+    element          = $(element);
+    this.element     = element;
+    this.update      = $(update);
+    this.hasFocus    = false;
+    this.changed     = false;
+    this.active      = false;
+    this.index       = 0;
+    this.entryCount  = 0;
+    this.oldElementValue = this.element.value;
+
+    if(this.setOptions)
+      this.setOptions(options);
+    else
+      this.options = options || { };
+
+    this.options.paramName    = this.options.paramName || this.element.name;
+    this.options.tokens       = this.options.tokens || [];
+    this.options.frequency    = this.options.frequency || 0.4;
+    this.options.minChars     = this.options.minChars || 1;
+    this.options.onShow       = this.options.onShow ||
+      function(element, update){
+        if(!update.style.position || update.style.position=='absolute') {
+          update.style.position = 'absolute';
+          Position.clone(element, update, {
+            setHeight: false,
+            offsetTop: element.offsetHeight
+          });
+        }
+        Effect.Appear(update,{duration:0.15});
+      };
+    this.options.onHide = this.options.onHide ||
+      function(element, update){ new Effect.Fade(update,{duration:0.15}) };
+
+    if(typeof(this.options.tokens) == 'string')
+      this.options.tokens = new Array(this.options.tokens);
+    // Force carriage returns as token delimiters anyway
+    if (!this.options.tokens.include('\n'))
+      this.options.tokens.push('\n');
+
+    this.observer = null;
+
+    this.element.setAttribute('autocomplete','off');
+
+    Element.hide(this.update);
+
+    Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
+    Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this));
+  },
+
+  show: function() {
+    if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
+    if(!this.iefix &&
+      (Prototype.Browser.IE) &&
+      (Element.getStyle(this.update, 'position')=='absolute')) {
+      new Insertion.After(this.update,
+       '<iframe id="' + this.update.id + '_iefix" '+
+       'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
+       'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
+      this.iefix = $(this.update.id+'_iefix');
+    }
+    if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
+  },
+
+  fixIEOverlapping: function() {
+    Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
+    this.iefix.style.zIndex = 1;
+    this.update.style.zIndex = 2;
+    Element.show(this.iefix);
+  },
+
+  hide: function() {
+    this.stopIndicator();
+    if(Element.getStyle(this.update, 'display')!='none') this.options.onHide(this.element, this.update);
+    if(this.iefix) Element.hide(this.iefix);
+  },
+
+  startIndicator: function() {
+    if(this.options.indicator) Element.show(this.options.indicator);
+  },
+
+  stopIndicator: function() {
+    if(this.options.indicator) Element.hide(this.options.indicator);
+  },
+
+  onKeyPress: function(event) {
+    if(this.active)
+      switch(event.keyCode) {
+       case Event.KEY_TAB:
+       case Event.KEY_RETURN:
+         this.selectEntry();
+         Event.stop(event);
+       case Event.KEY_ESC:
+         this.hide();
+         this.active = false;
+         Event.stop(event);
+         return;
+       case Event.KEY_LEFT:
+       case Event.KEY_RIGHT:
+         return;
+       case Event.KEY_UP:
+         this.markPrevious();
+         this.render();
+         Event.stop(event);
+         return;
+       case Event.KEY_DOWN:
+         this.markNext();
+         this.render();
+         Event.stop(event);
+         return;
+      }
+     else
+       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN ||
+         (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
+
+    this.changed = true;
+    this.hasFocus = true;
+
+    if(this.observer) clearTimeout(this.observer);
+      this.observer =
+        setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
+  },
+
+  activate: function() {
+    this.changed = false;
+    this.hasFocus = true;
+    this.getUpdatedChoices();
+  },
+
+  onHover: function(event) {
+    var element = Event.findElement(event, 'LI');
+    if(this.index != element.autocompleteIndex)
+    {
+        this.index = element.autocompleteIndex;
+        this.render();
+    }
+    Event.stop(event);
+  },
+
+  onClick: function(event) {
+    var element = Event.findElement(event, 'LI');
+    this.index = element.autocompleteIndex;
+    this.selectEntry();
+    this.hide();
+  },
+
+  onBlur: function(event) {
+    // needed to make click events working
+    setTimeout(this.hide.bind(this), 250);
+    this.hasFocus = false;
+    this.active = false;
+  },
+
+  render: function() {
+    if(this.entryCount > 0) {
+      for (var i = 0; i < this.entryCount; i++)
+        this.index==i ?
+          Element.addClassName(this.getEntry(i),"selected") :
+          Element.removeClassName(this.getEntry(i),"selected");
+      if(this.hasFocus) {
+        this.show();
+        this.active = true;
+      }
+    } else {
+      this.active = false;
+      this.hide();
+    }
+  },
+
+  markPrevious: function() {
+    if(this.index > 0) this.index--;
+      else this.index = this.entryCount-1;
+    this.getEntry(this.index).scrollIntoView(true);
+  },
+
+  markNext: function() {
+    if(this.index < this.entryCount-1) this.index++;
+      else this.index = 0;
+    this.getEntry(this.index).scrollIntoView(false);
+  },
+
+  getEntry: function(index) {
+    return this.update.firstChild.childNodes[index];
+  },
+
+  getCurrentEntry: function() {
+    return this.getEntry(this.index);
+  },
+
+  selectEntry: function() {
+    this.active = false;
+    this.updateElement(this.getCurrentEntry());
+  },
+
+  updateElement: function(selectedElement) {
+    if (this.options.updateElement) {
+      this.options.updateElement(selectedElement);
+      return;
+    }
+    var value = '';
+    if (this.options.select) {
+      var nodes = $(selectedElement).select('.' + this.options.select) || [];
+      if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
+    } else
+      value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
+
+    var bounds = this.getTokenBounds();
+    if (bounds[0] != -1) {
+      var newValue = this.element.value.substr(0, bounds[0]);
+      var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/);
+      if (whitespace)
+        newValue += whitespace[0];
+      this.element.value = newValue + value + this.element.value.substr(bounds[1]);
+    } else {
+      this.element.value = value;
+    }
+    this.oldElementValue = this.element.value;
+    this.element.focus();
+
+    if (this.options.afterUpdateElement)
+      this.options.afterUpdateElement(this.element, selectedElement);
+  },
+
+  updateChoices: function(choices) {
+    if(!this.changed && this.hasFocus) {
+      this.update.innerHTML = choices;
+      Element.cleanWhitespace(this.update);
+      Element.cleanWhitespace(this.update.down());
+
+      if(this.update.firstChild && this.update.down().childNodes) {
+        this.entryCount =
+          this.update.down().childNodes.length;
+        for (var i = 0; i < this.entryCount; i++) {
+          var entry = this.getEntry(i);
+          entry.autocompleteIndex = i;
+          this.addObservers(entry);
+        }
+      } else {
+        this.entryCount = 0;
+      }
+
+      this.stopIndicator();
+      this.index = 0;
+
+      if(this.entryCount==1 && this.options.autoSelect) {
+        this.selectEntry();
+        this.hide();
+      } else {
+        this.render();
+      }
+    }
+  },
+
+  addObservers: function(element) {
+    Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this));
+    Event.observe(element, "click", this.onClick.bindAsEventListener(this));
+  },
+
+  onObserverEvent: function() {
+    this.changed = false;
+    this.tokenBounds = null;
+    if(this.getToken().length>=this.options.minChars) {
+      this.getUpdatedChoices();
+    } else {
+      this.active = false;
+      this.hide();
+    }
+    this.oldElementValue = this.element.value;
+  },
+
+  getToken: function() {
+    var bounds = this.getTokenBounds();
+    return this.element.value.substring(bounds[0], bounds[1]).strip();
+  },
+
+  getTokenBounds: function() {
+    if (null != this.tokenBounds) return this.tokenBounds;
+    var value = this.element.value;
+    if (value.strip().empty()) return [-1, 0];
+    var diff = arguments.callee.getFirstDifferencePos(value, this.oldElementValue);
+    var offset = (diff == this.oldElementValue.length ? 1 : 0);
+    var prevTokenPos = -1, nextTokenPos = value.length;
+    var tp;
+    for (var index = 0, l = this.options.tokens.length; index < l; ++index) {
+      tp = value.lastIndexOf(this.options.tokens[index], diff + offset - 1);
+      if (tp > prevTokenPos) prevTokenPos = tp;
+      tp = value.indexOf(this.options.tokens[index], diff + offset);
+      if (-1 != tp && tp < nextTokenPos) nextTokenPos = tp;
+    }
+    return (this.tokenBounds = [prevTokenPos + 1, nextTokenPos]);
+  }
+});
+
+Autocompleter.Base.prototype.getTokenBounds.getFirstDifferencePos = function(newS, oldS) {
+  var boundary = Math.min(newS.length, oldS.length);
+  for (var index = 0; index < boundary; ++index)
+    if (newS[index] != oldS[index])
+      return index;
+  return boundary;
+};
+
+Ajax.Autocompleter = Class.create(Autocompleter.Base, {
+  initialize: function(element, update, url, options) {
+    this.baseInitialize(element, update, options);
+    this.options.asynchronous  = true;
+    this.options.onComplete    = this.onComplete.bind(this);
+    this.options.defaultParams = this.options.parameters || null;
+    this.url                   = url;
+  },
+
+  getUpdatedChoices: function() {
+    this.startIndicator();
+
+    var entry = encodeURIComponent(this.options.paramName) + '=' +
+      encodeURIComponent(this.getToken());
+
+    this.options.parameters = this.options.callback ?
+      this.options.callback(this.element, entry) : entry;
+
+    if(this.options.defaultParams)
+      this.options.parameters += '&' + this.options.defaultParams;
+
+    new Ajax.Request(this.url, this.options);
+  },
+
+  onComplete: function(request) {
+    this.updateChoices(request.responseText);
+  }
+});
+
+// The local array autocompleter. Used when you'd prefer to
+// inject an array of autocompletion options into the page, rather
+// than sending out Ajax queries, which can be quite slow sometimes.
+//
+// The constructor takes four parameters. The first two are, as usual,
+// the id of the monitored textbox, and id of the autocompletion menu.
+// The third is the array you want to autocomplete from, and the fourth
+// is the options block.
+//
+// Extra local autocompletion options:
+// - choices - How many autocompletion choices to offer
+//
+// - partialSearch - If false, the autocompleter will match entered
+//                    text only at the beginning of strings in the
+//                    autocomplete array. Defaults to true, which will
+//                    match text at the beginning of any *word* in the
+//                    strings in the autocomplete array. If you want to
+//                    search anywhere in the string, additionally set
+//                    the option fullSearch to true (default: off).
+//
+// - fullSsearch - Search anywhere in autocomplete array strings.
+//
+// - partialChars - How many characters to enter before triggering
+//                   a partial match (unlike minChars, which defines
+//                   how many characters are required to do any match
+//                   at all). Defaults to 2.
+//
+// - ignoreCase - Whether to ignore case when autocompleting.
+//                 Defaults to true.
+//
+// It's possible to pass in a custom function as the 'selector'
+// option, if you prefer to write your own autocompletion logic.
+// In that case, the other options above will not apply unless
+// you support them.
+
+Autocompleter.Local = Class.create(Autocompleter.Base, {
+  initialize: function(element, update, array, options) {
+    this.baseInitialize(element, update, options);
+    this.options.array = array;
+  },
+
+  getUpdatedChoices: function() {
+    this.updateChoices(this.options.selector(this));
+  },
+
+  setOptions: function(options) {
+    this.options = Object.extend({
+      choices: 10,
+      partialSearch: true,
+      partialChars: 2,
+      ignoreCase: true,
+      fullSearch: false,
+      selector: function(instance) {
+        var ret       = []; // Beginning matches
+        var partial   = []; // Inside matches
+        var entry     = instance.getToken();
+        var count     = 0;
+
+        for (var i = 0; i < instance.options.array.length &&
+          ret.length < instance.options.choices ; i++) {
+
+          var elem = instance.options.array[i];
+          var foundPos = instance.options.ignoreCase ?
+            elem.toLowerCase().indexOf(entry.toLowerCase()) :
+            elem.indexOf(entry);
+
+          while (foundPos != -1) {
+            if (foundPos == 0 && elem.length != entry.length) {
+              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +
+                elem.substr(entry.length) + "</li>");
+              break;
+            } else if (entry.length >= instance.options.partialChars &&
+              instance.options.partialSearch && foundPos != -1) {
+              if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
+                partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
+                  elem.substr(foundPos, entry.length) + "</strong>" + elem.substr(
+                  foundPos + entry.length) + "</li>");
+                break;
+              }
+            }
+
+            foundPos = instance.options.ignoreCase ?
+              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) :
+              elem.indexOf(entry, foundPos + 1);
+
+          }
+        }
+        if (partial.length)
+          ret = ret.concat(partial.slice(0, instance.options.choices - ret.length));
+        return "<ul>" + ret.join('') + "</ul>";
+      }
+    }, options || { });
+  }
+});
+
+// AJAX in-place editor and collection editor
+// Full rewrite by Christophe Porteneuve <tdd@...> (April 2007).
+
+// Use this if you notice weird scrolling problems on some browsers,
+// the DOM might be a bit confused when this gets called so do this
+// waits 1 ms (with setTimeout) until it does the activation
+Field.scrollFreeActivate = function(field) {
+  setTimeout(function() {
+    Field.activate(field);
+  }, 1);
+};
+
+Ajax.InPlaceEditor = Class.create({
+  initialize: function(element, url, options) {
+    this.url = url;
+    this.element = element = $(element);
+    this.prepareOptions();
+    this._controls = { };
+    arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!!
+    Object.extend(this.options, options || { });
+    if (!this.options.formId && this.element.id) {
+      this.options.formId = this.element.id + '-inplaceeditor';
+      if ($(this.options.formId))
+        this.options.formId = '';
+    }
+    if (this.options.externalControl)
+      this.options.externalControl = $(this.options.externalControl);
+    if (!this.options.externalControl)
+      this.options.externalControlOnly = false;
+    this._originalBackground = this.element.getStyle('background-color') || 'transparent';
+    this.element.title = this.options.clickToEditText;
+    this._boundCancelHandler = this.handleFormCancellation.bind(this);
+    this._boundComplete = (this.options.onComplete || Prototype.emptyFunction).bind(this);
+    this._boundFailureHandler = this.handleAJAXFailure.bind(this);
+    this._boundSubmitHandler = this.handleFormSubmission.bind(this);
+    this._boundWrapperHandler = this.wrapUp.bind(this);
+    this.registerListeners();
+  },
+  checkForEscapeOrReturn: function(e) {
+    if (!this._editing || e.ctrlKey || e.altKey || e.shiftKey) return;
+    if (Event.KEY_ESC == e.keyCode)
+      this.handleFormCancellation(e);
+    else if (Event.KEY_RETURN == e.keyCode)
+      this.handleFormSubmission(e);
+  },
+  createControl: function(mode, handler, extraClasses) {
+    var control = this.options[mode + 'Control'];
+    var text = this.options[mode + 'Text'];
+    if ('button' == control) {
+      var btn = document.createElement('input');
+      btn.type = 'submit';
+      btn.value = text;
+      btn.className = 'editor_' + mode + '_button';
+      if ('cancel' == mode)
+        btn.onclick = this._boundCancelHandler;
+      this._form.appendChild(btn);
+      this._controls[mode] = btn;
+    } else if ('link' == control) {
+      var link = document.createElement('a');
+      link.href = '#';
+      link.appendChild(document.createTextNode(text));
+      link.onclick = 'cancel' == mode ? this._boundCancelHandler : this._boundSubmitHandler;
+      link.className = 'editor_' + mode + '_link';
+      if (extraClasses)
+        link.className += ' ' + extraClasses;
+      this._form.appendChild(link);
+      this._controls[mode] = link;
+    }
+  },
+  createEditField: function() {
+    var text = (this.options.loadTextURL ? this.options.loadingText : this.getText());
+    var fld;
+    if (1 >= this.options.rows && !/\r|\n/.test(this.getText())) {
+      fld = document.createElement('input');
+      fld.type = 'text';
+      var size = this.options.size || this.options.cols || 0;
+      if (0 < size) fld.size = size;
+    } else {
+      fld = document.createElement('textarea');
+      fld.rows = (1 >= this.options.rows ? this.options.autoRows : this.options.rows);
+      fld.cols = this.options.cols || 40;
+    }
+    fld.name = this.options.paramName;
+    fld.value = text; // No HTML breaks conversion anymore
+    fld.className = 'editor_field';
+    if (this.options.submitOnBlur)
+      fld.onblur = this._boundSubmitHandler;
+    this._controls.editor = fld;
+    if (this.options.loadTextURL)
+      this.loadExternalText();
+    this._form.appendChild(this._controls.editor);
+  },
+  createForm: function() {
+    var ipe = this;
+    function addText(mode, condition) {
+      var text = ipe.options['text' + mode + 'Controls'];
+      if (!text || condition === false) return;
+      ipe._form.appendChild(document.createTextNode(text));
+    };
+    this._form = $(document.createElement('form'));
+    this._form.id = this.options.formId;
+    this._form.addClassName(this.options.formClassName);
+    this._form.onsubmit = this._boundSubmitHandler;
+    this.createEditField();
+    if ('textarea' == this._controls.editor.tagName.toLowerCase())
+      this._form.appendChild(document.createElement('br'));
+    if (this.options.onFormCustomization)
+      this.options.onFormCustomization(this, this._form);
+    addText('Before', this.options.okControl || this.options.cancelControl);
+    this.createControl('ok', this._boundSubmitHandler);
+    addText('Between', this.options.okControl && this.options.cancelControl);
+    this.createControl('cancel', this._boundCancelHandler, 'editor_cancel');
+    addText('After', this.options.okControl || this.options.cancelControl);
+  },
+  destroy: function() {
+    if (this._oldInnerHTML)
+      this.element.innerHTML = this._oldInnerHTML;
+    this.leaveEditMode();
+    this.unregisterListeners();
+  },
+  enterEditMode: function(e) {
+    if (this._saving || this._editing) return;
+    this._editing = true;
+    this.triggerCallback('onEnterEditMode');
+    if (this.options.externalControl)
+      this.options.externalControl.hide();
+    this.element.hide();
+    this.createForm();
+    this.element.parentNode.insertBefore(this._form, this.element);
+    if (!this.options.loadTextURL)
+      this.postProcessEditField();
+    if (e) Event.stop(e);
+  },
+  enterHover: function(e) {
+    if (this.options.hoverClassName)
+      this.element.addClassName(this.options.hoverClassName);
+    if (this._saving) return;
+    this.triggerCallback('onEnterHover');
+  },
+  getText: function() {
+    return this.element.innerHTML.unescapeHTML();
+  },
+  handleAJAXFailure: function(transport) {
+    this.triggerCallback('onFailure', transport);
+    if (this._oldInnerHTML) {
+      this.element.innerHTML = this._oldInnerHTML;
+      this._oldInnerHTML = null;
+    }
+  },
+  handleFormCancellation: function(e) {
+    this.wrapUp();
+    if (e) Event.stop(e);
+  },
+  handleFormSubmission: function(e) {
+    var form = this._form;
+    var value = $F(this._controls.editor);
+    this.prepareSubmission();
+    var params = this.options.callback(form, value) || '';
+    if (Object.isString(params))
+      params = params.toQueryParams();
+    params.editorId = this.element.id;
+    if (this.options.htmlResponse) {
+      var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
+      Object.extend(options, {
+        parameters: params,
+        onComplete: this._boundWrapperHandler,
+        onFailure: this._boundFailureHandler
+      });
+      new Ajax.Updater({ success: this.element }, this.url, options);
+    } else {
+      var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+      Object.extend(options, {
+        parameters: params,
+        onComplete: this._boundWrapperHandler,
+        onFailure: this._boundFailureHandler
+      });
+      new Ajax.Request(this.url, options);
+    }
+    if (e) Event.stop(e);
+  },
+  leaveEditMode: function() {
+    this.element.removeClassName(this.options.savingClassName);
+    this.removeForm();
+    this.leaveHover();
+    this.element.style.backgroundColor = this._originalBackground;
+    this.element.show();
+    if (this.options.externalControl)
+      this.options.externalControl.show();
+    this._saving = false;
+    this._editing = false;
+    this._oldInnerHTML = null;
+    this.triggerCallback('onLeaveEditMode');
+  },
+  leaveHover: function(e) {
+    if (this.options.hoverClassName)
+      this.element.removeClassName(this.options.hoverClassName);
+    if (this._saving) return;
+    this.triggerCallback('onLeaveHover');
+  },
+  loadExternalText: function() {
+    this._form.addClassName(this.options.loadingClassName);
+    this._controls.editor.disabled = true;
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        this._form.removeClassName(this.options.loadingClassName);
+        var text = transport.responseText;
+        if (this.options.stripLoadedTextTags)
+          text = text.stripTags();
+        this._controls.editor.value = text;
+        this._controls.editor.disabled = false;
+        this.postProcessEditField();
+      }.bind(this),
+      onFailure: this._boundFailureHandler
+    });
+    new Ajax.Request(this.options.loadTextURL, options);
+  },
+  postProcessEditField: function() {
+    var fpc = this.options.fieldPostCreation;
+    if (fpc)
+      $(this._controls.editor)['focus' == fpc ? 'focus' : 'activate']();
+  },
+  prepareOptions: function() {
+    this.options = Object.clone(Ajax.InPlaceEditor.DefaultOptions);
+    Object.extend(this.options, Ajax.InPlaceEditor.DefaultCallbacks);
+    [this._extraDefaultOptions].flatten().compact().each(function(defs) {
+      Object.extend(this.options, defs);
+    }.bind(this));
+  },
+  prepareSubmission: function() {
+    this._saving = true;
+    this.removeForm();
+    this.leaveHover();
+    this.showSaving();
+  },
+  registerListeners: function() {
+    this._listeners = { };
+    var listener;
+    $H(Ajax.InPlaceEditor.Listeners).each(function(pair) {
+      listener = this[pair.value].bind(this);
+      this._listeners[pair.key] = listener;
+      if (!this.options.externalControlOnly)
+        this.element.observe(pair.key, listener);
+      if (this.options.externalControl)
+        this.options.externalControl.observe(pair.key, listener);
+    }.bind(this));
+  },
+  removeForm: function() {
+    if (!this._form) return;
+    this._form.remove();
+    this._form = null;
+    this._controls = { };
+  },
+  showSaving: function() {
+    this._oldInnerHTML = this.element.innerHTML;
+    this.element.innerHTML = this.options.savingText;
+    this.element.addClassName(this.options.savingClassName);
+    this.element.style.backgroundColor = this._originalBackground;
+    this.element.show();
+  },
+  triggerCallback: function(cbName, arg) {
+    if ('function' == typeof this.options[cbName]) {
+      this.options[cbName](this, arg);
+    }
+  },
+  unregisterListeners: function() {
+    $H(this._listeners).each(function(pair) {
+      if (!this.options.externalControlOnly)
+        this.element.stopObserving(pair.key, pair.value);
+      if (this.options.externalControl)
+        this.options.externalControl.stopObserving(pair.key, pair.value);
+    }.bind(this));
+  },
+  wrapUp: function(transport) {
+    this.leaveEditMode();
+    // Can't use triggerCallback due to backward compatibility: requires
+    // binding + direct element
+    this._boundComplete(transport, this.element);
+  }
+});
+
+Object.extend(Ajax.InPlaceEditor.prototype, {
+  dispose: Ajax.InPlaceEditor.prototype.destroy
+});
+
+Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, {
+  initialize: function($super, element, url, options) {
+    this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions;
+    $super(element, url, options);
+  },
+
+  createEditField: function() {
+    var list = document.createElement('select');
+    list.name = this.options.paramName;
+    list.size = 1;
+    this._controls.editor = list;
+    this._collection = this.options.collection || [];
+    if (this.options.loadCollectionURL)
+      this.loadCollection();
+    else
+      this.checkForExternalText();
+    this._form.appendChild(this._controls.editor);
+  },
+
+  loadCollection: function() {
+    this._form.addClassName(this.options.loadingClassName);
+    this.showLoadingText(this.options.loadingCollectionText);
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        var js = transport.responseText.strip();
+        if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
+          throw('Server returned an invalid collection representation.');
+        this._collection = eval(js);
+        this.checkForExternalText();
+      }.bind(this),
+      onFailure: this.onFailure
+    });
+    new Ajax.Request(this.options.loadCollectionURL, options);
+  },
+
+  showLoadingText: function(text) {
+    this._controls.editor.disabled = true;
+    var tempOption = this._controls.editor.firstChild;
+    if (!tempOption) {
+      tempOption = document.createElement('option');
+      tempOption.value = '';
+      this._controls.editor.appendChild(tempOption);
+      tempOption.selected = true;
+    }
+    tempOption.update((text || '').stripScripts().stripTags());
+  },
+
+  checkForExternalText: function() {
+    this._text = this.getText();
+    if (this.options.loadTextURL)
+      this.loadExternalText();
+    else
+      this.buildOptionList();
+  },
+
+  loadExternalText: function() {
+    this.showLoadingText(this.options.loadingText);
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        this._text = transport.responseText.strip();
+        this.buildOptionList();
+      }.bind(this),
+      onFailure: this.onFailure
+    });
+    new Ajax.Request(this.options.loadTextURL, options);
+  },
+
+  buildOptionList: function() {
+    this._form.removeClassName(this.options.loadingClassName);
+    this._collection = this._collection.map(function(entry) {
+      return 2 === entry.length ? entry : [entry, entry].flatten();
+    });
+    var marker = ('value' in this.options) ? this.options.value : this._text;
+    var textFound = this._collection.any(function(entry) {
+      return entry[0] == marker;
+    }.bind(this));
+    this._controls.editor.update('');
+    var option;
+    this._collection.each(function(entry, index) {
+      option = document.createElement('option');
+      option.value = entry[0];
+      option.selected = textFound ? entry[0] == marker : 0 == index;
+      option.appendChild(document.createTextNode(entry[1]));
+      this._controls.editor.appendChild(option);
+    }.bind(this));
+    this._controls.editor.disabled = false;
+    Field.scrollFreeActivate(this._controls.editor);
+  }
+});
+
+//**** DEPRECATION LAYER FOR InPlace[Collection]Editor! ****
+//**** This only  exists for a while,  in order to  let ****
+//**** users adapt to  the new API.  Read up on the new ****
+//**** API and convert your code to it ASAP!            ****
+
+Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) {
+  if (!options) return;
+  function fallback(name, expr) {
+    if (name in options || expr === undefined) return;
+    options[name] = expr;
+  };
+  fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' :
+    options.cancelLink == options.cancelButton == false ? false : undefined)));
+  fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' :
+    options.okLink == options.okButton == false ? false : undefined)));
+  fallback('highlightColor', options.highlightcolor);
+  fallback('highlightEndColor', options.highlightendcolor);
+};
+
+Object.extend(Ajax.InPlaceEditor, {
+  DefaultOptions: {
+    ajaxOptions: { },
+    autoRows: 3,                                // Use when multi-line w/ rows == 1
+    cancelControl: 'link',                      // 'link'|'button'|false
+    cancelText: 'cancel',
+    clickToEditText: 'Click to edit',
+    externalControl: null,                      // id|elt
+    externalControlOnly: false,
+    fieldPostCreation: 'activate',              // 'activate'|'focus'|false
+    formClassName: 'inplaceeditor-form',
+    formId: null,                               // id|elt
+    highlightColor: '#ffff99',
+    highlightEndColor: '#ffffff',
+    hoverClassName: '',
+    htmlResponse: true,
+    loadingClassName: 'inplaceeditor-loading',
+    loadingText: 'Loading...',
+    okControl: 'button',                        // 'link'|'button'|false
+    okText: 'ok',
+    paramName: 'value',
+    rows: 1,                                    // If 1 and multi-line, uses autoRows
+    savingClassName: 'inplaceeditor-saving',
+    savingText: 'Saving...',
+    size: 0,
+    stripLoadedTextTags: false,
+    submitOnBlur: false,
+    textAfterControls: '',
+    textBeforeControls: '',
+    textBetweenControls: ''
+  },
+  DefaultCallbacks: {
+    callback: function(form) {
+      return Form.serialize(form);
+    },
+    onComplete: function(transport, element) {
+      // For backward compatibility, this one is bound to the IPE, and passes
+      // the element directly.  It was too often customized, so we don't break it.
+      new Effect.Highlight(element, {
+        startcolor: this.options.highlightColor, keepBackgroundImage: true });
+    },
+    onEnterEditMode: null,
+    onEnterHover: function(ipe) {
+      ipe.element.style.backgroundColor = ipe.options.highlightColor;
+      if (ipe._effect)
+        ipe._effect.cancel();
+    },
+    onFailure: function(transport, ipe) {
+      alert('Error communication with the server: ' + transport.responseText.stripTags());
+    },
+    onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls.
+    onLeaveEditMode: null,
+    onLeaveHover: function(ipe) {
+      ipe._effect = new Effect.Highlight(ipe.element, {
+        startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor,
+        restorecolor: ipe._originalBackground, keepBackgroundImage: true
+      });
+    }
+  },
+  Listeners: {
+    click: 'enterEditMode',
+    keydown: 'checkForEscapeOrReturn',
+    mouseover: 'enterHover',
+    mouseout: 'leaveHover'
+  }
+});
+
+Ajax.InPlaceCollectionEditor.DefaultOptions = {
+  loadingCollectionText: 'Loading options...'
+};
+
+// Delayed observer, like Form.Element.Observer,
+// but waits for delay after last key input
+// Ideal for live-search fields
+
+Form.Element.DelayedObserver = Class.create({
+  initialize: function(element, delay, callback) {
+    this.delay     = delay || 0.5;
+    this.element   = $(element);
+    this.callback  = callback;
+    this.timer     = null;
+    this.lastValue = $F(this.element);
+    Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
+  },
+  delayedListener: function(event) {
+    if(this.lastValue == $F(this.element)) return;
+    if(this.timer) clearTimeout(this.timer);
+    this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000);
+    this.lastValue = $F(this.element);
+  },
+  onTimerEvent: function() {
+    this.timer = null;
+    this.callback(this.element, $F(this.element));
+  }
+});
\ No newline at end of file
Property changes on: branches/product_cleanup/web/src/main/webapp/js/controls.js
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native

Added: branches/product_cleanup/web/src/main/webapp/js/datasourcetest.js (0 => 2114)

--- branches/product_cleanup/web/src/main/webapp/js/datasourcetest.js	                        (rev 0)
+++ branches/product_cleanup/web/src/main/webapp/js/datasourcetest.js	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,285 @@
+var connectUrl = '';
+var recordsetUrl = '';
+var queryHistoryUrl = '';
+var sqlOutputDivId = 'outputHolder';
+var formId = 'sqlForm';
+var ajaxActivityId = 'ajaxActivity';
+var metaDataH3Id = 'metaDataH3';
+var resultsH3Id = "resultsH3";
+var historyContainerDivId = "queryHistoryContainer";
+var historyOutputDivId = 'queryHistoryHolder';
+var historyVisible = false;
+var historyWrapped = true;
+var historyHeight = 150;
+var optionsDivId = 'optionsDL';
+var optionsVisible = false;
+var ajaxActivityTimer;
+
+function setupAjaxActions(aConnectUrl, aRecordsetUrl, aQueryHistoryUrl) {
+    connectUrl = aConnectUrl;
+    recordsetUrl = aRecordsetUrl;
+    queryHistoryUrl = aQueryHistoryUrl;
+
+    var rules = {
+        'li#connect': function(element) {
+            element.onclick = function() {
+                testConnction();
+                $('sql').focus();
+                return false;
+            }
+        },
+        'li#executeSql': function(element) {
+            element.onclick = function() {
+                executeSql();
+                $('sql').focus();
+                return false;
+            }
+        },
+        'li#showHistory': function(element) {
+            element.onclick = function() {
+                showQueryHistory();
+                $('sql').focus();
+                return false;
+            }
+        },
+        'li#hideHistory': function(element) {
+            element.onclick = function() {
+                hideQueryHistory();
+                $('sql').focus();
+                return false;
+            }
+        },
+        'li#showOptions': function(element) {
+            element.onclick = function() {
+                showOptions();
+                $('sql').focus();
+                return false;
+            }
+        },
+        'li#hideOptions': function(element) {
+            element.onclick = function() {
+                hideOptions();
+                $('sql').focus();
+                return false;
+            }
+        },
+        'li#wrap': function(element) {
+            element.onclick = function() {
+                wrapQueryHistory();
+                $('sql').focus();
+                return false;
+            }
+        },
+        'li#nowrap': function(element) {
+            element.onclick = function() {
+                nowrapQueryHistory();
+                $('sql').focus();
+                return false;
+            }
+        }
+    }
+
+    Behaviour.register(rules);
+}
+
+function testConnction() {
+    hideQueryHistory();
+    Element.show(ajaxActivityId);
+    Element.hide(resultsH3Id);
+    Element.show(metaDataH3Id);
+    $('rowsAffected').innerHTML = "";
+    $('pagebanner').innerHTML = "";
+    $('pagelinks').innerHTML = "";
+    var params = Form.serialize(formId);
+    new Ajax.Updater(sqlOutputDivId, connectUrl, {method: 'post', postBody: params, onComplete: function(req, obj) {
+        if (ajaxActivityTimer) clearTimeout(ajaxActivityTimer);
+        ajaxActivityTimer = setTimeout('Element.hide("' + ajaxActivityId + '")', 250);
+        $('sqlResultsWrapper').show();
+    }});
+}
+
+function executeSql() {
+    hideQueryHistory();
+    Element.show(ajaxActivityId);
+    Element.hide(metaDataH3Id);
+    Element.show(resultsH3Id);
+    var params = Form.serialize(formId);
+    new Ajax.Updater(sqlOutputDivId, recordsetUrl, {method: 'post', postBody: params}).onComplete = function() {
+        setupPaginationLinks();
+        if ($('rs_empty') || $('rs_error')) {
+            $('left_scroller').hide();
+            $('right_scroller').hide();
+            $('separator').hide();
+        } else {
+            $('left_scroller').show();
+            $('right_scroller').show();
+            $('separator').show();
+        }
+        $('sqlResultsWrapper').show();
+    };
+}
+
+function setupPaginationLinks(req, obj) {
+    if ($('rs_rowsAffected') && $('rs_pagebanner') && $('rs_pagelinks')) {
+        $('rowsAffected').innerHTML = $('rs_rowsAffected').innerHTML;
+        $('pagebanner').innerHTML = $('rs_pagebanner').innerHTML;
+        $('pagelinks').innerHTML = $('rs_pagelinks').innerHTML;
+    } else {
+        $('rowsAffected').innerHTML = "";
+        $('pagebanner').innerHTML = "";
+        $('pagelinks').innerHTML = "";
+    }
+
+    var links = $$('#pagelinks a');
+
+    links.each(function(lnk) {
+        lnk.onclick = function() {
+            Element.show(ajaxActivityId);
+            Element.show(resultsH3Id);
+            var p = Form.serialize(formId);
+            new Ajax.Updater(sqlOutputDivId, lnk.href, {method: 'post', postBody: p, onComplete: setupPaginationLinks});
+            return false;
+        }
+    });
+
+    if (ajaxActivityTimer) clearTimeout(ajaxActivityTimer);
+    ajaxActivityTimer = setTimeout('Element.hide("' + ajaxActivityId + '")', 250);
+}
+
+/*
+    event handlers to display a query history list
+*/
+
+function showQueryHistory() {
+    new Ajax.Updater(historyOutputDivId, queryHistoryUrl, {method: 'post', onComplete: function(req, obj) {
+        Element.hide('showHistory');
+        Element.show('hideHistory');
+        Element.setStyle(historyOutputDivId, {height: historyHeight + 'px'});
+        Effect.Appear(historyContainerDivId, {duration:0.20});
+
+        if (historyWrapped) {
+            wrapQueryHistory();
+        } else {
+            nowrapQueryHistory();
+        }
+
+        historyVisible = true;
+    }});
+}
+
+function getQueryHistoryItem(lnk) {
+    new Ajax.Request(lnk.href, {method: 'get', onComplete: function(lnkReq) {
+        $('sql').value = lnkReq.responseText;
+    }});
+
+    hideQueryHistory();
+    $('sql').focus();
+}
+
+function hideQueryHistory() {
+    Element.hide('hideHistory');
+    Element.show('showHistory');
+    Effect.Fade(historyContainerDivId, {duration:0.20});
+    historyVisible = false;
+}
+
+function wrapQueryHistory() {
+    Element.setStyle(historyOutputDivId, {"white-space": "normal"});
+    Element.hide('wrap');
+    Element.show('nowrap');
+    historyWrapped = true;
+}
+
+function nowrapQueryHistory() {
+    Element.setStyle(historyOutputDivId, {"white-space": "nowrap"});
+    Element.hide('nowrap');
+    Element.show('wrap');
+    historyWrapped = false;
+}
+
+/*
+    event handlers to display an option entry form
+*/
+
+function showOptions() {
+    Element.hide('showOptions');
+    Element.show('hideOptions');
+    Effect.Appear(optionsDivId, {duration:0.20});
+    optionsVisible = true;
+}
+
+function hideOptions() {
+    Element.hide('hideOptions');
+    Element.show('showOptions');
+    Effect.Fade(optionsDivId, {duration:0.20});
+    optionsVisible = false;
+}
+
+/*
+    event handlers to provide keyboard shortcuts for major form actions
+*/
+
+function setupShortcuts() {
+    var rules = {
+        'body': function(element) {
+            element.onkeydown = function() {
+                var sUserAgent = navigator.userAgent;
+                var isIE = sUserAgent.indexOf('compatible') > -1 && sUserAgent.indexOf('MSIE') > -1
+                var e;
+
+                if (isIE) {
+                    e = window.event;
+                } else {
+                    e = arguments[0];
+                }
+
+                if (e.keyCode == 13 && e.ctrlKey && ! e.altKey && ! e.shiftKey) {
+                    executeSql();
+                    $('sql').focus();
+                } else if (e.keyCode == 40 && e.ctrlKey && ! e.altKey && ! e.shiftKey) {
+                    if (historyVisible) {
+                        hideQueryHistory();
+                    } else {
+                        showQueryHistory();
+                    }
+                    $('sql').focus();
+                } else if (e.keyCode == 38 && e.ctrlKey && ! e.altKey && ! e.shiftKey) {
+                    if (optionsVisible) {
+                        hideOptions();
+                        $('sql').focus();
+                    } else {
+                        showOptions();
+                        $('sql').focus();
+                    }
+                }
+            }
+        }
+    };
+
+    Behaviour.register(rules);
+}
+
+/*
+   event handlers for sql textarea and query history div resizing
+*/
+
+function resizeTextArea(drag) {
+    var deltaY = drag.currentDelta()[1];
+    var h = (Element.getDimensions('sql').height + deltaY);
+    h = Math.max(h, 100);
+    Element.setStyle('sql', {height: h + 'px'});
+}
+
+function resizeQueryHistory(drag) {
+    var deltaY = drag.currentDelta()[1];
+    var h = (Element.getDimensions(historyOutputDivId).height + deltaY);
+    h = Math.max(h, 20);
+    historyHeight = h;
+    Element.setStyle(historyOutputDivId, {height: h + 'px'});
+}
+
+function revertDragHandle(handle) {
+    handle.style.top = 0;
+    handle.style.position = 'relative';
+    $('sql').focus();
+}
Property changes on: branches/product_cleanup/web/src/main/webapp/js/datasourcetest.js
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native

Added: branches/product_cleanup/web/src/main/webapp/js/dragdrop.js (0 => 2114)

--- branches/product_cleanup/web/src/main/webapp/js/dragdrop.js	                        (rev 0)
+++ branches/product_cleanup/web/src/main/webapp/js/dragdrop.js	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,975 @@
+// script.aculo.us dragdrop.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2008 Sammi Williams (http://www.oriontransfer.co.nz, sammi@...)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+if(Object.isUndefined(Effect))
+  throw("dragdrop.js requires including script.aculo.us' effects.js library");
+
+var Droppables = {
+  drops: [],
+
+  remove: function(element) {
+    this.drops = this.drops.reject(function(d) { return d.element==$(element) });
+  },
+
+  add: function(element) {
+    element = $(element);
+    var options = Object.extend({
+      greedy:     true,
+      hoverclass: null,
+      tree:       false
+    }, arguments[1] || { });
+
+    // cache containers
+    if(options.containment) {
+      options._containers = [];
+      var containment = options.containment;
+      if(Object.isArray(containment)) {
+        containment.each( function(c) { options._containers.push($(c)) });
+      } else {
+        options._containers.push($(containment));
+      }
+    }
+
+    if(options.accept) options.accept = [options.accept].flatten();
+
+    Element.makePositioned(element); // fix IE
+    options.element = element;
+
+    this.drops.push(options);
+  },
+
+  findDeepestChild: function(drops) {
+    deepest = drops[0];
+
+    for (i = 1; i < drops.length; ++i)
+      if (Element.isParent(drops[i].element, deepest.element))
+        deepest = drops[i];
+
+    return deepest;
+  },
+
+  isContained: function(element, drop) {
+    var containmentNode;
+    if(drop.tree) {
+      containmentNode = element.treeNode;
+    } else {
+      containmentNode = element.parentNode;
+    }
+    return drop._containers.detect(function(c) { return containmentNode == c });
+  },
+
+  isAffected: function(point, element, drop) {
+    return (
+      (drop.element!=element) &&
+      ((!drop._containers) ||
+        this.isContained(element, drop)) &&
+      ((!drop.accept) ||
+        (Element.classNames(element).detect(
+          function(v) { return drop.accept.include(v) } ) )) &&
+      Position.within(drop.element, point[0], point[1]) );
+  },
+
+  deactivate: function(drop) {
+    if(drop.hoverclass)
+      Element.removeClassName(drop.element, drop.hoverclass);
+    this.last_active = null;
+  },
+
+  activate: function(drop) {
+    if(drop.hoverclass)
+      Element.addClassName(drop.element, drop.hoverclass);
+    this.last_active = drop;
+  },
+
+  show: function(point, element) {
+    if(!this.drops.length) return;
+    var drop, affected = [];
+
+    this.drops.each( function(drop) {
+      if(Droppables.isAffected(point, element, drop))
+        affected.push(drop);
+    });
+
+    if(affected.length>0)
+      drop = Droppables.findDeepestChild(affected);
+
+    if(this.last_active && this.last_active != drop) this.deactivate(this.last_active);
+    if (drop) {
+      Position.within(drop.element, point[0], point[1]);
+      if(drop.onHover)
+        drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
+
+      if (drop != this.last_active) Droppables.activate(drop);
+    }
+  },
+
+  fire: function(event, element) {
+    if(!this.last_active) return;
+    Position.prepare();
+
+    if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
+      if (this.last_active.onDrop) {
+        this.last_active.onDrop(element, this.last_active.element, event);
+        return true;
+      }
+  },
+
+  reset: function() {
+    if(this.last_active)
+      this.deactivate(this.last_active);
+  }
+};
+
+var Draggables = {
+  drags: [],
+  observers: [],
+
+  register: function(draggable) {
+    if(this.drags.length == 0) {
+      this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
+      this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
+      this.eventKeypress  = this.keyPress.bindAsEventListener(this);
+
+      Event.observe(document, "mouseup", this.eventMouseUp);
+      Event.observe(document, "mousemove", this.eventMouseMove);
+      Event.observe(document, "keypress", this.eventKeypress);
+    }
+    this.drags.push(draggable);
+  },
+
+  unregister: function(draggable) {
+    this.drags = this.drags.reject(function(d) { return d==draggable });
+    if(this.drags.length == 0) {
+      Event.stopObserving(document, "mouseup", this.eventMouseUp);
+      Event.stopObserving(document, "mousemove", this.eventMouseMove);
+      Event.stopObserving(document, "keypress", this.eventKeypress);
+    }
+  },
+
+  activate: function(draggable) {
+    if(draggable.options.delay) {
+      this._timeout = setTimeout(function() {
+        Draggables._timeout = null;
+        window.focus();
+        Draggables.activeDraggable = draggable;
+      }.bind(this), draggable.options.delay);
+    } else {
+      window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
+      this.activeDraggable = draggable;
+    }
+  },
+
+  deactivate: function() {
+    this.activeDraggable = null;
+  },
+
+  updateDrag: function(event) {
+    if(!this.activeDraggable) return;
+    var pointer = [Event.pointerX(event), Event.pointerY(event)];
+    // Mozilla-based browsers fire successive mousemove events with
+    // the same coordinates, prevent needless redrawing (moz bug?)
+    if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
+    this._lastPointer = pointer;
+
+    this.activeDraggable.updateDrag(event, pointer);
+  },
+
+  endDrag: function(event) {
+    if(this._timeout) {
+      clearTimeout(this._timeout);
+      this._timeout = null;
+    }
+    if(!this.activeDraggable) return;
+    this._lastPointer = null;
+    this.activeDraggable.endDrag(event);
+    this.activeDraggable = null;
+  },
+
+  keyPress: function(event) {
+    if(this.activeDraggable)
+      this.activeDraggable.keyPress(event);
+  },
+
+  addObserver: function(observer) {
+    this.observers.push(observer);
+    this._cacheObserverCallbacks();
+  },
+
+  removeObserver: function(element) {  // element instead of observer fixes mem leaks
+    this.observers = this.observers.reject( function(o) { return o.element==element });
+    this._cacheObserverCallbacks();
+  },
+
+  notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
+    if(this[eventName+'Count'] > 0)
+      this.observers.each( function(o) {
+        if(o[eventName]) o[eventName](eventName, draggable, event);
+      });
+    if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
+  },
+
+  _cacheObserverCallbacks: function() {
+    ['onStart','onEnd','onDrag'].each( function(eventName) {
+      Draggables[eventName+'Count'] = Draggables.observers.select(
+        function(o) { return o[eventName]; }
+      ).length;
+    });
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+var Draggable = Class.create({
+  initialize: function(element) {
+    var defaults = {
+      handle: false,
+      reverteffect: function(element, top_offset, left_offset) {
+        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
+        new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur,
+          queue: {scope:'_draggable', position:'end'}
+        });
+      },
+      endeffect: function(element) {
+        var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
+        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
+          queue: {scope:'_draggable', position:'end'},
+          afterFinish: function(){
+            Draggable._dragging[element] = false
+          }
+        });
+      },
+      zindex: 1000,
+      revert: false,
+      quiet: false,
+      scroll: false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
+      snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
+      delay: 0
+    };
+
+    if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
+      Object.extend(defaults, {
+        starteffect: function(element) {
+          element._opacity = Element.getOpacity(element);
+          Draggable._dragging[element] = true;
+          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
+        }
+      });
+
+    var options = Object.extend(defaults, arguments[1] || { });
+
+    this.element = $(element);
+
+    if(options.handle && Object.isString(options.handle))
+      this.handle = this.element.down('.'+options.handle, 0);
+
+    if(!this.handle) this.handle = $(options.handle);
+    if(!this.handle) this.handle = this.element;
+
+    if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
+      options.scroll = $(options.scroll);
+      this._isScrollChild = Element.childOf(this.element, options.scroll);
+    }
+
+    Element.makePositioned(this.element); // fix IE
+
+    this.options  = options;
+    this.dragging = false;
+
+    this.eventMouseDown = this.initDrag.bindAsEventListener(this);
+    Event.observe(this.handle, "mousedown", this.eventMouseDown);
+
+    Draggables.register(this);
+  },
+
+  destroy: function() {
+    Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
+    Draggables.unregister(this);
+  },
+
+  currentDelta: function() {
+    return([
+      parseInt(Element.getStyle(this.element,'left') || '0'),
+      parseInt(Element.getStyle(this.element,'top') || '0')]);
+  },
+
+  initDrag: function(event) {
+    if(!Object.isUndefined(Draggable._dragging[this.element]) &&
+      Draggable._dragging[this.element]) return;
+    if(Event.isLeftClick(event)) {
+      // abort on form elements, fixes a Firefox issue
+      var src = Event.element(event);
+      if((tag_name = src.tagName.toUpperCase()) && (
+        tag_name=='INPUT' ||
+        tag_name=='SELECT' ||
+        tag_name=='OPTION' ||
+        tag_name=='BUTTON' ||
+        tag_name=='TEXTAREA')) return;
+
+      var pointer = [Event.pointerX(event), Event.pointerY(event)];
+      var pos     = Position.cumulativeOffset(this.element);
+      this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
+
+      Draggables.activate(this);
+      Event.stop(event);
+    }
+  },
+
+  startDrag: function(event) {
+    this.dragging = true;
+    if(!this.delta)
+      this.delta = this.currentDelta();
+
+    if(this.options.zindex) {
+      this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
+      this.element.style.zIndex = this.options.zindex;
+    }
+
+    if(this.options.ghosting) {
+      this._clone = this.element.cloneNode(true);
+      this._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
+      if (!this._originallyAbsolute)
+        Position.absolutize(this.element);
+      this.element.parentNode.insertBefore(this._clone, this.element);
+    }
+
+    if(this.options.scroll) {
+      if (this.options.scroll == window) {
+        var where = this._getWindowScroll(this.options.scroll);
+        this.originalScrollLeft = where.left;
+        this.originalScrollTop = where.top;
+      } else {
+        this.originalScrollLeft = this.options.scroll.scrollLeft;
+        this.originalScrollTop = this.options.scroll.scrollTop;
+      }
+    }
+
+    Draggables.notify('onStart', this, event);
+
+    if(this.options.starteffect) this.options.starteffect(this.element);
+  },
+
+  updateDrag: function(event, pointer) {
+    if(!this.dragging) this.startDrag(event);
+
+    if(!this.options.quiet){
+      Position.prepare();
+      Droppables.show(pointer, this.element);
+    }
+
+    Draggables.notify('onDrag', this, event);
+
+    this.draw(pointer);
+    if(this.options.change) this.options.change(this);
+
+    if(this.options.scroll) {
+      this.stopScrolling();
+
+      var p;
+      if (this.options.scroll == window) {
+        with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
+      } else {
+        p = Position.page(this.options.scroll);
+        p[0] += this.options.scroll.scrollLeft + Position.deltaX;
+        p[1] += this.options.scroll.scrollTop + Position.deltaY;
+        p.push(p[0]+this.options.scroll.offsetWidth);
+        p.push(p[1]+this.options.scroll.offsetHeight);
+      }
+      var speed = [0,0];
+      if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
+      if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity);
+      if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity);
+      if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
+      this.startScrolling(speed);
+    }
+
+    // fix AppleWebKit rendering
+    if(Prototype.Browser.WebKit) window.scrollBy(0,0);
+
+    Event.stop(event);
+  },
+
+  finishDrag: function(event, success) {
+    this.dragging = false;
+
+    if(this.options.quiet){
+      Position.prepare();
+      var pointer = [Event.pointerX(event), Event.pointerY(event)];
+      Droppables.show(pointer, this.element);
+    }
+
+    if(this.options.ghosting) {
+      if (!this._originallyAbsolute)
+        Position.relativize(this.element);
+      delete this._originallyAbsolute;
+      Element.remove(this._clone);
+      this._clone = null;
+    }
+
+    var dropped = false;
+    if(success) {
+      dropped = Droppables.fire(event, this.element);
+      if (!dropped) dropped = false;
+    }
+    if(dropped && this.options.onDropped) this.options.onDropped(this.element);
+    Draggables.notify('onEnd', this, event);
+
+    var revert = this.options.revert;
+    if(revert && Object.isFunction(revert)) revert = revert(this.element);
+
+    var d = this.currentDelta();
+    if(revert && this.options.reverteffect) {
+      if (dropped == 0 || revert != 'failure')
+        this.options.reverteffect(this.element,
+          d[1]-this.delta[1], d[0]-this.delta[0]);
+    } else {
+      this.delta = d;
+    }
+
+    if(this.options.zindex)
+      this.element.style.zIndex = this.originalZ;
+
+    if(this.options.endeffect)
+      this.options.endeffect(this.element);
+
+    Draggables.deactivate(this);
+    Droppables.reset();
+  },
+
+  keyPress: function(event) {
+    if(event.keyCode!=Event.KEY_ESC) return;
+    this.finishDrag(event, false);
+    Event.stop(event);
+  },
+
+  endDrag: function(event) {
+    if(!this.dragging) return;
+    this.stopScrolling();
+    this.finishDrag(event, true);
+    Event.stop(event);
+  },
+
+  draw: function(point) {
+    var pos = Position.cumulativeOffset(this.element);
+    if(this.options.ghosting) {
+      var r   = Position.realOffset(this.element);
+      pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
+    }
+
+    var d = this.currentDelta();
+    pos[0] -= d[0]; pos[1] -= d[1];
+
+    if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
+      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
+      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
+    }
+
+    var p = [0,1].map(function(i){
+      return (point[i]-pos[i]-this.offset[i])
+    }.bind(this));
+
+    if(this.options.snap) {
+      if(Object.isFunction(this.options.snap)) {
+        p = this.options.snap(p[0],p[1],this);
+      } else {
+      if(Object.isArray(this.options.snap)) {
+        p = p.map( function(v, i) {
+          return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this));
+      } else {
+        p = p.map( function(v) {
+          return (v/this.options.snap).round()*this.options.snap }.bind(this));
+      }
+    }}
+
+    var style = this.element.style;
+    if((!this.options.constraint) || (this.options.constraint=='horizontal'))
+      style.left = p[0] + "px";
+    if((!this.options.constraint) || (this.options.constraint=='vertical'))
+      style.top  = p[1] + "px";
+
+    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
+  },
+
+  stopScrolling: function() {
+    if(this.scrollInterval) {
+      clearInterval(this.scrollInterval);
+      this.scrollInterval = null;
+      Draggables._lastScrollPointer = null;
+    }
+  },
+
+  startScrolling: function(speed) {
+    if(!(speed[0] || speed[1])) return;
+    this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
+    this.lastScrolled = new Date();
+    this.scrollInterval = setInterval(this.scroll.bind(this), 10);
+  },
+
+  scroll: function() {
+    var current = new Date();
+    var delta = current - this.lastScrolled;
+    this.lastScrolled = current;
+    if(this.options.scroll == window) {
+      with (this._getWindowScroll(this.options.scroll)) {
+        if (this.scrollSpeed[0] || this.scrollSpeed[1]) {
+          var d = delta / 1000;
+          this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] );
+        }
+      }
+    } else {
+      this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
+      this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
+    }
+
+    Position.prepare();
+    Droppables.show(Draggables._lastPointer, this.element);
+    Draggables.notify('onDrag', this);
+    if (this._isScrollChild) {
+      Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
+      Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
+      Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
+      if (Draggables._lastScrollPointer[0] < 0)
+        Draggables._lastScrollPointer[0] = 0;
+      if (Draggables._lastScrollPointer[1] < 0)
+        Draggables._lastScrollPointer[1] = 0;
+      this.draw(Draggables._lastScrollPointer);
+    }
+
+    if(this.options.change) this.options.change(this);
+  },
+
+  _getWindowScroll: function(w) {
+    var T, L, W, H;
+    with (w.document) {
+      if (w.document.documentElement && documentElement.scrollTop) {
+        T = documentElement.scrollTop;
+        L = documentElement.scrollLeft;
+      } else if (w.document.body) {
+        T = body.scrollTop;
+        L = body.scrollLeft;
+      }
+      if (w.innerWidth) {
+        W = w.innerWidth;
+        H = w.innerHeight;
+      } else if (w.document.documentElement && documentElement.clientWidth) {
+        W = documentElement.clientWidth;
+        H = documentElement.clientHeight;
+      } else {
+        W = body.offsetWidth;
+        H = body.offsetHeight;
+      }
+    }
+    return { top: T, left: L, width: W, height: H };
+  }
+});
+
+Draggable._dragging = { };
+
+/*--------------------------------------------------------------------------*/
+
+var SortableObserver = Class.create({
+  initialize: function(element, observer) {
+    this.element   = $(element);
+    this.observer  = observer;
+    this.lastValue = Sortable.serialize(this.element);
+  },
+
+  onStart: function() {
+    this.lastValue = Sortable.serialize(this.element);
+  },
+
+  onEnd: function() {
+    Sortable.unmark();
+    if(this.lastValue != Sortable.serialize(this.element))
+      this.observer(this.element)
+  }
+});
+
+var Sortable = {
+  SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
+
+  sortables: { },
+
+  _findRootElement: function(element) {
+    while (element.tagName.toUpperCase() != "BODY") {
+      if(element.id && Sortable.sortables[element.id]) return element;
+      element = element.parentNode;
+    }
+  },
+
+  options: function(element) {
+    element = Sortable._findRootElement($(element));
+    if(!element) return;
+    return Sortable.sortables[element.id];
+  },
+
+  destroy: function(element){
+    element = $(element);
+    var s = Sortable.sortables[element.id];
+
+    if(s) {
+      Draggables.removeObserver(s.element);
+      s.droppables.each(function(d){ Droppables.remove(d) });
+      s.draggables.invoke('destroy');
+
+      delete Sortable.sortables[s.element.id];
+    }
+  },
+
+  create: function(element) {
+    element = $(element);
+    var options = Object.extend({
+      element:     element,
+      tag:         'li',       // assumes li children, override with tag: 'tagname'
+      dropOnEmpty: false,
+      tree:        false,
+      treeTag:     'ul',
+      overlap:     'vertical', // one of 'vertical', 'horizontal'
+      constraint:  'vertical', // one of 'vertical', 'horizontal', false
+      containment: element,    // also takes array of elements (or id's); or false
+      handle:      false,      // or a CSS class
+      only:        false,
+      delay:       0,
+      hoverclass:  null,
+      ghosting:    false,
+      quiet:       false,
+      scroll:      false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
+      format:      this.SERIALIZE_RULE,
+
+      // these take arrays of elements or ids and can be
+      // used for better initialization performance
+      elements:    false,
+      handles:     false,
+
+      onChange:    Prototype.emptyFunction,
+      onUpdate:    Prototype.emptyFunction
+    }, arguments[1] || { });
+
+    // clear any old sortable with same element
+    this.destroy(element);
+
+    // build options for the draggables
+    var options_for_draggable = {
+      revert:      true,
+      quiet:       options.quiet,
+      scroll:      options.scroll,
+      scrollSpeed: options.scrollSpeed,
+      scrollSensitivity: options.scrollSensitivity,
+      delay:       options.delay,
+      ghosting:    options.ghosting,
+      constraint:  options.constraint,
+      handle:      options.handle };
+
+    if(options.starteffect)
+      options_for_draggable.starteffect = options.starteffect;
+
+    if(options.reverteffect)
+      options_for_draggable.reverteffect = options.reverteffect;
+    else
+      if(options.ghosting) options_for_draggable.reverteffect = function(element) {
+        element.style.top  = 0;
+        element.style.left = 0;
+      };
+
+    if(options.endeffect)
+      options_for_draggable.endeffect = options.endeffect;
+
+    if(options.zindex)
+      options_for_draggable.zindex = options.zindex;
+
+    // build options for the droppables
+    var options_for_droppable = {
+      overlap:     options.overlap,
+      containment: options.containment,
+      tree:        options.tree,
+      hoverclass:  options.hoverclass,
+      onHover:     Sortable.onHover
+    };
+
+    var options_for_tree = {
+      onHover:      Sortable.onEmptyHover,
+      overlap:      options.overlap,
+      containment:  options.containment,
+      hoverclass:   options.hoverclass
+    };
+
+    // fix for gecko engine
+    Element.cleanWhitespace(element);
+
+    options.draggables = [];
+    options.droppables = [];
+
+    // drop on empty handling
+    if(options.dropOnEmpty || options.tree) {
+      Droppables.add(element, options_for_tree);
+      options.droppables.push(element);
+    }
+
+    (options.elements || this.findElements(element, options) || []).each( function(e,i) {
+      var handle = options.handles ? $(options.handles[i]) :
+        (options.handle ? $(e).select('.' + options.handle)[0] : e);
+      options.draggables.push(
+        new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
+      Droppables.add(e, options_for_droppable);
+      if(options.tree) e.treeNode = element;
+      options.droppables.push(e);
+    });
+
+    if(options.tree) {
+      (Sortable.findTreeElements(element, options) || []).each( function(e) {
+        Droppables.add(e, options_for_tree);
+        e.treeNode = element;
+        options.droppables.push(e);
+      });
+    }
+
+    // keep reference
+    this.sortables[element.id] = options;
+
+    // for onupdate
+    Draggables.addObserver(new SortableObserver(element, options.onUpdate));
+
+  },
+
+  // return all suitable-for-sortable elements in a guaranteed order
+  findElements: function(element, options) {
+    return Element.findChildren(
+      element, options.only, options.tree ? true : false, options.tag);
+  },
+
+  findTreeElements: function(element, options) {
+    return Element.findChildren(
+      element, options.only, options.tree ? true : false, options.treeTag);
+  },
+
+  onHover: function(element, dropon, overlap) {
+    if(Element.isParent(dropon, element)) return;
+
+    if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) {
+      return;
+    } else if(overlap>0.5) {
+      Sortable.mark(dropon, 'before');
+      if(dropon.previousSibling != element) {
+        var oldParentNode = element.parentNode;
+        element.style.visibility = "hidden"; // fix gecko rendering
+        dropon.parentNode.insertBefore(element, dropon);
+        if(dropon.parentNode!=oldParentNode)
+          Sortable.options(oldParentNode).onChange(element);
+        Sortable.options(dropon.parentNode).onChange(element);
+      }
+    } else {
+      Sortable.mark(dropon, 'after');
+      var nextElement = dropon.nextSibling || null;
+      if(nextElement != element) {
+        var oldParentNode = element.parentNode;
+        element.style.visibility = "hidden"; // fix gecko rendering
+        dropon.parentNode.insertBefore(element, nextElement);
+        if(dropon.parentNode!=oldParentNode)
+          Sortable.options(oldParentNode).onChange(element);
+        Sortable.options(dropon.parentNode).onChange(element);
+      }
+    }
+  },
+
+  onEmptyHover: function(element, dropon, overlap) {
+    var oldParentNode = element.parentNode;
+    var droponOptions = Sortable.options(dropon);
+
+    if(!Element.isParent(dropon, element)) {
+      var index;
+
+      var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
+      var child = null;
+
+      if(children) {
+        var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
+
+        for (index = 0; index < children.length; index += 1) {
+          if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
+            offset -= Element.offsetSize (children[index], droponOptions.overlap);
+          } else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) {
+            child = index + 1 < children.length ? children[index + 1] : null;
+            break;
+          } else {
+            child = children[index];
+            break;
+          }
+        }
+      }
+
+      dropon.insertBefore(element, child);
+
+      Sortable.options(oldParentNode).onChange(element);
+      droponOptions.onChange(element);
+    }
+  },
+
+  unmark: function() {
+    if(Sortable._marker) Sortable._marker.hide();
+  },
+
+  mark: function(dropon, position) {
+    // mark on ghosting only
+    var sortable = Sortable.options(dropon.parentNode);
+    if(sortable && !sortable.ghosting) return;
+
+    if(!Sortable._marker) {
+      Sortable._marker =
+        ($('dropmarker') || Element.extend(document.createElement('DIV'))).
+          hide().addClassName('dropmarker').setStyle({position:'absolute'});
+      document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
+    }
+    var offsets = Position.cumulativeOffset(dropon);
+    Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
+
+    if(position=='after')
+      if(sortable.overlap == 'horizontal')
+        Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
+      else
+        Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
+
+    Sortable._marker.show();
+  },
+
+  _tree: function(element, options, parent) {
+    var children = Sortable.findElements(element, options) || [];
+
+    for (var i = 0; i < children.length; ++i) {
+      var match = children[i].id.match(options.format);
+
+      if (!match) continue;
+
+      var child = {
+        id: encodeURIComponent(match ? match[1] : null),
+        element: element,
+        parent: parent,
+        children: [],
+        position: parent.children.length,
+        container: $(children[i]).down(options.treeTag)
+      };
+
+      /* Get the element containing the children and recurse over it */
+      if (child.container)
+        this._tree(child.container, options, child);
+
+      parent.children.push (child);
+    }
+
+    return parent;
+  },
+
+  tree: function(element) {
+    element = $(element);
+    var sortableOptions = this.options(element);
+    var options = Object.extend({
+      tag: sortableOptions.tag,
+      treeTag: sortableOptions.treeTag,
+      only: sortableOptions.only,
+      name: element.id,
+      format: sortableOptions.format
+    }, arguments[1] || { });
+
+    var root = {
+      id: null,
+      parent: null,
+      children: [],
+      container: element,
+      position: 0
+    };
+
+    return Sortable._tree(element, options, root);
+  },
+
+  /* Construct a [i] index for a particular node */
+  _constructIndex: function(node) {
+    var index = '';
+    do {
+      if (node.id) index = '[' + node.position + ']' + index;
+    } while ((node = node.parent) != null);
+    return index;
+  },
+
+  sequence: function(element) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[1] || { });
+
+    return $(this.findElements(element, options) || []).map( function(item) {
+      return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
+    });
+  },
+
+  setSequence: function(element, new_sequence) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[2] || { });
+
+    var nodeMap = { };
+    this.findElements(element, options).each( function(n) {
+        if (n.id.match(options.format))
+            nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
+        n.parentNode.removeChild(n);
+    });
+
+    new_sequence.each(function(ident) {
+      var n = nodeMap[ident];
+      if (n) {
+        n[1].appendChild(n[0]);
+        delete nodeMap[ident];
+      }
+    });
+  },
+
+  serialize: function(element) {
+    element = $(element);
+    var options = Object.extend(Sortable.options(element), arguments[1] || { });
+    var name = encodeURIComponent(
+      (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
+
+    if (options.tree) {
+      return Sortable.tree(element, arguments[1]).children.map( function (item) {
+        return [name + Sortable._constructIndex(item) + "[id]=" +
+                encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
+      }).flatten().join('&');
+    } else {
+      return Sortable.sequence(element, arguments[1]).map( function(item) {
+        return name + "[]=" + encodeURIComponent(item);
+      }).join('&');
+    }
+  }
+};
+
+// Returns true if child is contained within element
+Element.isParent = function(child, element) {
+  if (!child.parentNode || child == element) return false;
+  if (child.parentNode == element) return true;
+  return Element.isParent(child.parentNode, element);
+};
+
+Element.findChildren = function(element, only, recursive, tagName) {
+  if(!element.hasChildNodes()) return null;
+  tagName = tagName.toUpperCase();
+  if(only) only = [only].flatten();
+  var elements = [];
+  $A(element.childNodes).each( function(e) {
+    if(e.tagName && e.tagName.toUpperCase()==tagName &&
+      (!only || (Element.classNames(e).detect(function(v) { return only.include(v) }))))
+        elements.push(e);
+    if(recursive) {
+      var grandchildren = Element.findChildren(e, only, recursive, tagName);
+      if(grandchildren) elements.push(grandchildren);
+    }
+  });
+
+  return (elements.length>0 ? elements.flatten() : []);
+};
+
+Element.offsetSize = function (element, type) {
+  return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
+};
\ No newline at end of file
Property changes on: branches/product_cleanup/web/src/main/webapp/js/dragdrop.js
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native

Added: branches/product_cleanup/web/src/main/webapp/js/effects.js (0 => 2114)

--- branches/product_cleanup/web/src/main/webapp/js/effects.js	                        (rev 0)
+++ branches/product_cleanup/web/src/main/webapp/js/effects.js	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,1130 @@
+// script.aculo.us effects.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Contributors:
+//  Justin Palmer (http://encytemedia.com/)
+//  Mark Pilgrim (http://diveintomark.org/)
+//  Martin Bialasinki
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+// converts rgb() and #xxx to #xxxxxx format,
+// returns self (or first argument) if not convertable
+String.prototype.parseColor = function() {
+  var color = '#';
+  if (this.slice(0,4) == 'rgb(') {
+    var cols = this.slice(4,this.length-1).split(',');
+    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);
+  } else {
+    if (this.slice(0,1) == '#') {
+      if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();
+      if (this.length==7) color = this.toLowerCase();
+    }
+  }
+  return (color.length==7 ? color : (arguments[0] || this));
+};
+
+/*--------------------------------------------------------------------------*/
+
+Element.collectTextNodes = function(element) {
+  return $A($(element).childNodes).collect( function(node) {
+    return (node.nodeType==3 ? node.nodeValue :
+      (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
+  }).flatten().join('');
+};
+
+Element.collectTextNodesIgnoreClass = function(element, className) {
+  return $A($(element).childNodes).collect( function(node) {
+    return (node.nodeType==3 ? node.nodeValue :
+      ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
+        Element.collectTextNodesIgnoreClass(node, className) : ''));
+  }).flatten().join('');
+};
+
+Element.setContentZoom = function(element, percent) {
+  element = $(element);
+  element.setStyle({fontSize: (percent/100) + 'em'});
+  if (Prototype.Browser.WebKit) window.scrollBy(0,0);
+  return element;
+};
+
+Element.getInlineOpacity = function(element){
+  return $(element).style.opacity || '';
+};
+
+Element.forceRerendering = function(element) {
+  try {
+    element = $(element);
+    var n = document.createTextNode(' ');
+    element.appendChild(n);
+    element.removeChild(n);
+  } catch(e) { }
+};
+
+/*--------------------------------------------------------------------------*/
+
+var Effect = {
+  _elementDoesNotExistError: {
+    name: 'ElementDoesNotExistError',
+    message: 'The specified DOM element does not exist, but is required for this effect to operate'
+  },
+  Transitions: {
+    linear: Prototype.K,
+    sinoidal: function(pos) {
+      return (-Math.cos(pos*Math.PI)/2) + .5;
+    },
+    reverse: function(pos) {
+      return 1-pos;
+    },
+    flicker: function(pos) {
+      var pos = ((-Math.cos(pos*Math.PI)/4) + .75) + Math.random()/4;
+      return pos > 1 ? 1 : pos;
+    },
+    wobble: function(pos) {
+      return (-Math.cos(pos*Math.PI*(9*pos))/2) + .5;
+    },
+    pulse: function(pos, pulses) {
+      return (-Math.cos((pos*((pulses||5)-.5)*2)*Math.PI)/2) + .5;
+    },
+    spring: function(pos) {
+      return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
+    },
+    none: function(pos) {
+      return 0;
+    },
+    full: function(pos) {
+      return 1;
+    }
+  },
+  DefaultOptions: {
+    duration:   1.0,   // seconds
+    fps:        100,   // 100= assume 66fps max.
+    sync:       false, // true for combining
+    from:       0.0,
+    to:         1.0,
+    delay:      0.0,
+    queue:      'parallel'
+  },
+  tagifyText: function(element) {
+    var tagifyStyle = 'position:relative';
+    if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
+
+    element = $(element);
+    $A(element.childNodes).each( function(child) {
+      if (child.nodeType==3) {
+        child.nodeValue.toArray().each( function(character) {
+          element.insertBefore(
+            new Element('span', {style: tagifyStyle}).update(
+              character == ' ' ? String.fromCharCode(160) : character),
+              child);
+        });
+        Element.remove(child);
+      }
+    });
+  },
+  multiple: function(element, effect) {
+    var elements;
+    if (((typeof element == 'object') ||
+        Object.isFunction(element)) &&
+       (element.length))
+      elements = element;
+    else
+      elements = $(element).childNodes;
+
+    var options = Object.extend({
+      speed: 0.1,
+      delay: 0.0
+    }, arguments[2] || { });
+    var masterDelay = options.delay;
+
+    $A(elements).each( function(element, index) {
+      new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay }));
+    });
+  },
+  PAIRS: {
+    'slide':  ['SlideDown','SlideUp'],
+    'blind':  ['BlindDown','BlindUp'],
+    'appear': ['Appear','Fade']
+  },
+  toggle: function(element, effect) {
+    element = $(element);
+    effect = (effect || 'appear').toLowerCase();
+    var options = Object.extend({
+      queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
+    }, arguments[2] || { });
+    Effect[element.visible() ?
+      Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
+  }
+};
+
+Effect.DefaultOptions.transition = Effect.Transitions.sinoidal;
+
+/* ------------- core effects ------------- */
+
+Effect.ScopedQueue = Class.create(Enumerable, {
+  initialize: function() {
+    this.effects  = [];
+    this.interval = null;
+  },
+  _each: function(iterator) {
+    this.effects._each(iterator);
+  },
+  add: function(effect) {
+    var timestamp = new Date().getTime();
+
+    var position = Object.isString(effect.options.queue) ?
+      effect.options.queue : effect.options.queue.position;
+
+    switch(position) {
+      case 'front':
+        // move unstarted effects after this effect
+        this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
+            e.startOn  += effect.finishOn;
+            e.finishOn += effect.finishOn;
+          });
+        break;
+      case 'with-last':
+        timestamp = this.effects.pluck('startOn').max() || timestamp;
+        break;
+      case 'end':
+        // start effect after last queued effect has finished
+        timestamp = this.effects.pluck('finishOn').max() || timestamp;
+        break;
+    }
+
+    effect.startOn  += timestamp;
+    effect.finishOn += timestamp;
+
+    if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
+      this.effects.push(effect);
+
+    if (!this.interval)
+      this.interval = setInterval(this.loop.bind(this), 15);
+  },
+  remove: function(effect) {
+    this.effects = this.effects.reject(function(e) { return e==effect });
+    if (this.effects.length == 0) {
+      clearInterval(this.interval);
+      this.interval = null;
+    }
+  },
+  loop: function() {
+    var timePos = new Date().getTime();
+    for(var i=0, len=this.effects.length;i<len;i++)
+      this.effects[i] && this.effects[i].loop(timePos);
+  }
+});
+
+Effect.Queues = {
+  instances: $H(),
+  get: function(queueName) {
+    if (!Object.isString(queueName)) return queueName;
+
+    return this.instances.get(queueName) ||
+      this.instances.set(queueName, new Effect.ScopedQueue());
+  }
+};
+Effect.Queue = Effect.Queues.get('global');
+
+Effect.Base = Class.create({
+  position: null,
+  start: function(options) {
+    function codeForEvent(options,eventName){
+      return (
+        (options[eventName+'Internal'] ? 'this.options.'+eventName+'Internal(this);' : '') +
+        (options[eventName] ? 'this.options.'+eventName+'(this);' : '')
+      );
+    }
+    if (options && options.transition === false) options.transition = Effect.Transitions.linear;
+    this.options      = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { });
+    this.currentFrame = 0;
+    this.state        = 'idle';
+    this.startOn      = this.options.delay*1000;
+    this.finishOn     = this.startOn+(this.options.duration*1000);
+    this.fromToDelta  = this.options.to-this.options.from;
+    this.totalTime    = this.finishOn-this.startOn;
+    this.totalFrames  = this.options.fps*this.options.duration;
+
+    this.render = (function() {
+      function dispatch(effect, eventName) {
+        if (effect.options[eventName + 'Internal'])
+          effect.options[eventName + 'Internal'](effect);
+        if (effect.options[eventName])
+          effect.options[eventName](effect);
+      }
+
+      return function(pos) {
+        if (this.state === "idle") {
+          this.state = "running";
+          dispatch(this, 'beforeSetup');
+          if (this.setup) this.setup();
+          dispatch(this, 'afterSetup');
+        }
+        if (this.state === "running") {
+          pos = (this.options.transition(pos) * this.fromToDelta) + this.options.from;
+          this.position = pos;
+          dispatch(this, 'beforeUpdate');
+          if (this.update) this.update(pos);
+          dispatch(this, 'afterUpdate');
+        }
+      };
+    })();
+
+    this.event('beforeStart');
+    if (!this.options.sync)
+      Effect.Queues.get(Object.isString(this.options.queue) ?
+        'global' : this.options.queue.scope).add(this);
+  },
+  loop: function(timePos) {
+    if (timePos >= this.startOn) {
+      if (timePos >= this.finishOn) {
+        this.render(1.0);
+        this.cancel();
+        this.event('beforeFinish');
+        if (this.finish) this.finish();
+        this.event('afterFinish');
+        return;
+      }
+      var pos   = (timePos - this.startOn) / this.totalTime,
+          frame = (pos * this.totalFrames).round();
+      if (frame > this.currentFrame) {
+        this.render(pos);
+        this.currentFrame = frame;
+      }
+    }
+  },
+  cancel: function() {
+    if (!this.options.sync)
+      Effect.Queues.get(Object.isString(this.options.queue) ?
+        'global' : this.options.queue.scope).remove(this);
+    this.state = 'finished';
+  },
+  event: function(eventName) {
+    if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
+    if (this.options[eventName]) this.options[eventName](this);
+  },
+  inspect: function() {
+    var data = $H();
+    for(property in this)
+      if (!Object.isFunction(this[property])) data.set(property, this[property]);
+    return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
+  }
+});
+
+Effect.Parallel = Class.create(Effect.Base, {
+  initialize: function(effects) {
+    this.effects = effects || [];
+    this.start(arguments[1]);
+  },
+  update: function(position) {
+    this.effects.invoke('render', position);
+  },
+  finish: function(position) {
+    this.effects.each( function(effect) {
+      effect.render(1.0);
+      effect.cancel();
+      effect.event('beforeFinish');
+      if (effect.finish) effect.finish(position);
+      effect.event('afterFinish');
+    });
+  }
+});
+
+Effect.Tween = Class.create(Effect.Base, {
+  initialize: function(object, from, to) {
+    object = Object.isString(object) ? $(object) : object;
+    var args = $A(arguments), method = args.last(),
+      options = args.length == 5 ? args[3] : null;
+    this.method = Object.isFunction(method) ? method.bind(object) :
+      Object.isFunction(object[method]) ? object[method].bind(object) :
+      function(value) { object[method] = value };
+    this.start(Object.extend({ from: from, to: to }, options || { }));
+  },
+  update: function(position) {
+    this.method(position);
+  }
+});
+
+Effect.Event = Class.create(Effect.Base, {
+  initialize: function() {
+    this.start(Object.extend({ duration: 0 }, arguments[0] || { }));
+  },
+  update: Prototype.emptyFunction
+});
+
+Effect.Opacity = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    // make this work on IE on elements without 'layout'
+    if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
+      this.element.setStyle({zoom: 1});
+    var options = Object.extend({
+      from: this.element.getOpacity() || 0.0,
+      to:   1.0
+    }, arguments[1] || { });
+    this.start(options);
+  },
+  update: function(position) {
+    this.element.setOpacity(position);
+  }
+});
+
+Effect.Move = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({
+      x:    0,
+      y:    0,
+      mode: 'relative'
+    }, arguments[1] || { });
+    this.start(options);
+  },
+  setup: function() {
+    this.element.makePositioned();
+    this.originalLeft = parseFloat(this.element.getStyle('left') || '0');
+    this.originalTop  = parseFloat(this.element.getStyle('top')  || '0');
+    if (this.options.mode == 'absolute') {
+      this.options.x = this.options.x - this.originalLeft;
+      this.options.y = this.options.y - this.originalTop;
+    }
+  },
+  update: function(position) {
+    this.element.setStyle({
+      left: (this.options.x  * position + this.originalLeft).round() + 'px',
+      top:  (this.options.y  * position + this.originalTop).round()  + 'px'
+    });
+  }
+});
+
+// for backwards compatibility
+Effect.MoveBy = function(element, toTop, toLeft) {
+  return new Effect.Move(element,
+    Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
+};
+
+Effect.Scale = Class.create(Effect.Base, {
+  initialize: function(element, percent) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({
+      scaleX: true,
+      scaleY: true,
+      scaleContent: true,
+      scaleFromCenter: false,
+      scaleMode: 'box',        // 'box' or 'contents' or { } with provided values
+      scaleFrom: 100.0,
+      scaleTo:   percent
+    }, arguments[2] || { });
+    this.start(options);
+  },
+  setup: function() {
+    this.restoreAfterFinish = this.options.restoreAfterFinish || false;
+    this.elementPositioning = this.element.getStyle('position');
+
+    this.originalStyle = { };
+    ['top','left','width','height','fontSize'].each( function(k) {
+      this.originalStyle[k] = this.element.style[k];
+    }.bind(this));
+
+    this.originalTop  = this.element.offsetTop;
+    this.originalLeft = this.element.offsetLeft;
+
+    var fontSize = this.element.getStyle('font-size') || '100%';
+    ['em','px','%','pt'].each( function(fontSizeType) {
+      if (fontSize.indexOf(fontSizeType)>0) {
+        this.fontSize     = parseFloat(fontSize);
+        this.fontSizeType = fontSizeType;
+      }
+    }.bind(this));
+
+    this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
+
+    this.dims = null;
+    if (this.options.scaleMode=='box')
+      this.dims = [this.element.offsetHeight, this.element.offsetWidth];
+    if (/^content/.test(this.options.scaleMode))
+      this.dims = [this.element.scrollHeight, this.element.scrollWidth];
+    if (!this.dims)
+      this.dims = [this.options.scaleMode.originalHeight,
+                   this.options.scaleMode.originalWidth];
+  },
+  update: function(position) {
+    var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
+    if (this.options.scaleContent && this.fontSize)
+      this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType });
+    this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
+  },
+  finish: function(position) {
+    if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
+  },
+  setDimensions: function(height, width) {
+    var d = { };
+    if (this.options.scaleX) d.width = width.round() + 'px';
+    if (this.options.scaleY) d.height = height.round() + 'px';
+    if (this.options.scaleFromCenter) {
+      var topd  = (height - this.dims[0])/2;
+      var leftd = (width  - this.dims[1])/2;
+      if (this.elementPositioning == 'absolute') {
+        if (this.options.scaleY) d.top = this.originalTop-topd + 'px';
+        if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
+      } else {
+        if (this.options.scaleY) d.top = -topd + 'px';
+        if (this.options.scaleX) d.left = -leftd + 'px';
+      }
+    }
+    this.element.setStyle(d);
+  }
+});
+
+Effect.Highlight = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { });
+    this.start(options);
+  },
+  setup: function() {
+    // Prevent executing on elements not in the layout flow
+    if (this.element.getStyle('display')=='none') { this.cancel(); return; }
+    // Disable background image during the effect
+    this.oldStyle = { };
+    if (!this.options.keepBackgroundImage) {
+      this.oldStyle.backgroundImage = this.element.getStyle('background-image');
+      this.element.setStyle({backgroundImage: 'none'});
+    }
+    if (!this.options.endcolor)
+      this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
+    if (!this.options.restorecolor)
+      this.options.restorecolor = this.element.getStyle('background-color');
+    // init color calculations
+    this._base  = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this));
+    this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this));
+  },
+  update: function(position) {
+    this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
+      return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) });
+  },
+  finish: function() {
+    this.element.setStyle(Object.extend(this.oldStyle, {
+      backgroundColor: this.options.restorecolor
+    }));
+  }
+});
+
+Effect.ScrollTo = function(element) {
+  var options = arguments[1] || { },
+  scrollOffsets = document.viewport.getScrollOffsets(),
+  elementOffsets = $(element).cumulativeOffset();
+
+  if (options.offset) elementOffsets[1] += options.offset;
+
+  return new Effect.Tween(null,
+    scrollOffsets.top,
+    elementOffsets[1],
+    options,
+    function(p){ scrollTo(scrollOffsets.left, p.round()); }
+  );
+};
+
+/* ------------- combination effects ------------- */
+
+Effect.Fade = function(element) {
+  element = $(element);
+  var oldOpacity = element.getInlineOpacity();
+  var options = Object.extend({
+    from: element.getOpacity() || 1.0,
+    to:   0.0,
+    afterFinishInternal: function(effect) {
+      if (effect.options.to!=0) return;
+      effect.element.hide().setStyle({opacity: oldOpacity});
+    }
+  }, arguments[1] || { });
+  return new Effect.Opacity(element,options);
+};
+
+Effect.Appear = function(element) {
+  element = $(element);
+  var options = Object.extend({
+  from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0),
+  to:   1.0,
+  // force Safari to render floated elements properly
+  afterFinishInternal: function(effect) {
+    effect.element.forceRerendering();
+  },
+  beforeSetup: function(effect) {
+    effect.element.setOpacity(effect.options.from).show();
+  }}, arguments[1] || { });
+  return new Effect.Opacity(element,options);
+};
+
+Effect.Puff = function(element) {
+  element = $(element);
+  var oldStyle = {
+    opacity: element.getInlineOpacity(),
+    position: element.getStyle('position'),
+    top:  element.style.top,
+    left: element.style.left,
+    width: element.style.width,
+    height: element.style.height
+  };
+  return new Effect.Parallel(
+   [ new Effect.Scale(element, 200,
+      { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
+     new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
+     Object.extend({ duration: 1.0,
+      beforeSetupInternal: function(effect) {
+        Position.absolutize(effect.effects[0].element);
+      },
+      afterFinishInternal: function(effect) {
+         effect.effects[0].element.hide().setStyle(oldStyle); }
+     }, arguments[1] || { })
+   );
+};
+
+Effect.BlindUp = function(element) {
+  element = $(element);
+  element.makeClipping();
+  return new Effect.Scale(element, 0,
+    Object.extend({ scaleContent: false,
+      scaleX: false,
+      restoreAfterFinish: true,
+      afterFinishInternal: function(effect) {
+        effect.element.hide().undoClipping();
+      }
+    }, arguments[1] || { })
+  );
+};
+
+Effect.BlindDown = function(element) {
+  element = $(element);
+  var elementDimensions = element.getDimensions();
+  return new Effect.Scale(element, 100, Object.extend({
+    scaleContent: false,
+    scaleX: false,
+    scaleFrom: 0,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
+    restoreAfterFinish: true,
+    afterSetup: function(effect) {
+      effect.element.makeClipping().setStyle({height: '0px'}).show();
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.undoClipping();
+    }
+  }, arguments[1] || { }));
+};
+
+Effect.SwitchOff = function(element) {
+  element = $(element);
+  var oldOpacity = element.getInlineOpacity();
+  return new Effect.Appear(element, Object.extend({
+    duration: 0.4,
+    from: 0,
+    transition: Effect.Transitions.flicker,
+    afterFinishInternal: function(effect) {
+      new Effect.Scale(effect.element, 1, {
+        duration: 0.3, scaleFromCenter: true,
+        scaleX: false, scaleContent: false, restoreAfterFinish: true,
+        beforeSetup: function(effect) {
+          effect.element.makePositioned().makeClipping();
+        },
+        afterFinishInternal: function(effect) {
+          effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
+        }
+      });
+    }
+  }, arguments[1] || { }));
+};
+
+Effect.DropOut = function(element) {
+  element = $(element);
+  var oldStyle = {
+    top: element.getStyle('top'),
+    left: element.getStyle('left'),
+    opacity: element.getInlineOpacity() };
+  return new Effect.Parallel(
+    [ new Effect.Move(element, {x: 0, y: 100, sync: true }),
+      new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
+    Object.extend(
+      { duration: 0.5,
+        beforeSetup: function(effect) {
+          effect.effects[0].element.makePositioned();
+        },
+        afterFinishInternal: function(effect) {
+          effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
+        }
+      }, arguments[1] || { }));
+};
+
+Effect.Shake = function(element) {
+  element = $(element);
+  var options = Object.extend({
+    distance: 20,
+    duration: 0.5
+  }, arguments[1] || {});
+  var distance = parseFloat(options.distance);
+  var split = parseFloat(options.duration) / 10.0;
+  var oldStyle = {
+    top: element.getStyle('top'),
+    left: element.getStyle('left') };
+    return new Effect.Move(element,
+      { x:  distance, y: 0, duration: split, afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
+        effect.element.undoPositioned().setStyle(oldStyle);
+  }}); }}); }}); }}); }}); }});
+};
+
+Effect.SlideDown = function(element) {
+  element = $(element).cleanWhitespace();
+  // SlideDown need to have the content of the element wrapped in a container element with fixed height!
+  var oldInnerBottom = element.down().getStyle('bottom');
+  var elementDimensions = element.getDimensions();
+  return new Effect.Scale(element, 100, Object.extend({
+    scaleContent: false,
+    scaleX: false,
+    scaleFrom: window.opera ? 0 : 1,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
+    restoreAfterFinish: true,
+    afterSetup: function(effect) {
+      effect.element.makePositioned();
+      effect.element.down().makePositioned();
+      if (window.opera) effect.element.setStyle({top: ''});
+      effect.element.makeClipping().setStyle({height: '0px'}).show();
+    },
+    afterUpdateInternal: function(effect) {
+      effect.element.down().setStyle({bottom:
+        (effect.dims[0] - effect.element.clientHeight) + 'px' });
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.undoClipping().undoPositioned();
+      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
+    }, arguments[1] || { })
+  );
+};
+
+Effect.SlideUp = function(element) {
+  element = $(element).cleanWhitespace();
+  var oldInnerBottom = element.down().getStyle('bottom');
+  var elementDimensions = element.getDimensions();
+  return new Effect.Scale(element, window.opera ? 0 : 1,
+   Object.extend({ scaleContent: false,
+    scaleX: false,
+    scaleMode: 'box',
+    scaleFrom: 100,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
+    restoreAfterFinish: true,
+    afterSetup: function(effect) {
+      effect.element.makePositioned();
+      effect.element.down().makePositioned();
+      if (window.opera) effect.element.setStyle({top: ''});
+      effect.element.makeClipping().show();
+    },
+    afterUpdateInternal: function(effect) {
+      effect.element.down().setStyle({bottom:
+        (effect.dims[0] - effect.element.clientHeight) + 'px' });
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.hide().undoClipping().undoPositioned();
+      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom});
+    }
+   }, arguments[1] || { })
+  );
+};
+
+// Bug in opera makes the TD containing this element expand for a instance after finish
+Effect.Squish = function(element) {
+  return new Effect.Scale(element, window.opera ? 1 : 0, {
+    restoreAfterFinish: true,
+    beforeSetup: function(effect) {
+      effect.element.makeClipping();
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.hide().undoClipping();
+    }
+  });
+};
+
+Effect.Grow = function(element) {
+  element = $(element);
+  var options = Object.extend({
+    direction: 'center',
+    moveTransition: Effect.Transitions.sinoidal,
+    scaleTransition: Effect.Transitions.sinoidal,
+    opacityTransition: Effect.Transitions.full
+  }, arguments[1] || { });
+  var oldStyle = {
+    top: element.style.top,
+    left: element.style.left,
+    height: element.style.height,
+    width: element.style.width,
+    opacity: element.getInlineOpacity() };
+
+  var dims = element.getDimensions();
+  var initialMoveX, initialMoveY;
+  var moveX, moveY;
+
+  switch (options.direction) {
+    case 'top-left':
+      initialMoveX = initialMoveY = moveX = moveY = 0;
+      break;
+    case 'top-right':
+      initialMoveX = dims.width;
+      initialMoveY = moveY = 0;
+      moveX = -dims.width;
+      break;
+    case 'bottom-left':
+      initialMoveX = moveX = 0;
+      initialMoveY = dims.height;
+      moveY = -dims.height;
+      break;
+    case 'bottom-right':
+      initialMoveX = dims.width;
+      initialMoveY = dims.height;
+      moveX = -dims.width;
+      moveY = -dims.height;
+      break;
+    case 'center':
+      initialMoveX = dims.width / 2;
+      initialMoveY = dims.height / 2;
+      moveX = -dims.width / 2;
+      moveY = -dims.height / 2;
+      break;
+  }
+
+  return new Effect.Move(element, {
+    x: initialMoveX,
+    y: initialMoveY,
+    duration: 0.01,
+    beforeSetup: function(effect) {
+      effect.element.hide().makeClipping().makePositioned();
+    },
+    afterFinishInternal: function(effect) {
+      new Effect.Parallel(
+        [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
+          new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
+          new Effect.Scale(effect.element, 100, {
+            scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
+            sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
+        ], Object.extend({
+             beforeSetup: function(effect) {
+               effect.effects[0].element.setStyle({height: '0px'}).show();
+             },
+             afterFinishInternal: function(effect) {
+               effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
+             }
+           }, options)
+      );
+    }
+  });
+};
+
+Effect.Shrink = function(element) {
+  element = $(element);
+  var options = Object.extend({
+    direction: 'center',
+    moveTransition: Effect.Transitions.sinoidal,
+    scaleTransition: Effect.Transitions.sinoidal,
+    opacityTransition: Effect.Transitions.none
+  }, arguments[1] || { });
+  var oldStyle = {
+    top: element.style.top,
+    left: element.style.left,
+    height: element.style.height,
+    width: element.style.width,
+    opacity: element.getInlineOpacity() };
+
+  var dims = element.getDimensions();
+  var moveX, moveY;
+
+  switch (options.direction) {
+    case 'top-left':
+      moveX = moveY = 0;
+      break;
+    case 'top-right':
+      moveX = dims.width;
+      moveY = 0;
+      break;
+    case 'bottom-left':
+      moveX = 0;
+      moveY = dims.height;
+      break;
+    case 'bottom-right':
+      moveX = dims.width;
+      moveY = dims.height;
+      break;
+    case 'center':
+      moveX = dims.width / 2;
+      moveY = dims.height / 2;
+      break;
+  }
+
+  return new Effect.Parallel(
+    [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
+      new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
+      new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
+    ], Object.extend({
+         beforeStartInternal: function(effect) {
+           effect.effects[0].element.makePositioned().makeClipping();
+         },
+         afterFinishInternal: function(effect) {
+           effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
+       }, options)
+  );
+};
+
+Effect.Pulsate = function(element) {
+  element = $(element);
+  var options    = arguments[1] || { },
+    oldOpacity = element.getInlineOpacity(),
+    transition = options.transition || Effect.Transitions.linear,
+    reverser   = function(pos){
+      return 1 - transition((-Math.cos((pos*(options.pulses||5)*2)*Math.PI)/2) + .5);
+    };
+
+  return new Effect.Opacity(element,
+    Object.extend(Object.extend({  duration: 2.0, from: 0,
+      afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
+    }, options), {transition: reverser}));
+};
+
+Effect.Fold = function(element) {
+  element = $(element);
+  var oldStyle = {
+    top: element.style.top,
+    left: element.style.left,
+    width: element.style.width,
+    height: element.style.height };
+  element.makeClipping();
+  return new Effect.Scale(element, 5, Object.extend({
+    scaleContent: false,
+    scaleX: false,
+    afterFinishInternal: function(effect) {
+    new Effect.Scale(element, 1, {
+      scaleContent: false,
+      scaleY: false,
+      afterFinishInternal: function(effect) {
+        effect.element.hide().undoClipping().setStyle(oldStyle);
+      } });
+  }}, arguments[1] || { }));
+};
+
+Effect.Morph = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({
+      style: { }
+    }, arguments[1] || { });
+
+    if (!Object.isString(options.style)) this.style = $H(options.style);
+    else {
+      if (options.style.include(':'))
+        this.style = options.style.parseStyle();
+      else {
+        this.element.addClassName(options.style);
+        this.style = $H(this.element.getStyles());
+        this.element.removeClassName(options.style);
+        var css = this.element.getStyles();
+        this.style = this.style.reject(function(style) {
+          return style.value == css[style.key];
+        });
+        options.afterFinishInternal = function(effect) {
+          effect.element.addClassName(effect.options.style);
+          effect.transforms.each(function(transform) {
+            effect.element.style[transform.style] = '';
+          });
+        };
+      }
+    }
+    this.start(options);
+  },
+
+  setup: function(){
+    function parseColor(color){
+      if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
+      color = color.parseColor();
+      return $R(0,2).map(function(i){
+        return parseInt( color.slice(i*2+1,i*2+3), 16 );
+      });
+    }
+    this.transforms = this.style.map(function(pair){
+      var property = pair[0], value = pair[1], unit = null;
+
+      if (value.parseColor('#zzzzzz') != '#zzzzzz') {
+        value = value.parseColor();
+        unit  = 'color';
+      } else if (property == 'opacity') {
+        value = parseFloat(value);
+        if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
+          this.element.setStyle({zoom: 1});
+      } else if (Element.CSS_LENGTH.test(value)) {
+          var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
+          value = parseFloat(components[1]);
+          unit = (components.length == 3) ? components[2] : null;
+      }
+
+      var originalValue = this.element.getStyle(property);
+      return {
+        style: property.camelize(),
+        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
+        targetValue: unit=='color' ? parseColor(value) : value,
+        unit: unit
+      };
+    }.bind(this)).reject(function(transform){
+      return (
+        (transform.originalValue == transform.targetValue) ||
+        (
+          transform.unit != 'color' &&
+          (isNaN(transform.originalValue) || isNaN(transform.targetValue))
+        )
+      );
+    });
+  },
+  update: function(position) {
+    var style = { }, transform, i = this.transforms.length;
+    while(i--)
+      style[(transform = this.transforms[i]).style] =
+        transform.unit=='color' ? '#'+
+          (Math.round(transform.originalValue[0]+
+            (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
+          (Math.round(transform.originalValue[1]+
+            (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() +
+          (Math.round(transform.originalValue[2]+
+            (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
+        (transform.originalValue +
+          (transform.targetValue - transform.originalValue) * position).toFixed(3) +
+            (transform.unit === null ? '' : transform.unit);
+    this.element.setStyle(style, true);
+  }
+});
+
+Effect.Transform = Class.create({
+  initialize: function(tracks){
+    this.tracks  = [];
+    this.options = arguments[1] || { };
+    this.addTracks(tracks);
+  },
+  addTracks: function(tracks){
+    tracks.each(function(track){
+      track = $H(track);
+      var data = track.values().first();
+      this.tracks.push($H({
+        ids:     track.keys().first(),
+        effect:  Effect.Morph,
+        options: { style: data }
+      }));
+    }.bind(this));
+    return this;
+  },
+  play: function(){
+    return new Effect.Parallel(
+      this.tracks.map(function(track){
+        var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options');
+        var elements = [$(ids) || $$(ids)].flatten();
+        return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) });
+      }).flatten(),
+      this.options
+    );
+  }
+});
+
+Element.CSS_PROPERTIES = $w(
+  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
+  'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
+  'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
+  'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
+  'fontSize fontWeight height left letterSpacing lineHeight ' +
+  'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+
+  'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
+  'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
+  'right textIndent top width wordSpacing zIndex');
+
+Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
+
+String.__parseStyleElement = document.createElement('div');
+String.prototype.parseStyle = function(){
+  var style, styleRules = $H();
+  if (Prototype.Browser.WebKit)
+    style = new Element('div',{style:this}).style;
+  else {
+    String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
+    style = String.__parseStyleElement.childNodes[0].style;
+  }
+
+  Element.CSS_PROPERTIES.each(function(property){
+    if (style[property]) styleRules.set(property, style[property]);
+  });
+
+  if (Prototype.Browser.IE && this.include('opacity'))
+    styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
+
+  return styleRules;
+};
+
+if (document.defaultView && document.defaultView.getComputedStyle) {
+  Element.getStyles = function(element) {
+    var css = document.defaultView.getComputedStyle($(element), null);
+    return Element.CSS_PROPERTIES.inject({ }, function(styles, property) {
+      styles[property] = css[property];
+      return styles;
+    });
+  };
+} else {
+  Element.getStyles = function(element) {
+    element = $(element);
+    var css = element.currentStyle, styles;
+    styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) {
+      results[property] = css[property];
+      return results;
+    });
+    if (!styles.opacity) styles.opacity = element.getOpacity();
+    return styles;
+  };
+}
+
+Effect.Methods = {
+  morph: function(element, style) {
+    element = $(element);
+    new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { }));
+    return element;
+  },
+  visualEffect: function(element, effect, options) {
+    element = $(element);
+    var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
+    new Effect[klass](element, options);
+    return element;
+  },
+  highlight: function(element, options) {
+    element = $(element);
+    new Effect.Highlight(element, options);
+    return element;
+  }
+};
+
+$w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
+  'pulsate shake puff squish switchOff dropOut').each(
+  function(effect) {
+    Effect.Methods[effect] = function(element, options){
+      element = $(element);
+      Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
+      return element;
+    };
+  }
+);
+
+$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each(
+  function(f) { Effect.Methods[f] = Element[f]; }
+);
+
+Element.addMethods(Effect.Methods);
\ No newline at end of file
Property changes on: branches/product_cleanup/web/src/main/webapp/js/effects.js
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native

Added: branches/product_cleanup/web/src/main/webapp/js/func.js (0 => 2114)

--- branches/product_cleanup/web/src/main/webapp/js/func.js	                        (rev 0)
+++ branches/product_cleanup/web/src/main/webapp/js/func.js	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,189 @@
+function inverse($f) {
+    for ($i = 0; $i < $f.elements.length; $i++) {
+        if ($f.elements[$i].type == "checkbox") {
+            $f.elements[$i].checked = !$f.elements[$i].checked;
+        }
+    }
+    return false;
+}
+
+function checkAll($f) {
+    for ($i = 0; $i < $f.elements.length; $i++) {
+        if ($f.elements[$i].type == "checkbox") {
+            $f.elements[$i].checked = true;
+        }
+    }
+    return false;
+}
+
+/**
+ * Requires prototype.js (http://prototype.conio.net/)
+ */
+Ajax.ImgUpdater = Class.create();
+Ajax.ImgUpdater.prototype = {
+    initialize: function(imgID, timeout, newSrc) {
+        this.img = document.getElementById(imgID);
+        if (newSrc) {
+            this.src = newSrc;
+        } else {
+            this.src = this.img.src;
+        }
+        this.timeout = timeout;
+        this.start();
+    },
+
+    start: function() {
+        var now = new Date();
+        this.img.src = this.src + '&t=' + now.getTime();
+        this.timer = setTimeout(this.start.bind(this), this.timeout * 1000);
+    },
+
+    stop: function() {
+        if (this.timer) clearTimeout(this.timer);
+    }
+}
+
+function togglePanel(container, remember_url) {
+    if (Element.getStyle(container, "display") == 'none') {
+        if (remember_url) {
+            new Ajax.Request(remember_url, {method:'get',asynchronous:true, parameters: 'state=on'});
+        }
+        if (document.getElementById('invisible_' + container)) {
+            Element.hide('invisible_' + container);
+        }
+        if (document.getElementById('visible_' + container)) {
+            Element.show('visible_' + container);
+        }
+
+        Effect.Grow(container);
+    } else {
+        if (remember_url) {
+            new Ajax.Request(remember_url, {method:'get',asynchronous:true, parameters: 'state=off'});
+        }
+        if (document.getElementById('visible_' + container)) {
+            Element.hide('visible_' + container);
+        }
+        if (document.getElementById('invisible_' + container)) {
+            Element.show('invisible_' + container);
+        }
+        Effect.Shrink(container);
+    }
+    return false;
+}
+
+function scaleImage(v, min, max) {
+    var images = document.getElementsByClassName('scale-image');
+    w = (max - min) * v + min;
+    for (i = 0; i < images.length; i++) {
+        images[i].style.width = w + 'px';
+    }
+}
+
+function toggleAndReloadPanel(container, url) {
+    if (Element.getStyle(container, "display") == 'none') {
+        new Ajax.Updater(container, url);
+        Effect.BlindDown(container);
+    } else {
+        Effect.Shrink(container);
+    }
+}
+
+function getWindowHeight() {
+    var myHeight = 0;
+    if (typeof( window.innerHeight ) == 'number') {
+        //Non-IE
+        myHeight = window.innerHeight;
+    } else if (document.documentElement && document.documentElement.clientHeight) {
+        //IE 6+ in 'standards compliant mode'
+        myHeight = document.documentElement.clientHeight;
+    } else if (document.body && document.body.clientHeight) {
+        //IE 4 compatible
+        myHeight = document.body.clientHeight;
+    }
+    return myHeight;
+}
+
+function getWindowWidth() {
+    var myWidth = 0;
+    if (typeof( window.innerWidth ) == 'number') {
+        //Non-IE
+        myWidth = window.innerWidth;
+    } else if (document.documentElement && document.documentElement.clientWidth) {
+        //IE 6+ in 'standards compliant mode'
+        myWidth = document.documentElement.clientWidth;
+    } else if (document.body && document.body.clientWidth) {
+        //IE 4 compatible
+        myWidth = document.body.clientWidth;
+    }
+    return myWidth;
+}
+
+var helpTimerID;
+
+function setupHelpToggle(url, element) {
+    element.onclick = function() {
+        help_container = 'help';
+        if (Element.getStyle(help_container, "display") == 'none') {
+            new Ajax.Updater(help_container, url);
+        }
+        Effect.toggle(help_container, 'appear');
+        if (helpTimerID) {
+            clearTimeout(helpTimerID);
+        }
+        helpTimerID = setTimeout('Effect.Fade("' + help_container + '")', 15000);
+        return false;
+    };
+}
+
+function addAjaxTooltip(activator, tooltip, url) {
+    Tooltip.closeText = null;
+    Tooltip.autoHideTimeout = null;
+    Tooltip.showMethod = function(e) {
+        Effect.Appear(e, {to: 0.9});
+    };
+
+    Tooltip.add(activator, tooltip);
+    tt_container = $$('#' + tooltip + ' .tt_content')[0];
+    Event.observe(activator, 'click', function(e) {
+
+        t_title = $('tt_title');
+
+        if (t_title) t_title.hide();
+
+        tt_container.style.width = '300px';
+
+        tt_container.innerHTML = '<div class="ajax_activity">&nbsp;</div>';
+        new Ajax.Updater(tt_container, url, {method: 'get'}).onComplete = function () {
+            tt_container.style.width = null;
+            the_title = $('tooltip_title');
+            t_title = $('tt_title');
+
+            if (the_title && t_title) {
+                the_title.hide();
+                t_title.innerHTML = the_title.innerHTML;
+                t_title.show();
+            }
+        };
+    });
+}
+
+/**
+ * @return form action and parameters as url
+ */
+function interceptFormSubmit(form) {
+    var s = form.action;
+
+    for (i = 0; i < form.elements.length; i++) {
+        var e = form.elements[i];
+        if (e.type == "checkbox") {
+            s += "&" + escape(e.name) + "=" + (e.checked ? "on" : "off");
+        } else {
+            s += "&" + escape(e.name) + "=" + escape(e.value);
+        }
+    }
+
+    //alert(s);
+
+    return s;
+}
+
Property changes on: branches/product_cleanup/web/src/main/webapp/js/func.js
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native

Added: branches/product_cleanup/web/src/main/webapp/js/prototype.js (0 => 2114)

--- branches/product_cleanup/web/src/main/webapp/js/prototype.js	                        (rev 0)
+++ branches/product_cleanup/web/src/main/webapp/js/prototype.js	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,4320 @@
+/*  Prototype JavaScript framework, version 1.6.0.3
+ *  (c) 2005-2008 Sam Stephenson
+ *
+ *  Prototype is freely distributable under the terms of an MIT-style license.
+ *  For details, see the Prototype web site: http://www.prototypejs.org/
+ *
+ *--------------------------------------------------------------------------*/
+
+var Prototype = {
+  Version: '1.6.0.3',
+
+  Browser: {
+    IE:     !!(window.attachEvent &&
+      navigator.userAgent.indexOf('Opera') === -1),
+    Opera:  navigator.userAgent.indexOf('Opera') > -1,
+    WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
+    Gecko:  navigator.userAgent.indexOf('Gecko') > -1 &&
+      navigator.userAgent.indexOf('KHTML') === -1,
+    MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/)
+  },
+
+  BrowserFeatures: {
+    XPath: !!document.evaluate,
+    SelectorsAPI: !!document.querySelector,
+    ElementExtensions: !!window.HTMLElement,
+    SpecificElementExtensions:
+      document.createElement('div')['__proto__'] &&
+      document.createElement('div')['__proto__'] !==
+        document.createElement('form')['__proto__']
+  },
+
+  ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
+  JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
+
+  emptyFunction: function() { },
+  K: function(x) { return x }
+};
+
+if (Prototype.Browser.MobileSafari)
+  Prototype.BrowserFeatures.SpecificElementExtensions = false;
+
+
+/* Based on Alex Arnell's inheritance implementation. */
+var Class = {
+  create: function() {
+    var parent = null, properties = $A(arguments);
+    if (Object.isFunction(properties[0]))
+      parent = properties.shift();
+
+    function klass() {
+      this.initialize.apply(this, arguments);
+    }
+
+    Object.extend(klass, Class.Methods);
+    klass.superclass = parent;
+    klass.subclasses = [];
+
+    if (parent) {
+      var subclass = function() { };
+      subclass.prototype = parent.prototype;
+      klass.prototype = new subclass;
+      parent.subclasses.push(klass);
+    }
+
+    for (var i = 0; i < properties.length; i++)
+      klass.addMethods(properties[i]);
+
+    if (!klass.prototype.initialize)
+      klass.prototype.initialize = Prototype.emptyFunction;
+
+    klass.prototype.constructor = klass;
+
+    return klass;
+  }
+};
+
+Class.Methods = {
+  addMethods: function(source) {
+    var ancestor   = this.superclass && this.superclass.prototype;
+    var properties = Object.keys(source);
+
+    if (!Object.keys({ toString: true }).length)
+      properties.push("toString", "valueOf");
+
+    for (var i = 0, length = properties.length; i < length; i++) {
+      var property = properties[i], value = source[property];
+      if (ancestor && Object.isFunction(value) &&
+          value.argumentNames().first() == "$super") {
+        var method = value;
+        value = (function(m) {
+          return function() { return ancestor[m].apply(this, arguments) };
+        })(property).wrap(method);
+
+        value.valueOf = method.valueOf.bind(method);
+        value.toString = method.toString.bind(method);
+      }
+      this.prototype[property] = value;
+    }
+
+    return this;
+  }
+};
+
+var Abstract = { };
+
+Object.extend = function(destination, source) {
+  for (var property in source)
+    destination[property] = source[property];
+  return destination;
+};
+
+Object.extend(Object, {
+  inspect: function(object) {
+    try {
+      if (Object.isUndefined(object)) return 'undefined';
+      if (object === null) return 'null';
+      return object.inspect ? object.inspect() : String(object);
+    } catch (e) {
+      if (e instanceof RangeError) return '...';
+      throw e;
+    }
+  },
+
+  toJSON: function(object) {
+    var type = typeof object;
+    switch (type) {
+      case 'undefined':
+      case 'function':
+      case 'unknown': return;
+      case 'boolean': return object.toString();
+    }
+
+    if (object === null) return 'null';
+    if (object.toJSON) return object.toJSON();
+    if (Object.isElement(object)) return;
+
+    var results = [];
+    for (var property in object) {
+      var value = Object.toJSON(object[property]);
+      if (!Object.isUndefined(value))
+        results.push(property.toJSON() + ': ' + value);
+    }
+
+    return '{' + results.join(', ') + '}';
+  },
+
+  toQueryString: function(object) {
+    return $H(object).toQueryString();
+  },
+
+  toHTML: function(object) {
+    return object && object.toHTML ? object.toHTML() : String.interpret(object);
+  },
+
+  keys: function(object) {
+    var keys = [];
+    for (var property in object)
+      keys.push(property);
+    return keys;
+  },
+
+  values: function(object) {
+    var values = [];
+    for (var property in object)
+      values.push(object[property]);
+    return values;
+  },
+
+  clone: function(object) {
+    return Object.extend({ }, object);
+  },
+
+  isElement: function(object) {
+    return !!(object && object.nodeType == 1);
+  },
+
+  isArray: function(object) {
+    return object != null && typeof object == "object" &&
+      'splice' in object && 'join' in object;
+  },
+
+  isHash: function(object) {
+    return object instanceof Hash;
+  },
+
+  isFunction: function(object) {
+    return typeof object == "function";
+  },
+
+  isString: function(object) {
+    return typeof object == "string";
+  },
+
+  isNumber: function(object) {
+    return typeof object == "number";
+  },
+
+  isUndefined: function(object) {
+    return typeof object == "undefined";
+  }
+});
+
+Object.extend(Function.prototype, {
+  argumentNames: function() {
+    var names = this.toString().match(/^[\s\(]*function[^(]*\(([^\)]*)\)/)[1]
+      .replace(/\s+/g, '').split(',');
+    return names.length == 1 && !names[0] ? [] : names;
+  },
+
+  bind: function() {
+    if (arguments.length < 2 && Object.isUndefined(arguments[0])) return this;
+    var __method = this, args = $A(arguments), object = args.shift();
+    return function() {
+      return __method.apply(object, args.concat($A(arguments)));
+    }
+  },
+
+  bindAsEventListener: function() {
+    var __method = this, args = $A(arguments), object = args.shift();
+    return function(event) {
+      return __method.apply(object, [event || window.event].concat(args));
+    }
+  },
+
+  curry: function() {
+    if (!arguments.length) return this;
+    var __method = this, args = $A(arguments);
+    return function() {
+      return __method.apply(this, args.concat($A(arguments)));
+    }
+  },
+
+  delay: function() {
+    var __method = this, args = $A(arguments), timeout = args.shift() * 1000;
+    return window.setTimeout(function() {
+      return __method.apply(__method, args);
+    }, timeout);
+  },
+
+  defer: function() {
+    var args = [0.01].concat($A(arguments));
+    return this.delay.apply(this, args);
+  },
+
+  wrap: function(wrapper) {
+    var __method = this;
+    return function() {
+      return wrapper.apply(this, [__method.bind(this)].concat($A(arguments)));
+    }
+  },
+
+  methodize: function() {
+    if (this._methodized) return this._methodized;
+    var __method = this;
+    return this._methodized = function() {
+      return __method.apply(null, [this].concat($A(arguments)));
+    };
+  }
+});
+
+Date.prototype.toJSON = function() {
+  return '"' + this.getUTCFullYear() + '-' +
+    (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
+    this.getUTCDate().toPaddedString(2) + 'T' +
+    this.getUTCHours().toPaddedString(2) + ':' +
+    this.getUTCMinutes().toPaddedString(2) + ':' +
+    this.getUTCSeconds().toPaddedString(2) + 'Z"';
+};
+
+var Try = {
+  these: function() {
+    var returnValue;
+
+    for (var i = 0, length = arguments.length; i < length; i++) {
+      var lambda = arguments[i];
+      try {
+        returnValue = lambda();
+        break;
+      } catch (e) { }
+    }
+
+    return returnValue;
+  }
+};
+
+RegExp.prototype.match = RegExp.prototype.test;
+
+RegExp.escape = function(str) {
+  return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
+};
+
+/*--------------------------------------------------------------------------*/
+
+var PeriodicalExecuter = Class.create({
+  initialize: function(callback, frequency) {
+    this.callback = callback;
+    this.frequency = frequency;
+    this.currentlyExecuting = false;
+
+    this.registerCallback();
+  },
+
+  registerCallback: function() {
+    this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+  },
+
+  execute: function() {
+    this.callback(this);
+  },
+
+  stop: function() {
+    if (!this.timer) return;
+    clearInterval(this.timer);
+    this.timer = null;
+  },
+
+  onTimerEvent: function() {
+    if (!this.currentlyExecuting) {
+      try {
+        this.currentlyExecuting = true;
+        this.execute();
+      } finally {
+        this.currentlyExecuting = false;
+      }
+    }
+  }
+});
+Object.extend(String, {
+  interpret: function(value) {
+    return value == null ? '' : String(value);
+  },
+  specialChar: {
+    '\b': '\\b',
+    '\t': '\\t',
+    '\n': '\\n',
+    '\f': '\\f',
+    '\r': '\\r',
+    '\\': '\\\\'
+  }
+});
+
+Object.extend(String.prototype, {
+  gsub: function(pattern, replacement) {
+    var result = '', source = this, match;
+    replacement = arguments.callee.prepareReplacement(replacement);
+
+    while (source.length > 0) {
+      if (match = source.match(pattern)) {
+        result += source.slice(0, match.index);
+        result += String.interpret(replacement(match));
+        source  = source.slice(match.index + match[0].length);
+      } else {
+        result += source, source = '';
+      }
+    }
+    return result;
+  },
+
+  sub: function(pattern, replacement, count) {
+    replacement = this.gsub.prepareReplacement(replacement);
+    count = Object.isUndefined(count) ? 1 : count;
+
+    return this.gsub(pattern, function(match) {
+      if (--count < 0) return match[0];
+      return replacement(match);
+    });
+  },
+
+  scan: function(pattern, iterator) {
+    this.gsub(pattern, iterator);
+    return String(this);
+  },
+
+  truncate: function(length, truncation) {
+    length = length || 30;
+    truncation = Object.isUndefined(truncation) ? '...' : truncation;
+    return this.length > length ?
+      this.slice(0, length - truncation.length) + truncation : String(this);
+  },
+
+  strip: function() {
+    return this.replace(/^\s+/, '').replace(/\s+$/, '');
+  },
+
+  stripTags: function() {
+    return this.replace(/<\/?[^>]+>/gi, '');
+  },
+
+  stripScripts: function() {
+    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
+  },
+
+  extractScripts: function() {
+    var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
+    var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
+    return (this.match(matchAll) || []).map(function(scriptTag) {
+      return (scriptTag.match(matchOne) || ['', ''])[1];
+    });
+  },
+
+  evalScripts: function() {
+    return this.extractScripts().map(function(script) { return eval(script) });
+  },
+
+  escapeHTML: function() {
+    var self = arguments.callee;
+    self.text.data = this;
+    return self.div.innerHTML;
+  },
+
+  unescapeHTML: function() {
+    var div = new Element('div');
+    div.innerHTML = this.stripTags();
+    return div.childNodes[0] ? (div.childNodes.length > 1 ?
+      $A(div.childNodes).inject('', function(memo, node) { return memo+node.nodeValue }) :
+      div.childNodes[0].nodeValue) : '';
+  },
+
+  toQueryParams: function(separator) {
+    var match = this.strip().match(/([^?#]*)(#.*)?$/);
+    if (!match) return { };
+
+    return match[1].split(separator || '&').inject({ }, function(hash, pair) {
+      if ((pair = pair.split('='))[0]) {
+        var key = decodeURIComponent(pair.shift());
+        var value = pair.length > 1 ? pair.join('=') : pair[0];
+        if (value != undefined) value = decodeURIComponent(value);
+
+        if (key in hash) {
+          if (!Object.isArray(hash[key])) hash[key] = [hash[key]];
+          hash[key].push(value);
+        }
+        else hash[key] = value;
+      }
+      return hash;
+    });
+  },
+
+  toArray: function() {
+    return this.split('');
+  },
+
+  succ: function() {
+    return this.slice(0, this.length - 1) +
+      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
+  },
+
+  times: function(count) {
+    return count < 1 ? '' : new Array(count + 1).join(this);
+  },
+
+  camelize: function() {
+    var parts = this.split('-'), len = parts.length;
+    if (len == 1) return parts[0];
+
+    var camelized = this.charAt(0) == '-'
+      ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
+      : parts[0];
+
+    for (var i = 1; i < len; i++)
+      camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
+
+    return camelized;
+  },
+
+  capitalize: function() {
+    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
+  },
+
+  underscore: function() {
+    return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
+  },
+
+  dasherize: function() {
+    return this.gsub(/_/,'-');
+  },
+
+  inspect: function(useDoubleQuotes) {
+    var escapedString = this.gsub(/[\x00-\x1f\\]/, function(match) {
+      var character = String.specialChar[match[0]];
+      return character ? character : '\\u00' + match[0].charCodeAt().toPaddedString(2, 16);
+    });
+    if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
+    return "'" + escapedString.replace(/'/g, '\\\'') + "'";
+  },
+
+  toJSON: function() {
+    return this.inspect(true);
+  },
+
+  unfilterJSON: function(filter) {
+    return this.sub(filter || Prototype.JSONFilter, '#{1}');
+  },
+
+  isJSON: function() {
+    var str = this;
+    if (str.blank()) return false;
+    str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
+    return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
+  },
+
+  evalJSON: function(sanitize) {
+    var json = this.unfilterJSON();
+    try {
+      if (!sanitize || json.isJSON()) return eval('(' + json + ')');
+    } catch (e) { }
+    throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
+  },
+
+  include: function(pattern) {
+    return this.indexOf(pattern) > -1;
+  },
+
+  startsWith: function(pattern) {
+    return this.indexOf(pattern) === 0;
+  },
+
+  endsWith: function(pattern) {
+    var d = this.length - pattern.length;
+    return d >= 0 && this.lastIndexOf(pattern) === d;
+  },
+
+  empty: function() {
+    return this == '';
+  },
+
+  blank: function() {
+    return /^\s*$/.test(this);
+  },
+
+  interpolate: function(object, pattern) {
+    return new Template(this, pattern).evaluate(object);
+  }
+});
+
+if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
+  escapeHTML: function() {
+    return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+  },
+  unescapeHTML: function() {
+    return this.stripTags().replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
+  }
+});
+
+String.prototype.gsub.prepareReplacement = function(replacement) {
+  if (Object.isFunction(replacement)) return replacement;
+  var template = new Template(replacement);
+  return function(match) { return template.evaluate(match) };
+};
+
+String.prototype.parseQuery = String.prototype.toQueryParams;
+
+Object.extend(String.prototype.escapeHTML, {
+  div:  document.createElement('div'),
+  text: document.createTextNode('')
+});
+
+String.prototype.escapeHTML.div.appendChild(String.prototype.escapeHTML.text);
+
+var Template = Class.create({
+  initialize: function(template, pattern) {
+    this.template = template.toString();
+    this.pattern = pattern || Template.Pattern;
+  },
+
+  evaluate: function(object) {
+    if (Object.isFunction(object.toTemplateReplacements))
+      object = object.toTemplateReplacements();
+
+    return this.template.gsub(this.pattern, function(match) {
+      if (object == null) return '';
+
+      var before = match[1] || '';
+      if (before == '\\') return match[2];
+
+      var ctx = object, expr = match[3];
+      var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/;
+      match = pattern.exec(expr);
+      if (match == null) return before;
+
+      while (match != null) {
+        var comp = match[1].startsWith('[') ? match[2].gsub('\\\\]', ']') : match[1];
+        ctx = ctx[comp];
+        if (null == ctx || '' == match[3]) break;
+        expr = expr.substring('[' == match[3] ? match[1].length : match[0].length);
+        match = pattern.exec(expr);
+      }
+
+      return before + String.interpret(ctx);
+    });
+  }
+});
+Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
+
+var $break = { };
+
+var Enumerable = {
+  each: function(iterator, context) {
+    var index = 0;
+    try {
+      this._each(function(value) {
+        iterator.call(context, value, index++);
+      });
+    } catch (e) {
+      if (e != $break) throw e;
+    }
+    return this;
+  },
+
+  eachSlice: function(number, iterator, context) {
+    var index = -number, slices = [], array = this.toArray();
+    if (number < 1) return array;
+    while ((index += number) < array.length)
+      slices.push(array.slice(index, index+number));
+    return slices.collect(iterator, context);
+  },
+
+  all: function(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var result = true;
+    this.each(function(value, index) {
+      result = result && !!iterator.call(context, value, index);
+      if (!result) throw $break;
+    });
+    return result;
+  },
+
+  any: function(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var result = false;
+    this.each(function(value, index) {
+      if (result = !!iterator.call(context, value, index))
+        throw $break;
+    });
+    return result;
+  },
+
+  collect: function(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var results = [];
+    this.each(function(value, index) {
+      results.push(iterator.call(context, value, index));
+    });
+    return results;
+  },
+
+  detect: function(iterator, context) {
+    var result;
+    this.each(function(value, index) {
+      if (iterator.call(context, value, index)) {
+        result = value;
+        throw $break;
+      }
+    });
+    return result;
+  },
+
+  findAll: function(iterator, context) {
+    var results = [];
+    this.each(function(value, index) {
+      if (iterator.call(context, value, index))
+        results.push(value);
+    });
+    return results;
+  },
+
+  grep: function(filter, iterator, context) {
+    iterator = iterator || Prototype.K;
+    var results = [];
+
+    if (Object.isString(filter))
+      filter = new RegExp(filter);
+
+    this.each(function(value, index) {
+      if (filter.match(value))
+        results.push(iterator.call(context, value, index));
+    });
+    return results;
+  },
+
+  include: function(object) {
+    if (Object.isFunction(this.indexOf))
+      if (this.indexOf(object) != -1) return true;
+
+    var found = false;
+    this.each(function(value) {
+      if (value == object) {
+        found = true;
+        throw $break;
+      }
+    });
+    return found;
+  },
+
+  inGroupsOf: function(number, fillWith) {
+    fillWith = Object.isUndefined(fillWith) ? null : fillWith;
+    return this.eachSlice(number, function(slice) {
+      while(slice.length < number) slice.push(fillWith);
+      return slice;
+    });
+  },
+
+  inject: function(memo, iterator, context) {
+    this.each(function(value, index) {
+      memo = iterator.call(context, memo, value, index);
+    });
+    return memo;
+  },
+
+  invoke: function(method) {
+    var args = $A(arguments).slice(1);
+    return this.map(function(value) {
+      return value[method].apply(value, args);
+    });
+  },
+
+  max: function(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var result;
+    this.each(function(value, index) {
+      value = iterator.call(context, value, index);
+      if (result == null || value >= result)
+        result = value;
+    });
+    return result;
+  },
+
+  min: function(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var result;
+    this.each(function(value, index) {
+      value = iterator.call(context, value, index);
+      if (result == null || value < result)
+        result = value;
+    });
+    return result;
+  },
+
+  partition: function(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var trues = [], falses = [];
+    this.each(function(value, index) {
+      (iterator.call(context, value, index) ?
+        trues : falses).push(value);
+    });
+    return [trues, falses];
+  },
+
+  pluck: function(property) {
+    var results = [];
+    this.each(function(value) {
+      results.push(value[property]);
+    });
+    return results;
+  },
+
+  reject: function(iterator, context) {
+    var results = [];
+    this.each(function(value, index) {
+      if (!iterator.call(context, value, index))
+        results.push(value);
+    });
+    return results;
+  },
+
+  sortBy: function(iterator, context) {
+    return this.map(function(value, index) {
+      return {
+        value: value,
+        criteria: iterator.call(context, value, index)
+      };
+    }).sort(function(left, right) {
+      var a = left.criteria, b = right.criteria;
+      return a < b ? -1 : a > b ? 1 : 0;
+    }).pluck('value');
+  },
+
+  toArray: function() {
+    return this.map();
+  },
+
+  zip: function() {
+    var iterator = Prototype.K, args = $A(arguments);
+    if (Object.isFunction(args.last()))
+      iterator = args.pop();
+
+    var collections = [this].concat(args).map($A);
+    return this.map(function(value, index) {
+      return iterator(collections.pluck(index));
+    });
+  },
+
+  size: function() {
+    return this.toArray().length;
+  },
+
+  inspect: function() {
+    return '#<Enumerable:' + this.toArray().inspect() + '>';
+  }
+};
+
+Object.extend(Enumerable, {
+  map:     Enumerable.collect,
+  find:    Enumerable.detect,
+  select:  Enumerable.findAll,
+  filter:  Enumerable.findAll,
+  member:  Enumerable.include,
+  entries: Enumerable.toArray,
+  every:   Enumerable.all,
+  some:    Enumerable.any
+});
+function $A(iterable) {
+  if (!iterable) return [];
+  if (iterable.toArray) return iterable.toArray();
+  var length = iterable.length || 0, results = new Array(length);
+  while (length--) results[length] = iterable[length];
+  return results;
+}
+
+if (Prototype.Browser.WebKit) {
+  $A = function(iterable) {
+    if (!iterable) return [];
+    // In Safari, only use the `toArray` method if it's not a NodeList.
+    // A NodeList is a function, has an function `item` property, and a numeric
+    // `length` property. Adapted from Google Doctype.
+    if (!(typeof iterable === 'function' && typeof iterable.length ===
+        'number' && typeof iterable.item === 'function') && iterable.toArray)
+      return iterable.toArray();
+    var length = iterable.length || 0, results = new Array(length);
+    while (length--) results[length] = iterable[length];
+    return results;
+  };
+}
+
+Array.from = $A;
+
+Object.extend(Array.prototype, Enumerable);
+
+if (!Array.prototype._reverse) Array.prototype._reverse = Array.prototype.reverse;
+
+Object.extend(Array.prototype, {
+  _each: function(iterator) {
+    for (var i = 0, length = this.length; i < length; i++)
+      iterator(this[i]);
+  },
+
+  clear: function() {
+    this.length = 0;
+    return this;
+  },
+
+  first: function() {
+    return this[0];
+  },
+
+  last: function() {
+    return this[this.length - 1];
+  },
+
+  compact: function() {
+    return this.select(function(value) {
+      return value != null;
+    });
+  },
+
+  flatten: function() {
+    return this.inject([], function(array, value) {
+      return array.concat(Object.isArray(value) ?
+        value.flatten() : [value]);
+    });
+  },
+
+  without: function() {
+    var values = $A(arguments);
+    return this.select(function(value) {
+      return !values.include(value);
+    });
+  },
+
+  reverse: function(inline) {
+    return (inline !== false ? this : this.toArray())._reverse();
+  },
+
+  reduce: function() {
+    return this.length > 1 ? this : this[0];
+  },
+
+  uniq: function(sorted) {
+    return this.inject([], function(array, value, index) {
+      if (0 == index || (sorted ? array.last() != value : !array.include(value)))
+        array.push(value);
+      return array;
+    });
+  },
+
+  intersect: function(array) {
+    return this.uniq().findAll(function(item) {
+      return array.detect(function(value) { return item === value });
+    });
+  },
+
+  clone: function() {
+    return [].concat(this);
+  },
+
+  size: function() {
+    return this.length;
+  },
+
+  inspect: function() {
+    return '[' + this.map(Object.inspect).join(', ') + ']';
+  },
+
+  toJSON: function() {
+    var results = [];
+    this.each(function(object) {
+      var value = Object.toJSON(object);
+      if (!Object.isUndefined(value)) results.push(value);
+    });
+    return '[' + results.join(', ') + ']';
+  }
+});
+
+// use native browser JS 1.6 implementation if available
+if (Object.isFunction(Array.prototype.forEach))
+  Array.prototype._each = Array.prototype.forEach;
+
+if (!Array.prototype.indexOf) Array.prototype.indexOf = function(item, i) {
+  i || (i = 0);
+  var length = this.length;
+  if (i < 0) i = length + i;
+  for (; i < length; i++)
+    if (this[i] === item) return i;
+  return -1;
+};
+
+if (!Array.prototype.lastIndexOf) Array.prototype.lastIndexOf = function(item, i) {
+  i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1;
+  var n = this.slice(0, i).reverse().indexOf(item);
+  return (n < 0) ? n : i - n - 1;
+};
+
+Array.prototype.toArray = Array.prototype.clone;
+
+function $w(string) {
+  if (!Object.isString(string)) return [];
+  string = string.strip();
+  return string ? string.split(/\s+/) : [];
+}
+
+if (Prototype.Browser.Opera){
+  Array.prototype.concat = function() {
+    var array = [];
+    for (var i = 0, length = this.length; i < length; i++) array.push(this[i]);
+    for (var i = 0, length = arguments.length; i < length; i++) {
+      if (Object.isArray(arguments[i])) {
+        for (var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
+          array.push(arguments[i][j]);
+      } else {
+        array.push(arguments[i]);
+      }
+    }
+    return array;
+  };
+}
+Object.extend(Number.prototype, {
+  toColorPart: function() {
+    return this.toPaddedString(2, 16);
+  },
+
+  succ: function() {
+    return this + 1;
+  },
+
+  times: function(iterator, context) {
+    $R(0, this, true).each(iterator, context);
+    return this;
+  },
+
+  toPaddedString: function(length, radix) {
+    var string = this.toString(radix || 10);
+    return '0'.times(length - string.length) + string;
+  },
+
+  toJSON: function() {
+    return isFinite(this) ? this.toString() : 'null';
+  }
+});
+
+$w('abs round ceil floor').each(function(method){
+  Number.prototype[method] = Math[method].methodize();
+});
+function $H(object) {
+  return new Hash(object);
+};
+
+var Hash = Class.create(Enumerable, (function() {
+
+  function toQueryPair(key, value) {
+    if (Object.isUndefined(value)) return key;
+    return key + '=' + encodeURIComponent(String.interpret(value));
+  }
+
+  return {
+    initialize: function(object) {
+      this._object = Object.isHash(object) ? object.toObject() : Object.clone(object);
+    },
+
+    _each: function(iterator) {
+      for (var key in this._object) {
+        var value = this._object[key], pair = [key, value];
+        pair.key = key;
+        pair.value = value;
+        iterator(pair);
+      }
+    },
+
+    set: function(key, value) {
+      return this._object[key] = value;
+    },
+
+    get: function(key) {
+      // simulating poorly supported hasOwnProperty
+      if (this._object[key] !== Object.prototype[key])
+        return this._object[key];
+    },
+
+    unset: function(key) {
+      var value = this._object[key];
+      delete this._object[key];
+      return value;
+    },
+
+    toObject: function() {
+      return Object.clone(this._object);
+    },
+
+    keys: function() {
+      return this.pluck('key');
+    },
+
+    values: function() {
+      return this.pluck('value');
+    },
+
+    index: function(value) {
+      var match = this.detect(function(pair) {
+        return pair.value === value;
+      });
+      return match && match.key;
+    },
+
+    merge: function(object) {
+      return this.clone().update(object);
+    },
+
+    update: function(object) {
+      return new Hash(object).inject(this, function(result, pair) {
+        result.set(pair.key, pair.value);
+        return result;
+      });
+    },
+
+    toQueryString: function() {
+      return this.inject([], function(results, pair) {
+        var key = encodeURIComponent(pair.key), values = pair.value;
+
+        if (values && typeof values == 'object') {
+          if (Object.isArray(values))
+            return results.concat(values.map(toQueryPair.curry(key)));
+        } else results.push(toQueryPair(key, values));
+        return results;
+      }).join('&');
+    },
+
+    inspect: function() {
+      return '#<Hash:{' + this.map(function(pair) {
+        return pair.map(Object.inspect).join(': ');
+      }).join(', ') + '}>';
+    },
+
+    toJSON: function() {
+      return Object.toJSON(this.toObject());
+    },
+
+    clone: function() {
+      return new Hash(this);
+    }
+  }
+})());
+
+Hash.prototype.toTemplateReplacements = Hash.prototype.toObject;
+Hash.from = $H;
+var ObjectRange = Class.create(Enumerable, {
+  initialize: function(start, end, exclusive) {
+    this.start = start;
+    this.end = end;
+    this.exclusive = exclusive;
+  },
+
+  _each: function(iterator) {
+    var value = this.start;
+    while (this.include(value)) {
+      iterator(value);
+      value = value.succ();
+    }
+  },
+
+  include: function(value) {
+    if (value < this.start)
+      return false;
+    if (this.exclusive)
+      return value < this.end;
+    return value <= this.end;
+  }
+});
+
+var $R = function(start, end, exclusive) {
+  return new ObjectRange(start, end, exclusive);
+};
+
+var Ajax = {
+  getTransport: function() {
+    return Try.these(
+      function() {return new XMLHttpRequest()},
+      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
+      function() {return new ActiveXObject('Microsoft.XMLHTTP')}
+    ) || false;
+  },
+
+  activeRequestCount: 0
+};
+
+Ajax.Responders = {
+  responders: [],
+
+  _each: function(iterator) {
+    this.responders._each(iterator);
+  },
+
+  register: function(responder) {
+    if (!this.include(responder))
+      this.responders.push(responder);
+  },
+
+  unregister: function(responder) {
+    this.responders = this.responders.without(responder);
+  },
+
+  dispatch: function(callback, request, transport, json) {
+    this.each(function(responder) {
+      if (Object.isFunction(responder[callback])) {
+        try {
+          responder[callback].apply(responder, [request, transport, json]);
+        } catch (e) { }
+      }
+    });
+  }
+};
+
+Object.extend(Ajax.Responders, Enumerable);
+
+Ajax.Responders.register({
+  onCreate:   function() { Ajax.activeRequestCount++ },
+  onComplete: function() { Ajax.activeRequestCount-- }
+});
+
+Ajax.Base = Class.create({
+  initialize: function(options) {
+    this.options = {
+      method:       'post',
+      asynchronous: true,
+      contentType:  'application/x-www-form-urlencoded',
+      encoding:     'UTF-8',
+      parameters:   '',
+      evalJSON:     true,
+      evalJS:       true
+    };
+    Object.extend(this.options, options || { });
+
+    this.options.method = this.options.method.toLowerCase();
+
+    if (Object.isString(this.options.parameters))
+      this.options.parameters = this.options.parameters.toQueryParams();
+    else if (Object.isHash(this.options.parameters))
+      this.options.parameters = this.options.parameters.toObject();
+  }
+});
+
+Ajax.Request = Class.create(Ajax.Base, {
+  _complete: false,
+
+  initialize: function($super, url, options) {
+    $super(options);
+    this.transport = Ajax.getTransport();
+    this.request(url);
+  },
+
+  request: function(url) {
+    this.url = url;
+    this.method = this.options.method;
+    var params = Object.clone(this.options.parameters);
+
+    if (!['get', 'post'].include(this.method)) {
+      // simulate other verbs over post
+      params['_method'] = this.method;
+      this.method = 'post';
+    }
+
+    this.parameters = params;
+
+    if (params = Object.toQueryString(params)) {
+      // when GET, append parameters to URL
+      if (this.method == 'get')
+        this.url += (this.url.include('?') ? '&' : '?') + params;
+      else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent))
+        params += '&_=';
+    }
+
+    try {
+      var response = new Ajax.Response(this);
+      if (this.options.onCreate) this.options.onCreate(response);
+      Ajax.Responders.dispatch('onCreate', this, response);
+
+      this.transport.open(this.method.toUpperCase(), this.url,
+        this.options.asynchronous);
+
+      if (this.options.asynchronous) this.respondToReadyState.bind(this).defer(1);
+
+      this.transport.onreadystatechange = this.onStateChange.bind(this);
+      this.setRequestHeaders();
+
+      this.body = this.method == 'post' ? (this.options.postBody || params) : null;
+      this.transport.send(this.body);
+
+      /* Force Firefox to handle ready state 4 for synchronous requests */
+      if (!this.options.asynchronous && this.transport.overrideMimeType)
+        this.onStateChange();
+
+    }
+    catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  onStateChange: function() {
+    var readyState = this.transport.readyState;
+    if (readyState > 1 && !((readyState == 4) && this._complete))
+      this.respondToReadyState(this.transport.readyState);
+  },
+
+  setRequestHeaders: function() {
+    var headers = {
+      'X-Requested-With': 'XMLHttpRequest',
+      'X-Prototype-Version': Prototype.Version,
+      'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
+    };
+
+    if (this.method == 'post') {
+      headers['Content-type'] = this.options.contentType +
+        (this.options.encoding ? '; charset=' + this.options.encoding : '');
+
+      /* Force "Connection: close" for older Mozilla browsers to work
+       * around a bug where XMLHttpRequest sends an incorrect
+       * Content-length header. See Mozilla Bugzilla #246651.
+       */
+      if (this.transport.overrideMimeType &&
+          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
+            headers['Connection'] = 'close';
+    }
+
+    // user-defined headers
+    if (typeof this.options.requestHeaders == 'object') {
+      var extras = this.options.requestHeaders;
+
+      if (Object.isFunction(extras.push))
+        for (var i = 0, length = extras.length; i < length; i += 2)
+          headers[extras[i]] = extras[i+1];
+      else
+        $H(extras).each(function(pair) { headers[pair.key] = pair.value });
+    }
+
+    for (var name in headers)
+      this.transport.setRequestHeader(name, headers[name]);
+  },
+
+  success: function() {
+    var status = this.getStatus();
+    return !status || (status >= 200 && status < 300);
+  },
+
+  getStatus: function() {
+    try {
+      return this.transport.status || 0;
+    } catch (e) { return 0 }
+  },
+
+  respondToReadyState: function(readyState) {
+    var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this);
+
+    if (state == 'Complete') {
+      try {
+        this._complete = true;
+        (this.options['on' + response.status]
+         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
+         || Prototype.emptyFunction)(response, response.headerJSON);
+      } catch (e) {
+        this.dispatchException(e);
+      }
+
+      var contentType = response.getHeader('Content-type');
+      if (this.options.evalJS == 'force'
+          || (this.options.evalJS && this.isSameOrigin() && contentType
+          && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)))
+        this.evalResponse();
+    }
+
+    try {
+      (this.options['on' + state] || Prototype.emptyFunction)(response, response.headerJSON);
+      Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON);
+    } catch (e) {
+      this.dispatchException(e);
+    }
+
+    if (state == 'Complete') {
+      // avoid memory leak in MSIE: clean up
+      this.transport.onreadystatechange = Prototype.emptyFunction;
+    }
+  },
+
+  isSameOrigin: function() {
+    var m = this.url.match(/^\s*https?:\/\/[^\/]*/);
+    return !m || (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({
+      protocol: location.protocol,
+      domain: document.domain,
+      port: location.port ? ':' + location.port : ''
+    }));
+  },
+
+  getHeader: function(name) {
+    try {
+      return this.transport.getResponseHeader(name) || null;
+    } catch (e) { return null }
+  },
+
+  evalResponse: function() {
+    try {
+      return eval((this.transport.responseText || '').unfilterJSON());
+    } catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  dispatchException: function(exception) {
+    (this.options.onException || Prototype.emptyFunction)(this, exception);
+    Ajax.Responders.dispatch('onException', this, exception);
+  }
+});
+
+Ajax.Request.Events =
+  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
+
+Ajax.Response = Class.create({
+  initialize: function(request){
+    this.request = request;
+    var transport  = this.transport  = request.transport,
+        readyState = this.readyState = transport.readyState;
+
+    if((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) {
+      this.status       = this.getStatus();
+      this.statusText   = this.getStatusText();
+      this.responseText = String.interpret(transport.responseText);
+      this.headerJSON   = this._getHeaderJSON();
+    }
+
+    if(readyState == 4) {
+      var xml = transport.responseXML;
+      this.responseXML  = Object.isUndefined(xml) ? null : xml;
+      this.responseJSON = this._getResponseJSON();
+    }
+  },
+
+  status:      0,
+  statusText: '',
+
+  getStatus: Ajax.Request.prototype.getStatus,
+
+  getStatusText: function() {
+    try {
+      return this.transport.statusText || '';
+    } catch (e) { return '' }
+  },
+
+  getHeader: Ajax.Request.prototype.getHeader,
+
+  getAllHeaders: function() {
+    try {
+      return this.getAllResponseHeaders();
+    } catch (e) { return null }
+  },
+
+  getResponseHeader: function(name) {
+    return this.transport.getResponseHeader(name);
+  },
+
+  getAllResponseHeaders: function() {
+    return this.transport.getAllResponseHeaders();
+  },
+
+  _getHeaderJSON: function() {
+    var json = this.getHeader('X-JSON');
+    if (!json) return null;
+    json = decodeURIComponent(escape(json));
+    try {
+      return json.evalJSON(this.request.options.sanitizeJSON ||
+        !this.request.isSameOrigin());
+    } catch (e) {
+      this.request.dispatchException(e);
+    }
+  },
+
+  _getResponseJSON: function() {
+    var options = this.request.options;
+    if (!options.evalJSON || (options.evalJSON != 'force' &&
+      !(this.getHeader('Content-type') || '').include('application/json')) ||
+        this.responseText.blank())
+          return null;
+    try {
+      return this.responseText.evalJSON(options.sanitizeJSON ||
+        !this.request.isSameOrigin());
+    } catch (e) {
+      this.request.dispatchException(e);
+    }
+  }
+});
+
+Ajax.Updater = Class.create(Ajax.Request, {
+  initialize: function($super, container, url, options) {
+    this.container = {
+      success: (container.success || container),
+      failure: (container.failure || (container.success ? null : container))
+    };
+
+    options = Object.clone(options);
+    var onComplete = options.onComplete;
+    options.onComplete = (function(response, json) {
+      this.updateContent(response.responseText);
+      if (Object.isFunction(onComplete)) onComplete(response, json);
+    }).bind(this);
+
+    $super(url, options);
+  },
+
+  updateContent: function(responseText) {
+    var receiver = this.container[this.success() ? 'success' : 'failure'],
+        options = this.options;
+
+    if (!options.evalScripts) responseText = responseText.stripScripts();
+
+    if (receiver = $(receiver)) {
+      if (options.insertion) {
+        if (Object.isString(options.insertion)) {
+          var insertion = { }; insertion[options.insertion] = responseText;
+          receiver.insert(insertion);
+        }
+        else options.insertion(receiver, responseText);
+      }
+      else receiver.update(responseText);
+    }
+  }
+});
+
+Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
+  initialize: function($super, container, url, options) {
+    $super(options);
+    this.onComplete = this.options.onComplete;
+
+    this.frequency = (this.options.frequency || 2);
+    this.decay = (this.options.decay || 1);
+
+    this.updater = { };
+    this.container = container;
+    this.url = url;
+
+    this.start();
+  },
+
+  start: function() {
+    this.options.onComplete = this.updateComplete.bind(this);
+    this.onTimerEvent();
+  },
+
+  stop: function() {
+    this.updater.options.onComplete = undefined;
+    clearTimeout(this.timer);
+    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
+  },
+
+  updateComplete: function(response) {
+    if (this.options.decay) {
+      this.decay = (response.responseText == this.lastText ?
+        this.decay * this.options.decay : 1);
+
+      this.lastText = response.responseText;
+    }
+    this.timer = this.onTimerEvent.bind(this).delay(this.decay * this.frequency);
+  },
+
+  onTimerEvent: function() {
+    this.updater = new Ajax.Updater(this.container, this.url, this.options);
+  }
+});
+function $(element) {
+  if (arguments.length > 1) {
+    for (var i = 0, elements = [], length = arguments.length; i < length; i++)
+      elements.push($(arguments[i]));
+    return elements;
+  }
+  if (Object.isString(element))
+    element = document.getElementById(element);
+  return Element.extend(element);
+}
+
+if (Prototype.BrowserFeatures.XPath) {
+  document._getElementsByXPath = function(expression, parentElement) {
+    var results = [];
+    var query = document.evaluate(expression, $(parentElement) || document,
+      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+    for (var i = 0, length = query.snapshotLength; i < length; i++)
+      results.push(Element.extend(query.snapshotItem(i)));
+    return results;
+  };
+}
+
+/*--------------------------------------------------------------------------*/
+
+if (!window.Node) var Node = { };
+
+if (!Node.ELEMENT_NODE) {
+  // DOM level 2 ECMAScript Language Binding
+  Object.extend(Node, {
+    ELEMENT_NODE: 1,
+    ATTRIBUTE_NODE: 2,
+    TEXT_NODE: 3,
+    CDATA_SECTION_NODE: 4,
+    ENTITY_REFERENCE_NODE: 5,
+    ENTITY_NODE: 6,
+    PROCESSING_INSTRUCTION_NODE: 7,
+    COMMENT_NODE: 8,
+    DOCUMENT_NODE: 9,
+    DOCUMENT_TYPE_NODE: 10,
+    DOCUMENT_FRAGMENT_NODE: 11,
+    NOTATION_NODE: 12
+  });
+}
+
+(function() {
+  var element = this.Element;
+  this.Element = function(tagName, attributes) {
+    attributes = attributes || { };
+    tagName = tagName.toLowerCase();
+    var cache = Element.cache;
+    if (Prototype.Browser.IE && attributes.name) {
+      tagName = '<' + tagName + ' name="' + attributes.name + '">';
+      delete attributes.name;
+      return Element.writeAttribute(document.createElement(tagName), attributes);
+    }
+    if (!cache[tagName]) cache[tagName] = Element.extend(document.createElement(tagName));
+    return Element.writeAttribute(cache[tagName].cloneNode(false), attributes);
+  };
+  Object.extend(this.Element, element || { });
+  if (element) this.Element.prototype = element.prototype;
+}).call(window);
+
+Element.cache = { };
+
+Element.Methods = {
+  visible: function(element) {
+    return $(element).style.display != 'none';
+  },
+
+  toggle: function(element) {
+    element = $(element);
+    Element[Element.visible(element) ? 'hide' : 'show'](element);
+    return element;
+  },
+
+  hide: function(element) {
+    element = $(element);
+    element.style.display = 'none';
+    return element;
+  },
+
+  show: function(element) {
+    element = $(element);
+    element.style.display = '';
+    return element;
+  },
+
+  remove: function(element) {
+    element = $(element);
+    element.parentNode.removeChild(element);
+    return element;
+  },
+
+  update: function(element, content) {
+    element = $(element);
+    if (content && content.toElement) content = content.toElement();
+    if (Object.isElement(content)) return element.update().insert(content);
+    content = Object.toHTML(content);
+    element.innerHTML = content.stripScripts();
+    content.evalScripts.bind(content).defer();
+    return element;
+  },
+
+  replace: function(element, content) {
+    element = $(element);
+    if (content && content.toElement) content = content.toElement();
+    else if (!Object.isElement(content)) {
+      content = Object.toHTML(content);
+      var range = element.ownerDocument.createRange();
+      range.selectNode(element);
+      content.evalScripts.bind(content).defer();
+      content = range.createContextualFragment(content.stripScripts());
+    }
+    element.parentNode.replaceChild(content, element);
+    return element;
+  },
+
+  insert: function(element, insertions) {
+    element = $(element);
+
+    if (Object.isString(insertions) || Object.isNumber(insertions) ||
+        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
+          insertions = {bottom:insertions};
+
+    var content, insert, tagName, childNodes;
+
+    for (var position in insertions) {
+      content  = insertions[position];
+      position = position.toLowerCase();
+      insert = Element._insertionTranslations[position];
+
+      if (content && content.toElement) content = content.toElement();
+      if (Object.isElement(content)) {
+        insert(element, content);
+        continue;
+      }
+
+      content = Object.toHTML(content);
+
+      tagName = ((position == 'before' || position == 'after')
+        ? element.parentNode : element).tagName.toUpperCase();
+
+      childNodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+
+      if (position == 'top' || position == 'after') childNodes.reverse();
+      childNodes.each(insert.curry(element));
+
+      content.evalScripts.bind(content).defer();
+    }
+
+    return element;
+  },
+
+  wrap: function(element, wrapper, attributes) {
+    element = $(element);
+    if (Object.isElement(wrapper))
+      $(wrapper).writeAttribute(attributes || { });
+    else if (Object.isString(wrapper)) wrapper = new Element(wrapper, attributes);
+    else wrapper = new Element('div', wrapper);
+    if (element.parentNode)
+      element.parentNode.replaceChild(wrapper, element);
+    wrapper.appendChild(element);
+    return wrapper;
+  },
+
+  inspect: function(element) {
+    element = $(element);
+    var result = '<' + element.tagName.toLowerCase();
+    $H({'id': 'id', 'className': 'class'}).each(function(pair) {
+      var property = pair.first(), attribute = pair.last();
+      var value = (element[property] || '').toString();
+      if (value) result += ' ' + attribute + '=' + value.inspect(true);
+    });
+    return result + '>';
+  },
+
+  recursivelyCollect: function(element, property) {
+    element = $(element);
+    var elements = [];
+    while (element = element[property])
+      if (element.nodeType == 1)
+        elements.push(Element.extend(element));
+    return elements;
+  },
+
+  ancestors: function(element) {
+    return $(element).recursivelyCollect('parentNode');
+  },
+
+  descendants: function(element) {
+    return $(element).select("*");
+  },
+
+  firstDescendant: function(element) {
+    element = $(element).firstChild;
+    while (element && element.nodeType != 1) element = element.nextSibling;
+    return $(element);
+  },
+
+  immediateDescendants: function(element) {
+    if (!(element = $(element).firstChild)) return [];
+    while (element && element.nodeType != 1) element = element.nextSibling;
+    if (element) return [element].concat($(element).nextSiblings());
+    return [];
+  },
+
+  previousSiblings: function(element) {
+    return $(element).recursivelyCollect('previousSibling');
+  },
+
+  nextSiblings: function(element) {
+    return $(element).recursivelyCollect('nextSibling');
+  },
+
+  siblings: function(element) {
+    element = $(element);
+    return element.previousSiblings().reverse().concat(element.nextSiblings());
+  },
+
+  match: function(element, selector) {
+    if (Object.isString(selector))
+      selector = new Selector(selector);
+    return selector.match($(element));
+  },
+
+  up: function(element, expression, index) {
+    element = $(element);
+    if (arguments.length == 1) return $(element.parentNode);
+    var ancestors = element.ancestors();
+    return Object.isNumber(expression) ? ancestors[expression] :
+      Selector.findElement(ancestors, expression, index);
+  },
+
+  down: function(element, expression, index) {
+    element = $(element);
+    if (arguments.length == 1) return element.firstDescendant();
+    return Object.isNumber(expression) ? element.descendants()[expression] :
+      Element.select(element, expression)[index || 0];
+  },
+
+  previous: function(element, expression, index) {
+    element = $(element);
+    if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
+    var previousSiblings = element.previousSiblings();
+    return Object.isNumber(expression) ? previousSiblings[expression] :
+      Selector.findElement(previousSiblings, expression, index);
+  },
+
+  next: function(element, expression, index) {
+    element = $(element);
+    if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
+    var nextSiblings = element.nextSiblings();
+    return Object.isNumber(expression) ? nextSiblings[expression] :
+      Selector.findElement(nextSiblings, expression, index);
+  },
+
+  select: function() {
+    var args = $A(arguments), element = $(args.shift());
+    return Selector.findChildElements(element, args);
+  },
+
+  adjacent: function() {
+    var args = $A(arguments), element = $(args.shift());
+    return Selector.findChildElements(element.parentNode, args).without(element);
+  },
+
+  identify: function(element) {
+    element = $(element);
+    var id = element.readAttribute('id'), self = arguments.callee;
+    if (id) return id;
+    do { id = 'anonymous_element_' + self.counter++ } while ($(id));
+    element.writeAttribute('id', id);
+    return id;
+  },
+
+  readAttribute: function(element, name) {
+    element = $(element);
+    if (Prototype.Browser.IE) {
+      var t = Element._attributeTranslations.read;
+      if (t.values[name]) return t.values[name](element, name);
+      if (t.names[name]) name = t.names[name];
+      if (name.include(':')) {
+        return (!element.attributes || !element.attributes[name]) ? null :
+         element.attributes[name].value;
+      }
+    }
+    return element.getAttribute(name);
+  },
+
+  writeAttribute: function(element, name, value) {
+    element = $(element);
+    var attributes = { }, t = Element._attributeTranslations.write;
+
+    if (typeof name == 'object') attributes = name;
+    else attributes[name] = Object.isUndefined(value) ? true : value;
+
+    for (var attr in attributes) {
+      name = t.names[attr] || attr;
+      value = attributes[attr];
+      if (t.values[attr]) name = t.values[attr](element, value);
+      if (value === false || value === null)
+        element.removeAttribute(name);
+      else if (value === true)
+        element.setAttribute(name, name);
+      else element.setAttribute(name, value);
+    }
+    return element;
+  },
+
+  getHeight: function(element) {
+    return $(element).getDimensions().height;
+  },
+
+  getWidth: function(element) {
+    return $(element).getDimensions().width;
+  },
+
+  classNames: function(element) {
+    return new Element.ClassNames(element);
+  },
+
+  hasClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    var elementClassName = element.className;
+    return (elementClassName.length > 0 && (elementClassName == className ||
+      new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName)));
+  },
+
+  addClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    if (!element.hasClassName(className))
+      element.className += (element.className ? ' ' : '') + className;
+    return element;
+  },
+
+  removeClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    element.className = element.className.replace(
+      new RegExp("(^|\\s+)" + className + "(\\s+|$)"), ' ').strip();
+    return element;
+  },
+
+  toggleClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    return element[element.hasClassName(className) ?
+      'removeClassName' : 'addClassName'](className);
+  },
+
+  // removes whitespace-only text node children
+  cleanWhitespace: function(element) {
+    element = $(element);
+    var node = element.firstChild;
+    while (node) {
+      var nextNode = node.nextSibling;
+      if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
+        element.removeChild(node);
+      node = nextNode;
+    }
+    return element;
+  },
+
+  empty: function(element) {
+    return $(element).innerHTML.blank();
+  },
+
+  descendantOf: function(element, ancestor) {
+    element = $(element), ancestor = $(ancestor);
+
+    if (element.compareDocumentPosition)
+      return (element.compareDocumentPosition(ancestor) & 8) === 8;
+
+    if (ancestor.contains)
+      return ancestor.contains(element) && ancestor !== element;
+
+    while (element = element.parentNode)
+      if (element == ancestor) return true;
+
+    return false;
+  },
+
+  scrollTo: function(element) {
+    element = $(element);
+    var pos = element.cumulativeOffset();
+    window.scrollTo(pos[0], pos[1]);
+    return element;
+  },
+
+  getStyle: function(element, style) {
+    element = $(element);
+    style = style == 'float' ? 'cssFloat' : style.camelize();
+    var value = element.style[style];
+    if (!value || value == 'auto') {
+      var css = document.defaultView.getComputedStyle(element, null);
+      value = css ? css[style] : null;
+    }
+    if (style == 'opacity') return value ? parseFloat(value) : 1.0;
+    return value == 'auto' ? null : value;
+  },
+
+  getOpacity: function(element) {
+    return $(element).getStyle('opacity');
+  },
+
+  setStyle: function(element, styles) {
+    element = $(element);
+    var elementStyle = element.style, match;
+    if (Object.isString(styles)) {
+      element.style.cssText += ';' + styles;
+      return styles.include('opacity') ?
+        element.setOpacity(styles.match(/opacity:\s*(\d?\.?\d*)/)[1]) : element;
+    }
+    for (var property in styles)
+      if (property == 'opacity') element.setOpacity(styles[property]);
+      else
+        elementStyle[(property == 'float' || property == 'cssFloat') ?
+          (Object.isUndefined(elementStyle.styleFloat) ? 'cssFloat' : 'styleFloat') :
+            property] = styles[property];
+
+    return element;
+  },
+
+  setOpacity: function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1 || value === '') ? '' :
+      (value < 0.00001) ? 0 : value;
+    return element;
+  },
+
+  getDimensions: function(element) {
+    element = $(element);
+    var display = element.getStyle('display');
+    if (display != 'none' && display != null) // Safari bug
+      return {width: element.offsetWidth, height: element.offsetHeight};
+
+    // All *Width and *Height properties give 0 on elements with display none,
+    // so enable the element temporarily
+    var els = element.style;
+    var originalVisibility = els.visibility;
+    var originalPosition = els.position;
+    var originalDisplay = els.display;
+    els.visibility = 'hidden';
+    els.position = 'absolute';
+    els.display = 'block';
+    var originalWidth = element.clientWidth;
+    var originalHeight = element.clientHeight;
+    els.display = originalDisplay;
+    els.position = originalPosition;
+    els.visibility = originalVisibility;
+    return {width: originalWidth, height: originalHeight};
+  },
+
+  makePositioned: function(element) {
+    element = $(element);
+    var pos = Element.getStyle(element, 'position');
+    if (pos == 'static' || !pos) {
+      element._madePositioned = true;
+      element.style.position = 'relative';
+      // Opera returns the offset relative to the positioning context, when an
+      // element is position relative but top and left have not been defined
+      if (Prototype.Browser.Opera) {
+        element.style.top = 0;
+        element.style.left = 0;
+      }
+    }
+    return element;
+  },
+
+  undoPositioned: function(element) {
+    element = $(element);
+    if (element._madePositioned) {
+      element._madePositioned = undefined;
+      element.style.position =
+        element.style.top =
+        element.style.left =
+        element.style.bottom =
+        element.style.right = '';
+    }
+    return element;
+  },
+
+  makeClipping: function(element) {
+    element = $(element);
+    if (element._overflow) return element;
+    element._overflow = Element.getStyle(element, 'overflow') || 'auto';
+    if (element._overflow !== 'hidden')
+      element.style.overflow = 'hidden';
+    return element;
+  },
+
+  undoClipping: function(element) {
+    element = $(element);
+    if (!element._overflow) return element;
+    element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
+    element._overflow = null;
+    return element;
+  },
+
+  cumulativeOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  positionedOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+      if (element) {
+        if (element.tagName.toUpperCase() == 'BODY') break;
+        var p = Element.getStyle(element, 'position');
+        if (p !== 'static') break;
+      }
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  absolutize: function(element) {
+    element = $(element);
+    if (element.getStyle('position') == 'absolute') return element;
+    // Position.prepare(); // To be done manually by Scripty when it needs it.
+
+    var offsets = element.positionedOffset();
+    var top     = offsets[1];
+    var left    = offsets[0];
+    var width   = element.clientWidth;
+    var height  = element.clientHeight;
+
+    element._originalLeft   = left - parseFloat(element.style.left  || 0);
+    element._originalTop    = top  - parseFloat(element.style.top || 0);
+    element._originalWidth  = element.style.width;
+    element._originalHeight = element.style.height;
+
+    element.style.position = 'absolute';
+    element.style.top    = top + 'px';
+    element.style.left   = left + 'px';
+    element.style.width  = width + 'px';
+    element.style.height = height + 'px';
+    return element;
+  },
+
+  relativize: function(element) {
+    element = $(element);
+    if (element.getStyle('position') == 'relative') return element;
+    // Position.prepare(); // To be done manually by Scripty when it needs it.
+
+    element.style.position = 'relative';
+    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
+    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
+
+    element.style.top    = top + 'px';
+    element.style.left   = left + 'px';
+    element.style.height = element._originalHeight;
+    element.style.width  = element._originalWidth;
+    return element;
+  },
+
+  cumulativeScrollOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.scrollTop  || 0;
+      valueL += element.scrollLeft || 0;
+      element = element.parentNode;
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  getOffsetParent: function(element) {
+    if (element.offsetParent) return $(element.offsetParent);
+    if (element == document.body) return $(element);
+
+    while ((element = element.parentNode) && element != document.body)
+      if (Element.getStyle(element, 'position') != 'static')
+        return $(element);
+
+    return $(document.body);
+  },
+
+  viewportOffset: function(forElement) {
+    var valueT = 0, valueL = 0;
+
+    var element = forElement;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+
+      // Safari fix
+      if (element.offsetParent == document.body &&
+        Element.getStyle(element, 'position') == 'absolute') break;
+
+    } while (element = element.offsetParent);
+
+    element = forElement;
+    do {
+      if (!Prototype.Browser.Opera || (element.tagName && (element.tagName.toUpperCase() == 'BODY'))) {
+        valueT -= element.scrollTop  || 0;
+        valueL -= element.scrollLeft || 0;
+      }
+    } while (element = element.parentNode);
+
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  clonePosition: function(element, source) {
+    var options = Object.extend({
+      setLeft:    true,
+      setTop:     true,
+      setWidth:   true,
+      setHeight:  true,
+      offsetTop:  0,
+      offsetLeft: 0
+    }, arguments[2] || { });
+
+    // find page position of source
+    source = $(source);
+    var p = source.viewportOffset();
+
+    // find coordinate system to use
+    element = $(element);
+    var delta = [0, 0];
+    var parent = null;
+    // delta [0,0] will do fine with position: fixed elements,
+    // position:absolute needs offsetParent deltas
+    if (Element.getStyle(element, 'position') == 'absolute') {
+      parent = element.getOffsetParent();
+      delta = parent.viewportOffset();
+    }
+
+    // correct by body offsets (fixes Safari)
+    if (parent == document.body) {
+      delta[0] -= document.body.offsetLeft;
+      delta[1] -= document.body.offsetTop;
+    }
+
+    // set position
+    if (options.setLeft)   element.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
+    if (options.setTop)    element.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
+    if (options.setWidth)  element.style.width = source.offsetWidth + 'px';
+    if (options.setHeight) element.style.height = source.offsetHeight + 'px';
+    return element;
+  }
+};
+
+Element.Methods.identify.counter = 1;
+
+Object.extend(Element.Methods, {
+  getElementsBySelector: Element.Methods.select,
+  childElements: Element.Methods.immediateDescendants
+});
+
+Element._attributeTranslations = {
+  write: {
+    names: {
+      className: 'class',
+      htmlFor:   'for'
+    },
+    values: { }
+  }
+};
+
+if (Prototype.Browser.Opera) {
+  Element.Methods.getStyle = Element.Methods.getStyle.wrap(
+    function(proceed, element, style) {
+      switch (style) {
+        case 'left': case 'top': case 'right': case 'bottom':
+          if (proceed(element, 'position') === 'static') return null;
+        case 'height': case 'width':
+          // returns '0px' for hidden elements; we want it to return null
+          if (!Element.visible(element)) return null;
+
+          // returns the border-box dimensions rather than the content-box
+          // dimensions, so we subtract padding and borders from the value
+          var dim = parseInt(proceed(element, style), 10);
+
+          if (dim !== element['offset' + style.capitalize()])
+            return dim + 'px';
+
+          var properties;
+          if (style === 'height') {
+            properties = ['border-top-width', 'padding-top',
+             'padding-bottom', 'border-bottom-width'];
+          }
+          else {
+            properties = ['border-left-width', 'padding-left',
+             'padding-right', 'border-right-width'];
+          }
+          return properties.inject(dim, function(memo, property) {
+            var val = proceed(element, property);
+            return val === null ? memo : memo - parseInt(val, 10);
+          }) + 'px';
+        default: return proceed(element, style);
+      }
+    }
+  );
+
+  Element.Methods.readAttribute = Element.Methods.readAttribute.wrap(
+    function(proceed, element, attribute) {
+      if (attribute === 'title') return element.title;
+      return proceed(element, attribute);
+    }
+  );
+}
+
+else if (Prototype.Browser.IE) {
+  // IE doesn't report offsets correctly for static elements, so we change them
+  // to "relative" to get the values, then change them back.
+  Element.Methods.getOffsetParent = Element.Methods.getOffsetParent.wrap(
+    function(proceed, element) {
+      element = $(element);
+      // IE throws an error if element is not in document
+      try { element.offsetParent }
+      catch(e) { return $(document.body) }
+      var position = element.getStyle('position');
+      if (position !== 'static') return proceed(element);
+      element.setStyle({ position: 'relative' });
+      var value = proceed(element);
+      element.setStyle({ position: position });
+      return value;
+    }
+  );
+
+  $w('positionedOffset viewportOffset').each(function(method) {
+    Element.Methods[method] = Element.Methods[method].wrap(
+      function(proceed, element) {
+        element = $(element);
+        try { element.offsetParent }
+        catch(e) { return Element._returnOffset(0,0) }
+        var position = element.getStyle('position');
+        if (position !== 'static') return proceed(element);
+        // Trigger hasLayout on the offset parent so that IE6 reports
+        // accurate offsetTop and offsetLeft values for position: fixed.
+        var offsetParent = element.getOffsetParent();
+        if (offsetParent && offsetParent.getStyle('position') === 'fixed')
+          offsetParent.setStyle({ zoom: 1 });
+        element.setStyle({ position: 'relative' });
+        var value = proceed(element);
+        element.setStyle({ position: position });
+        return value;
+      }
+    );
+  });
+
+  Element.Methods.cumulativeOffset = Element.Methods.cumulativeOffset.wrap(
+    function(proceed, element) {
+      try { element.offsetParent }
+      catch(e) { return Element._returnOffset(0,0) }
+      return proceed(element);
+    }
+  );
+
+  Element.Methods.getStyle = function(element, style) {
+    element = $(element);
+    style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
+    var value = element.style[style];
+    if (!value && element.currentStyle) value = element.currentStyle[style];
+
+    if (style == 'opacity') {
+      if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
+        if (value[1]) return parseFloat(value[1]) / 100;
+      return 1.0;
+    }
+
+    if (value == 'auto') {
+      if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none'))
+        return element['offset' + style.capitalize()] + 'px';
+      return null;
+    }
+    return value;
+  };
+
+  Element.Methods.setOpacity = function(element, value) {
+    function stripAlpha(filter){
+      return filter.replace(/alpha\([^\)]*\)/gi,'');
+    }
+    element = $(element);
+    var currentStyle = element.currentStyle;
+    if ((currentStyle && !currentStyle.hasLayout) ||
+      (!currentStyle && element.style.zoom == 'normal'))
+        element.style.zoom = 1;
+
+    var filter = element.getStyle('filter'), style = element.style;
+    if (value == 1 || value === '') {
+      (filter = stripAlpha(filter)) ?
+        style.filter = filter : style.removeAttribute('filter');
+      return element;
+    } else if (value < 0.00001) value = 0;
+    style.filter = stripAlpha(filter) +
+      'alpha(opacity=' + (value * 100) + ')';
+    return element;
+  };
+
+  Element._attributeTranslations = {
+    read: {
+      names: {
+        'class': 'className',
+        'for':   'htmlFor'
+      },
+      values: {
+        _getAttr: function(element, attribute) {
+          return element.getAttribute(attribute, 2);
+        },
+        _getAttrNode: function(element, attribute) {
+          var node = element.getAttributeNode(attribute);
+          return node ? node.value : "";
+        },
+        _getEv: function(element, attribute) {
+          attribute = element.getAttribute(attribute);
+          return attribute ? attribute.toString().slice(23, -2) : null;
+        },
+        _flag: function(element, attribute) {
+          return $(element).hasAttribute(attribute) ? attribute : null;
+        },
+        style: function(element) {
+          return element.style.cssText.toLowerCase();
+        },
+        title: function(element) {
+          return element.title;
+        }
+      }
+    }
+  };
+
+  Element._attributeTranslations.write = {
+    names: Object.extend({
+      cellpadding: 'cellPadding',
+      cellspacing: 'cellSpacing'
+    }, Element._attributeTranslations.read.names),
+    values: {
+      checked: function(element, value) {
+        element.checked = !!value;
+      },
+
+      style: function(element, value) {
+        element.style.cssText = value ? value : '';
+      }
+    }
+  };
+
+  Element._attributeTranslations.has = {};
+
+  $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' +
+      'encType maxLength readOnly longDesc frameBorder').each(function(attr) {
+    Element._attributeTranslations.write.names[attr.toLowerCase()] = attr;
+    Element._attributeTranslations.has[attr.toLowerCase()] = attr;
+  });
+
+  (function(v) {
+    Object.extend(v, {
+      href:        v._getAttr,
+      src:         v._getAttr,
+      type:        v._getAttr,
+      action:      v._getAttrNode,
+      disabled:    v._flag,
+      checked:     v._flag,
+      readonly:    v._flag,
+      multiple:    v._flag,
+      onload:      v._getEv,
+      onunload:    v._getEv,
+      onclick:     v._getEv,
+      ondblclick:  v._getEv,
+      onmousedown: v._getEv,
+      onmouseup:   v._getEv,
+      onmouseover: v._getEv,
+      onmousemove: v._getEv,
+      onmouseout:  v._getEv,
+      onfocus:     v._getEv,
+      onblur:      v._getEv,
+      onkeypress:  v._getEv,
+      onkeydown:   v._getEv,
+      onkeyup:     v._getEv,
+      onsubmit:    v._getEv,
+      onreset:     v._getEv,
+      onselect:    v._getEv,
+      onchange:    v._getEv
+    });
+  })(Element._attributeTranslations.read.values);
+}
+
+else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) {
+  Element.Methods.setOpacity = function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1) ? 0.999999 :
+      (value === '') ? '' : (value < 0.00001) ? 0 : value;
+    return element;
+  };
+}
+
+else if (Prototype.Browser.WebKit) {
+  Element.Methods.setOpacity = function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1 || value === '') ? '' :
+      (value < 0.00001) ? 0 : value;
+
+    if (value == 1)
+      if(element.tagName.toUpperCase() == 'IMG' && element.width) {
+        element.width++; element.width--;
+      } else try {
+        var n = document.createTextNode(' ');
+        element.appendChild(n);
+        element.removeChild(n);
+      } catch (e) { }
+
+    return element;
+  };
+
+  // Safari returns margins on body which is incorrect if the child is absolutely
+  // positioned.  For performance reasons, redefine Element#cumulativeOffset for
+  // KHTML/WebKit only.
+  Element.Methods.cumulativeOffset = function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      if (element.offsetParent == document.body)
+        if (Element.getStyle(element, 'position') == 'absolute') break;
+
+      element = element.offsetParent;
+    } while (element);
+
+    return Element._returnOffset(valueL, valueT);
+  };
+}
+
+if (Prototype.Browser.IE || Prototype.Browser.Opera) {
+  // IE and Opera are missing .innerHTML support for TABLE-related and SELECT elements
+  Element.Methods.update = function(element, content) {
+    element = $(element);
+
+    if (content && content.toElement) content = content.toElement();
+    if (Object.isElement(content)) return element.update().insert(content);
+
+    content = Object.toHTML(content);
+    var tagName = element.tagName.toUpperCase();
+
+    if (tagName in Element._insertionTranslations.tags) {
+      $A(element.childNodes).each(function(node) { element.removeChild(node) });
+      Element._getContentFromAnonymousElement(tagName, content.stripScripts())
+        .each(function(node) { element.appendChild(node) });
+    }
+    else element.innerHTML = content.stripScripts();
+
+    content.evalScripts.bind(content).defer();
+    return element;
+  };
+}
+
+if ('outerHTML' in document.createElement('div')) {
+  Element.Methods.replace = function(element, content) {
+    element = $(element);
+
+    if (content && content.toElement) content = content.toElement();
+    if (Object.isElement(content)) {
+      element.parentNode.replaceChild(content, element);
+      return element;
+    }
+
+    content = Object.toHTML(content);
+    var parent = element.parentNode, tagName = parent.tagName.toUpperCase();
+
+    if (Element._insertionTranslations.tags[tagName]) {
+      var nextSibling = element.next();
+      var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+      parent.removeChild(element);
+      if (nextSibling)
+        fragments.each(function(node) { parent.insertBefore(node, nextSibling) });
+      else
+        fragments.each(function(node) { parent.appendChild(node) });
+    }
+    else element.outerHTML = content.stripScripts();
+
+    content.evalScripts.bind(content).defer();
+    return element;
+  };
+}
+
+Element._returnOffset = function(l, t) {
+  var result = [l, t];
+  result.left = l;
+  result.top = t;
+  return result;
+};
+
+Element._getContentFromAnonymousElement = function(tagName, html) {
+  var div = new Element('div'), t = Element._insertionTranslations.tags[tagName];
+  if (t) {
+    div.innerHTML = t[0] + html + t[1];
+    t[2].times(function() { div = div.firstChild });
+  } else div.innerHTML = html;
+  return $A(div.childNodes);
+};
+
+Element._insertionTranslations = {
+  before: function(element, node) {
+    element.parentNode.insertBefore(node, element);
+  },
+  top: function(element, node) {
+    element.insertBefore(node, element.firstChild);
+  },
+  bottom: function(element, node) {
+    element.appendChild(node);
+  },
+  after: function(element, node) {
+    element.parentNode.insertBefore(node, element.nextSibling);
+  },
+  tags: {
+    TABLE:  ['<table>',                '</table>',                   1],
+    TBODY:  ['<table><tbody>',         '</tbody></table>',           2],
+    TR:     ['<table><tbody><tr>',     '</tr></tbody></table>',      3],
+    TD:     ['<table><tbody><tr><td>', '</td></tr></tbody></table>', 4],
+    SELECT: ['<select>',               '</select>',                  1]
+  }
+};
+
+(function() {
+  Object.extend(this.tags, {
+    THEAD: this.tags.TBODY,
+    TFOOT: this.tags.TBODY,
+    TH:    this.tags.TD
+  });
+}).call(Element._insertionTranslations);
+
+Element.Methods.Simulated = {
+  hasAttribute: function(element, attribute) {
+    attribute = Element._attributeTranslations.has[attribute] || attribute;
+    var node = $(element).getAttributeNode(attribute);
+    return !!(node && node.specified);
+  }
+};
+
+Element.Methods.ByTag = { };
+
+Object.extend(Element, Element.Methods);
+
+if (!Prototype.BrowserFeatures.ElementExtensions &&
+    document.createElement('div')['__proto__']) {
+  window.HTMLElement = { };
+  window.HTMLElement.prototype = document.createElement('div')['__proto__'];
+  Prototype.BrowserFeatures.ElementExtensions = true;
+}
+
+Element.extend = (function() {
+  if (Prototype.BrowserFeatures.SpecificElementExtensions)
+    return Prototype.K;
+
+  var Methods = { }, ByTag = Element.Methods.ByTag;
+
+  var extend = Object.extend(function(element) {
+    if (!element || element._extendedByPrototype ||
+        element.nodeType != 1 || element == window) return element;
+
+    var methods = Object.clone(Methods),
+      tagName = element.tagName.toUpperCase(), property, value;
+
+    // extend methods for specific tags
+    if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
+
+    for (property in methods) {
+      value = methods[property];
+      if (Object.isFunction(value) && !(property in element))
+        element[property] = value.methodize();
+    }
+
+    element._extendedByPrototype = Prototype.emptyFunction;
+    return element;
+
+  }, {
+    refresh: function() {
+      // extend methods for all tags (Safari doesn't need this)
+      if (!Prototype.BrowserFeatures.ElementExtensions) {
+        Object.extend(Methods, Element.Methods);
+        Object.extend(Methods, Element.Methods.Simulated);
+      }
+    }
+  });
+
+  extend.refresh();
+  return extend;
+})();
+
+Element.hasAttribute = function(element, attribute) {
+  if (element.hasAttribute) return element.hasAttribute(attribute);
+  return Element.Methods.Simulated.hasAttribute(element, attribute);
+};
+
+Element.addMethods = function(methods) {
+  var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag;
+
+  if (!methods) {
+    Object.extend(Form, Form.Methods);
+    Object.extend(Form.Element, Form.Element.Methods);
+    Object.extend(Element.Methods.ByTag, {
+      "FORM":     Object.clone(Form.Methods),
+      "INPUT":    Object.clone(Form.Element.Methods),
+      "SELECT":   Object.clone(Form.Element.Methods),
+      "TEXTAREA": Object.clone(Form.Element.Methods)
+    });
+  }
+
+  if (arguments.length == 2) {
+    var tagName = methods;
+    methods = arguments[1];
+  }
+
+  if (!tagName) Object.extend(Element.Methods, methods || { });
+  else {
+    if (Object.isArray(tagName)) tagName.each(extend);
+    else extend(tagName);
+  }
+
+  function extend(tagName) {
+    tagName = tagName.toUpperCase();
+    if (!Element.Methods.ByTag[tagName])
+      Element.Methods.ByTag[tagName] = { };
+    Object.extend(Element.Methods.ByTag[tagName], methods);
+  }
+
+  function copy(methods, destination, onlyIfAbsent) {
+    onlyIfAbsent = onlyIfAbsent || false;
+    for (var property in methods) {
+      var value = methods[property];
+      if (!Object.isFunction(value)) continue;
+      if (!onlyIfAbsent || !(property in destination))
+        destination[property] = value.methodize();
+    }
+  }
+
+  function findDOMClass(tagName) {
+    var klass;
+    var trans = {
+      "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
+      "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
+      "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading",
+      "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
+      "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
+      "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
+      "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR":
+      "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
+      "FrameSet", "IFRAME": "IFrame"
+    };
+    if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element';
+    if (window[klass]) return window[klass];
+    klass = 'HTML' + tagName + 'Element';
+    if (window[klass]) return window[klass];
+    klass = 'HTML' + tagName.capitalize() + 'Element';
+    if (window[klass]) return window[klass];
+
+    window[klass] = { };
+    window[klass].prototype = document.createElement(tagName)['__proto__'];
+    return window[klass];
+  }
+
+  if (F.ElementExtensions) {
+    copy(Element.Methods, HTMLElement.prototype);
+    copy(Element.Methods.Simulated, HTMLElement.prototype, true);
+  }
+
+  if (F.SpecificElementExtensions) {
+    for (var tag in Element.Methods.ByTag) {
+      var klass = findDOMClass(tag);
+      if (Object.isUndefined(klass)) continue;
+      copy(T[tag], klass.prototype);
+    }
+  }
+
+  Object.extend(Element, Element.Methods);
+  delete Element.ByTag;
+
+  if (Element.extend.refresh) Element.extend.refresh();
+  Element.cache = { };
+};
+
+document.viewport = {
+  getDimensions: function() {
+    var dimensions = { }, B = Prototype.Browser;
+    $w('width height').each(function(d) {
+      var D = d.capitalize();
+      if (B.WebKit && !document.evaluate) {
+        // Safari <3.0 needs self.innerWidth/Height
+        dimensions[d] = self['inner' + D];
+      } else if (B.Opera && parseFloat(window.opera.version()) < 9.5) {
+        // Opera <9.5 needs document.body.clientWidth/Height
+        dimensions[d] = document.body['client' + D]
+      } else {
+        dimensions[d] = document.documentElement['client' + D];
+      }
+    });
+    return dimensions;
+  },
+
+  getWidth: function() {
+    return this.getDimensions().width;
+  },
+
+  getHeight: function() {
+    return this.getDimensions().height;
+  },
+
+  getScrollOffsets: function() {
+    return Element._returnOffset(
+      window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft,
+      window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop);
+  }
+};
+/* Portions of the Selector class are derived from Jack Slocum's DomQuery,
+ * part of YUI-Ext version 0.40, distributed under the terms of an MIT-style
+ * license.  Please see http://www.yui-ext.com/ for more information. */
+
+var Selector = Class.create({
+  initialize: function(expression) {
+    this.expression = expression.strip();
+
+    if (this.shouldUseSelectorsAPI()) {
+      this.mode = 'selectorsAPI';
+    } else if (this.shouldUseXPath()) {
+      this.mode = 'xpath';
+      this.compileXPathMatcher();
+    } else {
+      this.mode = "normal";
+      this.compileMatcher();
+    }
+
+  },
+
+  shouldUseXPath: function() {
+    if (!Prototype.BrowserFeatures.XPath) return false;
+
+    var e = this.expression;
+
+    // Safari 3 chokes on :*-of-type and :empty
+    if (Prototype.Browser.WebKit &&
+     (e.include("-of-type") || e.include(":empty")))
+      return false;
+
+    // XPath can't do namespaced attributes, nor can it read
+    // the "checked" property from DOM nodes
+    if ((/(\[[\w-]*?:|:checked)/).test(e))
+      return false;
+
+    return true;
+  },
+
+  shouldUseSelectorsAPI: function() {
+    if (!Prototype.BrowserFeatures.SelectorsAPI) return false;
+
+    if (!Selector._div) Selector._div = new Element('div');
+
+    // Make sure the browser treats the selector as valid. Test on an
+    // isolated element to minimize cost of this check.
+    try {
+      Selector._div.querySelector(this.expression);
+    } catch(e) {
+      return false;
+    }
+
+    return true;
+  },
+
+  compileMatcher: function() {
+    var e = this.expression, ps = Selector.patterns, h = Selector.handlers,
+        c = Selector.criteria, le, p, m;
+
+    if (Selector._cache[e]) {
+      this.matcher = Selector._cache[e];
+      return;
+    }
+
+    this.matcher = ["this.matcher = function(root) {",
+                    "var r = root, h = Selector.handlers, c = false, n;"];
+
+    while (e && le != e && (/\S/).test(e)) {
+      le = e;
+      for (var i in ps) {
+        p = ps[i];
+        if (m = e.match(p)) {
+          this.matcher.push(Object.isFunction(c[i]) ? c[i](m) :
+            new Template(c[i]).evaluate(m));
+          e = e.replace(m[0], '');
+          break;
+        }
+      }
+    }
+
+    this.matcher.push("return h.unique(n);\n}");
+    eval(this.matcher.join('\n'));
+    Selector._cache[this.expression] = this.matcher;
+  },
+
+  compileXPathMatcher: function() {
+    var e = this.expression, ps = Selector.patterns,
+        x = Selector.xpath, le, m;
+
+    if (Selector._cache[e]) {
+      this.xpath = Selector._cache[e]; return;
+    }
+
+    this.matcher = ['.//*'];
+    while (e && le != e && (/\S/).test(e)) {
+      le = e;
+      for (var i in ps) {
+        if (m = e.match(ps[i])) {
+          this.matcher.push(Object.isFunction(x[i]) ? x[i](m) :
+            new Template(x[i]).evaluate(m));
+          e = e.replace(m[0], '');
+          break;
+        }
+      }
+    }
+
+    this.xpath = this.matcher.join('');
+    Selector._cache[this.expression] = this.xpath;
+  },
+
+  findElements: function(root) {
+    root = root || document;
+    var e = this.expression, results;
+
+    switch (this.mode) {
+      case 'selectorsAPI':
+        // querySelectorAll queries document-wide, then filters to descendants
+        // of the context element. That's not what we want.
+        // Add an explicit context to the selector if necessary.
+        if (root !== document) {
+          var oldId = root.id, id = $(root).identify();
+          e = "#" + id + " " + e;
+        }
+
+        results = $A(root.querySelectorAll(e)).map(Element.extend);
+        root.id = oldId;
+
+        return results;
+      case 'xpath':
+        return document._getElementsByXPath(this.xpath, root);
+      default:
+       return this.matcher(root);
+    }
+  },
+
+  match: function(element) {
+    this.tokens = [];
+
+    var e = this.expression, ps = Selector.patterns, as = Selector.assertions;
+    var le, p, m;
+
+    while (e && le !== e && (/\S/).test(e)) {
+      le = e;
+      for (var i in ps) {
+        p = ps[i];
+        if (m = e.match(p)) {
+          // use the Selector.assertions methods unless the selector
+          // is too complex.
+          if (as[i]) {
+            this.tokens.push([i, Object.clone(m)]);
+            e = e.replace(m[0], '');
+          } else {
+            // reluctantly do a document-wide search
+            // and look for a match in the array
+            return this.findElements(document).include(element);
+          }
+        }
+      }
+    }
+
+    var match = true, name, matches;
+    for (var i = 0, token; token = this.tokens[i]; i++) {
+      name = token[0], matches = token[1];
+      if (!Selector.assertions[name](element, matches)) {
+        match = false; break;
+      }
+    }
+
+    return match;
+  },
+
+  toString: function() {
+    return this.expression;
+  },
+
+  inspect: function() {
+    return "#<Selector:" + this.expression.inspect() + ">";
+  }
+});
+
+Object.extend(Selector, {
+  _cache: { },
+
+  xpath: {
+    descendant:   "//*",
+    child:        "/*",
+    adjacent:     "/following-sibling::*[1]",
+    laterSibling: '/following-sibling::*',
+    tagName:      function(m) {
+      if (m[1] == '*') return '';
+      return "[local-name()='" + m[1].toLowerCase() +
+             "' or local-name()='" + m[1].toUpperCase() + "']";
+    },
+    className:    "[contains(concat(' ', @class, ' '), ' #{1} ')]",
+    id:           "[@id='#{1}']",
+    attrPresence: function(m) {
+      m[1] = m[1].toLowerCase();
+      return new Template("[@#{1}]").evaluate(m);
+    },
+    attr: function(m) {
+      m[1] = m[1].toLowerCase();
+      m[3] = m[5] || m[6];
+      return new Template(Selector.xpath.operators[m[2]]).evaluate(m);
+    },
+    pseudo: function(m) {
+      var h = Selector.xpath.pseudos[m[1]];
+      if (!h) return '';
+      if (Object.isFunction(h)) return h(m);
+      return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
+    },
+    operators: {
+      '=':  "[@#{1}='#{3}']",
+      '!=': "[@#{1}!='#{3}']",
+      '^=': "[starts-with(@#{1}, '#{3}')]",
+      '$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']",
+      '*=': "[contains(@#{1}, '#{3}')]",
+      '~=': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]",
+      '|=': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]"
+    },
+    pseudos: {
+      'first-child': '[not(preceding-sibling::*)]',
+      'last-child':  '[not(following-sibling::*)]',
+      'only-child':  '[not(preceding-sibling::* or following-sibling::*)]',
+      'empty':       "[count(*) = 0 and (count(text()) = 0)]",
+      'checked':     "[@checked]",
+      'disabled':    "[(@disabled) and (@type!='hidden')]",
+      'enabled':     "[not(@disabled) and (@type!='hidden')]",
+      'not': function(m) {
+        var e = m[6], p = Selector.patterns,
+            x = Selector.xpath, le, v;
+
+        var exclusion = [];
+        while (e && le != e && (/\S/).test(e)) {
+          le = e;
+          for (var i in p) {
+            if (m = e.match(p[i])) {
+              v = Object.isFunction(x[i]) ? x[i](m) : new Template(x[i]).evaluate(m);
+              exclusion.push("(" + v.substring(1, v.length - 1) + ")");
+              e = e.replace(m[0], '');
+              break;
+            }
+          }
+        }
+        return "[not(" + exclusion.join(" and ") + ")]";
+      },
+      'nth-child':      function(m) {
+        return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*) + 1) ", m);
+      },
+      'nth-last-child': function(m) {
+        return Selector.xpath.pseudos.nth("(count(./following-sibling::*) + 1) ", m);
+      },
+      'nth-of-type':    function(m) {
+        return Selector.xpath.pseudos.nth("position() ", m);
+      },
+      'nth-last-of-type': function(m) {
+        return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", m);
+      },
+      'first-of-type':  function(m) {
+        m[6] = "1"; return Selector.xpath.pseudos['nth-of-type'](m);
+      },
+      'last-of-type':   function(m) {
+        m[6] = "1"; return Selector.xpath.pseudos['nth-last-of-type'](m);
+      },
+      'only-of-type':   function(m) {
+        var p = Selector.xpath.pseudos; return p['first-of-type'](m) + p['last-of-type'](m);
+      },
+      nth: function(fragment, m) {
+        var mm, formula = m[6], predicate;
+        if (formula == 'even') formula = '2n+0';
+        if (formula == 'odd')  formula = '2n+1';
+        if (mm = formula.match(/^(\d+)$/)) // digit only
+          return '[' + fragment + "= " + mm[1] + ']';
+        if (mm = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
+          if (mm[1] == "-") mm[1] = -1;
+          var a = mm[1] ? Number(mm[1]) : 1;
+          var b = mm[2] ? Number(mm[2]) : 0;
+          predicate = "[((#{fragment} - #{b}) mod #{a} = 0) and " +
+          "((#{fragment} - #{b}) div #{a} >= 0)]";
+          return new Template(predicate).evaluate({
+            fragment: fragment, a: a, b: b });
+        }
+      }
+    }
+  },
+
+  criteria: {
+    tagName:      'n = h.tagName(n, r, "#{1}", c);      c = false;',
+    className:    'n = h.className(n, r, "#{1}", c);    c = false;',
+    id:           'n = h.id(n, r, "#{1}", c);           c = false;',
+    attrPresence: 'n = h.attrPresence(n, r, "#{1}", c); c = false;',
+    attr: function(m) {
+      m[3] = (m[5] || m[6]);
+      return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}", c); c = false;').evaluate(m);
+    },
+    pseudo: function(m) {
+      if (m[6]) m[6] = m[6].replace(/"/g, '\\"');
+      return new Template('n = h.pseudo(n, "#{1}", "#{6}", r, c); c = false;').evaluate(m);
+    },
+    descendant:   'c = "descendant";',
+    child:        'c = "child";',
+    adjacent:     'c = "adjacent";',
+    laterSibling: 'c = "laterSibling";'
+  },
+
+  patterns: {
+    // combinators must be listed first
+    // (and descendant needs to be last combinator)
+    laterSibling: /^\s*~\s*/,
+    child:        /^\s*>\s*/,
+    adjacent:     /^\s*\+\s*/,
+    descendant:   /^\s/,
+
+    // selectors follow
+    tagName:      /^\s*(\*|[\w\-]+)(\b|$)?/,
+    id:           /^#([\w\-\*]+)(\b|$)/,
+    className:    /^\.([\w\-\*]+)(\b|$)/,
+    pseudo:
+/^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s|[:+~>]))/,
+    attrPresence: /^\[((?:[\w]+:)?[\w]+)\]/,
+    attr:         /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/
+  },
+
+  // for Selector.match and Element#match
+  assertions: {
+    tagName: function(element, matches) {
+      return matches[1].toUpperCase() == element.tagName.toUpperCase();
+    },
+
+    className: function(element, matches) {
+      return Element.hasClassName(element, matches[1]);
+    },
+
+    id: function(element, matches) {
+      return element.id === matches[1];
+    },
+
+    attrPresence: function(element, matches) {
+      return Element.hasAttribute(element, matches[1]);
+    },
+
+    attr: function(element, matches) {
+      var nodeValue = Element.readAttribute(element, matches[1]);
+      return nodeValue && Selector.operators[matches[2]](nodeValue, matches[5] || matches[6]);
+    }
+  },
+
+  handlers: {
+    // UTILITY FUNCTIONS
+    // joins two collections
+    concat: function(a, b) {
+      for (var i = 0, node; node = b[i]; i++)
+        a.push(node);
+      return a;
+    },
+
+    // marks an array of nodes for counting
+    mark: function(nodes) {
+      var _true = Prototype.emptyFunction;
+      for (var i = 0, node; node = nodes[i]; i++)
+        node._countedByPrototype = _true;
+      return nodes;
+    },
+
+    unmark: function(nodes) {
+      for (var i = 0, node; node = nodes[i]; i++)
+        node._countedByPrototype = undefined;
+      return nodes;
+    },
+
+    // mark each child node with its position (for nth calls)
+    // "ofType" flag indicates whether we're indexing for nth-of-type
+    // rather than nth-child
+    index: function(parentNode, reverse, ofType) {
+      parentNode._countedByPrototype = Prototype.emptyFunction;
+      if (reverse) {
+        for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
+          var node = nodes[i];
+          if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++;
+        }
+      } else {
+        for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
+          if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++;
+      }
+    },
+
+    // filters out duplicates and extends all nodes
+    unique: function(nodes) {
+      if (nodes.length == 0) return nodes;
+      var results = [], n;
+      for (var i = 0, l = nodes.length; i < l; i++)
+        if (!(n = nodes[i])._countedByPrototype) {
+          n._countedByPrototype = Prototype.emptyFunction;
+          results.push(Element.extend(n));
+        }
+      return Selector.handlers.unmark(results);
+    },
+
+    // COMBINATOR FUNCTIONS
+    descendant: function(nodes) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        h.concat(results, node.getElementsByTagName('*'));
+      return results;
+    },
+
+    child: function(nodes) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        for (var j = 0, child; child = node.childNodes[j]; j++)
+          if (child.nodeType == 1 && child.tagName != '!') results.push(child);
+      }
+      return results;
+    },
+
+    adjacent: function(nodes) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        var next = this.nextElementSibling(node);
+        if (next) results.push(next);
+      }
+      return results;
+    },
+
+    laterSibling: function(nodes) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        h.concat(results, Element.nextSiblings(node));
+      return results;
+    },
+
+    nextElementSibling: function(node) {
+      while (node = node.nextSibling)
+        if (node.nodeType == 1) return node;
+      return null;
+    },
+
+    previousElementSibling: function(node) {
+      while (node = node.previousSibling)
+        if (node.nodeType == 1) return node;
+      return null;
+    },
+
+    // TOKEN FUNCTIONS
+    tagName: function(nodes, root, tagName, combinator) {
+      var uTagName = tagName.toUpperCase();
+      var results = [], h = Selector.handlers;
+      if (nodes) {
+        if (combinator) {
+          // fastlane for ordinary descendant combinators
+          if (combinator == "descendant") {
+            for (var i = 0, node; node = nodes[i]; i++)
+              h.concat(results, node.getElementsByTagName(tagName));
+            return results;
+          } else nodes = this[combinator](nodes);
+          if (tagName == "*") return nodes;
+        }
+        for (var i = 0, node; node = nodes[i]; i++)
+          if (node.tagName.toUpperCase() === uTagName) results.push(node);
+        return results;
+      } else return root.getElementsByTagName(tagName);
+    },
+
+    id: function(nodes, root, id, combinator) {
+      var targetNode = $(id), h = Selector.handlers;
+      if (!targetNode) return [];
+      if (!nodes && root == document) return [targetNode];
+      if (nodes) {
+        if (combinator) {
+          if (combinator == 'child') {
+            for (var i = 0, node; node = nodes[i]; i++)
+              if (targetNode.parentNode == node) return [targetNode];
+          } else if (combinator == 'descendant') {
+            for (var i = 0, node; node = nodes[i]; i++)
+              if (Element.descendantOf(targetNode, node)) return [targetNode];
+          } else if (combinator == 'adjacent') {
+            for (var i = 0, node; node = nodes[i]; i++)
+              if (Selector.handlers.previousElementSibling(targetNode) == node)
+                return [targetNode];
+          } else nodes = h[combinator](nodes);
+        }
+        for (var i = 0, node; node = nodes[i]; i++)
+          if (node == targetNode) return [targetNode];
+        return [];
+      }
+      return (targetNode && Element.descendantOf(targetNode, root)) ? [targetNode] : [];
+    },
+
+    className: function(nodes, root, className, combinator) {
+      if (nodes && combinator) nodes = this[combinator](nodes);
+      return Selector.handlers.byClassName(nodes, root, className);
+    },
+
+    byClassName: function(nodes, root, className) {
+      if (!nodes) nodes = Selector.handlers.descendant([root]);
+      var needle = ' ' + className + ' ';
+      for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) {
+        nodeClassName = node.className;
+        if (nodeClassName.length == 0) continue;
+        if (nodeClassName == className || (' ' + nodeClassName + ' ').include(needle))
+          results.push(node);
+      }
+      return results;
+    },
+
+    attrPresence: function(nodes, root, attr, combinator) {
+      if (!nodes) nodes = root.getElementsByTagName("*");
+      if (nodes && combinator) nodes = this[combinator](nodes);
+      var results = [];
+      for (var i = 0, node; node = nodes[i]; i++)
+        if (Element.hasAttribute(node, attr)) results.push(node);
+      return results;
+    },
+
+    attr: function(nodes, root, attr, value, operator, combinator) {
+      if (!nodes) nodes = root.getElementsByTagName("*");
+      if (nodes && combinator) nodes = this[combinator](nodes);
+      var handler = Selector.operators[operator], results = [];
+      for (var i = 0, node; node = nodes[i]; i++) {
+        var nodeValue = Element.readAttribute(node, attr);
+        if (nodeValue === null) continue;
+        if (handler(nodeValue, value)) results.push(node);
+      }
+      return results;
+    },
+
+    pseudo: function(nodes, name, value, root, combinator) {
+      if (nodes && combinator) nodes = this[combinator](nodes);
+      if (!nodes) nodes = root.getElementsByTagName("*");
+      return Selector.pseudos[name](nodes, value, root);
+    }
+  },
+
+  pseudos: {
+    'first-child': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        if (Selector.handlers.previousElementSibling(node)) continue;
+          results.push(node);
+      }
+      return results;
+    },
+    'last-child': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        if (Selector.handlers.nextElementSibling(node)) continue;
+          results.push(node);
+      }
+      return results;
+    },
+    'only-child': function(nodes, value, root) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (!h.previousElementSibling(node) && !h.nextElementSibling(node))
+          results.push(node);
+      return results;
+    },
+    'nth-child':        function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root);
+    },
+    'nth-last-child':   function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, true);
+    },
+    'nth-of-type':      function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, false, true);
+    },
+    'nth-last-of-type': function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, true, true);
+    },
+    'first-of-type':    function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, "1", root, false, true);
+    },
+    'last-of-type':     function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, "1", root, true, true);
+    },
+    'only-of-type':     function(nodes, formula, root) {
+      var p = Selector.pseudos;
+      return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root);
+    },
+
+    // handles the an+b logic
+    getIndices: function(a, b, total) {
+      if (a == 0) return b > 0 ? [b] : [];
+      return $R(1, total).inject([], function(memo, i) {
+        if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i);
+        return memo;
+      });
+    },
+
+    // handles nth(-last)-child, nth(-last)-of-type, and (first|last)-of-type
+    nth: function(nodes, formula, root, reverse, ofType) {
+      if (nodes.length == 0) return [];
+      if (formula == 'even') formula = '2n+0';
+      if (formula == 'odd')  formula = '2n+1';
+      var h = Selector.handlers, results = [], indexed = [], m;
+      h.mark(nodes);
+      for (var i = 0, node; node = nodes[i]; i++) {
+        if (!node.parentNode._countedByPrototype) {
+          h.index(node.parentNode, reverse, ofType);
+          indexed.push(node.parentNode);
+        }
+      }
+      if (formula.match(/^\d+$/)) { // just a number
+        formula = Number(formula);
+        for (var i = 0, node; node = nodes[i]; i++)
+          if (node.nodeIndex == formula) results.push(node);
+      } else if (m = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
+        if (m[1] == "-") m[1] = -1;
+        var a = m[1] ? Number(m[1]) : 1;
+        var b = m[2] ? Number(m[2]) : 0;
+        var indices = Selector.pseudos.getIndices(a, b, nodes.length);
+        for (var i = 0, node, l = indices.length; node = nodes[i]; i++) {
+          for (var j = 0; j < l; j++)
+            if (node.nodeIndex == indices[j]) results.push(node);
+        }
+      }
+      h.unmark(nodes);
+      h.unmark(indexed);
+      return results;
+    },
+
+    'empty': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        // IE treats comments as element nodes
+        if (node.tagName == '!' || node.firstChild) continue;
+        results.push(node);
+      }
+      return results;
+    },
+
+    'not': function(nodes, selector, root) {
+      var h = Selector.handlers, selectorType, m;
+      var exclusions = new Selector(selector).findElements(root);
+      h.mark(exclusions);
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (!node._countedByPrototype) results.push(node);
+      h.unmark(exclusions);
+      return results;
+    },
+
+    'enabled': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (!node.disabled && (!node.type || node.type !== 'hidden'))
+          results.push(node);
+      return results;
+    },
+
+    'disabled': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (node.disabled) results.push(node);
+      return results;
+    },
+
+    'checked': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (node.checked) results.push(node);
+      return results;
+    }
+  },
+
+  operators: {
+    '=':  function(nv, v) { return nv == v; },
+    '!=': function(nv, v) { return nv != v; },
+    '^=': function(nv, v) { return nv == v || nv && nv.startsWith(v); },
+    '$=': function(nv, v) { return nv == v || nv && nv.endsWith(v); },
+    '*=': function(nv, v) { return nv == v || nv && nv.include(v); },
+    '$=': function(nv, v) { return nv.endsWith(v); },
+    '*=': function(nv, v) { return nv.include(v); },
+    '~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); },
+    '|=': function(nv, v) { return ('-' + (nv || "").toUpperCase() +
+     '-').include('-' + (v || "").toUpperCase() + '-'); }
+  },
+
+  split: function(expression) {
+    var expressions = [];
+    expression.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
+      expressions.push(m[1].strip());
+    });
+    return expressions;
+  },
+
+  matchElements: function(elements, expression) {
+    var matches = $$(expression), h = Selector.handlers;
+    h.mark(matches);
+    for (var i = 0, results = [], element; element = elements[i]; i++)
+      if (element._countedByPrototype) results.push(element);
+    h.unmark(matches);
+    return results;
+  },
+
+  findElement: function(elements, expression, index) {
+    if (Object.isNumber(expression)) {
+      index = expression; expression = false;
+    }
+    return Selector.matchElements(elements, expression || '*')[index || 0];
+  },
+
+  findChildElements: function(element, expressions) {
+    expressions = Selector.split(expressions.join(','));
+    var results = [], h = Selector.handlers;
+    for (var i = 0, l = expressions.length, selector; i < l; i++) {
+      selector = new Selector(expressions[i].strip());
+      h.concat(results, selector.findElements(element));
+    }
+    return (l > 1) ? h.unique(results) : results;
+  }
+});
+
+if (Prototype.Browser.IE) {
+  Object.extend(Selector.handlers, {
+    // IE returns comment nodes on getElementsByTagName("*").
+    // Filter them out.
+    concat: function(a, b) {
+      for (var i = 0, node; node = b[i]; i++)
+        if (node.tagName !== "!") a.push(node);
+      return a;
+    },
+
+    // IE improperly serializes _countedByPrototype in (inner|outer)HTML.
+    unmark: function(nodes) {
+      for (var i = 0, node; node = nodes[i]; i++)
+        node.removeAttribute('_countedByPrototype');
+      return nodes;
+    }
+  });
+}
+
+function $$() {
+  return Selector.findChildElements(document, $A(arguments));
+}
+var Form = {
+  reset: function(form) {
+    $(form).reset();
+    return form;
+  },
+
+  serializeElements: function(elements, options) {
+    if (typeof options != 'object') options = { hash: !!options };
+    else if (Object.isUndefined(options.hash)) options.hash = true;
+    var key, value, submitted = false, submit = options.submit;
+
+    var data = elements.inject({ }, function(result, element) {
+      if (!element.disabled && element.name) {
+        key = element.name; value = $(element).getValue();
+        if (value != null && element.type != 'file' && (element.type != 'submit' || (!submitted &&
+            submit !== false && (!submit || key == submit) && (submitted = true)))) {
+          if (key in result) {
+            // a key is already present; construct an array of values
+            if (!Object.isArray(result[key])) result[key] = [result[key]];
+            result[key].push(value);
+          }
+          else result[key] = value;
+        }
+      }
+      return result;
+    });
+
+    return options.hash ? data : Object.toQueryString(data);
+  }
+};
+
+Form.Methods = {
+  serialize: function(form, options) {
+    return Form.serializeElements(Form.getElements(form), options);
+  },
+
+  getElements: function(form) {
+    return $A($(form).getElementsByTagName('*')).inject([],
+      function(elements, child) {
+        if (Form.Element.Serializers[child.tagName.toLowerCase()])
+          elements.push(Element.extend(child));
+        return elements;
+      }
+    );
+  },
+
+  getInputs: function(form, typeName, name) {
+    form = $(form);
+    var inputs = form.getElementsByTagName('input');
+
+    if (!typeName && !name) return $A(inputs).map(Element.extend);
+
+    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
+      var input = inputs[i];
+      if ((typeName && input.type != typeName) || (name && input.name != name))
+        continue;
+      matchingInputs.push(Element.extend(input));
+    }
+
+    return matchingInputs;
+  },
+
+  disable: function(form) {
+    form = $(form);
+    Form.getElements(form).invoke('disable');
+    return form;
+  },
+
+  enable: function(form) {
+    form = $(form);
+    Form.getElements(form).invoke('enable');
+    return form;
+  },
+
+  findFirstElement: function(form) {
+    var elements = $(form).getElements().findAll(function(element) {
+      return 'hidden' != element.type && !element.disabled;
+    });
+    var firstByIndex = elements.findAll(function(element) {
+      return element.hasAttribute('tabIndex') && element.tabIndex >= 0;
+    }).sortBy(function(element) { return element.tabIndex }).first();
+
+    return firstByIndex ? firstByIndex : elements.find(function(element) {
+      return ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
+    });
+  },
+
+  focusFirstElement: function(form) {
+    form = $(form);
+    form.findFirstElement().activate();
+    return form;
+  },
+
+  request: function(form, options) {
+    form = $(form), options = Object.clone(options || { });
+
+    var params = options.parameters, action = form.readAttribute('action') || '';
+    if (action.blank()) action = window.location.href;
+    options.parameters = form.serialize(true);
+
+    if (params) {
+      if (Object.isString(params)) params = params.toQueryParams();
+      Object.extend(options.parameters, params);
+    }
+
+    if (form.hasAttribute('method') && !options.method)
+      options.method = form.method;
+
+    return new Ajax.Request(action, options);
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+Form.Element = {
+  focus: function(element) {
+    $(element).focus();
+    return element;
+  },
+
+  select: function(element) {
+    $(element).select();
+    return element;
+  }
+};
+
+Form.Element.Methods = {
+  serialize: function(element) {
+    element = $(element);
+    if (!element.disabled && element.name) {
+      var value = element.getValue();
+      if (value != undefined) {
+        var pair = { };
+        pair[element.name] = value;
+        return Object.toQueryString(pair);
+      }
+    }
+    return '';
+  },
+
+  getValue: function(element) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    return Form.Element.Serializers[method](element);
+  },
+
+  setValue: function(element, value) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    Form.Element.Serializers[method](element, value);
+    return element;
+  },
+
+  clear: function(element) {
+    $(element).value = '';
+    return element;
+  },
+
+  present: function(element) {
+    return $(element).value != '';
+  },
+
+  activate: function(element) {
+    element = $(element);
+    try {
+      element.focus();
+      if (element.select && (element.tagName.toLowerCase() != 'input' ||
+          !['button', 'reset', 'submit'].include(element.type)))
+        element.select();
+    } catch (e) { }
+    return element;
+  },
+
+  disable: function(element) {
+    element = $(element);
+    element.disabled = true;
+    return element;
+  },
+
+  enable: function(element) {
+    element = $(element);
+    element.disabled = false;
+    return element;
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+var Field = Form.Element;
+var $F = Form.Element.Methods.getValue;
+
+/*--------------------------------------------------------------------------*/
+
+Form.Element.Serializers = {
+  input: function(element, value) {
+    switch (element.type.toLowerCase()) {
+      case 'checkbox':
+      case 'radio':
+        return Form.Element.Serializers.inputSelector(element, value);
+      default:
+        return Form.Element.Serializers.textarea(element, value);
+    }
+  },
+
+  inputSelector: function(element, value) {
+    if (Object.isUndefined(value)) return element.checked ? element.value : null;
+    else element.checked = !!value;
+  },
+
+  textarea: function(element, value) {
+    if (Object.isUndefined(value)) return element.value;
+    else element.value = value;
+  },
+
+  select: function(element, value) {
+    if (Object.isUndefined(value))
+      return this[element.type == 'select-one' ?
+        'selectOne' : 'selectMany'](element);
+    else {
+      var opt, currentValue, single = !Object.isArray(value);
+      for (var i = 0, length = element.length; i < length; i++) {
+        opt = element.options[i];
+        currentValue = this.optionValue(opt);
+        if (single) {
+          if (currentValue == value) {
+            opt.selected = true;
+            return;
+          }
+        }
+        else opt.selected = value.include(currentValue);
+      }
+    }
+  },
+
+  selectOne: function(element) {
+    var index = element.selectedIndex;
+    return index >= 0 ? this.optionValue(element.options[index]) : null;
+  },
+
+  selectMany: function(element) {
+    var values, length = element.length;
+    if (!length) return null;
+
+    for (var i = 0, values = []; i < length; i++) {
+      var opt = element.options[i];
+      if (opt.selected) values.push(this.optionValue(opt));
+    }
+    return values;
+  },
+
+  optionValue: function(opt) {
+    // extend element because hasAttribute may not be native
+    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.TimedObserver = Class.create(PeriodicalExecuter, {
+  initialize: function($super, element, frequency, callback) {
+    $super(callback, frequency);
+    this.element   = $(element);
+    this.lastValue = this.getValue();
+  },
+
+  execute: function() {
+    var value = this.getValue();
+    if (Object.isString(this.lastValue) && Object.isString(value) ?
+        this.lastValue != value : String(this.lastValue) != String(value)) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  }
+});
+
+Form.Element.Observer = Class.create(Abstract.TimedObserver, {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.Observer = Class.create(Abstract.TimedObserver, {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.EventObserver = Class.create({
+  initialize: function(element, callback) {
+    this.element  = $(element);
+    this.callback = callback;
+
+    this.lastValue = this.getValue();
+    if (this.element.tagName.toLowerCase() == 'form')
+      this.registerFormCallbacks();
+    else
+      this.registerCallback(this.element);
+  },
+
+  onElementEvent: function() {
+    var value = this.getValue();
+    if (this.lastValue != value) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  },
+
+  registerFormCallbacks: function() {
+    Form.getElements(this.element).each(this.registerCallback, this);
+  },
+
+  registerCallback: function(element) {
+    if (element.type) {
+      switch (element.type.toLowerCase()) {
+        case 'checkbox':
+        case 'radio':
+          Event.observe(element, 'click', this.onElementEvent.bind(this));
+          break;
+        default:
+          Event.observe(element, 'change', this.onElementEvent.bind(this));
+          break;
+      }
+    }
+  }
+});
+
+Form.Element.EventObserver = Class.create(Abstract.EventObserver, {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.EventObserver = Class.create(Abstract.EventObserver, {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+if (!window.Event) var Event = { };
+
+Object.extend(Event, {
+  KEY_BACKSPACE: 8,
+  KEY_TAB:       9,
+  KEY_RETURN:   13,
+  KEY_ESC:      27,
+  KEY_LEFT:     37,
+  KEY_UP:       38,
+  KEY_RIGHT:    39,
+  KEY_DOWN:     40,
+  KEY_DELETE:   46,
+  KEY_HOME:     36,
+  KEY_END:      35,
+  KEY_PAGEUP:   33,
+  KEY_PAGEDOWN: 34,
+  KEY_INSERT:   45,
+
+  cache: { },
+
+  relatedTarget: function(event) {
+    var element;
+    switch(event.type) {
+      case 'mouseover': element = event.fromElement; break;
+      case 'mouseout':  element = event.toElement;   break;
+      default: return null;
+    }
+    return Element.extend(element);
+  }
+});
+
+Event.Methods = (function() {
+  var isButton;
+
+  if (Prototype.Browser.IE) {
+    var buttonMap = { 0: 1, 1: 4, 2: 2 };
+    isButton = function(event, code) {
+      return event.button == buttonMap[code];
+    };
+
+  } else if (Prototype.Browser.WebKit) {
+    isButton = function(event, code) {
+      switch (code) {
+        case 0: return event.which == 1 && !event.metaKey;
+        case 1: return event.which == 1 && event.metaKey;
+        default: return false;
+      }
+    };
+
+  } else {
+    isButton = function(event, code) {
+      return event.which ? (event.which === code + 1) : (event.button === code);
+    };
+  }
+
+  return {
+    isLeftClick:   function(event) { return isButton(event, 0) },
+    isMiddleClick: function(event) { return isButton(event, 1) },
+    isRightClick:  function(event) { return isButton(event, 2) },
+
+    element: function(event) {
+      event = Event.extend(event);
+
+      var node          = event.target,
+          type          = event.type,
+          currentTarget = event.currentTarget;
+
+      if (currentTarget && currentTarget.tagName) {
+        // Firefox screws up the "click" event when moving between radio buttons
+        // via arrow keys. It also screws up the "load" and "error" events on images,
+        // reporting the document as the target instead of the original image.
+        if (type === 'load' || type === 'error' ||
+          (type === 'click' && currentTarget.tagName.toLowerCase() === 'input'
+            && currentTarget.type === 'radio'))
+              node = currentTarget;
+      }
+      if (node.nodeType == Node.TEXT_NODE) node = node.parentNode;
+      return Element.extend(node);
+    },
+
+    findElement: function(event, expression) {
+      var element = Event.element(event);
+      if (!expression) return element;
+      var elements = [element].concat(element.ancestors());
+      return Selector.findElement(elements, expression, 0);
+    },
+
+    pointer: function(event) {
+      var docElement = document.documentElement,
+      body = document.body || { scrollLeft: 0, scrollTop: 0 };
+      return {
+        x: event.pageX || (event.clientX +
+          (docElement.scrollLeft || body.scrollLeft) -
+          (docElement.clientLeft || 0)),
+        y: event.pageY || (event.clientY +
+          (docElement.scrollTop || body.scrollTop) -
+          (docElement.clientTop || 0))
+      };
+    },
+
+    pointerX: function(event) { return Event.pointer(event).x },
+    pointerY: function(event) { return Event.pointer(event).y },
+
+    stop: function(event) {
+      Event.extend(event);
+      event.preventDefault();
+      event.stopPropagation();
+      event.stopped = true;
+    }
+  };
+})();
+
+Event.extend = (function() {
+  var methods = Object.keys(Event.Methods).inject({ }, function(m, name) {
+    m[name] = Event.Methods[name].methodize();
+    return m;
+  });
+
+  if (Prototype.Browser.IE) {
+    Object.extend(methods, {
+      stopPropagation: function() { this.cancelBubble = true },
+      preventDefault:  function() { this.returnValue = false },
+      inspect: function() { return "[object Event]" }
+    });
+
+    return function(event) {
+      if (!event) return false;
+      if (event._extendedByPrototype) return event;
+
+      event._extendedByPrototype = Prototype.emptyFunction;
+      var pointer = Event.pointer(event);
+      Object.extend(event, {
+        target: event.srcElement,
+        relatedTarget: Event.relatedTarget(event),
+        pageX:  pointer.x,
+        pageY:  pointer.y
+      });
+      return Object.extend(event, methods);
+    };
+
+  } else {
+    Event.prototype = Event.prototype || document.createEvent("HTMLEvents")['__proto__'];
+    Object.extend(Event.prototype, methods);
+    return Prototype.K;
+  }
+})();
+
+Object.extend(Event, (function() {
+  var cache = Event.cache;
+
+  function getEventID(element) {
+    if (element._prototypeEventID) return element._prototypeEventID[0];
+    arguments.callee.id = arguments.callee.id || 1;
+    return element._prototypeEventID = [++arguments.callee.id];
+  }
+
+  function getDOMEventName(eventName) {
+    if (eventName && eventName.include(':')) return "dataavailable";
+    return eventName;
+  }
+
+  function getCacheForID(id) {
+    return cache[id] = cache[id] || { };
+  }
+
+  function getWrappersForEventName(id, eventName) {
+    var c = getCacheForID(id);
+    return c[eventName] = c[eventName] || [];
+  }
+
+  function createWrapper(element, eventName, handler) {
+    var id = getEventID(element);
+    var c = getWrappersForEventName(id, eventName);
+    if (c.pluck("handler").include(handler)) return false;
+
+    var wrapper = function(event) {
+      if (!Event || !Event.extend ||
+        (event.eventName && event.eventName != eventName))
+          return false;
+
+      Event.extend(event);
+      handler.call(element, event);
+    };
+
+    wrapper.handler = handler;
+    c.push(wrapper);
+    return wrapper;
+  }
+
+  function findWrapper(id, eventName, handler) {
+    var c = getWrappersForEventName(id, eventName);
+    return c.find(function(wrapper) { return wrapper.handler == handler });
+  }
+
+  function destroyWrapper(id, eventName, handler) {
+    var c = getCacheForID(id);
+    if (!c[eventName]) return false;
+    c[eventName] = c[eventName].without(findWrapper(id, eventName, handler));
+  }
+
+  function destroyCache() {
+    for (var id in cache)
+      for (var eventName in cache[id])
+        cache[id][eventName] = null;
+  }
+
+
+  // Internet Explorer needs to remove event handlers on page unload
+  // in order to avoid memory leaks.
+  if (window.attachEvent) {
+    window.attachEvent("onunload", destroyCache);
+  }
+
+  // Safari has a dummy event handler on page unload so that it won't
+  // use its bfcache. Safari <= 3.1 has an issue with restoring the "document"
+  // object when page is returned to via the back button using its bfcache.
+  if (Prototype.Browser.WebKit) {
+    window.addEventListener('unload', Prototype.emptyFunction, false);
+  }
+
+  return {
+    observe: function(element, eventName, handler) {
+      element = $(element);
+      var name = getDOMEventName(eventName);
+
+      var wrapper = createWrapper(element, eventName, handler);
+      if (!wrapper) return element;
+
+      if (element.addEventListener) {
+        element.addEventListener(name, wrapper, false);
+      } else {
+        element.attachEvent("on" + name, wrapper);
+      }
+
+      return element;
+    },
+
+    stopObserving: function(element, eventName, handler) {
+      element = $(element);
+      var id = getEventID(element), name = getDOMEventName(eventName);
+
+      if (!handler && eventName) {
+        getWrappersForEventName(id, eventName).each(function(wrapper) {
+          element.stopObserving(eventName, wrapper.handler);
+        });
+        return element;
+
+      } else if (!eventName) {
+        Object.keys(getCacheForID(id)).each(function(eventName) {
+          element.stopObserving(eventName);
+        });
+        return element;
+      }
+
+      var wrapper = findWrapper(id, eventName, handler);
+      if (!wrapper) return element;
+
+      if (element.removeEventListener) {
+        element.removeEventListener(name, wrapper, false);
+      } else {
+        element.detachEvent("on" + name, wrapper);
+      }
+
+      destroyWrapper(id, eventName, handler);
+
+      return element;
+    },
+
+    fire: function(element, eventName, memo) {
+      element = $(element);
+      if (element == document && document.createEvent && !element.dispatchEvent)
+        element = document.documentElement;
+
+      var event;
+      if (document.createEvent) {
+        event = document.createEvent("HTMLEvents");
+        event.initEvent("dataavailable", true, true);
+      } else {
+        event = document.createEventObject();
+        event.eventType = "ondataavailable";
+      }
+
+      event.eventName = eventName;
+      event.memo = memo || { };
+
+      if (document.createEvent) {
+        element.dispatchEvent(event);
+      } else {
+        element.fireEvent(event.eventType, event);
+      }
+
+      return Event.extend(event);
+    }
+  };
+})());
+
+Object.extend(Event, Event.Methods);
+
+Element.addMethods({
+  fire:          Event.fire,
+  observe:       Event.observe,
+  stopObserving: Event.stopObserving
+});
+
+Object.extend(document, {
+  fire:          Element.Methods.fire.methodize(),
+  observe:       Element.Methods.observe.methodize(),
+  stopObserving: Element.Methods.stopObserving.methodize(),
+  loaded:        false
+});
+
+(function() {
+  /* Support for the DOMContentLoaded event is based on work by Dan Webb,
+     Matthias Miller, Dean Edwards and John Resig. */
+
+  var timer;
+
+  function fireContentLoadedEvent() {
+    if (document.loaded) return;
+    if (timer) window.clearInterval(timer);
+    document.fire("dom:loaded");
+    document.loaded = true;
+  }
+
+  if (document.addEventListener) {
+    if (Prototype.Browser.WebKit) {
+      timer = window.setInterval(function() {
+        if (/loaded|complete/.test(document.readyState))
+          fireContentLoadedEvent();
+      }, 0);
+
+      Event.observe(window, "load", fireContentLoadedEvent);
+
+    } else {
+      document.addEventListener("DOMContentLoaded",
+        fireContentLoadedEvent, false);
+    }
+
+  } else {
+    document.write("<script id=__onDOMContentLoaded defer src=//:><\/script>");
+    $("__onDOMContentLoaded").onreadystatechange = function() {
+      if (this.readyState == "complete") {
+        this.onreadystatechange = null;
+        fireContentLoadedEvent();
+      }
+    };
+  }
+})();
+/*------------------------------- DEPRECATED -------------------------------*/
+
+Hash.toQueryString = Object.toQueryString;
+
+var Toggle = { display: Element.toggle };
+
+Element.Methods.childOf = Element.Methods.descendantOf;
+
+var Insertion = {
+  Before: function(element, content) {
+    return Element.insert(element, {before:content});
+  },
+
+  Top: function(element, content) {
+    return Element.insert(element, {top:content});
+  },
+
+  Bottom: function(element, content) {
+    return Element.insert(element, {bottom:content});
+  },
+
+  After: function(element, content) {
+    return Element.insert(element, {after:content});
+  }
+};
+
+var $continue = new Error('"throw $continue" is deprecated, use "return" instead');
+
+// This should be moved to script.aculo.us; notice the deprecated methods
+// further below, that map to the newer Element methods.
+var Position = {
+  // set to true if needed, warning: firefox performance problems
+  // NOT neeeded for page scrolling, only if draggable contained in
+  // scrollable elements
+  includeScrollOffsets: false,
+
+  // must be called before calling withinIncludingScrolloffset, every time the
+  // page is scrolled
+  prepare: function() {
+    this.deltaX =  window.pageXOffset
+                || document.documentElement.scrollLeft
+                || document.body.scrollLeft
+                || 0;
+    this.deltaY =  window.pageYOffset
+                || document.documentElement.scrollTop
+                || document.body.scrollTop
+                || 0;
+  },
+
+  // caches x/y coordinate pair to use with overlap
+  within: function(element, x, y) {
+    if (this.includeScrollOffsets)
+      return this.withinIncludingScrolloffsets(element, x, y);
+    this.xcomp = x;
+    this.ycomp = y;
+    this.offset = Element.cumulativeOffset(element);
+
+    return (y >= this.offset[1] &&
+            y <  this.offset[1] + element.offsetHeight &&
+            x >= this.offset[0] &&
+            x <  this.offset[0] + element.offsetWidth);
+  },
+
+  withinIncludingScrolloffsets: function(element, x, y) {
+    var offsetcache = Element.cumulativeScrollOffset(element);
+
+    this.xcomp = x + offsetcache[0] - this.deltaX;
+    this.ycomp = y + offsetcache[1] - this.deltaY;
+    this.offset = Element.cumulativeOffset(element);
+
+    return (this.ycomp >= this.offset[1] &&
+            this.ycomp <  this.offset[1] + element.offsetHeight &&
+            this.xcomp >= this.offset[0] &&
+            this.xcomp <  this.offset[0] + element.offsetWidth);
+  },
+
+  // within must be called directly before
+  overlap: function(mode, element) {
+    if (!mode) return 0;
+    if (mode == 'vertical')
+      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
+        element.offsetHeight;
+    if (mode == 'horizontal')
+      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
+        element.offsetWidth;
+  },
+
+  // Deprecation layer -- use newer Element methods now (1.5.2).
+
+  cumulativeOffset: Element.Methods.cumulativeOffset,
+
+  positionedOffset: Element.Methods.positionedOffset,
+
+  absolutize: function(element) {
+    Position.prepare();
+    return Element.absolutize(element);
+  },
+
+  relativize: function(element) {
+    Position.prepare();
+    return Element.relativize(element);
+  },
+
+  realOffset: Element.Methods.cumulativeScrollOffset,
+
+  offsetParent: Element.Methods.getOffsetParent,
+
+  page: Element.Methods.viewportOffset,
+
+  clone: function(source, target, options) {
+    options = options || { };
+    return Element.clonePosition(target, source, options);
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+if (!document.getElementsByClassName) document.getElementsByClassName = function(instanceMethods){
+  function iter(name) {
+    return name.blank() ? null : "[contains(concat(' ', @class, ' '), ' " + name + " ')]";
+  }
+
+  instanceMethods.getElementsByClassName = Prototype.BrowserFeatures.XPath ?
+  function(element, className) {
+    className = className.toString().strip();
+    var cond = /\s/.test(className) ? $w(className).map(iter).join('') : iter(className);
+    return cond ? document._getElementsByXPath('.//*' + cond, element) : [];
+  } : function(element, className) {
+    className = className.toString().strip();
+    var elements = [], classNames = (/\s/.test(className) ? $w(className) : null);
+    if (!classNames && !className) return elements;
+
+    var nodes = $(element).getElementsByTagName('*');
+    className = ' ' + className + ' ';
+
+    for (var i = 0, child, cn; child = nodes[i]; i++) {
+      if (child.className && (cn = ' ' + child.className + ' ') && (cn.include(className) ||
+          (classNames && classNames.all(function(name) {
+            return !name.toString().blank() && cn.include(' ' + name + ' ');
+          }))))
+        elements.push(Element.extend(child));
+    }
+    return elements;
+  };
+
+  return function(className, parentElement) {
+    return $(parentElement || document.body).getElementsByClassName(className);
+  };
+}(Element.Methods);
+
+/*--------------------------------------------------------------------------*/
+
+Element.ClassNames = Class.create();
+Element.ClassNames.prototype = {
+  initialize: function(element) {
+    this.element = $(element);
+  },
+
+  _each: function(iterator) {
+    this.element.className.split(/\s+/).select(function(name) {
+      return name.length > 0;
+    })._each(iterator);
+  },
+
+  set: function(className) {
+    this.element.className = className;
+  },
+
+  add: function(classNameToAdd) {
+    if (this.include(classNameToAdd)) return;
+    this.set($A(this).concat(classNameToAdd).join(' '));
+  },
+
+  remove: function(classNameToRemove) {
+    if (!this.include(classNameToRemove)) return;
+    this.set($A(this).without(classNameToRemove).join(' '));
+  },
+
+  toString: function() {
+    return $A(this).join(' ');
+  }
+};
+
+Object.extend(Element.ClassNames.prototype, Enumerable);
+
+/*--------------------------------------------------------------------------*/
+
+Element.addMethods();
\ No newline at end of file
Property changes on: branches/product_cleanup/web/src/main/webapp/js/prototype.js
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native

Added: branches/product_cleanup/web/src/main/webapp/js/scriptaculous.js (0 => 2114)

--- branches/product_cleanup/web/src/main/webapp/js/scriptaculous.js	                        (rev 0)
+++ branches/product_cleanup/web/src/main/webapp/js/scriptaculous.js	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,60 @@
+// script.aculo.us scriptaculous.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+var Scriptaculous = {
+  Version: '1.8.2',
+  require: function(libraryName) {
+    // inserting via DOM fails in Safari 2.0, so brute force approach
+    document.write('<script type="text/javascript" src="'+libraryName+'"><\/script>');
+  },
+  REQUIRED_PROTOTYPE: '1.6.0.3',
+  load: function() {
+    function convertVersionString(versionString) {
+      var v = versionString.replace(/_.*|\./g, '');
+      v = parseInt(v + '0'.times(4-v.length));
+      return versionString.indexOf('_') > -1 ? v-1 : v;
+    }
+
+    if((typeof Prototype=='undefined') ||
+       (typeof Element == 'undefined') ||
+       (typeof Element.Methods=='undefined') ||
+       (convertVersionString(Prototype.Version) <
+        convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
+       throw("script.aculo.us requires the Prototype JavaScript framework >= " +
+        Scriptaculous.REQUIRED_PROTOTYPE);
+
+    var js = /scriptaculous\.js(\?.*)?$/;
+    $$('head script[src]').findAll(function(s) {
+      return s.src.match(js);
+    }).each(function(s) {
+      var path = s.src.replace(js, ''),
+      includes = s.src.match(/\?.*load=([a-z,]*)/);
+      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
+       function(include) { Scriptaculous.require(path+include+'.js') });
+    });
+  }
+};
+
+Scriptaculous.load();
\ No newline at end of file
Property changes on: branches/product_cleanup/web/src/main/webapp/js/scriptaculous.js
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native

Added: branches/product_cleanup/web/src/main/webapp/js/slider.js (0 => 2114)

--- branches/product_cleanup/web/src/main/webapp/js/slider.js	                        (rev 0)
+++ branches/product_cleanup/web/src/main/webapp/js/slider.js	2009-12-17 23:44:32 UTC (rev 2114)
@@ -0,0 +1,275 @@
+// script.aculo.us slider.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Marty Haught, Thomas Fuchs
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+if (!Control) var Control = { };
+
+// options:
+//  axis: 'vertical', or 'horizontal' (default)
+//
+// callbacks:
+//  onChange(value)
+//  onSlide(value)
+Control.Slider = Class.create({
+  initialize: function(handle, track, options) {
+    var slider = this;
+
+    if (Object.isArray(handle)) {
+      this.handles = handle.collect( function(e) { return $(e) });
+    } else {
+      this.handles = [$(handle)];
+    }
+
+    this.track   = $(track);
+    this.options = options || { };
+
+    this.axis      = this.options.axis || 'horizontal';
+    this.increment = this.options.increment || 1;
+    this.step      = parseInt(this.options.step || '1');
+    this.range     = this.options.range || $R(0,1);
+
+    this.value     = 0; // assure backwards compat
+    this.values    = this.handles.map( function() { return 0 });
+    this.spans     = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
+    this.options.startSpan = $(this.options.startSpan || null);
+    this.options.endSpan   = $(this.options.endSpan || null);
+
+    this.restricted = this.options.restricted || false;
+
+    this.maximum   = this.options.maximum || this.range.end;
+    this.minimum   = this.options.minimum || this.range.start;
+
+    // Will be used to align the handle onto the track, if necessary
+    this.alignX = parseInt(this.options.alignX || '0');
+    this.alignY = parseInt(this.options.alignY || '0');
+
+    this.trackLength = this.maximumOffset() - this.minimumOffset();
+
+    this.handleLength = this.isVertical() ?
+      (this.handles[0].offsetHeight != 0 ?
+        this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) :
+      (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth :
+        this.handles[0].style.width.replace(/px$/,""));
+
+    this.active   = false;
+    this.dragging = false;
+    this.disabled = false;
+
+    if (this.options.disabled) this.setDisabled();
+
+    // Allowed values array
+    this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false;
+    if (this.allowedValues) {
+      this.minimum = this.allowedValues.min();
+      this.maximum = this.allowedValues.max();
+    }
+
+    this.eventMouseDown = this.startDrag.bindAsEventListener(this);
+    this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
+    this.eventMouseMove = this.update.bindAsEventListener(this);
+
+    // Initialize handles in reverse (make sure first handle is active)
+    this.handles.each( function(h,i) {
+      i = slider.handles.length-1-i;
+      slider.setValue(parseFloat(
+        (Object.isArray(slider.options.sliderValue) ?
+          slider.options.sliderValue[i] : slider.options.sliderValue) ||
+         slider.range.start), i);
+      h.makePositioned().observe("mousedown", slider.eventMouseDown);
+    });
+
+    this.track.observe("mousedown", this.eventMouseDown);
+    document.observe("mouseup", this.eventMouseUp);
+    document.observe("mousemove", this.eventMouseMove);
+
+    this.initialized = true;
+  },
+  dispose: function() {
+    var slider = this;
+    Event.stopObserving(this.track, "mousedown", this.eventMouseDown);
+    Event.stopObserving(document, "mouseup", this.eventMouseUp);
+    Event.stopObserving(document, "mousemove", this.eventMouseMove);
+    this.handles.each( function(h) {
+      Event.stopObserving(h, "mousedown", slider.eventMouseDown);
+    });
+  },
+  setDisabled: function(){
+    this.disabled = true;
+  },
+  setEnabled: function(){
+    this.disabled = false;
+  },
+  getNearestValue: function(value){
+    if (this.allowedValues){
+      if (value >= this.allowedValues.max()) return(this.allowedValues.max());
+      if (value <= this.allowedValues.min()) return(this.allowedValues.min());
+
+      var offset = Math.abs(this.allowedValues[0] - value);
+      var newValue = this.allowedValues[0];
+      this.allowedValues.each( function(v) {
+        var currentOffset = Math.abs(v - value);
+        if (currentOffset <= offset){
+          newValue = v;
+          offset = currentOffset;
+        }
+      });
+      return newValue;
+    }
+    if (value > this.range.end) return this.range.end;
+    if (value < this.range.start) return this.range.start;
+    return value;
+  },
+  setValue: function(sliderValue, handleIdx){
+    if (!this.active) {
+      this.activeHandleIdx = handleIdx || 0;
+      this.activeHandle    = this.handles[this.activeHandleIdx];
+      this.updateStyles();
+    }
+    handleIdx = handleIdx || this.activeHandleIdx || 0;
+    if (this.initialized && this.restricted) {
+      if ((handleIdx>0) && (sliderValue<this.values[handleIdx-1]))
+        sliderValue = this.values[handleIdx-1];
+      if ((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1]))
+        sliderValue = this.values[handleIdx+1];
+    }
+    sliderValue = this.getNearestValue(sliderValue);
+    this.values[handleIdx] = sliderValue;
+    this.value = this.values[0]; // assure backwards compat
+
+    this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] =
+      this.translateToPx(sliderValue);
+
+    this.drawSpans();
+    if (!this.dragging || !this.event) this.updateFinished();
+  },
+  setValueBy: function(delta, handleIdx) {
+    this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta,
+      handleIdx || this.activeHandleIdx || 0);
+  },
+  translateToPx: function(value) {
+    return Math.round(
+      ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) *
+      (value - this.range.start)) + "px";
+  },
+  translateToValue: function(offset) {
+    return ((offset/(this.trackLength-this.handleLength) *
+      (this.range.end-this.range.start)) + this.range.start);
+  },
+  getRange: function(range) {
+    var v = this.values.sortBy(Prototype.K);
+    range = range || 0;
+    return $R(v[range],v[range+1]);
+  },
+  minimumOffset: function(){
+    return(this.isVertical() ? this.alignY : this.alignX);
+  },
+  maximumOffset: function(){
+    return(this.isVertical() ?
+      (this.track.offsetHeight != 0 ? this.track.offsetHeight :
+        this.track.style.height.replace(/px$/,"")) - this.alignY :
+      (this.track.offsetWidth != 0 ? this.track.offsetWidth :
+        this.track.style.width.replace(/px$/,"")) - this.alignX);
+  },
+  isVertical:  function(){
+    return (this.axis == 'vertical');
+  },
+  drawSpans: function() {
+    var slider = this;
+    if (this.spans)
+      $R(0, this.spans.length-1).each(function(r) { slider.setSpan(slider.spans[r], slider.getRange(r)) });
+    if (this.options.startSpan)
+      this.setSpan(this.options.startSpan,
+        $R(0, this.values.length>1 ? this.getRange(0).min() : this.value ));
+    if (this.options.endSpan)
+      this.setSpan(this.options.endSpan,
+        $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum));
+  },
+  setSpan: function(span, range) {
+    if (this.isVertical()) {
+      span.style.top = this.translateToPx(range.start);
+      span.style.height = this.translateToPx(range.end - range.start + this.range.start);
+    } else {
+      span.style.left = this.translateToPx(range.start);
+      span.style.width = this.translateToPx(range.end - range.start + this.range.start);
+    }
+  },
+  updateStyles: function() {
+    this.handles.each( function(h){ Element.removeClassName(h, 'selected') });
+    Element.addClassName(this.activeHandle, 'selected');
+  },
+  startDrag: function(event) {
+    if (Event.isLeftClick(event)) {
+      if (!this.disabled){
+        this.active = true;
+
+        var handle = Event.element(event);
+        var pointer  = [Event.pointerX(event), Event.pointerY(event)];
+        var track = handle;
+        if (track==this.track) {
+          var offsets  = Position.cumulativeOffset(this.track);
+          this.event = event;
+          this.setValue(this.translateToValue(
+           (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2)
+          ));
+          var offsets  = Position.cumulativeOffset(this.activeHandle);
+          this.offsetX = (pointer[0] - offsets[0]);
+          this.offsetY = (pointer[1] - offsets[1]);
+        } else {
+          // find the handle (prevents issues with Safari)
+          while((this.handles.indexOf(handle) == -1) && handle.parentNode)
+            handle = handle.parentNode;
+
+          if (this.handles.indexOf(handle)!=-1) {
+            this.activeHandle    = handle;
+            this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
+            this.updateStyles();
+
+            var offsets  = Position.cumulativeOffset(this.activeHandle);
+            this.offsetX = (pointer[0] - offsets[0]);
+            this.offsetY = (pointer[1] - offsets[1]);
+          }
+        }
+      }
+      Event.stop(event);
+    }
+  },
+  update: function(event) {
+   if (this.active) {
+      if (!this.dragging) this.dragging = true;
+      this.draw(event);
+      if (Prototype.Browser.WebKit) window.scrollBy(0,0);
+      Event.stop(event);
+   }
+  },
+  draw: function(event) {
+    var pointer = [Event.pointerX(event), Event.pointerY(event)];
+    var offsets = Position.cumulativeOffset(this.track);
+    pointer[0] -= this.offsetX + offsets[0];
+    pointer[1] -= this.offsetY + offsets[1];
+    this.event = event;
+    this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
+    if (this.initialized && this.options.onSlide)
+      this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
+  },
+  endDrag: function(event) {
+    if (this.active && this.dragging) {
+      this.finishDrag(event, true);
+      Event.stop(event);
+    }
+    this.active = false;
+    this.dragging = false;
+  },
+  finishDrag: function(event, success) {
+    this.active = false;
+    this.dragging = false;
+    this.updateFinished();
+  },
+  updateFinished: function() {
+    if (this.initialized && this.options.onChange)
+      this.options.onChange(this.values.length>1 ? this.values : this.value, this);
+    this.event = null;
+  }
+});
\ No newline at end of file
Property changes on: branches/product_cleanup/web/src/main/webapp/js/slider.js
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native

Modified: branches/product_cleanup/web/src/test/java/org/mule/galaxy/web/Main.java (2113 => 2114)

--- branches/product_cleanup/web/src/test/java/org/mule/galaxy/web/Main.java	2009-12-17 18:20:34 UTC (rev 2113)
+++ branches/product_cleanup/web/src/test/java/org/mule/galaxy/web/Main.java	2009-12-17 23:44:32 UTC (rev 2114)
@@ -28,7 +28,14 @@
         connector.setHost("0.0.0.0");
         server.addConnector(connector);
 
-        final File baseWebapp = new File("src/main/webapp");
+        File base;
+        if (args.length > 0) {
+            base = new File(args[0]);
+        } else {
+            base = new File(".");
+        }
+        
+        final File baseWebapp = new File(base, "src/main/webapp");
 
         final FileResource webappResource = new FileResource(baseWebapp.toURI().toURL());
         final FileResource generated = new FileResource(new File("target/gwt-webapp").toURI().toURL());
@@ -65,7 +72,7 @@
             
         };
         wac.setContextPath("/");
-        wac.setDefaultsDescriptor(new File("src/test/resources/webdefault.xml").getAbsolutePath());
+        wac.setDefaultsDescriptor(new File(base, "src/test/resources/webdefault.xml").getAbsolutePath());
         wac.setWar(baseWebapp.getAbsolutePath());
         
         Map<String, Object> params = new HashMap<String, Object>();

--------------------------------------------------------------------- To unsubscribe from this list, please visit: http://admin.muleforge.org/manage_email

You received this message because you are subscribed to the Google Groups "MuleForge Dev" group.
To post to this group, send email to muleforgedev@....
To unsubscribe from this group, send email to muleforgedev+unsubscribe@....
For more options, visit this group at http://groups.google.com/group/muleforgedev?hl=en.

[mule-jira] Updated: (IBEANSIDE-12) New iBean project does not compile if iBeans distro not set

2009-12-17T12:06:22Z

[ http://www.mulesource.org/jira/browse/IBEANSIDE-12?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Ross Mason updated IBEANSIDE-12:
--------------------------------

Attachment: iBeans Eclipse Plugin.pdf

The steps to create the problem

> New iBean project does not compile if iBeans distro not set
> -----------------------------------------------------------
>
> Key: IBEANSIDE-12
> URL: http://www.mulesource.org/jira/browse/IBEANSIDE-12
> Project: iBeans IDE
> Issue Type: Bug
> Components: Usability/Integration, Wizards
> Affects Versions: 1.0-alpha-1
> Reporter: Ross Mason
> Assignee: Dirk Olmes
> Attachments: iBeans Eclipse Plugin.pdf
>
>
> If the new iBean project wizard is used before the iBeans distro location is set up, the project is created without ibeans enabled and the project does not compile. See the attached pdf (Thanks to Matt M)
> Solution is probably to check the iBeans distro in the wizard and allow the user to select the location before they can go to the next wizard screen

--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://www.mulesource.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

--

You received this message because you are subscribed to the Google Groups "MuleForge Dev" group.
To post to this group, send email to muleforgedev@....
To unsubscribe from this group, send email to muleforgedev+unsubscribe@....
For more options, visit this group at http://groups.google.com/group/muleforgedev?hl=en.

[mule-jira] Created: (IBEANSIDE-12) New iBean project does not compile if iBeans distro not set

2009-12-17T12:04:22Z

New iBean project does not compile if iBeans distro not set
-----------------------------------------------------------

Key: IBEANSIDE-12
URL: http://www.mulesource.org/jira/browse/IBEANSIDE-12
Project: iBeans IDE
Issue Type: Bug
Components: Usability/Integration, Wizards
Affects Versions: 1.0-alpha-1
Reporter: Ross Mason
Assignee: Dirk Olmes

If the new iBean project wizard is used before the iBeans distro location is set up, the project is created without ibeans enabled and the project does not compile. See the attached pdf (Thanks to Matt M)

Solution is probably to check the iBeans distro in the wizard and allow the user to select the location before they can go to the next wizard screen

--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://www.mulesource.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

--

You received this message because you are subscribed to the Google Groups "MuleForge Dev" group.
To post to this group, send email to muleforgedev@....
To unsubscribe from this group, send email to muleforgedev+unsubscribe@....
For more options, visit this group at http://groups.google.com/group/muleforgedev?hl=en.

[galaxy-dev] [2113] branches/product_cleanup: Yeah this isn't going to be usable for a while.

2009-12-17T10:20:35Z

[2113] branches/product_cleanup: Yeah this isn't going to be usable for a while.

Revision: 2113
Author: dandiep
Date: 2009-12-17 12:20:34 -0600 (Thu, 17 Dec 2009)

Log Message

Yeah this isn't going to be usable for a while. Remove web-standalone - can restore later.

Modified Paths

branches/product_cleanup/pom.xml

Removed Paths

branches/product_cleanup/web-standalone/

Diff

Modified: branches/product_cleanup/pom.xml (2112 => 2113)

--- branches/product_cleanup/pom.xml	2009-12-17 01:20:49 UTC (rev 2112)
+++ branches/product_cleanup/pom.xml	2009-12-17 18:20:34 UTC (rev 2113)
@@ -39,7 +39,6 @@
         <module>repository/gwt-client</module>
         <module>repository/server</module>
         <module>web</module>
-        <module>web-standalone</module>
         <module>gwt-client</module>
         <module>integration</module>
         <module>server</module>

--------------------------------------------------------------------- To unsubscribe from this list, please visit: http://admin.muleforge.org/manage_email

[galaxy-dev] [2112] branches/product_cleanup/repository/server: Make repository work as separate module.

2009-12-16T17:20:49Z

[2112] branches/product_cleanup/repository/server: Make repository work as separate module.

Revision: 2112
Author: dandiep
Date: 2009-12-16 19:20:49 -0600 (Wed, 16 Dec 2009)

Log Message

Make repository work as separate module. Applications create a Galaxy instance which in turn takes a collection of Modules which it starts.

Modified Paths

branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/PageManager.java
branches/product_cleanup/repository/gwt-client/pom.xml
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java
branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml
branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml
branches/product_cleanup/web/src/main/webapp/index.jsp

Added Paths

branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/AdminApplication.java
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/GalaxyModule.java
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyService.java
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyServiceAsync.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/Repository.gwt.xml
branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/Messages.properties
branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/GalaxyServiceImpl.java
branches/product_cleanup/web/src/main/webapp/images/ajax-loader.gif
branches/product_cleanup/web/src/test/java/org/mule/galaxy/web/server/GalaxyServiceTest.java

Removed Paths

branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/

Property Changed

branches/product_cleanup/repository/gwt-client/
branches/product_cleanup/repository/server/

Diff

Added: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/AdminApplication.java (0 => 2112)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/AdminApplication.java	                        (rev 0)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/AdminApplication.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -0,0 +1,21 @@
+package org.mule.galaxy.web.client;
+
+import java.util.ArrayList;
+
+import com.google.gwt.core.client.EntryPoint;
+
+/**
+ * A simple application implementation which just loads the administration panel.
+ * Useful for simple testing only.
+ */
+public class AdminApplication implements EntryPoint {
+
+    public void onModuleLoad() {
+        Galaxy galaxy = new Galaxy();
+        
+        // no extra modules, so just start an empty Galaxy instance with just
+        // the admin panel.
+        galaxy.initialize(new ArrayList<GalaxyModule>());
+    }
+
+}
Property changes on: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/AdminApplication.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java (2111 => 2112)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -54,7 +54,6 @@
 import com.extjs.gxt.ui.client.widget.layout.BorderLayout;
 import com.extjs.gxt.ui.client.widget.layout.BorderLayoutData;
 import com.extjs.gxt.ui.client.widget.layout.FlowLayout;
-import com.google.gwt.core.client.EntryPoint;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -95,7 +94,7 @@
     private GalaxyServiceAsync galaxyService;
     private AdministrationPanel adminPanel;
 
-    public void initialize(List<GalaxyModule> modules) {
+    public void initialize(final List<GalaxyModule> modules) {
         //GXT.setDefaultTheme(Theme.GRAY, true);
         GXT.BLANK_IMAGE_URL = "extjsresources/images/default/s.gif";
         final String LOGO = "images/galaxy_logo_main_trans.gif";
@@ -140,17 +139,7 @@
             }
 
             public void onSuccess(ApplicationInfo appInfo) {
-                user = (WUser) appInfo.getUser();
-                // always the left most item
-                rightHeaderPanel.insert(new Label("Welcome, " + user.getName()), 0);
-                
-                extensions = (List) appInfo.getExtensions();
-                Collections.sort(extensions);
-                
-                plugins = appInfo.getPluginTabs();
-                userManagementSupported = appInfo.isUserManagementSupported();
-                loadTabs(Galaxy.this);
-                showFirstPage();
+                initializeApplication(appInfo, modules);
             }
         });
 
@@ -166,6 +155,24 @@
         Image.prefetch("images/lightbox.png");
     }
 
+    protected void initializeApplication(ApplicationInfo appInfo, final List<GalaxyModule> modules) {
+        user = (WUser) appInfo.getUser();
+        // always the left most item
+        rightHeaderPanel.insert(new Label("Welcome, " + user.getName()), 0);
+        
+        extensions = (List) appInfo.getExtensions();
+        Collections.sort(extensions);
+        
+        plugins = appInfo.getPluginTabs();
+        userManagementSupported = appInfo.isUserManagementSupported();
+        loadTabs(Galaxy.this);
+        
+        for (GalaxyModule module : modules) {
+            module.initialize(Galaxy.this);
+        }
+        showFirstPage();
+    }
+    
     private void createFooter() {
         ContentPanel southPanel = new ContentPanel();
         southPanel.setBorders(false);

Added: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/GalaxyModule.java (0 => 2112)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/GalaxyModule.java	                        (rev 0)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/GalaxyModule.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -0,0 +1,8 @@
+package org.mule.galaxy.web.client;
+
+/**
+ * A Module which adds capabilities to Galaxy's user interface.
+ */
+public interface GalaxyModule {
+    public void initialize(Galaxy galaxy);
+}
Property changes on: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/GalaxyModule.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/PageManager.java (2111 => 2112)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/PageManager.java	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/PageManager.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -185,11 +185,15 @@
 
     public int createTab(String name, String token, String toolTip) {
         int index = tabPanel.getItemCount();
-        tabPanel.add(createEmptyTab(name, toolTip));
-        tabNames.add(index, token);
+        createTab(index, name, token, toolTip);
         return index;
     }
     
+    public void createTab(int index, String name, String token, String toolTip) {
+        tabPanel.insert(createEmptyTab(name, toolTip), index);
+        tabNames.add(index, token);
+    }
+    
     protected TabItem createEmptyTab(String name, String toolTip) {
         TabItem tab = new TabItem();
         TabItem.HeaderItem header = tab.getHeader();

Added: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyService.java (0 => 2112)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyService.java	                        (rev 0)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyService.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -0,0 +1,11 @@
+package org.mule.galaxy.web.rpc;
+
+import org.mule.galaxy.web.client.RPCException;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+
+public interface GalaxyService extends RemoteService {
+
+    ApplicationInfo getApplicationInfo() throws RPCException;
+
+}
Property changes on: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyService.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyServiceAsync.java (0 => 2112)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyServiceAsync.java	                        (rev 0)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyServiceAsync.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -0,0 +1,9 @@
+package org.mule.galaxy.web.rpc;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+public interface GalaxyServiceAsync {
+
+    void getApplicationInfo(AsyncCallback<ApplicationInfo> callback);
+
+}
Property changes on: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyServiceAsync.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Property changes: branches/product_cleanup/repository/gwt-client

Name: svn:ignore
   - target
   + target
.settings
.classpath
.project

Modified: branches/product_cleanup/repository/gwt-client/pom.xml (2111 => 2112)

--- branches/product_cleanup/repository/gwt-client/pom.xml	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/repository/gwt-client/pom.xml	2009-12-17 01:20:49 UTC (rev 2112)
@@ -55,10 +55,10 @@
                         <version>2.0-beta6</version>
                         <configuration>
                             <gwtVersion>${gwtVersion}</gwtVersion>
-                            <runTarget>org.mule.galaxy.web.Galaxy/Galaxy.html</runTarget>
+                            <runTarget>org.mule.galaxy.repository.Repository/Repository.html</runTarget>
                             <style>OBF</style>
                             <compileTargets>
-                                <value>org.mule.galaxy.web.Galaxy</value>
+                                <value>org.mule.galaxy.repository.Repository</value>
                             </compileTargets>
                             <extraJvmArgs>-Xss1024k -Xmx1024m -Dgwt.nowarn.legacy.tools</extraJvmArgs>
                             <!--

Added: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/Repository.gwt.xml (0 => 2112)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/Repository.gwt.xml	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/Repository.gwt.xml	2009-12-17 01:20:49 UTC (rev 2112)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--<!DOCTYPE module PUBLIC "-//Google //DTD gwt-module-configuration XML V1.0//EN"-->
+            <!--"http://google-web-toolkit.googlecode.com/svn/tags/1.4.61/distro-source/core/src/gwt-module.dtd">-->
+        
+<module>
+
+    <inherits name='org.mule.galaxy.repository.RepositoryLib'/>
+    
+    <source path="rpc"/>
+    <source path="client"/>
+    
+    <entry-point class='org.mule.galaxy.repository.client.RepositoryApplication'/>
+
+</module>
Property changes on: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/Repository.gwt.xml
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date Id
Name: svn:eol-style
   + native

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml (2111 => 2112)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml	2009-12-17 01:20:49 UTC (rev 2112)
@@ -5,23 +5,10 @@
         
 <module>
 
-    <!-- Inherit the core Web Toolkit stuff.                  -->
     <inherits name='org.mule.galaxy.web.GalaxyLib'/>
     <inherits name="com.google.gwt.gen2.table.Table"/>
     
     <source path="rpc"/>
     <source path="client"/>
-
-    <public path="public">
-        <!--
-            Don't recursively include GWT compiler output when
-            developing with IDE and m2.
-        -->
-        <exclude name="org.mule.galaxy.web.Galaxy/**"/>
-        <exclude name="WEB-INF/**"/>
-        <exclude name="META-INF/**"/> 
-    </public>
-
-    <stylesheet src="application.css"/>
-
+    
 </module>

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java (2111 => 2112)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -1,5 +1,19 @@
 package org.mule.galaxy.repository.client;
 
-public class RepositoryApplication {
+import java.util.Arrays;
 
-}
+import org.mule.galaxy.web.client.Galaxy;
+import org.mule.galaxy.web.client.GalaxyModule;
+
+import com.google.gwt.core.client.EntryPoint;
+
+public class RepositoryApplication implements EntryPoint {
+
+    public void onModuleLoad() {
+        Galaxy galaxy = new Galaxy();
+        
+        // Initialize Galaxy with the RepositoryModule
+        galaxy.initialize(Arrays.asList((GalaxyModule)new RepositoryModule()));
+    }
+
+}
\ No newline at end of file

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java (2111 => 2112)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -25,7 +25,7 @@
     private PropertyInterfaceManager propertyInterfaceManager = new PropertyInterfaceManager();
     private RepositoryConstants repositoryConstants;
     private RegistryServiceAsync registryService;
-    private int repositoryTabIndex;
+    private int repositoryTabIndex = 0;
     private boolean showTypeSystem = true;
     
     public void initialize(Galaxy galaxy) {
@@ -33,6 +33,8 @@
         this.repositoryConstants = (RepositoryConstants) GWT.create(RepositoryConstants.class);
 
         createService();
+        loadRepositoryTab();
+        addAdministrationMenuItems();
     }
 
     protected void addAdministrationMenuItems() {
@@ -86,7 +88,7 @@
     }
 
     protected void loadRepositoryTab() {
-        repositoryTabIndex = galaxy.getPageManager().createTab("Repository", "item", repositoryConstants.repo_TabTip());
+        galaxy.getPageManager().createTab(repositoryTabIndex, "Repository", "browse", repositoryConstants.repo_TabTip());
         createRepositoryPanels();
     }
 
@@ -120,6 +122,10 @@
     public void setShowTypeSystem(boolean showTypeSystem) {
         this.showTypeSystem = showTypeSystem;
     }
+
+    public void setRepositoryTab(int repositoryTabIndex) {
+        this.repositoryTabIndex = repositoryTabIndex;
+    }
     
 
 }

Property changes: branches/product_cleanup/repository/server

Name: svn:ignore
   + .settings
target
.classpath
.project

Added: branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/Messages.properties ( => )



Property changes on: branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/Messages.properties
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml (2111 => 2112)

--- branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml	2009-12-17 01:20:49 UTC (rev 2112)
@@ -12,7 +12,7 @@
 
     <bean id="coreGwtModule" class="org.mule.galaxy.web.GwtModule">
       <property name="core" value="true"/>
-      <property name="name" value="org.mule.galaxy.web.Repository"/>
+      <property name="name" value="org.mule.galaxy.repository.Repository"/>
       <property name="rpcServices">
         <map>
           <entry key="/galaxyService.rpc" value-ref="galaxyService" />

Added: branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/GalaxyServiceImpl.java (0 => 2112)

--- branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/GalaxyServiceImpl.java	                        (rev 0)
+++ branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/GalaxyServiceImpl.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -0,0 +1,92 @@
+package org.mule.galaxy.web.server;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.mule.galaxy.Registry;
+import org.mule.galaxy.extension.Extension;
+import org.mule.galaxy.security.AccessControlManager;
+import org.mule.galaxy.security.Permission;
+import org.mule.galaxy.security.User;
+import org.mule.galaxy.security.UserManager;
+import org.mule.galaxy.util.SecurityUtils;
+import org.mule.galaxy.web.GwtFacet;
+import org.mule.galaxy.web.WebManager;
+import org.mule.galaxy.web.client.RPCException;
+import org.mule.galaxy.web.rpc.ApplicationInfo;
+import org.mule.galaxy.web.rpc.GalaxyService;
+import org.mule.galaxy.web.rpc.PluginTabInfo;
+import org.mule.galaxy.web.rpc.WExtensionInfo;
+import org.mule.galaxy.web.rpc.WUser;
+
+public class GalaxyServiceImpl implements GalaxyService {
+
+    private Registry registry;
+    private WebManager webManager;
+    private UserManager userManager;
+    private AccessControlManager accessControlManager;
+    
+    public ApplicationInfo getApplicationInfo() throws RPCException {
+        ApplicationInfo info = new ApplicationInfo();
+        info.setPluginTabs(getPluginTabs());
+        info.setUser(getUserInfo());
+        info.setUserManagementSupported(userManager.isManagementSupported());
+        info.setExtensions(getExtensions());
+        return info;
+    }
+
+    protected Collection<PluginTabInfo> getPluginTabs() {
+        Collection<GwtFacet> facets = webManager.getGwtFacets();
+        ArrayList<PluginTabInfo> wPlugins = new ArrayList<PluginTabInfo>();
+        for (GwtFacet p : facets) {
+            if (!p.getName().equals("core")) {
+                PluginTabInfo wp = new PluginTabInfo();
+                wp.setName(p.getName());
+                wp.setToken(p.getToken());
+                wPlugins.add(wp);
+            }
+        }
+        return wPlugins;
+    }
+
+    public List<WExtensionInfo> getExtensions() throws RPCException {
+        ArrayList<WExtensionInfo> exts = new ArrayList<WExtensionInfo>();
+        for (Extension e : registry.getExtensions()) {
+            exts.add(new WExtensionInfo(e.getId(), e.getName(), e.getPropertyDescriptorConfigurationKeys(), e.isMultivalueSupported()));
+        }
+        return exts;
+    }
+
+    public WUser getUserInfo() throws RPCException {
+        User user = SecurityUtils.getCurrentUser();
+        WUser w = SecurityServiceImpl.createWUser(user);
+
+        List<String> perms = new ArrayList<String>();
+
+        for (Permission p : accessControlManager.getGrantedPermissions(user)) {
+            perms.add(p.toString());
+        }
+        w.setPermissions(perms);
+
+        return w;
+    }
+
+    public void setWebManager(WebManager webManager) {
+        this.webManager = webManager;
+    }
+
+    public void setRegistry(Registry registry) {
+        this.registry = registry;
+    }
+
+    public void setUserManager(UserManager userManager) {
+        this.userManager = userManager;
+    }
+
+    public void setAccessControlManager(AccessControlManager accessControlManager) {
+        this.accessControlManager = accessControlManager;
+    }
+    
+
+}
Property changes on: branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/GalaxyServiceImpl.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml (2111 => 2112)

--- branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml	2009-12-17 01:20:49 UTC (rev 2112)
@@ -16,7 +16,7 @@
     
     <bean id="coreGwtModule" class="org.mule.galaxy.web.GwtModule">
       <property name="core" value="true"/>
-      <property name="name" value="org.mule.galaxy.web.Admin"/>
+      <property name="name" value="org.mule.galaxy.repository.Repository"/>
       <property name="rpcServices">
         <map>
           <entry key="/galaxyService.rpc" value-ref="galaxyService" />

Added: branches/product_cleanup/web/src/main/webapp/images/ajax-loader.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/images/ajax-loader.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Modified: branches/product_cleanup/web/src/main/webapp/index.jsp (2111 => 2112)

--- branches/product_cleanup/web/src/main/webapp/index.jsp	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/web/src/main/webapp/index.jsp	2009-12-17 01:20:49 UTC (rev 2112)
@@ -132,7 +132,6 @@
     }
 %>
 
-<!-- OPTIONAL: include this if you want history support -->
 <iframe src="javascript:''" id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe>
 
 </body>

Added: branches/product_cleanup/web/src/test/java/org/mule/galaxy/web/server/GalaxyServiceTest.java (0 => 2112)

--- branches/product_cleanup/web/src/test/java/org/mule/galaxy/web/server/GalaxyServiceTest.java	                        (rev 0)
+++ branches/product_cleanup/web/src/test/java/org/mule/galaxy/web/server/GalaxyServiceTest.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -0,0 +1,43 @@
+package org.mule.galaxy.web.server;
+
+import java.util.Collection;
+
+import org.mule.galaxy.test.AbstractGalaxyTest;
+import org.mule.galaxy.web.rpc.ApplicationInfo;
+import org.mule.galaxy.web.rpc.GalaxyService;
+import org.mule.galaxy.web.rpc.PluginTabInfo;
+import org.mule.galaxy.web.rpc.WUser;
+
+public class GalaxyServiceTest extends AbstractGalaxyTest {
+
+    protected GalaxyService galaxyService;
+    
+    @Override
+    protected String[] getConfigLocations() {
+        return new String[] { "/META-INF/applicationContext-core.xml", 
+                              "/META-INF/applicationContext-core-extensions.xml", 
+                              "/META-INF/applicationContext-acegi-security.xml",
+                              "/META-INF/applicationContext-web.xml",
+                              "/META-INF/applicationContext-test.xml" };
+        
+    }
+    
+    public void testGwtPlugins() throws Exception {
+        Collection<PluginTabInfo> plugins = galaxyService.getApplicationInfo().getPluginTabs();
+        assertEquals(0, plugins.size());
+    }
+
+    public void testApplicationInfo() throws Exception {
+        ApplicationInfo appInfo = galaxyService.getApplicationInfo();
+        WUser user = appInfo.getUser();
+        
+        assertNotNull(user.getUsername());
+        Collection<String> permissions = user.getPermissions();
+        assertTrue(permissions.size() > 0);
+        
+        assertTrue(permissions.contains("MANAGE_USERS"));
+
+        assertNotNull(appInfo.getExtensions());
+    }
+    
+}
Property changes on: branches/product_cleanup/web/src/test/java/org/mule/galaxy/web/server/GalaxyServiceTest.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

--------------------------------------------------------------------- To unsubscribe from this list, please visit: http://admin.muleforge.org/manage_email

[galaxy-dev] [2111] branches/product_cleanup/web: Checkpoint.

2009-12-16T15:18:07Z

[2111] branches/product_cleanup/web: Checkpoint.

Revision: 2111
Author: dandiep
Date: 2009-12-16 17:18:07 -0600 (Wed, 16 Dec 2009)

Log Message

Checkpoint. Repository now compiles as it's own separate module. Nearly working as a standalone drop in to the web module.

Modified Paths

branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/GalaxyLib.gwt.xml
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/AdministrationPanel.java
branches/product_cleanup/integration/atom-client/src/test/java/org/mule/galaxy/atom/client/AtomGwtTest.java
branches/product_cleanup/repository/gwt-client/pom.xml
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity/ActivityPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity/DateParseException.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/InnerPropertyDescriptorForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/LifecycleForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/LifecycleListPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PolicyPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PropertyDescriptorForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PropertyDescriptorListPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/TypeForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/TypeListPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/AbstractBrowsePanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/ArtifactListPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/BulkEditPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/PolicyResultsPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddArtifactForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddItemForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddWorkspaceForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ChildItemsPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemInfoPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemRolePermissionPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/NameEditPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/PolicyResultsPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/RepositoryMenuPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/AbstractListRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/AbstractPropertyRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/ArtifactRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/EditPropertyPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/EntryMetadataPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/LifecycleRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/LinksRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/MapRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/NewPropertyPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/PropertyInterfaceManager.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/SimpleListRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/SimpleRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/UserListRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/AddItemHelper.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/ItemPathOracle.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/LifecycleSelectionPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/PolicySelectionPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/PropertyDescriptorComparator.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/RegistryOracle.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/WTypeComparator.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/ItemInfo.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/RegistryService.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/RegistryServiceAsync.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WApprovalMessage.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WArtifactType.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WArtifactView.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WComment.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WGovernanceInfo.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WIndex.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WLifecycle.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WLinks.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPhase.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPolicy.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPolicyException.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WProperty.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPropertyDescriptor.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WSearchResults.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WType.java
branches/product_cleanup/repository/server/pom.xml
branches/product_cleanup/repository/server/src/test/java/org/mule/galaxy/web/server/RegistryServiceTest.java
branches/product_cleanup/web/pom.xml
branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml

Added Paths

branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Admin.gwt.xml
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryConstants.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryMessages.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/StylizedSortableGrid.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/
branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/
branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/RegistryServiceImpl.java
branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathResolver.java
branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java
branches/product_cleanup/repository/server/src/main/resources/META-INF/
branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml

Removed Paths

branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Galaxy.gwt.xml
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/StylizedSortableGrid.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/activity/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/registry/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/ui/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/
branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/server/
branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java
branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/ContextPathResolver.java

Diff

Copied: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Admin.gwt.xml (from rev 2109, branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Galaxy.gwt.xml) (0 => 2111)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Admin.gwt.xml	                        (rev 0)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Admin.gwt.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--<!DOCTYPE module PUBLIC "-//Google //DTD gwt-module-configuration XML V1.0//EN"-->
+            <!--"http://google-web-toolkit.googlecode.com/svn/tags/1.4.61/distro-source/core/src/gwt-module.dtd">-->
+        
+<module>
+    <inherits name='org.mule.galaxy.web.GalaxyLib'/>
+    
+    <entry-point class='org.mule.galaxy.web.client.AdminApplication'/>
+</module>

Deleted: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Galaxy.gwt.xml (2110 => 2111)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Galaxy.gwt.xml	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Galaxy.gwt.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--<!DOCTYPE module PUBLIC "-//Google //DTD gwt-module-configuration XML V1.0//EN"-->
-            <!--"http://google-web-toolkit.googlecode.com/svn/tags/1.4.61/distro-source/core/src/gwt-module.dtd">-->
-        
-<module>
-    <inherits name='org.mule.galaxy.web.GalaxyLib'/>
-    <inherits name="com.google.gwt.gen2.table.Table"/>
-    
-    <entry-point class='org.mule.galaxy.web.client.Galaxy'/>
-</module>

Modified: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/GalaxyLib.gwt.xml (2110 => 2111)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/GalaxyLib.gwt.xml	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/GalaxyLib.gwt.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -7,11 +7,10 @@
 
     <!-- Inherit the core Web Toolkit stuff.                  -->
     <inherits name='com.google.gwt.user.User'/>
-    <inherits name='com.google.gwt.widgetideas.DatePicker' />
+    <inherits name='com.google.gwt.widgetideas.GlassPanel' />
     <inherits name='com.extjs.gxt.ui.GXT'/>
     <inherits name='com.google.gwt.i18n.I18N'/>
     
-
     <source path="rpc"/>
     <source path="client"/>

Modified: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java (2110 => 2111)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -70,7 +70,7 @@
 /**
  * Entry point classes define <code>onModuleLoad()</code>.
  */
-public class Galaxy implements EntryPoint {
+public class Galaxy {
 
     private SecurityServiceAsync securityService;
     private HeartbeatServiceAsync heartbeatService;
@@ -93,11 +93,9 @@
     private PageManager pageManager;
     private ContentPanel centerPanel;
     private GalaxyServiceAsync galaxyService;
+    private AdministrationPanel adminPanel;
 
-    /**
-     * This is the entry point method.
-     */
-    public void onModuleLoad() {
+    public void initialize(List<GalaxyModule> modules) {
         //GXT.setDefaultTheme(Theme.GRAY, true);
         GXT.BLANK_IMAGE_URL = "extjsresources/images/default/s.gif";
         final String LOGO = "images/galaxy_logo_main_trans.gif";
@@ -284,11 +282,15 @@
     protected void loadAdminTab() {
         if (showAdminTab(user)) {
             adminTabIndex = pageManager.createTab("Administration", "admin", administrationConstants.admin_TabTip());
-            AdministrationPanel adminPanel = createAdministrationPanel();
+            adminPanel = createAdministrationPanel();
             pageManager.createPageInfo("admin", adminPanel, adminTabIndex);
         }
     }
 
+    public AdministrationPanel getAministrationPanel() {
+        return adminPanel;
+    }
+
     protected void loadPluginTabs() {
         for (PluginTabInfo plugin : getPlugins()) {
             int index = pageManager.createTab(plugin.getName(), plugin.getRootToken(), "");

Modified: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/AdministrationPanel.java (2110 => 2111)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/AdministrationPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/AdministrationPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -252,5 +252,15 @@
         this.utilityItems = utilityItems;
     }
 
+    public void addUtilityMenuItem(NavMenuItem navMenuItem) {
+        // TODO Auto-generated method stub
+        
+    }
 
+    public void addManageMenuItem(NavMenuItem item) {
+        // TODO Auto-generated method stub
+        
+    }
+
+
 }

Deleted: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/StylizedSortableGrid.java (2110 => 2111)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/StylizedSortableGrid.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/StylizedSortableGrid.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,162 +0,0 @@
-package org.mule.galaxy.web.client.util;
-
-import com.google.gwt.gen2.table.client.SortableGrid;
-import com.google.gwt.gen2.table.client.TableModelHelper.ColumnSortList;
-import com.google.gwt.gen2.table.event.client.RowHighlightEvent;
-import com.google.gwt.gen2.table.event.client.RowHighlightHandler;
-import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
-import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
-import com.google.gwt.gen2.table.event.client.RowUnhighlightEvent;
-import com.google.gwt.gen2.table.event.client.RowUnhighlightHandler;
-import com.google.gwt.gen2.table.event.client.TableEvent.Row;
-import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.Element;
-
-public class StylizedSortableGrid extends SortableGrid {
-
-    public StylizedSortableGrid(int rows, int columns) {
-        super(rows, columns);
-
-        setCellSpacing(0);
-        setCellPadding(4);
-
-        addRowHighlightHandler(new RowHighlightHandler() {
-            public void onRowHighlight(RowHighlightEvent event) {
-                int idx = event.getValue().getRowIndex();
-                if (idx == 0)
-                    return;
-                getRowFormatter().setStyleName(idx, "SortableGrid-selectedRow");
-            }
-        });
-        addRowUnhighlightHandler(new RowUnhighlightHandler() {
-            public void onRowUnhighlight(RowUnhighlightEvent event) {
-                int idx = event.getValue().getRowIndex();
-                if (idx == 0 || getSelectedRows().contains(idx))
-                    return;
-
-                getRowFormatter().setStyleName(idx, "");
-            }
-        });
-        addRowSelectionHandler(new RowSelectionHandler() {
-
-            public void onRowSelection(RowSelectionEvent event) {
-                for (Row row : event.getDeselectedRows()) {
-                    int idx = row.getRowIndex();
-                    if (idx == 0)
-                        return;
-
-                    getRowFormatter().setStyleName(idx, "");
-                }
-
-                for (Row row : event.getSelectedRows()) {
-                    int idx = row.getRowIndex();
-                    if (idx == 0)
-                        return;
-
-                    getRowFormatter().setStyleName(idx, "SortableGrid-selectedRow");
-                }
-            }
-        });
-
-        setColumnSorter(new ColumnSorter() {
-
-            @Override
-            public void onSortColumn(SortableGrid grid, ColumnSortList sortList,
-                                     SortableGrid.ColumnSorterCallback callback) {
-                // Get the primary column and sort order
-                int column = sortList.getPrimaryColumn();
-                boolean ascending = sortList.isPrimaryAscending();
-
-                // Apply the default quicksort algorithm
-                SelectionGridCellFormatter formatter = grid.getSelectionGridCellFormatter();
-                Element[] tdElems = new Element[grid.getRowCount()];
-                for (int i = 0; i < tdElems.length; i++) {
-                    tdElems[i] = formatter.getElement(i, column);
-                }
-                
-                Element[] nonHeaders = new Element[tdElems.length-1];
-                
-                for (int i = 1; i < tdElems.length; i++) {
-                    nonHeaders[i-1] = tdElems[i];
-                }
-                
-                quicksort(nonHeaders, 0, nonHeaders.length - 1);
-
-                for (int i = 1; i < tdElems.length; i++) {
-                    tdElems[i] = nonHeaders[i-1];
-                }
-                
-                // Convert tdElems to trElems, reversing if needed
-                Element[] trElems = new Element[tdElems.length];
-                trElems[0] = DOM.getParent(tdElems[0]);
-                if (ascending) {
-                    for (int i = 1; i < tdElems.length; i++) {
-                        trElems[i] = DOM.getParent(tdElems[i]);
-                    }
-                } else {
-                    int maxElem = tdElems.length - 1;
-                    for (int i = 1; i <= maxElem; i++) {
-                        trElems[i] = DOM.getParent(tdElems[maxElem - i + 1]);
-                    }
-                }
-
-                // Use the callback to complete the sorting
-                callback.onSortingComplete(trElems);
-            }
-
-            /**
-             * Recursive quicksort algorithm.
-             * 
-             * @param tdElems
-             *            an array of row elements
-             * @param start
-             *            the start index to sort
-             * @param end
-             *            the last index to sort
-             */
-            private void quicksort(Element[] tdElems, int start, int end) {
-                // No need to sort
-                if (start >= end) {
-                    return;
-                }
-
-                // Sort this set
-                int i = start + 1;
-                int k = end;
-                String pivot = DOM.getInnerText(tdElems[start]);
-                while (k >= i) {
-                    if (DOM.getInnerText(tdElems[i]).compareTo(pivot) < 0) {
-                        // Move i until the value is great than the pivot
-                        i++;
-                    } else if (k == i) {
-                        // Don't swap if equal
-                        k--;
-                    } else if (DOM.getInnerText(tdElems[k]).compareTo(pivot) < 0) {
-                        // Swap the elements at k and i
-                        Element tr = tdElems[i];
-                        tdElems[i] = tdElems[k];
-                        tdElems[k] = tr;
-                        i++;
-                        k--;
-                    } else {
-                        // Decrement k
-                        k--;
-                    }
-                }
-
-                // Swap k and pivot
-                if (k != start) {
-                    Element tr = tdElems[k];
-                    tdElems[k] = tdElems[start];
-                    tdElems[start] = tr;
-                }
-
-                // Sort the subsets
-                quicksort(tdElems, start, k - 1);
-                quicksort(tdElems, k + 1, end);
-            }
-        });
-
-    }
-
-}

Modified: branches/product_cleanup/integration/atom-client/src/test/java/org/mule/galaxy/atom/client/AtomGwtTest.java (2110 => 2111)

--- branches/product_cleanup/integration/atom-client/src/test/java/org/mule/galaxy/atom/client/AtomGwtTest.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/integration/atom-client/src/test/java/org/mule/galaxy/atom/client/AtomGwtTest.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -3,9 +3,9 @@
 import java.util.List;
 
 import org.mule.galaxy.Item;
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.RegistryService;
-import org.mule.galaxy.web.rpc.WSearchResults;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryService;
+import org.mule.galaxy.repository.rpc.WSearchResults;
 
 public class AtomGwtTest extends AbstractAtomTest {
     protected RegistryService gwtRegistry;

Modified: branches/product_cleanup/repository/gwt-client/pom.xml (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/pom.xml	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/pom.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -7,7 +7,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mule.galaxy</groupId>
-    <artifactId>galaxy-repository-client</artifactId>
+    <artifactId>galaxy-repository-gwt-client</artifactId>
     <version>2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Galaxy Repository: GWT Client</name>

Added: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml (0 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--<!DOCTYPE module PUBLIC "-//Google //DTD gwt-module-configuration XML V1.0//EN"-->
+            <!--"http://google-web-toolkit.googlecode.com/svn/tags/1.4.61/distro-source/core/src/gwt-module.dtd">-->
+        
+<module>
+
+    <!-- Inherit the core Web Toolkit stuff.                  -->
+    <inherits name='org.mule.galaxy.web.GalaxyLib'/>
+    <inherits name="com.google.gwt.gen2.table.Table"/>
+    
+    <source path="rpc"/>
+    <source path="client"/>
+
+    <public path="public">
+        <!--
+            Don't recursively include GWT compiler output when
+            developing with IDE and m2.
+        -->
+        <exclude name="org.mule.galaxy.web.Galaxy/**"/>
+        <exclude name="WEB-INF/**"/>
+        <exclude name="META-INF/**"/> 
+    </public>
+
+    <stylesheet src="application.css"/>
+
+</module>
Property changes on: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date Id
Name: svn:eol-style
   + native

Added: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java (0 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,5 @@
+package org.mule.galaxy.repository.client;
+
+public class RepositoryApplication {
+
+}
Property changes on: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryConstants.java (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/ui/RepositoryConstants.java) (0 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryConstants.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryConstants.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,124 @@
+package org.mule.galaxy.repository.client;
+
+/**
+ * Interface to represent the constants contained in resource bundle:
+ */
+public interface RepositoryConstants extends com.google.gwt.i18n.client.Constants {
+
+  /**
+   * Translated "Specify the type of item you are adding, the workspace (parent) where you want it stored, and a name for it. Additional fields appear depending on the type of item you select (see the <a href=\"http://www.mulesoft.org/display/TCAT/Managing+the+Repository\" target=\"_blank\">online help</a> for details). Click <b>Add</b> to create the item.".
+   *
+   * @return translated "Specify the type of item you are adding, the workspace (parent) where you want it stored, and a name for it. Additional fields appear depending on the type of item you select (see the <a href=\"http://www.mulesoft.org/display/TCAT/Managing+the+Repository\" target=\"_blank\">online help</a> for details). Click <b>Add</b> to create the item."
+   */
+  @DefaultStringValue("Specify the type of item you are adding, the workspace (parent) where you want it stored, and a name for it. Additional fields appear depending on the type of item you select (see the <a href=\"http://www.mulesoft.org/display/TCAT/Managing+the+Repository\" target=\"_blank\">online help</a> for details). Click <b>Add</b> to create the item.")
+  @Key("repo_Add_Item_Tip")
+  String repo_Add_Item_Tip();
+
+  /**
+   * Translated "Deletes the currently selected workspace(s) or artifact(s)".
+   *
+   * @return translated "Deletes the currently selected workspace(s) or artifact(s)"
+   */
+  @DefaultStringValue("Deletes the currently selected workspace(s) or artifact(s)")
+  @Key("repo_Delete")
+  String repo_Delete();
+
+  /**
+   * Translated "Display related help topic on www.mulesoft.org".
+   *
+   * @return translated "Display related help topic on www.mulesoft.org"
+   */
+  @DefaultStringValue("Display related help topic on www.mulesoft.org")
+  @Key("repo_HelpLink")
+  String repo_HelpLink();
+
+  /**
+   * Translated "View and edit the name, metadata, and comments for the current workspace or item".
+   *
+   * @return translated "View and edit the name, metadata, and comments for the current workspace or item"
+   */
+  @DefaultStringValue("View and edit the name, metadata, and comments for the current workspace or item")
+  @Key("repo_Info_TabTip")
+  String repo_Info_TabTip();
+
+  /**
+   * Translated "Adds a new item to the repository".
+   *
+   * @return translated "Adds a new item to the repository"
+   */
+  @DefaultStringValue("Adds a new item to the repository")
+  @Key("repo_Items_New")
+  String repo_Items_New();
+
+  /**
+   * Translated "Add, view, and delete items in the repository".
+   *
+   * @return translated "Add, view, and delete items in the repository"
+   */
+  @DefaultStringValue("Add, view, and delete items in the repository")
+  @Key("repo_Items_TabTip")
+  String repo_Items_TabTip();
+
+  /**
+   * Translated "Adds a new artifact (file) to the current workspace".
+   *
+   * @return translated "Adds a new artifact (file) to the current workspace"
+   */
+  @DefaultStringValue("Adds a new artifact (file) to the current workspace")
+  @Key("repo_NewArtifact")
+  String repo_NewArtifact();
+
+  /**
+   * Translated "Adds a new workspace under the current workspace".
+   *
+   * @return translated "Adds a new workspace under the current workspace"
+   */
+  @DefaultStringValue("Adds a new workspace under the current workspace")
+  @Key("repo_NewWorkspace")
+  String repo_NewWorkspace();
+
+  /**
+   * Translated "Apply policies to the different lifecycle phases for the current workspace or item".
+   *
+   * @return translated "Apply policies to the different lifecycle phases for the current workspace or item"
+   */
+  @DefaultStringValue("Apply policies to the different lifecycle phases for the current workspace or item")
+  @Key("repo_Policies_TabTip")
+  String repo_Policies_TabTip();
+
+  /**
+   * Translated "Specify the type of access each role has to the current workspace or item".
+   *
+   * @return translated "Specify the type of access each role has to the current workspace or item"
+   */
+  @DefaultStringValue("Specify the type of access each role has to the current workspace or item")
+  @Key("repo_Security_TabTip")
+  String repo_Security_TabTip();
+
+  /**
+   * Translated "For each role, specify how users with that role can access this artifact or workspace. In the row for the role whose permissions you want to change, select whether you want to grant or revoke the right to read, modify, or delete the item, or to manage policies for the item.".
+   *
+   * @return translated "For each role, specify how users with that role can access this artifact or workspace. In the row for the role whose permissions you want to change, select whether you want to grant or revoke the right to read, modify, or delete the item, or to manage policies for the item."
+   */
+  @DefaultStringValue("For each role, specify how users with that role can access this artifact or workspace. In the row for the role whose permissions you want to change, select whether you want to grant or revoke the right to read, modify, or delete the item, or to manage policies for the item.")
+  @Key("repo_Security_Tip")
+  String repo_Security_Tip();
+
+  /**
+   * Translated "Manage your repository of applications, servers, and server groups".
+   *
+   * @return translated "Manage your repository of applications, servers, and server groups"
+   */
+  @DefaultStringValue("Manage your repository of applications, servers, and server groups")
+  @Key("repo_TabTip")
+  String repo_TabTip();
+
+  /**
+   * Translated "The repository stores applications and other objects as <i>artifacts</i>. Artifacts are organized into <i>workspaces</i>, such as the Applications workspace where your applications are stored by default. You can search or browse the repository, view the details of your artifacts, and add metadata and comments about them.".
+   *
+   * @return translated "The repository stores applications and other objects as <i>artifacts</i>. Artifacts are organized into <i>workspaces</i>, such as the Applications workspace where your applications are stored by default. You can search or browse the repository, view the details of your artifacts, and add metadata and comments about them."
+   */
+  @DefaultStringValue("The repository stores applications and other objects as <i>artifacts</i>. Artifacts are organized into <i>workspaces</i>, such as the Applications workspace where your applications are stored by default. You can search or browse the repository, view the details of your artifacts, and add metadata and comments about them.")
+  @Key("repo_Tip")
+  String repo_Tip();
+}

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryMessages.java (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/ui/RepositoryMessages.java) (0 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryMessages.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryMessages.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,4 @@
+package org.mule.galaxy.repository.client;
+
+public interface RepositoryMessages extends com.google.gwt.i18n.client.Messages {
+}

Added: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java (0 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,125 @@
+package org.mule.galaxy.repository.client;
+
+import org.mule.galaxy.repository.client.activity.ActivityPanel;
+import org.mule.galaxy.repository.client.admin.LifecycleForm;
+import org.mule.galaxy.repository.client.admin.LifecycleListPanel;
+import org.mule.galaxy.repository.client.admin.PolicyPanel;
+import org.mule.galaxy.repository.client.admin.PropertyDescriptorForm;
+import org.mule.galaxy.repository.client.admin.PropertyDescriptorListPanel;
+import org.mule.galaxy.repository.client.admin.TypeForm;
+import org.mule.galaxy.repository.client.admin.TypeListPanel;
+import org.mule.galaxy.repository.client.item.RepositoryMenuPanel;
+import org.mule.galaxy.repository.client.property.PropertyInterfaceManager;
+import org.mule.galaxy.repository.rpc.RegistryService;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.web.client.Galaxy;
+import org.mule.galaxy.web.client.GalaxyModule;
+import org.mule.galaxy.web.client.NavMenuItem;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.ServiceDefTarget;
+
+public class RepositoryModule implements GalaxyModule {
+    private Galaxy galaxy;
+    private PropertyInterfaceManager propertyInterfaceManager = new PropertyInterfaceManager();
+    private RepositoryConstants repositoryConstants;
+    private RegistryServiceAsync registryService;
+    private int repositoryTabIndex;
+    private boolean showTypeSystem = true;
+    
+    public void initialize(Galaxy galaxy) {
+        this.galaxy = galaxy;
+        this.repositoryConstants = (RepositoryConstants) GWT.create(RepositoryConstants.class);
+
+        createService();
+    }
+
+    protected void addAdministrationMenuItems() {
+
+        AdministrationPanel adminPanel = galaxy.getAministrationPanel();
+        if (galaxy.hasPermission("VIEW_ACTIVITY")) {
+            adminPanel.addUtilityMenuItem(new NavMenuItem("Activity",
+                                                          "ActivityPanel",
+                                                          new ActivityPanel(adminPanel, galaxy, registryService),
+                                                          null));
+        }
+        
+        if (galaxy.hasPermission("MANAGE_LIFECYCLES")) {
+            NavMenuItem item = new NavMenuItem("Lifecycles",
+                                               "lifecycles",
+                                               new LifecycleListPanel(adminPanel, registryService),
+                                               new LifecycleForm(adminPanel, registryService));
+            adminPanel.addManageMenuItem(item);
+        }
+        
+        if (isShowTypeSystem()) {
+            if (galaxy.hasPermission("MANAGE_POLICIES")) {
+                NavMenuItem item = new NavMenuItem("Policies", "policies", new PolicyPanel(adminPanel, galaxy, registryService), null);
+                adminPanel.addManageMenuItem(item);
+            }
+
+            if (galaxy.hasPermission("MANAGE_PROPERTIES")) {
+                NavMenuItem item = new NavMenuItem("Properties",
+                        "properties",
+                        new PropertyDescriptorListPanel(adminPanel, registryService),
+                        new PropertyDescriptorForm(adminPanel, this));
+                adminPanel.addManageMenuItem(item);
+            }
+
+            if (galaxy.hasPermission("MANAGE_PROPERTIES")) {
+                NavMenuItem item = new NavMenuItem("Types",
+                        "types",
+                        new TypeListPanel(adminPanel, registryService),
+                        new TypeForm(adminPanel, this));
+                adminPanel.addManageMenuItem(item);
+            }
+        }
+    }
+    
+    protected RepositoryMenuPanel createRepositoryPanels() {
+        return new RepositoryMenuPanel(this);
+    }
+
+    public int getRepositoryTab() {
+        return repositoryTabIndex;
+    }
+
+    protected void loadRepositoryTab() {
+        repositoryTabIndex = galaxy.getPageManager().createTab("Repository", "item", repositoryConstants.repo_TabTip());
+        createRepositoryPanels();
+    }
+
+    private void createService() {
+        this.registryService = (RegistryServiceAsync) GWT.create(RegistryService.class);
+        ServiceDefTarget target = (ServiceDefTarget) registryService;
+        String baseUrl = GWT.getModuleBaseURL();
+        target.setServiceEntryPoint(baseUrl + "../handler/registry.rpc");
+    }
+
+    public Galaxy getGalaxy() {
+        return galaxy;
+    }
+
+    public PropertyInterfaceManager getPropertyInterfaceManager() {
+        return propertyInterfaceManager;
+    }
+
+    public RepositoryConstants getRepositoryConstants() {
+        return repositoryConstants;
+    }
+
+    public RegistryServiceAsync getRegistryService() {
+        return registryService;
+    }
+
+    public boolean isShowTypeSystem() {
+        return showTypeSystem;
+    }
+
+    public void setShowTypeSystem(boolean showTypeSystem) {
+        this.showTypeSystem = showTypeSystem;
+    }
+    
+
+}
Property changes on: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/activity) ( => )

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity/ActivityPanel.java
===================================================================
--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/activity/ActivityPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity/ActivityPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,14 +16,19 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.activity;
+package org.mule.galaxy.repository.client.activity;
 
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+
+import org.mule.galaxy.repository.client.util.ItemPathOracle;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
 import org.mule.galaxy.web.client.AbstractFlowComposite;
 import org.mule.galaxy.web.client.ErrorPanel;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.ui.help.InlineHelpPanel;
 import org.mule.galaxy.web.client.util.InlineFlowPanel;
-import org.mule.galaxy.web.client.util.ItemPathOracle;
 import org.mule.galaxy.web.rpc.AbstractCallback;
 import org.mule.galaxy.web.rpc.WActivity;
 import org.mule.galaxy.web.rpc.WUser;
@@ -48,10 +53,6 @@
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.SuggestBox;
 
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-
 public class ActivityPanel extends AbstractFlowComposite {
 
     private ListBox userLB;
@@ -67,11 +68,13 @@
     private DateField startDate;
     private DateField endDate;
     private final ErrorPanel errorPanel;
+    private final RegistryServiceAsync service;
 
-    public ActivityPanel(ErrorPanel errorPanel, final Galaxy galaxy) {
+    public ActivityPanel(ErrorPanel errorPanel, final Galaxy galaxy, RegistryServiceAsync service) {
         super();
         this.errorPanel = errorPanel;
         this.galaxy = galaxy;
+        this.service = service;
     }
 
     public void initialize() {
@@ -136,7 +139,7 @@
         searchTable.setWidget(0, 5, textTB);
 
         searchTable.setWidget(1, 4, new Label("Relating to:"));
-        itemSB = new SuggestBox(new ItemPathOracle(galaxy, errorPanel));
+        itemSB = new SuggestBox(new ItemPathOracle(service, errorPanel));
         itemSB.setStyleName("x-form-text");
         itemSB.setText("[All Items]");
         searchTable.setWidget(1, 5, itemSB);
@@ -220,36 +223,17 @@
         Date toDate = endDate.getValue();
 
         if(fromDate != null && endDate != null) {
-            galaxy.getRegistryService().getActivities(fromDate, toDate, user,
-                    itemSB.getText(),
-                    textTB.getValue(),
-                    eventType, resultStart, maxResults,
-                    ascending, callback);
+            service.getActivities(fromDate, toDate, user,
+                                  itemSB.getText(),
+                                  textTB.getValue(),
+                                  eventType, resultStart, maxResults,
+                                  ascending, callback);
 
         }
 
 
     }
 
-    private Date parseDate(String s) throws DateParseException {
-        if (s.length() != 10 || s.charAt(4) != '-' || s.charAt(7) != '-') {
-            throw new DateParseException();
-        }
-
-        String yearStr = s.substring(0, 4);
-        String monthStr = s.substring(5, 7);
-        String dayStr = s.substring(8, 10);
-
-        try {
-            int year = new Integer(yearStr).intValue();
-            int month = new Integer(monthStr).intValue();
-            int day = new Integer(dayStr).intValue();
-            return new Date(year - 1900, month - 1, day);
-        } catch (NumberFormatException e) {
-            throw new DateParseException();
-        }
-    }
-
     protected void loadResults(Collection o) {
         resultsPanel.clear();

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity/DateParseException.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/activity/DateParseException.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity/DateParseException.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.activity;
+package org.mule.galaxy.repository.client.activity;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin) ( => )

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/InnerPropertyDescriptorForm.java
===================================================================
--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/InnerPropertyDescriptorForm.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/InnerPropertyDescriptorForm.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,12 +16,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
+import org.mule.galaxy.repository.client.property.PropertyInterfaceManager;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.rpc.WExtensionInfo;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
 
 import com.extjs.gxt.ui.client.widget.form.TextField;
 import com.google.gwt.event.dom.client.ChangeEvent;
@@ -47,10 +48,13 @@
     private ListBox typeLB;
     private HashMap<String, TextField<String>> fields;
     private Galaxy galaxy;
+    private PropertyInterfaceManager propertyManager;
 
     public void initialize(Galaxy galaxy,
+                           PropertyInterfaceManager propertyManager,
                            WPropertyDescriptor pd,
                            final FlexTable table) {
+        this.propertyManager = propertyManager;
         this.property = pd;
         this.galaxy = galaxy;
         table.setText(0, 0, "Name:");
@@ -98,7 +102,7 @@
             WExtensionInfo e = (WExtensionInfo) itr.next();
 
             // Only show properties which we have edit renderers for
-            if (galaxy.getPropertyInterfaceManager().isExtensionEditable(e.getId())) {
+            if (propertyManager.isExtensionEditable(e.getId())) {
                 typeLB.addItem(e.getDescription(), e.getId());
 
                 if (e.getId().equals(property.getExtension())) {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/LifecycleForm.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/LifecycleForm.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/LifecycleForm.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,16 +16,21 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WLifecycle;
+import org.mule.galaxy.repository.rpc.WPhase;
 import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Galaxy;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationForm;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
 import org.mule.galaxy.web.client.ui.help.InlineHelpPanel;
 import org.mule.galaxy.web.client.util.LightBox;
 import org.mule.galaxy.web.client.validation.StringNotEmptyValidator;
 import org.mule.galaxy.web.client.validation.ui.ValidatableTextBox;
-import org.mule.galaxy.web.rpc.WLifecycle;
-import org.mule.galaxy.web.rpc.WPhase;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
 import com.extjs.gxt.ui.client.event.Listener;
@@ -47,10 +52,7 @@
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.Widget;
 
-import java.util.ArrayList;
-import java.util.Iterator;
 
-
 public class LifecycleForm extends AbstractAdministrationForm {
 
     private WLifecycle lifecycle;
@@ -65,16 +67,18 @@
     private CheckBox defaultLifecycleCB;
     private static Button ok;
     private static Button cancel;
+    private final RegistryServiceAsync registryService;
 
-    public LifecycleForm(AdministrationPanel adminPanel) {
+    public LifecycleForm(AdministrationPanel adminPanel, RegistryServiceAsync registryService) {
         super(adminPanel, "lifecycles", "Lifecycle was saved.", "Lifecycle was deleted.",
                 "A lifecycle with that name already exists");
+        this.registryService = registryService;
 
         panel.setStyleName("lifecycle-form-base");
     }
 
     protected void fetchItem(String id) {
-        adminPanel.getRegistryService().getLifecycle(id, getFetchCallback());
+        registryService.getLifecycle(id, getFetchCallback());
     }
 
     protected void initializeItem(Object o) {
@@ -346,7 +350,7 @@
         lifecycle.setName(nameTB.getValue());
         lifecycle.setInitialPhase(initialPhase);
 
-        adminPanel.getRegistryService().saveLifecycle(lifecycle, getSaveCallback());
+        registryService.saveLifecycle(lifecycle, getSaveCallback());
     }
 
     protected void delete() {
@@ -356,7 +360,7 @@
 
                 if (Dialog.YES.equals(btn.getItemId())) {
                     LifecycleForm.super.delete();
-                    adminPanel.getRegistryService().deleteLifecycle(lifecycle.getId(), getDeleteCallback());
+                    registryService.deleteLifecycle(lifecycle.getId(), getDeleteCallback());
                 }
             }
         };

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/LifecycleListPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/LifecycleListPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/LifecycleListPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,14 +16,20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WLifecycle;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationComposite;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
+import org.mule.galaxy.web.client.ui.help.InlineHelpPanel;
+import org.mule.galaxy.web.client.util.FauxLinkRenderer;
 import org.mule.galaxy.web.client.util.ListCellRenderer;
-import org.mule.galaxy.web.client.util.FauxLinkRenderer;
-import org.mule.galaxy.web.client.ui.help.InlineHelpPanel;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.WLifecycle;
-import org.mule.galaxy.web.rpc.WUser;
 
 import com.extjs.gxt.ui.client.data.BeanModel;
 import com.extjs.gxt.ui.client.data.BeanModelFactory;
@@ -44,21 +50,20 @@
 import com.extjs.gxt.ui.client.widget.toolbar.ToolBar;
 import com.google.gwt.user.client.History;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 public class LifecycleListPanel extends AbstractAdministrationComposite {
 
-    public LifecycleListPanel(AdministrationPanel a) {
+    private final RegistryServiceAsync registryService;
+
+    public LifecycleListPanel(AdministrationPanel a, RegistryServiceAsync registryService) {
         super(a);
+        this.registryService = registryService;
     }
 
     @Override
     public void doShowPage() {
         super.doShowPage();
 
-        adminPanel.getRegistryService().getLifecycles(new AbstractCallback<Collection<WLifecycle>>(adminPanel) {
+        registryService.getLifecycles(new AbstractCallback<Collection<WLifecycle>>(adminPanel) {
 
             public void onSuccess(Collection<WLifecycle> lifecycles) {
                 showLifecycles(lifecycles);

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PolicyPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/PolicyPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PolicyPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,25 +16,25 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.mule.galaxy.repository.client.item.PolicyResultsPanel;
+import org.mule.galaxy.repository.client.util.LifecycleSelectionPanel;
+import org.mule.galaxy.repository.client.util.PolicySelectionPanel;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WPolicyException;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.client.ErrorPanel;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.PageInfo;
-import org.mule.galaxy.web.client.item.PolicyResultsPanel;
 import org.mule.galaxy.web.client.ui.help.InlineHelpPanel;
 import org.mule.galaxy.web.client.util.InlineFlowPanel;
-import org.mule.galaxy.web.client.util.LifecycleSelectionPanel;
-import org.mule.galaxy.web.client.util.PolicySelectionPanel;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WPolicyException;
 
 import com.extjs.gxt.ui.client.event.ButtonEvent;
 import com.extjs.gxt.ui.client.event.SelectionListener;
@@ -64,16 +64,16 @@
     private String workspaceId;
     private final Galaxy galaxy;
 
-    public PolicyPanel(ErrorPanel adminPanel, Galaxy galaxy) {
-        this(adminPanel, galaxy, null);
+    public PolicyPanel(ErrorPanel adminPanel, Galaxy galaxy, RegistryServiceAsync registryService) {
+        this(adminPanel, galaxy, registryService, null);
     }
 
-    public PolicyPanel(ErrorPanel adminPanel, Galaxy galaxy, String workspaceId) {
+    public PolicyPanel(ErrorPanel adminPanel, Galaxy galaxy, RegistryServiceAsync registryService, String workspaceId) {
         super();
         this.menuPanel = adminPanel;
         this.galaxy = galaxy;
         this.workspaceId = workspaceId;
-        this.svc = galaxy.getRegistryService();
+        this.svc = registryService;
 
         panel = new InlineFlowPanel();

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PropertyDescriptorForm.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/PropertyDescriptorForm.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PropertyDescriptorForm.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,10 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationForm;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
 
 import com.extjs.gxt.ui.client.event.Listener;
 import com.extjs.gxt.ui.client.event.MessageBoxEvent;
@@ -32,19 +34,22 @@
 
     private WPropertyDescriptor property;
     private InnerPropertyDescriptorForm innerForm;
+    private final RepositoryModule repositoryModule;
 
-    public PropertyDescriptorForm(AdministrationPanel adminPanel){
+    public PropertyDescriptorForm(AdministrationPanel adminPanel, 
+                                  RepositoryModule repositoryModule){
         super(adminPanel, "properties", "Property was saved.", "Property was deleted.",
               "A property with that name already exists.");
+        this.repositoryModule = repositoryModule;
     }
 
     protected void addFields(final FlexTable table) {
         this.innerForm = new InnerPropertyDescriptorForm();
-        innerForm.initialize(galaxy, property, table);
+        innerForm.initialize(galaxy, repositoryModule.getPropertyInterfaceManager(), property, table);
     }
 
     protected void fetchItem(String id) {
-        adminPanel.getRegistryService().getPropertyDescriptor(id, getFetchCallback());
+        repositoryModule.getRegistryService().getPropertyDescriptor(id, getFetchCallback());
     }
 
     public String getTitle() {
@@ -71,7 +76,7 @@
 
         property = innerForm.getPropertyDescriptor();
 
-        galaxy.getRegistryService().savePropertyDescriptor(property, getSaveCallback());
+        repositoryModule.getRegistryService().savePropertyDescriptor(property, getSaveCallback());
     }
 
     protected void delete() {
@@ -82,8 +87,7 @@
 
             if (Dialog.YES.equals(btn.getItemId())) {
               PropertyDescriptorForm.super.delete();
-              RegistryServiceAsync svc = adminPanel.getRegistryService();
-              svc.deletePropertyDescriptor(property.getId(), getDeleteCallback());
+              repositoryModule.getRegistryService().deletePropertyDescriptor(property.getId(), getDeleteCallback());
             }
           }
         };

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PropertyDescriptorListPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/PropertyDescriptorListPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PropertyDescriptorListPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,12 +16,18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
-import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
 import org.mule.galaxy.web.client.WidgetHelper;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationComposite;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
 import org.mule.galaxy.web.client.ui.help.InlineHelpPanel;
+import org.mule.galaxy.web.rpc.AbstractCallback;
 
 import com.extjs.gxt.ui.client.data.BeanModel;
 import com.extjs.gxt.ui.client.data.BeanModelFactory;
@@ -33,7 +39,6 @@
 import com.extjs.gxt.ui.client.store.ListStore;
 import com.extjs.gxt.ui.client.store.Store;
 import com.extjs.gxt.ui.client.widget.ContentPanel;
-import com.extjs.gxt.ui.client.widget.layout.FitLayout;
 import com.extjs.gxt.ui.client.widget.form.StoreFilterField;
 import com.extjs.gxt.ui.client.widget.grid.ColumnConfig;
 import com.extjs.gxt.ui.client.widget.grid.ColumnData;
@@ -41,25 +46,24 @@
 import com.extjs.gxt.ui.client.widget.grid.Grid;
 import com.extjs.gxt.ui.client.widget.grid.GridCellRenderer;
 import com.extjs.gxt.ui.client.widget.grid.RowNumberer;
-import com.extjs.gxt.ui.client.widget.grid.BufferView;
 import com.extjs.gxt.ui.client.widget.toolbar.FillToolItem;
 import com.extjs.gxt.ui.client.widget.toolbar.ToolBar;
 import com.google.gwt.user.client.History;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class PropertyDescriptorListPanel
         extends AbstractAdministrationComposite {
-    public PropertyDescriptorListPanel(AdministrationPanel a) {
+    private final RegistryServiceAsync registryService;
+
+    public PropertyDescriptorListPanel(AdministrationPanel a, RegistryServiceAsync registryService) {
         super(a);
+        this.registryService = registryService;
     }
 
     @Override
     public void doShowPage() {
         super.doShowPage();
 
-        adminPanel.getRegistryService().getPropertyDescriptors(false, new AbstractCallback<List<WPropertyDescriptor>>(adminPanel) {
+        registryService.getPropertyDescriptors(false, new AbstractCallback<List<WPropertyDescriptor>>(adminPanel) {
 
             public void onSuccess(List<WPropertyDescriptor> result) {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/TypeForm.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/TypeForm.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/TypeForm.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,19 +16,22 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.client.util.PropertyDescriptorComparator;
+import org.mule.galaxy.repository.client.util.StylizedSortableGrid;
+import org.mule.galaxy.repository.client.util.WTypeComparator;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
+import org.mule.galaxy.repository.rpc.WType;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationForm;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
 import org.mule.galaxy.web.client.util.InlineFlowPanel;
 import org.mule.galaxy.web.client.util.LightBox;
-import org.mule.galaxy.web.client.util.PropertyDescriptorComparator;
-import org.mule.galaxy.web.client.util.StylizedSortableGrid;
-import org.mule.galaxy.web.client.util.WTypeComparator;
 import org.mule.galaxy.web.client.validation.StringNotEmptyValidator;
 import org.mule.galaxy.web.client.validation.ui.ValidatableTextBox;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
-import org.mule.galaxy.web.rpc.WType;
 
 import com.extjs.gxt.ui.client.event.Listener;
 import com.extjs.gxt.ui.client.event.MessageBoxEvent;
@@ -66,10 +69,14 @@
     private List<WPropertyDescriptor> globalProperties;
     private SortableGrid propertiesTable;
     private InnerPropertyDescriptorForm innerForm;
+    private final RegistryServiceAsync registryService;
+    private final RepositoryModule repositoryModule;
 
-    public TypeForm(AdministrationPanel adminPanel) {
+    public TypeForm(AdministrationPanel adminPanel, RepositoryModule repositoryModule) {
         super(adminPanel, "types", "Type was saved.", "Type was deleted.",
                 "A type with that name already exists.");
+        this.repositoryModule = repositoryModule;
+        this.registryService = repositoryModule.getRegistryService();
     }
 
     protected void addFields(final FlexTable table) {
@@ -203,7 +210,7 @@
         FlexTable table = new FlexTable();
         container.add(table);
         this.innerForm = new InnerPropertyDescriptorForm();
-        innerForm.initialize(galaxy, p, table);
+        innerForm.initialize(galaxy, repositoryModule.getPropertyInterfaceManager(), p, table);
 
         Button cancel = new Button("Cancel");
         cancel.addClickHandler(new ClickHandler() {
@@ -253,7 +260,7 @@
     }
 
     protected void fetchItem(String id) {
-        adminPanel.getRegistryService().getType(id, getFetchCallback());
+        registryService.getType(id, getFetchCallback());
     }
 
     protected void initializeProperties(List<WPropertyDescriptor> pds) {
@@ -379,7 +386,7 @@
     }
 
     protected void intializeTypesAndProperties() {
-        adminPanel.getRegistryService().getTypes(new AbstractCallback<List<WType>>(errorPanel) {
+        registryService.getTypes(new AbstractCallback<List<WType>>(errorPanel) {
             public void onSuccess(List<WType> types) {
                 initializeTypes(types);
             }
@@ -391,7 +398,7 @@
             }
         });
 
-        adminPanel.getRegistryService().getPropertyDescriptors(false, new AbstractCallback(errorPanel) {
+        registryService.getPropertyDescriptors(false, new AbstractCallback(errorPanel) {
             public void onSuccess(Object pds) {
                 initializeProperties((List<WPropertyDescriptor>) pds);
             }
@@ -410,7 +417,7 @@
             return;
         }
 
-        RegistryServiceAsync svc = adminPanel.getRegistryService();
+        RegistryServiceAsync svc = registryService;
 
         type.setName(nameTB.getTextBox().getText());
         type.setAllowedChildrenIds(new ArrayList<String>());
@@ -444,8 +451,7 @@
 
                 if (Dialog.YES.equals(btn.getItemId())) {
                     TypeForm.super.delete();
-                    RegistryServiceAsync svc = adminPanel.getRegistryService();
-                    svc.deletePropertyDescriptor(type.getId(), getDeleteCallback());
+                    registryService.deletePropertyDescriptor(type.getId(), getDeleteCallback());
                 }
             }
         };

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/TypeListPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/TypeListPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/TypeListPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,11 +16,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WType;
 import org.mule.galaxy.web.client.WidgetHelper;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationComposite;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.WType;
 
 import com.extjs.gxt.ui.client.data.BeanModel;
 import com.extjs.gxt.ui.client.data.BeanModelFactory;
@@ -44,22 +50,21 @@
 import com.extjs.gxt.ui.client.widget.toolbar.ToolBar;
 import com.google.gwt.user.client.History;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class TypeListPanel
         extends AbstractAdministrationComposite {
     protected List<WType> types;
+    private final RegistryServiceAsync registryService;
 
-    public TypeListPanel(AdministrationPanel a) {
+    public TypeListPanel(AdministrationPanel a, RegistryServiceAsync registryService) {
         super(a);
+        this.registryService = registryService;
     }
 
     @Override
     public void doShowPage() {
         super.doShowPage();
 
-        adminPanel.getRegistryService().getTypes(new AbstractCallback<List<WType>>(adminPanel) {
+        registryService.getTypes(new AbstractCallback<List<WType>>(adminPanel) {
 
             public void onSuccess(List<WType> types) {
                 TypeListPanel.this.types = types;

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/registry) ( => )

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/AbstractBrowsePanel.java
===================================================================
--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/registry/AbstractBrowsePanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/AbstractBrowsePanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,19 +16,20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.registry;
+package org.mule.galaxy.repository.client.browse;
 
-import com.google.gwt.user.client.ui.Widget;
-
 import java.util.List;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WSearchResults;
 import org.mule.galaxy.web.client.AbstractWithTopComposite;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.util.Toolbox;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WSearchResults;
 
+import com.google.gwt.user.client.ui.Widget;
+
 /**
  * The basis for any form that lists out groups of artifacts.
  */
@@ -39,10 +40,12 @@
     protected final Galaxy galaxy;
     private boolean first = true;
     protected int resultStart;
+    private final RepositoryModule repository;
 
-    public AbstractBrowsePanel(Galaxy galaxy) {
-        this.galaxy = galaxy;
-        this.service = galaxy.getRegistryService();
+    public AbstractBrowsePanel(RepositoryModule repository) {
+        this.repository = repository;
+        this.galaxy = repository.getGalaxy();
+        this.service = repository.getRegistryService();
 
         Widget main = getMainPanel();
 
@@ -67,7 +70,7 @@
         }
 
         if (first) {
-            artifactListPanel = new ArtifactListPanel(this, galaxy);
+            artifactListPanel = new ArtifactListPanel(this, repository);
         }
 
         artifactListPanel.setResultStart(resultStart);

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/ArtifactListPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/registry/ArtifactListPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/ArtifactListPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.registry;
+package org.mule.galaxy.repository.client.browse;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,12 +24,13 @@
 import java.util.List;
 import java.util.Map;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.WSearchResults;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.util.InlineFlowPanel;
 import org.mule.galaxy.web.client.util.TooltipListener;
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.WSearchResults;
 
 import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.Window;
@@ -64,10 +65,12 @@
     private Hyperlink cancelLink;
     private Hyperlink editAll;
     private Map<CheckBox, String> CBCollection;
+    private RepositoryModule repository;
     
-    public ArtifactListPanel(AbstractBrowsePanel browsePanel, Galaxy galaxy) {
+    public ArtifactListPanel(AbstractBrowsePanel browsePanel, RepositoryModule repository) {
         super();
-        this.galaxy = galaxy;
+        this.galaxy = repository.getGalaxy();
+        this.repository = repository;
         this.browsePanel = browsePanel;
 
         panel = new FlowPanel();
@@ -293,13 +296,13 @@
 
             // edit only what the user selectes via the checkboxes
         } else if (sender == editSelected) {
-            galaxy.getPageManager().createPageInfo("bulk-edit", new BulkEditPanel(getSelectedArtifacts(), galaxy), 0);
+            galaxy.getPageManager().createPageInfo("bulk-edit", new BulkEditPanel(getSelectedArtifacts(), repository), 0);
             History.newItem("bulk-edit");
 
             // edit the entire result set
             setEditable(false);
         } else if (sender == editAll) {
-            galaxy.getPageManager().createPageInfo("bulk-edit", new BulkEditPanel(searchResults.getQuery(), searchResults.getTotal(), galaxy), 0);
+            galaxy.getPageManager().createPageInfo("bulk-edit", new BulkEditPanel(searchResults.getQuery(), searchResults.getTotal(), repository), 0);
             History.newItem("bulk-edit");
 
             // toggle edit mode

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/BulkEditPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/registry/BulkEditPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/BulkEditPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.registry;
+package org.mule.galaxy.repository.client.browse;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -26,16 +26,17 @@
 import java.util.List;
 import java.util.Map;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.client.admin.PolicyPanel;
+import org.mule.galaxy.repository.client.property.AbstractPropertyRenderer;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WPolicyException;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
 import org.mule.galaxy.web.client.AbstractErrorShowingComposite;
 import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.admin.PolicyPanel;
-import org.mule.galaxy.web.client.property.AbstractPropertyRenderer;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
 import org.mule.galaxy.web.rpc.SecurityService;
 import org.mule.galaxy.web.rpc.WPermission;
-import org.mule.galaxy.web.rpc.WPolicyException;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.History;
@@ -89,22 +90,26 @@
 
     private Collection<String> entryIds;
 
-    private Repository repository;
+    private final Galaxy galaxy;
 
-    public BulkEditPanel(Collection<String> entryIds, Repository repository) {
+    private final RepositoryModule repositoryModule;
+
+
+    public BulkEditPanel(Collection<String> entryIds, RepositoryModule repository) {
         this(entryIds.size(), repository);
         this.entryIds = entryIds;
     }
     
-    public BulkEditPanel(String query, long resultCount, Repository repository) {
+    public BulkEditPanel(String query, long resultCount, RepositoryModule repository) {
         this(resultCount, repository);
         this.query = query;
     }
     
-    public BulkEditPanel(long resultCount, Repository repository) {
+    public BulkEditPanel(long resultCount, RepositoryModule repository) {
         this.resultCount = resultCount;
-        this.repository = repository;
-        this.service = repository.getGalaxy().getRegistryService();
+        this.repositoryModule = repository;
+        this.galaxy = repository.getGalaxy();
+        this.service = repository.getRegistryService();
         this.permissions = new ArrayList();
         this.groups = new HashMap();
 
@@ -233,9 +238,9 @@
         propertyDescriptor = getPropertyDescriptor(txt);
 
         renderer = 
-            repository.getPropertyInterfaceManager().createRenderer(propertyDescriptor.getExtension(), 
+            repositoryModule.getPropertyInterfaceManager().createRenderer(propertyDescriptor.getExtension(), 
                                                                     propertyDescriptor.isMultiValued());
-        renderer.initialize(repository.getGalaxy(), this, null, true);
+        renderer.initialize(repositoryModule, this, null, true);
         
         table.setWidget(0, 4, renderer.createEditForm());
     }
@@ -295,7 +300,7 @@
 
     // RPC call to get list of available permissions
     private void fetchPermissions() {
-        repository.getGalaxy().getSecurityService().getPermissions(SecurityService.ITEM_PERMISSIONS, new AbstractCallback(this) {
+        galaxy.getSecurityService().getPermissions(SecurityService.ITEM_PERMISSIONS, new AbstractCallback(this) {
             public void onFailure(Throwable caught) {
                 super.onFailure(caught);
             }
@@ -315,7 +320,7 @@
 
     //RPC call to get list of available groups
     private void fetchGroups() {
-        repository.getGalaxy().getSecurityService().getGroupPermissions(new AbstractCallback(this) {
+        galaxy.getSecurityService().getGroupPermissions(new AbstractCallback(this) {
 
             public void onFailure(Throwable caught) {
                 super.onFailure(caught);
@@ -402,7 +407,7 @@
                 if (caught instanceof WPolicyException) {
                     WPolicyException pe = (WPolicyException) caught;
 
-                    PolicyPanel.handlePolicyFailure(repository.getGalaxy(), pe);
+                    PolicyPanel.handlePolicyFailure(galaxy, pe);
                 } else {
                     super.onFailure(caught);
                 }
@@ -413,11 +418,10 @@
             }
         };
         
-        RegistryServiceAsync svc = repository.getGalaxy().getRegistryService();
         if (entryIds != null) {
-            svc.setProperty(entryIds, propertyDescriptor.getName(), (Serializable)value, callback);
+            service.setProperty(entryIds, propertyDescriptor.getName(), (Serializable)value, callback);
         } else {
-            svc.setPropertyForQuery(query, propertyDescriptor.getName(), (Serializable)value, callback);
+            service.setPropertyForQuery(query, propertyDescriptor.getName(), (Serializable)value, callback);
         }
     }
 
@@ -439,7 +443,7 @@
                 if (caught instanceof WPolicyException) {
                     WPolicyException pe = (WPolicyException) caught;
 
-                    PolicyPanel.handlePolicyFailure(repository.getGalaxy(), pe);
+                    PolicyPanel.handlePolicyFailure(galaxy, pe);
                 } else {
                     super.onFailure(caught);
                 }

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/PolicyResultsPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/registry/PolicyResultsPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/PolicyResultsPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.registry;
+package org.mule.galaxy.repository.client.browse;
 
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Label;

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item) ( => )

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddArtifactForm.java
===================================================================
--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/AddArtifactForm.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddArtifactForm.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,17 +1,17 @@
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.mule.galaxy.web.client.Galaxy;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WType;
 import org.mule.galaxy.web.client.util.AbstractErrorHandlingPopup;
 import org.mule.galaxy.web.rpc.AbstractCallback;
 import org.mule.galaxy.web.rpc.ItemExistsException;
-import org.mule.galaxy.web.rpc.ItemInfo;
 import org.mule.galaxy.web.rpc.ItemNotFoundException;
-import org.mule.galaxy.web.rpc.WType;
 
 import com.extjs.gxt.ui.client.event.ButtonEvent;
 import com.extjs.gxt.ui.client.event.Events;
@@ -30,7 +30,6 @@
 
     private String fileId;
     private List<WType> types;
-    private final Galaxy galaxy;
     private Button closeBtn;
     private Button submitBtn;
 
@@ -42,13 +41,14 @@
     private final boolean parentIsWorkspace;
     private FileUploadField file;
     private final ChildItemsPanel itemsPanel;
+    private final RegistryServiceAsync registryService;
 
-    public AddArtifactForm(final Galaxy galaxy,
+    public AddArtifactForm(final RegistryServiceAsync registryService,
                            ItemInfo parent,
                            boolean parentIsWorkspace, 
                            ChildItemsPanel itemsPanel) {
         super();
-        this.galaxy = galaxy;
+        this.registryService = registryService;
         this.parent = parent;
         this.parentIsWorkspace = parentIsWorkspace;
         this.itemsPanel = itemsPanel;
@@ -150,7 +150,7 @@
         fpanel.addListener(Events.Submit, new Listener<FormEvent>() {
             public void handleEvent(final FormEvent fe) {
 
-                galaxy.getRegistryService().getTypes(new AbstractCallback<List<WType>>(AddArtifactForm.this) {
+                registryService.getTypes(new AbstractCallback<List<WType>>(AddArtifactForm.this) {
                     public void onSuccess(List<WType> types) {
                         AddArtifactForm.this.submit(fe, types);
                     }
@@ -216,23 +216,19 @@
                 }
             }
 
-            galaxy.getRegistryService().addVersionedItem(parentPath,
-                                                         name,
-                                                         fversion.getRawValue(),
-                                                         null,
-                                                         artifactType.getId(),
-                                                         avType.getId(),
-                                                         new HashMap<String, Serializable>(),
-                                                         versionProperties, 
-                                                         callback);
+            registryService.addVersionedItem(parentPath,
+                                             name,
+                                             fversion.getRawValue(),
+                                             null,
+                                             artifactType.getId(),
+                                             avType.getId(),
+                                             new HashMap<String, Serializable>(),
+                                             versionProperties, 
+                                             callback);
         } else {
             String parentId = parent != null ? parent.getPath() : null;
-            galaxy.getRegistryService().addItem(parentId, 
-                                                fversion.getRawValue(), 
-                                                null, 
-                                                avType.getId(), 
-                                                versionProperties, 
-                                                callback);
+            registryService.addItem(parentId, fversion.getRawValue(), null, 
+                                    avType.getId(), versionProperties, callback);
         }
         
     }

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddItemForm.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/AddItemForm.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddItemForm.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -25,24 +25,25 @@
 import java.util.List;
 import java.util.Map;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.client.browse.PolicyResultsPanel;
+import org.mule.galaxy.repository.client.property.AbstractPropertyRenderer;
+import org.mule.galaxy.repository.client.property.ArtifactRenderer;
+import org.mule.galaxy.repository.client.property.PropertyInterfaceManager;
+import org.mule.galaxy.repository.client.util.AddItemHelper;
+import org.mule.galaxy.repository.client.util.ItemPathOracle;
+import org.mule.galaxy.repository.client.util.WTypeComparator;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
+import org.mule.galaxy.repository.rpc.WType;
 import org.mule.galaxy.web.client.AbstractFlowComposite;
 import org.mule.galaxy.web.client.ErrorPanel;
 import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.property.AbstractPropertyRenderer;
-import org.mule.galaxy.web.client.property.ArtifactRenderer;
-import org.mule.galaxy.web.client.property.PropertyInterfaceManager;
-import org.mule.galaxy.web.client.registry.PolicyResultsPanel;
 import org.mule.galaxy.web.client.ui.help.InlineHelpPanel;
-import org.mule.galaxy.web.client.util.AddItemHelper;
-import org.mule.galaxy.web.client.util.ItemPathOracle;
 import org.mule.galaxy.web.client.util.StringUtil;
 import org.mule.galaxy.web.client.util.TooltipListener;
-import org.mule.galaxy.web.client.util.WTypeComparator;
 import org.mule.galaxy.web.rpc.AbstractCallback;
 import org.mule.galaxy.web.rpc.ItemExistsException;
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
-import org.mule.galaxy.web.rpc.WType;
 
 import com.extjs.gxt.ui.client.event.BaseEvent;
 import com.extjs.gxt.ui.client.event.ComponentEvent;
@@ -110,13 +111,14 @@
     private WType selectedVersion;
     private AddItemHelper form;
     private final ErrorPanel errorPanel;
+    private RepositoryModule repositoryModule;
 
-    public AddItemForm(final Galaxy galaxy, ErrorPanel errorPanel) {
-        this.galaxy = galaxy;
-        this.errorPanel = errorPanel;
+    public AddItemForm(RepositoryMenuPanel menuPanel) {
+        this.galaxy = menuPanel.getGalaxy();
+        this.repositoryModule = menuPanel.getRepositoryModule();
+        this.errorPanel = menuPanel;
 
-
-        form = new AddItemHelper(galaxy);
+        form = new AddItemHelper(repositoryModule.getRegistryService());
         form.setAction(GWT.getModuleBaseURL() + "../artifactUpload.form");
         form.addSubmitCompleteHandler(this);
 
@@ -127,10 +129,9 @@
         cp.setStyleName("x-panel-container-full");
         cp.add(form);
 
-
         // add inline help string and widget
         cp.setTopComponent(
-                new InlineHelpPanel(galaxy.getRepositoryConstants().repo_Add_Item_Tip(), 21));
+                new InlineHelpPanel(repositoryModule.getRepositoryConstants().repo_Add_Item_Tip(), 21));
 
         panel.add(cp);
     }
@@ -144,7 +145,7 @@
     public void showPage(List<String> params) {
         if (params.size() > 0) {
             itemId = params.get(0);
-            galaxy.getRegistryService().getItemInfo(itemId, false, new AbstractCallback<ItemInfo>(errorPanel) {
+            repositoryModule.getRegistryService().getItemInfo(itemId, false, new AbstractCallback<ItemInfo>(errorPanel) {
                 public void onSuccess(ItemInfo item) {
                     AddItemForm.this.item = item;
                     finishShow();
@@ -178,7 +179,7 @@
         // note how spacing uses a clear pixel on the second column
         table.setWidget(1, 0, new Label("Parent:"));
 
-        parentSB = new SuggestBox(new ItemPathOracle(galaxy, errorPanel));
+        parentSB = new SuggestBox(new ItemPathOracle(repositoryModule.getRegistryService(), errorPanel));
         parentSB.setStyleName("x-form-text");
 
         parentSB.getTextBox().setName("workspacePath");
@@ -199,7 +200,7 @@
         nameBox.setName("name");
         table.setWidget(2, 2, nameBox);
 
-        galaxy.getRegistryService().getTypes(new AbstractCallback<List<WType>>(errorPanel) {
+        repositoryModule.getRegistryService().getTypes(new AbstractCallback<List<WType>>(errorPanel) {
             public void onSuccess(List<WType> wtypes) {
                 Collections.sort(wtypes, new WTypeComparator());
                 AddItemForm.this.types = new HashMap<String, WType>();
@@ -368,7 +369,7 @@
         for (WPropertyDescriptor pd : props) {
             table.setText(row, 0, pd.getDescription());
             AbstractPropertyRenderer renderer = factory.createRenderer(pd.getExtension(), pd.isMultiValued());
-            renderer.initialize(galaxy, errorPanel, null, false);
+            renderer.initialize(repositoryModule, errorPanel, null, false);
             typeRenderers.put(pd.getName(), renderer);
             table.setWidget(row, 2, renderer.createEditForm());
 
@@ -511,7 +512,7 @@
         Map<String, Serializable> properties = getProperties(renderers);
 
         if (isUserSubmittingVersion()) {
-            galaxy.getRegistryService().addVersionedItem(parent,
+            repositoryModule.getRegistryService().addVersionedItem(parent,
                     name,
                     versionNameBox.getValue(),
                     null,
@@ -521,7 +522,7 @@
                     getProperties(versionRenderers),
                     callback);
         } else {
-            galaxy.getRegistryService().addItem(parent,
+            repositoryModule.getRegistryService().addItem(parent,
                     name,
                     null,
                     getType().getId(),

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddWorkspaceForm.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/AddWorkspaceForm.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddWorkspaceForm.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,13 +1,17 @@
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
-import org.mule.galaxy.web.client.Galaxy;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WType;
 import org.mule.galaxy.web.client.util.AbstractErrorHandlingPopup;
 import org.mule.galaxy.web.client.validation.FieldNotEmptyValidator;
 import org.mule.galaxy.web.rpc.AbstractCallback;
 import org.mule.galaxy.web.rpc.ItemExistsException;
-import org.mule.galaxy.web.rpc.ItemInfo;
 import org.mule.galaxy.web.rpc.ItemNotFoundException;
-import org.mule.galaxy.web.rpc.WType;
 
 import com.extjs.gxt.ui.client.event.ButtonEvent;
 import com.extjs.gxt.ui.client.event.SelectionListener;
@@ -19,14 +23,10 @@
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.History;
 
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.List;
-
 public class AddWorkspaceForm extends AbstractErrorHandlingPopup {
 
     private List<WType> types;
-    private final Galaxy galaxy;
+    private final RegistryServiceAsync registryService;
     private Button closeBtn;
     private Button submitBtn;
 
@@ -35,10 +35,10 @@
     private TextField<String> fname;
     private final ItemInfo parent;
 
-    public AddWorkspaceForm(final Galaxy galaxy,
+    public AddWorkspaceForm(final RegistryServiceAsync registryService,
                             ItemInfo parent) {
         super();
-        this.galaxy = galaxy;
+        this.registryService = registryService;
         this.parent = parent;
 
         formData = new FormData("-20");
@@ -85,7 +85,7 @@
 
     protected void addWorkspace() {
         setEnabled(false);
-        galaxy.getRegistryService().getTypes(new AbstractCallback<List<WType>>(AddWorkspaceForm.this) {
+        registryService.getTypes(new AbstractCallback<List<WType>>(AddWorkspaceForm.this) {
             public void onSuccess(List<WType> types) {
                 addWorkspace(types);
             }
@@ -116,7 +116,7 @@
         };
 
         String parentId = parent != null ? parent.getPath() : null;
-        galaxy.getRegistryService().addItem(parentId,
+        registryService.addItem(parentId,
                 fname.getValue(),
                 null,
                 getTypeByName("Workspace").getId(),

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ChildItemsPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/ChildItemsPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ChildItemsPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,9 +1,11 @@
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.rpc.ItemInfo;
 import org.mule.galaxy.web.client.AbstractFlowComposite;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.WidgetHelper;
@@ -12,7 +14,6 @@
 import org.mule.galaxy.web.client.util.ToolbarButton;
 import org.mule.galaxy.web.client.util.ToolbarButtonEvent;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.ItemInfo;
 
 import com.extjs.gxt.ui.client.data.BeanModel;
 import com.extjs.gxt.ui.client.data.BeanModelFactory;
@@ -46,11 +47,12 @@
     private final Galaxy galaxy;
     private final ItemInfo info;
     private CheckBoxSelectionModel<BeanModel> selectionModel;
+    private RepositoryModule repository;
 
-
     public ChildItemsPanel(Galaxy galaxy, RepositoryMenuPanel menuPanel, ItemInfo item) {
         super();
         this.galaxy = galaxy;
+        this.repository = menuPanel.getRepositoryModule();
         this.menuPanel = menuPanel;
         this.info = item;
     }
@@ -71,7 +73,7 @@
             }
         };
 
-        galaxy.getRegistryService().getItems(info != null ? info.getId() : null, false, callback);
+        repository.getRegistryService().getItems(info != null ? info.getId() : null, false, callback);
     }
 
     /**
@@ -89,7 +91,7 @@
         cp.setAutoWidth(true);
 
         // add inline help string and widget
-        cp.setTopComponent(new InlineHelpPanel(galaxy.getRepositoryConstants().repo_Tip(), 14));
+        cp.setTopComponent(new InlineHelpPanel(repository.getRepositoryConstants().repo_Tip(), 14));
 
         BeanModelFactory factory = BeanModelLookup.get().getFactory(ItemInfo.class);
         List<BeanModel> model = factory.createModel(items);
@@ -165,7 +167,7 @@
         });
 
         final ToolbarButton delBtn = new ToolbarButton("Delete");
-        delBtn.setToolTip(galaxy.getRepositoryConstants().repo_Delete());
+        delBtn.setToolTip(repository.getRepositoryConstants().repo_Delete());
         delBtn.setStyleName("toolbar-btn_left");
         delBtn.setEnabled(false);
         delBtn.addSelectionListener(new SelectionListener<ToolbarButtonEvent>() {
@@ -199,7 +201,7 @@
                         showNewWorkspace();
                     }
                 });
-                newWkspaceBtn.setToolTip(galaxy.getRepositoryConstants().repo_NewWorkspace());
+                newWkspaceBtn.setToolTip(repository.getRepositoryConstants().repo_NewWorkspace());
                 toolbar.add(newWkspaceBtn);
                 
                 final ToolbarButton newArtifactBtn = new ToolbarButton("New Artifact");
@@ -210,7 +212,7 @@
                         showArtifactUploadForm(true);
                     }
                 });
-                newArtifactBtn.setToolTip(galaxy.getRepositoryConstants().repo_NewArtifact());
+                newArtifactBtn.setToolTip(repository.getRepositoryConstants().repo_NewArtifact());
                 toolbar.add(newArtifactBtn);
             } else if (info.getType().equals("Artifact")) {
                 final ToolbarButton newVersionBtn = new ToolbarButton("New Version");
@@ -222,7 +224,7 @@
                     }
                 });
                 
-                newVersionBtn.setToolTip(galaxy.getRepositoryConstants().repo_Items_New());
+                newVersionBtn.setToolTip(repository.getRepositoryConstants().repo_Items_New());
                 toolbar.add(newVersionBtn);
             } else {
                 String token;
@@ -232,7 +234,7 @@
                     token = "add-item/";
                 }
                 ToolbarButton newBtn = WidgetHelper.createToolbarHistoryButton("New", token,
-                        "toolbar-btn_right", galaxy.getRepositoryConstants().repo_Items_New());
+                        "toolbar-btn_right", repository.getRepositoryConstants().repo_Items_New());
                 toolbar.add(newBtn);
             }
         }
@@ -242,12 +244,12 @@
 
 
     protected void showArtifactUploadForm(boolean parentIsWorkspace) {
-        LightBox popup = new LightBox(new AddArtifactForm(galaxy, info, parentIsWorkspace, this));
+        LightBox popup = new LightBox(new AddArtifactForm(repository.getRegistryService(), info, parentIsWorkspace, this));
         popup.show();
     }
 
     protected void showNewWorkspace() {
-        LightBox popup = new LightBox(new AddWorkspaceForm(galaxy, info));
+        LightBox popup = new LightBox(new AddWorkspaceForm(repository.getRegistryService(), info));
         popup.show();
     }
 
@@ -263,7 +265,7 @@
                     }
 
                     // FIXME: delete collection.
-                    galaxy.getRegistryService().delete(ids, new AbstractCallback(menuPanel) {
+                    repository.getRegistryService().delete(ids, new AbstractCallback(menuPanel) {
                         public void onSuccess(Object arg0) {
                             fetchAllItems();
                             menuPanel.removeItems(info, ids);

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemInfoPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/ItemInfoPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemInfoPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,8 +16,21 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
+import java.util.Iterator;
+import java.util.List;
+
+import org.mule.galaxy.repository.client.property.EntryMetadataPanel;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WComment;
+import org.mule.galaxy.web.client.AbstractShowable;
+import org.mule.galaxy.web.client.util.InlineFlowPanel;
+import org.mule.galaxy.web.client.validation.StringNotEmptyValidator;
+import org.mule.galaxy.web.client.validation.ui.ValidatableTextArea;
+import org.mule.galaxy.web.rpc.AbstractCallback;
+
 import com.extjs.gxt.ui.client.event.ButtonEvent;
 import com.extjs.gxt.ui.client.event.SelectionListener;
 import com.extjs.gxt.ui.client.widget.button.Button;
@@ -38,35 +51,19 @@
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
 
-import java.util.Iterator;
-import java.util.List;
-
-import org.mule.galaxy.web.client.AbstractShowable;
-import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.property.EntryMetadataPanel;
-import org.mule.galaxy.web.client.util.InlineFlowPanel;
-import org.mule.galaxy.web.client.validation.StringNotEmptyValidator;
-import org.mule.galaxy.web.client.validation.ui.ValidatableTextArea;
-import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.WComment;
-
 public class ItemInfoPanel extends AbstractShowable {
 
     private HorizontalPanel topPanel;
-    private Galaxy galaxy;
     private VerticalPanel rightGroup;
     private VerticalPanel panel;
     private FlowPanel commentsPanel;
     private ItemInfo info;
     private final RepositoryMenuPanel menuPanel;
     
-    public ItemInfoPanel(final Galaxy galaxy,
-                         RepositoryMenuPanel menuPanel,
+    public ItemInfoPanel(RepositoryMenuPanel menuPanel,
                          ItemInfo item, 
                          final ItemPanel artifactPanel, 
                          final List<String> callbackParams) {
-        this.galaxy = galaxy;
         this.menuPanel = menuPanel;
         this.info = item;
         
@@ -80,8 +77,7 @@
 
         FlexTable table = createColumnTable();
         
-        final NameEditPanel nep = new NameEditPanel(galaxy, 
-                                                    menuPanel,
+        final NameEditPanel nep = new NameEditPanel(menuPanel,
                                                     item.getId(),
                                                     item.getName(),
                                                     item.getParentPath(), 
@@ -105,7 +101,7 @@
         if (item.isLocal()) {
             panel.add(newSpacer());
             
-            panel.add(new EntryMetadataPanel(galaxy, menuPanel, "Metadata", item, false));
+            panel.add(new EntryMetadataPanel(menuPanel.getRepositoryModule(), menuPanel, "Metadata", item, false));
             panel.add(newSpacer());
             
             initComments();
@@ -266,7 +262,8 @@
         addButton.setEnabled(false);
         text.getTextArea().setEnabled(false);
         
-        galaxy.getRegistryService().addComment(info.getId(), parentId, text.getTextArea().getText(), new AbstractCallback(menuPanel) {
+        RegistryServiceAsync svc = menuPanel.getRepositoryModule().getRegistryService();
+        svc.addComment(info.getId(), parentId, text.getTextArea().getText(), new AbstractCallback(menuPanel) {
 
             public void onFailure(Throwable caught) {
                 super.onFailure(caught);

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/ItemPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,13 +16,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.client.admin.PolicyPanel;
+import org.mule.galaxy.repository.rpc.ItemInfo;
 import org.mule.galaxy.web.client.AbstractFlowComposite;
 import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.admin.PolicyPanel;
 import org.mule.galaxy.web.client.util.ShowableTabListener;
-import org.mule.galaxy.web.rpc.ItemInfo;
 import org.mule.galaxy.web.rpc.SecurityService;
 
 import com.extjs.gxt.ui.client.event.Events;
@@ -53,9 +54,11 @@
     private List<String> params;
     private RepositoryMenuPanel menuPanel;
     private TabPanel tabPanel;
+    private RepositoryModule repository;
 
-    public ItemPanel(Galaxy galaxy, RepositoryMenuPanel menuPanel) {
-        this.galaxy = galaxy;
+    public ItemPanel(RepositoryMenuPanel menuPanel) {
+        this.galaxy = menuPanel.getGalaxy();
+        this.repository = menuPanel.getRepositoryModule();
         this.menuPanel = menuPanel;
     }
 
@@ -95,26 +98,26 @@
         tabPanel.setAutoHeight(true);
 
         TabItem itemsTab = new TabItem("Items");
-        itemsTab.getHeader().setToolTip(galaxy.getRepositoryConstants().repo_Items_TabTip());
+        itemsTab.getHeader().setToolTip(repository.getRepositoryConstants().repo_Items_TabTip());
         itemsTab.add(new ChildItemsPanel(galaxy, menuPanel, info));
         tabPanel.add(itemsTab);
 
 
         TabItem infoTab = new TabItem("Info");
-        infoTab.getHeader().setToolTip(galaxy.getRepositoryConstants().repo_Info_TabTip());
-        infoTab.add(new ItemInfoPanel(galaxy, menuPanel, info, this, params));
+        infoTab.getHeader().setToolTip(repository.getRepositoryConstants().repo_Info_TabTip());
+        infoTab.add(new ItemInfoPanel(menuPanel, info, this, params));
         tabPanel.add(infoTab);
 
         if (galaxy.hasPermission("MANAGE_POLICIES") && info.isLocal()) {
             TabItem tab = new TabItem("Policies");
-            tab.getHeader().setToolTip(galaxy.getRepositoryConstants().repo_Policies_TabTip());
-            tab.add(new PolicyPanel(menuPanel, galaxy, itemId));
+            tab.getHeader().setToolTip(repository.getRepositoryConstants().repo_Policies_TabTip());
+            tab.add(new PolicyPanel(menuPanel, galaxy, repository.getRegistryService(), itemId));
             tabPanel.add(tab);
         }
 
         if (galaxy.hasPermission("MANAGE_GROUPS") && info.isLocal()) {
             TabItem tab = new TabItem("Security");
-            tab.getHeader().setToolTip(galaxy.getRepositoryConstants().repo_Security_TabTip());
+            tab.getHeader().setToolTip(repository.getRepositoryConstants().repo_Security_TabTip());
             tab.add(new ItemRolePermissionPanel(galaxy, menuPanel, info.getId(), SecurityService.ITEM_PERMISSIONS));
             tabPanel.add(tab);
         }

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemRolePermissionPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/ItemRolePermissionPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemRolePermissionPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.Widget;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/NameEditPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/NameEditPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/NameEditPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,8 +16,20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
+import java.util.List;
+
+import org.mule.galaxy.repository.client.admin.PolicyPanel;
+import org.mule.galaxy.repository.client.util.ItemPathOracle;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WPolicyException;
+import org.mule.galaxy.web.client.util.InlineFlowPanel;
+import org.mule.galaxy.web.client.validation.StringNotEmptyValidator;
+import org.mule.galaxy.web.client.validation.ui.ValidatableTextBox;
+import org.mule.galaxy.web.rpc.AbstractCallback;
+import org.mule.galaxy.web.rpc.ItemNotFoundException;
+
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Composite;
@@ -29,18 +41,6 @@
 import com.google.gwt.user.client.ui.SuggestBox;
 import com.google.gwt.user.client.ui.Widget;
 
-import java.util.List;
-
-import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.admin.PolicyPanel;
-import org.mule.galaxy.web.client.util.InlineFlowPanel;
-import org.mule.galaxy.web.client.util.ItemPathOracle;
-import org.mule.galaxy.web.client.validation.StringNotEmptyValidator;
-import org.mule.galaxy.web.client.validation.ui.ValidatableTextBox;
-import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.ItemNotFoundException;
-import org.mule.galaxy.web.rpc.WPolicyException;
-
 /**
  * A panel for editing the name of a registry entry.
  */
@@ -50,22 +50,21 @@
     private final String itemId;
     private String name;
     private final String workspacePath;
-    private final Galaxy galaxy;
     private final RepositoryMenuPanel menuPanel;
     private final List<String> callbackParams;
+    private RegistryServiceAsync registryService;
 
-    public NameEditPanel(Galaxy galaxy,
-                         RepositoryMenuPanel menuPanel,
+    public NameEditPanel(RepositoryMenuPanel menuPanel,
                          String itemId,
                          String name,
                          String workspacePath,  
                          final List<String> callbackParams) {
         super();
-        this.galaxy = galaxy;
         this.menuPanel = menuPanel;
         this.itemId = itemId;
         this.name = name;
         this.workspacePath = workspacePath;
+        this.registryService = menuPanel.getRepositoryModule().getRegistryService();
 
         panel = new InlineFlowPanel();
         this.callbackParams = callbackParams;
@@ -96,7 +95,7 @@
 
         final HorizontalPanel row = new HorizontalPanel();
 
-        final SuggestBox workspaceSB = new SuggestBox(new ItemPathOracle(galaxy, menuPanel));
+        final SuggestBox workspaceSB = new SuggestBox(new ItemPathOracle(registryService, menuPanel));
         workspaceSB.setText(workspacePath);
         row.add(workspaceSB);
         
@@ -139,14 +138,14 @@
         if (!newParent.equals(this.workspacePath) 
             || !newName.equals(this.name)) {
             // save only if name or workspace changed
-            galaxy.getRegistryService().move(itemId, newParent, newName, new AbstractCallback(menuPanel) {
+            registryService.move(itemId, newParent, newName, new AbstractCallback(menuPanel) {
 
                 @Override
                 public void onFailure(Throwable caught) {
                     if (caught instanceof ItemNotFoundException) {
                         menuPanel.setMessage("No parent workspace exists with that name!");
                     } else if (caught instanceof WPolicyException) {
-                        PolicyPanel.handlePolicyFailure(galaxy, (WPolicyException) caught);
+                        PolicyPanel.handlePolicyFailure(menuPanel.getGalaxy(), (WPolicyException) caught);
                     } else {
                         super.onFailure(caught);
                     }

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/PolicyResultsPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/PolicyResultsPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/PolicyResultsPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Hyperlink;
@@ -27,10 +27,10 @@
 import java.util.List;
 import java.util.Map;
 
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.WApprovalMessage;
 import org.mule.galaxy.web.client.AbstractErrorShowingComposite;
 import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.WApprovalMessage;
 
 public class PolicyResultsPanel extends AbstractErrorShowingComposite {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/RepositoryMenuPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/RepositoryMenuPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/RepositoryMenuPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -7,6 +7,9 @@
 import java.util.List;
 import java.util.Map;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.MenuPanel;
@@ -14,7 +17,6 @@
 import org.mule.galaxy.web.client.PageManager;
 import org.mule.galaxy.web.client.WidgetHelper;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.ItemInfo;
 
 import com.extjs.gxt.ui.client.data.BaseTreeLoader;
 import com.extjs.gxt.ui.client.data.BaseTreeModel;
@@ -48,14 +50,18 @@
     private BaseTreeModel root;
     protected Map<String,ModelData> idToData  = new HashMap<String,ModelData>();
     private String itemId;
+    private final RepositoryModule repository;
+    private RegistryServiceAsync registryService;
 
-    public RepositoryMenuPanel(Galaxy galaxy) {
+    public RepositoryMenuPanel(RepositoryModule repository) {
         super();
-        this.galaxy = galaxy;
+        this.repository = repository;
+        this.registryService = repository.getRegistryService();
+        this.galaxy = repository.getGalaxy();
 
         createPageInfo("browse", new ChildItemsPanel(galaxy, this, null));
-        createPageInfo("item/" + PageManager.WILDCARD, new ItemPanel(galaxy, this));
-        createPageInfo("add-item", new AddItemForm(galaxy, this));
+        createPageInfo("item/" + PageManager.WILDCARD, new ItemPanel(this));
+        createPageInfo("add-item", new AddItemForm(this));
         
         setId("repositoryTabBody");
     }
@@ -76,7 +82,7 @@
                         }
                     }
                 };
-                galaxy.getRegistryService().getItemInfo(itemId, true, getItemCallback);
+                registryService.getItemInfo(itemId, true, getItemCallback);
                 
                 loadItems(itemId);
             } else {
@@ -97,9 +103,8 @@
                 loadAndExpandItems(items);
             }
         };
-        galaxy.getRegistryService().getItems(itemId, true, getItemsCallback);
+        repository.getRegistryService().getItems(itemId, true, getItemsCallback);
     }
-
     
     protected void loadAndExpandItems(Collection<ItemInfo> items) {
         TreeModel parent = root;
@@ -269,7 +274,7 @@
                 final TreeModel parent = (TreeModel) be.getItem();
                 
                 String id = (String)parent.get("id");
-                galaxy.getRegistryService().getItems(id, false, new AbstractCallback<Collection<ItemInfo>>(RepositoryMenuPanel.this) {
+                repository.getRegistryService().getItems(id, false, new AbstractCallback<Collection<ItemInfo>>(RepositoryMenuPanel.this) {
                     public void onSuccess(Collection<ItemInfo> items) {
                         mergeItems(items, parent);
                     }
@@ -317,7 +322,7 @@
     }
 
     public void createPageInfo(String token, final WidgetHelper composite) {
-        PageInfo page = new PageInfo(token, getGalaxy().getRepositoryTab()) {
+        PageInfo page = new PageInfo(token, repository.getRepositoryTab()) {
 
             public AbstractShowable createInstance() {
                 return null;
@@ -336,6 +341,10 @@
         return galaxy;
     }
 
+    public RepositoryModule getRepositoryModule() {
+        return repository;
+    }
+
     public TreeStore<ModelData> getStore() {
         return store;
     }

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property) ( => )

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/AbstractListRenderer.java
===================================================================
--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/AbstractListRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/AbstractListRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,7 +1,11 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.mule.galaxy.repository.client.RepositoryModule;
 import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.util.InlineFlowPanel;
 
 import com.google.gwt.event.dom.client.ClickEvent;
@@ -11,10 +15,6 @@
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * Encapsulate a list of properties that is always editable.
  */
@@ -49,8 +49,8 @@
 
     @SuppressWarnings("unchecked")
     @Override
-    public void initialize(Galaxy galaxy, ErrorPanel errorPanel, Object value, boolean bulkEdit) {
-        super.initialize(galaxy, errorPanel, value, bulkEdit);
+    public void initialize(RepositoryModule repositoryModule, ErrorPanel errorPanel, Object value, boolean bulkEdit) {
+        super.initialize(repositoryModule, errorPanel, value, bulkEdit);
 
         values = new ArrayList<Object>();
         if (value != null) {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/AbstractPropertyRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/AbstractPropertyRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/AbstractPropertyRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,22 +1,25 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
-import com.google.gwt.user.client.ui.Widget;
-
 import java.io.Serializable;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
 import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.rpc.AbstractCallback;
 
+import com.google.gwt.user.client.ui.Widget;
+
 public abstract class AbstractPropertyRenderer {
-    protected Galaxy galaxy;
+    protected RepositoryModule repositoryModule;
     protected ErrorPanel errorPanel;
     protected Object value;
     protected boolean bulkEdit;
     protected boolean editSupported = true;
+    protected RegistryServiceAsync registryService;
     
-    public void initialize(Galaxy galaxy, ErrorPanel errorPanel, Object value, boolean bulkEdit) {
-        this.galaxy = galaxy;
+    public void initialize(RepositoryModule repositoryModule, ErrorPanel errorPanel, Object value, boolean bulkEdit) {
+        this.repositoryModule = repositoryModule;
+        this.registryService = repositoryModule.getRegistryService();
         this.errorPanel = errorPanel;
         this.value = value;             
         this.bulkEdit = bulkEdit;
@@ -31,10 +34,7 @@
     public abstract boolean validate();
  
     public void save(String itemId, String name, Serializable valueToSave, AbstractCallback saveCallback) {
-        galaxy.getRegistryService().setProperty(itemId, 
-                                                name, 
-                                                valueToSave, 
-                                                saveCallback);
+        registryService.setProperty(itemId, name, valueToSave, saveCallback);
     }
 
     public boolean isEditSupported() {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/ArtifactRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/ArtifactRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/ArtifactRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 import com.google.gwt.user.client.ui.FileUpload;
 import com.google.gwt.user.client.ui.Widget;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/EditPropertyPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/EditPropertyPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/EditPropertyPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,13 +1,16 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
+import java.io.Serializable;
+
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.client.admin.PolicyPanel;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WPolicyException;
+import org.mule.galaxy.repository.rpc.WProperty;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.admin.PolicyPanel;
 import org.mule.galaxy.web.client.util.InlineFlowPanel;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.WPolicyException;
-import org.mule.galaxy.web.rpc.WProperty;
 
 import com.extjs.gxt.ui.client.event.Listener;
 import com.extjs.gxt.ui.client.event.MessageBoxEvent;
@@ -20,8 +23,6 @@
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;
 
-import java.io.Serializable;
-
 /**
  * Encapsulates the rendering and editing of a property value.
  */
@@ -34,10 +35,11 @@
     protected ErrorPanel errorPanel;
     protected String itemId;
     protected WProperty property;
-    protected Galaxy galaxy;
+    protected RegistryServiceAsync registryService;
     protected ClickListener saveListener;
     protected ClickListener deleteListener;
     protected ClickListener cancelListener;
+    private RepositoryModule repositoryModule;
 
     public EditPropertyPanel(AbstractPropertyRenderer renderer, ErrorPanel errorPanel) {
         super();
@@ -159,7 +161,7 @@
     }
 
     protected void doDelete() {
-        galaxy.getRegistryService().deleteProperty(itemId, property.getName(), new AbstractCallback(errorPanel) {
+        registryService.deleteProperty(itemId, property.getName(), new AbstractCallback(errorPanel) {
 
             public void onSuccess(Object arg0) {
                 deleteListener.onClick(null);
@@ -193,7 +195,7 @@
                 if (caught instanceof WPolicyException) {
                     WPolicyException pe = (WPolicyException) caught;
 
-                    PolicyPanel.handlePolicyFailure(galaxy, pe);
+                    PolicyPanel.handlePolicyFailure(repositoryModule.getGalaxy(), pe);
                 } else {
                     onSaveFailure(caught, this);
                 }
@@ -221,7 +223,7 @@
     }
 
     private void initializeRenderer() {
-        renderer.initialize(galaxy, errorPanel, property.getValue(), false);
+        renderer.initialize(repositoryModule, errorPanel, property.getValue(), false);
     }
 
     protected void onSaveFailure(Throwable caught, AbstractCallback saveCallback) {
@@ -237,10 +239,6 @@
         this.property = property;
     }
 
-    public void setGalaxy(Galaxy galaxy) {
-        this.galaxy = galaxy;
-    }
-
     public void setErrorPanel(ErrorPanel errorPanel) {
         this.errorPanel = errorPanel;
     }
@@ -269,4 +267,8 @@
     public void setCancelListener(ClickListener cancelListener) {
         this.cancelListener = cancelListener;
     }
+
+    public void setRepositoryModule(RepositoryModule repositoryModule) {
+        this.repositoryModule = repositoryModule;
+    }
 }

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/EntryMetadataPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/EntryMetadataPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/EntryMetadataPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,8 +16,20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
+import java.util.Collection;
+
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WProperty;
+import org.mule.galaxy.web.client.AbstractShowable;
+import org.mule.galaxy.web.client.ErrorPanel;
+import org.mule.galaxy.web.client.Galaxy;
+import org.mule.galaxy.web.client.util.InlineFlowPanel;
+import org.mule.galaxy.web.rpc.AbstractCallback;
+
 import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.FlexTable;
@@ -27,17 +39,6 @@
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;
 
-import java.util.Collection;
-
-import org.mule.galaxy.web.client.AbstractShowable;
-import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.util.InlineFlowPanel;
-import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WProperty;
-
 /**
  * Shows all the artifact metadata.
  */
@@ -50,14 +51,18 @@
     private Hyperlink showAll;
     private final Galaxy galaxy;
     private ItemInfo item;
+    private final RepositoryModule repositoryModule;
+    private RegistryServiceAsync service;
     
-    public EntryMetadataPanel(final Galaxy galaxy,
+    public EntryMetadataPanel(final RepositoryModule repository,
                               final ErrorPanel registryPanel,
                               final String title,
                               final ItemInfo item,
                               final boolean stale) {
         super();
-        this.galaxy = galaxy;
+        this.repositoryModule = repository;
+        this.galaxy = repository.getGalaxy();
+        this.service = repository.getRegistryService();
         this.errorPanel = registryPanel;
         this.item = item;
         
@@ -84,9 +89,9 @@
             addMetadata.addClickListener(new ClickListener() {
     
                 public void onClick(Widget arg0) {
-                    NewPropertyPanel edit = new NewPropertyPanel(galaxy,
+                    NewPropertyPanel edit = new NewPropertyPanel(repositoryModule,
                                                                  errorPanel,
-                                                                 galaxy.getRegistryService(),
+                                                                 service,
                                                                  item.getId(),
                                                                  metadata,
                                                                  amPanel,
@@ -119,8 +124,7 @@
             showAll.setText("Show All");
         }
         
-        RegistryServiceAsync svc = galaxy.getRegistryService();
-        svc.getItemInfo(item.getId(), showHidden, new AbstractCallback<ItemInfo>(errorPanel) {
+        service.getItemInfo(item.getId(), showHidden, new AbstractCallback<ItemInfo>(errorPanel) {
 
             public void onSuccess(ItemInfo o) {
                 item = o;
@@ -138,11 +142,11 @@
     public void addRow(WProperty property) {
 
         final AbstractPropertyRenderer renderer = 
-            galaxy.getPropertyInterfaceManager().createRenderer(property.getExtension(), property.isMultiValued());
+            repositoryModule.getPropertyInterfaceManager().createRenderer(property.getExtension(), property.isMultiValued());
 
         EditPropertyPanel render = new EditPropertyPanel(renderer, errorPanel);
         render.setProperty(property);
-        render.setGalaxy(galaxy);
+        render.setRepositoryModule(repositoryModule);
         render.setItemId(item.getId());
         render.initialize();
         render.showView();

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/LifecycleRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/LifecycleRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/LifecycleRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 import com.google.gwt.user.client.ui.ChangeListener;
 import com.google.gwt.user.client.ui.FlexTable;
@@ -11,10 +11,10 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.mule.galaxy.repository.rpc.WLifecycle;
+import org.mule.galaxy.repository.rpc.WPhase;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.WLifecycle;
-import org.mule.galaxy.web.rpc.WPhase;
 
 public class LifecycleRenderer extends AbstractPropertyRenderer {
 
@@ -30,7 +30,7 @@
         lifecycleTable = AbstractShowable.createColumnTable();
         
         if (lifecycles == null) {
-            galaxy.getRegistryService().getLifecycles(new AbstractCallback(errorPanel) {
+            registryService.getLifecycles(new AbstractCallback(errorPanel) {
                 public void onSuccess(Object o) {
                     lifecycles = (Collection) o;
                     doShowLifecycles();
@@ -64,7 +64,7 @@
     public void loadRemote() {
         final List<String> ids = (List<String>) value;
         if (ids != null) {
-            galaxy.getRegistryService().getLifecycle(ids.get(0), new AbstractCallback(errorPanel) {
+            registryService.getLifecycle(ids.get(0), new AbstractCallback(errorPanel) {
     
                 public void onSuccess(Object o) {
                     lifecycle = (WLifecycle) o;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/LinksRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/LinksRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/LinksRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,19 +1,19 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.client.util.ItemPathOracle;
+import org.mule.galaxy.repository.rpc.WLinks;
 import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.util.InlineFlowPanel;
-import org.mule.galaxy.web.client.util.ItemPathOracle;
 import org.mule.galaxy.web.client.validation.Validator;
 import org.mule.galaxy.web.client.validation.ui.ValidatableSuggestBox;
 import org.mule.galaxy.web.rpc.AbstractCallback;
 import org.mule.galaxy.web.rpc.LinkInfo;
-import org.mule.galaxy.web.rpc.WLinks;
 
 import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.ui.Button;
@@ -35,8 +35,9 @@
     private Label verifyLabel;
 
     @Override
-    public void initialize(Galaxy galaxy, ErrorPanel errorPanel, Object value, boolean bulkEdit) {
-        this.galaxy = galaxy;
+    public void initialize(RepositoryModule repositoryModule, ErrorPanel errorPanel, Object value, boolean bulkEdit) {
+        this.repositoryModule = repositoryModule;
+        this.registryService = repositoryModule.getRegistryService();
         this.errorPanel = errorPanel;
         this.value = value;
         
@@ -100,7 +101,7 @@
             }
         };
         
-        suggest = new ValidatableSuggestBox(validator, new ItemPathOracle(galaxy, errorPanel, true, "xxx"));
+        suggest = new ValidatableSuggestBox(validator, new ItemPathOracle(registryService, errorPanel, true, "xxx"));
         addPanel.add(suggest);
 
         addButton = new Button();
@@ -124,7 +125,7 @@
     protected void verify(final String path) {
         setEnabled(false);
         
-        galaxy.getRegistryService().itemExists(path, new AbstractCallback<Boolean>(errorPanel) {
+        registryService.itemExists(path, new AbstractCallback<Boolean>(errorPanel) {
 
             public void onSuccess(Boolean exists) {
                 if (isDuplicate(path)) {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/MapRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/MapRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/MapRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/NewPropertyPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/NewPropertyPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/NewPropertyPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,8 +16,22 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.client.util.PropertyDescriptorComparator;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WProperty;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
+import org.mule.galaxy.web.client.ErrorPanel;
+import org.mule.galaxy.web.client.Galaxy;
+import org.mule.galaxy.web.client.util.InlineFlowPanel;
+import org.mule.galaxy.web.rpc.AbstractCallback;
+
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ChangeListener;
 import com.google.gwt.user.client.ui.ClickListener;
@@ -30,19 +44,6 @@
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
 
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.util.InlineFlowPanel;
-import org.mule.galaxy.web.client.util.PropertyDescriptorComparator;
-import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WProperty;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
-
 public class NewPropertyPanel extends Composite {
 
     private ListBox propertiesBox;
@@ -53,20 +54,20 @@
     private Panel propertiesPanel;
     private ClickListener cancelListener;
     private List propertyDescriptors;
-    private final Galaxy galaxy;
     private WProperty property;
     private Button cancelButton;
     private FlexTable panel;
     private InlineFlowPanel selectorPanel;
+    private final RepositoryModule repositoryModule;
 
-    public NewPropertyPanel(final Galaxy galaxy,
+    public NewPropertyPanel(final RepositoryModule repositoryModule,
                             final ErrorPanel registryPanel, 
                             final RegistryServiceAsync registryService,
                             final String itemId,
                             final Panel propertiesPanel,
                             final EntryMetadataPanel metadataPanel,
                             final FlexTable table) {
-        this.galaxy = galaxy;
+        this.repositoryModule = repositoryModule;
         this.errorPanel = registryPanel;
         this.itemId = itemId;
         this.propertiesPanel = propertiesPanel; 
@@ -131,13 +132,13 @@
         WPropertyDescriptor pd = getPropertyDescriptor(txt);
 
         AbstractPropertyRenderer renderer = 
-            galaxy.getPropertyInterfaceManager().createRenderer(pd.getExtension(), pd.isMultiValued());
+            repositoryModule.getPropertyInterfaceManager().createRenderer(pd.getExtension(), pd.isMultiValued());
         
         EditPropertyPanel render = new EditPropertyPanel(renderer, errorPanel);
         property = new WProperty(pd.getName(), pd.getDescription(), null, pd.getExtension(), false);
         property.setMultiValued(pd.isMultiValued());
         render.setProperty(property);
-        render.setGalaxy(galaxy);
+        render.setRepositoryModule(repositoryModule);
         render.setItemId(itemId);
         render.setErrorPanel(errorPanel);
         render.setSaveListener(new ClickListener() {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/PropertyInterfaceManager.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/PropertyInterfaceManager.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/PropertyInterfaceManager.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 
 /**

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/SimpleListRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/SimpleListRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/SimpleListRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 import java.util.Collection;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/SimpleRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/SimpleRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/SimpleRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/UserListRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/UserListRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/UserListRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -26,7 +26,7 @@
         userLB.addItem("Loading...");
         
         if (users == null) { 
-            galaxy.getSecurityService().getUsers(new AbstractCallback(errorPanel) {
+            repositoryModule.getGalaxy().getSecurityService().getUsers(new AbstractCallback(errorPanel) {
     
                 public void onSuccess(Object o) {
                     users = (Collection) o;

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util) ( => )

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/AddItemHelper.java
===================================================================
--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/AddItemHelper.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/AddItemHelper.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.util;
+package org.mule.galaxy.repository.client.util;
 
 
 import java.io.Serializable;
@@ -7,12 +7,12 @@
 import java.util.List;
 import java.util.Map;
 
-import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.property.AbstractPropertyRenderer;
-import org.mule.galaxy.web.client.property.ArtifactRenderer;
+import org.mule.galaxy.repository.client.property.AbstractPropertyRenderer;
+import org.mule.galaxy.repository.client.property.ArtifactRenderer;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WType;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.WType;
 
 import com.google.gwt.user.client.ui.FormPanel;
 
@@ -32,7 +32,6 @@
         ARTIFACT, ARTIFACT_VERSION, VERSION, VERSION_TYPE
     }
 
-    private final Galaxy galaxy;
     private String typeId;
     private String versionTypeId;
     private boolean addVersion;
@@ -46,10 +45,11 @@
     private String fileId;
     private AbstractCallback callback;
     protected Map<String, WType> types;
+    private final RegistryServiceAsync registryService;
 
 
-    public AddItemHelper(Galaxy galaxy) {
-        this.galaxy = galaxy;
+    public AddItemHelper(RegistryServiceAsync registryService) {
+        this.registryService = registryService;
         this.setEncoding(FormPanel.ENCODING_MULTIPART);
         this.setMethod(FormPanel.METHOD_POST);
     }
@@ -75,7 +75,7 @@
         Map<String, Serializable> properties = getProperties(this.getRenderers());
 
         if (this.isAddVersion()) {
-            this.galaxy.getRegistryService().addVersionedItem(parent,
+            registryService.addVersionedItem(parent,
                     name,
                     version,
                     null,
@@ -85,7 +85,7 @@
                     getProperties(this.getVersionRenderers()),
                     callback);
         } else {
-            this.galaxy.getRegistryService().addItem(parent,
+            registryService.addItem(parent,
                     name,
                     null,
                     getTypeId(),
@@ -133,7 +133,7 @@
     }
 
     public ItemInfo fetchAndSetItem(String itemId) {
-        galaxy.getRegistryService().getItemInfo(itemId, false, new AbstractCallback<ItemInfo>(null) {
+        registryService.getItemInfo(itemId, false, new AbstractCallback<ItemInfo>(null) {
             public void onSuccess(ItemInfo item) {
                 AddItemHelper.this.setItem(item);
             }
@@ -143,7 +143,7 @@
 
 
     public Map<String, WType> getTypes() {
-        galaxy.getRegistryService().getTypes(new AbstractCallback<List<WType>>(null) {
+        registryService.getTypes(new AbstractCallback<List<WType>>(null) {
             public void onSuccess(List<WType> wtypes) {
                 Collections.sort(wtypes, new WTypeComparator());
                 AddItemHelper.this.types = new HashMap<String, WType>();

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/ItemPathOracle.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/ItemPathOracle.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/ItemPathOracle.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.util;
+package org.mule.galaxy.repository.client.util;
 
 import com.google.gwt.user.client.ui.SuggestOracle;
 
@@ -6,36 +6,37 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
 import org.mule.galaxy.web.client.ErrorPanel;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.ItemInfo;
 
 public class ItemPathOracle extends SuggestOracle {
 
-    private Galaxy galaxy;
     private ErrorPanel errorPanel;
     private final String exclude;
     private final String[] types;
     private boolean recursive;
+    private final RegistryServiceAsync registryService;
     
-    public ItemPathOracle(Galaxy galaxy, ErrorPanel errorPanel, boolean recursive, String exclude, String... types) {
-        super();    
+    public ItemPathOracle(RegistryServiceAsync registryService, ErrorPanel errorPanel, boolean recursive, String exclude, String... types) {
+        super();
+        this.registryService = registryService;    
         this.errorPanel = errorPanel;
-        this.galaxy = galaxy;
         this.recursive = recursive;
         this.exclude = exclude;
         this.types = types;
     }
 
-    public ItemPathOracle(Galaxy galaxy, ErrorPanel errorPanel) {
-        this(galaxy, errorPanel, true, "xxx", new String[0]);
+    public ItemPathOracle(RegistryServiceAsync registryService, ErrorPanel errorPanel) {
+        this(registryService, errorPanel, true, "xxx", new String[0]);
     }
 
 
     @Override
     public void requestSuggestions(final Request request, final Callback callback) {
-        galaxy.getRegistryService().suggestItems(request.getQuery(), recursive, exclude,
+        registryService.suggestItems(request.getQuery(), recursive, exclude,
             types, new AbstractCallback<Collection<ItemInfo>>(errorPanel) {
 
             public void onSuccess(Collection<ItemInfo> entries) {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/LifecycleSelectionPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/LifecycleSelectionPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/LifecycleSelectionPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.util;
+package org.mule.galaxy.repository.client.util;
 
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.ChangeListener;
@@ -28,12 +28,12 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WLifecycle;
+import org.mule.galaxy.repository.rpc.WPhase;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.client.ErrorPanel;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WLifecycle;
-import org.mule.galaxy.web.rpc.WPhase;
 
 public class LifecycleSelectionPanel extends AbstractShowable {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/PolicySelectionPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/PolicySelectionPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/PolicySelectionPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.util;
+package org.mule.galaxy.repository.client.util;
 
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ChangeListener;
@@ -33,11 +33,11 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WPolicy;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.client.ErrorPanel;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WPolicy;
 
 public class PolicySelectionPanel extends AbstractShowable{

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/PropertyDescriptorComparator.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/PropertyDescriptorComparator.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/PropertyDescriptorComparator.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.mule.galaxy.web.client.util;
+package org.mule.galaxy.repository.client.util;
 
 import java.util.Comparator;
 
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
 
 public class PropertyDescriptorComparator implements Comparator<WPropertyDescriptor> {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/RegistryOracle.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/RegistryOracle.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/RegistryOracle.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,10 +1,11 @@
-package org.mule.galaxy.web.client.util;
+package org.mule.galaxy.repository.client.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.web.client.util.Oracle;
 
 import com.extjs.gxt.ui.client.data.BaseModelData;
 import com.extjs.gxt.ui.client.data.BasePagingLoadResult;

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/StylizedSortableGrid.java (from rev 2109, branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/StylizedSortableGrid.java) (0 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/StylizedSortableGrid.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/StylizedSortableGrid.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,162 @@
+package org.mule.galaxy.repository.client.util;
+
+import com.google.gwt.gen2.table.client.SortableGrid;
+import com.google.gwt.gen2.table.client.TableModelHelper.ColumnSortList;
+import com.google.gwt.gen2.table.event.client.RowHighlightEvent;
+import com.google.gwt.gen2.table.event.client.RowHighlightHandler;
+import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
+import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
+import com.google.gwt.gen2.table.event.client.RowUnhighlightEvent;
+import com.google.gwt.gen2.table.event.client.RowUnhighlightHandler;
+import com.google.gwt.gen2.table.event.client.TableEvent.Row;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.Element;
+
+public class StylizedSortableGrid extends SortableGrid {
+
+    public StylizedSortableGrid(int rows, int columns) {
+        super(rows, columns);
+
+        setCellSpacing(0);
+        setCellPadding(4);
+
+        addRowHighlightHandler(new RowHighlightHandler() {
+            public void onRowHighlight(RowHighlightEvent event) {
+                int idx = event.getValue().getRowIndex();
+                if (idx == 0)
+                    return;
+                getRowFormatter().setStyleName(idx, "SortableGrid-selectedRow");
+            }
+        });
+        addRowUnhighlightHandler(new RowUnhighlightHandler() {
+            public void onRowUnhighlight(RowUnhighlightEvent event) {
+                int idx = event.getValue().getRowIndex();
+                if (idx == 0 || getSelectedRows().contains(idx))
+                    return;
+
+                getRowFormatter().setStyleName(idx, "");
+            }
+        });
+        addRowSelectionHandler(new RowSelectionHandler() {
+
+            public void onRowSelection(RowSelectionEvent event) {
+                for (Row row : event.getDeselectedRows()) {
+                    int idx = row.getRowIndex();
+                    if (idx == 0)
+                        return;
+
+                    getRowFormatter().setStyleName(idx, "");
+                }
+
+                for (Row row : event.getSelectedRows()) {
+                    int idx = row.getRowIndex();
+                    if (idx == 0)
+                        return;
+
+                    getRowFormatter().setStyleName(idx, "SortableGrid-selectedRow");
+                }
+            }
+        });
+
+        setColumnSorter(new ColumnSorter() {
+
+            @Override
+            public void onSortColumn(SortableGrid grid, ColumnSortList sortList,
+                                     SortableGrid.ColumnSorterCallback callback) {
+                // Get the primary column and sort order
+                int column = sortList.getPrimaryColumn();
+                boolean ascending = sortList.isPrimaryAscending();
+
+                // Apply the default quicksort algorithm
+                SelectionGridCellFormatter formatter = grid.getSelectionGridCellFormatter();
+                Element[] tdElems = new Element[grid.getRowCount()];
+                for (int i = 0; i < tdElems.length; i++) {
+                    tdElems[i] = formatter.getElement(i, column);
+                }
+                
+                Element[] nonHeaders = new Element[tdElems.length-1];
+                
+                for (int i = 1; i < tdElems.length; i++) {
+                    nonHeaders[i-1] = tdElems[i];
+                }
+                
+                quicksort(nonHeaders, 0, nonHeaders.length - 1);
+
+                for (int i = 1; i < tdElems.length; i++) {
+                    tdElems[i] = nonHeaders[i-1];
+                }
+                
+                // Convert tdElems to trElems, reversing if needed
+                Element[] trElems = new Element[tdElems.length];
+                trElems[0] = DOM.getParent(tdElems[0]);
+                if (ascending) {
+                    for (int i = 1; i < tdElems.length; i++) {
+                        trElems[i] = DOM.getParent(tdElems[i]);
+                    }
+                } else {
+                    int maxElem = tdElems.length - 1;
+                    for (int i = 1; i <= maxElem; i++) {
+                        trElems[i] = DOM.getParent(tdElems[maxElem - i + 1]);
+                    }
+                }
+
+                // Use the callback to complete the sorting
+                callback.onSortingComplete(trElems);
+            }
+
+            /**
+             * Recursive quicksort algorithm.
+             * 
+             * @param tdElems
+             *            an array of row elements
+             * @param start
+             *            the start index to sort
+             * @param end
+             *            the last index to sort
+             */
+            private void quicksort(Element[] tdElems, int start, int end) {
+                // No need to sort
+                if (start >= end) {
+                    return;
+                }
+
+                // Sort this set
+                int i = start + 1;
+                int k = end;
+                String pivot = DOM.getInnerText(tdElems[start]);
+                while (k >= i) {
+                    if (DOM.getInnerText(tdElems[i]).compareTo(pivot) < 0) {
+                        // Move i until the value is great than the pivot
+                        i++;
+                    } else if (k == i) {
+                        // Don't swap if equal
+                        k--;
+                    } else if (DOM.getInnerText(tdElems[k]).compareTo(pivot) < 0) {
+                        // Swap the elements at k and i
+                        Element tr = tdElems[i];
+                        tdElems[i] = tdElems[k];
+                        tdElems[k] = tr;
+                        i++;
+                        k--;
+                    } else {
+                        // Decrement k
+                        k--;
+                    }
+                }
+
+                // Swap k and pivot
+                if (k != start) {
+                    Element tr = tdElems[k];
+                    tdElems[k] = tdElems[start];
+                    tdElems[start] = tr;
+                }
+
+                // Sort the subsets
+                quicksort(tdElems, start, k - 1);
+                quicksort(tdElems, k + 1, end);
+            }
+        });
+
+    }
+
+}

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/WTypeComparator.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/WTypeComparator.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/WTypeComparator.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.mule.galaxy.web.client.util;
+package org.mule.galaxy.repository.client.util;
 
 import java.util.Comparator;
 
-import org.mule.galaxy.web.rpc.WType;
+import org.mule.galaxy.repository.rpc.WType;
 
 public class WTypeComparator implements Comparator<WType> {

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc) ( => )

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/ItemInfo.java
===================================================================
--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/ItemInfo.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/ItemInfo.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import java.util.ArrayList;
 import java.util.Collection;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/RegistryService.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/RegistryService.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/RegistryService.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -26,6 +26,10 @@
 import java.util.Set;
 
 import org.mule.galaxy.web.client.RPCException;
+import org.mule.galaxy.web.rpc.ItemExistsException;
+import org.mule.galaxy.web.rpc.ItemNotFoundException;
+import org.mule.galaxy.web.rpc.SearchPredicate;
+import org.mule.galaxy.web.rpc.WActivity;
 
 import com.google.gwt.user.client.rpc.RemoteService;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/RegistryServiceAsync.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/RegistryServiceAsync.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/RegistryServiceAsync.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,14 +16,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import java.io.Serializable;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.mule.galaxy.web.rpc.SearchPredicate;
+
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
 public interface RegistryServiceAsync {
@@ -174,4 +177,14 @@
     void deleteArtifactView(String id, AsyncCallback callback);
     
     void getRecentArtifactViews(AsyncCallback callback);
+
+    void getActivities(Date from, 
+                       Date to, 
+                       String user,
+                       String itemPath,
+                       String text,
+                       String eventTypeStr, int start,
+                       int results, 
+                       boolean ascending,
+                       AsyncCallback callback);
 }
\ No newline at end of file

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WApprovalMessage.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WApprovalMessage.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WApprovalMessage.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WArtifactType.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WArtifactType.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WArtifactType.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.extjs.gxt.ui.client.data.BeanModelTag;
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WArtifactView.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WArtifactView.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WArtifactView.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,10 +1,12 @@
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
 
 import java.util.HashSet;
 import java.util.Set;
 
+import org.mule.galaxy.web.rpc.SearchPredicate;
+
 public class WArtifactView implements IsSerializable {
     private String id;
     private String name;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WComment.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WComment.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WComment.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WGovernanceInfo.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WGovernanceInfo.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WGovernanceInfo.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WIndex.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WIndex.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WIndex.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
 import com.extjs.gxt.ui.client.data.BeanModelTag;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WLifecycle.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WLifecycle.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WLifecycle.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
 import com.extjs.gxt.ui.client.data.BeanModelTag;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WLinks.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WLinks.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WLinks.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,10 +1,12 @@
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
 
 import java.io.Serializable;
 import java.util.List;
 
+import org.mule.galaxy.web.rpc.LinkInfo;
+
 public class WLinks implements IsSerializable, Serializable {
     private List<LinkInfo> links;
     private List<LinkInfo> reciprocal;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPhase.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WPhase.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPhase.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
 import com.extjs.gxt.ui.client.data.BeanModelTag;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPolicy.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WPolicy.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPolicy.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPolicyException.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WPolicyException.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPolicyException.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WProperty.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WProperty.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WProperty.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPropertyDescriptor.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WPropertyDescriptor.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPropertyDescriptor.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.extjs.gxt.ui.client.data.BeanModelTag;
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WSearchResults.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WSearchResults.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WSearchResults.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WType.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WType.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WType.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,6 +1,6 @@
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
-import org.mule.galaxy.web.client.util.PropertyDescriptorComparator;
+import org.mule.galaxy.repository.client.util.PropertyDescriptorComparator;
 
 import com.extjs.gxt.ui.client.data.BeanModelTag;
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/server/pom.xml (2110 => 2111)

--- branches/product_cleanup/repository/server/pom.xml	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/server/pom.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -28,7 +28,7 @@
 
         <dependency>
             <groupId>org.mule.galaxy</groupId>
-            <artifactId>galaxy-repository-client</artifactId>
+            <artifactId>galaxy-repository-gwt-client</artifactId>
             <version>${version}</version>
         </dependency>

Copied: branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/RegistryServiceImpl.java (from rev 2110, branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/server/RegistryServiceImpl.java) (0 => 2111)

--- branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/RegistryServiceImpl.java	                        (rev 0)
+++ branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/RegistryServiceImpl.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,2094 @@
+/*
+ * $Id: ContextPathResolver.java 794 2008-04-23 22:23:10Z andrew $
+ * --------------------------------------------------------------------------------------
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.mule.galaxy.repository;
+
+import java.io.FileNotFoundException;
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+
+import org.acegisecurity.context.SecurityContextHolder;
+import org.apache.abdera.i18n.text.UrlEncoding;
+import org.apache.abdera.i18n.text.CharUtils.Profile;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.mule.galaxy.DuplicateItemException;
+import org.mule.galaxy.Item;
+import org.mule.galaxy.Link;
+import org.mule.galaxy.Links;
+import org.mule.galaxy.NotFoundException;
+import org.mule.galaxy.PropertyException;
+import org.mule.galaxy.PropertyInfo;
+import org.mule.galaxy.Registry;
+import org.mule.galaxy.RegistryException;
+import org.mule.galaxy.activity.Activity;
+import org.mule.galaxy.activity.ActivityManager;
+import org.mule.galaxy.activity.ActivityManager.EventType;
+import org.mule.galaxy.artifact.ArtifactType;
+import org.mule.galaxy.artifact.ArtifactTypeDao;
+import org.mule.galaxy.collab.Comment;
+import org.mule.galaxy.collab.CommentManager;
+import org.mule.galaxy.event.EventManager;
+import org.mule.galaxy.extension.Extension;
+import org.mule.galaxy.impl.artifact.ArtifactExtension;
+import org.mule.galaxy.impl.artifact.UploadService;
+import org.mule.galaxy.impl.jcr.UserDetailsWrapper;
+import org.mule.galaxy.impl.lifecycle.LifecycleExtension;
+import org.mule.galaxy.impl.link.LinkExtension;
+import org.mule.galaxy.index.Index;
+import org.mule.galaxy.index.IndexManager;
+import org.mule.galaxy.lifecycle.Lifecycle;
+import org.mule.galaxy.lifecycle.LifecycleManager;
+import org.mule.galaxy.lifecycle.Phase;
+import org.mule.galaxy.policy.ApprovalMessage;
+import org.mule.galaxy.policy.Policy;
+import org.mule.galaxy.policy.PolicyException;
+import org.mule.galaxy.policy.PolicyManager;
+import org.mule.galaxy.query.OpRestriction;
+import org.mule.galaxy.query.Query;
+import org.mule.galaxy.query.QueryException;
+import org.mule.galaxy.query.Restriction;
+import org.mule.galaxy.query.SearchResults;
+import org.mule.galaxy.query.OpRestriction.Operator;
+import org.mule.galaxy.render.ItemRenderer;
+import org.mule.galaxy.render.RendererManager;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryService;
+import org.mule.galaxy.repository.rpc.WApprovalMessage;
+import org.mule.galaxy.repository.rpc.WArtifactType;
+import org.mule.galaxy.repository.rpc.WArtifactView;
+import org.mule.galaxy.repository.rpc.WComment;
+import org.mule.galaxy.repository.rpc.WIndex;
+import org.mule.galaxy.repository.rpc.WLifecycle;
+import org.mule.galaxy.repository.rpc.WLinks;
+import org.mule.galaxy.repository.rpc.WPhase;
+import org.mule.galaxy.repository.rpc.WPolicy;
+import org.mule.galaxy.repository.rpc.WPolicyException;
+import org.mule.galaxy.repository.rpc.WProperty;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
+import org.mule.galaxy.repository.rpc.WSearchResults;
+import org.mule.galaxy.repository.rpc.WType;
+import org.mule.galaxy.security.AccessControlManager;
+import org.mule.galaxy.security.AccessException;
+import org.mule.galaxy.security.Permission;
+import org.mule.galaxy.security.User;
+import org.mule.galaxy.security.UserManager;
+import org.mule.galaxy.type.PropertyDescriptor;
+import org.mule.galaxy.type.Type;
+import org.mule.galaxy.type.TypeManager;
+import org.mule.galaxy.util.SecurityUtils;
+import org.mule.galaxy.util.UserUtils;
+import org.mule.galaxy.view.ArtifactViewManager;
+import org.mule.galaxy.view.View;
+import org.mule.galaxy.web.ContextPathResolver;
+import org.mule.galaxy.web.client.RPCException;
+import org.mule.galaxy.web.rpc.ItemExistsException;
+import org.mule.galaxy.web.rpc.ItemNotFoundException;
+import org.mule.galaxy.web.rpc.LinkInfo;
+import org.mule.galaxy.web.rpc.SearchPredicate;
+import org.mule.galaxy.web.rpc.WActivity;
+
+public class RegistryServiceImpl implements RegistryService {
+
+    protected static final String DEFAULT_DATETIME_FORMAT = "h:mm a, MMMM d, yyyy";
+
+    private static final String RECENT_VIEWS = "recent.artifactViews";
+
+    private final Log log = LogFactory.getLog(getClass());
+
+    private Registry registry;
+    private ArtifactTypeDao artifactTypeDao;
+    private RendererManager rendererManager;
+    private PolicyManager policyManager;
+    private IndexManager indexManager;
+    private ActivityManager activityManager;
+    private AccessControlManager accessControlManager;
+    private ArtifactViewManager artifactViewManager;
+    private TypeManager typeManager;
+
+    private ContextPathResolver contextPathResolver;
+
+    private LifecycleManager localLifecycleManager;
+
+    private EventManager eventManager;
+
+    private UploadService uploadService;
+
+    private UserManager userManager;
+    
+    public Collection<ItemInfo> getItems(String parentId, boolean traverseUpParents) throws RPCException {
+        try {
+            if (parentId == null) {
+                Collection<Item> items = registry.getItems();
+                
+                return toWeb(items, false);
+            } else {
+                Item w = (Item) registry.getItemById(parentId);
+
+                Collection<ItemInfo> workspaces = null;
+                if (traverseUpParents) {
+                    while (w != null) {
+                        Item parent = w.getParent();
+                        Collection<ItemInfo> parentWorkspaces;
+                        if (parent != null) {
+                            parentWorkspaces = toWeb(parent.getItems(), false);
+                        } else {
+                            parentWorkspaces = toWeb(registry.getItems(), false);
+                        }
+                        
+                        if (workspaces != null) {
+                            addWorkspaces(w.getName(), parentWorkspaces, workspaces);
+                        }
+                        workspaces = parentWorkspaces;
+                        w = parent;
+                    }
+                } else {
+                    workspaces = toWeb(w.getItems(), false);
+                }
+                return workspaces;
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public Collection<ItemInfo> getItemsWithAllChildren(String parentPath) throws RPCException {
+        return getItemsInPath(parentPath, true);
+    }
+
+    public Collection<ItemInfo> getItemsInPath(String parentPath) throws RPCException {
+        return getItemsInPath(parentPath, false);
+    }
+
+    private Collection<ItemInfo> getItemsInPath(String parentPath, boolean populateChildren) throws RPCException {
+        try {
+            if (parentPath == null || "".equals(parentPath) || "/".equals(parentPath)) {
+                return toWeb(registry.getItems(), populateChildren);
+            } else {
+                return toWeb(registry.getItemByPath(parentPath).getItems(), populateChildren);
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    
+    private Collection<ItemInfo> toWeb(Collection<Item> workspaces, boolean populateChildren) throws RegistryException {
+        if (workspaces == null) {
+            return null;
+        }
+        
+        List<ItemInfo> wis = new ArrayList<ItemInfo>();
+        for (Item w : workspaces) {
+            if (!w.isInternal()) {
+                ItemInfo ww = toWeb(w, populateChildren);
+                wis.add(ww);
+            }
+        }
+        
+        return wis;
+    }
+
+    private void addWorkspaces(String name, Collection<ItemInfo> parents, Collection<ItemInfo> children) {
+        for (ItemInfo w : parents) {
+            if (name.equals(w.getName())) {
+                w.setItems(children);
+                return;
+            }
+        }
+    }
+    
+    private ItemInfo toWeb(Item i, boolean populateChildren) throws RegistryException {
+        ItemInfo ii = new ItemInfo();
+        ii.setId(i.getId());
+        ii.setName(i.getName());
+        ii.setPath(i.getPath());
+        if (i.getParent() != null) {
+            ii.setParentPath(i.getParent().getPath());
+        }
+        ii.setLocal(i.isLocal());
+        if (i.getAuthor() != null) {
+            ii.setAuthorName(i.getAuthor().getName());
+            ii.setAuthorUsername(i.getAuthor().getUsername());
+        } else {
+            ii.setAuthorName("[Removed]");
+            ii.setAuthorName("[Removed]");
+        }
+        ii.setType(i.getType().getName());
+        
+        if (populateChildren) {
+            Collection<ItemInfo> children = toWeb(i.getItems(), populateChildren);
+            ii.setItems(children);
+        }
+        return ii;
+    }
+
+    public String addVersionedItem(String parentPath, 
+                                   String name, 
+                                   String versionName, 
+                                   String lifecycleId,
+                                   String typeId, 
+                                   String versionTypeId, 
+                                   Map<String, Serializable> properties,
+                                   Map<String, Serializable> versionProperties) throws RPCException,
+        ItemNotFoundException, ItemExistsException, WPolicyException {
+        addItem(parentPath, name, lifecycleId, typeId, properties);
+        
+        if (!parentPath.endsWith("/")) {
+            parentPath += "/";
+        }
+        parentPath += name;
+        
+        return addItem(parentPath, versionName, lifecycleId, versionTypeId, versionProperties);
+    }
+
+    public String addItem(String parentPath, 
+                          String itemName, 
+                          String lifecycleId, 
+                          String typeId, 
+                          Map<String, Serializable> properties) 
+        throws RPCException, ItemNotFoundException, ItemExistsException, WPolicyException {
+        
+        // If we uploaded files, lets track them so we can delete them
+        ArrayList<String> filesToDelete = new ArrayList<String>();
+        
+        try {
+            Item item;
+            Type type = typeManager.getType(typeId);
+            Map<String, Object> localProperties = new HashMap<String, Object>();
+            if (properties != null) {
+                for (Map.Entry<String, Serializable> e : properties.entrySet()) {
+                    String name = e.getKey();
+                    PropertyDescriptor pd = typeManager.getPropertyDescriptorByName(name);
+                    
+                    localProperties.put(name, getLocalValue(pd, e.getValue(), null));
+                    
+                    if (pd != null && pd.getExtension() instanceof ArtifactExtension) {
+                        filesToDelete.add((String)e.getValue());
+                    }
+                }
+            }
+            
+            if (parentPath == null || "".equals(parentPath) || "/".equals(parentPath)) {
+                item = registry.newItem(itemName, type, localProperties).getItem();
+            } else {
+                Item parent = (Item) registry.getItemByPath(parentPath);
+                
+                if (parent == null) {
+                    throw new RPCException("Could not find parent workspace: " + parentPath);
+                }
+                item = parent.newItem(itemName, type, localProperties).getItem();
+            }
+            if (lifecycleId != null) {
+                item.setDefaultLifecycle(item.getLifecycleManager().getLifecycleById(lifecycleId));
+                registry.save(item);
+            }
+            
+            return item.getId();
+        } catch (DuplicateItemException e) {
+            throw new ItemExistsException();
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            log.error(e.getMessage(), e);
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw toWeb(e);
+        } catch (PropertyException e) {
+            throw new RPCException(e.getMessage());
+        } finally {
+            for (String s : filesToDelete) {
+                uploadService.delete(s);
+            }
+        }
+    }
+
+    public Collection<WArtifactType> getArtifactTypes() {
+        Collection<ArtifactType> artifactTypes = artifactTypeDao.listAll();
+        List<WArtifactType> atis = new ArrayList<WArtifactType>();
+
+        for (ArtifactType a : artifactTypes) {
+            WArtifactType at = toWeb(a);
+            atis.add(at);
+        }
+        return atis;
+    }
+
+    public WArtifactType getArtifactType(String id) throws RPCException {
+        try {
+            return toWeb(artifactTypeDao.get(id));
+        } catch (Exception e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    private WArtifactType toWeb(ArtifactType a) {
+        Set<QName> docTypes = a.getDocumentTypes();
+        List<String> docTypesAsStr = new ArrayList<String>();
+        if (docTypes != null) {
+            for (QName q : docTypes) {
+                docTypesAsStr.add(q.toString());
+            }
+        }
+        return new WArtifactType(a.getId(), a.getContentType(),
+                                 a.getDescription(), docTypesAsStr,
+                                 a.getFileExtensions());
+    }
+
+    public void deleteArtifactType(String id) throws RPCException {
+        try {
+            artifactTypeDao.delete(id);
+        } catch (RuntimeException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void saveArtifactType(WArtifactType artifactType) throws RPCException, ItemExistsException {
+        try {
+            ArtifactType at = fromWeb(artifactType);
+            artifactTypeDao.save(at);
+        } catch (RuntimeException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (DuplicateItemException e) {
+            throw new ItemExistsException();
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    private ArtifactType fromWeb(WArtifactType wat) {
+        ArtifactType at = new ArtifactType();
+        at.setId(wat.getId());
+        at.setDescription(wat.getDescription());
+        at.setContentType(wat.getMediaType());
+        at.setDocumentTypes(fromWeb(wat.getDocumentTypes()));
+
+        HashSet<String> exts = new HashSet<String>();
+        exts.addAll(wat.getFileExtensions());
+        at.setFileExtensions(exts);
+
+        return at;
+    }
+
+    private Set<QName> fromWeb(Collection<String> documentTypes) {
+        if (documentTypes == null) return null;
+
+        Set<QName> s = new HashSet<QName>();
+        for (Object o : documentTypes) {
+            String qn = o.toString();
+            if (qn.startsWith("{}")) {
+                qn = qn.substring(2);
+            }
+
+            s.add(QName.valueOf(qn));
+        }
+        return s;
+    }
+
+    private OpRestriction getRestrictionForPredicate(SearchPredicate pred) {
+        String property = pred.getProperty();
+        String value = pred.getValue();
+        switch (pred.getMatchType()) {
+            case SearchPredicate.HAS_VALUE:
+                return OpRestriction.eq(property, value);
+            case SearchPredicate.LIKE:
+                return OpRestriction.like(property, value);
+            case SearchPredicate.DOES_NOT_HAVE_VALUE:
+                return OpRestriction.not(OpRestriction.eq(property, value));
+            default:
+                return null;
+        }
+    }
+
+    public WSearchResults getArtifacts(String workspaceId, 
+                                       String workspacePath, 
+                                       boolean includeChildWkspcs,
+                                       Set<SearchPredicate> searchPredicates, 
+                                       String freeformQuery,
+                                       int start, int maxResults) throws RPCException {
+        Query q = getQuery(searchPredicates, start, maxResults);
+
+        final String context = contextPathResolver.getContextPath();
+        
+        try {
+            if (workspaceId != null) {
+                Item workspace = ((Item)registry.getItemById(workspaceId));
+                List<Item> items = workspace.getItems();
+                List<Item> trimmedItems = new ArrayList<Item>();
+                for (int i = start; i < start+maxResults && i < items.size(); i++) {
+                    trimmedItems.add(items.get(i));
+                }
+                WSearchResults results = getSearchResults(null, trimmedItems, items.size());
+                results.setQuery("select artifact, entry from '@" + workspaceId + "'");
+                results.setFeed(getLink(context + "/api/registry", workspace));
+                results.setTotal(items.size());
+                return results;
+            } else if (workspacePath != null && !"".equals(workspacePath) && !"/".equals(workspacePath)) {
+                q.fromPath(workspacePath, includeChildWkspcs);
+            }
+            
+            SearchResults results;
+            if (freeformQuery != null && !freeformQuery.equals(""))
+                results = registry.search(freeformQuery, start, maxResults);
+            else
+                results = registry.search(q);
+
+            WSearchResults wr = getSearchResults(null, results.getResults(), results.getTotal());
+            wr.setQuery(q.toString());
+            wr.setFeed(context + "/api/registry?q=" + UrlEncoding.encode(wr.getQuery(), Profile.PATH.filter()));
+            return wr;
+        } catch (QueryException e) {
+            throw new RPCException(e.getMessage());
+        } catch (RegistryException e) {
+            log.error("Could not query the registry.", e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public Collection<ItemInfo> suggestItems(String query, boolean recursive, String excludePath, String[] types) throws RPCException {
+        try {
+            SearchResults results = registry.suggest(query, recursive, 10, excludePath, types);
+            
+            ArrayList<ItemInfo> entries = new ArrayList<ItemInfo>();
+            for (Item i : results.getResults()) {
+                entries.add(toWeb(i, false));
+            }
+            return entries;
+        } catch (QueryException e) {
+            throw new RPCException(e.getMessage());
+        } catch (RegistryException e) {
+            log.error("Could not query the registry.", e);
+            throw new RPCException(e.getMessage());
+        }
+    }
+    
+    private Query getQuery(Set<SearchPredicate> searchPredicates, int start, int maxResults) {
+        Query q = new Query().orderBy("name");
+
+        q.setMaxResults(maxResults);
+        q.setStart(start);
+        // Filter based on our search terms
+
+        if (searchPredicates != null) {
+            for (Object predObj : searchPredicates) {
+                SearchPredicate pred = (SearchPredicate) predObj;
+                q.add(getRestrictionForPredicate(pred));
+            }
+        }
+        return q;
+    }
+
+    private WSearchResults getSearchResults(String type, 
+                                            Collection<? extends Item> results,
+                                            long total) throws RegistryException {
+
+        WSearchResults wsr = new WSearchResults();
+        ItemRenderer view;
+//        if (type != null) {
+//            view = rendererManager.getRenderer(type);
+//        } else {
+            view = rendererManager.getDefaultRenderer();
+//        }
+
+
+        int col = 0;
+        for (String colName : view.getColumnNames()) {
+            if (view.isSummary(col)) {
+                wsr.getColumns().add(colName);
+            }
+            col++;
+        }
+        
+        for (Item i : results) {
+            wsr.getRows().add(toWeb(i, false));
+        }
+
+        wsr.setTotal(total);
+        return wsr;
+    }
+
+    public WSearchResults getArtifactsForView(String viewId,
+                                              int resultStart,
+                                              int maxResults)
+            throws RPCException {
+        try {
+            View view = artifactViewManager.getArtifactView(viewId);
+            SearchResults result = registry.search(view.getQuery(), resultStart, maxResults);
+            return getSearchResults(null, result.getResults(), result.getTotal());
+        } catch (QueryException e) {
+            throw new RPCException(e.getMessage());
+        } catch (RegistryException e) {
+            log.error("Could not query the registry.", e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public void deleteArtifactView(String id) throws RPCException {
+        artifactViewManager.delete(id);
+        // clean up recent views too
+        User user = getCurrentUser();
+        List<String> views = (List<String>) user.getProperties().get(RECENT_VIEWS);
+        boolean wasFound = views.remove(id);
+
+        assert wasFound : "View deleted, but no corresponding Recent Views entry found for " + id;
+    }
+
+    public WArtifactView getArtifactView(String id) throws RPCException, ItemExistsException, ItemNotFoundException {
+        User user = getCurrentUser();
+        try {
+            WArtifactView view = toWeb(artifactViewManager.getArtifactView(id));
+            updateRecentArtifactViews(user, id);
+
+            return view;
+        } catch (DuplicateItemException e) {
+            throw new ItemExistsException();
+        } catch (NotFoundException e) {
+            log.error(e.getMessage(), e);
+            throw new ItemNotFoundException();
+        }
+    }
+
+    private void updateRecentArtifactViews(User user, String id) throws DuplicateItemException, NotFoundException {
+        List<String> recent = getRecentArtifactViewIds(user);
+
+        // remove this id if it alread exists
+        recent.remove(id);
+
+        // add the view to the top of the list
+        recent.add(0, id);
+
+        while (recent.size() > 5) {
+            recent.remove(recent.size() - 1);
+        }
+
+        userManager.save(user);
+    }
+
+    @SuppressWarnings("unchecked")
+    private List<String> getRecentArtifactViewIds(User user) {
+        if (user.getProperties() == null) {
+            user.setProperties(new HashMap<String, Object>());
+        }
+        List<String> recent = (List<String>) user.getProperties().get(RECENT_VIEWS);
+
+        if (recent == null) {
+            recent = new ArrayList<String>();
+            user.getProperties().put(RECENT_VIEWS, recent);
+        }
+        return recent;
+    }
+
+    public Collection<WArtifactView> getArtifactViews() throws RPCException {
+        List<WArtifactView> views = new ArrayList<WArtifactView>();
+        User currentUser = getCurrentUser();
+        for (View v : artifactViewManager.getArtifactViews(currentUser)) {
+            views.add(toWeb(v));
+        }
+
+        Collections.sort(views, new Comparator<WArtifactView>() {
+            public int compare(WArtifactView v1, WArtifactView v2) {
+                return v1.getName().compareTo(v2.getName());
+            }
+        });
+        return views;
+    }
+
+    public Collection<WArtifactView> getRecentArtifactViews() throws RPCException {
+        List<WArtifactView> views = new ArrayList<WArtifactView>();
+        User currentUser = getCurrentUser();
+        List<String> ids = getRecentArtifactViewIds(currentUser);
+        if (ids != null) {
+            for (String id : ids) {
+                try {
+                    views.add(toWeb(artifactViewManager.getArtifactView(id)));
+                } catch (NotFoundException e) {
+                }
+            }
+        }
+        return views;
+    }
+
+    private WArtifactView toWeb(View v) throws RPCException {
+        WArtifactView wv = new WArtifactView();
+        if (v == null) {
+            return wv;
+        }
+        wv.setName(v.getName());
+        wv.setId(v.getId());
+
+        try {
+            if (v.isFreeform()) {
+                wv.setQueryString(v.getQuery());
+            } else {
+                Query q = Query.fromString(v.getQuery());
+    
+                wv.setPredicates(getPredicates(q));
+                wv.setWorkspace(q.getFromPath());
+                wv.setWorkspaceSearchRecursive(q.isFromRecursive());
+            }
+            
+            wv.setShared(v.getUser() == null);
+        } catch (QueryException e) {
+            log.error("Could not parse query. " + e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        }
+        return wv;
+    }
+
+    /**
+     * Convert a string query to a set of search predicates for the SearchForm.
+     * You'll see that we do not have full fidelity yet between text queries and
+     * the actual form. However, that is not a problem as we'll only ever encounter
+     * queries which were created with the form. So there are some cases here
+     * that we don't have to worry about.
+     *
+     * @param q
+     * @return
+     * @throws RPCException
+     */
+    public Set<SearchPredicate> getPredicates(Query q) throws RPCException {
+        Set<SearchPredicate> predicates = new HashSet<SearchPredicate>();
+
+        for (Restriction r : q.getRestrictions()) {
+            if (r instanceof OpRestriction) {
+                OpRestriction op = (OpRestriction) r;
+
+                Object left = op.getLeft();
+                Object right = op.getRight();
+                Operator operator = op.getOperator();
+
+                if (operator.equals(Operator.NOT)) {
+                    if (right instanceof OpRestriction) {
+                        OpRestriction op2 = (OpRestriction) right;
+
+                        predicates.add(new SearchPredicate(op2.getLeft().toString(),
+                                                           SearchPredicate.DOES_NOT_HAVE_VALUE,
+                                                           op2.getRight().toString()));
+                    } else {
+                        throw new RPCException("Query could not be converted.");
+                    }
+                } else if (operator.equals(Operator.EQUALS)) {
+                    predicates.add(new SearchPredicate(left.toString(), SearchPredicate.HAS_VALUE, right.toString()));
+                } else if (operator.equals(Operator.LIKE)) {
+                    predicates.add(new SearchPredicate(left.toString(), SearchPredicate.LIKE, right.toString()));
+                }
+            }
+        }
+        return predicates;
+    }
+
+    public String saveArtifactView(WArtifactView wv) throws RPCException {
+        View v = fromWeb(wv);
+
+        try {
+            artifactViewManager.save(v);
+            return v.getId();
+        } catch (DuplicateItemException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException("Couldn't save view.");
+        } catch (NotFoundException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException("The view being saved has been deleted.");
+        }
+    }
+
+    private View fromWeb(WArtifactView wv) throws RPCException {
+        View v = new View();
+        v.setId(wv.getId());
+        v.setName(wv.getName());
+        if (!wv.isShared()) {
+            v.setUser(getCurrentUser());
+        }
+        
+        if (wv.getQueryString() != null && !"".equals(wv.getQueryString())) {
+            v.setQuery(wv.getQueryString());
+            v.setFreeform(true);
+        } else {
+            Query query = getQuery(wv.getPredicates(), 0, 0);
+            query.fromPath(wv.getWorkspace(), wv.isWorkspaceSearchRecursive());
+    
+            v.setQuery(query.toString());
+            v.setFreeform(false);
+        }
+        
+        return v;
+    }
+
+    public Collection<WIndex> getIndexes() {
+        ArrayList<WIndex> windexes = new ArrayList<WIndex>();
+
+        Collection<Index> indices = indexManager.getIndexes();
+        for (Index idx : indices) {
+            windexes.add(toWeb(idx));
+        }
+
+        return windexes;
+    }
+
+    private WIndex toWeb(Index idx) {
+
+        ArrayList<String> docTypes = new ArrayList<String>();
+        if (idx.getDocumentTypes() != null) {
+            for (QName q : idx.getDocumentTypes()) {
+                docTypes.add(q.toString());
+            }
+        }
+        String qt;
+        if (String.class.equals(idx.getQueryType())) {
+            qt = "String";
+        } else {
+            qt = "QName";
+        }
+
+        return new WIndex(idx.getId(),
+                          idx.getDescription(),
+                          idx.getMediaType(),
+                          idx.getConfiguration().get("property"),
+                          idx.getConfiguration().get("expression"),
+                          idx.getIndexer(),
+                          qt,
+                          docTypes);
+    }
+
+    public WIndex getIndex(String id) throws RPCException {
+        try {
+            Index idx = indexManager.getIndex(id);
+            if (idx == null) {
+                return null;
+            }
+            return toWeb(idx);
+        } catch (Exception e) {
+            throw new RPCException("Could not find index " + id);
+        }
+    }
+
+    public void saveIndex(WIndex wi) throws RPCException {
+        try {
+            Index idx = fromWeb(wi);
+
+            indexManager.save(idx);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException("Couldn't save index.");
+        }
+    }
+
+    public void deleteIndex(String id, boolean removeArtifactMetadata) throws RPCException {
+        try {
+            indexManager.delete(id, removeArtifactMetadata);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException("Couldn't save index.");
+        }
+    }
+
+    private Index fromWeb(WIndex wi) throws RPCException {
+        Index idx = new Index();
+        idx.setId(wi.getId());
+        idx.setConfiguration(new HashMap<String, String>());
+        idx.setIndexer(wi.getIndexer());
+
+        if (idx.getIndexer().contains("Groovy")) {
+            idx.getConfiguration().put("script", wi.getExpression());
+        } else {
+            idx.getConfiguration().put("property", wi.getProperty());
+            idx.getConfiguration().put("expression", wi.getExpression());
+        }
+        idx.setIndexer(wi.getIndexer());
+        idx.setDescription(wi.getDescription());
+        idx.setMediaType(wi.getMediaType());
+
+        if (wi.getResultType().equals("String")) {
+            idx.setQueryType(String.class);
+        } else {
+            idx.setQueryType(QName.class);
+        }
+
+        Set<QName> docTypes = new HashSet<QName>();
+        for (Object o : wi.getDocumentTypes()) {
+            try {
+                docTypes.add(QName.valueOf(o.toString()));
+            } catch (IllegalArgumentException e) {
+                throw new RPCException("QName was formatted incorrectly: " + o.toString());
+            }
+        }
+        idx.setDocumentTypes(docTypes);
+        return idx;
+    }
+
+    public boolean itemExists(String path) throws RPCException {
+        try {
+            registry.getItemByPath(path);
+            return true;
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            return false;
+        } catch (AccessException e) {
+            // Not sure if this is the right thing to do, but
+            // I think we should err on the side of not showing what
+            // is in the registry
+            return false;
+        }
+            
+    }
+
+    public WLinks getLinks(String itemId, String property) throws RPCException {
+        try {
+            Item item = registry.getItemById(itemId);
+            Links links = item.getProperty(property);
+            PropertyDescriptor pd = typeManager.getPropertyDescriptor(property);
+            
+            return toWeb(links, pd);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        }
+
+    }
+
+    private WLinks toWeb(Links links, PropertyDescriptor pd) {
+        if (links == null) {
+            return null;
+        }
+        
+        WLinks wlinks = new WLinks();
+        
+        List<LinkInfo> deps = new ArrayList<LinkInfo>();
+        
+        for (Link l : links.getLinks()) {
+            deps.add(toWeb(l, false));
+        }
+        wlinks.setLinks(deps);
+        
+        deps = new ArrayList<LinkInfo>();
+        for (Link l : links.getReciprocalLinks()) {
+            deps.add(toWeb(l, true));
+        }
+        wlinks.setReciprocal(deps);
+        
+        
+        wlinks.setReciprocalName(pd.getConfiguration().values().iterator().next());
+        
+        return wlinks;
+    }
+    
+    private LinkInfo toWeb(Link l, boolean recip) {
+        Item i = recip ? l.getItem() : l.getLinkedTo();
+        String name;
+        int itemType;
+        String id = null;
+
+        if (i != null) {
+            itemType = LinkInfo.TYPE_ENTRY;
+            name = i.getPath();
+            id = i.getId();
+        } else if (i == null) {
+            itemType = LinkInfo.TYPE_NOT_FOUND;
+            name = l.getLinkedToPath();
+        } else {
+            throw new UnsupportedOperationException();
+        }
+        return new LinkInfo(l.getId(),
+                            l.isAutoDetected(),
+                            id,
+                            name,
+                            itemType,
+                            recip);
+    }
+
+    private ItemInfo toWebExtended(Item e, boolean showProperties) throws RegistryException {
+        ItemInfo info = toWeb(e, false);
+        
+        Set<Permission> permissions = accessControlManager.getPermissions(SecurityUtils.getCurrentUser(), e);
+        info.setModifiable(permissions.contains(Permission.MODIFY_ITEM));
+        info.setDeletable(permissions.contains(Permission.DELETE_ITEM));
+
+        if (e.isLocal()) {
+            info.setDefaultLifecycleId(e.getDefaultLifecycle().getId());
+        }
+
+        final String context = contextPathResolver.getContextPath();
+        info.setArtifactFeedLink(getLink(context + "/api/registry", e) + ";history");
+        info.setCommentsFeedLink(context + "/api/comments");
+        
+        List<WComment> wcs = info.getComments();
+
+        CommentManager commentManager = e.getCommentManager();
+        if (commentManager != null) {
+            List<Comment> comments = commentManager.getComments(e.getId());
+            for (Comment c : comments) {
+                final SimpleDateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATETIME_FORMAT);
+                WComment wc = new WComment(c.getId(), 
+                                           UserUtils.getUsername(c.getUser()), 
+                                           dateFormat.format(c
+                        .getDate().getTime()), c.getText());
+                wcs.add(wc);
+    
+                Set<Comment> children = c.getComments();
+                if (children != null && children.size() > 0) {
+                    addComments(wc, children);
+                }
+            }
+        }
+
+        populateProperties(e, info, showProperties);
+        
+        return info;
+    }
+
+    public ItemInfo getItemInfo(String itemId, boolean showHidden) throws RPCException, ItemNotFoundException {
+        try {
+            Item item = registry.getItemById(itemId);
+
+            return toWebExtended(item, showHidden);
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public ItemInfo getItemByPath(String path) throws RPCException, ItemNotFoundException {
+        try {
+            Item item = registry.getItemByPath(path);
+            return toWeb(item, false);
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private void populateProperties(Item item, ItemInfo vi, boolean showHidden) {
+        for (PropertyInfo p : item.getProperties()) {
+            if (!showHidden && !p.isVisible()) {
+                continue;
+            }
+
+            PropertyDescriptor pd = p.getPropertyDescriptor();
+            Extension ext = pd != null ? pd.getExtension() : null;
+            
+            Object val = toWeb(item, p, ext);
+
+            String desc = p.getDescription();
+            if (desc == null) {
+                desc = p.getName();
+            }
+            
+            String extId = ext != null ? ext.getId() : null;
+            
+            vi.getProperties().add(new WProperty(p.getName(), 
+                                                 desc, 
+                                                 (Serializable) val, 
+                                                 extId, 
+                                                 p.isLocked()));
+        }
+
+        Collections.sort(vi.getProperties(), new Comparator() {
+
+            public int compare(Object o1, Object o2) {
+                return ((WProperty) o1).getDescription().compareTo(((WProperty) o2).getDescription());
+            }
+
+        });
+    }
+
+    private Object toWeb(Item item, PropertyInfo p, Extension ext) {
+        if (ext instanceof LinkExtension) {
+            Links links = p.getValue();
+            
+            return toWeb(links, p.getPropertyDescriptor());
+        } else if (ext instanceof ArtifactExtension) {
+            return getLink(contextPathResolver.getContextPath() + "/api/registry", item.getParent()) 
+                + "?version=" + item.getName();
+        } else {
+            Object internalValue = p.getInternalValue();
+            
+            return convertQNames(internalValue);
+        }
+    }
+
+    /**
+     * This method is here temporarily until we can serialize qnames remotely
+     * @param val
+     */
+    private Object convertQNames(Object val) {
+        if (val instanceof Collection) {
+            List<String> objs = new ArrayList<String>();
+            for (Object o : (Collection) val) {
+                objs.add(o.toString());
+            }
+            return objs;
+        }
+        return val;
+    }
+
+    private String getLink(String base, Item a) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(base).append(a.getPath());
+        return sb.toString();
+    }
+
+    public WComment addComment(String entryId, String parentComment, String text) throws RPCException, ItemNotFoundException {
+        try {
+            Item item = registry.getItemById(entryId);
+
+            Comment comment = new Comment();
+            comment.setText(text);
+
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(new Date());
+            comment.setDate(cal);
+
+            comment.setUser(getCurrentUser());
+
+            Item w = (Item)item.getParent();
+            CommentManager commentManager = w.getCommentManager();
+            if (parentComment != null) {
+                Comment c = commentManager.getComment(parentComment);
+                if (c == null) {
+                    throw new RPCException("Invalid parent comment");
+                }
+                comment.setParent(c);
+            } else {
+                comment.setItem(item);
+            }
+            commentManager.addComment(comment);
+
+            SimpleDateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATETIME_FORMAT);
+            return new WComment(comment.getId(), 
+                                UserUtils.getUsername(comment.getUser()), 
+                                dateFormat.format(comment.getDate().getTime()), 
+                                comment.getText());
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    private User getCurrentUser() throws RPCException {
+        UserDetailsWrapper wrapper = (UserDetailsWrapper) SecurityContextHolder.getContext()
+                .getAuthentication().getPrincipal();
+        if (wrapper == null) {
+            throw new RPCException("No user is logged in!");
+        }
+        return wrapper.getUser();
+    }
+
+    private void addComments(WComment parent, Set<Comment> comments) {
+        for (Comment c : comments) {
+            SimpleDateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATETIME_FORMAT);
+            WComment child = new WComment(c.getId(), UserUtils.getUsername(c.getUser()), dateFormat.format(c.getDate()
+                    .getTime()), c.getText());
+            parent.getComments().add(child);
+
+            Set<Comment> children = c.getComments();
+            if (children != null && children.size() > 0) {
+                addComments(child, children);
+            }
+        }
+    }
+
+    public void setProperty(String itemId, String propertyName, Serializable propertyValue) throws RPCException, ItemNotFoundException, WPolicyException {
+        try {
+            Item item = registry.getItemById(itemId);
+
+            PropertyDescriptor pd = typeManager.getPropertyDescriptorByName(propertyName);
+            
+            Object value = getLocalValue(pd, propertyValue, item);
+            
+            item.setProperty(pd.getProperty(), value);
+            
+            registry.save(item);
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (PropertyException e) {
+            // occurs if property name is formatted wrong
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw toWeb(e);
+        }
+    }
+
+    public Object getLocalValue(PropertyDescriptor pd, 
+                                Serializable s, 
+                                Item item) 
+        throws NotFoundException, RegistryException, AccessException, RPCException {
+        if (pd != null && pd.getExtension() != null) {
+            Extension ext = pd.getExtension();
+            if (ext instanceof LinkExtension) {
+                Links links = item.getProperty(pd.getProperty());
+                WLinks wlinks = (WLinks) s;
+                
+                Collection<Link> linksToRemove = new ArrayList<Link>();
+                Collection<Link> linksToAdd = new ArrayList<Link>();
+                if (links != null) {
+                    linksToRemove.addAll(links.getLinks());
+                }
+                for (Iterator<LinkInfo> itr = wlinks.getLinks().iterator(); itr.hasNext();) {
+                    LinkInfo wl = itr.next();
+                    Link l = getLink(linksToRemove, wl);
+                    
+                    if (l != null) {
+                        linksToRemove.remove(l);
+                    } else {
+                        Item linkTo = registry.getItemByPath(wl.getItemName());
+                        
+                        Link link = new Link(item, linkTo, null, false);
+                        linksToAdd.add(link);
+                    }
+                }
+                
+                if (links != null) {
+                    for (Link l : linksToRemove) {
+                        links.removeLinks(l);
+                    }
+                    for (Link l : linksToAdd) {
+                        links.addLinks(l);
+                    }
+                }
+                
+                return linksToAdd;
+            } else if (ext instanceof ArtifactExtension) {
+                try {
+                    return new Object[] { uploadService.getFile(s.toString()),
+                                          "application/octet-stream" };
+                } catch (FileNotFoundException e) {
+                    throw new RPCException("An error occurred processing the file upload. Please try again.");
+                }
+            } else if (ext instanceof LifecycleExtension) {
+                List ids = (List) s;
+                
+                if (ids.size() != 2) {
+                    throw new RPCException("Lifecycle metadata is wrong length!");
+                }
+                
+                LifecycleManager lifecycleManager;
+                if (item != null) {
+                    lifecycleManager = item.getLifecycleManager();
+                } else {
+                    lifecycleManager = localLifecycleManager;
+                }
+                
+                return (Phase) lifecycleManager.getPhaseById((String)ids.get(1));
+            }
+        } 
+        return s;
+    }
+    
+    private Link getLink(Collection<Link> linkList, LinkInfo l) {
+        for (Link link : linkList) {
+            String path = link.getLinkedToPath();
+            if (link.getId().equals(l.getLinkId())
+                || (path != null && path.equals(l.getItemName()))) {
+                return link;
+            }
+        }
+        return null;
+    }
+
+    public void setPropertyForQuery(String query,
+                                    String propertyName, 
+                                    Serializable propertyValue)
+        throws RPCException, ItemNotFoundException, WPolicyException {
+        try {
+            SearchResults results = registry.search(query, 0, -1);
+            List<Item> items = new ArrayList<Item>();
+            for (Item item : results.getResults()) {
+                PropertyDescriptor pd = typeManager.getPropertyDescriptorByName(propertyName);
+                Extension ext = pd != null ? pd.getExtension() : null;
+                
+                setProperty(item, pd, propertyValue, ext, items);
+            }
+            
+            // don't save until we actually manage to set everything
+            for (Item i : items) {
+                registry.save(i);
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (PropertyException e) {
+            // occurs if property name is formatted wrong
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw toWeb(e);
+        }
+    }
+
+    public void setProperty(Collection<String> entryIds,
+                            String propertyName, 
+                            Serializable propertyValue)
+        throws RPCException, ItemNotFoundException, WPolicyException {
+        try {
+            List<Item> items = new ArrayList<Item>();
+            for (String itemId : entryIds) {
+                Item item = registry.getItemById(itemId);
+
+                PropertyDescriptor pd = typeManager.getPropertyDescriptorByName(propertyName);
+                Extension ext = pd != null ? pd.getExtension() : null;
+                
+                setProperty(item, pd, propertyValue, ext, items);
+            }
+            
+            // don't save until we actually manage to set everything
+            for (Item i : items) {
+                registry.save(i);
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (PropertyException e) {
+            // occurs if property name is formatted wrong
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw toWeb(e);
+        }
+    }
+
+    private void setProperty(Item item, 
+                             PropertyDescriptor pd, 
+                             Serializable propertyValue, 
+                             Extension ext,
+                             List<Item> items) throws PropertyException, PolicyException, NotFoundException,
+        RegistryException, AccessException, RPCException {
+        Object value = getLocalValue(pd, propertyValue, item);
+        
+        item.setProperty(pd.getProperty(), value);
+        items.add(item);
+    }
+
+    public void deleteProperty(String itemId, String propertyName) throws RPCException, ItemNotFoundException {
+        try {
+            Item item = registry.getItemById(itemId);
+            item.setProperty(propertyName, null);
+            registry.save(item);
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (PropertyException e) {
+            // occurs if property name is formatted wrong
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void deleteProperty(Collection<String> entryIds, String propertyName) throws RPCException, ItemNotFoundException {
+        try {
+            List<Item> items = new ArrayList<Item>();
+            for (String itemId : entryIds) {
+                Item item = registry.getItemById(itemId);
+                
+                item.setProperty(propertyName, null);
+                items.add(item);
+            }
+            // don't save until we actually delete everything
+            for (Item i : items) {
+                registry.save(i);
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (PropertyException e) {
+            // occurs if property name is formatted wrong
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void deletePropertyForQuery(String query, String propertyName) throws RPCException, ItemNotFoundException {
+        try {
+            SearchResults results = registry.search(query, 0, -1);
+            List<Item> items = new ArrayList<Item>();
+            for (Item item : results.getResults()) {
+                item.setProperty(propertyName, null);
+            }
+            // don't save until we actually delete everything
+            for (Item i : items) {
+                registry.save(i);
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (PropertyException e) {
+            // occurs if property name is formatted wrong
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void deletePropertyDescriptor(String id) throws RPCException {
+        typeManager.deletePropertyDescriptor(id);
+    }
+
+    public WPropertyDescriptor getPropertyDescriptor(String id) throws RPCException, ItemNotFoundException {
+        try {
+            return toWeb(typeManager.getPropertyDescriptor(id));
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        }
+    }
+
+    public List<WPropertyDescriptor> getPropertyDescriptors(boolean includeIndex) throws RPCException {
+        List<WPropertyDescriptor> pds = new ArrayList<WPropertyDescriptor>();
+        for (PropertyDescriptor pd : typeManager.getGlobalPropertyDescriptors(includeIndex)) {
+            pds.add(toWeb(pd));
+        }
+        return pds;
+    }
+
+    private WPropertyDescriptor toWeb(PropertyDescriptor pd) {
+        String ext = pd.getExtension() != null ? pd.getExtension().getId() : null;
+        
+        WPropertyDescriptor wpd = new WPropertyDescriptor(pd.getId(), pd.getProperty(), pd.getDescription(), ext, pd.isMultivalued(), pd.getConfiguration());
+        if (pd.getType() != null) {
+            wpd.setTypeId(pd.getType().getId());
+        }
+        return wpd;
+    }
+
+    public void savePropertyDescriptor(WPropertyDescriptor wpd) throws RPCException, ItemNotFoundException, ItemExistsException {
+        try {
+            PropertyDescriptor pd;
+
+            if (wpd.getId() == null) {
+                pd = new PropertyDescriptor();
+            } else {
+                pd = typeManager.getPropertyDescriptor(wpd.getId());
+            }
+
+            pd.setProperty(wpd.getName());
+            pd.setDescription(wpd.getDescription());
+            pd.setMultivalued(wpd.isMultiValued());
+            pd.setConfiguration(wpd.getConfiguration());
+            pd.setExtension(registry.getExtension(wpd.getExtension()));
+            
+            typeManager.savePropertyDescriptor(pd);
+
+            wpd.setId(pd.getId());
+        } catch (DuplicateItemException e) {
+            throw new ItemExistsException();
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    
+    public List<WType> getTypes() throws RPCException {
+        ArrayList<WType> types = new ArrayList<WType>();
+        for (Type type : typeManager.getTypes()) {
+            types.add(toWeb(type));
+        }
+        return types;
+    }
+
+    public WType getType(String id) throws RPCException {
+        try {
+            return toWeb(typeManager.getType(id));
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void saveType(WType wt) throws RPCException, ItemExistsException {
+        try {
+            Type type = fromWeb(wt);
+            
+            // have to do two phases of saving. First, get a type ID
+            // then use that type ID on any property that was created
+            List<PropertyDescriptor> props = type.getProperties();
+            type.setProperties(null);
+            
+            typeManager.saveType(type);
+            
+            for (PropertyDescriptor pd : props) {
+                typeManager.savePropertyDescriptor(pd);
+            }
+            
+            type.setProperties(props);
+            typeManager.saveType(type);
+            
+            wt.setId(type.getId());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (DuplicateItemException e) {
+            throw new ItemExistsException();
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    private Type fromWeb(WType wt) throws NotFoundException {
+        Type type = new Type();
+        type.setId(wt.getId());
+        type.setName(wt.getName());
+        type.setAllowedChildren(fromWebToTypes(wt.getAllowedChildrenIds()));
+        type.setMixins(fromWebToTypes(wt.getMixinIds()));
+        
+        List<PropertyDescriptor> properties = new ArrayList<PropertyDescriptor>();
+        for (WPropertyDescriptor wpd : wt.getProperties()) {
+            PropertyDescriptor pd;
+            if (wpd.getId() != null  && !"new".equals(wpd.getId())) {
+                pd = typeManager.getPropertyDescriptor(wpd.getId());
+            } else {
+                pd = new PropertyDescriptor();
+                pd.setMultivalued(wpd.isMultiValued());
+                pd.setConfiguration(wpd.getConfiguration());
+                pd.setExtension(registry.getExtension(wpd.getExtension()));
+            }
+            
+            pd.setProperty(wpd.getName());
+            pd.setDescription(wpd.getDescription());
+            
+            properties.add(pd);
+        }
+        type.setProperties(properties);
+        
+        return type;
+    }
+
+    private List<Type> fromWebToTypes(List<String> allowedChildrenIds) 
+        throws NotFoundException {
+        List<Type> types = new ArrayList<Type>();
+        for (String id : allowedChildrenIds) {
+            types.add(typeManager.getType(id));
+        }
+        return types;
+    }
+    
+    private List<String> toWeb(List<Type> children) {
+        if (children == null) return Collections.emptyList();
+        
+        List<String> types = new ArrayList<String>();
+        for (Type t : children) {
+            types.add(t.getId());
+        }
+        return types;
+    }
+
+    private WType toWeb(Type type) {
+        WType wt = new WType();
+        wt.setId(type.getId());
+        wt.setName(type.getName());
+        ArrayList<WPropertyDescriptor> pds = new ArrayList<WPropertyDescriptor>();
+        if (type.getProperties() != null) {
+            for (PropertyDescriptor pd : type.getProperties()) {
+                pds.add(toWeb(pd));
+            }
+        }
+        wt.setProperties(pds);
+        wt.setAllowedChildrenIds(toWeb(type.getAllowedChildren()));
+        wt.setMixinIds(toWeb(type.getMixins()));
+        wt.getMixinIds().remove(type.getId());
+        wt.setSystem(type.isSystemType());
+        
+        return wt;
+    }
+
+    public Map<String, String> getQueryProperties() throws RPCException {
+        return registry.getQueryProperties();
+    }
+    
+    public void move(String itemId, String workspacePath, String name) 
+        throws RPCException, ItemNotFoundException, WPolicyException {
+        try {
+            Item i = registry.getItemById(itemId);
+            
+            registry.move(i, workspacePath, name);
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw toWeb(e);
+        } catch (PropertyException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void delete(String itemId) throws RPCException, ItemNotFoundException {
+        try {
+            Item item = registry.getItemById(itemId);
+
+            item.delete();
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void delete(List<String> ids) throws RPCException, ItemNotFoundException {
+        try {
+            for (String id : ids) {
+                Item item = registry.getItemById(id);
+    
+                item.delete();
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void transition(Collection<String> entryIds, String lifecycle, String phase) throws RPCException, ItemNotFoundException {
+        
+    }
+
+    public Collection<WLifecycle> getLifecycles() throws RPCException {
+        Collection<Lifecycle> lifecycles = localLifecycleManager.getLifecycles();
+        Lifecycle defaultLifecycle = localLifecycleManager.getDefaultLifecycle();
+
+        ArrayList<WLifecycle> wls = new ArrayList<WLifecycle>();
+        for (Lifecycle l : lifecycles) {
+            WLifecycle lifecycle = toWeb(l, defaultLifecycle.equals(l));
+            wls.add(lifecycle);
+        }
+
+        return wls;
+    }
+
+    public WLifecycle getLifecycle(String id) throws RPCException {
+        try {
+            Lifecycle defaultLifecycle = localLifecycleManager.getDefaultLifecycle();
+
+            Lifecycle l = localLifecycleManager.getLifecycleById(id);
+
+            return toWeb(l, defaultLifecycle.equals(l));
+        } catch (Exception e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    private WLifecycle toWeb(Lifecycle l, boolean defaultLifecycle) {
+        WLifecycle lifecycle = new WLifecycle(l.getId(), l.getName(), defaultLifecycle);
+
+        List<WPhase> wphases = new ArrayList<WPhase>();
+        lifecycle.setPhases(wphases);
+
+        for (Phase p : l.getPhases().values()) {
+            WPhase wp = toWeb(p);
+            wphases.add(wp);
+
+            if (p.equals(l.getInitialPhase())) {
+                lifecycle.setInitialPhase(wp);
+            }
+        }
+
+        for (Phase p : l.getPhases().values()) {
+            WPhase wp = lifecycle.getPhase(p.getName());
+            List<WPhase> nextPhases = new ArrayList<WPhase>();
+
+            for (Phase next : p.getNextPhases()) {
+                WPhase wnext = lifecycle.getPhase(next.getName());
+
+                nextPhases.add(wnext);
+            }
+            wp.setNextPhases(nextPhases);
+        }
+
+        Collections.sort(wphases, new Comparator<WPhase>() {
+
+            public int compare(WPhase o1, WPhase o2) {
+                return o1.getName().compareTo(o2.getName());
+            }
+
+        });
+        return lifecycle;
+    }
+
+    private WPhase toWeb(Phase p) {
+        WPhase wp = new WPhase(p.getId(), p.getName());
+        return wp;
+    }
+
+    public Collection<String> getActivePoliciesForLifecycle(String lifecycleName, String workspaceId)
+            throws RPCException {
+        Collection<Policy> pols;
+        Lifecycle lifecycle = localLifecycleManager.getLifecycle(lifecycleName);
+        try {
+            if (workspaceId != null) {
+                Item w = (Item) registry.getItemById(workspaceId);
+                pols = policyManager.getActivePolicies(w, lifecycle);
+            } else {
+                pols = policyManager.getActivePolicies(lifecycle);
+            }
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+        return getArtifactPolicyIds(pols);
+    }
+
+    public Collection<String> getActivePoliciesForPhase(String lifecycle, 
+                                                        String phaseName, 
+                                                        String itemId)
+            throws RPCException {
+        Collection<Policy> pols;
+        Phase phase = localLifecycleManager.getLifecycle(lifecycle).getPhase(phaseName);
+        try {
+            if (itemId != null) {
+                Item w = (Item) registry.getItemById(itemId);
+                pols = policyManager.getActivePolicies(w, phase);
+            } else {
+                pols = policyManager.getActivePolicies(phase);
+            }
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+
+        return getArtifactPolicyIds(pols);
+    }
+
+    public void setActivePolicies(String itemId, 
+                                  String lifecycle, 
+                                  String phase, Collection<String> ids)
+            throws RPCException, WPolicyException, ItemNotFoundException {
+        Lifecycle l = localLifecycleManager.getLifecycle(lifecycle);
+        List<Policy> policies = getArtifactPolicies(ids);
+
+        try {
+            if (phase != null) {
+                Phase p = l.getPhase(phase);
+
+                if (p == null) {
+                    throw new RPCException("Invalid phase: " + phase);
+                }
+
+                List<Phase> phases = Arrays.asList(p);
+
+                if (itemId == null || "".equals(itemId)) {
+                    policyManager.setActivePolicies(phases, policies.toArray(new Policy[policies
+                            .size()]));
+                } else {
+                    Item w = (Item) registry.getItemById(itemId);
+                    policyManager.setActivePolicies(w, phases, policies.toArray(new Policy[policies
+                            .size()]));
+                }
+            } else {
+                if (itemId == null || "".equals(itemId)) {
+                    policyManager.setActivePolicies(l, policies.toArray(new Policy[policies.size()]));
+                } else {
+                    Item w = (Item) registry.getItemById(itemId);
+                    policyManager.setActivePolicies(w, l, policies
+                            .toArray(new Policy[policies.size()]));
+                }
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw toWeb(e);
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    private WPolicyException toWeb(PolicyException e) throws RPCException {
+        Map<ItemInfo, Collection<WApprovalMessage>> failures = new HashMap<ItemInfo, Collection<WApprovalMessage>>();
+        for (Map.Entry<Item, List<ApprovalMessage>> entry : e.getPolicyFailures().entrySet()) {
+            Item i = entry.getKey();
+            List<ApprovalMessage> approvals = entry.getValue();
+
+            try {
+                ItemInfo info = toWeb(i, false);
+    
+                ArrayList<WApprovalMessage> wapprovals = new ArrayList<WApprovalMessage>();
+                for (ApprovalMessage app : approvals) {
+                    wapprovals.add(new WApprovalMessage(app.getMessage(), app.isWarning()));
+                }
+    
+                failures.put(info, wapprovals);
+            } catch (RegistryException ex) {
+                log.error(ex.getMessage(), ex);
+                throw new RPCException(ex.getMessage());
+            }
+        }
+        return new WPolicyException(failures);
+    }
+
+    private List<Policy> getArtifactPolicies(Collection ids) {
+        List<Policy> policies = new ArrayList<Policy>();
+        for (Iterator itr = ids.iterator(); itr.hasNext();) {
+            String id = (String) itr.next();
+
+            Policy policy = policyManager.getPolicy(id);
+            policies.add(policy);
+        }
+        return policies;
+    }
+
+    private Collection<String> getArtifactPolicyIds(Collection<Policy> pols) {
+        ArrayList<String> polNames = new ArrayList<String>();
+        for (Policy ap : pols) {
+            polNames.add(ap.getId());
+        }
+        return polNames;
+    }
+
+    public Collection<WPolicy> getPolicies() throws RPCException {
+        Collection<Policy> policies = policyManager.getPolicies();
+        List<WPolicy> gwtPolicies = new ArrayList<WPolicy>();
+        for (Policy p : policies) {
+            gwtPolicies.add(toWeb(p));
+        }
+        Collections.sort(gwtPolicies, new Comparator<WPolicy>() {
+
+            public int compare(WPolicy o1, WPolicy o2) {
+                return o1.getName().compareTo(o2.getName());
+            }
+
+        });
+
+        return gwtPolicies;
+    }
+
+    public void saveLifecycle(WLifecycle wl) throws RPCException, ItemExistsException {
+        Lifecycle l = fromWeb(wl);
+
+        try {
+            localLifecycleManager.save(l);
+
+            if (wl.isDefaultLifecycle()) {
+                Lifecycle defaultLifecycle = localLifecycleManager.getDefaultLifecycle();
+
+                if (!defaultLifecycle.equals(l)) {
+                    localLifecycleManager.setDefaultLifecycle(l);
+                }
+            }
+        } catch (DuplicateItemException e) {
+            throw new ItemExistsException();
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void deleteLifecycle(String id) throws RPCException {
+        try {
+            String fallback = localLifecycleManager.getDefaultLifecycle().getId();
+
+            if (id.equals(fallback)) {
+                throw new RPCException("The default lifecycle cannot be deleted. Please assign " +
+                        "another lifecycle to be the default before deleting this one.");
+            }
+
+            localLifecycleManager.delete(id, fallback);
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    private Lifecycle fromWeb(WLifecycle wl) throws RPCException {
+        Lifecycle l = new Lifecycle();
+        l.setPhases(new HashMap<String, Phase>());
+        l.setName(wl.getName());
+        l.setId(wl.getId());
+
+        for (Object o : wl.getPhases()) {
+            WPhase wp = (WPhase) o;
+
+            Phase p = new Phase(l);
+            p.setId(wp.getId());
+            p.setName(wp.getName());
+            l.getPhases().put(p.getName(), p);
+        }
+
+        for (Object o : wl.getPhases()) {
+            WPhase wp = (WPhase) o;
+            Phase p = l.getPhase(wp.getName());
+            p.setNextPhases(new HashSet<Phase>());
+
+            if (wp.getNextPhases() != null) {
+                for (Object oNext : wp.getNextPhases()) {
+                    WPhase wNext = (WPhase) oNext;
+                    Phase next = l.getPhase(wNext.getName());
+
+                    p.getNextPhases().add(next);
+                }
+            }
+        }
+
+        if (wl.getInitialPhase() == null) {
+            throw new RPCException("You must set a phase as the initial phase.");
+        }
+
+        l.setInitialPhase(l.getPhase(wl.getInitialPhase().getName()));
+        return l;
+    }
+
+    private WPolicy toWeb(Policy p) {
+        WPolicy wap = new WPolicy();
+        wap.setId(p.getId());
+        wap.setDescription(p.getDescription());
+        wap.setName(p.getName());
+
+        return wap;
+    }
+
+    public Collection<WActivity> getActivities(Date from, Date to, 
+                                               String user,
+                                               String itemPath,
+                                               String text,
+                                               String eventTypeStr, int start,
+                                    int results, boolean ascending) throws RPCException {
+
+        if ("All".equals(user)) {
+            user = null;
+        }
+
+        if (from != null) {
+            Calendar c = Calendar.getInstance();
+            c.setTime(from);
+            c.set(Calendar.HOUR, 0);
+            c.set(Calendar.MINUTE, 0);
+            c.set(Calendar.SECOND, 0);
+            from = c.getTime();
+        }
+
+        if (to != null) {
+            Calendar c = Calendar.getInstance();
+            c.setTime(to);
+            c.set(Calendar.HOUR, 23);
+            c.set(Calendar.MINUTE, 59);
+            c.set(Calendar.SECOND, 59);
+            to = c.getTime();
+        }
+
+        EventType eventType = null;
+        if ("Info".equals(eventTypeStr)) {
+            eventType = EventType.INFO;
+        } else if ("Warning".equals(eventTypeStr)) {
+            eventType = EventType.WARNING;
+        } else if ("Error".equals(eventTypeStr)) {
+            eventType = EventType.ERROR;
+        }
+
+        
+        try {
+            String itemId = null;
+            if (itemPath != null && !"[All Items]".equals(itemPath)) {
+                try {
+                    itemId = registry.getItemByPath(itemPath).getId();
+                } catch (NotFoundException e) {
+                    throw new RPCException("You do not have sufficient permissions to view activities relating to that item.");
+                }
+            }
+            
+            Collection<Activity> activities = activityManager.getActivities(from, to, user, 
+                                                                            itemId, text,
+                                                                            eventType, start, 
+                                                                            results, ascending);
+
+            ArrayList<WActivity> wactivities = new ArrayList<WActivity>();
+
+            for (Activity a : activities) {
+                wactivities.add(createWActivity(a));
+            }
+            return wactivities;
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    protected WActivity createWActivity(Activity a) {
+        WActivity wa = new WActivity();
+        wa.setId(a.getId());
+        wa.setEventType(a.getEventType().getText());
+        if (a.getUser() != null) {
+            wa.setUsername(a.getUser().getUsername());
+            wa.setName(a.getUser().getName());
+        }
+        wa.setMessage(a.getMessage());
+        SimpleDateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATETIME_FORMAT);
+        wa.setDate(dateFormat.format(a.getDate().getTime()));
+        return wa;
+    }
+
+    public void setAccessControlManager(AccessControlManager accessControlManager) {
+        this.accessControlManager = accessControlManager;
+    }
+
+    public void setRegistry(Registry registry) {
+        this.registry = registry;
+    }
+
+    public void setTypeManager(TypeManager typeManager) {
+        this.typeManager = typeManager;
+    }
+
+    public void setLifecycleManager(LifecycleManager lifecycleManager) {
+        this.localLifecycleManager = lifecycleManager;
+    }
+
+    public void setArtifactTypeDao(ArtifactTypeDao artifactTypeDao) {
+        this.artifactTypeDao = artifactTypeDao;
+    }
+
+    public void setPolicyManager(PolicyManager policyManager) {
+        this.policyManager = policyManager;
+    }
+
+    public void setRendererManager(RendererManager viewManager) {
+        this.rendererManager = viewManager;
+    }
+
+    public void setActivityManager(ActivityManager activityManager) {
+        this.activityManager = activityManager;
+    }
+
+    public void setIndexManager(IndexManager indexManager) {
+        this.indexManager = indexManager;
+    }
+
+    public void setArtifactViewManager(ArtifactViewManager artifactViewManager) {
+        this.artifactViewManager = artifactViewManager;
+    }
+
+    public ContextPathResolver getContextPathResolver() {
+        return contextPathResolver;
+    }
+
+    public void setContextPathResolver(final ContextPathResolver contextPathResolver) {
+        this.contextPathResolver = contextPathResolver;
+    }
+
+    public EventManager getEventManager() {
+        return eventManager;
+    }
+
+    public void setEventManager(final EventManager eventManager) {
+        this.eventManager = eventManager;
+    }
+
+    public void setUploadService(UploadService uploadService) {
+        this.uploadService = uploadService;
+    }
+
+    public void setUserManager(UserManager userManager) {
+        this.userManager = userManager;
+    }
+    
+}

Copied: branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathResolver.java (from rev 2109, branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/ContextPathResolver.java) (0 => 2111)

--- branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathResolver.java	                        (rev 0)
+++ branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathResolver.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,85 @@
+/*
+ * $Id$
+ * --------------------------------------------------------------------------------------
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.mule.galaxy.web;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.springframework.web.context.ContextLoader;
+import org.springframework.web.context.WebApplicationContext;
+
+/**
+ * Correctly resolves root context path both for WAR deployments in root/non-root contexts,
+ * as well as for test runs. There's some inconsistent behavior across servlet containers
+ * in this regard, and then the case is complicated by embedded and test runs of Galaxy.
+ * You may need to deploy a related filter for things to work in some scenarios (already
+ * done in Galaxy out-of-the-box).
+ *
+ * @see org.mule.galaxy.web.ContextPathSaverFilter
+ */
+public class ContextPathResolver
+{
+    /**
+     * A resolved context path. Optional, may never get set in some embedded scenarios.
+     */
+    private final static AtomicReference<String> savedContextPath = new AtomicReference<String>(null);
+
+    /**
+     * Returns:
+     * <ul>
+     *  <li>"" (empty) string when no servlet container is available (e.g. a test run)
+     *  <li>"" (empty) string when deployed to a servlet container root context
+     *  <li>context path name otherwise
+     * </ul>
+     * @return path
+     */
+    public String getContextPath()
+    {
+        String path = savedContextPath.get();
+        if (path != null)
+        {
+            // we're running in a container, filter intercepted the context path
+            return path;
+        } else
+        {
+            path = "";
+        }
+
+        // otherwise, let's try to guess, as we're running either embedded or in a test
+        WebApplicationContext context = ContextLoader.getCurrentWebApplicationContext();
+        if (context != null)
+        {
+            path = context.getServletContext().getServletContextName();
+            // when deployed in a servlet container under the server root
+            if ("/".equals(path))
+            {
+                path = "";
+            }
+        }
+        return path;
+    }
+
+    /**
+     * Normally called by a {@link org.mule.galaxy.web.ContextPathSaverFilter}. 
+     * @param path resolved context path
+     */
+    public static void saveContextPath(String path)
+    {
+        savedContextPath.compareAndSet(null, path);
+    }
+}

Copied: branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java (from rev 2109, branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java) (0 => 2111)

--- branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java	                        (rev 0)
+++ branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,55 @@
+/*
+ * $Id$
+ * --------------------------------------------------------------------------------------
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.mule.galaxy.web;
+
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Saves the currently deployed context path.
+ * @see ContextPathResolver
+ */
+public class ContextPathSaverFilter implements Filter
+{
+    
+
+    public void init(FilterConfig config) throws ServletException
+    {
+
+    }
+
+    public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException
+    {
+        ContextPathResolver.saveContextPath(((HttpServletRequest) req).getContextPath());
+        chain.doFilter(req, resp);
+    }
+
+    public void destroy()
+    {
+    }
+
+}

Added: branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml (0 => 2111)

--- branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml	                        (rev 0)
+++ branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,46 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xmlns:tx="http://www.springframework.org/schema/tx"
+  xmlns:a="http://abdera.apache.org"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+    http://abdera.apache.org http://abdera.apache.org/schemas/abdera-spring.xsd">
+    
+
+    <bean id="coreGwtModule" class="org.mule.galaxy.web.GwtModule">
+      <property name="core" value="true"/>
+      <property name="name" value="org.mule.galaxy.web.Repository"/>
+      <property name="rpcServices">
+        <map>
+          <entry key="/galaxyService.rpc" value-ref="galaxyService" />
+          <entry key="/securityService.rpc" value-ref="gwtSecurityService" />
+          <entry key="/heartbeat.rpc" value-ref="heartbeatService"/>
+          <entry key="/admin.rpc" value-ref="adminService"/>
+          <entry key="/registry.rpc" value-ref="gwtRegistry" />
+        </map>
+      </property>
+    </bean>
+    
+    <bean id="gwtRegistry" class="org.mule.galaxy.repository.RegistryServiceImpl">
+      <property name="registry" ref="registry"/>
+      <property name="artifactTypeDao" ref="artifactTypeDao"/>
+      <property name="indexManager" ref="indexManager"/>
+      <property name="rendererManager" ref="rendererManager"/>
+      <property name="lifecycleManager" ref="lifecycleManager"/>
+      <property name="policyManager" ref="policyManager"/>
+      <property name="activityManager" ref="activityManager"/>
+      <property name="artifactViewManager" ref="artifactViewManager"/>
+      <property name="accessControlManager" ref="accessControlManager"/>
+      <property name="typeManager" ref="typeManager"/>
+      <property name="uploadService" ref="uploadService"/>
+      <property name="userManager" ref="userManager"/>
+      <property name="contextPathResolver">
+          <bean class="org.mule.galaxy.web.ContextPathResolver"/>
+      </property>
+      <property name="eventManager" ref="eventManager"/>
+    </bean>
+
+</beans>
\ No newline at end of file
Property changes on: branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date Id
Name: svn:eol-style
   + native

Modified: branches/product_cleanup/repository/server/src/test/java/org/mule/galaxy/web/server/RegistryServiceTest.java (2110 => 2111)

--- branches/product_cleanup/repository/server/src/test/java/org/mule/galaxy/web/server/RegistryServiceTest.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/server/src/test/java/org/mule/galaxy/web/server/RegistryServiceTest.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -20,27 +20,28 @@
 import org.mule.galaxy.policy.ApprovalMessage;
 import org.mule.galaxy.policy.Policy;
 import org.mule.galaxy.query.Query;
+import org.mule.galaxy.repository.RegistryServiceImpl;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryService;
+import org.mule.galaxy.repository.rpc.WApprovalMessage;
+import org.mule.galaxy.repository.rpc.WArtifactType;
+import org.mule.galaxy.repository.rpc.WComment;
+import org.mule.galaxy.repository.rpc.WIndex;
+import org.mule.galaxy.repository.rpc.WLifecycle;
+import org.mule.galaxy.repository.rpc.WLinks;
+import org.mule.galaxy.repository.rpc.WPolicyException;
+import org.mule.galaxy.repository.rpc.WProperty;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
+import org.mule.galaxy.repository.rpc.WSearchResults;
+import org.mule.galaxy.repository.rpc.WType;
 import org.mule.galaxy.test.AbstractGalaxyTest;
 import org.mule.galaxy.type.PropertyDescriptor;
 import org.mule.galaxy.type.Type;
 import org.mule.galaxy.type.TypeManager;
 import org.mule.galaxy.web.rpc.GalaxyService;
-import org.mule.galaxy.web.rpc.ItemInfo;
 import org.mule.galaxy.web.rpc.LinkInfo;
 import org.mule.galaxy.web.rpc.PluginTabInfo;
-import org.mule.galaxy.web.rpc.RegistryService;
 import org.mule.galaxy.web.rpc.SearchPredicate;
-import org.mule.galaxy.web.rpc.WApprovalMessage;
-import org.mule.galaxy.web.rpc.WArtifactType;
-import org.mule.galaxy.web.rpc.WComment;
-import org.mule.galaxy.web.rpc.WIndex;
-import org.mule.galaxy.web.rpc.WLifecycle;
-import org.mule.galaxy.web.rpc.WLinks;
-import org.mule.galaxy.web.rpc.WPolicyException;
-import org.mule.galaxy.web.rpc.WProperty;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
-import org.mule.galaxy.web.rpc.WSearchResults;
-import org.mule.galaxy.web.rpc.WType;
 import org.mule.galaxy.web.rpc.WUser;
 
 public class RegistryServiceTest extends AbstractGalaxyTest {

Modified: branches/product_cleanup/web/pom.xml (2110 => 2111)

--- branches/product_cleanup/web/pom.xml	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/web/pom.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -45,6 +45,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.mule.galaxy</groupId>
+            <artifactId>galaxy-repository-server</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
             <groupId>com.extjs</groupId>
             <artifactId>gxt</artifactId>
         </dependency>

Deleted: branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java (2110 => 2111)

--- branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,56 +0,0 @@
-/*
- * $Id$
- * --------------------------------------------------------------------------------------
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-package org.mule.galaxy.web;
-
-import org.mule.galaxy.web.server.ContextPathResolver;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Saves the currently deployed context path.
- * @see ContextPathResolver
- */
-public class ContextPathSaverFilter implements Filter
-{
-    
-
-    public void init(FilterConfig config) throws ServletException
-    {
-
-    }
-
-    public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException
-    {
-        ContextPathResolver.saveContextPath(((HttpServletRequest) req).getContextPath());
-        chain.doFilter(req, resp);
-    }
-
-    public void destroy()
-    {
-    }
-
-}

Deleted: branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/ContextPathResolver.java (2110 => 2111)

--- branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/ContextPathResolver.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/ContextPathResolver.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,85 +0,0 @@
-/*
- * $Id$
- * --------------------------------------------------------------------------------------
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-package org.mule.galaxy.web.server;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.springframework.web.context.ContextLoader;
-import org.springframework.web.context.WebApplicationContext;
-
-/**
- * Correctly resolves root context path both for WAR deployments in root/non-root contexts,
- * as well as for test runs. There's some inconsistent behavior across servlet containers
- * in this regard, and then the case is complicated by embedded and test runs of Galaxy.
- * You may need to deploy a related filter for things to work in some scenarios (already
- * done in Galaxy out-of-the-box).
- *
- * @see org.mule.galaxy.web.ContextPathSaverFilter
- */
-public class ContextPathResolver
-{
-    /**
-     * A resolved context path. Optional, may never get set in some embedded scenarios.
-     */
-    private final static AtomicReference<String> savedContextPath = new AtomicReference<String>(null);
-
-    /**
-     * Returns:
-     * <ul>
-     *  <li>"" (empty) string when no servlet container is available (e.g. a test run)
-     *  <li>"" (empty) string when deployed to a servlet container root context
-     *  <li>context path name otherwise
-     * </ul>
-     * @return path
-     */
-    public String getContextPath()
-    {
-        String path = savedContextPath.get();
-        if (path != null)
-        {
-            // we're running in a container, filter intercepted the context path
-            return path;
-        } else
-        {
-            path = "";
-        }
-
-        // otherwise, let's try to guess, as we're running either embedded or in a test
-        WebApplicationContext context = ContextLoader.getCurrentWebApplicationContext();
-        if (context != null)
-        {
-            path = context.getServletContext().getServletContextName();
-            // when deployed in a servlet container under the server root
-            if ("/".equals(path))
-            {
-                path = "";
-            }
-        }
-        return path;
-    }
-
-    /**
-     * Normally called by a {@link org.mule.galaxy.web.ContextPathSaverFilter}. 
-     * @param path resolved context path
-     */
-    public static void saveContextPath(String path)
-    {
-        savedContextPath.compareAndSet(null, path);
-    }
-}

Modified: branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml (2110 => 2111)

--- branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
     
     <bean id="coreGwtModule" class="org.mule.galaxy.web.GwtModule">
       <property name="core" value="true"/>
-      <property name="name" value="org.mule.galaxy.web.Galaxy"/>
+      <property name="name" value="org.mule.galaxy.web.Admin"/>
       <property name="rpcServices">
         <map>
           <entry key="/galaxyService.rpc" value-ref="galaxyService" />

--------------------------------------------------------------------- To unsubscribe from this list, please visit: http://admin.muleforge.org/manage_email

[galaxy-dev] [2109] branches/product_cleanup: Add in directories so eclipse can deal with refactoring correctly.

2009-12-15T14:31:05Z

[2109] branches/product_cleanup: Add in directories so eclipse can deal with refactoring correctly.

Revision: 2109
Author: dandiep
Date: 2009-12-15 16:31:05 -0600 (Tue, 15 Dec 2009)

Log Message

Add in directories so eclipse can deal with refactoring correctly.

Added Paths

branches/product_cleanup/repository/
branches/product_cleanup/repository/gwt-client/
branches/product_cleanup/repository/gwt-client/pom.xml
branches/product_cleanup/repository/gwt-client/src/
branches/product_cleanup/repository/gwt-client/src/main/
branches/product_cleanup/repository/gwt-client/src/main/java/
branches/product_cleanup/repository/server/
branches/product_cleanup/repository/server/pom.xml
branches/product_cleanup/repository/server/src/
branches/product_cleanup/repository/server/src/main/
branches/product_cleanup/repository/server/src/main/java/
branches/product_cleanup/repository/server/src/main/resources/
branches/product_cleanup/repository/server/src/test/
branches/product_cleanup/repository/server/src/test/java/
branches/product_cleanup/repository/server/src/test/resources/

Diff

Added: branches/product_cleanup/repository/gwt-client/pom.xml (0 => 2109)

--- branches/product_cleanup/repository/gwt-client/pom.xml	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/pom.xml	2009-12-15 22:31:05 UTC (rev 2109)
@@ -0,0 +1,114 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.mule.galaxy</groupId>
+        <artifactId>galaxy-parent</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.mule.galaxy</groupId>
+    <artifactId>galaxy-repository-gwt-client</artifactId>
+    <version>2.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>Galaxy Repository: GWT Client</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.mule.galaxy</groupId>
+            <artifactId>galaxy-gwt-client</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.java</include>
+                    <include>**/*.xml</include>
+                    <include>**/*.html</include>
+                    <include>**/*.css</include>
+                </includes>
+                <excludes>
+                    <!-- Required for better IDE support of GWT (avoid looped symlinks). -->
+                    <exclude>**/org/mule/galaxy/web/public/**</exclude>
+                </excludes>
+            </resource>
+        </resources>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.totsp.gwt</groupId>
+                        <artifactId>maven-googlewebtoolkit2-plugin</artifactId>
+                        <version>2.0-beta6</version>
+                        <configuration>
+                            <gwtVersion>${gwtVersion}</gwtVersion>
+                            <runTarget>org.mule.galaxy.web.Galaxy/Galaxy.html</runTarget>
+                            <style>OBF</style>
+                            <compileTargets>
+                                <value>org.mule.galaxy.web.Galaxy</value>
+                            </compileTargets>
+                            <extraJvmArgs>-Xss1024k -Xmx1024m -Dgwt.nowarn.legacy.tools</extraJvmArgs>
+                            <!--
+                                CRITICAL: This should be false so that filtered resources are used instead.
+                                Also required for better IDE support of GWT (avoid looped symlinks).
+                            -->
+                            <sourcesOnPath>false</sourcesOnPath>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <!-- These two goals enable automatic GWT setup, but are expirimental -->
+                                    <goal>setup</goal>
+                                    <goal>extractGwt</goal>
+
+                                    <!-- Compile GWT stuff -->
+                                    <goal>compile</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>nogwt</id>
+        </profile>
+    </profiles>
+    <repositories>
+        <repository>
+            <id>gwt-maven</id>
+            <url>http://dist.codehaus.org/mule/dependencies/maven2/</url>
+        </repository>
+        <repository>
+            <id>gwt-maven2</id>
+            <!-- <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> -->
+            <url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>gwt-maven</id>
+            <url>http://dist.codehaus.org/mule/dependencies/maven2/</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>gwt-maven2</id>
+            <!-- <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> -->
+	    <url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+</project>
Property changes on: branches/product_cleanup/repository/gwt-client/pom.xml
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date Id
Name: svn:eol-style
   + native

Added: branches/product_cleanup/repository/server/pom.xml (0 => 2109)

--- branches/product_cleanup/repository/server/pom.xml	                        (rev 0)
+++ branches/product_cleanup/repository/server/pom.xml	2009-12-15 22:31:05 UTC (rev 2109)
@@ -0,0 +1,59 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.mule.galaxy</groupId>
+        <artifactId>galaxy-parent</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.mule.galaxy</groupId>
+    <artifactId>galaxy-repository-server</artifactId>
+    <version>2.0-SNAPSHOT</version>
+    <name>Galaxy Repository: Server</name>
+    <dependencies>
+
+        <dependency>
+            <groupId>org.mule.galaxy</groupId>
+            <artifactId>galaxy-core</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mule.galaxy</groupId>
+            <artifactId>galaxy-core</artifactId>
+            <version>${version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mule.galaxy</groupId>
+            <artifactId>galaxy-repository-gwt-client</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.gwt</groupId>
+            <artifactId>gwt-servlet</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.gwt</groupId>
+            <artifactId>gwt-incubator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.gwt</groupId>
+            <artifactId>gwt-user</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mule.galaxy</groupId>
+            <artifactId>galaxy-testutils</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
Property changes on: branches/product_cleanup/repository/server/pom.xml
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date Id
Name: svn:eol-style
   + native

--------------------------------------------------------------------- To unsubscribe from this list, please visit: http://admin.muleforge.org/manage_email

[galaxy-dev] [2108] branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util: More unused classes

2009-12-15T13:29:26Z

[2108] branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util: More unused classes

Revision: 2108
Author: dandiep
Date: 2009-12-15 15:29:26 -0600 (Tue, 15 Dec 2009)

Log Message

More unused classes

Removed Paths

branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCBox.java
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCButton.java
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCDatePicker.java
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCHelper.java

Diff

Deleted: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCBox.java (2107 => 2108)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCBox.java	2009-12-15 18:24:26 UTC (rev 2107)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCBox.java	2009-12-15 21:29:26 UTC (rev 2108)
@@ -1,91 +0,0 @@
-/*
- * Copyright 2007 Manuel Carrasco MoÃ±ino. (manuel_carrasco at users.sourceforge.net) 
- * http://code.google.com/p/gwtchismes
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.mule.galaxy.web.client.util;
-
-import com.google.gwt.user.client.ui.DockPanel;
-import com.google.gwt.user.client.ui.FlowPanel;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.Panel;
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.DockPanel.DockLayoutConstant;
-
-import java.util.Iterator;
-
-public class GWTCBox extends Panel {
-    HTML title = null;
-    HTML text = null;
-    DockPanel panel = new DockPanel();
-    public static String CONFIG_BLUE = "x-box-blue";
-        public void add(Widget w) {
-                panel.add(w, DockPanel.NORTH);
-        }
-    public void add(Widget widget, DockLayoutConstant direction) {
-        panel.add(widget, direction);
-    }
-        public boolean remove(Widget w) {
-                return panel.remove(w);
-        }
-        public Iterator iterator() {
-                return panel.iterator();
-        }
-        
-        public static final String STYLE_NORMAL = "x-box";
-        public static final String STYLE_BLUE = "x-box-blue";
-        
-        public GWTCBox() {
-                this(STYLE_NORMAL);
-        }
-        public GWTCBox(String style) {
-        FlowPanel m = new FlowPanel();
-                m.setStyleName("x-box");
-                m.addStyleName(style);
-                String[] v = {"t", "m", "b"};
-                String[] h = {"l", "r", "c"};
-                for (int i = 0; i < 3; i++) {
-                        Panel l = null;
-                        for (int j = 0; j < 3; j++) {
-                                Panel e = new SimplePanel();
-                                e.setStyleName("x-box-" + v[i] + h[j]);
-                    if (j==0) 
-                        m.add(e);
-                    else if (i==1 && j==2) 
-                        e.add(panel);
-                    if (l !=null ) 
-                        l.add(e);
-                    l = e;
-            }
-        }
-                setElement(m.getElement());
-        }
-        
-        public void setTitle(String title) {
-            if (this.title == null) {
-                this.title = new HTML();
-                panel.add(this.title, DockPanel.NORTH);
-            }
-            this.title.setHTML("<h3>" + title + "</h3>");
-        }
-    public void setText(String text) {
-        if (this.text == null) {
-            this.text = new HTML();
-            panel.add(this.text, DockPanel.CENTER);
-        }
-        this.title.setHTML("<p>" + text + "</p>");
-    }
-}

Deleted: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCButton.java (2107 => 2108)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCButton.java	2009-12-15 18:24:26 UTC (rev 2107)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCButton.java	2009-12-15 21:29:26 UTC (rev 2108)
@@ -1,154 +0,0 @@
-/*
- * Copyright 2007 Manuel Carrasco MoÃ±ino. (manuel_carrasco at users.sourceforge.net) 
- * http://code.google.com/p/gwtchismes
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.mule.galaxy.web.client.util;
-
-import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.Event;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.ClickListenerCollection;
-import com.google.gwt.user.client.ui.FlexTable;
-import com.google.gwt.user.client.ui.MouseListener;
-import com.google.gwt.user.client.ui.MouseListenerCollection;
-import com.google.gwt.user.client.ui.SourcesClickEvents;
-import com.google.gwt.user.client.ui.SourcesMouseEvents;
-import com.google.gwt.user.client.ui.UIObject;
-import com.google.gwt.user.client.ui.Widget;
-
-public class GWTCButton extends Widget implements SourcesMouseEvents, SourcesClickEvents {
-    public static int BUTTON_TYPE_1 = 1;
-    public static int BUTTON_TYPE_2 = 2;
-    
-        private FlexTable container = new FlexTable();
-        private boolean enabled = true;
-    private int contentIndex = 1;
-    private String[] styleComponentsType1 = {"x-btn", "left", "center", "right"};
-    private String[] styleComponentsType2 = {"my-btn", "l", "ml", "c", "mr", "r"};
-    private String[] styleComponents;
-    
-    public GWTCButton() {
-        this(2);
-    }
-    public GWTCButton(int type) {
-        if (type == BUTTON_TYPE_1) {
-            contentIndex = 1;
-            styleComponents = styleComponentsType1;
-        } else {
-            contentIndex = 2;
-            styleComponents = styleComponentsType2;
-        }
-        setElement(container.getElement());
-        container.setStyleName(styleComponents[0]);
-        container.addStyleName("my-no-selection");
-        container.setCellSpacing(0);
-        container.setCellPadding(0);
-        for (int idx = 1; idx < styleComponents.length; idx++) {
-            container.setHTML(0, idx -1 , "<i>&nbsp;</i>");
-            container.getCellFormatter().setStyleName(0, idx -1, styleComponents[0] + "-" + styleComponents[idx]);
-        }
-        sinkEvents(Event.MOUSEEVENTS);
-        addMouseListener(mouseOverListener);
-    }
-        public GWTCButton(String html, ClickListener listener) {
-                this(html);
-                addClickListener(listener);
-        }
-        public GWTCButton(String html) {
-                this();
-                setHTML(html);
-        }
-    public GWTCButton(int type, String html, ClickListener listener) {
-        this(type);
-        setHTML(html);
-        addClickListener(listener);
-    }
-
-        
-    
-    public void setText(String text) {
-        setHTML(text);
-    }
-
-        public void setHTML(String html) {
-                container.setHTML(0, contentIndex, html);
-        }
-        
-        public void click() {
-                clickListeners.fireClick(this);
-        }
-
-        public void onBrowserEvent(Event event) {
-                mouseListeners.fireMouseEvent(this, event);
-                if (enabled && DOM.eventGetType(event) == Event.ONCLICK) {
-            removeStyleName(UIObject.getStylePrimaryName(this.getElement()) + "-down");
-            removeStyleName(UIObject.getStylePrimaryName(this.getElement()) + "-over");
-                        clickListeners.fireClick(this);
-                }
-        }
-        
-        public void setEnabled(boolean enabled) {
-                this.enabled = enabled;
-                if (enabled) {
-                        this.removeStyleName(UIObject.getStylePrimaryName(getElement()) + "-disabled");
-                } else {
-                        this.addStyleName(UIObject.getStylePrimaryName(getElement()) + "-disabled");
-                }
-        }
-        
-
-        // SourcesMouseEvents Methods
-        private MouseListenerCollection mouseListeners = new MouseListenerCollection();
-        public void addMouseListener(MouseListener listener) {
-                mouseListeners.add(listener);
-        }
-        public void removeMouseListener(MouseListener listener) {
-                mouseListeners.remove(listener);
-        }
-        // SourcesClickEvents Methods
-        private ClickListenerCollection clickListeners = new ClickListenerCollection();
-        public void addClickListener(ClickListener listener) {
-                clickListeners.add(listener);
-        }
-        public void removeClickListener(ClickListener listener) {
-                clickListeners.remove(listener);
-        }
-
-
-        // A listener for changing style when the mouse is over
-        public static final MouseListener mouseOverListener = new MouseListener() {
-                public void onMouseUp(Widget sender, int x, int y) {
-                    sender.removeStyleName(UIObject.getStylePrimaryName(sender.getElement()) + "-down");
-                }
-
-                public void onMouseMove(Widget sender, int x, int y) {
-                }
-
-        public void onMouseEnter(Widget sender) {
-            sender.addStyleName(UIObject.getStylePrimaryName(sender.getElement()) + "-over");
-        }
-        
-                public void onMouseLeave(Widget sender) {
-            sender.removeStyleName(UIObject.getStylePrimaryName(sender.getElement()) + "-down");
-                        sender.removeStyleName(UIObject.getStylePrimaryName(sender.getElement()) + "-over");
-                }
-
-                public void onMouseDown(Widget sender, int x, int y) {
-            sender.addStyleName(UIObject.getStylePrimaryName(sender.getElement()) + "-down");
-                }
-        };
-
-}

Deleted: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCDatePicker.java (2107 => 2108)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCDatePicker.java	2009-12-15 18:24:26 UTC (rev 2107)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCDatePicker.java	2009-12-15 21:29:26 UTC (rev 2108)
@@ -1,865 +0,0 @@
-package org.mule.galaxy.web.client.util;
-
-/*
- * Copyright 2007 Manuel Carrasco MoÃ±ino. (manuel_carrasco at users.sourceforge.net) 
- * http://code.google.com/p/gwtchismes
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.ChangeListener;
-import com.google.gwt.user.client.ui.ChangeListenerCollection;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DialogBox;
-import com.google.gwt.user.client.ui.DockPanel;
-import com.google.gwt.user.client.ui.FlexTable;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.HasAlignment;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Panel;
-import com.google.gwt.user.client.ui.SourcesChangeEvents;
-import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
-
-import java.util.Date;
-
-/**
- * @author Manuel Carrasco MoÃ±ino
- * 
-     <h3>Class description</h3>
-       <p>
-         A widget to pick a date. It could be implemented as an independent
-         dialog box or it could be included into another widget.
-       </p>
-       <p>
-         You can configure minimalDate, maximalDate, cursorDate and locales
-         (day names, month names, help, and weekStart)
-       </p>
-       <p>
-         This class has public static methods useful for Date manipulation
-       </p>
-   <h3>Example</h3>
-      <pre>
-        // Configure internationalized strings using english language
-        private String[] days_en = new String[] { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" };
-        private String[] months_en = new String[] { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" };
-        
-        // Create a GWTCDatePicker that is show into the page
-        final GWTCDatePicker picker_en = new GWTCDatePicker(false);
-        // Internationalization
-        picker_en.setLocale(days_en, months_en, 0);
-        // Disable close button, becouse it is not a dialog
-        picker_en.disableCloseButton();
-        // Configure limits
-        picker_en.setMinimalDate(GWTCDatePicker.increaseYear(new Date(), -1));
-        picker_en.setMaximalDate(GWTCDatePicker.increaseYear(new Date(), 10));
-        // Add an action when the user selects a day
-        picker_en.addChangeListener(new ChangeListener() {
-            public void onChange(Widget sender) {
-                Window.alert(picker_en.getSelectedDateStr("MMMM dd, yyyy (dddd)"));
-            }
-        });
-        // Repaint the calendar
-        picker_en.drawCalendar();
-        
-      </pre>        
-       
-       <h3>CSS Style Rules</h3>
-         <ul>
-           <li>.GWTCDatePicker { GWTCDatePicket container, it can be overwritten }</li>
-           <li>.Caption { calendar text }</li>
-           <li>.Cal_buttons { navigation buttons }</li>
-           <li>.Cal_Header { text with the current month and year }</li>
-           <li>.Cal_WeekHeader { week headers row}</li>
-           <li>.Cal_CellDayNames { cells with day names} </li>
-           <li>.Cal_CellEmpty { cell without days }</li>
-           <li>.Cal_InvalidDay { cell with days which can not be selected because are out of the allowed interval }</li>
-           <li>.Cal_Selected { selected day }</li>
-           <li>.Cal_AfterSelected { days after the selected day and before the maximal day } </li>
-           <li>.Cal_BeforeSelected { days before the selected day and after the minimal day}</li>
-           <li>.Cal_Today { today } </li>
-         </ul>
- */
-public class GWTCDatePicker extends Composite implements ClickListener, SourcesChangeEvents {
-    // Style classes
-    private String styleName = "GWTCDatePicker";
-
-    private static String StyleCButtons = "Cal_Buttons";
-
-    private static String StyleCHeader = "Cal_Header";
-
-    private static String StyleCGrid = "Cal_Grid";
-
-    private static String StyleCWeekHeader = "Cal_WeekHeader";
-
-    private static String StyleCCellDayNames = "Cal_CellDayNames";
-
-    private static String StyleCCellEmpty = "Cal_CellEmpty";
-
-    private static String StyleCCellDays = "Cal_CellDays";
-
-    private static String StyleCInvalidDay = "Cal_InvalidDay";
-
-    private static String StyleCSelected = "Cal_Selected";
-
-    private static String StyleCAfterSelected = "Cal_AfterSelected";
-
-    private static String StyleCBeforeSelected = "Cal_BeforeSelected";
-
-    private static String StyleCToday = "Cal_Today";
-
-    // Configurable parameters
-
-    private Date minimalDate = setHourToZero(new Date());
-
-    private Date selectedDate = setHourToZero(new Date());
-
-    private Date cursorDate = setHourToZero(new Date());
-
-    private Date maximalDate = GWTCDatePicker.increaseDate(selectedDate, 365);
-    
-    private boolean useCellLinks = false;
-
-    // Internationalizable elements
-    private String[] days = new String[] { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" };
-
-    private String[] months = new String[] { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" };
-
-    private int weekStart = 0;
-
-    private String helpStr = "Calendar-Picker is a component of GWTChismes library.\n" +
-                                             "(c) Manuel Carrasco 2007\nhttp://code.google.com/p/gwtchismes\n\n" +
-                                             "Navigation buttons:\n" +
-                                             "\u003c Previous Month\n\u003e Next Month\n\u00AB Previous Year\n\u00BB Next Year\n- Actual Month\nx Close\n ";
-
-    // Containers
-    private Panel outer = new VerticalPanel();
-
-    private DialogBox calendarDlg = null;
-
-    // Navigation Buttons
-    private final DockPanel navButtons = new DockPanel();
-
-    private final DockPanel bottonButtons = new DockPanel();
-
-    private final DockPanel topButtons = new DockPanel();
-
-    private final HTML titleBtn = new HTML();
-
-    private final GWTCButton helpBtn = new GWTCButton("?", this);
-
-    private final GWTCButton closeBtn = new GWTCButton("x", this);
-
-    private final GWTCButton actualMBtn = new GWTCButton("-", this);
-
-    // public final GWTCButton prevMBtn = new GWTCButton("\u003c", this);
-    private final GWTCButton prevMBtn = new GWTCButton("&lt;", this);
-
-    private final GWTCButton prevYBtn = new GWTCButton("\u00AB", this);
-
-    private final GWTCButton nextMBtn = new GWTCButton("\u003e", this);
-
-    private final GWTCButton nextYBtn = new GWTCButton("\u00BB", this);
-
-    private HorizontalPanel prevButtons = new HorizontalPanel();
-
-    private HorizontalPanel nextButtons = new HorizontalPanel();
-    
-    private boolean needsRedraw = true;
-    
-    public static int CONFIG_DIALOG = 1;
-    public static int CONFIG_BORDERS = 2;
-
-    /**
-     * Constructor, you need specify the behaviour: floating dialog box or embeded widget
-     * 
-     * @param dialog
-     *            true if you wan an independient and drageable dialog box when
-     *            the picker is showed
-     */
-    public GWTCDatePicker(boolean dialog) {
-        if (dialog)
-            initialize(CONFIG_DIALOG);
-        else
-            initialize(0);
-        
-    }
-    public GWTCDatePicker(int config) {
-        initialize(config);
-    }
-    private void initialize(int config) {
-        if ((config & CONFIG_BORDERS) == CONFIG_BORDERS) {
-            outer = new GWTCBox();
-        }
-        if ((config & CONFIG_DIALOG) == CONFIG_DIALOG) {
-            calendarDlg = new DialogBox();
-            calendarDlg.setWidget(outer);
-            initWidget(new DockPanel());
-        } else {
-            initWidget(outer);
-            drawCalendar();
-        }
-        setStyleName(styleName);
-
-        navButtons.setStyleName(GWTCDatePicker.StyleCButtons);
-        titleBtn.setStyleName(GWTCDatePicker.StyleCHeader);
-
-        navButtons.add(bottonButtons, DockPanel.SOUTH);
-        navButtons.add(topButtons, DockPanel.NORTH);
-
-        prevButtons.add(prevYBtn);
-        prevButtons.add(prevMBtn);
-        nextButtons.add(nextMBtn);
-        nextButtons.add(nextYBtn);
-
-        bottonButtons.add(prevButtons, DockPanel.WEST);
-        bottonButtons.add(actualMBtn, DockPanel.CENTER);
-        bottonButtons.add(nextButtons, DockPanel.EAST);
-        bottonButtons.setVerticalAlignment(DockPanel.ALIGN_MIDDLE);
-        bottonButtons.setCellVerticalAlignment(actualMBtn, HasAlignment.ALIGN_MIDDLE);
-        bottonButtons.setCellHorizontalAlignment(prevButtons, DockPanel.ALIGN_LEFT);
-        bottonButtons.setCellHorizontalAlignment(nextButtons, DockPanel.ALIGN_RIGHT);
-        bottonButtons.setCellHorizontalAlignment(actualMBtn, HasAlignment.ALIGN_CENTER);
-        bottonButtons.setCellWidth(actualMBtn, "100%");
-        actualMBtn.setWidth("100%");
-
-        topButtons.add(helpBtn, DockPanel.WEST);
-        topButtons.add(titleBtn, DockPanel.CENTER);
-        topButtons.add(closeBtn, DockPanel.EAST);
-        topButtons.setVerticalAlignment(DockPanel.ALIGN_MIDDLE);
-        topButtons.setCellVerticalAlignment(titleBtn, HasAlignment.ALIGN_MIDDLE);
-        topButtons.setCellHorizontalAlignment(helpBtn, DockPanel.ALIGN_LEFT);
-        topButtons.setCellHorizontalAlignment(closeBtn, DockPanel.ALIGN_RIGHT);
-        topButtons.setCellHorizontalAlignment(titleBtn, HasAlignment.ALIGN_CENTER);
-        topButtons.setCellWidth(titleBtn, "100%");
-
-    }
-
-    /**
-     * Sets the object's style name to the calendar container, removing all
-     * other styles.
-     * 
-     * @see com.google.gwt.user.client.ui.UIObject#setStyleName(java.lang.String)
-     */
-    public void setStyleName(String s) {
-        styleName = s;
-        if (calendarDlg != null) {
-            calendarDlg.setStyleName(styleName);
-        } else
-            outer.setStyleName(styleName);
-    }
-
-    /**
-     * Adds a secondary or dependent style name to this object
-     * 
-     * @see com.google.gwt.user.client.ui.UIObject#addStyleName(java.lang.String)
-     */
-    public void addStyleName(String s) {
-        if (calendarDlg != null) {
-            calendarDlg.addStyleName(s);
-        } else
-            outer.addStyleName(s);
-    }
-
-    /**
-     * Draw or redraw all calendar elements into the container
-     * 
-     */
-    public void drawCalendar() {
-        if (this.isVisible() == false)
-            return;
-        if (!needsRedraw)
-            return;
-
-        FlexTable grid = new FlexTable();
-        grid.setStyleName(GWTCDatePicker.StyleCGrid);
-        grid.setCellSpacing(0);
-
-        outer.clear();
-        outer.add(navButtons);
-        outer.add(grid);
-
-        titleBtn.setHTML(GWTCDatePicker.formatDate("MMMM, yyyy", cursorDate, months, days));
-
-        grid.getRowFormatter().setStyleName(0, GWTCDatePicker.StyleCWeekHeader);
-        int l = 0;
-        for (int i = weekStart; i < 7; i++) {
-            grid.getCellFormatter().setStyleName(0, l, GWTCDatePicker.StyleCCellDayNames);
-            grid.setText(0, l++, ((String) days[i]).substring(0, 3));
-        }
-        if (l < 7) {
-            grid.getCellFormatter().setStyleName(0, l, GWTCDatePicker.StyleCCellDayNames);
-            grid.setText(0, l++, ((String) days[0]).substring(0, 3));
-        }
-
-        Date firstDate = new Date(cursorDate.getYear(), cursorDate.getMonth(), 1);
-        long todayNum = 1 + GWTCDatePicker.compareDate(firstDate, new Date());
-        long minimalNum = 1 + GWTCDatePicker.compareDate(firstDate, minimalDate);
-        long maximalNum = 1 + GWTCDatePicker.compareDate(firstDate, maximalDate);
-        long selectedNum = 1 + GWTCDatePicker.compareDate(firstDate, selectedDate);
-        // long cursorNum = 1 + DatePicker.compareDate(firstDate,
-        // cursorDate);
-        int firstWDay = firstDate.getDay();
-        int numOfDays = GWTCDatePicker.daysInMonth(cursorDate);
-        int j = 0 + weekStart;
-
-        for (int i = 1; i < 7; i++) { // each row in the grid
-            for (int k = 0; k < 7; k++, j++) { // each day in the week
-                int displayNum = (firstWDay < weekStart) ? (j - firstWDay - 6) : (j - firstWDay + 1);
-                if (j < firstWDay || displayNum > numOfDays || displayNum <= 0) {
-                    grid.getCellFormatter().setStyleName(i, k, GWTCDatePicker.StyleCCellEmpty);
-                    grid.setHTML(i, k, "&nbsp;");
-                } else {
-                    HTML html = new CellHTML(displayNum, useCellLinks);
-                    grid.getCellFormatter().setStyleName(i, k, GWTCDatePicker.StyleCCellDays);
-                    html.setStyleName(GWTCDatePicker.StyleCCellDays);
-                    if (displayNum < minimalNum || displayNum > maximalNum) {
-                        html.addStyleName(GWTCDatePicker.StyleCInvalidDay);
-                        grid.getCellFormatter().addStyleName(i, k, GWTCDatePicker.StyleCInvalidDay);
-                    } else if (displayNum == selectedNum) {
-                        html.addStyleName(GWTCDatePicker.StyleCSelected);
-                        grid.getCellFormatter().addStyleName(i, k, GWTCDatePicker.StyleCSelected);
-                        html.addClickListener(this);
-                    } else if (displayNum >= selectedNum) {
-                        html.addStyleName(GWTCDatePicker.StyleCAfterSelected);
-                        grid.getCellFormatter().addStyleName(i, k, GWTCDatePicker.StyleCAfterSelected);
-                        html.addClickListener(this);
-                    } else {
-                        html.addStyleName(GWTCDatePicker.StyleCBeforeSelected);
-                        grid.getCellFormatter().addStyleName(i, k, GWTCDatePicker.StyleCBeforeSelected);
-                        html.addClickListener(this);
-                    }
-                    if (displayNum == todayNum) {
-                        html.addStyleName(GWTCDatePicker.StyleCToday);
-                        grid.getCellFormatter().addStyleName(i, k, GWTCDatePicker.StyleCToday);
-                    }
-                    // else if (displayNum == cursorNum) {
-                    // grid.getCellFormatter().addStyleName(i, k, "Cal_Cursor");
-                    // }
-                    grid.setWidget(i, k, html);
-                }
-            }
-        }
-        prevMBtn.setEnabled(isVisibleMonth(cursorDate, -1));
-        nextMBtn.setEnabled(isVisibleMonth(cursorDate, 1));
-        prevYBtn.setEnabled(isVisibleMonth(cursorDate, -12));
-        nextYBtn.setEnabled(isVisibleMonth(cursorDate, 12));
-        
-        needsRedraw = false;
-    }
-
-    /**
-     * Unhide the calendar container, if the calendar picker is a dialog box and
-     * param sender is not null the dialog is positioned near of it
-     * 
-     * @param sender
-     *            the widget that the user has clicked
-     */
-    public void show(Widget sender) {
-        this.drawCalendar();
-        if (calendarDlg == null) {
-            outer.setVisible(true);
-        } else {
-            calendarDlg.show();
-            GWTCHelper.positionPopupPanel(calendarDlg, sender);
-        }
-    }
-
-    /**
-     * Hide the calendar container.
-     * 
-     */
-    public void hide() {
-        if (calendarDlg != null) {
-            if (  calendarDlg.isAttached() ) {
-                calendarDlg.hide();
-            }
-        } else
-            outer.setVisible(false);
-    }
-
-    /**
-     * Set the text for the caption of the dialog box. It is only available if the calendar is shown as a dialog.
-     * 
-     * @param t
-     *            the message to display
-     */
-    public void setText(String t) {
-        if (calendarDlg != null)
-            calendarDlg.setText(t);
-    }
-
-    /**
-     * Set the help text.
-     * 
-     * @param t
-     *            the help message to display, if t is null help button is
-     *            disabled
-     */
-    public void setHelp(String t) {
-        helpStr = t;
-        if (t == null || t.length() == 0)
-            helpBtn.setEnabled(false);
-        else
-            helpBtn.setEnabled(true);
-    }
-    
-    /**
-     * Disable the close Button
-     */
-    public void disableCloseButton(){
-        this.closeBtn.setVisible(false);
-    }
-
-    /**
-     * Internationalize the calendar.
-     * 
-     * @param d
-     *            array with the full names of the week days (default english
-     *            names [Sunday ... Saturday] )
-     * @param m
-     *            array with the full names of the months (default english
-     *            names: [January ... December])
-     * @param s
-     *            number of the first day in the week [1...7] (default 1 =
-     *            sunday)
-     */
-    public void setLocale(String[] d, String[] m, int s) {
-        this.needsRedraw = true;
-        if (days.length >= 7)
-            days = d;
-        if (months.length >= 12)
-            months = m;
-        weekStart = s;
-        drawCalendar();
-    }
-
-    /**
-     * This method returns true or false whether a month has selectable days in
-     * the allowed interval
-     * 
-     * @param date
-     *            Date of the selected day
-     * @param months
-     *            increment of months
-     * @return true if the month has selectable days
-     */
-    public boolean isVisibleMonth(Date date, int months) {
-        Date d = GWTCDatePicker.increaseMonth(date, months);
-        Date firstD = new Date(d.getTime());
-        firstD.setDate(1);
-        Date lastD = new Date(d.getTime());
-        lastD.setDate(GWTCDatePicker.daysInMonth(d));
-        
-        if (GWTCDatePicker.compareDate(minimalDate, lastD) < 0) {
-            return false;
-        }
-        if (GWTCDatePicker.compareDate(maximalDate, firstD) > 0) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Set the date where the calendar is positioned
-     * 
-     * @param d
-     *            Date
-     */
-    public void setCursorDate(Date d) {
-        if (isVisibleMonth(d, 0)) {
-            this.needsRedraw = true;
-            cursorDate = setHourToZero(d);
-        }
-    }
-
-    /**
-     * Set the date selected by the user
-     * 
-     * @param d
-     *            Date
-     */
-    public void setSelectedDate(Date d) {
-        d = setHourToZero(d);
-        if ( GWTCDatePicker.compareDate(d, selectedDate) != 0) {
-            needsRedraw = true;
-            cursorDate = selectedDate = d;
-            drawCalendar();
-        }
-    }
-
-    /**
-     * Set the minimal selectable date
-     * 
-     * @param d
-     *            Date
-     */
-    public void setMinimalDate(Date d) {
-        this.needsRedraw = true;
-        minimalDate = setHourToZero(d);
-        if (maximalDate.getTime() < minimalDate.getTime())
-            maximalDate = d;
-        if (selectedDate.getTime() < minimalDate.getTime())
-            selectedDate = d;
-        if (cursorDate.getTime() < minimalDate.getTime())
-            this.setSelectedDate(d);
-    }
-
-    /**
-     * Set the maximal selectable date
-     * 
-     * @param d
-     *            Date
-     */
-    public void setMaximalDate(Date d) {
-        this.needsRedraw = true;
-        maximalDate = setHourToZero(d);
-        if (minimalDate.getTime() > maximalDate.getTime())
-            minimalDate = d;
-        if (selectedDate.getTime() > maximalDate.getTime())
-            selectedDate = d;
-        if (cursorDate.getTime() > maximalDate.getTime())
-            this.setSelectedDate(d);
-    }
-
-    /**
-     * Get the date selected by the user
-     * 
-     * @return Date
-     */
-    public Date getSelectedDate() {
-        return selectedDate;
-    }
-
-    /**
-     * Get a string with the selected date in the desired format
-     * 
-     * @param format
-     *            representation of the desired format [dddd ddd dd yyyy yy MMMM  MMM MM]
-     * @return String
-     */
-    public String getSelectedDateStr(String format) {
-        return formatDate(format, selectedDate, months, days);
-    }
-
-    /*
-     * (non-Javadoc)
-     */
-    private ChangeListenerCollection changeListeners;
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.google.gwt.user.client.ui.ClickListener#onClick(com.google.gwt.user.client.ui.Widget)
-     */
-    public void onClick(Widget sender) {
-        if (sender == prevMBtn) {
-            setCursorDate(GWTCDatePicker.increaseMonth(cursorDate, -1));
-            drawCalendar();
-        } else if (sender == nextMBtn) {
-            setCursorDate(GWTCDatePicker.increaseMonth(cursorDate, 1));
-            drawCalendar();
-        } else if (sender == prevYBtn) {
-            setCursorDate(GWTCDatePicker.increaseYear(cursorDate, -1));
-            drawCalendar();
-        } else if (sender == nextYBtn) {
-            setCursorDate(GWTCDatePicker.increaseYear(cursorDate, 1));
-            drawCalendar();
-        } else if (sender == actualMBtn) {
-            setCursorDate(new Date());
-            drawCalendar();
-        } else if (sender == helpBtn) {
-            Window.alert(helpStr);
-        } else if (sender == closeBtn) {
-            if (calendarDlg != null) {
-                calendarDlg.hide();
-            } else {
-                outer.setVisible(false);
-            }
-        } else if (sender instanceof CellHTML) {
-            CellHTML cell = (CellHTML) sender;
-            setSelectedDate(new Date(cursorDate.getYear(), cursorDate.getMonth(), cell.getDay()));
-            if (changeListeners != null) 
-                changeListeners.fireChange(this);
-        } else {
-            // an unknown click listener
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.google.gwt.user.client.ui.SourcesChangeEvents#addChangeListener(com.google.gwt.user.client.ui.ChangeListener)
-     */
-    public void addChangeListener(ChangeListener listener) {
-        if (changeListeners == null)
-            changeListeners = new ChangeListenerCollection();
-        changeListeners.add(listener);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.google.gwt.user.client.ui.SourcesChangeEvents#removeChangeListener(com.google.gwt.user.client.ui.ChangeListener)
-     */
-    public void removeChangeListener(ChangeListener listener) {
-        if (changeListeners != null)
-            changeListeners.remove(listener);
-    }
-
-    private static final int YEARS = 1;
-    private static final int MONTHS = 2;
-    private static final int DAYS = 3;
-
-    /**
-     * Add days to a reference Date
-     * 
-     * @param d
-     *            Date of reference
-     * @param n
-     *            number of days to increase (for decrease use negative values)
-     * @return the new Date
-     */
-    public static Date increaseDate(Date d, int n) {
-        Date ret = new Date(GWTCDatePicker.add(d.getTime(), n, GWTCDatePicker.DAYS));
-        return ret;
-    }
-
-    /**
-     * Add months to a reference Date
-     * 
-     * @param d
-     *            Date of reference
-     * @param n
-     *            number of months to increase (for decrease use negative
-     *            values)
-     * @return the new Date
-     */
-    public static Date increaseMonth(Date d, int n) {
-        if (d.getDate() > 28) {
-            Date tmp = new Date(d.getTime());
-            tmp.setDate(1);
-            GWTCDatePicker.add(tmp.getTime(), n, GWTCDatePicker.MONTHS);
-            int d1 = daysInMonth(d);
-            int d2 = daysInMonth(tmp);
-            if (d1 > d2)
-                d.setDate(d2);
-        }
-
-        return new Date(GWTCDatePicker.add(d.getTime(), n, GWTCDatePicker.MONTHS));
-    }
-
-    /**
-     * Add years to a reference Date
-     * 
-     * @param d
-     *            Date of reference
-     * @param n
-     *            number of years to increase (for decrease use negative values)
-     * @return the new Date
-     */
-    public static Date increaseYear(Date d, int n) {
-        return new Date(GWTCDatePicker.add(d.getTime(), n, GWTCDatePicker.YEARS));
-    }
-
-    /**
-     * Calculate the number of days in a month
-     * 
-     * @param d
-     *            reference date
-     * @return the number of days in this month [1...31]
-     */
-    public static int daysInMonth(Date d) {
-        Date nd = new Date(GWTCDatePicker.add(d.getTime(), 1, GWTCDatePicker.MONTHS));
-        return GWTCDatePicker.compareDate(d, nd);
-    }
-
-    /**
-     * Calculate the number of days betwen two dates
-     * 
-     * @param a
-     *            Date
-     * @param b
-     *            Date
-     * @return the difference in days betwen b and a (b - a)
-     */
-    public static int compareDate(Date a, Date b) {
-        long d1 = setHourToZero(a).getTime();
-        long d2 = setHourToZero(b).getTime();
-        return (int) ((d2 - d1) / 1000 / 60 / 60 / 24);
-    }
-
-    private static long add(long time, int n, int months2) {
-        return (long) add((double) time, n, months2);
-    }
-    
-    /**
-     * Increase/decrease a date based in a type parameter which specifies the type of operation
-     * 
-     * This method is coded enterely in native javascript because it has native methods to increase dates  
-     * 
-     * @param time
-     *            in milliseconds since 1-1-1970
-     * @param value
-     *            interval to add (use negative values to decrease)
-     * @param type
-     *            type of addition (1=days, 2=months, 3=years, 4=hours
-     * @return number of milliseconds from 1-1-1970
-     */
-    private static native double add(double time, int value, int type)
-    /*-{
-     var d = new Date(time);
-     if (type == 1) {
-       // this is a hack because getYear returns diferent results with diferent browsers
-        var y = d.getYear();
-        y = y < 1000 ? y + 1900 : y; 
-        d.setYear( value + y);
-     }   
-     if (type == 2) d.setMonth(d.getMonth() + value);
-     if (type == 3) d.setDate(d.getDate() + value);
-     return d.getTime();  
-     }-*/;
-
-    /**
-     * Set hour, minutes, second and milliseconds to zero.
-     * 
-     * @param date
-     *            Date
-     * @return Modified date
-     */
-    public static Date setHourToZero(Date date) {
-        Date d = new Date(date.getTime());
-        d.setHours(0);
-        d.setMinutes(0);
-        d.setSeconds(0);
-        // a trick to set milliseconds to zero
-        long t = d.getTime() / 1000;
-        t = t * 1000;
-        return new Date(t);
-    }
-
-    /**
-     * Create a new Date
-     * 
-     * @param y
-     *            year (ie 1980)
-     * @param m
-     *            month (1...12)
-     * @param d
-     *            day of month (1...31)
-     * @return new Date
-     */
-    public static Date newDateFromYMD(int y, int m, int d) {
-        Date dat = new Date();
-        dat.setYear(y - 1900);
-        dat.setMonth(m -1);
-        dat.setDate(d);
-        return setHourToZero(dat);
-    }
-
-    /**
-     *  Basic method to format dates 
-     *  
-     *  TODO: use the new class DateTimeFormat available in GWT 1.4.  But still there are many people using old versions 
-     * 
-     * @param format
-     *            (supported dddd ddd dd yyyy yy MMMM MMM MM)
-     * @param date
-     * @param months
-     *            array with the months names [January ... December]
-     * @param days
-     *            array with the days names [Sunday .... Saturday]
-     * @return formated string
-     */
-    static public String formatDate(String format, Date date, String[] months, String days[]) {
-        /*
-        DateTimeFormat dateFormat  = DateTimeFormat.getFormat(format); 
-        Window.alert ("" + date + " " + dateFormat.format(date));
-        */
-        
-        if (date == null || format == null || months == null || days == null)
-            return "NULL";
-        String ret = format;
-        String month = months[date.getMonth()];
-        String day = days[date.getDay()];
-        String month_3 = month.length() >= 3 ? month.substring(0, 3) : month;
-        String day_3 = day.length() >= 3 ? day.substring(0, 3) : day;
-        //String day_4 = day.length() >= 4 ? day.substring(0, 4) : day;
-        ret = ret.replaceAll("ddddd", day);
-        ret = ret.replaceAll("dddd", day);
-        ret = ret.replaceAll("ddd", day_3);
-        ret = ret.replaceAll("dd", leftPadding(String.valueOf(date.getDate()), "0", 2));
-        ret = ret.replaceAll("yyyy", String.valueOf(1900 + date.getYear()));
-        ret = ret.replaceAll("yy", "" + leftPadding(String.valueOf(date.getYear() % 100), "0", 2));
-        ret = ret.replaceAll("MMMM", month);
-        ret = ret.replaceAll("MMM", month_3);
-        ret = ret.replaceAll("MM", leftPadding(String.valueOf(date.getMonth() + 1), "0", 2));
-        return ret;
-    }
-
-    static private String leftPadding(String text, String character, int maxNumberChars) {
-        StringBuffer ret = new StringBuffer();
-        for (int i = text.length(); i < maxNumberChars; i++) {
-            ret.append(character);
-        }
-        ret.append(text);
-        return ret.toString();
-    }
-    
-    /**
-     * Enables the use of links in Cells, it is needed to use Selenium-IDE
-     * It interferes with History 
-     * By default this parameter is disabled.
-     * 
-     * @param b
-     */
-    public void useCellLinks(boolean b) {
-        useCellLinks = b;
-        this.needsRedraw = true;
-    }
-
-    /**
-     * Basic Widget that represents each cell in the calendar picker
-     * 
-     */
-    private static class CellHTML extends HTML {
-        private int day;
-        private boolean useCellLinks = false;
-
-        public CellHTML(int day, boolean useCellLinks) {
-            super (String.valueOf(day));
-            this.useCellLinks = useCellLinks;
-            this.day = day;
-        }
-        
-        public void addClickListener(ClickListener pickListener) {
-            boolean ie6 = GWTCHelper.isIE6(); 
-            if (useCellLinks && ie6 == false) {
-                // If the cell has a click-listernet, we add a link, so Selenium is able to use it
-                // setHTML( "<a href=\"javascript:;\">" + String.valueOf(day) + "</a>");
-                setHTML( "<a href=\"#\">" + String.valueOf(day) + "</a>");
-            }
-            super.addClickListener(pickListener);
-            //  IE6 does not support div:hover style, this listener adds a new class when the mouse is over
-            if (ie6)
-                this.addMouseListener(GWTCButton.mouseOverListener);
-        }
-
-        public int getDay() {
-            return day;
-        }
-        
-    }
-}

Deleted: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCHelper.java (2107 => 2108)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCHelper.java	2009-12-15 18:24:26 UTC (rev 2107)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/GWTCHelper.java	2009-12-15 21:29:26 UTC (rev 2108)
@@ -1,137 +0,0 @@
-/*
- * Copyright 2007 Manuel Carrasco MoÃ±ino. (manuel_carrasco at users.sourceforge.net) 
- * http://code.google.com/p/gwtchismes
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.mule.galaxy.web.client.util;
-
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.PopupPanel;
-import com.google.gwt.user.client.ui.Widget;
-
-/**
- * @author Manuel Carrasco MoÃ±ino
- * <h3>Class description</h3>
- * <p>
- * Utility class for the gwtchismes library
- * </p> 
- */
-public class GWTCHelper {
-
-    /**
-     * Detection of Internet Explorer 6.x 
-     * @return true if the browser is ie6
-     */
-    public static native boolean isIE6() /*-{
-      return (window.XMLHttpRequest)? false: true;
-    }-*/;
-    
-    /**
-     * This method move the panel near the widget provided.
-     * If widget is null, the panel is centered into the visible area of the browser.
-     *  
-     * Hack: PopupPanel.center() does not work because it centers the panel in the  window.
-     * 
-     * @param panel
-     * @param widget
-     */
-    public static void positionPopupPanel(PopupPanel panel, Widget widget) {
-        if (panel==null) return;
-
-        int visibleW = getVisibleWidth();
-        int visibleH = getVisibleHeight();
-        int windowW = Window.getClientWidth();
-        int windowH = Window.getClientHeight();
-        int scrollLeft = Window.getScrollLeft();
-        int scrollTop = Window.getScrollTop();
-        int objectW = panel.getOffsetWidth();
-        int objectH = panel.getOffsetHeight();
-        
-        if (widget != null ) {
-            // Put the panel near the widget
-            int left = widget.getAbsoluteLeft() - 20;
-            int top = widget.getAbsoluteTop() + 10;
-            panel.setPopupPosition(left, top);
-            // If part of the panel is not visible, move the scrollbars
-            int xDiff =  objectW + left - visibleW - scrollLeft;
-            int yDiff =  objectH + top - visibleH - scrollTop;
-            if (xDiff < 0 ) {
-                xDiff = left - scrollLeft;
-                if (xDiff > 0) xDiff = 0;
-            }
-            if (yDiff < 0 ) {
-                yDiff = top - scrollTop;
-                if (yDiff > 0) yDiff = 0;
-            }
-            
-            // scrollTo(scrollLeft + xDiff, scrollTop + yDiff);
-        } else {
-            // Center the panel into the visible part of the document
-            if (visibleW == 0 || visibleH == 0) {
-                //Window.alert("center 1");
-                panel.center();
-            } else if ( visibleH > windowH){
-                //Window.alert("center 2");
-                panel.center();
-            } else {
-                //Window.alert("center 3");
-                int left = scrollLeft + ((visibleW + objectW) / 2) - objectW;
-                int top = scrollTop + ((visibleH + objectH) / 2) - objectH;
-                panel.setPopupPosition(left, top);
-            }
-        }
-    }
-    public static void centerPopupPanel(PopupPanel panel) {
-        positionPopupPanel(panel, null);
-    }
-    
-    public static void maximizeWidget(Widget widget) {
-        if (widget==null) return;
-        int w = Math.max(getVisibleWidth(), Window.getClientWidth());
-        int h = Math.max(getVisibleHeight(), Window.getClientHeight());
-        widget.setSize(w + "px", h + "px");
-    }
-    public static native void scrollTo(int x, int y) /*-{
-       $wnd.scrollTo(x,y);
-    }-*/;
-    public static native int getVisibleWidth() /*-{
-       return $wnd.document.documentElement.clientWidth;
-    }-*/;
-    public static native int getVisibleHeight() /*-{
-       return $wnd.document.documentElement.clientHeight;
-    }-*/;
-
-    public static String internationalize(String s, Object[] os) {
-        for (int i = 0; i < os.length; i++) {
-            String o = "" + (os[i] != null ? os[i] : "");
-            String c = "{" + i + "}";
-            for (;;) {
-                int pos = s.indexOf(c);
-                if (pos < 0)
-                    break;
-                String trail = "";
-                if (pos + c.length() < s.length())
-                    trail = s.substring(pos + c.length());
-                s = s.substring(0, pos) + o + trail;
-            }
-        }
-        return s;
-    }
-
-    public static String internationalize(String s, String o) {
-        Object[] os = { o };
-        return internationalize(s, os);
-    }
-}

--------------------------------------------------------------------- To unsubscribe from this list, please visit: http://admin.muleforge.org/manage_email

[galaxy-dev] [2107] branches/product_cleanup: Remove netboot

2009-12-15T10:24:26Z

[2107] branches/product_cleanup: Remove netboot

Revision: 2107
Author: dandiep
Date: 2009-12-15 12:24:26 -0600 (Tue, 15 Dec 2009)

Log Message

Remove netboot

Modified Paths

branches/product_cleanup/pom.xml

Removed Paths

branches/product_cleanup/netboot/

Diff

Modified: branches/product_cleanup/pom.xml (2106 => 2107)

--- branches/product_cleanup/pom.xml	2009-12-15 18:22:24 UTC (rev 2106)
+++ branches/product_cleanup/pom.xml	2009-12-15 18:24:26 UTC (rev 2107)
@@ -41,7 +41,6 @@
         <module>gwt-client</module>
         <module>integration</module>
         <module>server</module>
-        <module>netboot</module>
 	<module>examples</module>
     </modules>

--------------------------------------------------------------------- To unsubscribe from this list, please visit: http://admin.muleforge.org/manage_email