187 files changed, 22014 insertions, 21904 deletions

diff --git a/cpp/demo/Database/Oracle/occi/DbTypes.typ b/cpp/demo/Database/Oracle/occi/DbTypes.typ
index f682eb61adc..89a7a2a0a02 100755
--- a/cpp/demo/Database/Oracle/occi/DbTypes.typ
+++ b/cpp/demo/Database/Oracle/occi/DbTypes.typ
@@ -1,16 +1,16 @@
-# **********************************************************************

-#

-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-#

-# This copy of Ice is licensed to you under the terms described in the

-# ICE_LICENSE file included in this distribution.

-#

-# **********************************************************************

-#

-# Compile with:

-# ott userid=scott/tiger@orcl code=cpp hfile=DbTypes.h cppfile=DbTypes.cpp

-#     mapfile=DbTypesMap.cpp intype=DbTypes.typ outtype=DbTypesOut.typ 

-#     attraccess=private

-#

-TYPE DEPT_T

-TYPE EMP_T

+# **********************************************************************
+#
+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+#
+# Compile with:
+# ott userid=scott/tiger@orcl code=cpp hfile=DbTypes.h cppfile=DbTypes.cpp
+#     mapfile=DbTypesMap.cpp intype=DbTypes.typ outtype=DbTypesOut.typ 
+#     attraccess=private
+#
+TYPE DEPT_T
+TYPE EMP_T
diff --git a/cpp/demo/Database/Oracle/occi/OCCIServantLocator.cpp b/cpp/demo/Database/Oracle/occi/OCCIServantLocator.cpp
index 58c4148376c..51a014dfb2a 100644
--- a/cpp/demo/Database/Oracle/occi/OCCIServantLocator.cpp
+++ b/cpp/demo/Database/Oracle/occi/OCCIServantLocator.cpp
@@ -6,75 +6,75 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-

-#include <OCCIServantLocator.h>

-#include <EmpI.h>

-#include <DeptI.h>

-#include <DbTypes.h>

-#include <Util.h>

-#include <occi.h>

-

-using namespace std;

-using namespace oracle::occi;

-

-OCCIServantLocator::OCCIServantLocator(const DeptFactoryIPtr& factory) :

-    _factory(factory)

-{}

-

-

-Ice::ObjectPtr 

-OCCIServantLocator::locate(const Ice::Current& current, Ice::LocalObjectPtr& cookie)

-{

-    ConnectionHolderPtr con = new ConnectionHolder(_factory->getConnectionPool());

-    RefAny ref = decodeRef(current.id.name, _factory->getEnv(), con->connection());

-

-    try

-    {

-        //

-        // Extract SQL type from target object

-        //

-        string sqlType = Ref<PObject>(ref)->getSQLTypeName();

-

-        //

-        // Create and return the servant, used only for this one operation

-        //

-        if(sqlType.find("EMP_T") != string::npos)

-        {

-            return new EmpI(ref, con, _factory);

-        }

-        else if(sqlType.find("DEPT_T") != string::npos)

-        {

-            return new DeptI(ref, con, _factory);

-        }

-        else

-        {

-            return 0;

-        }

-    }

-    catch(const SQLException& sqle)

-    {

-        if(sqle.getErrorCode() == 21700)

-        {

-            return 0;

-        }

-        else

-        {

-            throw;

-        }

-    }

-}

-

-void 

-OCCIServantLocator::finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&)

-{

-    //

-    // Nothing to do: if the connection was not yet released, it is released (and the tx rolled back)

-    // when the servant's last refcount goes away

-    //

-}

-

-void 

-OCCIServantLocator::deactivate(const string&)

-{

-}

-

+
+#include <OCCIServantLocator.h>
+#include <EmpI.h>
+#include <DeptI.h>
+#include <DbTypes.h>
+#include <Util.h>
+#include <occi.h>
+
+using namespace std;
+using namespace oracle::occi;
+
+OCCIServantLocator::OCCIServantLocator(const DeptFactoryIPtr& factory) :
+    _factory(factory)
+{}
+
+
+Ice::ObjectPtr 
+OCCIServantLocator::locate(const Ice::Current& current, Ice::LocalObjectPtr& cookie)
+{
+    ConnectionHolderPtr con = new ConnectionHolder(_factory->getConnectionPool());
+    RefAny ref = decodeRef(current.id.name, _factory->getEnv(), con->connection());
+
+    try
+    {
+        //
+        // Extract SQL type from target object
+        //
+        string sqlType = Ref<PObject>(ref)->getSQLTypeName();
+
+        //
+        // Create and return the servant, used only for this one operation
+        //
+        if(sqlType.find("EMP_T") != string::npos)
+        {
+            return new EmpI(ref, con, _factory);
+        }
+        else if(sqlType.find("DEPT_T") != string::npos)
+        {
+            return new DeptI(ref, con, _factory);
+        }
+        else
+        {
+            return 0;
+        }
+    }
+    catch(const SQLException& sqle)
+    {
+        if(sqle.getErrorCode() == 21700)
+        {
+            return 0;
+        }
+        else
+        {
+            throw;
+        }
+    }
+}
+
+void 
+OCCIServantLocator::finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&)
+{
+    //
+    // Nothing to do: if the connection was not yet released, it is released (and the tx rolled back)
+    // when the servant's last refcount goes away
+    //
+}
+
+void 
+OCCIServantLocator::deactivate(const string&)
+{
+}
+
diff --git a/cpp/demo/Database/Oracle/occi/OCCIServantLocator.h b/cpp/demo/Database/Oracle/occi/OCCIServantLocator.h
index f1d952b39f3..61fdc9784c4 100644
--- a/cpp/demo/Database/Oracle/occi/OCCIServantLocator.h
+++ b/cpp/demo/Database/Oracle/occi/OCCIServantLocator.h
@@ -6,26 +6,26 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-

-#ifndef OCCI_SERVANT_LOCATOR_H

-#define OCCI_SERVANT_LOCATOR_H

-

-#include <DeptFactoryI.h>

-#include <Ice/ServantLocator.h>

-#include <occi.h>

-

-class OCCIServantLocator : public Ice::ServantLocator

-{

-public:

-    

-    OCCIServantLocator(const DeptFactoryIPtr&);

-

-    virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&);

-    virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&);

-    virtual void deactivate(const std::string&);

-  

-private:

-    DeptFactoryIPtr _factory;

-};

-

-#endif

+
+#ifndef OCCI_SERVANT_LOCATOR_H
+#define OCCI_SERVANT_LOCATOR_H
+
+#include <DeptFactoryI.h>
+#include <Ice/ServantLocator.h>
+#include <occi.h>
+
+class OCCIServantLocator : public Ice::ServantLocator
+{
+public:
+    
+    OCCIServantLocator(const DeptFactoryIPtr&);
+
+    virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&);
+    virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&);
+    virtual void deactivate(const std::string&);
+  
+private:
+    DeptFactoryIPtr _factory;
+};
+
+#endif
diff --git a/cpp/demo/Database/Oracle/occi/createTypes.sql b/cpp/demo/Database/Oracle/occi/createTypes.sql
index 82fdc0fc025..3c8422d9764 100644
--- a/cpp/demo/Database/Oracle/occi/createTypes.sql
+++ b/cpp/demo/Database/Oracle/occi/createTypes.sql
@@ -1,54 +1,54 @@
-Rem

-Rem Copyright (c) 2006 ZeroC, Inc. All rights reserved.

-Rem

-Rem This copy of Ice is licensed to you under the terms described in the

-Rem ICE_LICENSE file included in this distribution.

-

-Rem

-Rem Create object types and views for the DEPT and EMP tables

-Rem

-

-SET ECHO ON 

-

-CONNECT scott/tiger@orcl

-

-DROP VIEW EMP_VIEW;

-DROP VIEW DEPT_VIEW;

-DROP TYPE EMP_T;

-DROP TYPE DEPT_T;

-

-CREATE TYPE DEPT_T AS OBJECT(

-   DEPTNO NUMBER(2),

-   DNAME VARCHAR2(14),

-   LOC VARCHAR2(13));

-/

-

-CREATE TYPE EMP_T;

-/

-CREATE TYPE EMP_T AS OBJECT(

-   EMPNO NUMBER(4),

-   ENAME VARCHAR2(10),

-   JOB VARCHAR2(9),

-   MGRREF REF EMP_T,

-   HIREDATE DATE,

-   SAL NUMBER(7,2),

-   COMM NUMBER(7,2),

-   DEPTREF REF DEPT_T);

-/

-

-CREATE VIEW DEPT_VIEW OF DEPT_T WITH OBJECT IDENTIFIER(DEPTNO)

-   AS SELECT DEPTNO, DNAME, LOC FROM DEPT;

-

-Rem

-Rem Need to create the view in two steps since it references itself

-Rem

-CREATE VIEW EMP_VIEW OF EMP_T WITH OBJECT IDENTIFIER(EMPNO)

-   AS SELECT EMPNO, ENAME, JOB, NULL, HIREDATE, SAL, COMM, 

-             MAKE_REF(DEPT_VIEW, DEPTNO) FROM EMP;

-

-CREATE OR REPLACE VIEW EMP_VIEW OF EMP_T WITH OBJECT IDENTIFIER(EMPNO)

-   AS SELECT EMPNO, ENAME, JOB, MAKE_REF(EMP_VIEW, MGR), HIREDATE, SAL,

-             COMM, MAKE_REF(DEPT_VIEW, DEPTNO) FROM EMP;

-

-COMMIT;

-EXIT

+Rem
+Rem Copyright (c) 2006 ZeroC, Inc. All rights reserved.
+Rem
+Rem This copy of Ice is licensed to you under the terms described in the
+Rem ICE_LICENSE file included in this distribution.
+
+Rem
+Rem Create object types and views for the DEPT and EMP tables
+Rem
+
+SET ECHO ON 
+
+CONNECT scott/tiger@orcl
+
+DROP VIEW EMP_VIEW;
+DROP VIEW DEPT_VIEW;
+DROP TYPE EMP_T;
+DROP TYPE DEPT_T;
+
+CREATE TYPE DEPT_T AS OBJECT(
+   DEPTNO NUMBER(2),
+   DNAME VARCHAR2(14),
+   LOC VARCHAR2(13));
+/
+
+CREATE TYPE EMP_T;
+/
+CREATE TYPE EMP_T AS OBJECT(
+   EMPNO NUMBER(4),
+   ENAME VARCHAR2(10),
+   JOB VARCHAR2(9),
+   MGRREF REF EMP_T,
+   HIREDATE DATE,
+   SAL NUMBER(7,2),
+   COMM NUMBER(7,2),
+   DEPTREF REF DEPT_T);
+/
+
+CREATE VIEW DEPT_VIEW OF DEPT_T WITH OBJECT IDENTIFIER(DEPTNO)
+   AS SELECT DEPTNO, DNAME, LOC FROM DEPT;
+
+Rem
+Rem Need to create the view in two steps since it references itself
+Rem
+CREATE VIEW EMP_VIEW OF EMP_T WITH OBJECT IDENTIFIER(EMPNO)
+   AS SELECT EMPNO, ENAME, JOB, NULL, HIREDATE, SAL, COMM, 
+             MAKE_REF(DEPT_VIEW, DEPTNO) FROM EMP;
+
+CREATE OR REPLACE VIEW EMP_VIEW OF EMP_T WITH OBJECT IDENTIFIER(EMPNO)
+   AS SELECT EMPNO, ENAME, JOB, MAKE_REF(EMP_VIEW, MGR), HIREDATE, SAL,
+             COMM, MAKE_REF(DEPT_VIEW, DEPTNO) FROM EMP;
+
+COMMIT;
+EXIT
diff --git a/cpp/demo/Freeze/library/Scanner.cpp b/cpp/demo/Freeze/library/Scanner.cpp
index 89c9c00a3c2..909b2633081 100755
--- a/cpp/demo/Freeze/library/Scanner.cpp
+++ b/cpp/demo/Freeze/library/Scanner.cpp
@@ -1,4 +1,4 @@
-#include "IceUtil/Config.h" 

+#include "IceUtil/Config.h" 
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
diff --git a/cpp/demo/Freeze/phonebook/Scanner.cpp b/cpp/demo/Freeze/phonebook/Scanner.cpp
index ca723d09126..22fedb31aca 100755
--- a/cpp/demo/Freeze/phonebook/Scanner.cpp
+++ b/cpp/demo/Freeze/phonebook/Scanner.cpp
@@ -1,4 +1,4 @@
-#include "IceUtil/Config.h" 

+#include "IceUtil/Config.h" 
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
diff --git a/cpp/demo/Ice/MFC/client/HelloClient.h b/cpp/demo/Ice/MFC/client/HelloClient.h
index 2f5cef4faae..08a21097d1d 100644
--- a/cpp/demo/Ice/MFC/client/HelloClient.h
+++ b/cpp/demo/Ice/MFC/client/HelloClient.h
@@ -7,28 +7,28 @@
 //
 // **********************************************************************
 
-

-#ifndef HELLO_CLIENT_H

-#define HELLO_CLIENT_H

-

-#pragma once

-

-#ifndef __AFXWIN_H__

-    #error include 'stdafx.h' before including this file for PCH

-#endif

-

-#include "Resource.h"

-

-class CHelloClientApp : public CWinApp

-{

-public:

-    CHelloClientApp();

-

-    virtual BOOL InitInstance();

-

-    DECLARE_MESSAGE_MAP()

-};

-

-extern CHelloClientApp theApp;

-

-#endif

+
+#ifndef HELLO_CLIENT_H
+#define HELLO_CLIENT_H
+
+#pragma once
+
+#ifndef __AFXWIN_H__
+    #error include 'stdafx.h' before including this file for PCH
+#endif
+
+#include "Resource.h"
+
+class CHelloClientApp : public CWinApp
+{
+public:
+    CHelloClientApp();
+
+    virtual BOOL InitInstance();
+
+    DECLARE_MESSAGE_MAP()
+};
+
+extern CHelloClientApp theApp;
+
+#endif
diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
index c3f8f31ca74..fbb9dcc2a91 100644
--- a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
+++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
@@ -1,452 +1,452 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-#include "stdafx.h"

-#include "HelloClient.h"

-#include "HelloClientDlg.h"

-

-#include <iomanip>

-

-#ifdef _DEBUG

-#define new DEBUG_NEW

-#endif

-

-#define WM_AMI_CALLBACK             (WM_USER + 1)

-

-using namespace std;

-using namespace Demo;

-

-namespace

-{

-

-class Dispatcher : public Ice::Dispatcher

-{

-public:

-

-    Dispatcher(CHelloClientDlg* dialog) : _dialog(dialog)

-    {

-    }

-

-    virtual void 

-    dispatch(const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr&)

-    {

-        //

-        // Dispatch Ice AMI callbacks with the event loop thread.

-        //

-        _dialog->PostMessage(WM_AMI_CALLBACK, 0, reinterpret_cast<LPARAM>(new Ice::DispatcherCallPtr(call)));

-    }

-

-private:

-

-    CHelloClientDlg* _dialog;

-};

-

-class Callback : public IceUtil::Shared

-{

-public:

-

-    Callback(CHelloClientDlg* dialog) : _dialog(dialog)

-    {

-    }

-

-    void

-    sent(bool)

-    {

-        _dialog->sent();

-    }

-

-    void

-    response()

-    {

-        _dialog->response();

-    }

-

-    void

-    exception(const Ice::Exception& ex)

-    {

-        _dialog->exception(ex);

-    }

-

-    void

-    flushSent(bool)

-    {

-        _dialog->flushed();

-    }

-

-private:

-

-    CHelloClientDlg* _dialog;

-};

-typedef IceUtil::Handle<Callback> CallbackPtr;

-

-enum DeliveryMode

-{

-    TWOWAY,

-    TWOWAY_SECURE,

-    ONEWAY,

-    ONEWAY_SECURE,

-    ONEWAY_BATCH,

-    ONEWAY_SECURE_BATCH,

-    DATAGRAM,

-    DATAGRAM_BATCH

-};

-

-}

-

-BEGIN_MESSAGE_MAP(CHelloClientDlg, CDialog)

-    ON_WM_PAINT()

-    ON_WM_QUERYDRAGICON()

-    ON_WM_HSCROLL()

-    ON_BN_CLICKED(IDC_INVOKE, OnSayHello)

-    ON_BN_CLICKED(IDC_FLUSH, OnFlush)

-    ON_BN_CLICKED(IDC_SHUTDOWN, OnShutdown)

-    ON_MESSAGE(WM_AMI_CALLBACK, OnAMICallback)

-END_MESSAGE_MAP()

-

-

-CHelloClientDlg::CHelloClientDlg(CWnd* pParent /*=NULL*/) : CDialog(CHelloClientDlg::IDD, pParent)

-{

-    _hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);

-

-    //

-    // Create the communicator.

-    //

-    Ice::InitializationData initData;

-    initData.properties = Ice::createProperties();

-    initData.properties->load("config");

-    initData.dispatcher = new Dispatcher(this);

-    _communicator = Ice::initialize(initData);

-

-    //

-    // Create AMI callbacks.

-    // 

-    CallbackPtr cb = new Callback(this);

-    _sayHelloCallback = newCallback_Hello_sayHello(cb, &Callback::response, &Callback::exception, &Callback::sent);

-    _shutdownCallback = newCallback_Hello_shutdown(cb, &Callback::response, &Callback::exception);

-    _flushCallback = Ice::newCallback_Communicator_flushBatchRequests(cb, &Callback::exception, &Callback::flushSent);

-}

-

-void

-CHelloClientDlg::DoDataExchange(CDataExchange* pDX)

-{

-    CDialog::DoDataExchange(pDX);

-}

-

-

-BOOL

-CHelloClientDlg::OnInitDialog()

-{

-    CDialog::OnInitDialog();

-

-    // Set the icon for this dialog.  The framework does this automatically

-    // when the application's main window is not a dialog

-    SetIcon(_hIcon, TRUE);         // Set big icon

-    SetIcon(_hIcon, FALSE);        // Set small icon

-

-    //

-    // Retrieve the controls.

-    //

-    _host = (CEdit*)GetDlgItem(IDC_HOST);

-    _mode = (CComboBox*)GetDlgItem(IDC_MODE);

-    _timeout = (CSliderCtrl*)GetDlgItem(IDC_TIMEOUT_SLIDER);

-    _timeoutStatus = (CStatic*)GetDlgItem(IDC_TIMEOUT_STATUS);

-    _delay = (CSliderCtrl*)GetDlgItem(IDC_DELAY_SLIDER);

-    _delayStatus = (CStatic*)GetDlgItem(IDC_DELAY_STATUS);

-    _status = (CStatic*)GetDlgItem(IDC_STATUSBAR);

-    _flush = (CButton*)GetDlgItem(IDC_FLUSH);

-

-    //

-    // Use twoway mode as the initial default.

-    //

-    _mode->SetCurSel(TWOWAY);

-

-    //

-    // Disable flush

-    //

-    _flush->EnableWindow(FALSE);

-

-    //

-    // Set hostname

-    //

-    _host->SetWindowText(CString("127.0.0.1"));

-

-    //

-    // Initialize timeout slider

-    //

-    _timeout->SetRangeMin(0);

-    _timeout->SetRangeMax(50);

-    _timeoutStatus->SetWindowText(CString("0.0s"));

-

-    //

-    // Initialize delay slider

-    //

-    _delay->SetRangeMin(0);

-    _delay->SetRangeMax(50);

-    _delayStatus->SetWindowText(CString("0.0s"));

-

-    _status->SetWindowText(CString(" Ready"));

-

-    return TRUE;  // return TRUE  unless you set the focus to a control

-}

-

-void

-CHelloClientDlg::OnClose()

-{

-    //

-    // Destroy the communicator. If AMI calls are still in progress they will be

-    // interrupted with an Ice::CommunicatorDestroyedException.

-    //

-    try

-    {

-        _communicator->destroy();

-    }

-    catch(const IceUtil::Exception&)

-    {

-    }

-}

-

-// If you add a minimize button to your dialog, you will need the code below

-// to draw the icon.  For MFC applications using the document/view model,

-// this is automatically done for you by the framework.

-

-void

-CHelloClientDlg::OnPaint() 

-{

-    if(IsIconic())

-    {

-        CPaintDC dc(this); // device context for painting

-

-        SendMessage(WM_ICONERASEBKGND, reinterpret_cast<WPARAM>(dc.GetSafeHdc()), 0);

-

-        // Center icon in client rectangle

-        int cxIcon = GetSystemMetrics(SM_CXICON);

-        int cyIcon = GetSystemMetrics(SM_CYICON);

-        CRect rect;

-        GetClientRect(&rect);

-        int x = (rect.Width() - cxIcon + 1) / 2;

-        int y = (rect.Height() - cyIcon + 1) / 2;

-

-        // Draw the icon

-        dc.DrawIcon(x, y, _hIcon);

-    }

-    else

-    {

-        CDialog::OnPaint();

-    }

-}

-

-// The system calls this function to obtain the cursor to display while the user drags

-// the minimized window.

-HCURSOR

-CHelloClientDlg::OnQueryDragIcon()

-{

-    return static_cast<HCURSOR>(_hIcon);

-}

-

-void

-CHelloClientDlg::OnHScroll(UINT, UINT, CScrollBar* scroll)

-{

-    CSliderCtrl* slider = (CSliderCtrl*)scroll;

-    ostringstream s;

-    if(slider == _timeout)

-    {

-        s << setiosflags(ios::fixed) << setprecision(1) << (long)_timeout->GetPos()/10.0 << "s";

-        _timeoutStatus->SetWindowText(CString(s.str().c_str()));

-    }

-    else

-    {

-        s << setiosflags(ios::fixed) << setprecision(1) << (long)_delay->GetPos()/10.0 << "s";

-        _delayStatus->SetWindowText(CString(s.str().c_str()));

-    }

-}

-

-void

-CHelloClientDlg::OnSayHello()

-{

-    Demo::HelloPrx hello = createProxy();

-    if(!hello)

-    {

-        return;

-    }

-    int delay = _delay->GetPos() * 100;

-    try

-    {

-        if(!deliveryModeIsBatch())

-        {

-            _status->SetWindowText(CString(" Sending request"));

-            hello->begin_sayHello(delay, _sayHelloCallback);

-        }

-        else

-        {

-            _flush->EnableWindow(TRUE);

-            hello->sayHello(delay);

-            _status->SetWindowText(CString(" Queued sayHello request"));

-        }

-    }

-    catch(const IceUtil::Exception& ex)

-    {

-        handleException(ex);

-    }

-}

-

-void

-CHelloClientDlg::OnShutdown()

-{

-    Demo::HelloPrx hello = createProxy();

-    try

-    {

-        if(!deliveryModeIsBatch())

-        {

-            _status->SetWindowText(CString(" Sending request"));

-            CallbackPtr cb = new Callback(this);

-            hello->begin_shutdown(_shutdownCallback);

-        }

-        else

-        {

-            _flush->EnableWindow(TRUE);

-            hello->shutdown();

-            _status->SetWindowText(CString(" Queued shutdown request"));

-        }

-    }

-    catch(const IceUtil::Exception& ex)

-    {

-        handleException(ex);

-    }

-}

-

-void

-CHelloClientDlg::OnFlush()

-{

-    try

-    {

-        _communicator->begin_flushBatchRequests(_flushCallback);

-    }

-    catch(const IceUtil::Exception& ex)

-    {

-        handleException(ex);

-    }

-    _flush->EnableWindow(FALSE);

-}

-

-LRESULT

-CHelloClientDlg::OnAMICallback(WPARAM, LPARAM lParam)

-{

-    try

-    {

-        Ice::DispatcherCallPtr* call = reinterpret_cast<Ice::DispatcherCallPtr*>(lParam);

-        (*call)->run();

-        delete call;

-    }

-    catch(const Ice::Exception& ex)

-    {

-        handleException(ex);

-    }

-    return 0;

-}

-

-void

-CHelloClientDlg::sent()

-{

-    int mode = _mode->GetCurSel();

-    if(mode == TWOWAY || mode == TWOWAY_SECURE)

-    {

-        _status->SetWindowText(CString(" Waiting for response"));

-    }

-    else

-    {

-        _status->SetWindowText(CString(" Ready"));

-    }

-}

-

-void

-CHelloClientDlg::response()

-{

-    _status->SetWindowText(CString(" Ready"));

-}

-

-void

-CHelloClientDlg::exception(const Ice::Exception& ex)

-{

-    if(!dynamic_cast<const Ice::CommunicatorDestroyedException*>(&ex))

-    {

-        handleException(ex);

-    }

-}

-

-void

-CHelloClientDlg::flushed()

-{

-    _status->SetWindowText(CString(" Flushed batch requests"));

-}

-

-Demo::HelloPrx

-CHelloClientDlg::createProxy()

-{

-    CString h;

-    _host->GetWindowText(h);

-    string host = (LPCTSTR)h;

-    if(host.size() == 0)

-    {

-        _status->SetWindowText(CString(" No hostname"));

-    }

-

-    string s = "hello:tcp -h " + host + " -p 10000:ssl -h " + host + " -p 10001:udp -h " + host + " -p 10000";

-    Ice::ObjectPrx prx = _communicator->stringToProxy(s);

-

-    int mode = _mode->GetCurSel();

-    switch(mode)

-    {

-        case TWOWAY:

-            prx = prx->ice_twoway();

-            break;

-        case TWOWAY_SECURE:

-            prx = prx->ice_twoway()->ice_secure(true);;

-            break;

-        case ONEWAY:

-            prx = prx->ice_oneway();

-            break;

-        case ONEWAY_SECURE:

-            prx = prx->ice_oneway()->ice_secure(true);

-            break;

-        case ONEWAY_BATCH:

-            prx = prx->ice_batchOneway();

-            break;

-        case ONEWAY_SECURE_BATCH:

-            prx = prx->ice_batchOneway()->ice_secure(true);

-            break;

-        case DATAGRAM:

-            prx = prx->ice_datagram();

-            break;

-        case DATAGRAM_BATCH:

-            prx = prx->ice_batchDatagram();

-            break;

-    }

-

-    int timeout = _timeout->GetPos() * 100;

-    if(timeout != 0)

-    {

-        prx = prx->ice_timeout(timeout);

-    }

-

-    return Demo::HelloPrx::uncheckedCast(prx);

-}

-

-BOOL 

-CHelloClientDlg::deliveryModeIsBatch()

-{

-    return _mode->GetCurSel() == ONEWAY_BATCH ||

-           _mode->GetCurSel() == ONEWAY_SECURE_BATCH ||

-           _mode->GetCurSel() == DATAGRAM_BATCH;

-}

-

-void

-CHelloClientDlg::handleException(const IceUtil::Exception& ex)

-{

-    _status->SetWindowText(CString(ex.ice_name().c_str()));

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include "stdafx.h"
+#include "HelloClient.h"
+#include "HelloClientDlg.h"
+
+#include <iomanip>
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
+#define WM_AMI_CALLBACK             (WM_USER + 1)
+
+using namespace std;
+using namespace Demo;
+
+namespace
+{
+
+class Dispatcher : public Ice::Dispatcher
+{
+public:
+
+    Dispatcher(CHelloClientDlg* dialog) : _dialog(dialog)
+    {
+    }
+
+    virtual void 
+    dispatch(const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr&)
+    {
+        //
+        // Dispatch Ice AMI callbacks with the event loop thread.
+        //
+        _dialog->PostMessage(WM_AMI_CALLBACK, 0, reinterpret_cast<LPARAM>(new Ice::DispatcherCallPtr(call)));
+    }
+
+private:
+
+    CHelloClientDlg* _dialog;
+};
+
+class Callback : public IceUtil::Shared
+{
+public:
+
+    Callback(CHelloClientDlg* dialog) : _dialog(dialog)
+    {
+    }
+
+    void
+    sent(bool)
+    {
+        _dialog->sent();
+    }
+
+    void
+    response()
+    {
+        _dialog->response();
+    }
+
+    void
+    exception(const Ice::Exception& ex)
+    {
+        _dialog->exception(ex);
+    }
+
+    void
+    flushSent(bool)
+    {
+        _dialog->flushed();
+    }
+
+private:
+
+    CHelloClientDlg* _dialog;
+};
+typedef IceUtil::Handle<Callback> CallbackPtr;
+
+enum DeliveryMode
+{
+    TWOWAY,
+    TWOWAY_SECURE,
+    ONEWAY,
+    ONEWAY_SECURE,
+    ONEWAY_BATCH,
+    ONEWAY_SECURE_BATCH,
+    DATAGRAM,
+    DATAGRAM_BATCH
+};
+
+}
+
+BEGIN_MESSAGE_MAP(CHelloClientDlg, CDialog)
+    ON_WM_PAINT()
+    ON_WM_QUERYDRAGICON()
+    ON_WM_HSCROLL()
+    ON_BN_CLICKED(IDC_INVOKE, OnSayHello)
+    ON_BN_CLICKED(IDC_FLUSH, OnFlush)
+    ON_BN_CLICKED(IDC_SHUTDOWN, OnShutdown)
+    ON_MESSAGE(WM_AMI_CALLBACK, OnAMICallback)
+END_MESSAGE_MAP()
+
+
+CHelloClientDlg::CHelloClientDlg(CWnd* pParent /*=NULL*/) : CDialog(CHelloClientDlg::IDD, pParent)
+{
+    _hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+
+    //
+    // Create the communicator.
+    //
+    Ice::InitializationData initData;
+    initData.properties = Ice::createProperties();
+    initData.properties->load("config");
+    initData.dispatcher = new Dispatcher(this);
+    _communicator = Ice::initialize(initData);
+
+    //
+    // Create AMI callbacks.
+    // 
+    CallbackPtr cb = new Callback(this);
+    _sayHelloCallback = newCallback_Hello_sayHello(cb, &Callback::response, &Callback::exception, &Callback::sent);
+    _shutdownCallback = newCallback_Hello_shutdown(cb, &Callback::response, &Callback::exception);
+    _flushCallback = Ice::newCallback_Communicator_flushBatchRequests(cb, &Callback::exception, &Callback::flushSent);
+}
+
+void
+CHelloClientDlg::DoDataExchange(CDataExchange* pDX)
+{
+    CDialog::DoDataExchange(pDX);
+}
+
+
+BOOL
+CHelloClientDlg::OnInitDialog()
+{
+    CDialog::OnInitDialog();
+
+    // Set the icon for this dialog.  The framework does this automatically
+    // when the application's main window is not a dialog
+    SetIcon(_hIcon, TRUE);         // Set big icon
+    SetIcon(_hIcon, FALSE);        // Set small icon
+
+    //
+    // Retrieve the controls.
+    //
+    _host = (CEdit*)GetDlgItem(IDC_HOST);
+    _mode = (CComboBox*)GetDlgItem(IDC_MODE);
+    _timeout = (CSliderCtrl*)GetDlgItem(IDC_TIMEOUT_SLIDER);
+    _timeoutStatus = (CStatic*)GetDlgItem(IDC_TIMEOUT_STATUS);
+    _delay = (CSliderCtrl*)GetDlgItem(IDC_DELAY_SLIDER);
+    _delayStatus = (CStatic*)GetDlgItem(IDC_DELAY_STATUS);
+    _status = (CStatic*)GetDlgItem(IDC_STATUSBAR);
+    _flush = (CButton*)GetDlgItem(IDC_FLUSH);
+
+    //
+    // Use twoway mode as the initial default.
+    //
+    _mode->SetCurSel(TWOWAY);
+
+    //
+    // Disable flush
+    //
+    _flush->EnableWindow(FALSE);
+
+    //
+    // Set hostname
+    //
+    _host->SetWindowText(CString("127.0.0.1"));
+
+    //
+    // Initialize timeout slider
+    //
+    _timeout->SetRangeMin(0);
+    _timeout->SetRangeMax(50);
+    _timeoutStatus->SetWindowText(CString("0.0s"));
+
+    //
+    // Initialize delay slider
+    //
+    _delay->SetRangeMin(0);
+    _delay->SetRangeMax(50);
+    _delayStatus->SetWindowText(CString("0.0s"));
+
+    _status->SetWindowText(CString(" Ready"));
+
+    return TRUE;  // return TRUE  unless you set the focus to a control
+}
+
+void
+CHelloClientDlg::OnClose()
+{
+    //
+    // Destroy the communicator. If AMI calls are still in progress they will be
+    // interrupted with an Ice::CommunicatorDestroyedException.
+    //
+    try
+    {
+        _communicator->destroy();
+    }
+    catch(const IceUtil::Exception&)
+    {
+    }
+}
+
+// If you add a minimize button to your dialog, you will need the code below
+// to draw the icon.  For MFC applications using the document/view model,
+// this is automatically done for you by the framework.
+
+void
+CHelloClientDlg::OnPaint() 
+{
+    if(IsIconic())
+    {
+        CPaintDC dc(this); // device context for painting
+
+        SendMessage(WM_ICONERASEBKGND, reinterpret_cast<WPARAM>(dc.GetSafeHdc()), 0);
+
+        // Center icon in client rectangle
+        int cxIcon = GetSystemMetrics(SM_CXICON);
+        int cyIcon = GetSystemMetrics(SM_CYICON);
+        CRect rect;
+        GetClientRect(&rect);
+        int x = (rect.Width() - cxIcon + 1) / 2;
+        int y = (rect.Height() - cyIcon + 1) / 2;
+
+        // Draw the icon
+        dc.DrawIcon(x, y, _hIcon);
+    }
+    else
+    {
+        CDialog::OnPaint();
+    }
+}
+
+// The system calls this function to obtain the cursor to display while the user drags
+// the minimized window.
+HCURSOR
+CHelloClientDlg::OnQueryDragIcon()
+{
+    return static_cast<HCURSOR>(_hIcon);
+}
+
+void
+CHelloClientDlg::OnHScroll(UINT, UINT, CScrollBar* scroll)
+{
+    CSliderCtrl* slider = (CSliderCtrl*)scroll;
+    ostringstream s;
+    if(slider == _timeout)
+    {
+        s << setiosflags(ios::fixed) << setprecision(1) << (long)_timeout->GetPos()/10.0 << "s";
+        _timeoutStatus->SetWindowText(CString(s.str().c_str()));
+    }
+    else
+    {
+        s << setiosflags(ios::fixed) << setprecision(1) << (long)_delay->GetPos()/10.0 << "s";
+        _delayStatus->SetWindowText(CString(s.str().c_str()));
+    }
+}
+
+void
+CHelloClientDlg::OnSayHello()
+{
+    Demo::HelloPrx hello = createProxy();
+    if(!hello)
+    {
+        return;
+    }
+    int delay = _delay->GetPos() * 100;
+    try
+    {
+        if(!deliveryModeIsBatch())
+        {
+            _status->SetWindowText(CString(" Sending request"));
+            hello->begin_sayHello(delay, _sayHelloCallback);
+        }
+        else
+        {
+            _flush->EnableWindow(TRUE);
+            hello->sayHello(delay);
+            _status->SetWindowText(CString(" Queued sayHello request"));
+        }
+    }
+    catch(const IceUtil::Exception& ex)
+    {
+        handleException(ex);
+    }
+}
+
+void
+CHelloClientDlg::OnShutdown()
+{
+    Demo::HelloPrx hello = createProxy();
+    try
+    {
+        if(!deliveryModeIsBatch())
+        {
+            _status->SetWindowText(CString(" Sending request"));
+            CallbackPtr cb = new Callback(this);
+            hello->begin_shutdown(_shutdownCallback);
+        }
+        else
+        {
+            _flush->EnableWindow(TRUE);
+            hello->shutdown();
+            _status->SetWindowText(CString(" Queued shutdown request"));
+        }
+    }
+    catch(const IceUtil::Exception& ex)
+    {
+        handleException(ex);
+    }
+}
+
+void
+CHelloClientDlg::OnFlush()
+{
+    try
+    {
+        _communicator->begin_flushBatchRequests(_flushCallback);
+    }
+    catch(const IceUtil::Exception& ex)
+    {
+        handleException(ex);
+    }
+    _flush->EnableWindow(FALSE);
+}
+
+LRESULT
+CHelloClientDlg::OnAMICallback(WPARAM, LPARAM lParam)
+{
+    try
+    {
+        Ice::DispatcherCallPtr* call = reinterpret_cast<Ice::DispatcherCallPtr*>(lParam);
+        (*call)->run();
+        delete call;
+    }
+    catch(const Ice::Exception& ex)
+    {
+        handleException(ex);
+    }
+    return 0;
+}
+
+void
+CHelloClientDlg::sent()
+{
+    int mode = _mode->GetCurSel();
+    if(mode == TWOWAY || mode == TWOWAY_SECURE)
+    {
+        _status->SetWindowText(CString(" Waiting for response"));
+    }
+    else
+    {
+        _status->SetWindowText(CString(" Ready"));
+    }
+}
+
+void
+CHelloClientDlg::response()
+{
+    _status->SetWindowText(CString(" Ready"));
+}
+
+void
+CHelloClientDlg::exception(const Ice::Exception& ex)
+{
+    if(!dynamic_cast<const Ice::CommunicatorDestroyedException*>(&ex))
+    {
+        handleException(ex);
+    }
+}
+
+void
+CHelloClientDlg::flushed()
+{
+    _status->SetWindowText(CString(" Flushed batch requests"));
+}
+
+Demo::HelloPrx
+CHelloClientDlg::createProxy()
+{
+    CString h;
+    _host->GetWindowText(h);
+    string host = (LPCTSTR)h;
+    if(host.size() == 0)
+    {
+        _status->SetWindowText(CString(" No hostname"));
+    }
+
+    string s = "hello:tcp -h " + host + " -p 10000:ssl -h " + host + " -p 10001:udp -h " + host + " -p 10000";
+    Ice::ObjectPrx prx = _communicator->stringToProxy(s);
+
+    int mode = _mode->GetCurSel();
+    switch(mode)
+    {
+        case TWOWAY:
+            prx = prx->ice_twoway();
+            break;
+        case TWOWAY_SECURE:
+            prx = prx->ice_twoway()->ice_secure(true);;
+            break;
+        case ONEWAY:
+            prx = prx->ice_oneway();
+            break;
+        case ONEWAY_SECURE:
+            prx = prx->ice_oneway()->ice_secure(true);
+            break;
+        case ONEWAY_BATCH:
+            prx = prx->ice_batchOneway();
+            break;
+        case ONEWAY_SECURE_BATCH:
+            prx = prx->ice_batchOneway()->ice_secure(true);
+            break;
+        case DATAGRAM:
+            prx = prx->ice_datagram();
+            break;
+        case DATAGRAM_BATCH:
+            prx = prx->ice_batchDatagram();
+            break;
+    }
+
+    int timeout = _timeout->GetPos() * 100;
+    if(timeout != 0)
+    {
+        prx = prx->ice_timeout(timeout);
+    }
+
+    return Demo::HelloPrx::uncheckedCast(prx);
+}
+
+BOOL 
+CHelloClientDlg::deliveryModeIsBatch()
+{
+    return _mode->GetCurSel() == ONEWAY_BATCH ||
+           _mode->GetCurSel() == ONEWAY_SECURE_BATCH ||
+           _mode->GetCurSel() == DATAGRAM_BATCH;
+}
+
+void
+CHelloClientDlg::handleException(const IceUtil::Exception& ex)
+{
+    _status->SetWindowText(CString(ex.ice_name().c_str()));
+}
diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.h b/cpp/demo/Ice/MFC/client/HelloClientDlg.h
index 167b1571063..ce692b457cf 100644
--- a/cpp/demo/Ice/MFC/client/HelloClientDlg.h
+++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.h
@@ -1,70 +1,70 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-

-#ifndef HELLO_CLIENT_DLG_H

-#define HELLO_CLIENT_DLG_H

-

-#include "Hello.h"

-

-#pragma once

-

-class CHelloClientDlg : public CDialog

-{

-public:

-

-    CHelloClientDlg(CWnd* = NULL);

-

-    enum { IDD = IDD_HELLOCLIENT_DIALOG };

-

-    afx_msg void OnCbnSelchangeMode();

-

-    void exception(const Ice::Exception&);

-    void response();;

-    void sent();

-    void flushed();

-

-protected:

-

-    virtual void DoDataExchange(CDataExchange*);    // DDX/DDV support

-

-    Ice::CommunicatorPtr _communicator;

-    Demo::Callback_Hello_sayHelloPtr _sayHelloCallback;

-    Demo::Callback_Hello_shutdownPtr _shutdownCallback;

-    Ice::Callback_Communicator_flushBatchRequestsPtr _flushCallback;

-    CEdit* _host;

-    CComboBox* _mode;

-    CSliderCtrl* _timeout;

-    CStatic* _timeoutStatus;

-    CSliderCtrl* _delay;

-    CStatic* _delayStatus;

-    CStatic* _status;

-    CButton* _flush;

-    HICON _hIcon;

-

-    // Generated message map functions

-    virtual BOOL OnInitDialog();

-    afx_msg void OnClose();

-    afx_msg void OnPaint();

-    afx_msg HCURSOR OnQueryDragIcon();

-    afx_msg void OnHScroll(UINT, UINT, CScrollBar*);

-    afx_msg void OnSayHello();

-    afx_msg void OnFlush();

-    afx_msg void OnShutdown();

-    afx_msg LRESULT OnAMICallback(WPARAM, LPARAM);

-    DECLARE_MESSAGE_MAP()

-

-private:

-

-    Demo::HelloPrx createProxy();

-    BOOL deliveryModeIsBatch();

-    void handleException(const IceUtil::Exception&);

-};

-

-#endif

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+
+#ifndef HELLO_CLIENT_DLG_H
+#define HELLO_CLIENT_DLG_H
+
+#include "Hello.h"
+
+#pragma once
+
+class CHelloClientDlg : public CDialog
+{
+public:
+
+    CHelloClientDlg(CWnd* = NULL);
+
+    enum { IDD = IDD_HELLOCLIENT_DIALOG };
+
+    afx_msg void OnCbnSelchangeMode();
+
+    void exception(const Ice::Exception&);
+    void response();;
+    void sent();
+    void flushed();
+
+protected:
+
+    virtual void DoDataExchange(CDataExchange*);    // DDX/DDV support
+
+    Ice::CommunicatorPtr _communicator;
+    Demo::Callback_Hello_sayHelloPtr _sayHelloCallback;
+    Demo::Callback_Hello_shutdownPtr _shutdownCallback;
+    Ice::Callback_Communicator_flushBatchRequestsPtr _flushCallback;
+    CEdit* _host;
+    CComboBox* _mode;
+    CSliderCtrl* _timeout;
+    CStatic* _timeoutStatus;
+    CSliderCtrl* _delay;
+    CStatic* _delayStatus;
+    CStatic* _status;
+    CButton* _flush;
+    HICON _hIcon;
+
+    // Generated message map functions
+    virtual BOOL OnInitDialog();
+    afx_msg void OnClose();
+    afx_msg void OnPaint();
+    afx_msg HCURSOR OnQueryDragIcon();
+    afx_msg void OnHScroll(UINT, UINT, CScrollBar*);
+    afx_msg void OnSayHello();
+    afx_msg void OnFlush();
+    afx_msg void OnShutdown();
+    afx_msg LRESULT OnAMICallback(WPARAM, LPARAM);
+    DECLARE_MESSAGE_MAP()
+
+private:
+
+    Demo::HelloPrx createProxy();
+    BOOL deliveryModeIsBatch();
+    void handleException(const IceUtil::Exception&);
+};
+
+#endif
diff --git a/cpp/demo/Ice/MFC/client/Resource.h b/cpp/demo/Ice/MFC/client/Resource.h
index 7075a527802..b35407d15ec 100755
--- a/cpp/demo/Ice/MFC/client/Resource.h
+++ b/cpp/demo/Ice/MFC/client/Resource.h
@@ -1,33 +1,33 @@
-//{{NO_DEPENDENCIES}}

-// Microsoft Visual C++ generated include file.

-// Used by HelloClient.rc

-//

-#define IDD_HELLOCLIENT_DIALOG          101

-#define IDR_MAINFRAME                   128

-#define IDC_MODELABEL                   1000

-#define IDC_MODE                        1001

-#define IDC_TIMEOUTLABEL                1002

-#define IDC_DELAYLABEL                  1003

-#define IDC_INVOKE                      1004

-#define IDC_FLUSH                       1005

-#define IDC_SHUTDOWN                    1006

-#define IDC_STATUSBAR                   1007

-#define IDC_TIMEOUT_STATUS              1008

-#define IDC_HOST                        1009

-#define IDC_HOSTNAME                    1010

-#define IDC_HOSTLABEL                   1010

-#define IDC_TIMEOUT_SLIDER              1011

-#define IDC_DELAY_SLIDER                1012

-#define IDC_STATUSBAR3                  1013

-#define IDC_DELAY_STATUS                1013

-

-// Next default values for new objects

-// 

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        130

-#define _APS_NEXT_COMMAND_VALUE         32771

-#define _APS_NEXT_CONTROL_VALUE         1012

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif

+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by HelloClient.rc
+//
+#define IDD_HELLOCLIENT_DIALOG          101
+#define IDR_MAINFRAME                   128
+#define IDC_MODELABEL                   1000
+#define IDC_MODE                        1001
+#define IDC_TIMEOUTLABEL                1002
+#define IDC_DELAYLABEL                  1003
+#define IDC_INVOKE                      1004
+#define IDC_FLUSH                       1005
+#define IDC_SHUTDOWN                    1006
+#define IDC_STATUSBAR                   1007
+#define IDC_TIMEOUT_STATUS              1008
+#define IDC_HOST                        1009
+#define IDC_HOSTNAME                    1010
+#define IDC_HOSTLABEL                   1010
+#define IDC_TIMEOUT_SLIDER              1011
+#define IDC_DELAY_SLIDER                1012
+#define IDC_STATUSBAR3                  1013
+#define IDC_DELAY_STATUS                1013
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        130
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1012
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/cpp/demo/Ice/MFC/client/stdafx.cpp b/cpp/demo/Ice/MFC/client/stdafx.cpp
index c73265a887b..1e840966688 100644
--- a/cpp/demo/Ice/MFC/client/stdafx.cpp
+++ b/cpp/demo/Ice/MFC/client/stdafx.cpp
@@ -7,11 +7,11 @@
 //
 // **********************************************************************
 
-

-// stdafx.cpp : source file that includes just the standard includes

-// HelloClient.pch will be the pre-compiled header

-// stdafx.obj will contain the pre-compiled type information

-

-#include "stdafx.h"

-

-

+
+// stdafx.cpp : source file that includes just the standard includes
+// HelloClient.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+
diff --git a/cpp/demo/Ice/MFC/server/HelloServer.h b/cpp/demo/Ice/MFC/server/HelloServer.h
index 14944e3ae13..198a0d1acba 100644
--- a/cpp/demo/Ice/MFC/server/HelloServer.h
+++ b/cpp/demo/Ice/MFC/server/HelloServer.h
@@ -7,28 +7,28 @@
 //
 // **********************************************************************
 
-

-#ifndef HELLO_SERVER_H

-#define HELLO_SERVER_H

-

-#pragma once

-

-#ifndef __AFXWIN_H__

-    #error include 'stdafx.h' before including this file for PCH

-#endif

-

-#include "Resource.h"

-

-class CHelloServerApp : public CWinApp

-{

-public:

-    CHelloServerApp();

-

-    virtual BOOL InitInstance();

-

-    DECLARE_MESSAGE_MAP()

-};

-

-extern CHelloServerApp theApp;

-

-#endif

+
+#ifndef HELLO_SERVER_H
+#define HELLO_SERVER_H
+
+#pragma once
+
+#ifndef __AFXWIN_H__
+    #error include 'stdafx.h' before including this file for PCH
+#endif
+
+#include "Resource.h"
+
+class CHelloServerApp : public CWinApp
+{
+public:
+    CHelloServerApp();
+
+    virtual BOOL InitInstance();
+
+    DECLARE_MESSAGE_MAP()
+};
+
+extern CHelloServerApp theApp;
+
+#endif
diff --git a/cpp/demo/Ice/MFC/server/HelloServerDlg.h b/cpp/demo/Ice/MFC/server/HelloServerDlg.h
index 4082629ae07..eaa70fe876b 100644
--- a/cpp/demo/Ice/MFC/server/HelloServerDlg.h
+++ b/cpp/demo/Ice/MFC/server/HelloServerDlg.h
@@ -7,39 +7,39 @@
 //
 // **********************************************************************
 
-

-#ifndef HELLO_SERVER_DLG_H

-#define HELLO_SERVER_DLG_H

-

-#pragma once

-

-#include "LogI.h"

-

-class CHelloServerDlg : public CDialog

-{

-public:

-    CHelloServerDlg(const Ice::CommunicatorPtr&, const LogIPtr&, CWnd* = NULL);

-

-    enum { IDD = IDD_HELLOSERVER_DIALOG };

-

-protected:

-    virtual void DoDataExchange(CDataExchange*);    // DDX/DDV support

-

-protected:

-    Ice::CommunicatorPtr _communicator;

-    LogIPtr _log;

-    CEdit* _edit;

-    HICON _hIcon;

-

-    // Generated message map functions

-    virtual BOOL OnInitDialog();

-    virtual void OnCancel();

-    afx_msg void OnPaint();

-    afx_msg HCURSOR OnQueryDragIcon();

-    afx_msg void OnShutdown();

-    afx_msg void OnClear();

+
+#ifndef HELLO_SERVER_DLG_H
+#define HELLO_SERVER_DLG_H
+
+#pragma once
+
+#include "LogI.h"
+
+class CHelloServerDlg : public CDialog
+{
+public:
+    CHelloServerDlg(const Ice::CommunicatorPtr&, const LogIPtr&, CWnd* = NULL);
+
+    enum { IDD = IDD_HELLOSERVER_DIALOG };
+
+protected:
+    virtual void DoDataExchange(CDataExchange*);    // DDX/DDV support
+
+protected:
+    Ice::CommunicatorPtr _communicator;
+    LogIPtr _log;
+    CEdit* _edit;
+    HICON _hIcon;
+
+    // Generated message map functions
+    virtual BOOL OnInitDialog();
+    virtual void OnCancel();
+    afx_msg void OnPaint();
+    afx_msg HCURSOR OnQueryDragIcon();
+    afx_msg void OnShutdown();
+    afx_msg void OnClear();
     afx_msg LRESULT OnLog(WPARAM, LPARAM);
-    DECLARE_MESSAGE_MAP()

-};

-

-#endif

+    DECLARE_MESSAGE_MAP()
+};
+
+#endif
diff --git a/cpp/demo/Ice/MFC/server/Resource.h b/cpp/demo/Ice/MFC/server/Resource.h
index aa36843484c..fd2966fc9b1 100644
--- a/cpp/demo/Ice/MFC/server/Resource.h
+++ b/cpp/demo/Ice/MFC/server/Resource.h
@@ -1,20 +1,20 @@
-//{{NO_DEPENDENCIES}}

-// Microsoft Developer Studio generated include file.

-// Used by HelloServer.rc

-//

-#define IDD_HELLOSERVER_DIALOG          101

-#define IDR_MAINFRAME                   128

-#define IDC_SHUTDOWN                    1001

-#define IDC_CLEAR                       1002

-#define IDC_LOG                         1003

-

-// Next default values for new objects

-// 

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        130

-#define _APS_NEXT_COMMAND_VALUE         32771

-#define _APS_NEXT_CONTROL_VALUE         1004

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif

+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by HelloServer.rc
+//
+#define IDD_HELLOSERVER_DIALOG          101
+#define IDR_MAINFRAME                   128
+#define IDC_SHUTDOWN                    1001
+#define IDC_CLEAR                       1002
+#define IDC_LOG                         1003
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        130
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1004
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/cpp/demo/Ice/MFC/server/stdafx.cpp b/cpp/demo/Ice/MFC/server/stdafx.cpp
index e46a30ff629..59971dfb70f 100644
--- a/cpp/demo/Ice/MFC/server/stdafx.cpp
+++ b/cpp/demo/Ice/MFC/server/stdafx.cpp
@@ -7,11 +7,11 @@
 //
 // **********************************************************************
 
-

-// stdafx.cpp : source file that includes just the standard includes

-// HelloServer.pch will be the pre-compiled header

-// stdafx.obj will contain the pre-compiled type information

-

-#include "stdafx.h"

-

-

+
+// stdafx.cpp : source file that includes just the standard includes
+// HelloServer.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+
diff --git a/cpp/demo/IceGrid/icebox/application.xml b/cpp/demo/IceGrid/icebox/application.xml
index dd5e29675c0..7322dc8ae46 100644
--- a/cpp/demo/IceGrid/icebox/application.xml
+++ b/cpp/demo/IceGrid/icebox/application.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-<!-- This file was written by IceGrid Admin -->

-<icegrid>

-   <application name="HelloSimpsons">

-      <service-template id="HelloService">

-         <parameter name="name"/>

-         <service name="${name}" entry="HelloService:create">

-            <description>A very simple service named after ${name}</description>

-            <properties>

-               <property name="Hello.Identity" value="hello"/>

-            </properties>

-            <adapter name="Hello-${name}" endpoints="default" id="Hello-${name}" replica-group="HelloGroup" server-lifetime="false"/>

-         </service>

-      </service-template>

-      <server-template id="Glacier2">

-         <parameter name="instance-name" default="${application}.Glacier2"/>

-         <parameter name="client-endpoints"/>

-         <parameter name="server-endpoints"/>

-         <parameter name="session-timeout" default="0"/>

-         <server id="${instance-name}" activation="manual" exe="glacier2router">

-            <properties>

-               <property name="Ice.Admin.Endpoints" value="tcp -h 127.0.0.1"/>

-               <property name="Glacier2.Client.Endpoints" value="${client-endpoints}"/>

-               <property name="Glacier2.Server.Endpoints" value="${server-endpoints}"/>

-               <property name="Glacier2.InstanceName" value="${instance-name}"/>

-               <property name="Glacier2.SessionTimeout" value="${session-timeout}"/>

-            </properties>

-         </server>

-      </server-template>

-      <replica-group id="HelloGroup">

-         <load-balancing type="round-robin" n-replicas="1"/>

-         <object identity="hello" type="::Demo::Hello"/>

-      </replica-group>

-      <node name="node1">

-         <server-instance template="Glacier2" instance-name="DemoGlacier2" client-endpoints="tcp -h localhost -p 4063" server-endpoints="tcp">

-            <properties>

-               <property name="Glacier2.SessionManager" value="DemoIceGrid/AdminSessionManager"/>

-               <property name="Glacier2.PermissionsVerifier" value="DemoGlacier2/NullPermissionsVerifier"/>

-            </properties>

-         </server-instance>

-         <icebox id="IceBox" activation="on-demand" exe="icebox">

-            <description>A sample IceBox server</description>

-            <properties>

-               <property name="Ice.Admin.Endpoints" value="tcp -h 127.0.0.1"/>

-               <property name="IceBox.InstanceName" value="${server}"/>

-               <property name="IceBox.Trace.ServiceObserver" value="1"/>

-            </properties>

-            <service-instance template="HelloService" name="Homer"/>

-            <service-instance template="HelloService" name="Marge"/>

-            <service-instance template="HelloService" name="Bart"/>

-            <service-instance template="HelloService" name="Lisa"/>

-            <service-instance template="HelloService" name="Maggie"/>

-         </icebox>

-      </node>

-   </application>

-</icegrid>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- This file was written by IceGrid Admin -->
+<icegrid>
+   <application name="HelloSimpsons">
+      <service-template id="HelloService">
+         <parameter name="name"/>
+         <service name="${name}" entry="HelloService:create">
+            <description>A very simple service named after ${name}</description>
+            <properties>
+               <property name="Hello.Identity" value="hello"/>
+            </properties>
+            <adapter name="Hello-${name}" endpoints="default" id="Hello-${name}" replica-group="HelloGroup" server-lifetime="false"/>
+         </service>
+      </service-template>
+      <server-template id="Glacier2">
+         <parameter name="instance-name" default="${application}.Glacier2"/>
+         <parameter name="client-endpoints"/>
+         <parameter name="server-endpoints"/>
+         <parameter name="session-timeout" default="0"/>
+         <server id="${instance-name}" activation="manual" exe="glacier2router">
+            <properties>
+               <property name="Ice.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
+               <property name="Glacier2.Client.Endpoints" value="${client-endpoints}"/>
+               <property name="Glacier2.Server.Endpoints" value="${server-endpoints}"/>
+               <property name="Glacier2.InstanceName" value="${instance-name}"/>
+               <property name="Glacier2.SessionTimeout" value="${session-timeout}"/>
+            </properties>
+         </server>
+      </server-template>
+      <replica-group id="HelloGroup">
+         <load-balancing type="round-robin" n-replicas="1"/>
+         <object identity="hello" type="::Demo::Hello"/>
+      </replica-group>
+      <node name="node1">
+         <server-instance template="Glacier2" instance-name="DemoGlacier2" client-endpoints="tcp -h localhost -p 4063" server-endpoints="tcp">
+            <properties>
+               <property name="Glacier2.SessionManager" value="DemoIceGrid/AdminSessionManager"/>
+               <property name="Glacier2.PermissionsVerifier" value="DemoGlacier2/NullPermissionsVerifier"/>
+            </properties>
+         </server-instance>
+         <icebox id="IceBox" activation="on-demand" exe="icebox">
+            <description>A sample IceBox server</description>
+            <properties>
+               <property name="Ice.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
+               <property name="IceBox.InstanceName" value="${server}"/>
+               <property name="IceBox.Trace.ServiceObserver" value="1"/>
+            </properties>
+            <service-instance template="HelloService" name="Homer"/>
+            <service-instance template="HelloService" name="Marge"/>
+            <service-instance template="HelloService" name="Bart"/>
+            <service-instance template="HelloService" name="Lisa"/>
+            <service-instance template="HelloService" name="Maggie"/>
+         </icebox>
+      </node>
+   </application>
+</icegrid>
diff --git a/cpp/demo/IcePatch2/MFC/README b/cpp/demo/IcePatch2/MFC/README
index cfc206a063b..78c1ffbf286 100644
--- a/cpp/demo/IcePatch2/MFC/README
+++ b/cpp/demo/IcePatch2/MFC/README
@@ -1,41 +1,41 @@
-This demo illustrates how to use MFC to create a simple IcePatch2

-client application.

-

-In order to use this demo, you must first prepare a sample data

-directory for the IcePatch2 server. The contents of the data

-directory are what the client will receive during the patch process.

-For convenience, this example uses its own source files as the data

-to be patched.

-

-Assuming that your current working directory is demo/IcePatch2/MFC,

-you can prepare the data files with the following command:

-

-> icepatch2calc .

-

-Next, start the IcePatch2 server. Note that the trailing "." argument

-in the following command is required and directs the server to use the

-current directory as its data directory:

-

-> icepatch2server --IcePatch2.Endpoints="tcp -h 127.0.0.1 -p 10000" .

-

-Before we start the patch client, we must first create an empty

-directory where the downloaded files will be placed. For example, open

-a new command window and execute this command:

-

-> mkdir C:\icepatch_download

-

-Now you can start the IcePatch2 client (You will also need to pass an

-argument that defines IcePatch2.Endpoints if you use an endpoint other

-than the one shown above when you start icepatch2server):

-

-> client

-

-Click the "..." button to the right of the Patch Directory field and

-select the empty directory you just created. Then click the "Patch"

-button to begin the patch process. The first time you click this

-button you will be prompted to confirm that you want to perform a

-thorough patch (because the target download directory is empty).

-

-If you add files or delete files from the data directory or make

-changes to existing files, you must stop the server, run icepatch2calc

-again to update the data files, and then restart the IcePatch2 server.

+This demo illustrates how to use MFC to create a simple IcePatch2
+client application.
+
+In order to use this demo, you must first prepare a sample data
+directory for the IcePatch2 server. The contents of the data
+directory are what the client will receive during the patch process.
+For convenience, this example uses its own source files as the data
+to be patched.
+
+Assuming that your current working directory is demo/IcePatch2/MFC,
+you can prepare the data files with the following command:
+
+> icepatch2calc .
+
+Next, start the IcePatch2 server. Note that the trailing "." argument
+in the following command is required and directs the server to use the
+current directory as its data directory:
+
+> icepatch2server --IcePatch2.Endpoints="tcp -h 127.0.0.1 -p 10000" .
+
+Before we start the patch client, we must first create an empty
+directory where the downloaded files will be placed. For example, open
+a new command window and execute this command:
+
+> mkdir C:\icepatch_download
+
+Now you can start the IcePatch2 client (You will also need to pass an
+argument that defines IcePatch2.Endpoints if you use an endpoint other
+than the one shown above when you start icepatch2server):
+
+> client
+
+Click the "..." button to the right of the Patch Directory field and
+select the empty directory you just created. Then click the "Patch"
+button to begin the patch process. The first time you click this
+button you will be prompted to confirm that you want to perform a
+thorough patch (because the target download directory is empty).
+
+If you add files or delete files from the data directory or make
+changes to existing files, you must stop the server, run icepatch2calc
+again to update the data files, and then restart the IcePatch2 server.
diff --git a/cpp/demo/IcePatch2/MFC/resource.h b/cpp/demo/IcePatch2/MFC/resource.h
index d97e574378b..3f5dfd7febc 100644
--- a/cpp/demo/IcePatch2/MFC/resource.h
+++ b/cpp/demo/IcePatch2/MFC/resource.h
@@ -1,36 +1,36 @@
-//{{NO_DEPENDENCIES}}

-// Microsoft Developer Studio generated include file.

-// Used by PatchClient.rc

-//

-#define IDD_PATCHCLIENT_DIALOG          101

-#define IDR_MAINFRAME                   128

-#define IDC_MODELABEL                   1000

-#define IDC_MODE                        1001

-#define IDC_SECURE                      1002

-#define IDC_TIMEOUT                     1003

-#define IDC_INVOKE                      1004

-#define IDC_FLUSH                       1005

-#define IDC_SHUTDOWN                    1006

-#define IDC_STATUSBAR                   1007

-#define IDC_PROGRESS                    1008

-#define IDC_PERCENT                     1009

-#define IDC_STARTPATCH                  1010

-#define IDC_CANCELPATCH                 1011

-#define IDC_THOROUGH                    1015

-#define IDC_PATH                        1016

-#define IDC_SELECTDIR                   1017

-#define IDC_ORPHAN                      1018

-#define IDC_FILE                        1023

-#define IDC_TOTAL                       1024

-#define IDC_SPEED                       1025

-

-// Next default values for new objects

-// 

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        130

-#define _APS_NEXT_COMMAND_VALUE         32771

-#define _APS_NEXT_CONTROL_VALUE         1026

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif

+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by PatchClient.rc
+//
+#define IDD_PATCHCLIENT_DIALOG          101
+#define IDR_MAINFRAME                   128
+#define IDC_MODELABEL                   1000
+#define IDC_MODE                        1001
+#define IDC_SECURE                      1002
+#define IDC_TIMEOUT                     1003
+#define IDC_INVOKE                      1004
+#define IDC_FLUSH                       1005
+#define IDC_SHUTDOWN                    1006
+#define IDC_STATUSBAR                   1007
+#define IDC_PROGRESS                    1008
+#define IDC_PERCENT                     1009
+#define IDC_STARTPATCH                  1010
+#define IDC_CANCELPATCH                 1011
+#define IDC_THOROUGH                    1015
+#define IDC_PATH                        1016
+#define IDC_SELECTDIR                   1017
+#define IDC_ORPHAN                      1018
+#define IDC_FILE                        1023
+#define IDC_TOTAL                       1024
+#define IDC_SPEED                       1025
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        130
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1026
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/cpp/demo/book/evictor_filesystem/Scanner.cpp b/cpp/demo/book/evictor_filesystem/Scanner.cpp
index 4a6a9c0ab78..7b654a5b6ca 100755
--- a/cpp/demo/book/evictor_filesystem/Scanner.cpp
+++ b/cpp/demo/book/evictor_filesystem/Scanner.cpp
@@ -1,4 +1,4 @@
-#include "IceUtil/Config.h" 

+#include "IceUtil/Config.h" 
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
diff --git a/cpp/demo/book/lifecycle/Scanner.cpp b/cpp/demo/book/lifecycle/Scanner.cpp
index 4a6a9c0ab78..7b654a5b6ca 100755
--- a/cpp/demo/book/lifecycle/Scanner.cpp
+++ b/cpp/demo/book/lifecycle/Scanner.cpp
@@ -1,4 +1,4 @@
-#include "IceUtil/Config.h" 

+#include "IceUtil/Config.h" 
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
diff --git a/cpp/demo/book/map_filesystem/Scanner.cpp b/cpp/demo/book/map_filesystem/Scanner.cpp
index 4a6a9c0ab78..7b654a5b6ca 100644
--- a/cpp/demo/book/map_filesystem/Scanner.cpp
+++ b/cpp/demo/book/map_filesystem/Scanner.cpp
@@ -1,4 +1,4 @@
-#include "IceUtil/Config.h" 

+#include "IceUtil/Config.h" 
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
diff --git a/cpp/doc/slicefiles b/cpp/doc/slicefiles
index 19f89c2f283..40e577bcf82 100755
--- a/cpp/doc/slicefiles
+++ b/cpp/doc/slicefiles
@@ -1,68 +1,68 @@
-SLICEFILES = ..\..\slice\Freeze\BackgroundSaveEvictor.ice \

-             ..\..\slice\Freeze\CatalogData.ice \

-             ..\..\slice\Freeze\Connection.ice \

-             ..\..\slice\Freeze\ConnectionF.ice \

-             ..\..\slice\Freeze\DB.ice \

-             ..\..\slice\Freeze\Evictor.ice \

-             ..\..\slice\Freeze\EvictorF.ice \

-             ..\..\slice\Freeze\EvictorStorage.ice \

-             ..\..\slice\Freeze\Exception.ice \

-             ..\..\slice\Freeze\Transaction.ice \

-             ..\..\slice\Freeze\TransactionalEvictor.ice \

-             ..\..\slice\Glacier2\PermissionsVerifier.ice \

-             ..\..\slice\Glacier2\PermissionsVerifierF.ice \

-             ..\..\slice\Glacier2\Router.ice \

-             ..\..\slice\Glacier2\RouterF.ice \

-             ..\..\slice\Glacier2\Session.ice \

-             ..\..\slice\Glacier2\SSLInfo.ice \

-             ..\..\slice\Ice\BuiltinSequences.ice \

-             ..\..\slice\Ice\Communicator.ice \

-             ..\..\slice\Ice\CommunicatorF.ice \

-             ..\..\slice\Ice\Connection.ice \

-             ..\..\slice\Ice\ConnectionF.ice \

-             ..\..\slice\Ice\Current.ice \

-             ..\..\slice\Ice\Endpoint.ice \

-             ..\..\slice\Ice\EndpointF.ice \

-             ..\..\slice\Ice\EndpointTypes.ice \

-             ..\..\slice\Ice\FacetMap.ice \

-             ..\..\slice\Ice\Identity.ice \

-             ..\..\slice\Ice\ImplicitContext.ice \

-             ..\..\slice\Ice\ImplicitContextF.ice \

-             ..\..\slice\Ice\LocalException.ice \

-             ..\..\slice\Ice\Locator.ice \

-             ..\..\slice\Ice\LocatorF.ice \

-             ..\..\slice\Ice\Logger.ice \

-             ..\..\slice\Ice\LoggerF.ice \

-             ..\..\slice\Ice\ObjectAdapter.ice \

-             ..\..\slice\Ice\ObjectAdapterF.ice \

-             ..\..\slice\Ice\ObjectFactory.ice \

-             ..\..\slice\Ice\ObjectFactoryF.ice \

-             ..\..\slice\Ice\Plugin.ice \

-             ..\..\slice\Ice\PluginF.ice \

-             ..\..\slice\Ice\Process.ice \

-             ..\..\slice\Ice\ProcessF.ice \

-             ..\..\slice\Ice\Properties.ice \

-             ..\..\slice\Ice\PropertiesF.ice \

-             ..\..\slice\Ice\Router.ice \

-             ..\..\slice\Ice\RouterF.ice \

-             ..\..\slice\Ice\ServantLocator.ice \

-             ..\..\slice\Ice\ServantLocatorF.ice \

-             ..\..\slice\Ice\SliceChecksumDict.ice \

-             ..\..\slice\Ice\Stats.ice \

-             ..\..\slice\Ice\StatsF.ice \

-             ..\..\slice\IceBox\IceBox.ice \

-             ..\..\slice\IceGrid\Admin.ice \

-             ..\..\slice\IceGrid\Descriptor.ice \

-             ..\..\slice\IceGrid\Exception.ice \

-             ..\..\slice\IceGrid\FileParser.ice \

-             ..\..\slice\IceGrid\Locator.ice \

-             ..\..\slice\IceGrid\Observer.ice \

-             ..\..\slice\IceGrid\Query.ice \

-             ..\..\slice\IceGrid\Registry.ice \

-             ..\..\slice\IceGrid\Session.ice \

-             ..\..\slice\IceGrid\UserAccountMapper.ice \

-             ..\..\slice\IcePatch2\FileInfo.ice \

-             ..\..\slice\IcePatch2\FileServer.ice \

-             ..\..\slice\IceSSL\Endpoint.ice \

-             ..\..\slice\IceStorm\IceStorm.ice 

-

+SLICEFILES = ..\..\slice\Freeze\BackgroundSaveEvictor.ice \
+             ..\..\slice\Freeze\CatalogData.ice \
+             ..\..\slice\Freeze\Connection.ice \
+             ..\..\slice\Freeze\ConnectionF.ice \
+             ..\..\slice\Freeze\DB.ice \
+             ..\..\slice\Freeze\Evictor.ice \
+             ..\..\slice\Freeze\EvictorF.ice \
+             ..\..\slice\Freeze\EvictorStorage.ice \
+             ..\..\slice\Freeze\Exception.ice \
+             ..\..\slice\Freeze\Transaction.ice \
+             ..\..\slice\Freeze\TransactionalEvictor.ice \
+             ..\..\slice\Glacier2\PermissionsVerifier.ice \
+             ..\..\slice\Glacier2\PermissionsVerifierF.ice \
+             ..\..\slice\Glacier2\Router.ice \
+             ..\..\slice\Glacier2\RouterF.ice \
+             ..\..\slice\Glacier2\Session.ice \
+             ..\..\slice\Glacier2\SSLInfo.ice \
+             ..\..\slice\Ice\BuiltinSequences.ice \
+             ..\..\slice\Ice\Communicator.ice \
+             ..\..\slice\Ice\CommunicatorF.ice \
+             ..\..\slice\Ice\Connection.ice \
+             ..\..\slice\Ice\ConnectionF.ice \
+             ..\..\slice\Ice\Current.ice \
+             ..\..\slice\Ice\Endpoint.ice \
+             ..\..\slice\Ice\EndpointF.ice \
+             ..\..\slice\Ice\EndpointTypes.ice \
+             ..\..\slice\Ice\FacetMap.ice \
+             ..\..\slice\Ice\Identity.ice \
+             ..\..\slice\Ice\ImplicitContext.ice \
+             ..\..\slice\Ice\ImplicitContextF.ice \
+             ..\..\slice\Ice\LocalException.ice \
+             ..\..\slice\Ice\Locator.ice \
+             ..\..\slice\Ice\LocatorF.ice \
+             ..\..\slice\Ice\Logger.ice \
+             ..\..\slice\Ice\LoggerF.ice \
+             ..\..\slice\Ice\ObjectAdapter.ice \
+             ..\..\slice\Ice\ObjectAdapterF.ice \
+             ..\..\slice\Ice\ObjectFactory.ice \
+             ..\..\slice\Ice\ObjectFactoryF.ice \
+             ..\..\slice\Ice\Plugin.ice \
+             ..\..\slice\Ice\PluginF.ice \
+             ..\..\slice\Ice\Process.ice \
+             ..\..\slice\Ice\ProcessF.ice \
+             ..\..\slice\Ice\Properties.ice \
+             ..\..\slice\Ice\PropertiesF.ice \
+             ..\..\slice\Ice\Router.ice \
+             ..\..\slice\Ice\RouterF.ice \
+             ..\..\slice\Ice\ServantLocator.ice \
+             ..\..\slice\Ice\ServantLocatorF.ice \
+             ..\..\slice\Ice\SliceChecksumDict.ice \
+             ..\..\slice\Ice\Stats.ice \
+             ..\..\slice\Ice\StatsF.ice \
+             ..\..\slice\IceBox\IceBox.ice \
+             ..\..\slice\IceGrid\Admin.ice \
+             ..\..\slice\IceGrid\Descriptor.ice \
+             ..\..\slice\IceGrid\Exception.ice \
+             ..\..\slice\IceGrid\FileParser.ice \
+             ..\..\slice\IceGrid\Locator.ice \
+             ..\..\slice\IceGrid\Observer.ice \
+             ..\..\slice\IceGrid\Query.ice \
+             ..\..\slice\IceGrid\Registry.ice \
+             ..\..\slice\IceGrid\Session.ice \
+             ..\..\slice\IceGrid\UserAccountMapper.ice \
+             ..\..\slice\IcePatch2\FileInfo.ice \
+             ..\..\slice\IcePatch2\FileServer.ice \
+             ..\..\slice\IceSSL\Endpoint.ice \
+             ..\..\slice\IceStorm\IceStorm.ice 
+
diff --git a/cpp/src/Ice/EventLoggerMsg.h b/cpp/src/Ice/EventLoggerMsg.h
index ef3d9132286..75756db548f 100755
--- a/cpp/src/Ice/EventLoggerMsg.h
+++ b/cpp/src/Ice/EventLoggerMsg.h
@@ -1,53 +1,53 @@
- // **********************************************************************

- //

- // Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

- //

- // This copy of Ice is licensed to you under the terms described in the

- // ICE_LICENSE file included in this distribution.

- //

- // **********************************************************************

-//

-//  Values are 32 bit values laid out as follows:

-//

-//   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1

-//   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

-//  +---+-+-+-----------------------+-------------------------------+

-//  |Sev|C|R|     Facility          |               Code            |

-//  +---+-+-+-----------------------+-------------------------------+

-//

-//  where

-//

-//      Sev - is the severity code

-//

-//          00 - Success

-//          01 - Informational

-//          10 - Warning

-//          11 - Error

-//

-//      C - is the Customer code flag

-//

-//      R - is a reserved bit

-//

-//      Facility - is the facility code

-//

-//      Code - is the facility's status code

-//

-//

-// Define the facility codes

-//

-

-

-//

-// Define the severity codes

-//

-

-

-//

-// MessageId: EVENT_LOGGER_MSG

-//

-// MessageText:

-//

-// %1

-//

-#define EVENT_LOGGER_MSG                 0x00000000L

-

+ // **********************************************************************
+ //
+ // Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+ //
+ // This copy of Ice is licensed to you under the terms described in the
+ // ICE_LICENSE file included in this distribution.
+ //
+ // **********************************************************************
+//
+//  Values are 32 bit values laid out as follows:
+//
+//   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+//   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+//  +---+-+-+-----------------------+-------------------------------+
+//  |Sev|C|R|     Facility          |               Code            |
+//  +---+-+-+-----------------------+-------------------------------+
+//
+//  where
+//
+//      Sev - is the severity code
+//
+//          00 - Success
+//          01 - Informational
+//          10 - Warning
+//          11 - Error
+//
+//      C - is the Customer code flag
+//
+//      R - is a reserved bit
+//
+//      Facility - is the facility code
+//
+//      Code - is the facility's status code
+//
+//
+// Define the facility codes
+//
+
+
+//
+// Define the severity codes
+//
+
+
+//
+// MessageId: EVENT_LOGGER_MSG
+//
+// MessageText:
+//
+// %1
+//
+#define EVENT_LOGGER_MSG                 0x00000000L
+
diff --git a/cpp/src/IceDB/IceDB.rc b/cpp/src/IceDB/IceDB.rc
index 3cde3536999..af10fc5f736 100644
--- a/cpp/src/IceDB/IceDB.rc
+++ b/cpp/src/IceDB/IceDB.rc
@@ -1,38 +1,38 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,0,0
- PRODUCTVERSION 3,4,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icedb34d\0"
- #define ORIGINALFILENAME "icedb34d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icedb34\0"
- #define ORIGINALFILENAME "icedb34.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "IceDB DLL\0"
-            VALUE "FileVersion", "3.4.0\0"
-            VALUE "InternalName", INTERNALNAME
-            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"
-            VALUE "OriginalFilename", ORIGINALFILENAME
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.4.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
+#include "winver.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 3,4,0,0

+ PRODUCTVERSION 3,4,0,0

+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

+#ifdef _DEBUG

+ FILEFLAGS VS_FF_DEBUG

+ #define INTERNALNAME "icedb34d\0"

+ #define ORIGINALFILENAME "icedb34d.dll\0"

+#else

+ FILEFLAGS 0x0L

+ #define INTERNALNAME "icedb34\0"

+ #define ORIGINALFILENAME "icedb34.dll\0"

+#endif

+ FILEOS 0x4L

+ FILETYPE VFT_DLL

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", "ZeroC, Inc.\0"

+            VALUE "FileDescription", "IceDB DLL\0"

+            VALUE "FileVersion", "3.4.0\0"

+            VALUE "InternalName", INTERNALNAME

+            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"

+            VALUE "OriginalFilename", ORIGINALFILENAME

+            VALUE "ProductName", "Ice\0"

+            VALUE "ProductVersion", "3.4.0\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

diff --git a/cpp/src/IceDB/Makefile.mak b/cpp/src/IceDB/Makefile.mak
index ec00899c93b..d8ef1f37817 100644
--- a/cpp/src/IceDB/Makefile.mak
+++ b/cpp/src/IceDB/Makefile.mak
@@ -1,66 +1,66 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
- 
-LIBNAME		= $(top_srcdir)\lib\icedb$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-OBJS		= IceDB.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DICE_DB_API_EXPORTS -DWIN32_LEAN_AND_MEAN
-
-LINKWITH        = $(BASELIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-!if "$(BCPLUSPLUS)" == "yes"
-RES_FILE        = ,, IceDB.res
-!else
-RES_FILE        = IceDB.res
-!endif
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceDB.res
-	$(LINK) $(BASE):0x28000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-
-clean::
-	-del /q IceDB.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-
-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"
-
-!elseif "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
-
-!include .depend.mak
+# **********************************************************************

+#

+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

+#

+# This copy of Ice is licensed to you under the terms described in the

+# ICE_LICENSE file included in this distribution.

+#

+# **********************************************************************

+

+top_srcdir	= ..\..

+ 

+LIBNAME		= $(top_srcdir)\lib\icedb$(LIBSUFFIX).lib

+DLLNAME		= $(top_srcdir)\bin\icedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll

+

+TARGETS		= $(LIBNAME) $(DLLNAME)

+

+OBJS		= IceDB.obj

+

+SRCS		= $(OBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+CPPFLAGS	= -I.. $(CPPFLAGS) -DICE_DB_API_EXPORTS -DWIN32_LEAN_AND_MEAN

+

+LINKWITH        = $(BASELIBS)

+

+!if "$(GENERATE_PDB)" == "yes"

+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

+!endif

+

+!if "$(BCPLUSPLUS)" == "yes"

+RES_FILE        = ,, IceDB.res

+!else

+RES_FILE        = IceDB.res

+!endif

+

+$(LIBNAME): $(DLLNAME)

+

+$(DLLNAME): $(OBJS) IceDB.res

+	$(LINK) $(BASE):0x28000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)

+	move $(DLLNAME:.dll=.lib) $(LIBNAME)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)

+

+clean::

+	-del /q IceDB.res

+

+install:: all

+	copy $(LIBNAME) "$(install_libdir)"

+	copy $(DLLNAME) "$(install_bindir)"

+

+

+!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

+

+install:: all

+	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"

+

+!elseif "$(GENERATE_PDB)" == "yes"

+

+install:: all

+	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

+

+!endif

+

+!include .depend.mak

diff --git a/cpp/src/IceGrid/FileParserI.h b/cpp/src/IceGrid/FileParserI.h
index ca6e9855c46..51e5765bf42 100644
--- a/cpp/src/IceGrid/FileParserI.h
+++ b/cpp/src/IceGrid/FileParserI.h
@@ -6,18 +6,18 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-

-#ifndef ICE_GRID_FILE_PARSERI_H

-#define ICE_GRID_FILE_PARSERI_H

-

-#include <IceGrid/FileParser.h>

-

-class FileParserI : public IceGrid::FileParser

-{

-public:

-

-    IceGrid::ApplicationDescriptor

-    parse(const std::string& file, const IceGrid::AdminPrx& admin, const Ice::Current&);

-};

-

-#endif

+
+#ifndef ICE_GRID_FILE_PARSERI_H
+#define ICE_GRID_FILE_PARSERI_H
+
+#include <IceGrid/FileParser.h>
+
+class FileParserI : public IceGrid::FileParser
+{
+public:
+
+    IceGrid::ApplicationDescriptor
+    parse(const std::string& file, const IceGrid::AdminPrx& admin, const Ice::Current&);
+};
+
+#endif
diff --git a/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc b/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc
index 8514d02e19c..394cfee03cf 100644
--- a/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc
+++ b/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc
@@ -1,38 +1,38 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,0,0
- PRODUCTVERSION 3,4,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormfreezedb34d\0"
- #define ORIGINALFILENAME "icestormfreezedb34d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icegridfreezedb34\0"
- #define ORIGINALFILENAME "icegridfreezedb34.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "IceGrid Freeze DB DLL\0"
-            VALUE "FileVersion", "3.4.0\0"
-            VALUE "InternalName", INTERNALNAME
-            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"
-            VALUE "OriginalFilename", ORIGINALFILENAME
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.4.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
+#include "winver.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 3,4,0,0

+ PRODUCTVERSION 3,4,0,0

+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

+#ifdef _DEBUG

+ FILEFLAGS VS_FF_DEBUG

+ #define INTERNALNAME "icestormfreezedb34d\0"

+ #define ORIGINALFILENAME "icestormfreezedb34d.dll\0"

+#else

+ FILEFLAGS 0x0L

+ #define INTERNALNAME "icegridfreezedb34\0"

+ #define ORIGINALFILENAME "icegridfreezedb34.dll\0"

+#endif

+ FILEOS 0x4L

+ FILETYPE VFT_DLL

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", "ZeroC, Inc.\0"

+            VALUE "FileDescription", "IceGrid Freeze DB DLL\0"

+            VALUE "FileVersion", "3.4.0\0"

+            VALUE "InternalName", INTERNALNAME

+            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"

+            VALUE "OriginalFilename", ORIGINALFILENAME

+            VALUE "ProductName", "Ice\0"

+            VALUE "ProductVersion", "3.4.0\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

diff --git a/cpp/src/IceGrid/FreezeDB/Makefile.mak b/cpp/src/IceGrid/FreezeDB/Makefile.mak
index 542f830b8a6..495b64e42ba 100644
--- a/cpp/src/IceGrid/FreezeDB/Makefile.mak
+++ b/cpp/src/IceGrid/FreezeDB/Makefile.mak
@@ -1,92 +1,92 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-
-LIBNAME		= $(top_srcdir)\lib\icegridfreezedb$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icegridfreezedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS         = $(LIBNAME) $(DLLNAME)
-
-OBJS   		= StringApplicationInfoDict.obj \
-		  IdentityObjectInfoDict.obj \
-		  StringAdapterInfoDict.obj \
-		  FreezeDB.obj
-
-DB_OBJS		= FreezeTypes.obj
-
-{$(top_srcdir)\src\IceDB\}.cpp.obj::
-    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(top_srcdir)\src\IceDB\FreezeTypes.cpp
-
-HDIR		= $(headerdir)/IceGrid
-SDIR		= $(slicedir)/IceGrid
-
-SLICE2FREEZECMD = $(SLICE2FREEZE) -I..\.. --ice --include-dir IceGrid\FreezeDB $(ICECPPFLAGS)
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I..\.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-SLICE2CPPFLAGS	= -I..\.. --ice --include-dir IceGrid\FreezeDB $(SLICE2CPPFLAGS)
-
-LINKWITH 	= icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS)
-MLINKWITH 	= freeze$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib icegriddb$(LIBSUFFIX).lib $(LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = IceGridFreezeDB.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) $(DB_OBJS) IceGridFreezeDB.res
-	$(LINK) /base:0x2E000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \
-		$(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-
-StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \
-	StringApplicationInfoDict $(SDIR)\Admin.ice
-
-IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(slicedir)\Ice\Identity.ice $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \
-	--dict-index IceGrid::IdentityObjectInfoDict,type \
-	IdentityObjectInfoDict $(slicedir)\Ice\Identity.ice $(SDIR)\Admin.ice
-
-StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo \
-	--dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(SDIR)\Admin.ice
-
-clean::
-	-del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
-	-del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
-	-del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
-	-del /q IceGridFreezeDB.res IceGridMigrate.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
-
-!include .depend.mak
+# **********************************************************************

+#

+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

+#

+# This copy of Ice is licensed to you under the terms described in the

+# ICE_LICENSE file included in this distribution.

+#

+# **********************************************************************

+

+top_srcdir	= ..\..\..

+

+LIBNAME		= $(top_srcdir)\lib\icegridfreezedb$(LIBSUFFIX).lib

+DLLNAME		= $(top_srcdir)\bin\icegridfreezedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll

+

+TARGETS         = $(LIBNAME) $(DLLNAME)

+

+OBJS   		= StringApplicationInfoDict.obj \

+		  IdentityObjectInfoDict.obj \

+		  StringAdapterInfoDict.obj \

+		  FreezeDB.obj

+

+DB_OBJS		= FreezeTypes.obj

+

+{$(top_srcdir)\src\IceDB\}.cpp.obj::

+    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<

+

+SRCS		= $(OBJS:.obj=.cpp) \

+		  $(top_srcdir)\src\IceDB\FreezeTypes.cpp

+

+HDIR		= $(headerdir)/IceGrid

+SDIR		= $(slicedir)/IceGrid

+

+SLICE2FREEZECMD = $(SLICE2FREEZE) -I..\.. --ice --include-dir IceGrid\FreezeDB $(ICECPPFLAGS)

+

+!include $(top_srcdir)\config\Make.rules.mak

+

+CPPFLAGS	= -I..\.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN

+SLICE2CPPFLAGS	= -I..\.. --ice --include-dir IceGrid\FreezeDB $(SLICE2CPPFLAGS)

+

+LINKWITH 	= icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS)

+MLINKWITH 	= freeze$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib icegriddb$(LIBSUFFIX).lib $(LIBS)

+

+!if "$(GENERATE_PDB)" == "yes"

+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

+!endif

+

+RES_FILE        = IceGridFreezeDB.res

+

+$(LIBNAME): $(DLLNAME)

+

+$(DLLNAME): $(OBJS) $(DB_OBJS) IceGridFreezeDB.res

+	$(LINK) /base:0x2E000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \

+		$(RES_FILE)

+	move $(DLLNAME:.dll=.lib) $(LIBNAME)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)

+

+StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

+	del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp

+	$(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \

+	StringApplicationInfoDict $(SDIR)\Admin.ice

+

+IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(slicedir)\Ice\Identity.ice $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

+	del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp

+	$(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \

+	--dict-index IceGrid::IdentityObjectInfoDict,type \

+	IdentityObjectInfoDict $(slicedir)\Ice\Identity.ice $(SDIR)\Admin.ice

+

+StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

+	del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp

+	$(SLICE2FREEZECMD) --dict IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo \

+	--dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(SDIR)\Admin.ice

+

+clean::

+	-del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp

+	-del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp

+	-del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp

+	-del /q IceGridFreezeDB.res IceGridMigrate.res

+

+install:: all

+	copy $(LIBNAME) "$(install_libdir)"

+	copy $(DLLNAME) "$(install_bindir)"

+

+!if "$(GENERATE_PDB)" == "yes"

+

+install:: all

+	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

+

+!endif

+

+!include .depend.mak

diff --git a/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc b/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc
index 6eb838f2f5f..ac8af830401 100644
--- a/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc
+++ b/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc
@@ -1,38 +1,38 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,0,0
- PRODUCTVERSION 3,4,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icegridsqldb34d\0"
- #define ORIGINALFILENAME "icegridsqldb34d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icegridsqldb34\0"
- #define ORIGINALFILENAME "icegridsqldb34.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "IceGrid Sql DB DLL\0"
-            VALUE "FileVersion", "3.4.0\0"
-            VALUE "InternalName", INTERNALNAME
-            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"
-            VALUE "OriginalFilename", ORIGINALFILENAME
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.4.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
+#include "winver.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 3,4,0,0

+ PRODUCTVERSION 3,4,0,0

+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

+#ifdef _DEBUG

+ FILEFLAGS VS_FF_DEBUG

+ #define INTERNALNAME "icegridsqldb34d\0"

+ #define ORIGINALFILENAME "icegridsqldb34d.dll\0"

+#else

+ FILEFLAGS 0x0L

+ #define INTERNALNAME "icegridsqldb34\0"

+ #define ORIGINALFILENAME "icegridsqldb34.dll\0"

+#endif

+ FILEOS 0x4L

+ FILETYPE VFT_DLL

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", "ZeroC, Inc.\0"

+            VALUE "FileDescription", "IceGrid Sql DB DLL\0"

+            VALUE "FileVersion", "3.4.0\0"

+            VALUE "InternalName", INTERNALNAME

+            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"

+            VALUE "OriginalFilename", ORIGINALFILENAME

+            VALUE "ProductName", "Ice\0"

+            VALUE "ProductVersion", "3.4.0\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

diff --git a/cpp/src/IceGrid/SqlDB/Makefile.mak b/cpp/src/IceGrid/SqlDB/Makefile.mak
index 4eb40cdf1bf..d7ee6759a1d 100644
--- a/cpp/src/IceGrid/SqlDB/Makefile.mak
+++ b/cpp/src/IceGrid/SqlDB/Makefile.mak
@@ -1,66 +1,66 @@
-
-#
-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-
-LIBNAME		= $(top_srcdir)\lib\icegridsqldb$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icegridsqldb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS         = $(LIBNAME) $(DLLNAME)
-
-OBJS  		= SqlStringApplicationInfoDict.obj \
-		  SqlIdentityObjectInfoDict.obj \
-		  SqlStringAdapterInfoDict.obj \
-		  SqlDB.obj
-
-DB_OBJS		= SqlTypes.obj
-
-{$(top_srcdir)\src\IceDB\}.cpp.obj::
-    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(top_srcdir)\src\IceDB\SqlTypes.cpp
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I..\.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-LINKWITH 	= $(QT_LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib $(LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = IceGridSqlDB.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) $(DB_OBJS) IceGridSqlDB.res
-	$(LINK) /base:0x2E000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \
-		$(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-
-clean::
-	-del /q IceGridSqlDB.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
-
-!include .depend.mak
+

+#

+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

+#

+# This copy of Ice is licensed to you under the terms described in the

+# ICE_LICENSE file included in this distribution.

+#

+# **********************************************************************

+

+top_srcdir	= ..\..\..

+

+LIBNAME		= $(top_srcdir)\lib\icegridsqldb$(LIBSUFFIX).lib

+DLLNAME		= $(top_srcdir)\bin\icegridsqldb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll

+

+TARGETS         = $(LIBNAME) $(DLLNAME)

+

+OBJS  		= SqlStringApplicationInfoDict.obj \

+		  SqlIdentityObjectInfoDict.obj \

+		  SqlStringAdapterInfoDict.obj \

+		  SqlDB.obj

+

+DB_OBJS		= SqlTypes.obj

+

+{$(top_srcdir)\src\IceDB\}.cpp.obj::

+    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<

+

+SRCS		= $(OBJS:.obj=.cpp) \

+		  $(top_srcdir)\src\IceDB\SqlTypes.cpp

+

+!include $(top_srcdir)\config\Make.rules.mak

+

+CPPFLAGS	= -I..\.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN

+

+LINKWITH 	= $(QT_LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib $(LIBS)

+

+!if "$(GENERATE_PDB)" == "yes"

+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

+!endif

+

+RES_FILE        = IceGridSqlDB.res

+

+$(LIBNAME): $(DLLNAME)

+

+$(DLLNAME): $(OBJS) $(DB_OBJS) IceGridSqlDB.res

+	$(LINK) /base:0x2E000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \

+		$(RES_FILE)

+	move $(DLLNAME:.dll=.lib) $(LIBNAME)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)

+

+clean::

+	-del /q IceGridSqlDB.res

+

+install:: all

+	copy $(LIBNAME) "$(install_libdir)"

+	copy $(DLLNAME) "$(install_bindir)"

+

+!if "$(GENERATE_PDB)" == "yes"

+

+install:: all

+	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

+

+!endif

+

+!include .depend.mak

diff --git a/cpp/src/IcePatch2/security.manifest b/cpp/src/IcePatch2/security.manifest
index 7bb8cb7b12c..3b17a575a95 100644
--- a/cpp/src/IcePatch2/security.manifest
+++ b/cpp/src/IcePatch2/security.manifest
@@ -1,11 +1,11 @@
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>

-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">

-    <security>

-      <requestedPrivileges>

-        <requestedExecutionLevel

-          level="asInvoker"

-          uiAccess="false"/>

-        </requestedPrivileges>

-       </security>

-  </trustInfo>

-</assembly>

+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="asInvoker"
+          uiAccess="false"/>
+        </requestedPrivileges>
+       </security>
+  </trustInfo>
+</assembly>
diff --git a/cpp/src/IcePatch2Lib/security.manifest b/cpp/src/IcePatch2Lib/security.manifest
index 7bb8cb7b12c..3b17a575a95 100644
--- a/cpp/src/IcePatch2Lib/security.manifest
+++ b/cpp/src/IcePatch2Lib/security.manifest
@@ -1,11 +1,11 @@
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>

-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">

-    <security>

-      <requestedPrivileges>

-        <requestedExecutionLevel

-          level="asInvoker"

-          uiAccess="false"/>

-        </requestedPrivileges>

-       </security>

-  </trustInfo>

-</assembly>

+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="asInvoker"
+          uiAccess="false"/>
+        </requestedPrivileges>
+       </security>
+  </trustInfo>
+</assembly>
diff --git a/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc b/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc
index 12ade539c57..c2b90616a6a 100644
--- a/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc
+++ b/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc
@@ -1,38 +1,38 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,0,0
- PRODUCTVERSION 3,4,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormfreezedb34d\0"
- #define ORIGINALFILENAME "icestormfreezedb34d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icestormfreezedb34\0"
- #define ORIGINALFILENAME "icestormfreezedb34.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "IceStorm Freeze DB DLL\0"
-            VALUE "FileVersion", "3.4.0\0"
-            VALUE "InternalName", INTERNALNAME
-            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"
-            VALUE "OriginalFilename", ORIGINALFILENAME
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.4.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
+#include "winver.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 3,4,0,0

+ PRODUCTVERSION 3,4,0,0

+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

+#ifdef _DEBUG

+ FILEFLAGS VS_FF_DEBUG

+ #define INTERNALNAME "icestormfreezedb34d\0"

+ #define ORIGINALFILENAME "icestormfreezedb34d.dll\0"

+#else

+ FILEFLAGS 0x0L

+ #define INTERNALNAME "icestormfreezedb34\0"

+ #define ORIGINALFILENAME "icestormfreezedb34.dll\0"

+#endif

+ FILEOS 0x4L

+ FILETYPE VFT_DLL

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", "ZeroC, Inc.\0"

+            VALUE "FileDescription", "IceStorm Freeze DB DLL\0"

+            VALUE "FileVersion", "3.4.0\0"

+            VALUE "InternalName", INTERNALNAME

+            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"

+            VALUE "OriginalFilename", ORIGINALFILENAME

+            VALUE "ProductName", "Ice\0"

+            VALUE "ProductVersion", "3.4.0\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

diff --git a/cpp/src/IceStorm/FreezeDB/Makefile.mak b/cpp/src/IceStorm/FreezeDB/Makefile.mak
index 26fab1277d1..fc7f639b73f 100644
--- a/cpp/src/IceStorm/FreezeDB/Makefile.mak
+++ b/cpp/src/IceStorm/FreezeDB/Makefile.mak
@@ -1,120 +1,120 @@
-
-#
-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-
-LIBNAME		= $(top_srcdir)\lib\icestormfreezedb$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icestormfreezedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
-
-MIGRATE		= $(top_srcdir)\bin\icestormmigrate.exe
-
-TARGETS         = $(LIBNAME) $(DLLNAME) $(MIGRATE)
-
-OBJS   		= LLUMap.obj \
-                  SubscriberMap.obj \
-		  FreezeDB.obj
-
-DB_OBJS		= FreezeTypes.obj
-
-MOBJS		= Migrate.obj \
-                  SubscriberMap.obj \
-                  LLUMap.obj \
-		  LinkRecord.obj \
-		  V32FormatDB.obj \
-		  V31FormatDB.obj \
-		  V32Format.obj \
-		  V31Format.obj
-
-{$(top_srcdir)\src\IceDB\}.cpp.obj::
-    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(MOBJS:.obj=.cpp) \
-		  $(top_srcdir)\src\IceDB\FreezeTypes.cpp
-
-HDIR		= $(headerdir)/IceStorm
-SDIR		= $(slicedir)/IceStorm
-
-SLICE2FREEZECMD = $(SLICE2FREEZE) -I..\.. --ice --include-dir IceStorm\FreezeDB $(ICECPPFLAGS)
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I..\.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-SLICE2CPPFLAGS	= -I..\.. --ice --include-dir IceStorm\FreezeDB $(SLICE2CPPFLAGS)
-
-LINKWITH 	= icestormservice$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS)
-MLINKWITH 	= freeze$(LIBSUFFIX).lib icestormservice$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib $(LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-MPDBFLAGS       = /pdb:$(MIGRATE:.exe=.pdb)
-!endif
-
-RES_FILE        = IceStormFreezeDB.res
-MRES_FILE       = IceStormMigrate.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) $(DB_OBJS) IceStormFreezeDB.res
-	$(LINK) /base:0x2D000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \
-		$(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-
-$(MIGRATE): $(MOBJS) IceStormMigrate.res
-	$(LINK) $(LD_EXEFLAGS) $(MPDBFLAGS) $(MOBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(MLINKWITH) $(MRES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-LLUMap.h LLUMap.cpp: ..\..\IceStorm\LLURecord.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q LLUMap.h LLUMap.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate LLUMap ..\..\IceStorm\LLURecord.ice
-
-SubscriberMap.h SubscriberMap.cpp: ..\..\IceStorm\SubscriberRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q SubscriberMap.h SubscriberMap.cpp
-	$(SLICE2FREEZECMD) \
-	--dict IceStorm::SubscriberMap,IceStorm::SubscriberRecordKey,IceStorm::SubscriberRecord,sort \
-	SubscriberMap ..\..\IceStorm\SubscriberRecord.ice
-
-# Needed for migration.
-V32FormatDB.h V32FormatDB.cpp: V32Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q V32FormatDB.h V32FormatDB.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \
-	V32FormatDB V32Format.ice
-
-V31FormatDB.h V31FormatDB.cpp: V31Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q V31FormatDB.h V31FormatDB.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \
-	V31FormatDB V31Format.ice
-
-clean::
-	-del /q LLUMap.h LLUMap.cpp
-	-del /q SubscriberMap.h SubscriberMap.cpp
-	-del /q V32FormatDB.cpp V31FormatDB.cpp V31FormatDB.h V31FormatDB.h
-	-del /q V32Migrate.cpp V32Migrate.h
-	-del /q V31Migrate.cpp V31Migrate.h
-	-del /q $(MIGRATE:.exe=.*)
-	-del /q IceStormFreezeDB.res IceStormMigrate.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-	copy $(MIGRATE) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-	copy $(MIGRATE:.exe=.pdb) "$(install_bindir)"
-
-!endif
-
-!include .depend.mak
+

+#

+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

+#

+# This copy of Ice is licensed to you under the terms described in the

+# ICE_LICENSE file included in this distribution.

+#

+# **********************************************************************

+

+top_srcdir	= ..\..\..

+

+LIBNAME		= $(top_srcdir)\lib\icestormfreezedb$(LIBSUFFIX).lib

+DLLNAME		= $(top_srcdir)\bin\icestormfreezedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll

+

+MIGRATE		= $(top_srcdir)\bin\icestormmigrate.exe

+

+TARGETS         = $(LIBNAME) $(DLLNAME) $(MIGRATE)

+

+OBJS   		= LLUMap.obj \

+                  SubscriberMap.obj \

+		  FreezeDB.obj

+

+DB_OBJS		= FreezeTypes.obj

+

+MOBJS		= Migrate.obj \

+                  SubscriberMap.obj \

+                  LLUMap.obj \

+		  LinkRecord.obj \

+		  V32FormatDB.obj \

+		  V31FormatDB.obj \

+		  V32Format.obj \

+		  V31Format.obj

+

+{$(top_srcdir)\src\IceDB\}.cpp.obj::

+    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<

+

+SRCS		= $(OBJS:.obj=.cpp) \

+		  $(MOBJS:.obj=.cpp) \

+		  $(top_srcdir)\src\IceDB\FreezeTypes.cpp

+

+HDIR		= $(headerdir)/IceStorm

+SDIR		= $(slicedir)/IceStorm

+

+SLICE2FREEZECMD = $(SLICE2FREEZE) -I..\.. --ice --include-dir IceStorm\FreezeDB $(ICECPPFLAGS)

+

+!include $(top_srcdir)\config\Make.rules.mak

+

+CPPFLAGS	= -I..\.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN

+SLICE2CPPFLAGS	= -I..\.. --ice --include-dir IceStorm\FreezeDB $(SLICE2CPPFLAGS)

+

+LINKWITH 	= icestormservice$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS)

+MLINKWITH 	= freeze$(LIBSUFFIX).lib icestormservice$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib $(LIBS)

+

+!if "$(GENERATE_PDB)" == "yes"

+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

+MPDBFLAGS       = /pdb:$(MIGRATE:.exe=.pdb)

+!endif

+

+RES_FILE        = IceStormFreezeDB.res

+MRES_FILE       = IceStormMigrate.res

+

+$(LIBNAME): $(DLLNAME)

+

+$(DLLNAME): $(OBJS) $(DB_OBJS) IceStormFreezeDB.res

+	$(LINK) /base:0x2D000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \

+		$(RES_FILE)

+	move $(DLLNAME:.dll=.lib) $(LIBNAME)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)

+

+$(MIGRATE): $(MOBJS) IceStormMigrate.res

+	$(LINK) $(LD_EXEFLAGS) $(MPDBFLAGS) $(MOBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(MLINKWITH) $(MRES_FILE)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

+

+LLUMap.h LLUMap.cpp: ..\..\IceStorm\LLURecord.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

+	del /q LLUMap.h LLUMap.cpp

+	$(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate LLUMap ..\..\IceStorm\LLURecord.ice

+

+SubscriberMap.h SubscriberMap.cpp: ..\..\IceStorm\SubscriberRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

+	del /q SubscriberMap.h SubscriberMap.cpp

+	$(SLICE2FREEZECMD) \

+	--dict IceStorm::SubscriberMap,IceStorm::SubscriberRecordKey,IceStorm::SubscriberRecord,sort \

+	SubscriberMap ..\..\IceStorm\SubscriberRecord.ice

+

+# Needed for migration.

+V32FormatDB.h V32FormatDB.cpp: V32Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

+	del /q V32FormatDB.h V32FormatDB.cpp

+	$(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \

+	V32FormatDB V32Format.ice

+

+V31FormatDB.h V31FormatDB.cpp: V31Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

+	del /q V31FormatDB.h V31FormatDB.cpp

+	$(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \

+	V31FormatDB V31Format.ice

+

+clean::

+	-del /q LLUMap.h LLUMap.cpp

+	-del /q SubscriberMap.h SubscriberMap.cpp

+	-del /q V32FormatDB.cpp V31FormatDB.cpp V31FormatDB.h V31FormatDB.h

+	-del /q V32Migrate.cpp V32Migrate.h

+	-del /q V31Migrate.cpp V31Migrate.h

+	-del /q $(MIGRATE:.exe=.*)

+	-del /q IceStormFreezeDB.res IceStormMigrate.res

+

+install:: all

+	copy $(LIBNAME) "$(install_libdir)"

+	copy $(DLLNAME) "$(install_bindir)"

+	copy $(MIGRATE) "$(install_bindir)"

+

+!if "$(GENERATE_PDB)" == "yes"

+

+install:: all

+	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

+	copy $(MIGRATE:.exe=.pdb) "$(install_bindir)"

+

+!endif

+

+!include .depend.mak

diff --git a/cpp/src/IceStorm/LLURecord.ice b/cpp/src/IceStorm/LLURecord.ice
index a3e23830109..23cebf0fd7b 100644
--- a/cpp/src/IceStorm/LLURecord.ice
+++ b/cpp/src/IceStorm/LLURecord.ice
@@ -26,4 +26,4 @@ struct LogUpdate
 
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc b/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc
index eafc50e59d5..d8bafb2524c 100644
--- a/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc
+++ b/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc
@@ -1,38 +1,38 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,0,0
- PRODUCTVERSION 3,4,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormsqldb34d\0"
- #define ORIGINALFILENAME "icestormsqldb34d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icestormsqldb34\0"
- #define ORIGINALFILENAME "icestormsqldb34.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "IceStorm Sql DB DLL\0"
-            VALUE "FileVersion", "3.4.0\0"
-            VALUE "InternalName", INTERNALNAME
-            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"
-            VALUE "OriginalFilename", ORIGINALFILENAME
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.4.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
+#include "winver.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 3,4,0,0

+ PRODUCTVERSION 3,4,0,0

+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

+#ifdef _DEBUG

+ FILEFLAGS VS_FF_DEBUG

+ #define INTERNALNAME "icestormsqldb34d\0"

+ #define ORIGINALFILENAME "icestormsqldb34d.dll\0"

+#else

+ FILEFLAGS 0x0L

+ #define INTERNALNAME "icestormsqldb34\0"

+ #define ORIGINALFILENAME "icestormsqldb34.dll\0"

+#endif

+ FILEOS 0x4L

+ FILETYPE VFT_DLL

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", "ZeroC, Inc.\0"

+            VALUE "FileDescription", "IceStorm Sql DB DLL\0"

+            VALUE "FileVersion", "3.4.0\0"

+            VALUE "InternalName", INTERNALNAME

+            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"

+            VALUE "OriginalFilename", ORIGINALFILENAME

+            VALUE "ProductName", "Ice\0"

+            VALUE "ProductVersion", "3.4.0\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

diff --git a/cpp/src/IceStorm/SqlDB/Makefile.mak b/cpp/src/IceStorm/SqlDB/Makefile.mak
index 3a78f92f0e0..c739fc3efa1 100644
--- a/cpp/src/IceStorm/SqlDB/Makefile.mak
+++ b/cpp/src/IceStorm/SqlDB/Makefile.mak
@@ -1,66 +1,66 @@
-
-#
-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-
-LIBNAME		= $(top_srcdir)\lib\icestormsqldb$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icestormsqldb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS         = $(LIBNAME) $(DLLNAME)
-
-OBJS  		= SqlLLU.obj \
-                  SqlSubscriberMap.obj \
-		  SqlDB.obj
-
-DB_OBJS		= SqlTypes.obj
-
-{$(top_srcdir)\src\IceDB\}.cpp.obj::
-    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(MOBJS:.obj=.cpp) \
-		  $(top_srcdir)\src\IceDB\SqlTypes.cpp
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I..\.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-LINKWITH 	= $(QT_LIBS) icestormservice$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib $(LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = IceStormSqlDB.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) $(DB_OBJS) IceStormSqlDB.res
-	$(LINK) /base:0x2D000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \
-		$(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-
-clean::
-	-del /q IceStormSqlDB.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
-
-!include .depend.mak
+

+#

+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

+#

+# This copy of Ice is licensed to you under the terms described in the

+# ICE_LICENSE file included in this distribution.

+#

+# **********************************************************************

+

+top_srcdir	= ..\..\..

+

+LIBNAME		= $(top_srcdir)\lib\icestormsqldb$(LIBSUFFIX).lib

+DLLNAME		= $(top_srcdir)\bin\icestormsqldb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll

+

+TARGETS         = $(LIBNAME) $(DLLNAME)

+

+OBJS  		= SqlLLU.obj \

+                  SqlSubscriberMap.obj \

+		  SqlDB.obj

+

+DB_OBJS		= SqlTypes.obj

+

+{$(top_srcdir)\src\IceDB\}.cpp.obj::

+    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<

+

+SRCS		= $(OBJS:.obj=.cpp) \

+		  $(MOBJS:.obj=.cpp) \

+		  $(top_srcdir)\src\IceDB\SqlTypes.cpp

+

+!include $(top_srcdir)\config\Make.rules.mak

+

+CPPFLAGS	= -I..\.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN

+

+LINKWITH 	= $(QT_LIBS) icestormservice$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib $(LIBS)

+

+!if "$(GENERATE_PDB)" == "yes"

+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

+!endif

+

+RES_FILE        = IceStormSqlDB.res

+

+$(LIBNAME): $(DLLNAME)

+

+$(DLLNAME): $(OBJS) $(DB_OBJS) IceStormSqlDB.res

+	$(LINK) /base:0x2D000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \

+		$(RES_FILE)

+	move $(DLLNAME:.dll=.lib) $(LIBNAME)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)

+

+clean::

+	-del /q IceStormSqlDB.res

+

+install:: all

+	copy $(LIBNAME) "$(install_libdir)"

+	copy $(DLLNAME) "$(install_bindir)"

+

+!if "$(GENERATE_PDB)" == "yes"

+

+install:: all

+	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

+

+!endif

+

+!include .depend.mak

diff --git a/cpp/test/Freeze/fileLock/run.py b/cpp/test/Freeze/fileLock/run.py
index 3e743ae91c7..73defbe6c19 100755
--- a/cpp/test/Freeze/fileLock/run.py
+++ b/cpp/test/Freeze/fileLock/run.py
@@ -46,4 +46,4 @@ clientExe.sendline('go')
 clientExe.expect('File lock released.')
 clientExe.waitTestSuccess()
 
-print "ok"
\ No newline at end of file
+print "ok"
diff --git a/cpp/test/Ice/interceptor/TestI.cpp b/cpp/test/Ice/interceptor/TestI.cpp
index 4cd1f54ea2a..e5e74ae0015 100644
--- a/cpp/test/Ice/interceptor/TestI.cpp
+++ b/cpp/test/Ice/interceptor/TestI.cpp
@@ -6,20 +6,20 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-

+
 #ifndef INTERCEPTOR_TEST_API_EXPORTS
 #   define INTERCEPTOR_TEST_API_EXPORTS
 #endif
-#include <Ice/Ice.h>

-#include <Test.h>

-#include <iostream>

-

-using namespace IceUtil; 

-using namespace std;

-

-void

-Test::RetryException::ice_print(ostream& out) const

-{

-    Exception::ice_print(out);

-    out << ":\nretry dispatch";

-}

+#include <Ice/Ice.h>
+#include <Test.h>
+#include <iostream>
+
+using namespace IceUtil; 
+using namespace std;
+
+void
+Test::RetryException::ice_print(ostream& out) const
+{
+    Exception::ice_print(out);
+    out << ":\nretry dispatch";
+}
diff --git a/cpp/test/IceBox/configuration/config.service1-2 b/cpp/test/IceBox/configuration/config.service1-2
index 76064138212..c173914db2a 100644
--- a/cpp/test/IceBox/configuration/config.service1-2
+++ b/cpp/test/IceBox/configuration/config.service1-2
@@ -8,4 +8,4 @@ OverrideMe=2
 UnsetMe=
 
 
-Ice.PrintAdapterReady=0
\ No newline at end of file
+Ice.PrintAdapterReady=0
diff --git a/cpp/test/IceGrid/replication/useraccounts.txt b/cpp/test/IceGrid/replication/useraccounts.txt
index de136797a01..98b9109d438 100644
--- a/cpp/test/IceGrid/replication/useraccounts.txt
+++ b/cpp/test/IceGrid/replication/useraccounts.txt
@@ -1,2 +1,2 @@
-dummy1 Dummy User Account1
-dummy2 Dummy User Account2
\ No newline at end of file
+dummy1 Dummy User Account1

+dummy2 Dummy User Account2

diff --git a/cpp/test/IceUtil/fileLock/Makefile.mak b/cpp/test/IceUtil/fileLock/Makefile.mak
index 15e910f44db..02b98eb081d 100644
--- a/cpp/test/IceUtil/fileLock/Makefile.mak
+++ b/cpp/test/IceUtil/fileLock/Makefile.mak
@@ -40,4 +40,4 @@ $(CLIENTF): $(OBJFS)
 clean::

 	del /q run.pid

 

-!include .depend.mak
+!include .depend.mak

diff --git a/cpp/test/IceUtil/fileLock/run.py b/cpp/test/IceUtil/fileLock/run.py
index e84ffa2ee09..9232b4b2448 100755
--- a/cpp/test/IceUtil/fileLock/run.py
+++ b/cpp/test/IceUtil/fileLock/run.py
@@ -53,4 +53,4 @@ clientExe.expect('File lock acquired.\.*')
 clientExe.sendline('go')
 clientExe.expect('File lock released.')
 clientExe.waitTestSuccess()
-print "ok"
\ No newline at end of file
+print "ok"
diff --git a/cpp/test/IceUtil/unicode/LICENSE b/cpp/test/IceUtil/unicode/LICENSE
index 06484a8c158..7b66698dba5 100755
--- a/cpp/test/IceUtil/unicode/LICENSE
+++ b/cpp/test/IceUtil/unicode/LICENSE
@@ -1,3 +1,3 @@
-The content of the *.utf* files comes from Wikipedia and is licensed

-under the GNU Free Document License version 1.2 (see FDL file).

-

+The content of the *.utf* files comes from Wikipedia and is licensed
+under the GNU Free Document License version 1.2 (see FDL file).
+
diff --git a/cpp/test/IceUtil/unicode/filename.txt b/cpp/test/IceUtil/unicode/filename.txt
index e6373bde83b..269631e158c 100644
--- a/cpp/test/IceUtil/unicode/filename.txt
+++ b/cpp/test/IceUtil/unicode/filename.txt
@@ -1 +1 @@
-cœur.txt
\ No newline at end of file
+cœur.txt

diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.err b/cpp/test/Slice/errorDetection/IllegalLocal.err
index fa56f466c01..3acc9aa5e5c 100644
--- a/cpp/test/Slice/errorDetection/IllegalLocal.err
+++ b/cpp/test/Slice/errorDetection/IllegalLocal.err
@@ -1,23 +1,23 @@
-IllegalLocal.ice:17: local interface `i2' cannot have non-local base interface `i1'

-IllegalLocal.ice:19: non-local interface `i3' cannot have local base interface `i2'

-IllegalLocal.ice:25: non-local class `c2' cannot have local base interface `i2'

-IllegalLocal.ice:31: non-local interface `i' cannot have operation `op' throwing local exception `le'

-IllegalLocal.ice:34: non-local exception `le2' cannot have local base exception `le'

-IllegalLocal.ice:40: non-local class`c3' cannot contain local member `lo1'

-IllegalLocal.ice:41: cannot create proxy for local interface `i2'

-IllegalLocal.ice:41: non-local class`c3' cannot contain local member `lo2'

-IllegalLocal.ice:42: non-local class`c3' cannot contain local member `lo3'

-IllegalLocal.ice:43: non-local class`c3' cannot contain local member `ls'

-IllegalLocal.ice:48: non-local struct`s1' cannot contain local member `ls'

-IllegalLocal.ice:53: non-local exception`e3' cannot contain local member `ls'

-IllegalLocal.ice:56: non-local sequence `los' cannot have local element type

-IllegalLocal.ice:59: warning: use of sequences in dictionary keys has been deprecated

-IllegalLocal.ice:59: non-local dictionary `d1' cannot have local key type

-IllegalLocal.ice:60: non-local dictionary `d2' cannot have local value type

-IllegalLocal.ice:61: warning: use of sequences in dictionary keys has been deprecated

-IllegalLocal.ice:61: non-local dictionary `d3' cannot have local key type

-IllegalLocal.ice:61: non-local dictionary `d3' cannot have local value type

-IllegalLocal.ice:66: non-local struct`s2' cannot contain local member `m'

-IllegalLocal.ice:72: non-local struct`s3' cannot contain local member `e'

-IllegalLocal.ice:77: non-local interface `i5' cannot have local parameter `p' in operation `op'

-IllegalLocal.ice:78: non-local interface `i5' cannot have operation `op2' with local return type

+IllegalLocal.ice:17: local interface `i2' cannot have non-local base interface `i1'
+IllegalLocal.ice:19: non-local interface `i3' cannot have local base interface `i2'
+IllegalLocal.ice:25: non-local class `c2' cannot have local base interface `i2'
+IllegalLocal.ice:31: non-local interface `i' cannot have operation `op' throwing local exception `le'
+IllegalLocal.ice:34: non-local exception `le2' cannot have local base exception `le'
+IllegalLocal.ice:40: non-local class`c3' cannot contain local member `lo1'
+IllegalLocal.ice:41: cannot create proxy for local interface `i2'
+IllegalLocal.ice:41: non-local class`c3' cannot contain local member `lo2'
+IllegalLocal.ice:42: non-local class`c3' cannot contain local member `lo3'
+IllegalLocal.ice:43: non-local class`c3' cannot contain local member `ls'
+IllegalLocal.ice:48: non-local struct`s1' cannot contain local member `ls'
+IllegalLocal.ice:53: non-local exception`e3' cannot contain local member `ls'
+IllegalLocal.ice:56: non-local sequence `los' cannot have local element type
+IllegalLocal.ice:59: warning: use of sequences in dictionary keys has been deprecated
+IllegalLocal.ice:59: non-local dictionary `d1' cannot have local key type
+IllegalLocal.ice:60: non-local dictionary `d2' cannot have local value type
+IllegalLocal.ice:61: warning: use of sequences in dictionary keys has been deprecated
+IllegalLocal.ice:61: non-local dictionary `d3' cannot have local key type
+IllegalLocal.ice:61: non-local dictionary `d3' cannot have local value type
+IllegalLocal.ice:66: non-local struct`s2' cannot contain local member `m'
+IllegalLocal.ice:72: non-local struct`s3' cannot contain local member `e'
+IllegalLocal.ice:77: non-local interface `i5' cannot have local parameter `p' in operation `op'
+IllegalLocal.ice:78: non-local interface `i5' cannot have operation `op2' with local return type
diff --git a/cpp/test/Slice/parser/Makefile.mak b/cpp/test/Slice/parser/Makefile.mak
index 9a49c02162e..f917a6c74d9 100644
--- a/cpp/test/Slice/parser/Makefile.mak
+++ b/cpp/test/Slice/parser/Makefile.mak
@@ -1,28 +1,28 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-
-TARGETS		= $(OBJS)
-
-OBJS		= CircularA.obj \
-		  CircularB.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-SLICE2CPPFLAGS	= -I. $(SLICE2CPPFLAGS)
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-clean::
-	del /q CircularA.cpp CircularA.h
-	del /q CircularB.cpp CircularB.h
-
-!include .depend.mak
+# **********************************************************************

+#

+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

+#

+# This copy of Ice is licensed to you under the terms described in the

+# ICE_LICENSE file included in this distribution.

+#

+# **********************************************************************

+

+top_srcdir	= ..\..\..

+

+TARGETS		= $(OBJS)

+

+OBJS		= CircularA.obj \

+		  CircularB.obj

+

+SRCS		= $(OBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+SLICE2CPPFLAGS	= -I. $(SLICE2CPPFLAGS)

+CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN

+

+clean::

+	del /q CircularA.cpp CircularA.h

+	del /q CircularB.cpp CircularB.h

+

+!include .depend.mak

diff --git a/cs/demo/Glacier2/chat/App.xaml b/cs/demo/Glacier2/chat/App.xaml
index 33fffe497ee..e93d138ce72 100755
--- a/cs/demo/Glacier2/chat/App.xaml
+++ b/cs/demo/Glacier2/chat/App.xaml
@@ -1,21 +1,21 @@
-<!--

-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

--->

-<Application x:Class="Glacier2.chat.client.App"

-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

-    Startup="start" ShutdownMode="OnLastWindowClose">

-    <Application.Resources>

-        <Style x:Key="Menu">

-            <Setter Property="MenuItem.FontFamily" Value="Times New Romans"/>

-            <Setter Property="MenuItem.FontSize" Value="12"/>

-        </Style>

-    </Application.Resources>

-</Application>

+<!--
+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+-->
+<Application x:Class="Glacier2.chat.client.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Startup="start" ShutdownMode="OnLastWindowClose">
+    <Application.Resources>
+        <Style x:Key="Menu">
+            <Setter Property="MenuItem.FontFamily" Value="Times New Romans"/>
+            <Setter Property="MenuItem.FontSize" Value="12"/>
+        </Style>
+    </Application.Resources>
+</Application>
diff --git a/cs/demo/Glacier2/chat/App.xaml.cs b/cs/demo/Glacier2/chat/App.xaml.cs
index b8b8cfef5a8..c344795a1ac 100755
--- a/cs/demo/Glacier2/chat/App.xaml.cs
+++ b/cs/demo/Glacier2/chat/App.xaml.cs
@@ -1,32 +1,32 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.Configuration;

-using System.Data;

-using System.Linq;

-using System.Windows;

-

-namespace Glacier2.chat.client

-{

-    /// <summary>

-    /// Interaction logic for App.xaml

-    /// </summary>

-    public partial class App : System.Windows.Application

-    {

-    

-        public void start(object sender, StartupEventArgs e)

-        {

-            ChatWindow window = new ChatWindow();

-            window.Show();

-            window.doLogin();

-        }

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Windows;
+
+namespace Glacier2.chat.client
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : System.Windows.Application
+    {
+    
+        public void start(object sender, StartupEventArgs e)
+        {
+            ChatWindow window = new ChatWindow();
+            window.Show();
+            window.doLogin();
+        }
+    }
+}
diff --git a/cs/demo/Glacier2/chat/CancelDialog.xaml b/cs/demo/Glacier2/chat/CancelDialog.xaml
index e7e6416ed93..ac7eeab5c8d 100755
--- a/cs/demo/Glacier2/chat/CancelDialog.xaml
+++ b/cs/demo/Glacier2/chat/CancelDialog.xaml
@@ -1,27 +1,27 @@
-<!--

-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

--->

-<Window x:Class="Glacier2.chat.client.CancelDialog"

-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

-    Title="Connecting" Height="80" Width="200" ResizeMode="NoResize">

-    <Grid>

-        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical">

-

-            <StackPanel Orientation="Vertical">

-                    <TextBlock Margin="2" Name="txtInfo" Width="180" TextWrapping="Wrap">Please wait while connecting...</TextBlock>

-            </StackPanel>

-

-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">

-                <Button Margin="2" MaxWidth="80" Click="cancel" IsDefault="True">Cancel</Button>

-            </StackPanel>

-        </StackPanel>

-    </Grid>

-</Window>

+<!--
+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+-->
+<Window x:Class="Glacier2.chat.client.CancelDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Title="Connecting" Height="80" Width="200" ResizeMode="NoResize">
+    <Grid>
+        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical">
+
+            <StackPanel Orientation="Vertical">
+                    <TextBlock Margin="2" Name="txtInfo" Width="180" TextWrapping="Wrap">Please wait while connecting...</TextBlock>
+            </StackPanel>
+
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                <Button Margin="2" MaxWidth="80" Click="cancel" IsDefault="True">Cancel</Button>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/cs/demo/Glacier2/chat/CancelDialog.xaml.cs b/cs/demo/Glacier2/chat/CancelDialog.xaml.cs
index e3eb9dccd5a..366335811a4 100755
--- a/cs/demo/Glacier2/chat/CancelDialog.xaml.cs
+++ b/cs/demo/Glacier2/chat/CancelDialog.xaml.cs
@@ -1,49 +1,49 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Data;

-using System.Windows.Documents;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Imaging;

-using System.Windows.Shapes;

-

-namespace Glacier2.chat.client

-{

-    /// <summary>

-    /// Interaction logic for CancelDialog.xaml

-    /// </summary>

-    public partial class CancelDialog : Window

-    {

-        public CancelDialog()

-        {

-            InitializeComponent();

-        }

-

-        public void cancel(object sender, RoutedEventArgs args)

-        {

-            _cancel = true;

-            Close();

-        }

-

-        public bool ShowModal()

-        {

-            ShowDialog();

-            return _cancel;

-        }

-

-        private bool _cancel = false;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Glacier2.chat.client
+{
+    /// <summary>
+    /// Interaction logic for CancelDialog.xaml
+    /// </summary>
+    public partial class CancelDialog : Window
+    {
+        public CancelDialog()
+        {
+            InitializeComponent();
+        }
+
+        public void cancel(object sender, RoutedEventArgs args)
+        {
+            _cancel = true;
+            Close();
+        }
+
+        public bool ShowModal()
+        {
+            ShowDialog();
+            return _cancel;
+        }
+
+        private bool _cancel = false;
+    }
+}
diff --git a/cs/demo/Glacier2/chat/ChatCommands.cs b/cs/demo/Glacier2/chat/ChatCommands.cs
index 871f6f9f5f8..1530adbfb27 100755
--- a/cs/demo/Glacier2/chat/ChatCommands.cs
+++ b/cs/demo/Glacier2/chat/ChatCommands.cs
@@ -1,58 +1,58 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Windows.Input;

-

-namespace Glacier2.chat.client

-{

-    public class ChatCommands

-    {

-        static ChatCommands()

-        {

-            // Initialize logout command

-            _loginCommand = new RoutedUICommand("Login", "Login", typeof(ChatCommands), null);

-            // Initialize logout command

-            _logoutCommand = new RoutedUICommand("Logout", "Logout", typeof(ChatCommands), null);

-            // Initialize exit commnad

-            _exitCommand = new RoutedUICommand("Exit", "&Exit", typeof(ChatCommands), null);

-        }

-

-        public static RoutedUICommand Login

-        {

-            get

-            {

-                return _loginCommand;

-            }

-        }

-

-        public static RoutedUICommand Logout

-        {

-            get

-            {

-                return _logoutCommand;

-            }

-        }

-

-        public static RoutedUICommand Exit

-        {

-            get

-            {

-                return _exitCommand;

-            }

-        }

-

-        private static RoutedUICommand _loginCommand;

-        private static RoutedUICommand _logoutCommand;

-        private static RoutedUICommand _exitCommand;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Input;
+
+namespace Glacier2.chat.client
+{
+    public class ChatCommands
+    {
+        static ChatCommands()
+        {
+            // Initialize logout command
+            _loginCommand = new RoutedUICommand("Login", "Login", typeof(ChatCommands), null);
+            // Initialize logout command
+            _logoutCommand = new RoutedUICommand("Logout", "Logout", typeof(ChatCommands), null);
+            // Initialize exit commnad
+            _exitCommand = new RoutedUICommand("Exit", "&Exit", typeof(ChatCommands), null);
+        }
+
+        public static RoutedUICommand Login
+        {
+            get
+            {
+                return _loginCommand;
+            }
+        }
+
+        public static RoutedUICommand Logout
+        {
+            get
+            {
+                return _logoutCommand;
+            }
+        }
+
+        public static RoutedUICommand Exit
+        {
+            get
+            {
+                return _exitCommand;
+            }
+        }
+
+        private static RoutedUICommand _loginCommand;
+        private static RoutedUICommand _logoutCommand;
+        private static RoutedUICommand _exitCommand;
+    }
+}
diff --git a/cs/demo/Glacier2/chat/ChatWindow.xaml b/cs/demo/Glacier2/chat/ChatWindow.xaml
index f12fc665e36..e786db40417 100755
--- a/cs/demo/Glacier2/chat/ChatWindow.xaml
+++ b/cs/demo/Glacier2/chat/ChatWindow.xaml
@@ -1,69 +1,69 @@
-<!--

-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

--->

-<Window x:Class="Glacier2.chat.client.ChatWindow"

-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

-    xmlns:local="clr-namespace:Glacier2.chat.client"

-    Title="Chat Window" Height="300" Width="300" Closed="windowClosed">

-    <Window.CommandBindings>

-        <CommandBinding Command="local:ChatCommands.Login" Executed="login" CanExecute="isLoginEnabled"/>

-        <CommandBinding Command="local:ChatCommands.Logout" Executed="logout" CanExecute="isLogoutEnabled"/>

-        <CommandBinding Command="local:ChatCommands.Exit" Executed="exit"/>

-    </Window.CommandBindings>

-    <DockPanel>

-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" DockPanel.Dock="Top">

-            <Menu Style="{StaticResource Menu}" Background="White">

-                <MenuItem Header="Session">

-                    <MenuItem Header="_Login" Command="local:ChatCommands.Login" Background="White"/>

-                    <MenuItem Header="_Logout" Command="local:ChatCommands.Logout" Background="White"/>

-                    <MenuItem Header="E_xit" Command="local:ChatCommands.Exit" Background="White"/>

-                </MenuItem>

-            </Menu>

-        </StackPanel>

-    <Grid>

-        <Grid.RowDefinitions>

-            <RowDefinition Height="5*"></RowDefinition>

-            <RowDefinition Height="AUTO"></RowDefinition>

-            <RowDefinition Height="AUTO"></RowDefinition>

-            <RowDefinition Height="AUTO"></RowDefinition>

-        </Grid.RowDefinitions>

-        <Grid.ColumnDefinitions>

-            <ColumnDefinition></ColumnDefinition>

-        </Grid.ColumnDefinitions>

-

-            <!-- Define a text box to show chat messages. -->

-            <TextBox Grid.Column="0" Grid.Row="0" x:Name="txtMessages"

-                 FontSize="12" Text="" TextWrapping="Wrap" IsEnabled="True"    

-                 ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" 

-                 ScrollViewer.VerticalScrollBarVisibility="Auto" IsReadOnly="True"

-                 MinLines="4" SizeChanged="scrollDown"/>

-        

-        <!-- Define another splitter to separate the upper view and the text box used

-            for input messages. -->

-        <GridSplitter Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Height="2"

-                      ResizeDirection="Rows" HorizontalAlignment="Stretch"/>

-

-        <!--- Define an editable text box for the user to write messages. -->

-        <TextBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3"

-                 Name="input"

-                 IsEnabled="False"

-                 TextWrapping="Wrap" 

-                 ScrollViewer.CanContentScroll="True"

-                 HorizontalScrollBarVisibility="Hidden"

-                 VerticalScrollBarVisibility="Auto"

-                 Background="WhiteSmoke" KeyDown="sendMessage" TabIndex="1"></TextBox>

-

-            <!-- TextBlock with the status message -->

-            <Label Grid.Row="3" Name="status" Grid.Column="0" VerticalAlignment="Bottom" Content="Not connected"/>

-

-        </Grid>

-    </DockPanel>

-</Window>

+<!--
+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+-->
+<Window x:Class="Glacier2.chat.client.ChatWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:Glacier2.chat.client"
+    Title="Chat Window" Height="300" Width="300" Closed="windowClosed">
+    <Window.CommandBindings>
+        <CommandBinding Command="local:ChatCommands.Login" Executed="login" CanExecute="isLoginEnabled"/>
+        <CommandBinding Command="local:ChatCommands.Logout" Executed="logout" CanExecute="isLogoutEnabled"/>
+        <CommandBinding Command="local:ChatCommands.Exit" Executed="exit"/>
+    </Window.CommandBindings>
+    <DockPanel>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" DockPanel.Dock="Top">
+            <Menu Style="{StaticResource Menu}" Background="White">
+                <MenuItem Header="Session">
+                    <MenuItem Header="_Login" Command="local:ChatCommands.Login" Background="White"/>
+                    <MenuItem Header="_Logout" Command="local:ChatCommands.Logout" Background="White"/>
+                    <MenuItem Header="E_xit" Command="local:ChatCommands.Exit" Background="White"/>
+                </MenuItem>
+            </Menu>
+        </StackPanel>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="5*"></RowDefinition>
+            <RowDefinition Height="AUTO"></RowDefinition>
+            <RowDefinition Height="AUTO"></RowDefinition>
+            <RowDefinition Height="AUTO"></RowDefinition>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition></ColumnDefinition>
+        </Grid.ColumnDefinitions>
+
+            <!-- Define a text box to show chat messages. -->
+            <TextBox Grid.Column="0" Grid.Row="0" x:Name="txtMessages"
+                 FontSize="12" Text="" TextWrapping="Wrap" IsEnabled="True"    
+                 ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" 
+                 ScrollViewer.VerticalScrollBarVisibility="Auto" IsReadOnly="True"
+                 MinLines="4" SizeChanged="scrollDown"/>
+        
+        <!-- Define another splitter to separate the upper view and the text box used
+            for input messages. -->
+        <GridSplitter Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Height="2"
+                      ResizeDirection="Rows" HorizontalAlignment="Stretch"/>
+
+        <!--- Define an editable text box for the user to write messages. -->
+        <TextBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3"
+                 Name="input"
+                 IsEnabled="False"
+                 TextWrapping="Wrap" 
+                 ScrollViewer.CanContentScroll="True"
+                 HorizontalScrollBarVisibility="Hidden"
+                 VerticalScrollBarVisibility="Auto"
+                 Background="WhiteSmoke" KeyDown="sendMessage" TabIndex="1"></TextBox>
+
+            <!-- TextBlock with the status message -->
+            <Label Grid.Row="3" Name="status" Grid.Column="0" VerticalAlignment="Bottom" Content="Not connected"/>
+
+        </Grid>
+    </DockPanel>
+</Window>
diff --git a/cs/demo/Glacier2/chat/ChatWindow.xaml.cs b/cs/demo/Glacier2/chat/ChatWindow.xaml.cs
index 2c8485343f3..569b79c06f8 100755
--- a/cs/demo/Glacier2/chat/ChatWindow.xaml.cs
+++ b/cs/demo/Glacier2/chat/ChatWindow.xaml.cs
@@ -1,287 +1,287 @@
-// **********************************************************************

-//

-// Copyright(c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Data;

-using System.Windows.Documents;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Imaging;

-using System.Windows.Navigation;

-using System.Windows.Shapes;

-using System.Windows.Threading;

-

-using Demo;

-

-namespace Glacier2.chat.client

-{

-    public class LoginData

-    {

-        public LoginData()

-        {

-            routerHost = "127.0.0.1";

-            userName = "test";

-            password = "";

-        }

-

-        public String routerHost;

-        public String userName;

-        public String password;

-    }

-

-    class Util

-    {

-        static public void

-        locateOnScreen(System.Windows.Window window)

-        {

-            window.Left = (System.Windows.SystemParameters.PrimaryScreenWidth - window.Width) / 2;

-            window.Top = (System.Windows.SystemParameters.PrimaryScreenHeight - window.Height) / 2;

-        }

-

-        static public void

-        centerWindow(System.Windows.Window w1, System.Windows.Window w)

-        {

-            w1.Top = w.Top + ((w.Height - w1.Height) / 2);

-            w1.Left = w.Left + ((w.Width - w1.Width) / 2);

-        }

-    }

-

-    /// <summary>

-    /// Interaction logic for ChatWindow.xaml

-    /// </summary>

-    public partial class ChatWindow : Window, Glacier2.SessionCallback

-    {

-        private class ChatCallbackI : Demo.ChatCallbackDisp_

-        {

-            public ChatCallbackI(ChatWindow window)

-            {

-                _window = window;

-            }

-

-            public override void

-            message(string data, Ice.Current current)

-            {

-                _window.appendMessage(data + Environment.NewLine);

-            }

-

-            private ChatWindow _window;

-        }

-

-        public ChatWindow()

-        {

-            Ice.InitializationData initData = new Ice.InitializationData();

-

-            initData.properties = Ice.Util.createProperties();

-            initData.properties.load("config.client");

-

-            // Dispatch servant calls and AMI callbacks with this windows Dispatcher.

-            initData.dispatcher = delegate(System.Action action, Ice.Connection connection)

-            {

-                Dispatcher.BeginInvoke(DispatcherPriority.Normal, action);

-            };

-

-            _factory = new SessionFactoryHelper(initData, this);

-            InitializeComponent();

-            Util.locateOnScreen(this);

-        }

-

-        private void

-        login(object sender, ExecutedRoutedEventArgs args)

-        {

-            doLogin();

-        }

-        

-        public void doLogin()

-        {

-            LoginDialog loginDialog = new LoginDialog(_loginData);

-            Util.centerWindow(loginDialog, this);

-            if(loginDialog.ShowModal())

-            {

-                status.Content = "Connecting";

-                _factory.setRouterHost(_loginData.routerHost);

-                _factory.setRouterIdentity(new Ice.Identity("router", "DemoGlacier2"));

-                _session = _factory.connect(_loginData.userName, _loginData.password);

-

-                _cancelDialog = new CancelDialog();

-                Util.centerWindow(_cancelDialog, this);

-                if(_cancelDialog.ShowModal())

-                {

-                    destroySession();

-                }

-            }

-        }

-

-        private void

-        logout(object sender, ExecutedRoutedEventArgs args)

-        {

-            txtMessages.Text = "";

-            status.Content = "Logging out";

-            destroySession();

-        }

-

-        private void

-        exit(object sender, ExecutedRoutedEventArgs args)

-        {

-            Close();

-        }

-

-        private void

-        windowClosed(object sender, EventArgs e)

-        {

-            lock(this)

-            {

-                destroySession();

-            }

-            App.Current.Shutdown(0);

-        }

-

-        private void

-        isLogoutEnabled(object sender, CanExecuteRoutedEventArgs args)

-        {

-            args.CanExecute = _session != null && _session.isConnected();

-        }

-

-        private void

-        isLoginEnabled(object sender,CanExecuteRoutedEventArgs args)

-        {

-            args.CanExecute = _session == null || !_session.isConnected();

-        }

-

-        //

-        // Event handler attached to txtChatImputLine onKeyDown.

-        // If the key is the Enter key, it sends the message asynchronously

-        // and cleans the input line; otherwise, it does nothing.

-        //

-        private void

-        sendMessage(object sender, KeyEventArgs e)

-        {

-            if(e.Key == Key.Enter)

-            {

-                string message = input.Text.Trim();

-                if(message.Length > 0)

-                {

-                    _chat.begin_say(message).whenCompleted(delegate(Ice.Exception ex)

-                                             {

-                                                 appendMessage("<system-message> - " + ex.ToString() + 

-                                                               Environment.NewLine);

-                                             });

-                }

-                input.Text = "";

-            }

-        }

-

-        private void

-        scrollDown(object sender, SizeChangedEventArgs e)

-        {

-            txtMessages.ScrollToEnd();

-        }

-

-        private void

-        closeCancelDialog()

-        {

-            if(_cancelDialog != null)

-            {

-                _cancelDialog.Close();

-                _cancelDialog = null;

-            }

-        }

-

-        public void

-        appendMessage(string message)

-        {

-            txtMessages.AppendText(message);

-            txtMessages.ScrollToEnd();

-        }

-

-        private void

-        destroySession()

-        {

-            if(_session != null)

-            {

-                _session.destroy();

-                _session = null;

-            }

-        }

-

-        private LoginData _loginData = new LoginData();

-        private CancelDialog _cancelDialog = new CancelDialog();

-        private Glacier2.SessionFactoryHelper _factory;

-        private Glacier2.SessionHelper _session;

-        private Demo.ChatSessionPrx _chat;

-

-        #region Callback Members

-

-        public void connectFailed(SessionHelper session, Exception ex)

-        {

-            // If the session has been reassigned avoid the

-            // spurious callback.

-            if(session != _session)

-            {

-                return;

-            }

-

-            closeCancelDialog();

-            status.Content = ex.GetType();

-        }

-

-        public void connected(SessionHelper session)

-        {

-            // If the session has been reassigned avoid the

-            // spurious callback.

-            if(session != _session)

-            {

-                return;

-            }

-

-            Ice.Object servant = new ChatCallbackI(this);

-

-            Demo.ChatCallbackPrx callback = Demo.ChatCallbackPrxHelper.uncheckedCast(_session.addWithUUID(servant));

-            _chat = Demo.ChatSessionPrxHelper.uncheckedCast(_session.session());

-            _chat.begin_setCallback(callback).whenCompleted(delegate()

-                                              {

-                                                  closeCancelDialog();

-                                                  input.IsEnabled = true;

-                                                  status.Content = "Connected with " + _loginData.routerHost;

-                                              },

-                                              delegate(Ice.Exception ex)

-                                              {

-                                                  if(_session != null)

-                                                  {

-                                                      _session.destroy();

-                                                  }

-                                              });

-        }

-

-        public void createdCommunicator(SessionHelper session)

-        {

-        }

-

-        public void disconnected(SessionHelper session)

-        {

-            // If the session has been reassigned avoid the

-            // spurious callback.

-            if(session != _session)

-            {

-                return;

-            }

-            closeCancelDialog();

-            _session = null;

-            _chat = null;

-            input.IsEnabled = false;

-            status.Content = "Not connected";

-        }

-

-        #endregion

-    }

-}

+// **********************************************************************
+//
+// Copyright(c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+using Demo;
+
+namespace Glacier2.chat.client
+{
+    public class LoginData
+    {
+        public LoginData()
+        {
+            routerHost = "127.0.0.1";
+            userName = "test";
+            password = "";
+        }
+
+        public String routerHost;
+        public String userName;
+        public String password;
+    }
+
+    class Util
+    {
+        static public void
+        locateOnScreen(System.Windows.Window window)
+        {
+            window.Left = (System.Windows.SystemParameters.PrimaryScreenWidth - window.Width) / 2;
+            window.Top = (System.Windows.SystemParameters.PrimaryScreenHeight - window.Height) / 2;
+        }
+
+        static public void
+        centerWindow(System.Windows.Window w1, System.Windows.Window w)
+        {
+            w1.Top = w.Top + ((w.Height - w1.Height) / 2);
+            w1.Left = w.Left + ((w.Width - w1.Width) / 2);
+        }
+    }
+
+    /// <summary>
+    /// Interaction logic for ChatWindow.xaml
+    /// </summary>
+    public partial class ChatWindow : Window, Glacier2.SessionCallback
+    {
+        private class ChatCallbackI : Demo.ChatCallbackDisp_
+        {
+            public ChatCallbackI(ChatWindow window)
+            {
+                _window = window;
+            }
+
+            public override void
+            message(string data, Ice.Current current)
+            {
+                _window.appendMessage(data + Environment.NewLine);
+            }
+
+            private ChatWindow _window;
+        }
+
+        public ChatWindow()
+        {
+            Ice.InitializationData initData = new Ice.InitializationData();
+
+            initData.properties = Ice.Util.createProperties();
+            initData.properties.load("config.client");
+
+            // Dispatch servant calls and AMI callbacks with this windows Dispatcher.
+            initData.dispatcher = delegate(System.Action action, Ice.Connection connection)
+            {
+                Dispatcher.BeginInvoke(DispatcherPriority.Normal, action);
+            };
+
+            _factory = new SessionFactoryHelper(initData, this);
+            InitializeComponent();
+            Util.locateOnScreen(this);
+        }
+
+        private void
+        login(object sender, ExecutedRoutedEventArgs args)
+        {
+            doLogin();
+        }
+        
+        public void doLogin()
+        {
+            LoginDialog loginDialog = new LoginDialog(_loginData);
+            Util.centerWindow(loginDialog, this);
+            if(loginDialog.ShowModal())
+            {
+                status.Content = "Connecting";
+                _factory.setRouterHost(_loginData.routerHost);
+                _factory.setRouterIdentity(new Ice.Identity("router", "DemoGlacier2"));
+                _session = _factory.connect(_loginData.userName, _loginData.password);
+
+                _cancelDialog = new CancelDialog();
+                Util.centerWindow(_cancelDialog, this);
+                if(_cancelDialog.ShowModal())
+                {
+                    destroySession();
+                }
+            }
+        }
+
+        private void
+        logout(object sender, ExecutedRoutedEventArgs args)
+        {
+            txtMessages.Text = "";
+            status.Content = "Logging out";
+            destroySession();
+        }
+
+        private void
+        exit(object sender, ExecutedRoutedEventArgs args)
+        {
+            Close();
+        }
+
+        private void
+        windowClosed(object sender, EventArgs e)
+        {
+            lock(this)
+            {
+                destroySession();
+            }
+            App.Current.Shutdown(0);
+        }
+
+        private void
+        isLogoutEnabled(object sender, CanExecuteRoutedEventArgs args)
+        {
+            args.CanExecute = _session != null && _session.isConnected();
+        }
+
+        private void
+        isLoginEnabled(object sender,CanExecuteRoutedEventArgs args)
+        {
+            args.CanExecute = _session == null || !_session.isConnected();
+        }
+
+        //
+        // Event handler attached to txtChatImputLine onKeyDown.
+        // If the key is the Enter key, it sends the message asynchronously
+        // and cleans the input line; otherwise, it does nothing.
+        //
+        private void
+        sendMessage(object sender, KeyEventArgs e)
+        {
+            if(e.Key == Key.Enter)
+            {
+                string message = input.Text.Trim();
+                if(message.Length > 0)
+                {
+                    _chat.begin_say(message).whenCompleted(delegate(Ice.Exception ex)
+                                             {
+                                                 appendMessage("<system-message> - " + ex.ToString() + 
+                                                               Environment.NewLine);
+                                             });
+                }
+                input.Text = "";
+            }
+        }
+
+        private void
+        scrollDown(object sender, SizeChangedEventArgs e)
+        {
+            txtMessages.ScrollToEnd();
+        }
+
+        private void
+        closeCancelDialog()
+        {
+            if(_cancelDialog != null)
+            {
+                _cancelDialog.Close();
+                _cancelDialog = null;
+            }
+        }
+
+        public void
+        appendMessage(string message)
+        {
+            txtMessages.AppendText(message);
+            txtMessages.ScrollToEnd();
+        }
+
+        private void
+        destroySession()
+        {
+            if(_session != null)
+            {
+                _session.destroy();
+                _session = null;
+            }
+        }
+
+        private LoginData _loginData = new LoginData();
+        private CancelDialog _cancelDialog = new CancelDialog();
+        private Glacier2.SessionFactoryHelper _factory;
+        private Glacier2.SessionHelper _session;
+        private Demo.ChatSessionPrx _chat;
+
+        #region Callback Members
+
+        public void connectFailed(SessionHelper session, Exception ex)
+        {
+            // If the session has been reassigned avoid the
+            // spurious callback.
+            if(session != _session)
+            {
+                return;
+            }
+
+            closeCancelDialog();
+            status.Content = ex.GetType();
+        }
+
+        public void connected(SessionHelper session)
+        {
+            // If the session has been reassigned avoid the
+            // spurious callback.
+            if(session != _session)
+            {
+                return;
+            }
+
+            Ice.Object servant = new ChatCallbackI(this);
+
+            Demo.ChatCallbackPrx callback = Demo.ChatCallbackPrxHelper.uncheckedCast(_session.addWithUUID(servant));
+            _chat = Demo.ChatSessionPrxHelper.uncheckedCast(_session.session());
+            _chat.begin_setCallback(callback).whenCompleted(delegate()
+                                              {
+                                                  closeCancelDialog();
+                                                  input.IsEnabled = true;
+                                                  status.Content = "Connected with " + _loginData.routerHost;
+                                              },
+                                              delegate(Ice.Exception ex)
+                                              {
+                                                  if(_session != null)
+                                                  {
+                                                      _session.destroy();
+                                                  }
+                                              });
+        }
+
+        public void createdCommunicator(SessionHelper session)
+        {
+        }
+
+        public void disconnected(SessionHelper session)
+        {
+            // If the session has been reassigned avoid the
+            // spurious callback.
+            if(session != _session)
+            {
+                return;
+            }
+            closeCancelDialog();
+            _session = null;
+            _chat = null;
+            input.IsEnabled = false;
+            status.Content = "Not connected";
+        }
+
+        #endregion
+    }
+}
diff --git a/cs/demo/Glacier2/chat/LoginDialog.xaml b/cs/demo/Glacier2/chat/LoginDialog.xaml
index df3feea57a3..e8908afd35b 100755
--- a/cs/demo/Glacier2/chat/LoginDialog.xaml
+++ b/cs/demo/Glacier2/chat/LoginDialog.xaml
@@ -1,41 +1,41 @@
-<!--

-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

--->

-<Window x:Class="Glacier2.chat.client.LoginDialog"

-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

-    Title="LoginDialog" Height="160" Width="240" ResizeMode="NoResize">

-    <Grid>

-        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical"

-                MaxWidth="240">

-            <!-- Connection data -->

-            <StackPanel Orientation="Vertical">

-                <StackPanel Orientation="Horizontal">

-                    <TextBlock Margin="2" Name="lblHost" Width="60">Host:</TextBlock>

-                    <TextBox Margin="2" Name="txtHost" Width="120"></TextBox>

-                </StackPanel>

-                <StackPanel Orientation="Horizontal">

-                    <TextBlock Margin="2" Name="lblUsername" Width="60">Username:</TextBlock>

-                    <TextBox Margin="2" Name="txtUsername" Width="120"></TextBox>

-                </StackPanel>

-                <StackPanel Orientation="Horizontal">

-                    <TextBlock Margin="2" TextWrapping="NoWrap" Width="60">Password:</TextBlock>

-                    <PasswordBox Margin="2" Name="txtPassword" Width="120"></PasswordBox>

-                </StackPanel>

-            </StackPanel>

-

-            <!-- Login / Cancel buttons -->

-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">

-                <Button Margin="2" MaxWidth="80" Click="login" IsDefault="True">Login</Button>

-                <Button Margin="2" MaxWidth="80" Click="cancel" IsDefault="True">Cancel</Button>

-            </StackPanel>

-        </StackPanel>

-    </Grid>

-</Window>

+<!--
+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+-->
+<Window x:Class="Glacier2.chat.client.LoginDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Title="LoginDialog" Height="160" Width="240" ResizeMode="NoResize">
+    <Grid>
+        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical"
+                MaxWidth="240">
+            <!-- Connection data -->
+            <StackPanel Orientation="Vertical">
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Margin="2" Name="lblHost" Width="60">Host:</TextBlock>
+                    <TextBox Margin="2" Name="txtHost" Width="120"></TextBox>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Margin="2" Name="lblUsername" Width="60">Username:</TextBlock>
+                    <TextBox Margin="2" Name="txtUsername" Width="120"></TextBox>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Margin="2" TextWrapping="NoWrap" Width="60">Password:</TextBlock>
+                    <PasswordBox Margin="2" Name="txtPassword" Width="120"></PasswordBox>
+                </StackPanel>
+            </StackPanel>
+
+            <!-- Login / Cancel buttons -->
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                <Button Margin="2" MaxWidth="80" Click="login" IsDefault="True">Login</Button>
+                <Button Margin="2" MaxWidth="80" Click="cancel" IsDefault="True">Cancel</Button>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/cs/demo/Glacier2/chat/LoginDialog.xaml.cs b/cs/demo/Glacier2/chat/LoginDialog.xaml.cs
index 670aa6ac803..2d4b96e8745 100755
--- a/cs/demo/Glacier2/chat/LoginDialog.xaml.cs
+++ b/cs/demo/Glacier2/chat/LoginDialog.xaml.cs
@@ -1,63 +1,63 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Data;

-using System.Windows.Documents;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Imaging;

-using System.Windows.Shapes;

-

-namespace Glacier2.chat.client

-{

-    /// <summary>

-    /// Interaction logic for LoginDialog.xaml

-    /// </summary>

-    public partial class LoginDialog : Window

-    {

-        public LoginDialog(LoginData loginData)

-        {

-            InitializeComponent();

-            _loginData = loginData;

-            txtHost.Text = _loginData.routerHost;

-            txtUsername.Text = _loginData.userName;

-            txtPassword.Password = _loginData.password;

-        }

-

-        public void login(object sender, RoutedEventArgs e)

-        {

-            _loginData.routerHost = txtHost.Text;

-            _loginData.userName = txtUsername.Text;

-            _loginData.password = txtPassword.Password;

-            _cancel = false;

-            Close();

-        }

-

-        public void cancel(object sender, RoutedEventArgs args)

-        {

-            _cancel = true;

-            Close();

-        }

-

-        public bool ShowModal()

-        {

-            ShowDialog();

-            return !_cancel;

-        }

-

-        private bool _cancel = true;

-        private LoginData _loginData;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Glacier2.chat.client
+{
+    /// <summary>
+    /// Interaction logic for LoginDialog.xaml
+    /// </summary>
+    public partial class LoginDialog : Window
+    {
+        public LoginDialog(LoginData loginData)
+        {
+            InitializeComponent();
+            _loginData = loginData;
+            txtHost.Text = _loginData.routerHost;
+            txtUsername.Text = _loginData.userName;
+            txtPassword.Password = _loginData.password;
+        }
+
+        public void login(object sender, RoutedEventArgs e)
+        {
+            _loginData.routerHost = txtHost.Text;
+            _loginData.userName = txtUsername.Text;
+            _loginData.password = txtPassword.Password;
+            _cancel = false;
+            Close();
+        }
+
+        public void cancel(object sender, RoutedEventArgs args)
+        {
+            _cancel = true;
+            Close();
+        }
+
+        public bool ShowModal()
+        {
+            ShowDialog();
+            return !_cancel;
+        }
+
+        private bool _cancel = true;
+        private LoginData _loginData;
+    }
+}
diff --git a/cs/demo/Glacier2/chat/Properties/AssemblyInfo.cs b/cs/demo/Glacier2/chat/Properties/AssemblyInfo.cs
index bcf9f65b7e8..031ce1e01a4 100755
--- a/cs/demo/Glacier2/chat/Properties/AssemblyInfo.cs
+++ b/cs/demo/Glacier2/chat/Properties/AssemblyInfo.cs
@@ -1,55 +1,55 @@
-using System.Reflection;

-using System.Resources;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-using System.Windows;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("Glacier2.chat.client")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("Glacier2.chat.client")]

-[assembly: AssemblyCopyright("Copyright ©  2010")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-//In order to begin building localizable applications, set 

-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file

-//inside a <PropertyGroup>.  For example, if you are using US english

-//in your source files, set the <UICulture> to en-US.  Then uncomment

-//the NeutralResourceLanguage attribute below.  Update the "en-US" in

-//the line below to match the UICulture setting in the project file.

-

-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]

-

-

-[assembly: ThemeInfo(

-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located

-    //(used if a resource is not found in the page, 

-    // or application resource dictionaries)

-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located

-    //(used if a resource is not found in the page, 

-    // app, or any theme specific resource dictionaries)

-)]

-

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers 

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Glacier2.chat.client")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Glacier2.chat.client")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+    //(used if a resource is not found in the page, 
+    // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    //(used if a resource is not found in the page, 
+    // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/cs/demo/Glacier2/chat/Properties/Resources.Designer.cs b/cs/demo/Glacier2/chat/Properties/Resources.Designer.cs
index a96435df6e7..33bbc28e6a8 100755
--- a/cs/demo/Glacier2/chat/Properties/Resources.Designer.cs
+++ b/cs/demo/Glacier2/chat/Properties/Resources.Designer.cs
@@ -1,71 +1,71 @@
-//------------------------------------------------------------------------------

-// <auto-generated>

-//     This code was generated by a tool.

-//     Runtime Version:2.0.50727.1433

-//

-//     Changes to this file may cause incorrect behavior and will be lost if

-//     the code is regenerated.

-// </auto-generated>

-//------------------------------------------------------------------------------

-

-namespace Glacier2.chat.client.Properties

-{

-

-

-    /// <summary>

-    ///   A strongly-typed resource class, for looking up localized strings, etc.

-    /// </summary>

-    // This class was auto-generated by the StronglyTypedResourceBuilder

-    // class via a tool like ResGen or Visual Studio.

-    // To add or remove a member, edit your .ResX file then rerun ResGen

-    // with the /str option, or rebuild your VS project.

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]

-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    internal class Resources

-    {

-

-        private static global::System.Resources.ResourceManager resourceMan;

-

-        private static global::System.Globalization.CultureInfo resourceCulture;

-

-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]

-        internal Resources()

-        {

-        }

-

-        /// <summary>

-        ///   Returns the cached ResourceManager instance used by this class.

-        /// </summary>

-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]

-        internal static global::System.Resources.ResourceManager ResourceManager

-        {

-            get

-            {

-                if ((resourceMan == null))

-                {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Glacier2.chat.client.Properties.Resources", typeof(Resources).Assembly);

-                    resourceMan = temp;

-                }

-                return resourceMan;

-            }

-        }

-

-        /// <summary>

-        ///   Overrides the current thread's CurrentUICulture property for all

-        ///   resource lookups using this strongly typed resource class.

-        /// </summary>

-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]

-        internal static global::System.Globalization.CultureInfo Culture

-        {

-            get

-            {

-                return resourceCulture;

-            }

-            set

-            {

-                resourceCulture = value;

-            }

-        }

-    }

-}

+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.1433
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Glacier2.chat.client.Properties
+{
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources
+    {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources()
+        {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Glacier2.chat.client.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
+                return resourceCulture;
+            }
+            set
+            {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/cs/demo/Glacier2/chat/Properties/Resources.resx b/cs/demo/Glacier2/chat/Properties/Resources.resx
index ffecec851ab..2b64efaf5df 100755
--- a/cs/demo/Glacier2/chat/Properties/Resources.resx
+++ b/cs/demo/Glacier2/chat/Properties/Resources.resx
@@ -114,4 +114,4 @@
   <resheader name="writer">

     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

-</root>
\ No newline at end of file
+</root>

diff --git a/cs/demo/Glacier2/chat/Properties/Settings.Designer.cs b/cs/demo/Glacier2/chat/Properties/Settings.Designer.cs
index 6b363ea5353..472165a6cde 100755
--- a/cs/demo/Glacier2/chat/Properties/Settings.Designer.cs
+++ b/cs/demo/Glacier2/chat/Properties/Settings.Designer.cs
@@ -1,30 +1,30 @@
-//------------------------------------------------------------------------------

-// <auto-generated>

-//     This code was generated by a tool.

-//     Runtime Version:2.0.50727.1433

-//

-//     Changes to this file may cause incorrect behavior and will be lost if

-//     the code is regenerated.

-// </auto-generated>

-//------------------------------------------------------------------------------

-

-namespace Glacier2.chat.client.Properties

-{

-

-

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]

-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase

-    {

-

-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

-

-        public static Settings Default

-        {

-            get

-            {

-                return defaultInstance;

-            }

-        }

-    }

-}

+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.1433
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Glacier2.chat.client.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/cs/demo/Glacier2/chat/Properties/Settings.settings b/cs/demo/Glacier2/chat/Properties/Settings.settings
index 8f2fd95d626..1dc1197a474 100755
--- a/cs/demo/Glacier2/chat/Properties/Settings.settings
+++ b/cs/demo/Glacier2/chat/Properties/Settings.settings
@@ -4,4 +4,4 @@
     <Profile Name="(Default)" />

   </Profiles>

   <Settings />

-</SettingsFile>
\ No newline at end of file
+</SettingsFile>

diff --git a/cs/demo/Ice/wpf/App.xaml b/cs/demo/Ice/wpf/App.xaml
index a72bc4d3452..be5bee38505 100644
--- a/cs/demo/Ice/wpf/App.xaml
+++ b/cs/demo/Ice/wpf/App.xaml
@@ -1,18 +1,18 @@
-<!--

-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

--->

-<Application x:Class="Ice.wpf.client.App"

-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

-    StartupUri="HelloWindow.xaml">

-    <Application.Resources>

-         

-    </Application.Resources>

-</Application>

+<!--
+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+-->
+<Application x:Class="Ice.wpf.client.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    StartupUri="HelloWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/cs/demo/Ice/wpf/App.xaml.cs b/cs/demo/Ice/wpf/App.xaml.cs
index 67609070928..e1067676eeb 100644
--- a/cs/demo/Ice/wpf/App.xaml.cs
+++ b/cs/demo/Ice/wpf/App.xaml.cs
@@ -1,25 +1,25 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.Configuration;

-using System.Data;

-using System.Linq;

-using System.Windows;

-

-namespace Ice.wpf.client

-{

-    /// <summary>

-    /// Interaction logic for App.xaml

-    /// </summary>

-    public partial class App : System.Windows.Application

-    {

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Windows;
+
+namespace Ice.wpf.client
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : System.Windows.Application
+    {
+    }
+}
diff --git a/cs/demo/Ice/wpf/HelloWindow.xaml b/cs/demo/Ice/wpf/HelloWindow.xaml
index 1285e27485d..eca181199d1 100644
--- a/cs/demo/Ice/wpf/HelloWindow.xaml
+++ b/cs/demo/Ice/wpf/HelloWindow.xaml
@@ -1,91 +1,91 @@
-<!--

-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

--->

-<Window x:Class="Ice.wpf.client.HelloWindow"

-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

-    Title="Ice - Hello World!" SizeToContent="WidthAndHeight" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"

-        Loaded="Window_Loaded" Closed="Window_Closed" Width="300" Height="190" MinWidth="300" MinHeight="190">

-    <Grid Margin="10">

-        <Grid.ColumnDefinitions>

-            <ColumnDefinition Width="*"/>

-        </Grid.ColumnDefinitions>

-        <Grid.RowDefinitions>

-            <RowDefinition Height="Auto"/>

-            <RowDefinition Height="Auto"/>

-            <RowDefinition Height="Auto"/>

-        </Grid.RowDefinitions>

-

-        <Grid Grid.Row="0" Grid.Column="0">

-            <Grid.ColumnDefinitions>

-                <ColumnDefinition Width="*"/>

-                <ColumnDefinition Width="2*"/>

-            </Grid.ColumnDefinitions>

-            <Grid.RowDefinitions>

-                <RowDefinition Height="Auto" MinHeight="23" />

-                <RowDefinition Height="Auto" MinHeight="23" />

-                <RowDefinition Height="Auto" MinHeight="28" />

-                <RowDefinition Height="Auto" MinHeight="23" />

-            </Grid.RowDefinitions>

-            <Label Grid.Row="0" Grid.Column="0" Name="label4" VerticalAlignment="Top" HorizontalAlignment="Left" Width="70" >Hostname</Label>

-            <Label Grid.Row="1" Grid.Column="0" Name="label2" VerticalAlignment="Top" HorizontalAlignment="Left" Width="70">Mode</Label>

-            <Label Grid.Row="2" Grid.Column="0" Name="label1" Height="28" HorizontalAlignment="Left" VerticalAlignment="Top" Width="70">Timeout</Label>

-            <Label Grid.Row="3" Grid.Column="0" Name="label3" VerticalAlignment="Top" HorizontalAlignment="Left" Width="70">Delay</Label>

-            

-            <TextBox Grid.Row="0" Grid.Column="1" Name="hostname" VerticalAlignment="Top">127.0.0.1</TextBox>

-            <ComboBox Grid.Row="1" Grid.Column="1" Name="deliveryMode" VerticalAlignment="Top" IsReadOnly="True" SelectedIndex="0">

-                <ComboBoxItem>Twoway</ComboBoxItem>

-                <ComboBoxItem>Twoway Secure</ComboBoxItem>

-                <ComboBoxItem>Oneway</ComboBoxItem>

-                <ComboBoxItem>Oneway Batch</ComboBoxItem>

-                <ComboBoxItem>Oneway Secure</ComboBoxItem>

-                <ComboBoxItem>Oneway Secure Batch</ComboBoxItem>

-                <ComboBoxItem>Datagram</ComboBoxItem>

-                <ComboBoxItem>Datagram Batch</ComboBoxItem>

-            </ComboBox>

-            <Grid Grid.Row="2" Grid.Column="1">

-                <Grid.ColumnDefinitions>

-                    <ColumnDefinition Width="4*"/>

-                    <ColumnDefinition Width="*"/>

-                </Grid.ColumnDefinitions>

-                <Grid.RowDefinitions>

-                    <RowDefinition Height="Auto"/>

-                </Grid.RowDefinitions>

-                <Slider Grid.Row="0" Grid.Column="0" Name="timeoutSlider" VerticalAlignment="Top" Maximum="5000" Height="22" ValueChanged="timeoutSlider_ValueChanged" />

-                <Label Grid.Row="0" Grid.Column="1" Name="timeoutLabel" VerticalAlignment="Top" HorizontalAlignment="Left">0.0</Label>

-            </Grid>

-            <Grid Grid.Row="3" Grid.Column="1">

-                <Grid.ColumnDefinitions>

-                    <ColumnDefinition Width="4*"/>

-                    <ColumnDefinition Width="*"/>

-                </Grid.ColumnDefinitions>

-                <Grid.RowDefinitions>

-                    <RowDefinition Height="Auto"/>

-                </Grid.RowDefinitions>

-                <Slider Grid.Row="0" Grid.Column="0" Name="delaySlider" VerticalAlignment="Top" Maximum="5000" Height="22" ValueChanged="delaySlider_ValueChanged" />

-                <Label Grid.Row="0" Grid.Column="1" Name="delayLabel" VerticalAlignment="Top" HorizontalAlignment="Left">0.0</Label>

-            </Grid>

-        </Grid>

-        <Grid Grid.Row="1" Grid.Column="0" Margin="0 10 0 5">

-            <Grid.ColumnDefinitions>

-                <ColumnDefinition Width="*"/>

-                <ColumnDefinition Width="*"/>

-                <ColumnDefinition Width="*"/>

-            </Grid.ColumnDefinitions>

-            <Grid.RowDefinitions>

-                <RowDefinition Height="Auto"/>

-            </Grid.RowDefinitions>

-            <Button Grid.Column="0"  VerticalAlignment="Center" HorizontalAlignment="Center" Name="sayHello" Click="sayHello_Click">Hello World!</Button>

-            <Button Grid.Column="1"  VerticalAlignment="Center" HorizontalAlignment="Center" Name="shutdown" Click="shutdown_Click">Shutdown</Button>

-            <Button Grid.Column="2"  VerticalAlignment="Center" HorizontalAlignment="Center" Name="flush" Click="flush_Click">Flush</Button>

-        </Grid>

-        <Label Grid.Row="2" Grid.Column="0" Name="status">Ready</Label>

-    </Grid>

-</Window>

+<!--
+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+-->
+<Window x:Class="Ice.wpf.client.HelloWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Title="Ice - Hello World!" SizeToContent="WidthAndHeight" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+        Loaded="Window_Loaded" Closed="Window_Closed" Width="300" Height="190" MinWidth="300" MinHeight="190">
+    <Grid Margin="10">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <Grid Grid.Row="0" Grid.Column="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="2*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" MinHeight="23" />
+                <RowDefinition Height="Auto" MinHeight="23" />
+                <RowDefinition Height="Auto" MinHeight="28" />
+                <RowDefinition Height="Auto" MinHeight="23" />
+            </Grid.RowDefinitions>
+            <Label Grid.Row="0" Grid.Column="0" Name="label4" VerticalAlignment="Top" HorizontalAlignment="Left" Width="70" >Hostname</Label>
+            <Label Grid.Row="1" Grid.Column="0" Name="label2" VerticalAlignment="Top" HorizontalAlignment="Left" Width="70">Mode</Label>
+            <Label Grid.Row="2" Grid.Column="0" Name="label1" Height="28" HorizontalAlignment="Left" VerticalAlignment="Top" Width="70">Timeout</Label>
+            <Label Grid.Row="3" Grid.Column="0" Name="label3" VerticalAlignment="Top" HorizontalAlignment="Left" Width="70">Delay</Label>
+            
+            <TextBox Grid.Row="0" Grid.Column="1" Name="hostname" VerticalAlignment="Top">127.0.0.1</TextBox>
+            <ComboBox Grid.Row="1" Grid.Column="1" Name="deliveryMode" VerticalAlignment="Top" IsReadOnly="True" SelectedIndex="0">
+                <ComboBoxItem>Twoway</ComboBoxItem>
+                <ComboBoxItem>Twoway Secure</ComboBoxItem>
+                <ComboBoxItem>Oneway</ComboBoxItem>
+                <ComboBoxItem>Oneway Batch</ComboBoxItem>
+                <ComboBoxItem>Oneway Secure</ComboBoxItem>
+                <ComboBoxItem>Oneway Secure Batch</ComboBoxItem>
+                <ComboBoxItem>Datagram</ComboBoxItem>
+                <ComboBoxItem>Datagram Batch</ComboBoxItem>
+            </ComboBox>
+            <Grid Grid.Row="2" Grid.Column="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="4*"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+                <Slider Grid.Row="0" Grid.Column="0" Name="timeoutSlider" VerticalAlignment="Top" Maximum="5000" Height="22" ValueChanged="timeoutSlider_ValueChanged" />
+                <Label Grid.Row="0" Grid.Column="1" Name="timeoutLabel" VerticalAlignment="Top" HorizontalAlignment="Left">0.0</Label>
+            </Grid>
+            <Grid Grid.Row="3" Grid.Column="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="4*"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+                <Slider Grid.Row="0" Grid.Column="0" Name="delaySlider" VerticalAlignment="Top" Maximum="5000" Height="22" ValueChanged="delaySlider_ValueChanged" />
+                <Label Grid.Row="0" Grid.Column="1" Name="delayLabel" VerticalAlignment="Top" HorizontalAlignment="Left">0.0</Label>
+            </Grid>
+        </Grid>
+        <Grid Grid.Row="1" Grid.Column="0" Margin="0 10 0 5">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Button Grid.Column="0"  VerticalAlignment="Center" HorizontalAlignment="Center" Name="sayHello" Click="sayHello_Click">Hello World!</Button>
+            <Button Grid.Column="1"  VerticalAlignment="Center" HorizontalAlignment="Center" Name="shutdown" Click="shutdown_Click">Shutdown</Button>
+            <Button Grid.Column="2"  VerticalAlignment="Center" HorizontalAlignment="Center" Name="flush" Click="flush_Click">Flush</Button>
+        </Grid>
+        <Label Grid.Row="2" Grid.Column="0" Name="status">Ready</Label>
+    </Grid>
+</Window>
diff --git a/cs/demo/Ice/wpf/HelloWindow.xaml.cs b/cs/demo/Ice/wpf/HelloWindow.xaml.cs
index 88c42f6bd67..542e873b4c2 100644
--- a/cs/demo/Ice/wpf/HelloWindow.xaml.cs
+++ b/cs/demo/Ice/wpf/HelloWindow.xaml.cs
@@ -1,294 +1,294 @@
-// **********************************************************************

-//

-// Copyright(c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Data;

-using System.Windows.Documents;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Imaging;

-using System.Windows.Navigation;

-using System.Windows.Shapes;

-using System.Windows.Threading;

-using System.Diagnostics;

-

-namespace Ice.wpf.client

-{

-    /// <summary>

-    /// Interaction logic for HelloWindow.xaml

-    /// </summary>

-    public partial class HelloWindow : Window

-    {

-        public HelloWindow()

-        {

-            InitializeComponent();

-            locateOnScreen(this);

-        }

-

-        static String TWOWAY = "Twoway";

-        static String TWOWAY_SECURE = "Twoway Secure";

-        static String ONEWAY = "Oneway";

-        static String ONEWAY_BATCH = "Oneway Batch";

-        static String ONEWAY_SECURE = "Oneway Secure";

-        static String ONEWAY_SECURE_BATCH = "Oneway Secure Batch";

-        static String DATAGRAM = "Datagram";

-        static String DATAGRAM_BATCH = "Datagram Batch";

-

-        private void Window_Loaded(object sender, EventArgs e)

-        {

-            try

-            {

-                Ice.InitializationData initData = new Ice.InitializationData();

-                initData.properties = Ice.Util.createProperties();

-                initData.properties.load("config.client");

-                initData.dispatcher = delegate(System.Action action, Ice.Connection connection)

-                {

-                    Dispatcher.BeginInvoke(DispatcherPriority.Normal, action);

-                };

-                _communicator = Ice.Util.initialize(initData);

-            }

-            catch(Ice.LocalException ex)

-            {

-                handleException(ex);

-            }

-        }

-

-        private void Window_Closed(object sender, EventArgs e)

-        {

-            if(_communicator == null)

-            {

-                return;

-            }

-

-            _communicator.destroy();

-            _communicator = null;

-        }

-

-        private bool deliveryModeIsBatch()

-        {

-            return deliveryMode.Text.Equals(ONEWAY_BATCH) ||

-                    deliveryMode.Text.Equals(ONEWAY_SECURE_BATCH) ||

-                    deliveryMode.Text.Equals(DATAGRAM_BATCH);

-        }

-

-        private Ice.ObjectPrx deliveryModeApply(Ice.ObjectPrx prx)

-        {

-            if(deliveryMode.Text.Equals(TWOWAY))

-            {

-                prx = prx.ice_twoway();

-            }

-            else if(deliveryMode.Text.Equals(TWOWAY_SECURE))

-            {

-                prx = prx.ice_twoway().ice_secure(true);

-            }

-            else if(deliveryMode.Text.Equals(ONEWAY))

-            {

-                prx = prx.ice_oneway();

-            }

-            else if(deliveryMode.Text.Equals(ONEWAY_BATCH))

-            {

-                prx = prx.ice_batchOneway();

-            }

-            else if(deliveryMode.Text.Equals(ONEWAY_SECURE))

-            {

-                prx = prx.ice_oneway().ice_secure(true);

-            }

-            else if(deliveryMode.Text.Equals(ONEWAY_SECURE_BATCH))

-            {

-                prx = prx.ice_batchOneway().ice_secure(true);

-            }

-            else if(deliveryMode.Text.Equals(DATAGRAM))

-            {

-                prx = prx.ice_datagram();

-            }

-            else if(deliveryMode.Text.Equals(DATAGRAM_BATCH))

-            {

-                prx = prx.ice_batchDatagram();

-            }

-

-            return prx;

-        }

-

-        class SayHelloCB

-        {

-            public SayHelloCB(HelloWindow window)

-            {

-                _window = window;

-            }

-            

-            public void response()

-            {

-                lock(this)

-                {

-                    Debug.Assert(!_response);

-                    _response = true;

-                    _window.status.Content = "Ready";

-                }

-            }

-

-            public void exception(Exception ex)

-            {

-                lock(this)

-                {

-                    Debug.Assert(!_response);

-                    _response = true;

-                    _window.handleException(ex);

-                }

-            }

-

-            public void sent(bool sentSynchronously)

-            {

-                lock(this)

-                {

-                    if(_response)

-                    {

-                        return;

-                    }

-                    if(_window.deliveryMode.Text.Equals(TWOWAY) || _window.deliveryMode.Text.Equals(TWOWAY_SECURE))

-                    {

-                        _window.status.Content = "Waiting for response";

-                    }

-                    else

-                    {

-                        _window.status.Content = "Ready";

-                    }

-                }

-            }

-

-            private bool _response = false;

-            private HelloWindow _window;

-        }

-

-        private void sayHello_Click(object sender, RoutedEventArgs e)

-        {

-            Demo.HelloPrx hello = createProxy();

-            if(hello == null)

-            {

-                return;

-            }

-

-            int delay =(int)delaySlider.Value;

-            try

-            {

-                if(!deliveryModeIsBatch())

-                {

-                    status.Content = "Sending request";

-                    SayHelloCB cb = new SayHelloCB(this);

-                    hello.begin_sayHello(delay).whenCompleted(cb.response, cb.exception).whenSent(cb.sent);

-                }

-                else

-                {

-                    flush.IsEnabled = true;

-                    hello.sayHello(delay);

-                    status.Content = "Queued sayHello request";

-                }

-            }

-            catch(Ice.LocalException ex)

-            {

-                handleException(ex);

-            }

-        }

-

-        private void handleException(Exception ex)

-        {

-            status.Content = ex.GetType();

-        }

-

-        private void shutdown_Click(object sender, RoutedEventArgs e)

-        {

-            Demo.HelloPrx hello = createProxy();

-            if(hello == null)

-            {

-                return;

-            }

-

-            int delay =(int)delaySlider.Value;

-

-            try

-            {

-                if(!deliveryModeIsBatch())

-                {

-                    AsyncResult<Demo.Callback_Hello_shutdown> result = hello.begin_shutdown();

-                    status.Content = "Sending request";

-                    result.whenCompleted(delegate()

-                                         {

-                                             status.Content = "Ready";

-                                         },

-                                         delegate(Exception ex)

-                                         {

-                                             handleException(ex);

-                                         });

-                }

-                else

-                {

-                    flush.IsEnabled = true;

-                    hello.shutdown();

-                    status.Content = "Queued shutdown request";

-                }

-            }

-            catch(Ice.LocalException ex)

-            {

-                handleException(ex);

-            }

-        }

-

-        private void flush_Click(object sender, RoutedEventArgs e)

-        {

-            Ice.AsyncResult r = _communicator.begin_flushBatchRequests();

-            r.whenCompleted(handleException);

-

-            flush.IsEnabled = false;

-            status.Content = "Flushed batch requests";

-        }

-

-        Demo.HelloPrx

-        createProxy()

-        {

-            String host = hostname.Text.Trim();

-            if(host.Length == 0)

-            {

-                status.Content = "No hostname";

-                return null;

-            }

-

-            String s = "hello:tcp -h " + host + " -p 10000:ssl -h " + host + " -p 10001:udp -h " + host + " -p 10000";

-            Ice.ObjectPrx prx = _communicator.stringToProxy(s);

-            prx = deliveryModeApply(prx);

-            int timeout =(int)timeoutSlider.Value;

-            if(timeout != 0)

-            {

-                prx = prx.ice_timeout(timeout);

-            }

-            return Demo.HelloPrxHelper.uncheckedCast(prx);

-        }

-

-        private void timeoutSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)

-        {

-            timeoutLabel.Content =(timeoutSlider.Value / 1000.0).ToString("F1");

-        }

-

-        private void delaySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)

-        {

-            delayLabel.Content =(delaySlider.Value / 1000.0).ToString("F1");

-        }

-

-        static private void locateOnScreen(System.Windows.Window window)

-        {

-            window.Left =(System.Windows.SystemParameters.PrimaryScreenWidth - window.Width) / 2;

-            window.Top =(System.Windows.SystemParameters.PrimaryScreenHeight - window.Height) / 2;

-        }

-

-        private Ice.Communicator _communicator = null;

-    }

-}

+// **********************************************************************
+//
+// Copyright(c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+using System.Diagnostics;
+
+namespace Ice.wpf.client
+{
+    /// <summary>
+    /// Interaction logic for HelloWindow.xaml
+    /// </summary>
+    public partial class HelloWindow : Window
+    {
+        public HelloWindow()
+        {
+            InitializeComponent();
+            locateOnScreen(this);
+        }
+
+        static String TWOWAY = "Twoway";
+        static String TWOWAY_SECURE = "Twoway Secure";
+        static String ONEWAY = "Oneway";
+        static String ONEWAY_BATCH = "Oneway Batch";
+        static String ONEWAY_SECURE = "Oneway Secure";
+        static String ONEWAY_SECURE_BATCH = "Oneway Secure Batch";
+        static String DATAGRAM = "Datagram";
+        static String DATAGRAM_BATCH = "Datagram Batch";
+
+        private void Window_Loaded(object sender, EventArgs e)
+        {
+            try
+            {
+                Ice.InitializationData initData = new Ice.InitializationData();
+                initData.properties = Ice.Util.createProperties();
+                initData.properties.load("config.client");
+                initData.dispatcher = delegate(System.Action action, Ice.Connection connection)
+                {
+                    Dispatcher.BeginInvoke(DispatcherPriority.Normal, action);
+                };
+                _communicator = Ice.Util.initialize(initData);
+            }
+            catch(Ice.LocalException ex)
+            {
+                handleException(ex);
+            }
+        }
+
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            if(_communicator == null)
+            {
+                return;
+            }
+
+            _communicator.destroy();
+            _communicator = null;
+        }
+
+        private bool deliveryModeIsBatch()
+        {
+            return deliveryMode.Text.Equals(ONEWAY_BATCH) ||
+                    deliveryMode.Text.Equals(ONEWAY_SECURE_BATCH) ||
+                    deliveryMode.Text.Equals(DATAGRAM_BATCH);
+        }
+
+        private Ice.ObjectPrx deliveryModeApply(Ice.ObjectPrx prx)
+        {
+            if(deliveryMode.Text.Equals(TWOWAY))
+            {
+                prx = prx.ice_twoway();
+            }
+            else if(deliveryMode.Text.Equals(TWOWAY_SECURE))
+            {
+                prx = prx.ice_twoway().ice_secure(true);
+            }
+            else if(deliveryMode.Text.Equals(ONEWAY))
+            {
+                prx = prx.ice_oneway();
+            }
+            else if(deliveryMode.Text.Equals(ONEWAY_BATCH))
+            {
+                prx = prx.ice_batchOneway();
+            }
+            else if(deliveryMode.Text.Equals(ONEWAY_SECURE))
+            {
+                prx = prx.ice_oneway().ice_secure(true);
+            }
+            else if(deliveryMode.Text.Equals(ONEWAY_SECURE_BATCH))
+            {
+                prx = prx.ice_batchOneway().ice_secure(true);
+            }
+            else if(deliveryMode.Text.Equals(DATAGRAM))
+            {
+                prx = prx.ice_datagram();
+            }
+            else if(deliveryMode.Text.Equals(DATAGRAM_BATCH))
+            {
+                prx = prx.ice_batchDatagram();
+            }
+
+            return prx;
+        }
+
+        class SayHelloCB
+        {
+            public SayHelloCB(HelloWindow window)
+            {
+                _window = window;
+            }
+            
+            public void response()
+            {
+                lock(this)
+                {
+                    Debug.Assert(!_response);
+                    _response = true;
+                    _window.status.Content = "Ready";
+                }
+            }
+
+            public void exception(Exception ex)
+            {
+                lock(this)
+                {
+                    Debug.Assert(!_response);
+                    _response = true;
+                    _window.handleException(ex);
+                }
+            }
+
+            public void sent(bool sentSynchronously)
+            {
+                lock(this)
+                {
+                    if(_response)
+                    {
+                        return;
+                    }
+                    if(_window.deliveryMode.Text.Equals(TWOWAY) || _window.deliveryMode.Text.Equals(TWOWAY_SECURE))
+                    {
+                        _window.status.Content = "Waiting for response";
+                    }
+                    else
+                    {
+                        _window.status.Content = "Ready";
+                    }
+                }
+            }
+
+            private bool _response = false;
+            private HelloWindow _window;
+        }
+
+        private void sayHello_Click(object sender, RoutedEventArgs e)
+        {
+            Demo.HelloPrx hello = createProxy();
+            if(hello == null)
+            {
+                return;
+            }
+
+            int delay =(int)delaySlider.Value;
+            try
+            {
+                if(!deliveryModeIsBatch())
+                {
+                    status.Content = "Sending request";
+                    SayHelloCB cb = new SayHelloCB(this);
+                    hello.begin_sayHello(delay).whenCompleted(cb.response, cb.exception).whenSent(cb.sent);
+                }
+                else
+                {
+                    flush.IsEnabled = true;
+                    hello.sayHello(delay);
+                    status.Content = "Queued sayHello request";
+                }
+            }
+            catch(Ice.LocalException ex)
+            {
+                handleException(ex);
+            }
+        }
+
+        private void handleException(Exception ex)
+        {
+            status.Content = ex.GetType();
+        }
+
+        private void shutdown_Click(object sender, RoutedEventArgs e)
+        {
+            Demo.HelloPrx hello = createProxy();
+            if(hello == null)
+            {
+                return;
+            }
+
+            int delay =(int)delaySlider.Value;
+
+            try
+            {
+                if(!deliveryModeIsBatch())
+                {
+                    AsyncResult<Demo.Callback_Hello_shutdown> result = hello.begin_shutdown();
+                    status.Content = "Sending request";
+                    result.whenCompleted(delegate()
+                                         {
+                                             status.Content = "Ready";
+                                         },
+                                         delegate(Exception ex)
+                                         {
+                                             handleException(ex);
+                                         });
+                }
+                else
+                {
+                    flush.IsEnabled = true;
+                    hello.shutdown();
+                    status.Content = "Queued shutdown request";
+                }
+            }
+            catch(Ice.LocalException ex)
+            {
+                handleException(ex);
+            }
+        }
+
+        private void flush_Click(object sender, RoutedEventArgs e)
+        {
+            Ice.AsyncResult r = _communicator.begin_flushBatchRequests();
+            r.whenCompleted(handleException);
+
+            flush.IsEnabled = false;
+            status.Content = "Flushed batch requests";
+        }
+
+        Demo.HelloPrx
+        createProxy()
+        {
+            String host = hostname.Text.Trim();
+            if(host.Length == 0)
+            {
+                status.Content = "No hostname";
+                return null;
+            }
+
+            String s = "hello:tcp -h " + host + " -p 10000:ssl -h " + host + " -p 10001:udp -h " + host + " -p 10000";
+            Ice.ObjectPrx prx = _communicator.stringToProxy(s);
+            prx = deliveryModeApply(prx);
+            int timeout =(int)timeoutSlider.Value;
+            if(timeout != 0)
+            {
+                prx = prx.ice_timeout(timeout);
+            }
+            return Demo.HelloPrxHelper.uncheckedCast(prx);
+        }
+
+        private void timeoutSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            timeoutLabel.Content =(timeoutSlider.Value / 1000.0).ToString("F1");
+        }
+
+        private void delaySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            delayLabel.Content =(delaySlider.Value / 1000.0).ToString("F1");
+        }
+
+        static private void locateOnScreen(System.Windows.Window window)
+        {
+            window.Left =(System.Windows.SystemParameters.PrimaryScreenWidth - window.Width) / 2;
+            window.Top =(System.Windows.SystemParameters.PrimaryScreenHeight - window.Height) / 2;
+        }
+
+        private Ice.Communicator _communicator = null;
+    }
+}
diff --git a/cs/demo/Ice/wpf/Properties/AssemblyInfo.cs b/cs/demo/Ice/wpf/Properties/AssemblyInfo.cs
index 477b3052629..a4393ba1e71 100755
--- a/cs/demo/Ice/wpf/Properties/AssemblyInfo.cs
+++ b/cs/demo/Ice/wpf/Properties/AssemblyInfo.cs
@@ -1,55 +1,55 @@
-using System.Reflection;

-using System.Resources;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-using System.Windows;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("Ice.wpf.client")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("Ice.wpf.client")]

-[assembly: AssemblyCopyright("Copyright ©  2010")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-//In order to begin building localizable applications, set 

-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file

-//inside a <PropertyGroup>.  For example, if you are using US english

-//in your source files, set the <UICulture> to en-US.  Then uncomment

-//the NeutralResourceLanguage attribute below.  Update the "en-US" in

-//the line below to match the UICulture setting in the project file.

-

-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]

-

-

-[assembly: ThemeInfo(

-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located

-    //(used if a resource is not found in the page, 

-    // or application resource dictionaries)

-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located

-    //(used if a resource is not found in the page, 

-    // app, or any theme specific resource dictionaries)

-)]

-

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers 

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Ice.wpf.client")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Ice.wpf.client")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+    //(used if a resource is not found in the page, 
+    // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    //(used if a resource is not found in the page, 
+    // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/cs/demo/Ice/wpf/Properties/Resources.Designer.cs b/cs/demo/Ice/wpf/Properties/Resources.Designer.cs
index f40e7d965b2..4ffd3bcc16d 100755
--- a/cs/demo/Ice/wpf/Properties/Resources.Designer.cs
+++ b/cs/demo/Ice/wpf/Properties/Resources.Designer.cs
@@ -1,71 +1,71 @@
-//------------------------------------------------------------------------------

-// <auto-generated>

-//     This code was generated by a tool.

-//     Runtime Version:2.0.50727.1433

-//

-//     Changes to this file may cause incorrect behavior and will be lost if

-//     the code is regenerated.

-// </auto-generated>

-//------------------------------------------------------------------------------

-

-namespace Ice.wpf.client.Properties

-{

-

-

-    /// <summary>

-    ///   A strongly-typed resource class, for looking up localized strings, etc.

-    /// </summary>

-    // This class was auto-generated by the StronglyTypedResourceBuilder

-    // class via a tool like ResGen or Visual Studio.

-    // To add or remove a member, edit your .ResX file then rerun ResGen

-    // with the /str option, or rebuild your VS project.

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]

-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    internal class Resources

-    {

-

-        private static global::System.Resources.ResourceManager resourceMan;

-

-        private static global::System.Globalization.CultureInfo resourceCulture;

-

-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]

-        internal Resources()

-        {

-        }

-

-        /// <summary>

-        ///   Returns the cached ResourceManager instance used by this class.

-        /// </summary>

-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]

-        internal static global::System.Resources.ResourceManager ResourceManager

-        {

-            get

-            {

-                if ((resourceMan == null))

-                {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ice.wpf.client.Properties.Resources", typeof(Resources).Assembly);

-                    resourceMan = temp;

-                }

-                return resourceMan;

-            }

-        }

-

-        /// <summary>

-        ///   Overrides the current thread's CurrentUICulture property for all

-        ///   resource lookups using this strongly typed resource class.

-        /// </summary>

-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]

-        internal static global::System.Globalization.CultureInfo Culture

-        {

-            get

-            {

-                return resourceCulture;

-            }

-            set

-            {

-                resourceCulture = value;

-            }

-        }

-    }

-}

+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.1433
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Ice.wpf.client.Properties
+{
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources
+    {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources()
+        {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ice.wpf.client.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
+                return resourceCulture;
+            }
+            set
+            {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/cs/demo/Ice/wpf/Properties/Resources.resx b/cs/demo/Ice/wpf/Properties/Resources.resx
index ffecec851ab..2b64efaf5df 100755
--- a/cs/demo/Ice/wpf/Properties/Resources.resx
+++ b/cs/demo/Ice/wpf/Properties/Resources.resx
@@ -114,4 +114,4 @@
   <resheader name="writer">

     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

-</root>
\ No newline at end of file
+</root>

diff --git a/cs/demo/Ice/wpf/Properties/Settings.Designer.cs b/cs/demo/Ice/wpf/Properties/Settings.Designer.cs
index f3bff7a3a95..93df3f41bc1 100755
--- a/cs/demo/Ice/wpf/Properties/Settings.Designer.cs
+++ b/cs/demo/Ice/wpf/Properties/Settings.Designer.cs
@@ -1,30 +1,30 @@
-//------------------------------------------------------------------------------

-// <auto-generated>

-//     This code was generated by a tool.

-//     Runtime Version:2.0.50727.1433

-//

-//     Changes to this file may cause incorrect behavior and will be lost if

-//     the code is regenerated.

-// </auto-generated>

-//------------------------------------------------------------------------------

-

-namespace Ice.wpf.client.Properties

-{

-

-

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]

-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase

-    {

-

-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

-

-        public static Settings Default

-        {

-            get

-            {

-                return defaultInstance;

-            }

-        }

-    }

-}

+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.1433
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Ice.wpf.client.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/cs/demo/Ice/wpf/Properties/Settings.settings b/cs/demo/Ice/wpf/Properties/Settings.settings
index 8f2fd95d626..1dc1197a474 100755
--- a/cs/demo/Ice/wpf/Properties/Settings.settings
+++ b/cs/demo/Ice/wpf/Properties/Settings.settings
@@ -4,4 +4,4 @@
     <Profile Name="(Default)" />

   </Profiles>

   <Settings />

-</SettingsFile>
\ No newline at end of file
+</SettingsFile>

diff --git a/cs/demo/IceBox/hello/config.admin b/cs/demo/IceBox/hello/config.admin
index a5c17db1204..242636ca9ef 100644
--- a/cs/demo/IceBox/hello/config.admin
+++ b/cs/demo/IceBox/hello/config.admin
@@ -1,13 +1,13 @@
-#

-# Proxy to the IceBox ServiceManager:

-#

-

-#

-# When the IceBox.ServiceManager object adapter is configured: 

-#

-#IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/ServiceManager:tcp -p 9998 -h 127.0.0.1

-

-#

-# When Ice.Admin is configured:

-#

-IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/admin -f IceBox.ServiceManager:tcp -p 9996 -h 127.0.0.1

+#
+# Proxy to the IceBox ServiceManager:
+#
+
+#
+# When the IceBox.ServiceManager object adapter is configured: 
+#
+#IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/ServiceManager:tcp -p 9998 -h 127.0.0.1
+
+#
+# When Ice.Admin is configured:
+#
+IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/admin -f IceBox.ServiceManager:tcp -p 9996 -h 127.0.0.1
diff --git a/cs/src/Ice/AMDCallback.cs b/cs/src/Ice/AMDCallback.cs
index 98bb55c7e86..1ab0581cca7 100644
--- a/cs/src/Ice/AMDCallback.cs
+++ b/cs/src/Ice/AMDCallback.cs
@@ -20,4 +20,4 @@ namespace Ice
         /// Use ice_response to raise user exceptions.</param>
         void ice_exception(System.Exception ex);
     }
-}
\ No newline at end of file
+}
diff --git a/cs/src/Ice/ConnectionReaper.cs b/cs/src/Ice/ConnectionReaper.cs
index 42ffb318172..759dd1cadc3 100644
--- a/cs/src/Ice/ConnectionReaper.cs
+++ b/cs/src/Ice/ConnectionReaper.cs
@@ -41,4 +41,4 @@ namespace IceInternal
 
         private ICollection<Ice.ConnectionI> _connections = new List<Ice.ConnectionI>();
     }
-}
\ No newline at end of file
+}
diff --git a/cs/src/Ice/SocketOperation.cs b/cs/src/Ice/SocketOperation.cs
index c1a8281bef9..d7d7e89f282 100644
--- a/cs/src/Ice/SocketOperation.cs
+++ b/cs/src/Ice/SocketOperation.cs
@@ -16,4 +16,4 @@ namespace IceInternal
         public const int Write = 2;
         public const int Connect = 2;
     }
-}
\ No newline at end of file
+}
diff --git a/cs/test/Ice/dispatcher/TestI.cs b/cs/test/Ice/dispatcher/TestI.cs
index 4c0dcd50ba0..c114f70271c 100644
--- a/cs/test/Ice/dispatcher/TestI.cs
+++ b/cs/test/Ice/dispatcher/TestI.cs
@@ -74,4 +74,4 @@ public class TestControllerI : TestIntfControllerDisp_
     }
 
     private Ice.ObjectAdapter _adapter;
-};
\ No newline at end of file
+};
diff --git a/cs/test/Ice/location/ServerManagerI.cs b/cs/test/Ice/location/ServerManagerI.cs
index 11ceecdc300..b0dea9217e1 100644
--- a/cs/test/Ice/location/ServerManagerI.cs
+++ b/cs/test/Ice/location/ServerManagerI.cs
@@ -16,11 +16,11 @@ public class ServerManagerI : ServerManagerDisp_
         Ice.InitializationData initData)
     {
         _registry = registry;
-        _communicators = new ArrayList();

-        _initData = initData;

-        _initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter");

-        _initData.properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");

-        _initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2");

+        _communicators = new ArrayList();
+        _initData = initData;
+        _initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter");
+        _initData.properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
+        _initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2");
     }
     
     public override void startServer(Ice.Current current)
diff --git a/cs/test/Ice/seqMapping/Makefile.mak b/cs/test/Ice/seqMapping/Makefile.mak
index a3172a561fb..40cf64841c4 100644
--- a/cs/test/Ice/seqMapping/Makefile.mak
+++ b/cs/test/Ice/seqMapping/Makefile.mak
@@ -27,7 +27,7 @@ GDIR		= generated
 

 MCSFLAGS	= $(MCSFLAGS) -target:exe

 

-
+

 client.exe: $(C_SRCS) $(GEN_SRCS) Serializable.dll

 	$(MCS) $(MCSFLAGS) -out:$@ -r:"$(refdir)\Ice.dll" -r:Serializable.dll $(C_SRCS) $(GEN_SRCS)

 

@@ -40,7 +40,7 @@ collocated.exe: $(COL_SRCS) $(GEN_SRCS) Serializable.dll
 serveramd.exe: $(SAMD_SRCS) $(GEN_AMD_SRCS) Serializable.dll

 	$(MCS) $(MCSFLAGS) -out:$@ -r:"$(refdir)\Ice.dll" -r:Serializable.dll $(SAMD_SRCS) $(GEN_AMD_SRCS)

 

-Serializable.dll: Serializable.cs
-	$(MCS) $(MCSFLAGS) -target:library -out:Serializable.dll /keyfile:$(KEYFILE) Serializable.cs
-
+Serializable.dll: Serializable.cs

+	$(MCS) $(MCSFLAGS) -target:library -out:Serializable.dll /keyfile:$(KEYFILE) Serializable.cs

+

 !include .depend.mak

diff --git a/cs/test/Ice/stream/Makefile.mak b/cs/test/Ice/stream/Makefile.mak
index a71450450a7..d2c9ef5a4a1 100644
--- a/cs/test/Ice/stream/Makefile.mak
+++ b/cs/test/Ice/stream/Makefile.mak
@@ -28,7 +28,7 @@ SLICE2CSFLAGS	= $(SLICE2CSFLAGS) --stream -I.
 client.exe: $(C_SRCS) $(GEN_SRCS) Serializable.dll

 	$(MCS) $(MCSFLAGS) -out:$@ -r:"$(refdir)\Ice.dll" -r:Serializable.dll $(C_SRCS) $(GEN_SRCS)

 

-Serializable.dll: Serializable.cs
-	$(MCS) $(MCSFLAGS) -target:library -out:Serializable.dll /keyfile:$(KEYFILE) Serializable.cs
-
+Serializable.dll: Serializable.cs

+	$(MCS) $(MCSFLAGS) -target:library -out:Serializable.dll /keyfile:$(KEYFILE) Serializable.cs

+

 !include .depend.mak

diff --git a/cs/test/Ice/threadPoolPriority/PriorityI.cs b/cs/test/Ice/threadPoolPriority/PriorityI.cs
index ab44d10042a..f5f1747a2f5 100644
--- a/cs/test/Ice/threadPoolPriority/PriorityI.cs
+++ b/cs/test/Ice/threadPoolPriority/PriorityI.cs
@@ -14,4 +14,4 @@ public class PriorityI : Test.PriorityDisp_
     {
         return Thread.CurrentThread.Priority.ToString();
     }
-}
\ No newline at end of file
+}
diff --git a/cs/test/IceBox/configuration/config.icebox2 b/cs/test/IceBox/configuration/config.icebox2
index 6b921b75231..2e86b5c7113 100644
--- a/cs/test/IceBox/configuration/config.icebox2
+++ b/cs/test/IceBox/configuration/config.icebox2
@@ -13,4 +13,4 @@ IceBox.Service.Service1=testservice.dll:TestServiceI --Ice.Config=config.service
 IceBox.UseSharedCommunicator.Service2=1
 IceBox.Service.Service2=testservice.dll:TestServiceI --Ice.Config=config.service2-2
 
-IceBox.LoadOrder=Service1 Service2
\ No newline at end of file
+IceBox.LoadOrder=Service1 Service2
diff --git a/cs/test/IceBox/configuration/config.service1-2 b/cs/test/IceBox/configuration/config.service1-2
index 76064138212..c173914db2a 100644
--- a/cs/test/IceBox/configuration/config.service1-2
+++ b/cs/test/IceBox/configuration/config.service1-2
@@ -8,4 +8,4 @@ OverrideMe=2
 UnsetMe=
 
 
-Ice.PrintAdapterReady=0
\ No newline at end of file
+Ice.PrintAdapterReady=0
diff --git a/cs/test/IceBox/configuration/config.service2-2 b/cs/test/IceBox/configuration/config.service2-2
index c1a99d112c1..36c8d0812cb 100644
--- a/cs/test/IceBox/configuration/config.service2-2
+++ b/cs/test/IceBox/configuration/config.service2-2
@@ -6,4 +6,4 @@ Service2.Prop=1
 OverrideMe=3
 UnsetMe=
 
-Ice.PrintAdapterReady=0
\ No newline at end of file
+Ice.PrintAdapterReady=0
diff --git a/distribution/bin/fixLineEnd.py b/distribution/bin/fixLineEnd.py
new file mode 100644
index 00000000000..43df12c6eda
--- /dev/null
+++ b/distribution/bin/fixLineEnd.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+sys.path.append(os.path.join(os.path.dirname(__file__), "..", "lib"))
+import FixUtil
+
+def usage():
+    print "Usage: " + sys.argv[0] + " [options]"
+    print
+    print "Options:"
+    print "-h    Show this message."
+    print
+
+for x in sys.argv[1:]:
+    if x == "-h":
+        usage()
+        sys.exit(0)
+    elif x.startswith("-"):
+        print sys.argv[0] + ": unknown option `" + x + "'"
+        print
+        usage()
+        sys.exit(1)
+
+FixUtil.fixLineEnd()
diff --git a/distribution/lib/FixUtil.py b/distribution/lib/FixUtil.py
index 086de45a5f3..f52bf7587f0 100755
--- a/distribution/lib/FixUtil.py
+++ b/distribution/lib/FixUtil.py
@@ -211,3 +211,81 @@ def checkVersion(version):
     if not re.match(vpatCheck, version):
         print "invalid version number: " + version + " (it should have the form 3.2.1 or 3.2b or 3.2b2)"
         sys.exit(0)
+
+def fixLineEnd():
+    files = getTrackedFiles()
+
+    #
+    # Filename suffixes that don't need to be checked.
+    #
+    ignoreSubfix = ["\.aip", "\.bmp", "\.exe", "\.gif", "\.jpg", "\.png", "\.rtf", "\.zip", \
+                    "\.snk", "\.pfx", "\.class", "\.ico", "\.jks", "\.gz", "\.DS_Store", "\.chm", "\.utf16le", \
+                    "\.utf16be", "\.utf32le", "\.utf32be", "\.dat", "\.bin", "\.patch", "patch\..*", "passwords",
+                    "plugin.properties", ".jar", "\.cfg", "\.depend.mak"]
+
+    #
+    # File extensions that must use DOS-style line endings.
+    #
+    dosExtensions = [".mak", ".mak.cs", ".mak.php", ".mak.vb", ".txt", ".exe.config", ".csproj", ".vbproj", \
+                     ".vcproj", ".vsproj", ".sln", ".vsdir", ".bat", ".rc", ".rc2", ".settings", ".AddIn", \
+                     ".resx", ".bcc", ".msvc", ".dsp", ".dsw"]
+
+    for filename in files:
+        path = filename.lower()
+        ignore = False
+        for e in ignoreSubfix:
+            regexp = re.compile(e.lower() + "$")
+            if regexp.search(path):
+                ignore = True
+                #print "Ignoring file " + filename + " with extension " + e
+                break
+
+        if ignore:
+            continue
+
+        dos = False
+        for e in dosExtensions:
+            if path.endswith(e.lower()):
+                dos = True
+                break
+
+        file = open(filename, "r")
+
+        convert = False
+        for line in file:
+            if dos:
+                if line.endswith("\n") and not line.endswith("\r\n"):
+                    convert = True
+                    break
+            else:
+                if line.endswith("\r\n"):
+                    convert = True
+                    break
+
+        file.close()
+        file = open(filename, "r")
+        text = file.read()
+        file.close()
+
+        eol = None
+        if len(text) > 0: # Ignore empty files
+            if convert:
+                if not text.endswith("\n"):
+                    eol = "\n"
+            else:
+                if dos and not text.endswith("\r\n"):
+                    eol = "\r\n"
+                elif not dos and not text.endswith("\n"):
+                    eol = "\n"
+
+        if eol:
+            file = open(filename, "w")
+            file.write(text + eol)
+            file.close()
+            print "Added EOL to file " + filename
+
+        if convert:
+            print "Converting " + filename
+            os.popen("dos2unix -U -q " + filename)
+            if dos:
+                os.popen("recode -f latin1..dos " + filename)
diff --git a/distribution/src/common/Make.rules.mak b/distribution/src/common/Make.rules.mak
index 53a64f1dfa5..eeb98b904f4 100644
--- a/distribution/src/common/Make.rules.mak
+++ b/distribution/src/common/Make.rules.mak
@@ -1,144 +1,144 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-#
-# Define OPTIMIZE as yes if you want to build with
-# optimization. Otherwise Ice is build with debug information.
-#
-#OPTIMIZE		= yes
-
-#
-# Define if you want pdb files to be generated for optimized/release
-# builds
-#
-#RELEASEPDBS             = yes
-
-#
-# Specify your C++ compiler. Supported values are:
-# VC90, VC90_EXPRESS, BCC2010
-#
-#CPP_COMPILER		= VC90
-
-# ----------------------------------------------------------------------
-# Don't change anything below this line!
-# ----------------------------------------------------------------------
-
-#
-# Common definitions
-#
-ice_language     = cpp
-slice_translator = slice2cpp.exe
-ice_require_cpp  = 1
-
-!include $(top_srcdir)\config\Make.common.rules.mak
-
-includedir		= $(ice_dir)\include
-
-SETARGV			= setargv.obj
-
-#
-# Compiler specific definitions
-#
-!if "$(CPP_COMPILER)" == "BCC2010"
-BCPLUSPLUS		= yes
-!include 	$(top_srcdir)/config/Make.rules.bcc
-!elseif "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" 
-!include        $(top_srcdir)/config/Make.rules.msvc
-!elseif "$(CPP_COMPILER)" == ""
-!error Please set CPP_COMPILER to VC90, VC90_EXPRESS or BCC2010
-!else
-!error Invalid setting for CPP_COMPILER: $(CPP_COMPILER)
-!endif
-
-!if "$(CPP_COMPILER)" == "BCC2010"
-libsuff			= \bcc10
-!else
-libsuff			= $(x64suffix)
-!endif
-
-!if "$(OPTIMIZE)" != "yes"
-LIBSUFFIX	= $(LIBSUFFIX)d
-RCFLAGS		= -D_DEBUG
-!endif
-
-CPPFLAGS		= $(CPPFLAGS) -I"$(includedir)"
-ICECPPFLAGS		= -I"$(slicedir)"
-SLICE2CPPFLAGS		= $(ICECPPFLAGS)
-
-LDFLAGS			= $(LDFLAGS) $(PRELIBPATH)"$(ice_dir)\lib$(libsuff)"
-LDFLAGS			= $(LDFLAGS) $(LDPLATFORMFLAGS) $(CXXFLAGS)
-
-SLICEPARSERLIB		= $(ice_dir)\lib$(x64suffix)\slice$(LIBSUFFIX).lib
-SLICE2CPP		= $(ice_dir)\bin$(x64suffix)\slice2cpp.exe
-SLICE2XSD		= $(ice_dir)\bin$(x64suffix)\slice2xsd.exe
-SLICE2FREEZE		= $(ice_dir)\bin$(x64suffix)\slice2freeze.exe
-
-MT 			= mt.exe
-
-EVERYTHING		= all clean install
-
-.SUFFIXES:
-.SUFFIXES:		.ice .cpp .c .obj .res .rc
-
-.cpp.obj::
-	$(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
-
-.c.obj:
-	$(CC) /c $(CPPFLAGS) $(CFLAGS) $<
-
-.ice.cpp:
-	del /q $(*F).h $(*F).cpp
-	"$(SLICE2CPP)" $(SLICE2CPPFLAGS) $(*F).ice
-
-.rc.res:
-	rc $(RCFLAGS) $<
-
-
-all:: $(SRCS) $(TARGETS)
-
-!if "$(TARGETS)" != ""
-
-clean::
-	-del /q $(TARGETS)
-
-!endif
-
-# Suffix set, we're using a debug build.
-!if "$(LIBSUFFIX)" != ""
-
-!if "$(LIBNAME)" != ""
-clean::
-	-del /q $(LIBNAME:d.lib=.lib)
-	-del /q $(LIBNAME)
-!endif
-!if "$(DLLNAME)" != ""
-clean::
-	-del /q $(DLLNAME:d.dll=.*)
-	-del /q $(DLLNAME:.dll=.*)
-!endif
-
-!else
-
-!if "$(LIBNAME)" != ""
-clean::
-	-del /q $(LIBNAME:.lib=d.lib)
-	-del /q $(LIBNAME)
-!endif
-!if "$(DLLNAME)" != ""
-clean::
-	-del /q $(DLLNAME:.dll=d.*)
-	-del /q $(DLLNAME:.dll=.*)
-!endif
-
-!endif
-
-clean::
-	-del /q *.obj *.bak *.ilk *.exp *.pdb *.tds *.idb
-
-install::
+# **********************************************************************

+#

+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

+#

+# This copy of Ice is licensed to you under the terms described in the

+# ICE_LICENSE file included in this distribution.

+#

+# **********************************************************************

+

+#

+# Define OPTIMIZE as yes if you want to build with

+# optimization. Otherwise Ice is build with debug information.

+#

+#OPTIMIZE		= yes

+

+#

+# Define if you want pdb files to be generated for optimized/release

+# builds

+#

+#RELEASEPDBS             = yes

+

+#

+# Specify your C++ compiler. Supported values are:

+# VC90, VC90_EXPRESS, BCC2010

+#

+#CPP_COMPILER		= VC90

+

+# ----------------------------------------------------------------------

+# Don't change anything below this line!

+# ----------------------------------------------------------------------

+

+#

+# Common definitions

+#

+ice_language     = cpp

+slice_translator = slice2cpp.exe

+ice_require_cpp  = 1

+

+!include $(top_srcdir)\config\Make.common.rules.mak

+

+includedir		= $(ice_dir)\include

+

+SETARGV			= setargv.obj

+

+#

+# Compiler specific definitions

+#

+!if "$(CPP_COMPILER)" == "BCC2010"

+BCPLUSPLUS		= yes

+!include 	$(top_srcdir)/config/Make.rules.bcc

+!elseif "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" 

+!include        $(top_srcdir)/config/Make.rules.msvc

+!elseif "$(CPP_COMPILER)" == ""

+!error Please set CPP_COMPILER to VC90, VC90_EXPRESS or BCC2010

+!else

+!error Invalid setting for CPP_COMPILER: $(CPP_COMPILER)

+!endif

+

+!if "$(CPP_COMPILER)" == "BCC2010"

+libsuff			= \bcc10

+!else

+libsuff			= $(x64suffix)

+!endif

+

+!if "$(OPTIMIZE)" != "yes"

+LIBSUFFIX	= $(LIBSUFFIX)d

+RCFLAGS		= -D_DEBUG

+!endif

+

+CPPFLAGS		= $(CPPFLAGS) -I"$(includedir)"

+ICECPPFLAGS		= -I"$(slicedir)"

+SLICE2CPPFLAGS		= $(ICECPPFLAGS)

+

+LDFLAGS			= $(LDFLAGS) $(PRELIBPATH)"$(ice_dir)\lib$(libsuff)"

+LDFLAGS			= $(LDFLAGS) $(LDPLATFORMFLAGS) $(CXXFLAGS)

+

+SLICEPARSERLIB		= $(ice_dir)\lib$(x64suffix)\slice$(LIBSUFFIX).lib

+SLICE2CPP		= $(ice_dir)\bin$(x64suffix)\slice2cpp.exe

+SLICE2XSD		= $(ice_dir)\bin$(x64suffix)\slice2xsd.exe

+SLICE2FREEZE		= $(ice_dir)\bin$(x64suffix)\slice2freeze.exe

+

+MT 			= mt.exe

+

+EVERYTHING		= all clean install

+

+.SUFFIXES:

+.SUFFIXES:		.ice .cpp .c .obj .res .rc

+

+.cpp.obj::

+	$(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<

+

+.c.obj:

+	$(CC) /c $(CPPFLAGS) $(CFLAGS) $<

+

+.ice.cpp:

+	del /q $(*F).h $(*F).cpp

+	"$(SLICE2CPP)" $(SLICE2CPPFLAGS) $(*F).ice

+

+.rc.res:

+	rc $(RCFLAGS) $<

+

+

+all:: $(SRCS) $(TARGETS)

+

+!if "$(TARGETS)" != ""

+

+clean::

+	-del /q $(TARGETS)

+

+!endif

+

+# Suffix set, we're using a debug build.

+!if "$(LIBSUFFIX)" != ""

+

+!if "$(LIBNAME)" != ""

+clean::

+	-del /q $(LIBNAME:d.lib=.lib)

+	-del /q $(LIBNAME)

+!endif

+!if "$(DLLNAME)" != ""

+clean::

+	-del /q $(DLLNAME:d.dll=.*)

+	-del /q $(DLLNAME:.dll=.*)

+!endif

+

+!else

+

+!if "$(LIBNAME)" != ""

+clean::

+	-del /q $(LIBNAME:.lib=d.lib)

+	-del /q $(LIBNAME)

+!endif

+!if "$(DLLNAME)" != ""

+clean::

+	-del /q $(DLLNAME:.dll=d.*)

+	-del /q $(DLLNAME:.dll=.*)

+!endif

+

+!endif

+

+clean::

+	-del /q *.obj *.bak *.ilk *.exp *.pdb *.tds *.idb

+

+install::

diff --git a/distribution/src/thirdparty/README.txt b/distribution/src/thirdparty/README.txt
index 5af2c917ebe..74671a80e4f 100644
--- a/distribution/src/thirdparty/README.txt
+++ b/distribution/src/thirdparty/README.txt
@@ -1,203 +1,203 @@
-======================================================================
-Third Party Packages
-======================================================================
-
-Introduction
-------------
-
-This archive contains the source code distributions, including any
-source patches, for the third-party packages required to build Ice on
-Windows.
-
-This document provides instructions for applying patches and important
-information about building the third-party packages. Note that you do
-not need to build these packages yourself, as ZeroC supplies a Windows
-installer that contains release and debug libraries for all of the
-third-party dependencies. The installer is available at
-
-  http://www.zeroc.com/download.html
-
-If you prefer to compile the third-party packages from source code, we
-recommend that you use the same Visual C++ version to build all of the
-packages. You will need a utility such as WinZip to extract the
-source code distributions.
-
-For more information about the third-party dependencies, please refer
-to the links below:
-
-STLport        http://www.stlport.org
-Berkeley DB    http://www.oracle.com/database/berkeley-db/index.html
-expat          http://expat.sourceforge.net
-OpenSSL        http://www.openssl.org
-bzip2          http://sources.redhat.com/bzip2
-mcpp           http://mcpp.sourceforge.net
-
-
-Table of Contents
------------------
-
-  1. Patches
-     - bzip2
-     - Berkeley DB
-     - mcpp
-  2. Packages
-     - STLport
-     - Berkeley DB
-     - expat
-     - OpenSSL
-     - bzip2
-     - mcpp
-
-
-======================================================================
-1. Patches
-======================================================================
-
-Applying patches requires the "patch" utility. You can download a
-Windows executable from the following location:
-
-  http://gnuwin32.sourceforge.net/packages/patch.htm
-
-
-bzip2
------
-
-The bzip2-1.0.5 distribution does not directly support creating DLLs.
-The file bzlib.patch in this archive contains a patch for bzlib.h that
-allows bzip2 to be compiled into a DLL.
-
-After extracting the bzip2 source distribution, change to the
-top-level directory and apply the patch as shown below:
-
-  > patch -p0 bzlib.h < ..\bzip2\bzlib.patch
-
-
-Berkeley DB
------------
-
-The file db/patch.4.8.24.17646 in this archive contains an important
-fix for Berkeley DB required by Ice. 
-
-After extracting the Berkeley DB 4.8.24 source distribution, change 
-to the top-level directory and apply the patches as shown below:
-
- > cd db-4.8.24
- > patch -p0 < patch.db-4.8.24.17646
-
-
-mcpp
-----
-
-The file mcpp/patch.mcpp.2.7.2 in this archive contains several
-important fixes required by Ice. We expect that these changes will be
-included in a future release of mcpp.
-
-After extracting the mcpp source distribution, change to the top-level
-directory and apply the patch as shown below:
-
-  > cd mcpp-2.7.2
-  > patch -p0 < patch.mcpp.2.7.2
-
-
-======================================================================
-2. Packages
-======================================================================
-
-
-STLport
--------
-
-STLport is only required when using Visual C++ 6.0. For installation
-instructions, please refer to
-
-  http://www.stlport.org/doc/install.html
-
-
-Berkeley DB
------------
-
-When building the debug version of the Berkeley DB DLL (db_dll
-project), you should remove the "DIAGNOSTIC" and "CONFIG_TEST" defines
-and the /export:__db_assert linker option. Without these modifications,
-database environments created by the debug DLL are not compatible with
-environments created by the release DLL.
-
-For installation instructions, please refer to
-
-  http://www.oracle.com/technology/documentation/berkeley-db/db/ref/build_win/intro.html
-
-
-expat
------
-
-Use the provided expat binary installer to install expat in the
-directory of your choice. The installer includes binaries as well as
-source code.
-
-
-OpenSSL
--------
-
-After extracting the OpenSSL source archive, refer to the file
-INSTALL.W32 or INSTALL.W64 for build instructions.
-
-For Visual C++ 6.0, you should use the replacement makefile included
-in this archive:
-
-  > nmake /f ..\openssl\ntdll.mak
-
-For 64-bit builds it is also necessary to remove references to
-libbufferoverflowu.lib from ms\ntdll.mak before running nmake.
-
-
-bzip2
------
-
-If you have not already applied the patch for bzip2, please read the
-"Patches" section above before continuing.
-
-To build bzip2, change to the source directory and use the replacement
-makefile included in this archive:
-
-  > nmake /f ..\bzip2\Makefile.mak
-
-This will build the release and debug versions of the bzip2 DLLs. If
-you are using Visual C++ 6.0, first set the CPP_COMPILER environment
-variable as shown below:
-
-  > set CPP_COMPILER=VC60
-
-
-mcpp
-----
-
-Follow these instructions for building mcpp:
-
-- Change to the mcpp src directory:
-
-  > cd mcpp-2.7.2\src
-
-- Apply the patch for noconfig.H appropriate for your compiler from
-  the noconfig directory. For example, for VS2008 you would run:
-
-  > patch -p0 < ..\noconfig\vc2008.dif
-
-  and for C++Builder 2010 you would run:
-
-  > patch -p0 < ..\noconfig\bc59.dif
-
-- Microsoft Visual C++: 
- 
-  Build the mcpp release library:
-
-  > nmake MCPP_LIB=1 /f ..\noconfig\visualc.mak mcpplib
-
-  To build the debug version of the library:
-
-  > nmake MCPP_LIB=1 DEBUG=1 /f ..\noconfig\visualc.mak mcpplib
-
-- CodeGear C++Builder: 
-
-  Build the mcpp library:
-
-  > make -DMCPP_LIB -f..\noconfig\borlandc.mak mcpplib
+======================================================================

+Third Party Packages

+======================================================================

+

+Introduction

+------------

+

+This archive contains the source code distributions, including any

+source patches, for the third-party packages required to build Ice on

+Windows.

+

+This document provides instructions for applying patches and important

+information about building the third-party packages. Note that you do

+not need to build these packages yourself, as ZeroC supplies a Windows

+installer that contains release and debug libraries for all of the

+third-party dependencies. The installer is available at

+

+  http://www.zeroc.com/download.html

+

+If you prefer to compile the third-party packages from source code, we

+recommend that you use the same Visual C++ version to build all of the

+packages. You will need a utility such as WinZip to extract the

+source code distributions.

+

+For more information about the third-party dependencies, please refer

+to the links below:

+

+STLport        http://www.stlport.org

+Berkeley DB    http://www.oracle.com/database/berkeley-db/index.html

+expat          http://expat.sourceforge.net

+OpenSSL        http://www.openssl.org

+bzip2          http://sources.redhat.com/bzip2

+mcpp           http://mcpp.sourceforge.net

+

+

+Table of Contents

+-----------------

+

+  1. Patches

+     - bzip2

+     - Berkeley DB

+     - mcpp

+  2. Packages

+     - STLport

+     - Berkeley DB

+     - expat

+     - OpenSSL

+     - bzip2

+     - mcpp

+

+

+======================================================================

+1. Patches

+======================================================================

+

+Applying patches requires the "patch" utility. You can download a

+Windows executable from the following location:

+

+  http://gnuwin32.sourceforge.net/packages/patch.htm

+

+

+bzip2

+-----

+

+The bzip2-1.0.5 distribution does not directly support creating DLLs.

+The file bzlib.patch in this archive contains a patch for bzlib.h that

+allows bzip2 to be compiled into a DLL.

+

+After extracting the bzip2 source distribution, change to the

+top-level directory and apply the patch as shown below:

+

+  > patch -p0 bzlib.h < ..\bzip2\bzlib.patch

+

+

+Berkeley DB

+-----------

+

+The file db/patch.4.8.24.17646 in this archive contains an important

+fix for Berkeley DB required by Ice. 

+

+After extracting the Berkeley DB 4.8.24 source distribution, change 

+to the top-level directory and apply the patches as shown below:

+

+ > cd db-4.8.24

+ > patch -p0 < patch.db-4.8.24.17646

+

+

+mcpp

+----

+

+The file mcpp/patch.mcpp.2.7.2 in this archive contains several

+important fixes required by Ice. We expect that these changes will be

+included in a future release of mcpp.

+

+After extracting the mcpp source distribution, change to the top-level

+directory and apply the patch as shown below:

+

+  > cd mcpp-2.7.2

+  > patch -p0 < patch.mcpp.2.7.2

+

+

+======================================================================

+2. Packages

+======================================================================

+

+

+STLport

+-------

+

+STLport is only required when using Visual C++ 6.0. For installation

+instructions, please refer to

+

+  http://www.stlport.org/doc/install.html

+

+

+Berkeley DB

+-----------

+

+When building the debug version of the Berkeley DB DLL (db_dll

+project), you should remove the "DIAGNOSTIC" and "CONFIG_TEST" defines

+and the /export:__db_assert linker option. Without these modifications,

+database environments created by the debug DLL are not compatible with

+environments created by the release DLL.

+

+For installation instructions, please refer to

+

+  http://www.oracle.com/technology/documentation/berkeley-db/db/ref/build_win/intro.html

+

+

+expat

+-----

+

+Use the provided expat binary installer to install expat in the

+directory of your choice. The installer includes binaries as well as

+source code.

+

+

+OpenSSL

+-------

+

+After extracting the OpenSSL source archive, refer to the file

+INSTALL.W32 or INSTALL.W64 for build instructions.

+

+For Visual C++ 6.0, you should use the replacement makefile included

+in this archive:

+

+  > nmake /f ..\openssl\ntdll.mak

+

+For 64-bit builds it is also necessary to remove references to

+libbufferoverflowu.lib from ms\ntdll.mak before running nmake.

+

+

+bzip2

+-----

+

+If you have not already applied the patch for bzip2, please read the

+"Patches" section above before continuing.

+

+To build bzip2, change to the source directory and use the replacement

+makefile included in this archive:

+

+  > nmake /f ..\bzip2\Makefile.mak

+

+This will build the release and debug versions of the bzip2 DLLs. If

+you are using Visual C++ 6.0, first set the CPP_COMPILER environment

+variable as shown below:

+

+  > set CPP_COMPILER=VC60

+

+

+mcpp

+----

+

+Follow these instructions for building mcpp:

+

+- Change to the mcpp src directory:

+

+  > cd mcpp-2.7.2\src

+

+- Apply the patch for noconfig.H appropriate for your compiler from

+  the noconfig directory. For example, for VS2008 you would run:

+

+  > patch -p0 < ..\noconfig\vc2008.dif

+

+  and for C++Builder 2010 you would run:

+

+  > patch -p0 < ..\noconfig\bc59.dif

+

+- Microsoft Visual C++: 

+ 

+  Build the mcpp release library:

+

+  > nmake MCPP_LIB=1 /f ..\noconfig\visualc.mak mcpplib

+

+  To build the debug version of the library:

+

+  > nmake MCPP_LIB=1 DEBUG=1 /f ..\noconfig\visualc.mak mcpplib

+

+- CodeGear C++Builder: 

+

+  Build the mcpp library:

+

+  > make -DMCPP_LIB -f..\noconfig\borlandc.mak mcpplib

diff --git a/distribution/src/windows/actions/icegridregistry.vbs b/distribution/src/windows/actions/icegridregistry.vbs
index 3159f474e4d..6ddbdb98542 100644
--- a/distribution/src/windows/actions/icegridregistry.vbs
+++ b/distribution/src/windows/actions/icegridregistry.vbs
@@ -1,28 +1,28 @@
-Const ForReading = 1, ForWriting = 2, ForAppending =8

-

-Dim fso

-Dim installDir

-Dim fileName

-Dim file

-Dim tmpFileName

-Dim tmpFile

-Dim nextLine

-

-installDir = Session.Property("CustomActionData")

-fileName = installDir & "config\icegridregistry.cfg"

-tmpFileName = configFile & ".tmp"

-

-Set fso = CreateObject("Scripting.FileSystemObject")

-Set file = fso.OpenTextFile(fileName, ForReading, True)

-Set tmpFile = fso.OpenTextFile(tmpFileName, ForWriting, True)

-

-Do Until file.AtEndOfStream

-   nextLine = file.ReadLine

-   tmpFile.WriteLine Replace(nextLine, "@installdir@\", installDir)

-Loop

-

-file.Close

-tmpFile.Close

-

-fso.DeleteFile fileName

-fso.MoveFile tmpFileName, fileName

+Const ForReading = 1, ForWriting = 2, ForAppending =8
+
+Dim fso
+Dim installDir
+Dim fileName
+Dim file
+Dim tmpFileName
+Dim tmpFile
+Dim nextLine
+
+installDir = Session.Property("CustomActionData")
+fileName = installDir & "config\icegridregistry.cfg"
+tmpFileName = configFile & ".tmp"
+
+Set fso = CreateObject("Scripting.FileSystemObject")
+Set file = fso.OpenTextFile(fileName, ForReading, True)
+Set tmpFile = fso.OpenTextFile(tmpFileName, ForWriting, True)
+
+Do Until file.AtEndOfStream
+   nextLine = file.ReadLine
+   tmpFile.WriteLine Replace(nextLine, "@installdir@\", installDir)
+Loop
+
+file.Close
+tmpFile.Close
+
+fso.DeleteFile fileName
+fso.MoveFile tmpFileName, fileName
diff --git a/distribution/src/windows/actions/vsplugin.vbs b/distribution/src/windows/actions/vsplugin.vbs
index 27fabb34e1c..115751fc4ad 100644
--- a/distribution/src/windows/actions/vsplugin.vbs
+++ b/distribution/src/windows/actions/vsplugin.vbs
@@ -1,11 +1,11 @@
-

-Dim vs2008CsPath

-Dim vs2008CppPath

-

-

-vs2008CsPath = Session.Property("VS_2008_CS_TEMPLATE_DIR")

-vs2008CppPath = Session.Property("VS_2008_CPP_TEMPLATE_DIR")

-

-

-Session.Property("VS_2008_CS_TEMPLATE_DIR_MOD") = Replace(vs2008CsPath, "\.\", "\")

-Session.Property("VS_2008_CPP_TEMPLATE_DIR_MOD") = Replace(vs2008CppPath, "\.\", "\")

+
+Dim vs2008CsPath
+Dim vs2008CppPath
+
+
+vs2008CsPath = Session.Property("VS_2008_CS_TEMPLATE_DIR")
+vs2008CppPath = Session.Property("VS_2008_CPP_TEMPLATE_DIR")
+
+
+Session.Property("VS_2008_CS_TEMPLATE_DIR_MOD") = Replace(vs2008CsPath, "\.\", "\")
+Session.Property("VS_2008_CPP_TEMPLATE_DIR_MOD") = Replace(vs2008CppPath, "\.\", "\")
diff --git a/distribution/src/windows/docs/rtf.footer b/distribution/src/windows/docs/rtf.footer
index 80511256b5a..4bc13a3f63a 100755
--- a/distribution/src/windows/docs/rtf.footer
+++ b/distribution/src/windows/docs/rtf.footer
@@ -1,2 +1,2 @@
-\par

-}

+\par
+}
diff --git a/distribution/src/windows/docs/rtf.hdr b/distribution/src/windows/docs/rtf.hdr
index cb78d1e91c6..9261acae0b9 100755
--- a/distribution/src/windows/docs/rtf.hdr
+++ b/distribution/src/windows/docs/rtf.hdr
@@ -1,2 +1,2 @@
-{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Lucida Sans Unicode;}}

-{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\lang1033\f0\fs14 

+{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Lucida Sans Unicode;}}
+{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\lang1033\f0\fs14 
diff --git a/java/resources/IceGridAdmin/IceGridAdmin_popup_html.js b/java/resources/IceGridAdmin/IceGridAdmin_popup_html.js
index 0a7a3b78710..a745239e754 100644
--- a/java/resources/IceGridAdmin/IceGridAdmin_popup_html.js
+++ b/java/resources/IceGridAdmin/IceGridAdmin_popup_html.js
@@ -1,40 +1,40 @@
-/* --- Script © 2005-2007 EC Software --- */

-var ua = navigator.userAgent;

-var dom = (document.getElementById) ? true : false;

-var ie4 = (document.all && !dom) ? true : false;

-var ie5_5 = ((ua.indexOf("MSIE 5.5")>=0 || ua.indexOf("MSIE 6")>=0) && ua.indexOf("Opera")<0) ? true : false;

-var ns4 = (document.layers && !dom) ? true : false;

-var offsxy = 6;

-function hmshowPopup(e, txt, stick) {

-  var tip = '<table  border="1" cellpadding="3" cellspacing="0" bgcolor="#FFFFFF" style="{border-width:1px; border-color:#FF0000; border-collapse:collapse;}"><tr valign=top><td>'+ txt + '<\/td><\/tr><\/table>';

-  var tooltip = atooltip();

-  e = e?e:window.event;

-  var mx = ns4 ? e.PageX : e.clientX;

-  var my = ns4 ? e.PageY : e.clientY;

-  var obj   = (window.document.compatMode && window.document.compatMode == "CSS1Compat") ? window.document.documentElement : window.document.body;

-  var bodyl = (window.pageXOffset) ? window.pageXOffset : obj.scrollLeft;

-  var bodyt = (window.pageYOffset) ? window.pageYOffset : obj.scrollTop;

-  var bodyw = (window.innerWidth)  ? window.innerWidth  : obj.offsetWidth;

-  if (ns4) {

-    tooltip.document.write(tip);

-    tooltip.document.close();

-    if ((mx + offsxy + bodyl + tooltip.width) > bodyw) { mx = bodyw - offsxy - bodyl - tooltip.width; if (mx < 0) mx = 0; }

-    tooltip.left = mx + offsxy + bodyl;

-    tooltip.top = my + offsxy + bodyt;

-  }

-  else {

-    tooltip.innerHTML = tip;

-    if (tooltip.offsetWidth) if ((mx + offsxy + bodyl + tooltip.offsetWidth) > bodyw) { mx = bodyw - offsxy - bodyl - tooltip.offsetWidth; if (mx < 0) mx = 0; }

-    tooltip.style.left = (mx + offsxy + bodyl)+"px";

-    tooltip.style.top  = (my + offsxy + bodyt)+"px";

-  }

-  with(tooltip) { ns4 ? visibility="show" : style.visibility="visible" }

-  if (stick) document.onmouseup = hmhidePopup;

-}

-function hmhidePopup() {

-  var tooltip = atooltip();

-  ns4 ? tooltip.visibility="hide" : tooltip.style.visibility="hidden";

-}

-function atooltip(){

- return ns4 ? document.hmpopupDiv : ie4 ? document.all.hmpopupDiv : document.getElementById('hmpopupDiv')

-}

+/* --- Script © 2005-2007 EC Software --- */
+var ua = navigator.userAgent;
+var dom = (document.getElementById) ? true : false;
+var ie4 = (document.all && !dom) ? true : false;
+var ie5_5 = ((ua.indexOf("MSIE 5.5")>=0 || ua.indexOf("MSIE 6")>=0) && ua.indexOf("Opera")<0) ? true : false;
+var ns4 = (document.layers && !dom) ? true : false;
+var offsxy = 6;
+function hmshowPopup(e, txt, stick) {
+  var tip = '<table  border="1" cellpadding="3" cellspacing="0" bgcolor="#FFFFFF" style="{border-width:1px; border-color:#FF0000; border-collapse:collapse;}"><tr valign=top><td>'+ txt + '<\/td><\/tr><\/table>';
+  var tooltip = atooltip();
+  e = e?e:window.event;
+  var mx = ns4 ? e.PageX : e.clientX;
+  var my = ns4 ? e.PageY : e.clientY;
+  var obj   = (window.document.compatMode && window.document.compatMode == "CSS1Compat") ? window.document.documentElement : window.document.body;
+  var bodyl = (window.pageXOffset) ? window.pageXOffset : obj.scrollLeft;
+  var bodyt = (window.pageYOffset) ? window.pageYOffset : obj.scrollTop;
+  var bodyw = (window.innerWidth)  ? window.innerWidth  : obj.offsetWidth;
+  if (ns4) {
+    tooltip.document.write(tip);
+    tooltip.document.close();
+    if ((mx + offsxy + bodyl + tooltip.width) > bodyw) { mx = bodyw - offsxy - bodyl - tooltip.width; if (mx < 0) mx = 0; }
+    tooltip.left = mx + offsxy + bodyl;
+    tooltip.top = my + offsxy + bodyt;
+  }
+  else {
+    tooltip.innerHTML = tip;
+    if (tooltip.offsetWidth) if ((mx + offsxy + bodyl + tooltip.offsetWidth) > bodyw) { mx = bodyw - offsxy - bodyl - tooltip.offsetWidth; if (mx < 0) mx = 0; }
+    tooltip.style.left = (mx + offsxy + bodyl)+"px";
+    tooltip.style.top  = (my + offsxy + bodyt)+"px";
+  }
+  with(tooltip) { ns4 ? visibility="show" : style.visibility="visible" }
+  if (stick) document.onmouseup = hmhidePopup;
+}
+function hmhidePopup() {
+  var tooltip = atooltip();
+  ns4 ? tooltip.visibility="hide" : tooltip.style.visibility="hidden";
+}
+function atooltip(){
+ return ns4 ? document.hmpopupDiv : ie4 ? document.all.hmpopupDiv : document.getElementById('hmpopupDiv')
+}
diff --git a/java/resources/IceGridAdmin/adapter.htm b/java/resources/IceGridAdmin/adapter.htm
index 6fbfb46e0c3..e62e118379b 100644
--- a/java/resources/IceGridAdmin/adapter.htm
+++ b/java/resources/IceGridAdmin/adapter.htm
@@ -1,151 +1,151 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?adapter.htm"; }

-  else { parent.lazysync('adapter.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Adapter</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Ice::Process,Adapter">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="runtime_components.htm">Runtime Components</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Adapter</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="server.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="runtime_components.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="dbenv.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>An adapter represents an Ice object adapter described in the IceGrid registry that resides in a server or an IceBox service. Note that direct object adapters are not displayed since IceGrid knows nothing about them.</p>

-<p class="p_Heading2"><span class="f_Heading2">States</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">An adapter can be either active (<img src="adapter_active.png" width="16" height="16" border="0" alt="">) or inactive (<img src="adapter_inactive.png" width="16" height="16" border="0" alt="">).</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Adapter Properties panel shows:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Status</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The status of this object adapter: Active or Inactive.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Published Endpoints</span></p>

-<p class="p_IndentList3"><span class="f_IndentList2">The endpoints that this object adapter has registered with the IceGrid registry. Blank when the adapter's status is Inactive.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this adapter.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Adapter ID</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">This object adapter's ID. Adapter IDs are unique within an IceGrid deployment.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Replica Group</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When this adapter belongs to a replica group, shows the replica group ID. Blank otherwise.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Priority</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The adapter's priority. Used only when the adapter belongs to a replica group with the &quot;Ordered&quot; load balancing policy.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Endpoints</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The </span><span class="f_T_Code">Endpoints</span><span class="f_IndentList3"> configuration property of this object adapter.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Published Endpoints</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The </span><span class="f_T_Code">PublishedEndpoints</span><span class="f_IndentList3"> configuration property of this object adapter.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Register Process</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When the </span><span class="f_T_Entry">Register Process</span><span class="f_IndentList3"> checkbox is checked, this object adapter will register an </span><span class="f_T_Code">Ice::Process</span><span class="f_IndentList3"> object with IceGrid upon activation. This setting is meaningful only for servers with an Ice version less than 3.3.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Server Lifetime</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When the </span><span class="f_T_Entry">Server Lifetime</span><span class="f_IndentList3"> checkbox is checked, IceGrid considers that this object adapter is activated when the server starts up and deactivated when the server shuts down. This allows IceGrid to detect when a server is fully activated (all its object adapters with a server-lifetime have registered) and when a server is shutting down (at least one object adapter with server-lifetime has unregistered). </span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Well-known Objects</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The well-known objects defined by this object adapter.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Allocatable &nbsp;Objects</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The well-known objects defined by this object adapter.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">&nbsp;</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?adapter.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?adapter.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?adapter.htm"; }
+  else { parent.lazysync('adapter.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Adapter</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Ice::Process,Adapter">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="runtime_components.htm">Runtime Components</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Adapter</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="server.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="runtime_components.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="dbenv.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>An adapter represents an Ice object adapter described in the IceGrid registry that resides in a server or an IceBox service. Note that direct object adapters are not displayed since IceGrid knows nothing about them.</p>
+<p class="p_Heading2"><span class="f_Heading2">States</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">An adapter can be either active (<img src="adapter_active.png" width="16" height="16" border="0" alt="">) or inactive (<img src="adapter_inactive.png" width="16" height="16" border="0" alt="">).</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Adapter Properties panel shows:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Status</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The status of this object adapter: Active or Inactive.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Published Endpoints</span></p>
+<p class="p_IndentList3"><span class="f_IndentList2">The endpoints that this object adapter has registered with the IceGrid registry. Blank when the adapter's status is Inactive.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this adapter.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Adapter ID</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">This object adapter's ID. Adapter IDs are unique within an IceGrid deployment.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Replica Group</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When this adapter belongs to a replica group, shows the replica group ID. Blank otherwise.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Priority</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The adapter's priority. Used only when the adapter belongs to a replica group with the &quot;Ordered&quot; load balancing policy.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Endpoints</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The </span><span class="f_T_Code">Endpoints</span><span class="f_IndentList3"> configuration property of this object adapter.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Published Endpoints</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The </span><span class="f_T_Code">PublishedEndpoints</span><span class="f_IndentList3"> configuration property of this object adapter.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Register Process</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When the </span><span class="f_T_Entry">Register Process</span><span class="f_IndentList3"> checkbox is checked, this object adapter will register an </span><span class="f_T_Code">Ice::Process</span><span class="f_IndentList3"> object with IceGrid upon activation. This setting is meaningful only for servers with an Ice version less than 3.3.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Server Lifetime</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When the </span><span class="f_T_Entry">Server Lifetime</span><span class="f_IndentList3"> checkbox is checked, IceGrid considers that this object adapter is activated when the server starts up and deactivated when the server shuts down. This allows IceGrid to detect when a server is fully activated (all its object adapters with a server-lifetime have registered) and when a server is shutting down (at least one object adapter with server-lifetime has unregistered). </span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Well-known Objects</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The well-known objects defined by this object adapter.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Allocatable &nbsp;Objects</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The well-known objects defined by this object adapter.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">&nbsp;</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?adapter.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?adapter.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_adapter.htm b/java/resources/IceGridAdmin/app_adapter.htm
index 5480045d620..be8e97ceb2a 100644
--- a/java/resources/IceGridAdmin/app_adapter.htm
+++ b/java/resources/IceGridAdmin/app_adapter.htm
@@ -1,148 +1,148 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_adapter.htm"; }

-  else { parent.lazysync('app_adapter.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Adapter</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Activation Timeout,Ice::Process">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Adapter</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_server_instance.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_descriptors.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_dbenv.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>Each indirect object adapter registered with IceGrid requires its own Adapter descriptor. If you need to specify a direct adapter, simply create a number of Ice properties in your server.</p>

-<p><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Adapter Properties panel offers the following fields:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Adapter Name</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The name of the object adapter. This name must be unique within the enclosing Ice communicator, and is only used to lookup adapter properties.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this object adapter.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Adapter ID</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The ID of the object adapter. This ID must be unique within an IceGrid deployment. Default value: </span><span class="f_T_Code">${server}.</span><span class="f_T_Code" style="font-style: italic;">adapter-name</span><span class="f_IndentList3">.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Replica Group</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The ID of this adapter's <a href="app_replica__group.htm">Replica Group</a>. By default, an adapter does not belong to any replica group.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Priority</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The adapter priority in its <a href="app_replica__group.htm">Replica Group</a>. The default priority is 0.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Endpoints</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The configured endpoints for this object adapter. Corresponds to the </span><span class="f_T_Code" style="font-style: italic;">adapter-name</span><span class="f_T_Code">.Endpoints</span><span class="f_IndentList3"> property. Default: default, which means listen using the default protocol (tcp by default) on an OS assigned port, on all interfaces.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Published Endpoints</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The configured published endpoints for this object adapter. Corresponds to the </span><span class="f_T_Code" style="font-style: italic;">adapter-name</span><span class="f_T_Code">.PublishedEndpoints</span><span class="f_IndentList3"> property. Default: Actual endpoints, derived by Ice from the </span><span class="f_T_Entry">Endpoints</span><span class="f_IndentList3"> field above.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Register Process</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">This setting is ignored for servers running Ice version 3.3 or greater.</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When checked, this adapter will create and register an </span><span class="f_T_Code">Ice::Process</span><span class="f_IndentList3"> object with IceGrid during activation. Such object is used to cleanly shutdown the server from IceGrid. Each server should register one, and only one such </span><span class="f_T_Code">Ice::Process</span><span class="f_IndentList3"> object.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Server Lifetime</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When checked, IceGrid expects this adapter to register its endpoints during server startup and unregister them during server shutdown. See also Activation Timeout. Default: true (checked).</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Well-known Objects</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A table of well-known objects defined by this adapter. When </span><span class="f_T_Entry">Property</span><span class="f_IndentList3"> is set, IceGrid generates a property with this name and with </span><span class="f_T_Entry">Identity</span><span class="f_IndentList3"> as value.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Allocatable Objects</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A table of allocatable objects defined by this adapter. When </span><span class="f_T_Entry">Property</span><span class="f_IndentList3"> is set, IceGrid generates a property with this name and with </span><span class="f_T_Entry">Identity</span><span class="f_IndentList3"> as value.</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">&nbsp;</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_adapter.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_adapter.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_adapter.htm"; }
+  else { parent.lazysync('app_adapter.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Adapter</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Activation Timeout,Ice::Process">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Adapter</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_server_instance.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_descriptors.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_dbenv.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>Each indirect object adapter registered with IceGrid requires its own Adapter descriptor. If you need to specify a direct adapter, simply create a number of Ice properties in your server.</p>
+<p><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Adapter Properties panel offers the following fields:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Adapter Name</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The name of the object adapter. This name must be unique within the enclosing Ice communicator, and is only used to lookup adapter properties.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this object adapter.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Adapter ID</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The ID of the object adapter. This ID must be unique within an IceGrid deployment. Default value: </span><span class="f_T_Code">${server}.</span><span class="f_T_Code" style="font-style: italic;">adapter-name</span><span class="f_IndentList3">.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Replica Group</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The ID of this adapter's <a href="app_replica__group.htm">Replica Group</a>. By default, an adapter does not belong to any replica group.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Priority</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The adapter priority in its <a href="app_replica__group.htm">Replica Group</a>. The default priority is 0.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Endpoints</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The configured endpoints for this object adapter. Corresponds to the </span><span class="f_T_Code" style="font-style: italic;">adapter-name</span><span class="f_T_Code">.Endpoints</span><span class="f_IndentList3"> property. Default: default, which means listen using the default protocol (tcp by default) on an OS assigned port, on all interfaces.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Published Endpoints</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The configured published endpoints for this object adapter. Corresponds to the </span><span class="f_T_Code" style="font-style: italic;">adapter-name</span><span class="f_T_Code">.PublishedEndpoints</span><span class="f_IndentList3"> property. Default: Actual endpoints, derived by Ice from the </span><span class="f_T_Entry">Endpoints</span><span class="f_IndentList3"> field above.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Register Process</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">This setting is ignored for servers running Ice version 3.3 or greater.</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When checked, this adapter will create and register an </span><span class="f_T_Code">Ice::Process</span><span class="f_IndentList3"> object with IceGrid during activation. Such object is used to cleanly shutdown the server from IceGrid. Each server should register one, and only one such </span><span class="f_T_Code">Ice::Process</span><span class="f_IndentList3"> object.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Server Lifetime</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When checked, IceGrid expects this adapter to register its endpoints during server startup and unregister them during server shutdown. See also Activation Timeout. Default: true (checked).</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Well-known Objects</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A table of well-known objects defined by this adapter. When </span><span class="f_T_Entry">Property</span><span class="f_IndentList3"> is set, IceGrid generates a property with this name and with </span><span class="f_T_Entry">Identity</span><span class="f_IndentList3"> as value.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Allocatable Objects</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A table of allocatable objects defined by this adapter. When </span><span class="f_T_Entry">Property</span><span class="f_IndentList3"> is set, IceGrid generates a property with this name and with </span><span class="f_T_Entry">Identity</span><span class="f_IndentList3"> as value.</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">&nbsp;</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_adapter.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_adapter.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_application.htm b/java/resources/IceGridAdmin/app_application.htm
index 3b935d075f0..91b8027199d 100644
--- a/java/resources/IceGridAdmin/app_application.htm
+++ b/java/resources/IceGridAdmin/app_application.htm
@@ -1,138 +1,138 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_application.htm"; }

-  else { parent.lazysync('app_application.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Application</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Application</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_descriptors.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_descriptors.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_node.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p class="p_Heading2"><span class="f_Heading2">Creating a new Application</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">You can create a new application using</span><span class="f_T_Menu"> File &gt; New Application</span><span class="f_IndentList2">: this opens a new Application pane, with an empty application definition.</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">When you are connected to an IceGrid registry, you can also use</span><span class="f_T_Menu"> File &gt; New Application with Default Templates from Registry</span><span class="f_IndentList2">. This also opens new Application pane with a brand new application definition. This new application contains a copy of all the templates definitions contained in the IceGrid registry default template file. See </span><span class="f_T_Code">IceGrid.Registry.DefaultTemplates</span><span class="f_IndentList2"> in the <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://www.zeroc.com/doc/Ice-3.4.0/manual/" target="_blank" class="weblink" title="Distributed Programming with Ice">Ice manual</a>.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Application Properties panel offers the following fields:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Name</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The name of the application. This field is not editable for live applications.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this application.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Variables</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">This table shows application-level IceGrid variables. See <a href="app_variables.htm">Variables</a>.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">IcePatch2 Proxy</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A stringified (or well-known) proxy for the IcePatch2 server than contains this application's distribution. Possible values:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">&quot;None selected&quot; (default) or blank: no distribution defined</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_T_Code">${application}.IcePatch2/server</span><span class="f_IndentList3">: corresponds to the well-known proxy of an IcePatch2 server deployed in this application using the IcePatch2 default server-template (with a default instance-name parameter value).</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">Your own value</span></td></tr></table></div><p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Directories</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">List of directories included in the application distribution. When blank, the entire IcePatch2 server repository is used as the distribution.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Children</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">An application node can have five types of children:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_node.htm">Node</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_property_set.htm">Property Set</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_replica__group.htm">Replica Group</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_server_template.htm">Server Template</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_service_template.htm">Service Template</a></span></td></tr></table></div>

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_application.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_application.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_application.htm"; }
+  else { parent.lazysync('app_application.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Application</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Application</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_descriptors.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_descriptors.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_node.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p class="p_Heading2"><span class="f_Heading2">Creating a new Application</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">You can create a new application using</span><span class="f_T_Menu"> File &gt; New Application</span><span class="f_IndentList2">: this opens a new Application pane, with an empty application definition.</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">When you are connected to an IceGrid registry, you can also use</span><span class="f_T_Menu"> File &gt; New Application with Default Templates from Registry</span><span class="f_IndentList2">. This also opens new Application pane with a brand new application definition. This new application contains a copy of all the templates definitions contained in the IceGrid registry default template file. See </span><span class="f_T_Code">IceGrid.Registry.DefaultTemplates</span><span class="f_IndentList2"> in the <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://www.zeroc.com/doc/Ice-3.4.0/manual/" target="_blank" class="weblink" title="Distributed Programming with Ice">Ice manual</a>.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Application Properties panel offers the following fields:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Name</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The name of the application. This field is not editable for live applications.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this application.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Variables</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">This table shows application-level IceGrid variables. See <a href="app_variables.htm">Variables</a>.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">IcePatch2 Proxy</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A stringified (or well-known) proxy for the IcePatch2 server than contains this application's distribution. Possible values:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">&quot;None selected&quot; (default) or blank: no distribution defined</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_T_Code">${application}.IcePatch2/server</span><span class="f_IndentList3">: corresponds to the well-known proxy of an IcePatch2 server deployed in this application using the IcePatch2 default server-template (with a default instance-name parameter value).</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">Your own value</span></td></tr></table></div><p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Directories</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">List of directories included in the application distribution. When blank, the entire IcePatch2 server repository is used as the distribution.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Children</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">An application node can have five types of children:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_node.htm">Node</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_property_set.htm">Property Set</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_replica__group.htm">Replica Group</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_server_template.htm">Server Template</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_service_template.htm">Service Template</a></span></td></tr></table></div>
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_application.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_application.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_copy__paste.htm b/java/resources/IceGridAdmin/app_copy__paste.htm
index dbeb0ea6e04..399f5af5c49 100644
--- a/java/resources/IceGridAdmin/app_copy__paste.htm
+++ b/java/resources/IceGridAdmin/app_copy__paste.htm
@@ -1,125 +1,125 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_copy__paste.htm"; }

-  else { parent.lazysync('app_copy__paste.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Copy &amp; Paste</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_editing_and_saving.htm">Editing &amp; Saving</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Copy &amp; Paste</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_editing_and_saving.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_editing_and_saving.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_navigation.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>Most descriptor sub-trees can be copied and later pasted. Copies are always deep-copies: for example if you copy a node, all the servers on this code are copied, including all the the sub-elements of these servers (object adapters, database environment, services, etc.).</p>

-<p class="p_IndentList2"><img src="copy-paste.png" width="287" height="259" border="0" alt=""></p>

-<p>After pasting a sub-tree, you typically need to check and edit the new elements to avoid any duplicate server IDs, adapter IDs etc.</p>

-<p>&nbsp;</p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_copy__paste.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_copy__paste.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_copy__paste.htm"; }
+  else { parent.lazysync('app_copy__paste.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Copy &amp; Paste</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_editing_and_saving.htm">Editing &amp; Saving</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Copy &amp; Paste</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_editing_and_saving.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_editing_and_saving.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_navigation.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>Most descriptor sub-trees can be copied and later pasted. Copies are always deep-copies: for example if you copy a node, all the servers on this code are copied, including all the the sub-elements of these servers (object adapters, database environment, services, etc.).</p>
+<p class="p_IndentList2"><img src="copy-paste.png" width="287" height="259" border="0" alt=""></p>
+<p>After pasting a sub-tree, you typically need to check and edit the new elements to avoid any duplicate server IDs, adapter IDs etc.</p>
+<p>&nbsp;</p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_copy__paste.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_copy__paste.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_dbenv.htm b/java/resources/IceGridAdmin/app_dbenv.htm
index 5a7684f26b2..4193a5a70b4 100644
--- a/java/resources/IceGridAdmin/app_dbenv.htm
+++ b/java/resources/IceGridAdmin/app_dbenv.htm
@@ -1,131 +1,131 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_dbenv.htm"; }

-  else { parent.lazysync('app_dbenv.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Database Environment</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="DB Home">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Database Environment</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_adapter.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_descriptors.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_service.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Database Environment Properties panel offers the following fields:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Name</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The name of the Freeze Database Environment. This name must be unique within the enclosing Ice communicator.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this database environment.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">DB Home</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The path of the home directory of the Berkeley DB environment. The default is &quot;Created by the IceGrid Node&quot;: when selected, IceGrid node creates automatically a directory in its local server tree. Otherwise, if you enter your own value, the path must exist: IceGrid node will not create it if it does not.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">This table shows a list of Berkeley DB properties for this database environment. These are not Ice properties! IceGrid generates a DB_CONFIG file in the </span><span class="f_T_Entry">DB Home</span><span class="f_IndentList3"> directory with these settings.</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_dbenv.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_dbenv.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_dbenv.htm"; }
+  else { parent.lazysync('app_dbenv.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Database Environment</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="DB Home">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Database Environment</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_adapter.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_descriptors.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_service.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Database Environment Properties panel offers the following fields:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Name</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The name of the Freeze Database Environment. This name must be unique within the enclosing Ice communicator.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this database environment.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">DB Home</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The path of the home directory of the Berkeley DB environment. The default is &quot;Created by the IceGrid Node&quot;: when selected, IceGrid node creates automatically a directory in its local server tree. Otherwise, if you enter your own value, the path must exist: IceGrid node will not create it if it does not.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">This table shows a list of Berkeley DB properties for this database environment. These are not Ice properties! IceGrid generates a DB_CONFIG file in the </span><span class="f_T_Entry">DB Home</span><span class="f_IndentList3"> directory with these settings.</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_dbenv.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_dbenv.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_descriptors.htm b/java/resources/IceGridAdmin/app_descriptors.htm
index 0a9ddc4b27a..48680b61201 100644
--- a/java/resources/IceGridAdmin/app_descriptors.htm
+++ b/java/resources/IceGridAdmin/app_descriptors.htm
@@ -1,125 +1,125 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_descriptors.htm"; }

-  else { parent.lazysync('app_descriptors.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Descriptors</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Descriptors</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_variables.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="application.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_application.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>An application definition is described using one application descriptor with a number of nested sub-descriptors (and sub-sub descriptors). The descriptors correspond to Slice types in the IceGrid registry interfaces, and to XML element in an IceGrid XML representation.</p>

-<p>IceGrid Admin maps these descriptors to nodes on a tree representation:</p>

-<p class="p_IndentList2"><img src="application-tree.png" width="210" height="270" border="0" alt=""></p>

-<p>&nbsp;</p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_descriptors.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_descriptors.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_descriptors.htm"; }
+  else { parent.lazysync('app_descriptors.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Descriptors</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Descriptors</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_variables.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="application.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_application.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>An application definition is described using one application descriptor with a number of nested sub-descriptors (and sub-sub descriptors). The descriptors correspond to Slice types in the IceGrid registry interfaces, and to XML element in an IceGrid XML representation.</p>
+<p>IceGrid Admin maps these descriptors to nodes on a tree representation:</p>
+<p class="p_IndentList2"><img src="application-tree.png" width="210" height="270" border="0" alt=""></p>
+<p>&nbsp;</p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_descriptors.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_descriptors.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_editing_and_saving.htm b/java/resources/IceGridAdmin/app_editing_and_saving.htm
index 0add991e54e..11b66ba425e 100644
--- a/java/resources/IceGridAdmin/app_editing_and_saving.htm
+++ b/java/resources/IceGridAdmin/app_editing_and_saving.htm
@@ -1,141 +1,141 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_editing_and_saving.htm"; }

-  else { parent.lazysync('app_editing_and_saving.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Editing &amp; Saving</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Editing &amp; Saving</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="application.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="application.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_copy__paste.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p class="p_Heading2"><span class="f_Heading2">Editing</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">As soon as you make any update in a form, IceGrid Admin enables two buttons at the bottom of this form: Apply and Discard.</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">If you navigate to another node without pressing Apply or Discard, the default is Apply: your changes are applied to the in-memory representation of the application definition. However these changes are not stored to the IceGrid registry or XML file until you save the application definition (see below).</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">Editing a live application (</span><img src="registry_bound_application.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">) also disconnects this application from the IceGrid registry: updates made by other users are no longer propagated to the Application tab.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Error Checking</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">IceGrid Admin performs very little error checking while you are working on an application definition. For example, you may temporarily keep several servers with the same ID, leave some parameters of a template instance unset, or use an undefined variable. All such errors are only detected when you save your application to an IceGrid registry.</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">There are nonetheless two types of constraints enforced by IceGrid Admin at all times:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">two descriptor nodes in an application pane display cannot have the same name</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">some fields (such as </span><span class="f_T_Entry">Path to Executable</span><span class="f_IndentList2"> for a server) cannot be empty.</span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">If you violate such a constraint, IceGrid Admin prevents you from applying your change. </span></p>

-<p class="p_Heading2"><span class="f_Heading2">Saving</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">You save an application definition to an IceGrid registry or an XML file with the menu item </span><span class="f_T_Menu">File &gt; Save</span><span class="f_IndentList2">, </span><span class="f_T_Menu">File &gt; Save to File</span><span class="f_IndentList2"> or </span><span class="f_T_Menu">File &gt; Save to Registry</span><span class="f_IndentList2">, or with the corresponding toolbar button.</span></p>

-<p class="p_IndentList2"><span class="f_T_Entry">Save</span><span class="f_IndentList2"> saves a live application to the IceGrid registry, and a file-bound application to its associated XML file.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Discarding Updates</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">You may discard all your updates by selecting </span><span class="f_T_Menu">File &gt; Discard Updates</span><span class="f_IndentList2"> or pressing the corresponding toolbar button. </span><span class="f_IndentList2" style="font-style: italic;">Discard Updates</span><span class="f_IndentList2"> simply reloads the application from the IceGrid registry or its associated XML file.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Concurrent Updates to the same IceGrid Registry</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">If several administrators update the same application definition concurrently, the last save will silently overwrite previous (concurrent) updates. </span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">To avoid this situation, you can acquire an exclusive write access to the IceGrid registry with</span><span class="f_T_Menu"> File &gt; Acquire Exclusive Write Access</span><span class="f_IndentList2">. After this exclusive write access is granted, any attempt by another session to save to the IceGrid registry will result in an error:</span></p>

-<p class="p_IndentList3"><img src="exclusive-write.png" width="479" height="134" border="0" alt=""></p>

-<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_editing_and_saving.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_editing_and_saving.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_editing_and_saving.htm"; }
+  else { parent.lazysync('app_editing_and_saving.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Editing &amp; Saving</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Editing &amp; Saving</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="application.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="application.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_copy__paste.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p class="p_Heading2"><span class="f_Heading2">Editing</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">As soon as you make any update in a form, IceGrid Admin enables two buttons at the bottom of this form: Apply and Discard.</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">If you navigate to another node without pressing Apply or Discard, the default is Apply: your changes are applied to the in-memory representation of the application definition. However these changes are not stored to the IceGrid registry or XML file until you save the application definition (see below).</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">Editing a live application (</span><img src="registry_bound_application.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">) also disconnects this application from the IceGrid registry: updates made by other users are no longer propagated to the Application tab.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Error Checking</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">IceGrid Admin performs very little error checking while you are working on an application definition. For example, you may temporarily keep several servers with the same ID, leave some parameters of a template instance unset, or use an undefined variable. All such errors are only detected when you save your application to an IceGrid registry.</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">There are nonetheless two types of constraints enforced by IceGrid Admin at all times:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">two descriptor nodes in an application pane display cannot have the same name</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">some fields (such as </span><span class="f_T_Entry">Path to Executable</span><span class="f_IndentList2"> for a server) cannot be empty.</span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">If you violate such a constraint, IceGrid Admin prevents you from applying your change. </span></p>
+<p class="p_Heading2"><span class="f_Heading2">Saving</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">You save an application definition to an IceGrid registry or an XML file with the menu item </span><span class="f_T_Menu">File &gt; Save</span><span class="f_IndentList2">, </span><span class="f_T_Menu">File &gt; Save to File</span><span class="f_IndentList2"> or </span><span class="f_T_Menu">File &gt; Save to Registry</span><span class="f_IndentList2">, or with the corresponding toolbar button.</span></p>
+<p class="p_IndentList2"><span class="f_T_Entry">Save</span><span class="f_IndentList2"> saves a live application to the IceGrid registry, and a file-bound application to its associated XML file.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Discarding Updates</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">You may discard all your updates by selecting </span><span class="f_T_Menu">File &gt; Discard Updates</span><span class="f_IndentList2"> or pressing the corresponding toolbar button. </span><span class="f_IndentList2" style="font-style: italic;">Discard Updates</span><span class="f_IndentList2"> simply reloads the application from the IceGrid registry or its associated XML file.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Concurrent Updates to the same IceGrid Registry</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">If several administrators update the same application definition concurrently, the last save will silently overwrite previous (concurrent) updates. </span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">To avoid this situation, you can acquire an exclusive write access to the IceGrid registry with</span><span class="f_T_Menu"> File &gt; Acquire Exclusive Write Access</span><span class="f_IndentList2">. After this exclusive write access is granted, any attempt by another session to save to the IceGrid registry will result in an error:</span></p>
+<p class="p_IndentList3"><img src="exclusive-write.png" width="479" height="134" border="0" alt=""></p>
+<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_editing_and_saving.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_editing_and_saving.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_icebox_server.htm b/java/resources/IceGridAdmin/app_icebox_server.htm
index 811dd93efb4..405737dea5c 100644
--- a/java/resources/IceGridAdmin/app_icebox_server.htm
+++ b/java/resources/IceGridAdmin/app_icebox_server.htm
@@ -1,128 +1,128 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_icebox_server.htm"; }

-  else { parent.lazysync('app_icebox_server.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>IceBox Server</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Ice::Process">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a> &gt; <a href="app_server.htm">Server</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">IceBox Server</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_plain_server.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_server.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_server_instance.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Properties panel for an IceBox server is identical to the Properties panel for a <a href="app_plain_server.htm">Plain Server</a>. </span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">When you create a new IceBox server, some properties are created automatically:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_T_Code">IceBox.InstanceName=${server}</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_T_Code">Ice.Admin.Endpoints=tcp -h 127.0.0.1</span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">The </span><span class="f_T_Code">Ice.Admin.Endpoints</span><span class="f_IndentList2"> setting enables the Admin object in the main communicator of this IceBox server. &nbsp;See </span><span class="f_T_Code">Ice.Admin.Endpoints</span><span class="f_IndentList2"> in the <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://www.zeroc.com/doc/Ice-3.4.0/manual/" target="_blank" class="weblink" title="Distributed Programming with Ice">Ice manual</a>. </span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The </span><span class="f_IndentList2" style="font-style: italic;">Path to Executable </span><span class="f_IndentList2">is typically </span><span class="f_T_Code">icebox</span><span class="f_IndentList2">, </span><span class="f_T_Code">iceboxd</span><span class="f_IndentList2"> (for a C++ IceBox), </span><span class="f_T_Code">java</span><span class="f_IndentList2"> (for a Java IceBox) or </span><span class="f_T_Code">iceboxcs</span><span class="f_IndentList2"> (for a .NET IceBox). In Java, the </span><span class="f_T_Entry">Command Arguments</span><span class="f_IndentList2"> should include the IceBox container class name, </span><span class="f_T_Code">IceBox.Server</span><span class="f_IndentList2">.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Children</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">An IceBox server can have only one type of children, <a href="app_service.htm">Service</a>.</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_icebox_server.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_icebox_server.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_icebox_server.htm"; }
+  else { parent.lazysync('app_icebox_server.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>IceBox Server</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Ice::Process">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a> &gt; <a href="app_server.htm">Server</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">IceBox Server</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_plain_server.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_server.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_server_instance.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Properties panel for an IceBox server is identical to the Properties panel for a <a href="app_plain_server.htm">Plain Server</a>. </span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">When you create a new IceBox server, some properties are created automatically:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_T_Code">IceBox.InstanceName=${server}</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_T_Code">Ice.Admin.Endpoints=tcp -h 127.0.0.1</span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">The </span><span class="f_T_Code">Ice.Admin.Endpoints</span><span class="f_IndentList2"> setting enables the Admin object in the main communicator of this IceBox server. &nbsp;See </span><span class="f_T_Code">Ice.Admin.Endpoints</span><span class="f_IndentList2"> in the <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://www.zeroc.com/doc/Ice-3.4.0/manual/" target="_blank" class="weblink" title="Distributed Programming with Ice">Ice manual</a>. </span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The </span><span class="f_IndentList2" style="font-style: italic;">Path to Executable </span><span class="f_IndentList2">is typically </span><span class="f_T_Code">icebox</span><span class="f_IndentList2">, </span><span class="f_T_Code">iceboxd</span><span class="f_IndentList2"> (for a C++ IceBox), </span><span class="f_T_Code">java</span><span class="f_IndentList2"> (for a Java IceBox) or </span><span class="f_T_Code">iceboxcs</span><span class="f_IndentList2"> (for a .NET IceBox). In Java, the </span><span class="f_T_Entry">Command Arguments</span><span class="f_IndentList2"> should include the IceBox container class name, </span><span class="f_T_Code">IceBox.Server</span><span class="f_IndentList2">.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Children</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">An IceBox server can have only one type of children, <a href="app_service.htm">Service</a>.</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_icebox_server.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_icebox_server.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_navigation.htm b/java/resources/IceGridAdmin/app_navigation.htm
index 08106b4428c..0069627c79a 100644
--- a/java/resources/IceGridAdmin/app_navigation.htm
+++ b/java/resources/IceGridAdmin/app_navigation.htm
@@ -1,125 +1,125 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_navigation.htm"; }

-  else { parent.lazysync('app_navigation.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Navigation</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Navigation</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_copy__paste.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="application.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_variables.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>Each Application pane maintains a history of the nodes you have visited in this pane. You can navigate these nodes using the <span class="f_T_Menu">View &gt; Go Back to the Previous Node</span> and <span class="f_T_Menu">View &gt; Go to the Next Node</span> menu items, or with the equivalent toolbar buttons:</p>

-<p class="p_IndentList2"><img src="prevnext.png" width="76" height="42" border="0" alt=""></p>

-<p>Also on some forms a green arrow button provides a link to another node (typically a template) in the same Application pane:</p>

-<p class="p_IndentList2"><img src="gototemplate.png" width="321" height="47" border="0" alt=""></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_navigation.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_navigation.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_navigation.htm"; }
+  else { parent.lazysync('app_navigation.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Navigation</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Navigation</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_copy__paste.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="application.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_variables.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>Each Application pane maintains a history of the nodes you have visited in this pane. You can navigate these nodes using the <span class="f_T_Menu">View &gt; Go Back to the Previous Node</span> and <span class="f_T_Menu">View &gt; Go to the Next Node</span> menu items, or with the equivalent toolbar buttons:</p>
+<p class="p_IndentList2"><img src="prevnext.png" width="76" height="42" border="0" alt=""></p>
+<p>Also on some forms a green arrow button provides a link to another node (typically a template) in the same Application pane:</p>
+<p class="p_IndentList2"><img src="gototemplate.png" width="321" height="47" border="0" alt=""></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_navigation.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_navigation.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_node.htm b/java/resources/IceGridAdmin/app_node.htm
index ead0fab75c6..2aee515b973 100644
--- a/java/resources/IceGridAdmin/app_node.htm
+++ b/java/resources/IceGridAdmin/app_node.htm
@@ -1,135 +1,135 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_node.htm"; }

-  else { parent.lazysync('app_node.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Node</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Load Factor">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Node</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_application.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_descriptors.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_server.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>A node represents an IceGrid node that starts and monitors your servers. Several applications can be deployed on the same node; &nbsp;however a node descriptor describes only the servers defined by the enclosing application.</p>

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Node Properties panel offers the following fields:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Name</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The name of the node. This name must match the </span> <span class="f_T_Code">IceGrid.Node.Name</span> configuration property of the node process.</p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this node.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Variables</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">This table shows node-level IceGrid variables. See <a href="app_variables.htm">Variables</a>.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Load Factor</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A floating point value used to compare different nodes when making a load-balancing decision based on load-average (for Linux and Unix) or CPU utilization (for Windows). See <a href="app_replica__group.htm">Replica Group</a>.</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Leaving this value blank is equivalent to the default: 1.0 on Linux and Unix, and 1.0 divided by the number of CPUs on Windows.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Children</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A node can have two types of children:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_server.htm">Server</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_property_set.htm">Property Set</a></span></td></tr></table></div>

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_node.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_node.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_node.htm"; }
+  else { parent.lazysync('app_node.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Node</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Load Factor">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Node</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_application.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_descriptors.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_server.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>A node represents an IceGrid node that starts and monitors your servers. Several applications can be deployed on the same node; &nbsp;however a node descriptor describes only the servers defined by the enclosing application.</p>
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Node Properties panel offers the following fields:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Name</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The name of the node. This name must match the </span> <span class="f_T_Code">IceGrid.Node.Name</span> configuration property of the node process.</p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this node.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Variables</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">This table shows node-level IceGrid variables. See <a href="app_variables.htm">Variables</a>.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Load Factor</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A floating point value used to compare different nodes when making a load-balancing decision based on load-average (for Linux and Unix) or CPU utilization (for Windows). See <a href="app_replica__group.htm">Replica Group</a>.</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Leaving this value blank is equivalent to the default: 1.0 on Linux and Unix, and 1.0 divided by the number of CPUs on Windows.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Children</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A node can have two types of children:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_server.htm">Server</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_property_set.htm">Property Set</a></span></td></tr></table></div>
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_node.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_node.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_plain_server.htm b/java/resources/IceGridAdmin/app_plain_server.htm
index 2f2e2563325..3d7744e3a26 100644
--- a/java/resources/IceGridAdmin/app_plain_server.htm
+++ b/java/resources/IceGridAdmin/app_plain_server.htm
@@ -1,165 +1,165 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_plain_server.htm"; }

-  else { parent.lazysync('app_plain_server.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Plain Server</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Activation Timeout">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a> &gt; <a href="app_server.htm">Server</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Plain Server</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_server.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_server.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_icebox_server.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Server Properties panel offers the following fields:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Server ID</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The ID of the server; corresponds to the </span><span class="f_T_Code">Ice.ServerID</span><span class="f_IndentList3"> property. &nbsp;Each server must have a unique ID within an IceGrid deployment.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this server.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Property Sets</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">List of property-set IDs; you refer to a property set to &quot;include&quot; all its properties in the server.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Ice properties private to this server.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Log Files</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">This table can be used to declare a number of log files used by this server. Path is the path to the log file (a relative path is relative to the IceGrid node working directory); when Property is set, IceGrid generates a property with this name and the log file path as value.</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">You declare log files to be able to conveniently retrieve them using IceGrid Admin (in the <a href="live_deployment.htm">Live Deployment</a> tab) or with the icegridadmin command-line utility.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Path to Executable</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Path to the server's executable; cannot be blank. A relative path is relative to the IceGrid node working directory.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Ice Version</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The Ice version of this server. If you don't provide a value, IceGrid assumes it's the same version as the IceGrid registry.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Working Directory</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The working directory for the server when started by the IceGrid node.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Command Arguments</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The command-line arguments given to the server when started by the IceGrid node.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Run as</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">On Linux and Unix, when IceGrid node is running as root, it is possible to run the server under any username. Enter the desired username in this field.</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When not set (the default), the server runs as the same user as the IceGrid node, except when IceGrid node runs as root. In this case, the server runs as nobody.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Environment Variables</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The environment variables for the server when started by the IceGrid node. These variables are in addition to &nbsp;variables defined in the IceGrid node own environment.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Activation Mode</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The server's activation mode. Must be one of:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">always: IceGrid node keeps this server running all the time</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">manual: this server is started &quot;manually&quot;, using IceGrid Admin or the icegridadmin command-line utility</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">on-demand: IceGrid starts this server when it resolves the object-adapter ID of an object adapter defined in this server</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">session: IceGrid starts a separate instance of this server for each IceGrid session that allocates this server </span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">a variable or combination of variables that resolves to one of the values above</span></td></tr></table></div><p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Activation Timeout</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When activating a server, IceGrid gives </span><span class="f_T_Entry">timeout</span><span class="f_IndentList3"> seconds to object adapters with server lifetime to register their endpoints with the IceGrid registry. During this time, lookup for the corresponding adapter IDs are delayed.</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">If not set or set to 0, the IceGrid node uses the value of its</span><span class="f_T_Code"> IceGrid.Node.WaitTime</span><span class="f_IndentList3"> property.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Deactivation Timeout</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When deactivating a server, IceGrid gives </span><span class="f_T_Entry">timeout</span><span class="f_IndentList3"> seconds to the server to exit gracefully. After this timeout, the server process is killed.</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">If not set or set to 0, the IceGrid node uses the value of its</span><span class="f_T_Code"> IceGrid.Node.WaitTime</span><span class="f_IndentList3"> property.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Allocatable</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Specifies whether the server can be allocated. A server is allocated implicitly when one of its allocatable objects is allocated. This checkbox is ignored if the server activation mode is session; a server with this activation mode is always allocatable. Default: false.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Depends on the application distribution</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A server that depends on the application distribution is stopped and disabled before any application distribution update, and re-enabled after such update. Default: true.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">IcePatch2 Proxy</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A stringified (or well-known) proxy for the IcePatch2 server than contains this server's private distribution. Possible values:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">&quot;None selected&quot; (default) or blank: no private distribution defined</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_T_Code">${application}.IcePatch2/server</span><span class="f_IndentList3">: corresponds to the well-known proxy of an IcePatch2 server deployed in this application using the IcePatch2 default server-template (with a default instance-name parameter value).</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">Your own value</span></td></tr></table></div><p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Directories</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">List of directories included in the server distribution. When blank, the entire IcePatch2 server repository is used as the distribution.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Children</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A plain server can have two types of children:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_adapter.htm">Adapter</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_dbenv.htm">Database Environment</a></span></td></tr></table></div>

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_plain_server.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_plain_server.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_plain_server.htm"; }
+  else { parent.lazysync('app_plain_server.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Plain Server</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Activation Timeout">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a> &gt; <a href="app_server.htm">Server</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Plain Server</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_server.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_server.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_icebox_server.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Server Properties panel offers the following fields:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Server ID</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The ID of the server; corresponds to the </span><span class="f_T_Code">Ice.ServerID</span><span class="f_IndentList3"> property. &nbsp;Each server must have a unique ID within an IceGrid deployment.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this server.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Property Sets</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">List of property-set IDs; you refer to a property set to &quot;include&quot; all its properties in the server.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Ice properties private to this server.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Log Files</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">This table can be used to declare a number of log files used by this server. Path is the path to the log file (a relative path is relative to the IceGrid node working directory); when Property is set, IceGrid generates a property with this name and the log file path as value.</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">You declare log files to be able to conveniently retrieve them using IceGrid Admin (in the <a href="live_deployment.htm">Live Deployment</a> tab) or with the icegridadmin command-line utility.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Path to Executable</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Path to the server's executable; cannot be blank. A relative path is relative to the IceGrid node working directory.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Ice Version</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The Ice version of this server. If you don't provide a value, IceGrid assumes it's the same version as the IceGrid registry.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Working Directory</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The working directory for the server when started by the IceGrid node.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Command Arguments</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The command-line arguments given to the server when started by the IceGrid node.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Run as</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">On Linux and Unix, when IceGrid node is running as root, it is possible to run the server under any username. Enter the desired username in this field.</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When not set (the default), the server runs as the same user as the IceGrid node, except when IceGrid node runs as root. In this case, the server runs as nobody.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Environment Variables</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The environment variables for the server when started by the IceGrid node. These variables are in addition to &nbsp;variables defined in the IceGrid node own environment.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Activation Mode</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The server's activation mode. Must be one of:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">always: IceGrid node keeps this server running all the time</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">manual: this server is started &quot;manually&quot;, using IceGrid Admin or the icegridadmin command-line utility</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">on-demand: IceGrid starts this server when it resolves the object-adapter ID of an object adapter defined in this server</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">session: IceGrid starts a separate instance of this server for each IceGrid session that allocates this server </span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">a variable or combination of variables that resolves to one of the values above</span></td></tr></table></div><p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Activation Timeout</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When activating a server, IceGrid gives </span><span class="f_T_Entry">timeout</span><span class="f_IndentList3"> seconds to object adapters with server lifetime to register their endpoints with the IceGrid registry. During this time, lookup for the corresponding adapter IDs are delayed.</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">If not set or set to 0, the IceGrid node uses the value of its</span><span class="f_T_Code"> IceGrid.Node.WaitTime</span><span class="f_IndentList3"> property.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Deactivation Timeout</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When deactivating a server, IceGrid gives </span><span class="f_T_Entry">timeout</span><span class="f_IndentList3"> seconds to the server to exit gracefully. After this timeout, the server process is killed.</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">If not set or set to 0, the IceGrid node uses the value of its</span><span class="f_T_Code"> IceGrid.Node.WaitTime</span><span class="f_IndentList3"> property.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Allocatable</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Specifies whether the server can be allocated. A server is allocated implicitly when one of its allocatable objects is allocated. This checkbox is ignored if the server activation mode is session; a server with this activation mode is always allocatable. Default: false.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Depends on the application distribution</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A server that depends on the application distribution is stopped and disabled before any application distribution update, and re-enabled after such update. Default: true.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">IcePatch2 Proxy</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A stringified (or well-known) proxy for the IcePatch2 server than contains this server's private distribution. Possible values:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">&quot;None selected&quot; (default) or blank: no private distribution defined</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_T_Code">${application}.IcePatch2/server</span><span class="f_IndentList3">: corresponds to the well-known proxy of an IcePatch2 server deployed in this application using the IcePatch2 default server-template (with a default instance-name parameter value).</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">Your own value</span></td></tr></table></div><p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Directories</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">List of directories included in the server distribution. When blank, the entire IcePatch2 server repository is used as the distribution.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Children</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A plain server can have two types of children:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_adapter.htm">Adapter</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_dbenv.htm">Database Environment</a></span></td></tr></table></div>
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_plain_server.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_plain_server.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_plain_service.htm b/java/resources/IceGridAdmin/app_plain_service.htm
index 4f710b1cf7a..1da090d4dc4 100644
--- a/java/resources/IceGridAdmin/app_plain_service.htm
+++ b/java/resources/IceGridAdmin/app_plain_service.htm
@@ -1,139 +1,139 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_plain_service.htm"; }

-  else { parent.lazysync('app_plain_service.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Plain Service</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a> &gt; <a href="app_service.htm">Service</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Plain Service</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_service.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_service.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_service_instance.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Service Properties panel offers the following fields:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Service Name</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The name of the service. Must be unique within the enclosing IceBox server.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this service.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Property Sets</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">List of property-set IDs; you refer to a property set to &quot;include&quot; all its properties in the service.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Ice properties private to this service.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Log Files</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">This table can be used to declare a number of log files used by this service. Path is the path to the log file (a relative path is relative to the IceGrid node working directory); when Property is set, IceGrid generates a property with this name and the log file path as value.</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">You declare log files to be able to conveniently retrieve them using IceGrid Admin (in the <a href="live_deployment.htm">Live Deployment</a> tab) or with the icegridadmin command-line utility.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Entry Point</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The service's entry point, for example </span><span class="f_T_Code">IceStormService,32:createIceStorm</span><span class="f_IndentList3">. </span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">IceGrid will append </span><span class="f_T_Code">--Ice.Config=</span><span class="f_T_Code" style="font-style: italic;">path-to-service-config-file</span><span class="f_IndentList3"> to this entry point when it generates the </span><span class="f_T_Code">IceBox.Service.</span><span class="f_T_Code" style="font-style: italic;">service-name</span><span class="f_IndentList3"> property in the enclosing IceBox server config file.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Children</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A plain service can have two types of children:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_adapter.htm">Adapter</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_dbenv.htm">Database Environment</a></span></td></tr></table></div>

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_plain_service.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_plain_service.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_plain_service.htm"; }
+  else { parent.lazysync('app_plain_service.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Plain Service</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a> &gt; <a href="app_service.htm">Service</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Plain Service</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_service.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_service.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_service_instance.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Service Properties panel offers the following fields:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Service Name</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The name of the service. Must be unique within the enclosing IceBox server.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this service.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Property Sets</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">List of property-set IDs; you refer to a property set to &quot;include&quot; all its properties in the service.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Ice properties private to this service.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Log Files</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">This table can be used to declare a number of log files used by this service. Path is the path to the log file (a relative path is relative to the IceGrid node working directory); when Property is set, IceGrid generates a property with this name and the log file path as value.</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">You declare log files to be able to conveniently retrieve them using IceGrid Admin (in the <a href="live_deployment.htm">Live Deployment</a> tab) or with the icegridadmin command-line utility.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Entry Point</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The service's entry point, for example </span><span class="f_T_Code">IceStormService,32:createIceStorm</span><span class="f_IndentList3">. </span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">IceGrid will append </span><span class="f_T_Code">--Ice.Config=</span><span class="f_T_Code" style="font-style: italic;">path-to-service-config-file</span><span class="f_IndentList3"> to this entry point when it generates the </span><span class="f_T_Code">IceBox.Service.</span><span class="f_T_Code" style="font-style: italic;">service-name</span><span class="f_IndentList3"> property in the enclosing IceBox server config file.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Children</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A plain service can have two types of children:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_adapter.htm">Adapter</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_dbenv.htm">Database Environment</a></span></td></tr></table></div>
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_plain_service.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_plain_service.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_property_set.htm b/java/resources/IceGridAdmin/app_property_set.htm
index 5194bc004d3..905ce6e7850 100644
--- a/java/resources/IceGridAdmin/app_property_set.htm
+++ b/java/resources/IceGridAdmin/app_property_set.htm
@@ -1,132 +1,132 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_property_set.htm"; }

-  else { parent.lazysync('app_property_set.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Property Set</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Property Set</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_service_instance.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_descriptors.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_replica__group.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>A Property Set defines a set of Ice properties. IceGrid Admin supports two kinds of Property Sets: </p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td>Named Property Set, defined within an application or within a node. Server and service definitions refer to such property sets to &quot;include&quot; the corresponding properties.</td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td>Service-Instance Property Set, defined as a child of an IceBox server instance. Such a property set provides properties to a service instance within a concrete IceBox server.</td></tr></table></div><p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Property Set Properties panel offers the following fields:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">ID</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">(Named Property Set only) The ID of a named property set.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Service Name</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">(Service Instance property set) The service name.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Property Sets</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">List of Property Set IDs. The corresponding property sets are &quot;included&quot; in this property set.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Ice properties private to this Property Set</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_property_set.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_property_set.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_property_set.htm"; }
+  else { parent.lazysync('app_property_set.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Property Set</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Property Set</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_service_instance.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_descriptors.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_replica__group.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>A Property Set defines a set of Ice properties. IceGrid Admin supports two kinds of Property Sets: </p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td>Named Property Set, defined within an application or within a node. Server and service definitions refer to such property sets to &quot;include&quot; the corresponding properties.</td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td>Service-Instance Property Set, defined as a child of an IceBox server instance. Such a property set provides properties to a service instance within a concrete IceBox server.</td></tr></table></div><p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Property Set Properties panel offers the following fields:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">ID</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">(Named Property Set only) The ID of a named property set.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Service Name</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">(Service Instance property set) The service name.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Property Sets</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">List of Property Set IDs. The corresponding property sets are &quot;included&quot; in this property set.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Ice properties private to this Property Set</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_property_set.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_property_set.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_replica__group.htm b/java/resources/IceGridAdmin/app_replica__group.htm
index ddb8b177de8..f4d3464f296 100644
--- a/java/resources/IceGridAdmin/app_replica__group.htm
+++ b/java/resources/IceGridAdmin/app_replica__group.htm
@@ -1,137 +1,137 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_replica__group.htm"; }

-  else { parent.lazysync('app_replica__group.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Replica Group</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Load Balancing,Load Sample">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Replica Group</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_property_set.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_descriptors.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_server_template.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>A replica group represents an abstract grouping of identical, or very similar, object adapters. An object adapter joins this group by setting this replica group ID in its <span class="f_T_Entry">Replica Group</span> field.</p>

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Replica Properties panel offers the following fields:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Replica Group ID</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The ID of this replica group. Must be unique within an IceGrid deployment.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this replica group.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Well-known Objects</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A table of well-known objects defined by this replica group.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Load Balancing Policy</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The load-balancing policy used by IceGrid when resolving the</span><span class="f_T_Entry"> Replica Group ID</span><span class="f_IndentList3"> in proxies. Must be one of:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">Adaptive: return the endpoints of the object adapters whose nodes report the lowest load-average (on Linux/Unix) or CPU utilization (on Windows). The actual load-average or CPU utilization value of each node is multiplied by the node's load-factor for this comparison. See Load Sample below, and <a href="app_node.htm">Node</a>.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">Ordered: return the endpoints of the object adapters with the highest priority. See <a href="app_adapter.htm">Adapter</a>.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">Random: returns the endpoints of object adapters selected at random. This is the default policy.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">Round-robin: IceGrid puts all the object adapters in a list, and for each new resolution, it returns the endpoints from the next </span><span class="f_T_Entry">How many Adapters</span><span class="f_IndentList3"> items on this list.</span></td></tr></table></div><p class="p_Heading2Sub2"><span class="f_Heading2Sub2">How many Adapters</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Specify the number of object adapters selected by IceGrid for each resolution. 1 is a common value.</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When set to 0 (the default), IceGrid returns the endpoints of all object adapters in this replica group.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Load Sample</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Available only with the Adaptive load-balancing policy. Specify the load-average or CPU utilization sample &nbsp;to use when comparing nodes: it can be 1 (default), 5 or 15 minutes.</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_replica__group.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_replica__group.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_replica__group.htm"; }
+  else { parent.lazysync('app_replica__group.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Replica Group</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Load Balancing,Load Sample">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Replica Group</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_property_set.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_descriptors.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_server_template.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>A replica group represents an abstract grouping of identical, or very similar, object adapters. An object adapter joins this group by setting this replica group ID in its <span class="f_T_Entry">Replica Group</span> field.</p>
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Replica Properties panel offers the following fields:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Replica Group ID</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The ID of this replica group. Must be unique within an IceGrid deployment.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this replica group.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Well-known Objects</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A table of well-known objects defined by this replica group.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Load Balancing Policy</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The load-balancing policy used by IceGrid when resolving the</span><span class="f_T_Entry"> Replica Group ID</span><span class="f_IndentList3"> in proxies. Must be one of:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">Adaptive: return the endpoints of the object adapters whose nodes report the lowest load-average (on Linux/Unix) or CPU utilization (on Windows). The actual load-average or CPU utilization value of each node is multiplied by the node's load-factor for this comparison. See Load Sample below, and <a href="app_node.htm">Node</a>.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">Ordered: return the endpoints of the object adapters with the highest priority. See <a href="app_adapter.htm">Adapter</a>.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">Random: returns the endpoints of object adapters selected at random. This is the default policy.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">Round-robin: IceGrid puts all the object adapters in a list, and for each new resolution, it returns the endpoints from the next </span><span class="f_T_Entry">How many Adapters</span><span class="f_IndentList3"> items on this list.</span></td></tr></table></div><p class="p_Heading2Sub2"><span class="f_Heading2Sub2">How many Adapters</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Specify the number of object adapters selected by IceGrid for each resolution. 1 is a common value.</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When set to 0 (the default), IceGrid returns the endpoints of all object adapters in this replica group.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Load Sample</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Available only with the Adaptive load-balancing policy. Specify the load-average or CPU utilization sample &nbsp;to use when comparing nodes: it can be 1 (default), 5 or 15 minutes.</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_replica__group.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_replica__group.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_server.htm b/java/resources/IceGridAdmin/app_server.htm
index 7396f3f1557..ec056cf967a 100644
--- a/java/resources/IceGridAdmin/app_server.htm
+++ b/java/resources/IceGridAdmin/app_server.htm
@@ -1,122 +1,122 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_server.htm"; }

-  else { parent.lazysync('app_server.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Server</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Server</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_node.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_descriptors.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_plain_server.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>A server represents an Ice server deployed on a node as part of an application. IceGrid supports three kinds of servers:</p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><a href="app_plain_server.htm">Plain Server</a>: a normal Ice server, with typically a single Ice communicator. IceGrid generates a single Ice configuration file for this server.</td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><a href="app_icebox_server.htm">IceBox Server</a>: an IceBox server, with usually a number of IceBox services deployed in it. IceGrid generates an Ice configuration file for the IceBox server itself, and also a separate Ice configuration for each IceBox service.</td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><a href="app_server_instance.htm">Server Instance</a>: a server (either plain server or IceBox server) defined using a server template .</td></tr></table></div>

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_server.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_server.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_server.htm"; }
+  else { parent.lazysync('app_server.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Server</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Server</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_node.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_descriptors.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_plain_server.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>A server represents an Ice server deployed on a node as part of an application. IceGrid supports three kinds of servers:</p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><a href="app_plain_server.htm">Plain Server</a>: a normal Ice server, with typically a single Ice communicator. IceGrid generates a single Ice configuration file for this server.</td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><a href="app_icebox_server.htm">IceBox Server</a>: an IceBox server, with usually a number of IceBox services deployed in it. IceGrid generates an Ice configuration file for the IceBox server itself, and also a separate Ice configuration for each IceBox service.</td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><a href="app_server_instance.htm">Server Instance</a>: a server (either plain server or IceBox server) defined using a server template .</td></tr></table></div>
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_server.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_server.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_server_instance.htm b/java/resources/IceGridAdmin/app_server_instance.htm
index 24f457b81da..e6a72cd1af4 100644
--- a/java/resources/IceGridAdmin/app_server_instance.htm
+++ b/java/resources/IceGridAdmin/app_server_instance.htm
@@ -1,135 +1,135 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_server_instance.htm"; }

-  else { parent.lazysync('app_server_instance.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Server Instance</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a> &gt; <a href="app_server.htm">Server</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Server Instance</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_icebox_server.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_server.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_adapter.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>A server instance is a server created from a server template; it may be a plain server or an IceBox server.</p>

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Server Instance Properties panel offers the following fields:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Template</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The name of the <a href="app_server_template.htm">Server Template</a>.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Parameters</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Use this table to assign values to the template parameters defined in the server template.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Property Sets</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">List of property-set IDs; you refer to a property set to &quot;include&quot; all its properties in this server-instance.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Ice properties private to this server. Overall, the properties of the server instance are a combination of properties defined in the server template (including its own property sets references) augmented and possibly overridden by properties defined in the server instance. </span></p>

-<p class="p_Heading2"><span class="f_Heading2">Children</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">An instance of an IceBox server template can have one type of children, <a href="app_property_set.htm">Property Set</a>. </span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">An instance of a plain server template cannot have any child.</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_server_instance.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_server_instance.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_server_instance.htm"; }
+  else { parent.lazysync('app_server_instance.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Server Instance</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a> &gt; <a href="app_server.htm">Server</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Server Instance</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_icebox_server.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_server.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_adapter.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>A server instance is a server created from a server template; it may be a plain server or an IceBox server.</p>
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Server Instance Properties panel offers the following fields:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Template</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The name of the <a href="app_server_template.htm">Server Template</a>.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Parameters</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Use this table to assign values to the template parameters defined in the server template.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Property Sets</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">List of property-set IDs; you refer to a property set to &quot;include&quot; all its properties in this server-instance.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Ice properties private to this server. Overall, the properties of the server instance are a combination of properties defined in the server template (including its own property sets references) augmented and possibly overridden by properties defined in the server instance. </span></p>
+<p class="p_Heading2"><span class="f_Heading2">Children</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">An instance of an IceBox server template can have one type of children, <a href="app_property_set.htm">Property Set</a>. </span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">An instance of a plain server template cannot have any child.</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_server_instance.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_server_instance.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_server_template.htm b/java/resources/IceGridAdmin/app_server_template.htm
index 7e97d289013..3781389acc4 100644
--- a/java/resources/IceGridAdmin/app_server_template.htm
+++ b/java/resources/IceGridAdmin/app_server_template.htm
@@ -1,133 +1,133 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_server_template.htm"; }

-  else { parent.lazysync('app_server_template.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Server Template</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Server Template</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_replica__group.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_descriptors.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_service_template.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>A server template is used to capture the common definitions of several similar or identical servers.</p>

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Server Template Properties panel offers the following fields:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Template ID</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The ID the template. Must be unique within the application.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Parameters</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The list of parameters for this template. Each parameter can have an optional default value. </span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Plain Server Properties</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The remaining fields are the <a href="app_plain_server.htm">Plain Server</a> fields.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Children</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A plain server template can have two types of children:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_adapter.htm">Adapter</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_dbenv.htm">Database Environment</a></span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">An IceBox server template can have only one kind of children, <a href="app_service.htm">Service</a>.</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_server_template.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_server_template.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_server_template.htm"; }
+  else { parent.lazysync('app_server_template.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Server Template</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Server Template</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_replica__group.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_descriptors.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_service_template.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>A server template is used to capture the common definitions of several similar or identical servers.</p>
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Server Template Properties panel offers the following fields:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Template ID</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The ID the template. Must be unique within the application.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Parameters</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The list of parameters for this template. Each parameter can have an optional default value. </span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Plain Server Properties</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The remaining fields are the <a href="app_plain_server.htm">Plain Server</a> fields.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Children</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A plain server template can have two types of children:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_adapter.htm">Adapter</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_dbenv.htm">Database Environment</a></span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">An IceBox server template can have only one kind of children, <a href="app_service.htm">Service</a>.</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_server_template.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_server_template.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_service.htm b/java/resources/IceGridAdmin/app_service.htm
index 9ae6c761947..c6349428b7e 100644
--- a/java/resources/IceGridAdmin/app_service.htm
+++ b/java/resources/IceGridAdmin/app_service.htm
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_service.htm"; }

-  else { parent.lazysync('app_service.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Service</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Service</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_dbenv.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_descriptors.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_plain_service.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>A service represents an IceBox service deployed on an IceBox server. &nbsp;IceGrid supports two kinds of services:</p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><a href="app_plain_service.htm">Plain Service</a>: a service defined directly with a service descriptor</td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><a href="app_service_instance.htm">Service Instance</a>: a service defined using a service template</td></tr></table></div><p class="p_Heading2"><span class="f_Heading2">Load Order</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The load-order of services within an IceBox server is determined by their display order in IceGrid Admin. You can reorder services using </span><span class="f_T_Menu">Edit &gt; Move Up</span><span class="f_IndentList2"> or </span><span class="f_T_Menu">Edit &gt; Move Down</span><span class="f_IndentList2"> (also available from each service's contextual menu).</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_service.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_service.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_service.htm"; }
+  else { parent.lazysync('app_service.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Service</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Service</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_dbenv.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_descriptors.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_plain_service.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>A service represents an IceBox service deployed on an IceBox server. &nbsp;IceGrid supports two kinds of services:</p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><a href="app_plain_service.htm">Plain Service</a>: a service defined directly with a service descriptor</td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><a href="app_service_instance.htm">Service Instance</a>: a service defined using a service template</td></tr></table></div><p class="p_Heading2"><span class="f_Heading2">Load Order</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The load-order of services within an IceBox server is determined by their display order in IceGrid Admin. You can reorder services using </span><span class="f_T_Menu">Edit &gt; Move Up</span><span class="f_IndentList2"> or </span><span class="f_T_Menu">Edit &gt; Move Down</span><span class="f_IndentList2"> (also available from each service's contextual menu).</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_service.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_service.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_service_instance.htm b/java/resources/IceGridAdmin/app_service_instance.htm
index 810dbe1a6f8..0ac9249ff94 100644
--- a/java/resources/IceGridAdmin/app_service_instance.htm
+++ b/java/resources/IceGridAdmin/app_service_instance.htm
@@ -1,131 +1,131 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_service_instance.htm"; }

-  else { parent.lazysync('app_service_instance.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Service Instance</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a> &gt; <a href="app_service.htm">Service</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Service Instance</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_plain_service.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_service.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_property_set.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Service Instance Properties panel offers the following fields:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Template</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The name of the <a href="app_service_template.htm">Service Template</a>.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Parameters</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Use this table to give values to the template parameters defined in the service template.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Property Sets</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">List of property-set IDs; you refer to a property set to &quot;include&quot; all its properties in the service.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Ice properties private to this service.</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_service_instance.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_service_instance.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_service_instance.htm"; }
+  else { parent.lazysync('app_service_instance.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Service Instance</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a> &gt; <a href="app_service.htm">Service</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Service Instance</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_plain_service.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_service.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_property_set.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Service Instance Properties panel offers the following fields:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Template</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The name of the <a href="app_service_template.htm">Service Template</a>.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Parameters</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Use this table to give values to the template parameters defined in the service template.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Property Sets</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">List of property-set IDs; you refer to a property set to &quot;include&quot; all its properties in the service.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Ice properties private to this service.</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_service_instance.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_service_instance.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_service_template.htm b/java/resources/IceGridAdmin/app_service_template.htm
index da5546089d6..9711c17dc91 100644
--- a/java/resources/IceGridAdmin/app_service_template.htm
+++ b/java/resources/IceGridAdmin/app_service_template.htm
@@ -1,129 +1,129 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_service_template.htm"; }

-  else { parent.lazysync('app_service_template.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Service Template</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Service Template</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_server_template.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="app_descriptors.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><img src="btn_next_d.gif" border="0">

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>A service template is used to capture the common definitions of several similar or identical services.</p>

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Service Template Properties panel offers the following fields:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Template ID</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The ID the template. Must be unique within the application.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Parameters</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The list of parameters for this template. Each parameter can have an optional default value. </span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Plain Service Properties</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The remaining fields are the <a href="app_plain_service.htm">Plain Service</a> fields.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Children</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A service template can have two types of children:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_adapter.htm">Adapter</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_dbenv.htm">Database Environment</a></span></td></tr></table></div>

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_service_template.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_service_template.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_service_template.htm"; }
+  else { parent.lazysync('app_service_template.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Service Template</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a> &gt; <a href="app_descriptors.htm">Descriptors</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Service Template</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_server_template.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="app_descriptors.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><img src="btn_next_d.gif" border="0">
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>A service template is used to capture the common definitions of several similar or identical services.</p>
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Service Template Properties panel offers the following fields:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Template ID</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The ID the template. Must be unique within the application.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Parameters</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The list of parameters for this template. Each parameter can have an optional default value. </span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Plain Service Properties</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The remaining fields are the <a href="app_plain_service.htm">Plain Service</a> fields.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Children</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A service template can have two types of children:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_adapter.htm">Adapter</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="app_dbenv.htm">Database Environment</a></span></td></tr></table></div>
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_service_template.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_service_template.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/app_variables.htm b/java/resources/IceGridAdmin/app_variables.htm
index 6a23f9ba9de..e6c28847b3b 100644
--- a/java/resources/IceGridAdmin/app_variables.htm
+++ b/java/resources/IceGridAdmin/app_variables.htm
@@ -1,236 +1,236 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?app_variables.htm"; }

-  else { parent.lazysync('app_variables.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Variables</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Pre-Defined Variables,application,application.distrib,node,node.os,node.hostname,node.release,node.version,node.machine,node.datadir,server,server.distrib,service,session.id">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="application.htm">Application</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Variables</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="app_navigation.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="application.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_descriptors.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>Variables allow you to define commonly-used information once and refer to them symbolically throughout your application descriptors.</p>

-<p class="p_Heading2"><span class="f_Heading2">Syntax</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">Substitution for a variable or parameter </span><span class="f_T_Code">VP</span><span class="f_IndentList2"> is attempted whenever the symbol </span><span class="f_T_Code">${VP}</span><span class="f_IndentList2"> is encountered, subject to the limitations and rules described below. Substitution is case-sensitive, and a fatal error occurs if </span><span class="f_T_Code">VP</span><span class="f_IndentList2"> is not defined when the application is saved to an IceGrid registry.</span></p>

-<p class="p_Heading2Sub"><span class="f_Heading2Sub">Where are Variables Allowed?</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">Substitution is performed in all string fields except the following:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">server and service template IDs (when defining a template or when referring to a template)</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">variable names</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">template parameter names</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">node names</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">application names</span></td></tr></table></div><p class="p_Heading2Sub"><span class="f_Heading2Sub">Escaping a Variable</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">You can prevent substitution by escaping a variable reference with an additional leading $ character. For example, in order to assign the literal string </span><span class="f_T_Code">${abc} </span><span class="f_IndentList2">to a variable, you would use</span><span class="f_T_Code"> $${abc} </span>as this variable's value.</p>

-<p class="p_IndentList2">The extra $ symbol is only meaningful when immediately preceding a variable reference, therefore text such as <span class="f_T_Code">US$$55</span> is not modified. Each occurrence of the characters $$ preceding a variable reference is replaced with a single $ character, and that character does not initiate a variable reference.</p>

-<p class="p_Heading2"><span class="f_Heading2">Pre-Defined Variables</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">IceGrid defines a set of read-only variables to hold information that may be of use to descriptors. The names of these variables are reserved and cannot be used as variable or parameter names. The table below describes the purpose of each variable and defines the context in which it is valid.</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table cellspacing="0" cellpadding="0" border="1" style="border: solid 2px #808080; border-spacing:0px; border-collapse: collapse;">

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_NormalHead"><span class="f_NormalHead">Name</span></p>

-</td>

-<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_NormalHead"><span class="f_NormalHead">Description</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">application</span></p>

-</td>

-<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The name of the enclosing application.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">application.distrib</span></p>

-</td>

-<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The pathname of the enclosing application’s distribution directory, and an alias for </span><span class="f_T_Code">${node.datadir}/distrib/${application}</span><span class="f_TableText">.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">node</span></p>

-</td>

-<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The name of the enclosing node.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">node.os</span></p>

-</td>

-<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The name of the enclosing node’s operating system. On Unix, this is value is provided by uname. On Windows, the value is Windows.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">node.hostname</span></p>

-</td>

-<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The host name of the enclosing node.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">node.release</span></p>

-</td>

-<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The operation system release of the enclosing node. On Unix, this value is provided by uname. On Windows, the value is obtained from the </span><span class="f_T_Code">OSVERSIONINFO</span><span class="f_TableText"> data structure.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">node.version</span></p>

-</td>

-<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The operation system version of the enclosing node. On Unix, this value is provided by uname. On Windows, the value represents the current service pack level.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">node.machine</span></p>

-</td>

-<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The machine hardware name of the enclosing node. On Unix, this value is provided by uname. On Windows, the value is x86 or x64.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">node.datadir</span></p>

-</td>

-<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The absolute pathname of the enclosing node’s data directory.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">server</span></p>

-</td>

-<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The ID of the enclosing server.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">server.distrib</span></p>

-</td>

-<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The pathname of the enclosing server’s distribution directory, and an alias for </span><span class="f_T_Code">${node.datadir}/servers/${server}/distrib</span><span class="f_TableText">.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">service</span></p>

-</td>

-<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The name of the enclosing service.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">session.id</span></p>

-</td>

-<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The client session identifier. For sessions created with a user name and password, the value is the user ID; for sessions created from a secure connection, the value is the distinguished name associated with the connection.</span></p>

-</td>

-</tr>

-</table>

-</div>

-<p>&nbsp;</p>

-<p class="p_IndentList2"><span class="f_IndentList2">The availability of a variable is easily determined in some cases, but may not be readily apparent in others. For example, you can use the ${node} variable in a property value within a server template definition, because variables in the body of a server template are only evaluated when the server template is instantiated on a specific node.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Variable Substitution in IceGrid Admin Forms</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">In a number of forms, you can substitute variables and template parameters by their respecitive value. Use </span><span class="f_T_Menu">View &gt; Show Variables</span><span class="f_IndentList2"> and </span><span class="f_T_Menu">View &gt; Substitute Variables </span><span class="f_IndentList2">or the corresponding toolbar toggle buttons:</span></p>

-<p class="p_IndentList3"><img src="variables.png" width="97" height="58" border="0" alt=""></p>

-<p class="p_IndentList2"><span class="f_IndentList2">When variable-substitution is enabled, the descriptors are displayed read-only.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Scoping Rules</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">Descriptors may only define variables at the application and node levels. Each node introduces a new scope, such that defining a variable at the node level overrides (but does not modify) the value of an application variable with the same name. Similarly, a template parameter overrides the value of a variable with the same name in an enclosing scope. A descriptor may refer to a variable defined in any enclosing scope, but its value is determined by the nearest scope. The diagram below illustrates these concepts:</span></p>

-<p class="p_IndentList3"><img src="variable-scopes.png" width="717" height="717" border="0" alt=""></p>

-<p class="p_IndentList3"><span class="f_IndentList3">&nbsp;</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">In this diagram, the variable x is defined at the application level with the value 1. In nodeA, x is overridden with the value 2, whereas x remains unchanged in nodeB. Within the context of nodeA, x continues to have the value 2 in a server instance definition. However, when x is used as the name of a template parameter, the node’s definition of x is overridden and x has the value 3 in the template’s scope.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Resolving a Reference</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">To resolve a variable reference </span><span class="f_T_Code">${var}</span><span class="f_IndentList2">, IceGrid searches for a definition of var using the following order of precedence:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Pre-defined variables</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Template parameters, if applicable</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Node variables, if applicable</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Application variables</span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">After the initial substitution, any remaining references are resolved recursively using the following order of precedence:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Pre-defined variables</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Node variables, if applicable</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Application variables</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Template Parameters</span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">Template parameters are not visible in nested template instances. This situation can only occur when an IceBox server template instantiates a service template. </span></p>

-<p class="p_Heading2"><span class="f_Heading2">Modifying a Variable</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A variable definition can be overridden in an inner scope, but the inner definition does not modify the outer variable.</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_variables.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_variables.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?app_variables.htm"; }
+  else { parent.lazysync('app_variables.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Variables</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Pre-Defined Variables,application,application.distrib,node,node.os,node.hostname,node.release,node.version,node.machine,node.datadir,server,server.distrib,service,session.id">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="application.htm">Application</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Variables</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="app_navigation.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="application.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_descriptors.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>Variables allow you to define commonly-used information once and refer to them symbolically throughout your application descriptors.</p>
+<p class="p_Heading2"><span class="f_Heading2">Syntax</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">Substitution for a variable or parameter </span><span class="f_T_Code">VP</span><span class="f_IndentList2"> is attempted whenever the symbol </span><span class="f_T_Code">${VP}</span><span class="f_IndentList2"> is encountered, subject to the limitations and rules described below. Substitution is case-sensitive, and a fatal error occurs if </span><span class="f_T_Code">VP</span><span class="f_IndentList2"> is not defined when the application is saved to an IceGrid registry.</span></p>
+<p class="p_Heading2Sub"><span class="f_Heading2Sub">Where are Variables Allowed?</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">Substitution is performed in all string fields except the following:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">server and service template IDs (when defining a template or when referring to a template)</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">variable names</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">template parameter names</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">node names</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">application names</span></td></tr></table></div><p class="p_Heading2Sub"><span class="f_Heading2Sub">Escaping a Variable</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">You can prevent substitution by escaping a variable reference with an additional leading $ character. For example, in order to assign the literal string </span><span class="f_T_Code">${abc} </span><span class="f_IndentList2">to a variable, you would use</span><span class="f_T_Code"> $${abc} </span>as this variable's value.</p>
+<p class="p_IndentList2">The extra $ symbol is only meaningful when immediately preceding a variable reference, therefore text such as <span class="f_T_Code">US$$55</span> is not modified. Each occurrence of the characters $$ preceding a variable reference is replaced with a single $ character, and that character does not initiate a variable reference.</p>
+<p class="p_Heading2"><span class="f_Heading2">Pre-Defined Variables</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">IceGrid defines a set of read-only variables to hold information that may be of use to descriptors. The names of these variables are reserved and cannot be used as variable or parameter names. The table below describes the purpose of each variable and defines the context in which it is valid.</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table cellspacing="0" cellpadding="0" border="1" style="border: solid 2px #808080; border-spacing:0px; border-collapse: collapse;">
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_NormalHead"><span class="f_NormalHead">Name</span></p>
+</td>
+<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_NormalHead"><span class="f_NormalHead">Description</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">application</span></p>
+</td>
+<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The name of the enclosing application.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">application.distrib</span></p>
+</td>
+<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The pathname of the enclosing application’s distribution directory, and an alias for </span><span class="f_T_Code">${node.datadir}/distrib/${application}</span><span class="f_TableText">.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">node</span></p>
+</td>
+<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The name of the enclosing node.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">node.os</span></p>
+</td>
+<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The name of the enclosing node’s operating system. On Unix, this is value is provided by uname. On Windows, the value is Windows.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">node.hostname</span></p>
+</td>
+<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The host name of the enclosing node.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">node.release</span></p>
+</td>
+<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The operation system release of the enclosing node. On Unix, this value is provided by uname. On Windows, the value is obtained from the </span><span class="f_T_Code">OSVERSIONINFO</span><span class="f_TableText"> data structure.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">node.version</span></p>
+</td>
+<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The operation system version of the enclosing node. On Unix, this value is provided by uname. On Windows, the value represents the current service pack level.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">node.machine</span></p>
+</td>
+<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The machine hardware name of the enclosing node. On Unix, this value is provided by uname. On Windows, the value is x86 or x64.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">node.datadir</span></p>
+</td>
+<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The absolute pathname of the enclosing node’s data directory.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">server</span></p>
+</td>
+<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The ID of the enclosing server.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">server.distrib</span></p>
+</td>
+<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The pathname of the enclosing server’s distribution directory, and an alias for </span><span class="f_T_Code">${node.datadir}/servers/${server}/distrib</span><span class="f_TableText">.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">service</span></p>
+</td>
+<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The name of the enclosing service.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="166" style="width:166px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">session.id</span></p>
+</td>
+<td valign="top" width="683" style="width:683px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The client session identifier. For sessions created with a user name and password, the value is the user ID; for sessions created from a secure connection, the value is the distinguished name associated with the connection.</span></p>
+</td>
+</tr>
+</table>
+</div>
+<p>&nbsp;</p>
+<p class="p_IndentList2"><span class="f_IndentList2">The availability of a variable is easily determined in some cases, but may not be readily apparent in others. For example, you can use the ${node} variable in a property value within a server template definition, because variables in the body of a server template are only evaluated when the server template is instantiated on a specific node.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Variable Substitution in IceGrid Admin Forms</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">In a number of forms, you can substitute variables and template parameters by their respecitive value. Use </span><span class="f_T_Menu">View &gt; Show Variables</span><span class="f_IndentList2"> and </span><span class="f_T_Menu">View &gt; Substitute Variables </span><span class="f_IndentList2">or the corresponding toolbar toggle buttons:</span></p>
+<p class="p_IndentList3"><img src="variables.png" width="97" height="58" border="0" alt=""></p>
+<p class="p_IndentList2"><span class="f_IndentList2">When variable-substitution is enabled, the descriptors are displayed read-only.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Scoping Rules</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">Descriptors may only define variables at the application and node levels. Each node introduces a new scope, such that defining a variable at the node level overrides (but does not modify) the value of an application variable with the same name. Similarly, a template parameter overrides the value of a variable with the same name in an enclosing scope. A descriptor may refer to a variable defined in any enclosing scope, but its value is determined by the nearest scope. The diagram below illustrates these concepts:</span></p>
+<p class="p_IndentList3"><img src="variable-scopes.png" width="717" height="717" border="0" alt=""></p>
+<p class="p_IndentList3"><span class="f_IndentList3">&nbsp;</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">In this diagram, the variable x is defined at the application level with the value 1. In nodeA, x is overridden with the value 2, whereas x remains unchanged in nodeB. Within the context of nodeA, x continues to have the value 2 in a server instance definition. However, when x is used as the name of a template parameter, the node’s definition of x is overridden and x has the value 3 in the template’s scope.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Resolving a Reference</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">To resolve a variable reference </span><span class="f_T_Code">${var}</span><span class="f_IndentList2">, IceGrid searches for a definition of var using the following order of precedence:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Pre-defined variables</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Template parameters, if applicable</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Node variables, if applicable</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Application variables</span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">After the initial substitution, any remaining references are resolved recursively using the following order of precedence:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Pre-defined variables</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Node variables, if applicable</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Application variables</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Template Parameters</span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">Template parameters are not visible in nested template instances. This situation can only occur when an IceBox server template instantiates a service template. </span></p>
+<p class="p_Heading2"><span class="f_Heading2">Modifying a Variable</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A variable definition can be overridden in an inner scope, but the inner definition does not modify the outer variable.</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_variables.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?app_variables.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/application.htm b/java/resources/IceGridAdmin/application.htm
index 7b3b6d93312..0eb7844ce60 100644
--- a/java/resources/IceGridAdmin/application.htm
+++ b/java/resources/IceGridAdmin/application.htm
@@ -1,123 +1,123 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?application.htm"; }

-  else { parent.lazysync('application.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Application</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   &raquo;No topics above this level&laquo;

-   </p>

-   <p class="p_Heading1"><span class="f_Heading1">Application</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="log_file_dialog.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="welcome.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="app_editing_and_saving.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>IceGrid definitions are organized in &quot;applications&quot;, with typically one or a few applications deployed on a given IceGrid instance.</p>

-<p>An Application pane allows you to:</p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">create a new application: describe servers, IceBox services, the nodes you want to run them, specify load-balancing policies, etc.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">browse and edit the definition of an existing, live application deployed in an IceGrid instance</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">browse and edit the definition of an application stored in an IceGrid XML file</span></td></tr></table></div>

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?application.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?application.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?application.htm"; }
+  else { parent.lazysync('application.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Application</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   &raquo;No topics above this level&laquo;
+   </p>
+   <p class="p_Heading1"><span class="f_Heading1">Application</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="log_file_dialog.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="welcome.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="app_editing_and_saving.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>IceGrid definitions are organized in &quot;applications&quot;, with typically one or a few applications deployed on a given IceGrid instance.</p>
+<p>An Application pane allows you to:</p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">create a new application: describe servers, IceBox services, the nodes you want to run them, specify load-balancing policies, etc.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">browse and edit the definition of an existing, live application deployed in an IceGrid instance</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">browse and edit the definition of an application stored in an IceGrid XML file</span></td></tr></table></div>
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?application.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?application.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/command_line_arguments.htm b/java/resources/IceGridAdmin/command_line_arguments.htm
index b9c06b1908b..8fe0b5ced9e 100644
--- a/java/resources/IceGridAdmin/command_line_arguments.htm
+++ b/java/resources/IceGridAdmin/command_line_arguments.htm
@@ -1,168 +1,168 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?command_line_arguments.htm"; }

-  else { parent.lazysync('command_line_arguments.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Command-Line Arguments</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="IceGridAdmin.AuthenticateUsingSSL,IceGridAdmin.Username,IceGridAdmin.Password,IceGridAdmin.Trace.Observers,IceGridAdmin.Trace.SaveToRegistry">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="introduction.htm">Introduction</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Command-Line Arguments</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="starting_icegrid_admin.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="introduction.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="main_window.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>IceGrid Admin can be configured using Ice properties, and like with most Ice applications, these properties can be set using command-line arguments or a configuration file (or both).</p>

-<p>Since IceGrid Admin is an Ice application (a client to the IceGrid registry), setting regular Ice properties can be useful as well. For example, you can set the <span class="f_T_Code">Ice.Trace.Network</span> property to get detailed information about network communications sent to stderr.</p>

-<p class="p_Example"><span class="f_Example"> $ icegridgui --Ice.Trace.Network=2</span></p>

-<p>Ice properties are described in detail in the <span class="f_IndentList2"> <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://www.zeroc.com/doc/Ice-3.4.0/manual/" target="_blank" class="weblink" title="Distributed Programming with Ice">Ice manual</a>. </span></p>

-<p><span class="f_IndentList2">The following table shows properties specific to IceGrid Admin itself:</span></p>

-<div style="text-align: center; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table align="center" cellspacing="0" cellpadding="0" border="1" style="border: solid 2px #808080; border-spacing:0px; border-collapse: collapse;">

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="304" style="width:304px; border: solid 1px #808080;"><p class="p_NormalHead"><span class="f_NormalHead">Name</span></p>

-</td>

-<td valign="top" width="607" style="width:607px; border: solid 1px #808080;"><p class="p_NormalHead"><span class="f_NormalHead">Description</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="304" style="width:304px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">IceGridAdmin.AuthenticateUsingSSL</span></p>

-</td>

-<td valign="top" width="607" style="width:607px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">By default, when logging into an IceGrid registry, IceGrid Admin offers you to use username/password for user authentication. Setting this property to a value &gt; 0 instructs IceGrid Admin to offer SSL authentication by default. See <a href="login.htm">Login</a> for details.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="304" style="width:304px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">IceGridAdmin.Username</span></p>

-</td>

-<td valign="top" width="607" style="width:607px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The default username when authenticating with a username/password. See <a href="login.htm">Login</a> for details.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="304" style="width:304px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">IceGridAdmin.Password</span></p>

-</td>

-<td valign="top" width="607" style="width:607px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The default password when authenticating with a username/password . See <a href="login.htm">Login</a> for details.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="304" style="width:304px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">IceGridAdmin.Trace.Observers</span></p>

-</td>

-<td valign="top" width="607" style="width:607px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">When set to a value &gt; 0, IceGrid Admin writes a log message (to stderr) each time it receives information from the IceGrid registry. This is typically used to debug problems in IceGrid Admin.</span></p>

-</td>

-</tr>

-<tr style="text-align:left;vertical-align:top;">

-<td valign="top" width="304" style="width:304px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">IceGridAdmin.Trace.SaveToRegistry</span></p>

-</td>

-<td valign="top" width="607" style="width:607px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">When set to a value &gt; 0, IceGrid Admin logs information (to stderr) about all save activities directed to the IceGrid registry. This is typically used to debug problems in IceGrid Admin.</span></p>

-</td>

-</tr>

-</table>

-</div>

-<p><span class="f_IndentList2">&nbsp;</span></p>

-<p>If you need to set many properties, it is a good idea to write a configuration file and use the --Ice.Config command-line argument to specify the location of this file. For example:</p>

-<p class="p_Example"><span class="f_Example"> &gt; java -jar C:\Ice-3.4.0\bin\IceGridGUI.jar --Ice.Config=icegridadmin.conf</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?command_line_arguments.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?command_line_arguments.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?command_line_arguments.htm"; }
+  else { parent.lazysync('command_line_arguments.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Command-Line Arguments</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="IceGridAdmin.AuthenticateUsingSSL,IceGridAdmin.Username,IceGridAdmin.Password,IceGridAdmin.Trace.Observers,IceGridAdmin.Trace.SaveToRegistry">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="introduction.htm">Introduction</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Command-Line Arguments</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="starting_icegrid_admin.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="introduction.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="main_window.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>IceGrid Admin can be configured using Ice properties, and like with most Ice applications, these properties can be set using command-line arguments or a configuration file (or both).</p>
+<p>Since IceGrid Admin is an Ice application (a client to the IceGrid registry), setting regular Ice properties can be useful as well. For example, you can set the <span class="f_T_Code">Ice.Trace.Network</span> property to get detailed information about network communications sent to stderr.</p>
+<p class="p_Example"><span class="f_Example"> $ icegridgui --Ice.Trace.Network=2</span></p>
+<p>Ice properties are described in detail in the <span class="f_IndentList2"> <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://www.zeroc.com/doc/Ice-3.4.0/manual/" target="_blank" class="weblink" title="Distributed Programming with Ice">Ice manual</a>. </span></p>
+<p><span class="f_IndentList2">The following table shows properties specific to IceGrid Admin itself:</span></p>
+<div style="text-align: center; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 0px;"><table align="center" cellspacing="0" cellpadding="0" border="1" style="border: solid 2px #808080; border-spacing:0px; border-collapse: collapse;">
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="304" style="width:304px; border: solid 1px #808080;"><p class="p_NormalHead"><span class="f_NormalHead">Name</span></p>
+</td>
+<td valign="top" width="607" style="width:607px; border: solid 1px #808080;"><p class="p_NormalHead"><span class="f_NormalHead">Description</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="304" style="width:304px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">IceGridAdmin.AuthenticateUsingSSL</span></p>
+</td>
+<td valign="top" width="607" style="width:607px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">By default, when logging into an IceGrid registry, IceGrid Admin offers you to use username/password for user authentication. Setting this property to a value &gt; 0 instructs IceGrid Admin to offer SSL authentication by default. See <a href="login.htm">Login</a> for details.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="304" style="width:304px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">IceGridAdmin.Username</span></p>
+</td>
+<td valign="top" width="607" style="width:607px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The default username when authenticating with a username/password. See <a href="login.htm">Login</a> for details.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="304" style="width:304px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">IceGridAdmin.Password</span></p>
+</td>
+<td valign="top" width="607" style="width:607px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">The default password when authenticating with a username/password . See <a href="login.htm">Login</a> for details.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="304" style="width:304px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">IceGridAdmin.Trace.Observers</span></p>
+</td>
+<td valign="top" width="607" style="width:607px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">When set to a value &gt; 0, IceGrid Admin writes a log message (to stderr) each time it receives information from the IceGrid registry. This is typically used to debug problems in IceGrid Admin.</span></p>
+</td>
+</tr>
+<tr style="text-align:left;vertical-align:top;">
+<td valign="top" width="304" style="width:304px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">IceGridAdmin.Trace.SaveToRegistry</span></p>
+</td>
+<td valign="top" width="607" style="width:607px; border: solid 1px #808080;"><p class="p_TableText"><span class="f_TableText">When set to a value &gt; 0, IceGrid Admin logs information (to stderr) about all save activities directed to the IceGrid registry. This is typically used to debug problems in IceGrid Admin.</span></p>
+</td>
+</tr>
+</table>
+</div>
+<p><span class="f_IndentList2">&nbsp;</span></p>
+<p>If you need to set many properties, it is a good idea to write a configuration file and use the --Ice.Config command-line argument to specify the location of this file. For example:</p>
+<p class="p_Example"><span class="f_Example"> &gt; java -jar C:\Ice-3.4.0\bin\IceGridGUI.jar --Ice.Config=icegridadmin.conf</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?command_line_arguments.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?command_line_arguments.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/custom.css b/java/resources/IceGridAdmin/custom.css
index 69305bb299e..88c7533e133 100644
--- a/java/resources/IceGridAdmin/custom.css
+++ b/java/resources/IceGridAdmin/custom.css
@@ -1,70 +1,70 @@
-  a { color: #0000FF; text-decoration: none }

-  a:visited {color: #0000FF }

-  a:hover {color: #E4641C; text-decoration: underline }

-  a.weblink {color: #0000FF; text-decoration: underline }

-  a.weblink:visited {color: #0000FF}

-  a.weblink:hover {color: #E4641C }

-  a.popuplink {color: #FF0000; text-decoration: none}

-  a.popuplink:visited {color: #FF0000}

-  a.popuplink:hover {color: #FF0000; text-decoration: underline}

-  a.filelink {color: #04BC14; text-decoration: none}

-  a.filelink:visited {color: #04BC14}

-  a.filelink:hover {color: #04BC14; text-decoration: underline}

-  a.inline-toggle {color: Green; text-decoration: none;  font-weight: bold;  font-family: "Times New Roman", serif;     }

-  a.inline-toggle:visited {color: Green; }

-  a.inline-toggle:hover {text-decoration: underline}

-  .fsmall {

-  font-size: 10px;

-	font-family: Verdana, Helvetica, sans-serif;

-	text-align: center;

-	margin: 10px 0px 0px 0px;

-	}

-  .crumbs {font-size: 8pt; margin-bottom: 3px; margin-top: 0px; color: #FFFFFF}

-  .crumbs a {text-decoration: underline; color: #FFFFFF}

-  .crumbs a:visited {text-decoration: underline; color: #FFFFFF}

-  .crumbs a:hover {color: #F4BC5C}

-  .expander {text-align: right; padding: 0; width: 100%; font-family: Verdana, Helvetica, sans-serif; font-size:9; font-weight: bold; border-bottom: 2px; border-bottom-style: solid; border-bottom-color: grey;

-  margin-bottom: 1px;}

- 

-@media screen{

-  #idcontent {    

-      width: 100%; 

-      padding: 0px !important; 

-      padding: 10px 15px 5px 10px; 

-   } 

-  #innerdiv {    

-      padding: 10px 5px 5px 10px !important;  

-      padding: 0px; 

-   } 

-   

-    .topichead {

-       padding: 5px;

-    }

-    

-    .navlinks {

-      font-size: 10pt;

-    }

-    .navlinks a {

-      text-decoration: none;

-      color: blue;

-    }

-    .navlinks a:visited {

-      text-decoration: none;

-      color: blue;

-    }

-    .navlinks a:hover {

-      text-decoration: underline;

-      color: blue;

-    }

-    

-   html.nonscroll { 

-      overflow:hidden; 

-   } 

-   body.nonscroll {    

-      overflow:hidden; 

-      height:100%; 

-   } 

-   div.nonscroll { 

-      overflow:auto; 

-   } 

-}

+  a { color: #0000FF; text-decoration: none }
+  a:visited {color: #0000FF }
+  a:hover {color: #E4641C; text-decoration: underline }
+  a.weblink {color: #0000FF; text-decoration: underline }
+  a.weblink:visited {color: #0000FF}
+  a.weblink:hover {color: #E4641C }
+  a.popuplink {color: #FF0000; text-decoration: none}
+  a.popuplink:visited {color: #FF0000}
+  a.popuplink:hover {color: #FF0000; text-decoration: underline}
+  a.filelink {color: #04BC14; text-decoration: none}
+  a.filelink:visited {color: #04BC14}
+  a.filelink:hover {color: #04BC14; text-decoration: underline}
+  a.inline-toggle {color: Green; text-decoration: none;  font-weight: bold;  font-family: "Times New Roman", serif;     }
+  a.inline-toggle:visited {color: Green; }
+  a.inline-toggle:hover {text-decoration: underline}
+  .fsmall {
+  font-size: 10px;
+	font-family: Verdana, Helvetica, sans-serif;
+	text-align: center;
+	margin: 10px 0px 0px 0px;
+	}
+  .crumbs {font-size: 8pt; margin-bottom: 3px; margin-top: 0px; color: #FFFFFF}
+  .crumbs a {text-decoration: underline; color: #FFFFFF}
+  .crumbs a:visited {text-decoration: underline; color: #FFFFFF}
+  .crumbs a:hover {color: #F4BC5C}
+  .expander {text-align: right; padding: 0; width: 100%; font-family: Verdana, Helvetica, sans-serif; font-size:9; font-weight: bold; border-bottom: 2px; border-bottom-style: solid; border-bottom-color: grey;
+  margin-bottom: 1px;}
+ 
+@media screen{
+  #idcontent {    
+      width: 100%; 
+      padding: 0px !important; 
+      padding: 10px 15px 5px 10px; 
+   } 
+  #innerdiv {    
+      padding: 10px 5px 5px 10px !important;  
+      padding: 0px; 
+   } 
+   
+    .topichead {
+       padding: 5px;
+    }
+    
+    .navlinks {
+      font-size: 10pt;
+    }
+    .navlinks a {
+      text-decoration: none;
+      color: blue;
+    }
+    .navlinks a:visited {
+      text-decoration: none;
+      color: blue;
+    }
+    .navlinks a:hover {
+      text-decoration: underline;
+      color: blue;
+    }
+    
+   html.nonscroll { 
+      overflow:hidden; 
+   } 
+   body.nonscroll {    
+      overflow:hidden; 
+      height:100%; 
+   } 
+   div.nonscroll { 
+      overflow:auto; 
+   } 
+}
diff --git a/java/resources/IceGridAdmin/dbenv.htm b/java/resources/IceGridAdmin/dbenv.htm
index 6b065577fdf..7cd04f84857 100644
--- a/java/resources/IceGridAdmin/dbenv.htm
+++ b/java/resources/IceGridAdmin/dbenv.htm
@@ -1,130 +1,130 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?dbenv.htm"; }

-  else { parent.lazysync('dbenv.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Database Environment</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="DB Home,Database Environment">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="runtime_components.htm">Runtime Components</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Database Environment</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="adapter.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="runtime_components.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="service.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>A Database Environment represents a Berkeley DB database environment, typically used for storage by the Freeze persistence service.</p>

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Database Environment Properties panel shows:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this Berkeley DB database environment.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">DB Home</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The path to the home directory of this database environment. Corresponds to the Ice property </span><span class="f_T_Code">Freeze.DbEnv.</span><span class="f_T_Code" style="font-style: italic;">env-name</span><span class="f_T_Code">.DbHome. </span><span class="f_IndentList3">It is often created by the IceGrid node in the server's private directory. </span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Berkeley DB configuration properties for this database environment. IceGrid generates a DB_CONFIG file in the DB Home directory with these properties.</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?dbenv.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?dbenv.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?dbenv.htm"; }
+  else { parent.lazysync('dbenv.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Database Environment</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="DB Home,Database Environment">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="runtime_components.htm">Runtime Components</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Database Environment</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="adapter.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="runtime_components.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="service.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>A Database Environment represents a Berkeley DB database environment, typically used for storage by the Freeze persistence service.</p>
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Database Environment Properties panel shows:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this Berkeley DB database environment.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">DB Home</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The path to the home directory of this database environment. Corresponds to the Ice property </span><span class="f_T_Code">Freeze.DbEnv.</span><span class="f_T_Code" style="font-style: italic;">env-name</span><span class="f_T_Code">.DbHome. </span><span class="f_IndentList3">It is often created by the IceGrid node in the server's private directory. </span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Berkeley DB configuration properties for this database environment. IceGrid generates a DB_CONFIG file in the DB Home directory with these properties.</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?dbenv.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?dbenv.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/helpman_topicinit.js b/java/resources/IceGridAdmin/helpman_topicinit.js
index e1ba89d4675..d32e9601f37 100644
--- a/java/resources/IceGridAdmin/helpman_topicinit.js
+++ b/java/resources/IceGridAdmin/helpman_topicinit.js
@@ -1,93 +1,93 @@
-/* ---------------- Script © 2006-2007 EC Software ----------------

-This script was created by Help & Manual. It is designed for use 

-in combination with the output of Help & Manual and must not

-be used outside this context.     http://www.helpandmanual.com

-

-Do not modify this file! It will be overwritten by Help & Manual.

------------------------------------------------------------------*/

-

-var topicInitScriptAvailable = true;

-var HMToggles = new Array();

-

-function HMToggleExpandAll(value)

-{

-	if (HMToggles.length != null){ 

-	  for (i=0; i<HMToggles.length; i++){ 

-		HMToggleExpand(HMToggles[i], value); 

-	  }

-	}

-}

-

-function HMToggle()

-{ 

-	var op = HMToggle.arguments[0];

-	for (i=1; i<HMToggle.arguments.length; i++) {

-	  var objID = HMToggle.arguments[i]; 

-       	  var obj = document.getElementById(objID);

- 	  switch (op) {

-		case "toggle": 

-		  var state = obj.getAttribute("hm.state");

-		  if (state == null) { state = "0" }; 

-		  HMToggleExpand(obj, (state != "1"));

-		  break;

-

-		case "expand":

-		  HMToggleExpand(obj, true);

-		  break;

-

-		case "collapse":

-		  HMToggleExpand(obj, false);

-		  break;

-	  }

-	}

-}

-

-function HMToggleExpand(obj, value)

-{

-	tagName = obj.nodeName.toLowerCase();

-	switch (tagName) {

-		case "span":

-		  obj.style.display = (value ? "inline" : "none");

-		  break;

-		case "table":

-		  obj.style.display = (value ? "block" : "none");

-		  break;

-		case "img":

-		  obj.src = (value ? obj.getAttribute("hm.src1") : obj.getAttribute("hm.src0"));

-		  var newTitle = (value ? obj.getAttribute("hm.title1") : obj.getAttribute("hm.title0"));

-		  if (newTitle != null) { obj.title = newTitle; }

-		  var newCaption = (value ? obj.getAttribute("hm.caption1") : obj.getAttribute("hm.caption0"));

-		  if (newCaption != null) { obj.parentNode.parentNode.parentNode.nextSibling.firstChild.firstChild.innerHTML = newCaption; }

-		  break;

-	}

-	obj.setAttribute("hm.state", value ? "1" : "0");

-}

-

-function HMInitToggle()

-{

-    if (document.getElementById) {

-	var node = document.getElementById(HMInitToggle.arguments[0]);

-	for (i=1; i<HMInitToggle.arguments.length-1; i=i+2) { 

-		if (HMInitToggle.arguments[i] == "onclick") {

-		  node.onclick = Function(HMInitToggle.arguments[i+1]); 

-		}

-		else { 

-		  node.setAttribute(HMInitToggle.arguments[i], decodeURI(HMInitToggle.arguments[i+1])); 

-		}

-		if (HMInitToggle.arguments[i].substring(0,6) == "hm.src") {

-			var img = new Image();

-			img.src = HMInitToggle.arguments[i+1];

-		}

-	}

-	mustExpand = window.location.search.lastIndexOf("zoom_highlight") > 0;

-	if (node.nodeName.toLowerCase() == "img") {

-	   var aLink = node.parentNode;

-	   if (aLink.nodeName.toLowerCase() == "a") { 

-		aLink.href = "javascript:HMToggle('toggle','" + HMInitToggle.arguments[0] +"')";

-		mustExpand = false; 

-	   }

-	}

-	HMToggles[HMToggles.length] = node;

-	HMToggleExpand(node, ((node.getAttribute("hm.state") == "1") || mustExpand));

-    }

-}
\ No newline at end of file
+/* ---------------- Script © 2006-2007 EC Software ----------------
+This script was created by Help & Manual. It is designed for use 
+in combination with the output of Help & Manual and must not
+be used outside this context.     http://www.helpandmanual.com
+
+Do not modify this file! It will be overwritten by Help & Manual.
+-----------------------------------------------------------------*/
+
+var topicInitScriptAvailable = true;
+var HMToggles = new Array();
+
+function HMToggleExpandAll(value)
+{
+	if (HMToggles.length != null){ 
+	  for (i=0; i<HMToggles.length; i++){ 
+		HMToggleExpand(HMToggles[i], value); 
+	  }
+	}
+}
+
+function HMToggle()
+{ 
+	var op = HMToggle.arguments[0];
+	for (i=1; i<HMToggle.arguments.length; i++) {
+	  var objID = HMToggle.arguments[i]; 
+       	  var obj = document.getElementById(objID);
+ 	  switch (op) {
+		case "toggle": 
+		  var state = obj.getAttribute("hm.state");
+		  if (state == null) { state = "0" }; 
+		  HMToggleExpand(obj, (state != "1"));
+		  break;
+
+		case "expand":
+		  HMToggleExpand(obj, true);
+		  break;
+
+		case "collapse":
+		  HMToggleExpand(obj, false);
+		  break;
+	  }
+	}
+}
+
+function HMToggleExpand(obj, value)
+{
+	tagName = obj.nodeName.toLowerCase();
+	switch (tagName) {
+		case "span":
+		  obj.style.display = (value ? "inline" : "none");
+		  break;
+		case "table":
+		  obj.style.display = (value ? "block" : "none");
+		  break;
+		case "img":
+		  obj.src = (value ? obj.getAttribute("hm.src1") : obj.getAttribute("hm.src0"));
+		  var newTitle = (value ? obj.getAttribute("hm.title1") : obj.getAttribute("hm.title0"));
+		  if (newTitle != null) { obj.title = newTitle; }
+		  var newCaption = (value ? obj.getAttribute("hm.caption1") : obj.getAttribute("hm.caption0"));
+		  if (newCaption != null) { obj.parentNode.parentNode.parentNode.nextSibling.firstChild.firstChild.innerHTML = newCaption; }
+		  break;
+	}
+	obj.setAttribute("hm.state", value ? "1" : "0");
+}
+
+function HMInitToggle()
+{
+    if (document.getElementById) {
+	var node = document.getElementById(HMInitToggle.arguments[0]);
+	for (i=1; i<HMInitToggle.arguments.length-1; i=i+2) { 
+		if (HMInitToggle.arguments[i] == "onclick") {
+		  node.onclick = Function(HMInitToggle.arguments[i+1]); 
+		}
+		else { 
+		  node.setAttribute(HMInitToggle.arguments[i], decodeURI(HMInitToggle.arguments[i+1])); 
+		}
+		if (HMInitToggle.arguments[i].substring(0,6) == "hm.src") {
+			var img = new Image();
+			img.src = HMInitToggle.arguments[i+1];
+		}
+	}
+	mustExpand = window.location.search.lastIndexOf("zoom_highlight") > 0;
+	if (node.nodeName.toLowerCase() == "img") {
+	   var aLink = node.parentNode;
+	   if (aLink.nodeName.toLowerCase() == "a") { 
+		aLink.href = "javascript:HMToggle('toggle','" + HMInitToggle.arguments[0] +"')";
+		mustExpand = false; 
+	   }
+	}
+	HMToggles[HMToggles.length] = node;
+	HMToggleExpand(node, ((node.getAttribute("hm.state") == "1") || mustExpand));
+    }
+}
diff --git a/java/resources/IceGridAdmin/highlight.js b/java/resources/IceGridAdmin/highlight.js
index 9666a57abb8..cce75a6ed66 100644
--- a/java/resources/IceGridAdmin/highlight.js
+++ b/java/resources/IceGridAdmin/highlight.js
@@ -1,251 +1,251 @@
-// ----------------------------------------------------------------------------

-// Zoom Search Engine 4.3 (27/6/2006)

-// Highlight & auto-scroll script

-//

-// email: zoom@wrensoft.com

-// www: http://www.wrensoft.com

-//

-// Copyright (C) Wrensoft 2006

-// ----------------------------------------------------------------------------

-// Use this script to allow your search matches to highlight and scroll to

-// the matched word on the actual web page where it was found.

-//

-// You will need to link to this JS file from each page of your site

-// which requires the "highlight/jump to matched word" feature.

-//

-// For example, you could paste the following HTML in your site's header or 

-// footer:

-//

-//   <style>.highlight { background: #FFFF40; }</style>

-//   <script type="text/javascript" src="highlight.js"></script>

-//

-// Note: You will need to specify the correct path to "highlight.js" depending

-// on where the file is located.

-//

-// You will then need to modify the BODY tag on your page to include an "onLoad" 

-// attribute, such as:

-//

-//   <body onload="highlight();">

-//

-// If for some reason you can not modify the body tag of your page, an alternative

-// would be to put the following line after the </body> tag of your page:

-//

-//   <script type="text/javascript">highlight();</script>

-//

-// For more information, consult the Users Guide and our support website at:

-// http://www.wrensoft.com/zoom/support

-//

-//

-// This script is licensed for use with the Zoom Search Engine. Original

-// development by Brett Alcock, VBasys Limited. To licence other applications 

-// email highlight@vbasys.com with the subject "license".

-

-var CatchJSErrors = true;

-

-function catcherror() { return true; }

-if (CatchJSErrors)

-{

-    window.onerror = catcherror;

-}

-

-function QueryString(key)

-{

-    var value = null;

-    for (var i=0;i<QueryString.keys.length;i++)

-    {

-        if (QueryString.keys[i]==key)

-        {

-            value = QueryString.values[i];

-            break;

-        }

-    }

-    return value;

-}

-

-function QueryString_Parse()

-{

-    var query = window.location.search.substring(1);

-    var pairs = query.split("&");

-

-    for (var i=0;i<pairs.length;i++)

-    {

-        var pos = pairs[i].indexOf('=');

-        if (pos >= 0)

-        {

-            var argname = pairs[i].substring(0,pos);

-            var value = pairs[i].substring(pos+1);

-            QueryString.keys[QueryString.keys.length] = argname;

-            QueryString.values[QueryString.values.length] = value;

-        }

-    }

-}

-

-QueryString.keys = new Array();

-QueryString.values = new Array();

-

-QueryString_Parse();

-

-function getElement(id)

-{

-    if (document.getElementById)

-        return(document.getElementById(id));

-    else if (document.all)

-        return(document.all[id]);

-}

-

-function findPosY(obj)

-{

-    var curtop = 0;

-    if (obj.offsetParent)

-    {

-        while (obj.offsetParent)

-        {

-            curtop += obj.offsetTop

-            obj = obj.offsetParent;

-        }

-    }

-    else if (obj.y)

-        curtop += obj.y;

-    return curtop;

-}

-

-

-// regular expression version

-function SearchHiLite(text)

-{

-    var SearchAsSubstring = 0;

-    var hl;

-

-    hl = QueryString("zoom_highlight");

-    if (hl == "" || hl == null)

-    {

-        hl = QueryString("zoom_highlightsub");

-        if (hl == "" || hl == null)

-            return false;

-        else

-            SearchAsSubstring = 1;

-    }

-    if ((document.charset && document.charset == "utf-8") ||

-    	(document.characterSet && document.characterSet == "UTF-8"))

-    	hl = decodeURIComponent(hl);

-    else

-    	hl = unescape(hl);

-    hl = hl.toLowerCase();

-                

-    // create array of terms        

-    //var term = hl.split("+"); 

-    var re = /\"(.*?)\"|[^\\+\"]+/g;

-    var term = hl.match(re);    

-   

-    // convert terms in regexp patterns

-    for (var i=0;i<term.length;i++) // take each term in turn

-    {       

-        if(term[i] != "")

-        {                   

-            if (term[i].indexOf("\"") != -1)

-            {

-                // contains double quotes               

-                term[i]=term[i].replace(/\"/g,"");

-                term[i]=term[i].replace(/\+/g," "); 

-            }

-            else

-            {

-                term[i]=term[i].replace(/\+/g,"");  

-            }                           

-

-            if (term[i].indexOf("*") != -1 || term[i].indexOf("?") != -1)

-            {

-                // convert wildcard pattern to regexp

-                term[i] = term[i].replace(/\\/g, " ");

-                term[i] = term[i].replace(/\^/g, " ");

-

-                //term[i] = term[i].replace(/\+/g, " "); // split on this so no point in looking

-

-                term[i] = term[i].replace(/\#/g, " ");

-                term[i] = term[i].replace(/\$/g, " ");

-                term[i] = term[i].replace(/\./g, " ");

-                

-                // check if search term only contains only wildcards

-                // if so, we will not attempt to highlight this term

-                var wildcards = /\w/;

-                if (wildcards.test(term[i]))

-                {

-                	term[i] = term[i].replace(/\*/g, "[^\\s]*");

-                	term[i] = term[i].replace(/\?/g, "[^\\s]"); // insist upon one non whitespace

-                }                

-                else                

-                	term[i] = "";                

-            }

-			

-			if (term[i] != "")

-			{

-	            if (SearchAsSubstring == 0)

-	            {	                

-	                term[i] = "(>[\\s]*|>[^<]+[\\b\\W])("+term[i]+")(<|[\\b\\W][^>]*<)";

-	            }

-	            else

-	            {

-	                // if term leads with wildcard then allow it to match preceeding text in word

-	                var strWB="";

-	                if(term[i].substr(0,7)=="[^\\s]*") strWB="\\b";

-	                term[i] = "(>|>[^<]+)"+strWB+"("+term[i]+")([^>]*<)";

-	            }

-	        }	        

-        }

-    }

-

-    text=text.replace(/&amp;/ig, '&');

-    text=text.replace(/&nbsp;/ig, '');

-

-    for (var i=0;i<term.length;i++) // take each term in turn

-    {

-        if(term[i] != "")

-        {        	        	

-            // we need a loop for the main search to catch all between ><

-            // and we add  before each found to ignore those done etc

-            // todo: develop reliable single pass regexp and dispose of loop

-            var l = 0;

-            re = new RegExp(term[i], "gi");

-            var count = 0; // just incase

-            text = ">" + text + "<"; // temporary tag marks

-            do 

-            {

-                l=text.length;

-                text=text.replace(re, '$1<span style="background:#FFFF40;" class="highlight" id="highlight" name="highlight">$2</span id="highlight">$3');

-                count++;

-            }

-            //while(re.lastIndex>0 && count<100); lastIndex not set properly under netscape

-            while(l!=text.length && count<100);

-            text = text.substring(1, text.length-1); // remove temporary tags

-        }

-    }        

-    text = text.replace(eval("//g"), '');        

-    text = text.replace(eval("//g"), '&nbsp;');    

-       

-    return(text);

-}

-

-function jumpHL()

-{

-    var d=getElement("highlight");

-    if(d)

-    {

-        var y=findPosY(d);

-        // if element near top of page

-        if(y < 100)

-            window.scrollTo(0,0); // go to top of page

-        else

-            window.scrollTo(0,y-50); // show space of 50 above

-    }

-}

-

-function highlight()

-{	

-    var x = document.body;

-    if (x)

-    {

-        var strHTML=SearchHiLite(x.innerHTML);

-        if (strHTML!=false) x.innerHTML = strHTML;

-        jumpHL();

-    }

-}

+// ----------------------------------------------------------------------------
+// Zoom Search Engine 4.3 (27/6/2006)
+// Highlight & auto-scroll script
+//
+// email: zoom@wrensoft.com
+// www: http://www.wrensoft.com
+//
+// Copyright (C) Wrensoft 2006
+// ----------------------------------------------------------------------------
+// Use this script to allow your search matches to highlight and scroll to
+// the matched word on the actual web page where it was found.
+//
+// You will need to link to this JS file from each page of your site
+// which requires the "highlight/jump to matched word" feature.
+//
+// For example, you could paste the following HTML in your site's header or 
+// footer:
+//
+//   <style>.highlight { background: #FFFF40; }</style>
+//   <script type="text/javascript" src="highlight.js"></script>
+//
+// Note: You will need to specify the correct path to "highlight.js" depending
+// on where the file is located.
+//
+// You will then need to modify the BODY tag on your page to include an "onLoad" 
+// attribute, such as:
+//
+//   <body onload="highlight();">
+//
+// If for some reason you can not modify the body tag of your page, an alternative
+// would be to put the following line after the </body> tag of your page:
+//
+//   <script type="text/javascript">highlight();</script>
+//
+// For more information, consult the Users Guide and our support website at:
+// http://www.wrensoft.com/zoom/support
+//
+//
+// This script is licensed for use with the Zoom Search Engine. Original
+// development by Brett Alcock, VBasys Limited. To licence other applications 
+// email highlight@vbasys.com with the subject "license".
+
+var CatchJSErrors = true;
+
+function catcherror() { return true; }
+if (CatchJSErrors)
+{
+    window.onerror = catcherror;
+}
+
+function QueryString(key)
+{
+    var value = null;
+    for (var i=0;i<QueryString.keys.length;i++)
+    {
+        if (QueryString.keys[i]==key)
+        {
+            value = QueryString.values[i];
+            break;
+        }
+    }
+    return value;
+}
+
+function QueryString_Parse()
+{
+    var query = window.location.search.substring(1);
+    var pairs = query.split("&");
+
+    for (var i=0;i<pairs.length;i++)
+    {
+        var pos = pairs[i].indexOf('=');
+        if (pos >= 0)
+        {
+            var argname = pairs[i].substring(0,pos);
+            var value = pairs[i].substring(pos+1);
+            QueryString.keys[QueryString.keys.length] = argname;
+            QueryString.values[QueryString.values.length] = value;
+        }
+    }
+}
+
+QueryString.keys = new Array();
+QueryString.values = new Array();
+
+QueryString_Parse();
+
+function getElement(id)
+{
+    if (document.getElementById)
+        return(document.getElementById(id));
+    else if (document.all)
+        return(document.all[id]);
+}
+
+function findPosY(obj)
+{
+    var curtop = 0;
+    if (obj.offsetParent)
+    {
+        while (obj.offsetParent)
+        {
+            curtop += obj.offsetTop
+            obj = obj.offsetParent;
+        }
+    }
+    else if (obj.y)
+        curtop += obj.y;
+    return curtop;
+}
+
+
+// regular expression version
+function SearchHiLite(text)
+{
+    var SearchAsSubstring = 0;
+    var hl;
+
+    hl = QueryString("zoom_highlight");
+    if (hl == "" || hl == null)
+    {
+        hl = QueryString("zoom_highlightsub");
+        if (hl == "" || hl == null)
+            return false;
+        else
+            SearchAsSubstring = 1;
+    }
+    if ((document.charset && document.charset == "utf-8") ||
+    	(document.characterSet && document.characterSet == "UTF-8"))
+    	hl = decodeURIComponent(hl);
+    else
+    	hl = unescape(hl);
+    hl = hl.toLowerCase();
+                
+    // create array of terms        
+    //var term = hl.split("+"); 
+    var re = /\"(.*?)\"|[^\\+\"]+/g;
+    var term = hl.match(re);    
+   
+    // convert terms in regexp patterns
+    for (var i=0;i<term.length;i++) // take each term in turn
+    {       
+        if(term[i] != "")
+        {                   
+            if (term[i].indexOf("\"") != -1)
+            {
+                // contains double quotes               
+                term[i]=term[i].replace(/\"/g,"");
+                term[i]=term[i].replace(/\+/g," "); 
+            }
+            else
+            {
+                term[i]=term[i].replace(/\+/g,"");  
+            }                           
+
+            if (term[i].indexOf("*") != -1 || term[i].indexOf("?") != -1)
+            {
+                // convert wildcard pattern to regexp
+                term[i] = term[i].replace(/\\/g, " ");
+                term[i] = term[i].replace(/\^/g, " ");
+
+                //term[i] = term[i].replace(/\+/g, " "); // split on this so no point in looking
+
+                term[i] = term[i].replace(/\#/g, " ");
+                term[i] = term[i].replace(/\$/g, " ");
+                term[i] = term[i].replace(/\./g, " ");
+                
+                // check if search term only contains only wildcards
+                // if so, we will not attempt to highlight this term
+                var wildcards = /\w/;
+                if (wildcards.test(term[i]))
+                {
+                	term[i] = term[i].replace(/\*/g, "[^\\s]*");
+                	term[i] = term[i].replace(/\?/g, "[^\\s]"); // insist upon one non whitespace
+                }                
+                else                
+                	term[i] = "";                
+            }
+			
+			if (term[i] != "")
+			{
+	            if (SearchAsSubstring == 0)
+	            {	                
+	                term[i] = "(>[\\s]*|>[^<]+[\\b\\W])("+term[i]+")(<|[\\b\\W][^>]*<)";
+	            }
+	            else
+	            {
+	                // if term leads with wildcard then allow it to match preceeding text in word
+	                var strWB="";
+	                if(term[i].substr(0,7)=="[^\\s]*") strWB="\\b";
+	                term[i] = "(>|>[^<]+)"+strWB+"("+term[i]+")([^>]*<)";
+	            }
+	        }	        
+        }
+    }
+
+    text=text.replace(/&amp;/ig, '&');
+    text=text.replace(/&nbsp;/ig, '');
+
+    for (var i=0;i<term.length;i++) // take each term in turn
+    {
+        if(term[i] != "")
+        {        	        	
+            // we need a loop for the main search to catch all between ><
+            // and we add  before each found to ignore those done etc
+            // todo: develop reliable single pass regexp and dispose of loop
+            var l = 0;
+            re = new RegExp(term[i], "gi");
+            var count = 0; // just incase
+            text = ">" + text + "<"; // temporary tag marks
+            do 
+            {
+                l=text.length;
+                text=text.replace(re, '$1<span style="background:#FFFF40;" class="highlight" id="highlight" name="highlight">$2</span id="highlight">$3');
+                count++;
+            }
+            //while(re.lastIndex>0 && count<100); lastIndex not set properly under netscape
+            while(l!=text.length && count<100);
+            text = text.substring(1, text.length-1); // remove temporary tags
+        }
+    }        
+    text = text.replace(eval("//g"), '');        
+    text = text.replace(eval("//g"), '&nbsp;');    
+       
+    return(text);
+}
+
+function jumpHL()
+{
+    var d=getElement("highlight");
+    if(d)
+    {
+        var y=findPosY(d);
+        // if element near top of page
+        if(y < 100)
+            window.scrollTo(0,0); // go to top of page
+        else
+            window.scrollTo(0,y-50); // show space of 50 above
+    }
+}
+
+function highlight()
+{	
+    var x = document.body;
+    if (x)
+    {
+        var strHTML=SearchHiLite(x.innerHTML);
+        if (strHTML!=false) x.innerHTML = strHTML;
+        jumpHL();
+    }
+}
diff --git a/java/resources/IceGridAdmin/icegridadmin_content_dyn.html b/java/resources/IceGridAdmin/icegridadmin_content_dyn.html
index b938176fe00..2022d898242 100644
--- a/java/resources/IceGridAdmin/icegridadmin_content_dyn.html
+++ b/java/resources/IceGridAdmin/icegridadmin_content_dyn.html
@@ -1,110 +1,110 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ --><head>

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-

-<!-- This line includes the general project style sheet (not required) -->

-   <link type="text/css" href="styles.css" rel="stylesheet">

-

-<!-- This block defines the styles of the TOC headings, change them as needed -->

-   <style type="text/css">

-       a { color: black; text-decoration: none }

-       a:visited {color: black}

-       a:hover { text-decoration: underline }

-       .navtitle    { font-size: 14pt; font-weight: bold; margin-bottom: 16px; }

-       .navbar      { font-size: 10pt; }

-

-       SPAN.heading1 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-       SPAN.heading2 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-       SPAN.heading3 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-       SPAN.heading4 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-       SPAN.heading5 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-       SPAN.heading6 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-

-       SPAN.hilight1 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }

-       SPAN.hilight2 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }

-       SPAN.hilight3 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }

-       SPAN.hilight4 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }

-       SPAN.hilight5 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }

-       SPAN.hilight6 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }

-

-   TD.toc { padding-bottom: 2px; padding-right: 3px }

-   TABLE.toc { border: 0 none; margin: 0px 0px 0px 0px; padding: 0px 0px 0px 4px; }

-   IMG.icon {}

-

-</style>

-</head>

-<body bgcolor="#FFFFFF" background="lines.gif" onload="parent.loadstate(document.getElementById('tree'));" onunload="parent.savestate(document.getElementById('tree'));">

-<!--  <body style="background: #FFFFFF; url(null) fixed no-repeat;" background="lines.gif" onload="parent.loadstate(document.getElementById('tree'));" onunload="parent.savestate(document.getElementById('tree'));"> -->

-<p class="navtitle">IceGrid Admin</p>

-<p class="navbar">

-<b>Contents</b>&nbsp;|&nbsp;<a href="icegridadmin_kwindex_dyn.html">Index</a>&nbsp;|&nbsp;<a href="icegridadmin_ftsearch.html">Search</a></p>

-<hr size="1" />

-

-<!-- Placeholder for the TOC - this variable is REQUIRED! -->

-<div id="tree">

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a1" href="welcome.htm" target="hmcontent" onclick="return parent.hilight('s1')" ondblclick="javascript:parent.toggle('div1')"><span id="s1" class="heading1">Welcome</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><a href="javascript:parent.toggle('div2')"><img id="i2" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a2" href="introduction.htm" target="hmcontent" onclick="return parent.hilight('s2')" ondblclick="javascript:parent.toggle('div2')"><span id="s2" class="heading1">Introduction</span></a></td></tr></table>

-<div id="div2" style="display:none">

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a2.1" href="system_requirements.htm" target="hmcontent" onclick="return parent.hilight('s2.1')" ondblclick="javascript:parent.toggle('div2.1')"><span id="s2.1" class="heading2">System Requirements</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a2.2" href="starting_icegrid_admin.htm" target="hmcontent" onclick="return parent.hilight('s2.2')" ondblclick="javascript:parent.toggle('div2.2')"><span id="s2.2" class="heading2">Starting IceGrid Admin</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a2.3" href="command_line_arguments.htm" target="hmcontent" onclick="return parent.hilight('s2.3')" ondblclick="javascript:parent.toggle('div2.3')"><span id="s2.3" class="heading2">Command-Line Arguments</span></a></td></tr></table>

-</div>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a3" href="main_window.htm" target="hmcontent" onclick="return parent.hilight('s3')" ondblclick="javascript:parent.toggle('div3')"><span id="s3" class="heading1">Main Window</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><a href="javascript:parent.toggle('div4')"><img id="i4" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a4" href="live_deployment.htm" target="hmcontent" onclick="return parent.hilight('s4')" ondblclick="javascript:parent.toggle('div4')"><span id="s4" class="heading1">Live Deployment</span></a></td></tr></table>

-<div id="div4" style="display:none">

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><a href="javascript:parent.toggle('div4.1')"><img id="i4.1" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a4.1" href="login.htm" target="hmcontent" onclick="return parent.hilight('s4.1')" ondblclick="javascript:parent.toggle('div4.1')"><span id="s4.1" class="heading2">Login</span></a></td></tr></table>

-<div id="div4.1" style="display:none">

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.1.1" href="ssl_configuration.htm" target="hmcontent" onclick="return parent.hilight('s4.1.1')" ondblclick="javascript:parent.toggle('div4.1.1')"><span id="s4.1.1" class="heading3">SSL Configuration</span></a></td></tr></table>

-</div>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.2" href="logout.htm" target="hmcontent" onclick="return parent.hilight('s4.2')" ondblclick="javascript:parent.toggle('div4.2')"><span id="s4.2" class="heading2">Logout</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><a href="javascript:parent.toggle('div4.3')"><img id="i4.3" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a4.3" href="runtime_components.htm" target="hmcontent" onclick="return parent.hilight('s4.3')" ondblclick="javascript:parent.toggle('div4.3')"><span id="s4.3" class="heading2">Runtime Components</span></a></td></tr></table>

-<div id="div4.3" style="display:none">

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.3.1" href="registry.htm" target="hmcontent" onclick="return parent.hilight('s4.3.1')" ondblclick="javascript:parent.toggle('div4.3.1')"><span id="s4.3.1" class="heading3">Registry</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.3.2" href="slave_registry.htm" target="hmcontent" onclick="return parent.hilight('s4.3.2')" ondblclick="javascript:parent.toggle('div4.3.2')"><span id="s4.3.2" class="heading3">Slave Registry</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.3.3" href="node.htm" target="hmcontent" onclick="return parent.hilight('s4.3.3')" ondblclick="javascript:parent.toggle('div4.3.3')"><span id="s4.3.3" class="heading3">Node</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.3.4" href="server.htm" target="hmcontent" onclick="return parent.hilight('s4.3.4')" ondblclick="javascript:parent.toggle('div4.3.4')"><span id="s4.3.4" class="heading3">Server</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.3.5" href="adapter.htm" target="hmcontent" onclick="return parent.hilight('s4.3.5')" ondblclick="javascript:parent.toggle('div4.3.5')"><span id="s4.3.5" class="heading3">Adapter</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.3.6" href="dbenv.htm" target="hmcontent" onclick="return parent.hilight('s4.3.6')" ondblclick="javascript:parent.toggle('div4.3.6')"><span id="s4.3.6" class="heading3">Database Environment</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.3.7" href="service.htm" target="hmcontent" onclick="return parent.hilight('s4.3.7')" ondblclick="javascript:parent.toggle('div4.3.7')"><span id="s4.3.7" class="heading3">Service</span></a></td></tr></table>

-</div>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.4" href="log_file_dialog.htm" target="hmcontent" onclick="return parent.hilight('s4.4')" ondblclick="javascript:parent.toggle('div4.4')"><span id="s4.4" class="heading2">Log File Dialog</span></a></td></tr></table>

-</div>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><a href="javascript:parent.toggle('div5')"><img id="i5" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a5" href="application.htm" target="hmcontent" onclick="return parent.hilight('s5')" ondblclick="javascript:parent.toggle('div5')"><span id="s5" class="heading1">Application</span></a></td></tr></table>

-<div id="div5" style="display:none">

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><a href="javascript:parent.toggle('div5.1')"><img id="i5.1" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a5.1" href="app_editing_and_saving.htm" target="hmcontent" onclick="return parent.hilight('s5.1')" ondblclick="javascript:parent.toggle('div5.1')"><span id="s5.1" class="heading2">Editing &amp; Saving</span></a></td></tr></table>

-<div id="div5.1" style="display:none">

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.1.1" href="app_copy__paste.htm" target="hmcontent" onclick="return parent.hilight('s5.1.1')" ondblclick="javascript:parent.toggle('div5.1.1')"><span id="s5.1.1" class="heading3">Copy &amp; Paste</span></a></td></tr></table>

-</div>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.2" href="app_navigation.htm" target="hmcontent" onclick="return parent.hilight('s5.2')" ondblclick="javascript:parent.toggle('div5.2')"><span id="s5.2" class="heading2">Navigation</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.3" href="app_variables.htm" target="hmcontent" onclick="return parent.hilight('s5.3')" ondblclick="javascript:parent.toggle('div5.3')"><span id="s5.3" class="heading2">Variables</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><a href="javascript:parent.toggle('div5.4')"><img id="i5.4" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a5.4" href="app_descriptors.htm" target="hmcontent" onclick="return parent.hilight('s5.4')" ondblclick="javascript:parent.toggle('div5.4')"><span id="s5.4" class="heading2">Descriptors</span></a></td></tr></table>

-<div id="div5.4" style="display:none">

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.1" href="app_application.htm" target="hmcontent" onclick="return parent.hilight('s5.4.1')" ondblclick="javascript:parent.toggle('div5.4.1')"><span id="s5.4.1" class="heading3">Application</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.2" href="app_node.htm" target="hmcontent" onclick="return parent.hilight('s5.4.2')" ondblclick="javascript:parent.toggle('div5.4.2')"><span id="s5.4.2" class="heading3">Node</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><a href="javascript:parent.toggle('div5.4.3')"><img id="i5.4.3" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a5.4.3" href="app_server.htm" target="hmcontent" onclick="return parent.hilight('s5.4.3')" ondblclick="javascript:parent.toggle('div5.4.3')"><span id="s5.4.3" class="heading3">Server</span></a></td></tr></table>

-<div id="div5.4.3" style="display:none">

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.3.1" href="app_plain_server.htm" target="hmcontent" onclick="return parent.hilight('s5.4.3.1')" ondblclick="javascript:parent.toggle('div5.4.3.1')"><span id="s5.4.3.1" class="heading4">Plain Server</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.3.2" href="app_icebox_server.htm" target="hmcontent" onclick="return parent.hilight('s5.4.3.2')" ondblclick="javascript:parent.toggle('div5.4.3.2')"><span id="s5.4.3.2" class="heading4">IceBox Server</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.3.3" href="app_server_instance.htm" target="hmcontent" onclick="return parent.hilight('s5.4.3.3')" ondblclick="javascript:parent.toggle('div5.4.3.3')"><span id="s5.4.3.3" class="heading4">Server Instance</span></a></td></tr></table>

-</div>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.4" href="app_adapter.htm" target="hmcontent" onclick="return parent.hilight('s5.4.4')" ondblclick="javascript:parent.toggle('div5.4.4')"><span id="s5.4.4" class="heading3">Adapter</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.5" href="app_dbenv.htm" target="hmcontent" onclick="return parent.hilight('s5.4.5')" ondblclick="javascript:parent.toggle('div5.4.5')"><span id="s5.4.5" class="heading3">Database Environment</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><a href="javascript:parent.toggle('div5.4.6')"><img id="i5.4.6" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a5.4.6" href="app_service.htm" target="hmcontent" onclick="return parent.hilight('s5.4.6')" ondblclick="javascript:parent.toggle('div5.4.6')"><span id="s5.4.6" class="heading3">Service</span></a></td></tr></table>

-<div id="div5.4.6" style="display:none">

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.6.1" href="app_plain_service.htm" target="hmcontent" onclick="return parent.hilight('s5.4.6.1')" ondblclick="javascript:parent.toggle('div5.4.6.1')"><span id="s5.4.6.1" class="heading4">Plain Service</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.6.2" href="app_service_instance.htm" target="hmcontent" onclick="return parent.hilight('s5.4.6.2')" ondblclick="javascript:parent.toggle('div5.4.6.2')"><span id="s5.4.6.2" class="heading4">Service Instance</span></a></td></tr></table>

-</div>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.7" href="app_property_set.htm" target="hmcontent" onclick="return parent.hilight('s5.4.7')" ondblclick="javascript:parent.toggle('div5.4.7')"><span id="s5.4.7" class="heading3">Property Set</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.8" href="app_replica__group.htm" target="hmcontent" onclick="return parent.hilight('s5.4.8')" ondblclick="javascript:parent.toggle('div5.4.8')"><span id="s5.4.8" class="heading3">Replica Group</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.9" href="app_server_template.htm" target="hmcontent" onclick="return parent.hilight('s5.4.9')" ondblclick="javascript:parent.toggle('div5.4.9')"><span id="s5.4.9" class="heading3">Server Template</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.10" href="app_service_template.htm" target="hmcontent" onclick="return parent.hilight('s5.4.10')" ondblclick="javascript:parent.toggle('div5.4.10')"><span id="s5.4.10" class="heading3">Service Template</span></a></td></tr></table>

-</div>

-</div>

-</div>

-<script type="text/javascript">

-parent.preloadicons('button_topic.gif','button_openbook.gif','button_closedbook.gif');</script>

-

-<hr size="1" /><p><span style="font-size: 8px">(c) 2007-2010, ZeroC, Inc.</span></p>

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ --><head>
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<!-- This line includes the general project style sheet (not required) -->
+   <link type="text/css" href="styles.css" rel="stylesheet">
+
+<!-- This block defines the styles of the TOC headings, change them as needed -->
+   <style type="text/css">
+       a { color: black; text-decoration: none }
+       a:visited {color: black}
+       a:hover { text-decoration: underline }
+       .navtitle    { font-size: 14pt; font-weight: bold; margin-bottom: 16px; }
+       .navbar      { font-size: 10pt; }
+
+       SPAN.heading1 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+       SPAN.heading2 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+       SPAN.heading3 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+       SPAN.heading4 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+       SPAN.heading5 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+       SPAN.heading6 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+
+       SPAN.hilight1 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }
+       SPAN.hilight2 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }
+       SPAN.hilight3 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }
+       SPAN.hilight4 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }
+       SPAN.hilight5 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }
+       SPAN.hilight6 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }
+
+   TD.toc { padding-bottom: 2px; padding-right: 3px }
+   TABLE.toc { border: 0 none; margin: 0px 0px 0px 0px; padding: 0px 0px 0px 4px; }
+   IMG.icon {}
+
+</style>
+</head>
+<body bgcolor="#FFFFFF" background="lines.gif" onload="parent.loadstate(document.getElementById('tree'));" onunload="parent.savestate(document.getElementById('tree'));">
+<!--  <body style="background: #FFFFFF; url(null) fixed no-repeat;" background="lines.gif" onload="parent.loadstate(document.getElementById('tree'));" onunload="parent.savestate(document.getElementById('tree'));"> -->
+<p class="navtitle">IceGrid Admin</p>
+<p class="navbar">
+<b>Contents</b>&nbsp;|&nbsp;<a href="icegridadmin_kwindex_dyn.html">Index</a>&nbsp;|&nbsp;<a href="icegridadmin_ftsearch.html">Search</a></p>
+<hr size="1" />
+
+<!-- Placeholder for the TOC - this variable is REQUIRED! -->
+<div id="tree">
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a1" href="welcome.htm" target="hmcontent" onclick="return parent.hilight('s1')" ondblclick="javascript:parent.toggle('div1')"><span id="s1" class="heading1">Welcome</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><a href="javascript:parent.toggle('div2')"><img id="i2" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a2" href="introduction.htm" target="hmcontent" onclick="return parent.hilight('s2')" ondblclick="javascript:parent.toggle('div2')"><span id="s2" class="heading1">Introduction</span></a></td></tr></table>
+<div id="div2" style="display:none">
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a2.1" href="system_requirements.htm" target="hmcontent" onclick="return parent.hilight('s2.1')" ondblclick="javascript:parent.toggle('div2.1')"><span id="s2.1" class="heading2">System Requirements</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a2.2" href="starting_icegrid_admin.htm" target="hmcontent" onclick="return parent.hilight('s2.2')" ondblclick="javascript:parent.toggle('div2.2')"><span id="s2.2" class="heading2">Starting IceGrid Admin</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a2.3" href="command_line_arguments.htm" target="hmcontent" onclick="return parent.hilight('s2.3')" ondblclick="javascript:parent.toggle('div2.3')"><span id="s2.3" class="heading2">Command-Line Arguments</span></a></td></tr></table>
+</div>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a3" href="main_window.htm" target="hmcontent" onclick="return parent.hilight('s3')" ondblclick="javascript:parent.toggle('div3')"><span id="s3" class="heading1">Main Window</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><a href="javascript:parent.toggle('div4')"><img id="i4" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a4" href="live_deployment.htm" target="hmcontent" onclick="return parent.hilight('s4')" ondblclick="javascript:parent.toggle('div4')"><span id="s4" class="heading1">Live Deployment</span></a></td></tr></table>
+<div id="div4" style="display:none">
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><a href="javascript:parent.toggle('div4.1')"><img id="i4.1" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a4.1" href="login.htm" target="hmcontent" onclick="return parent.hilight('s4.1')" ondblclick="javascript:parent.toggle('div4.1')"><span id="s4.1" class="heading2">Login</span></a></td></tr></table>
+<div id="div4.1" style="display:none">
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.1.1" href="ssl_configuration.htm" target="hmcontent" onclick="return parent.hilight('s4.1.1')" ondblclick="javascript:parent.toggle('div4.1.1')"><span id="s4.1.1" class="heading3">SSL Configuration</span></a></td></tr></table>
+</div>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.2" href="logout.htm" target="hmcontent" onclick="return parent.hilight('s4.2')" ondblclick="javascript:parent.toggle('div4.2')"><span id="s4.2" class="heading2">Logout</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><a href="javascript:parent.toggle('div4.3')"><img id="i4.3" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a4.3" href="runtime_components.htm" target="hmcontent" onclick="return parent.hilight('s4.3')" ondblclick="javascript:parent.toggle('div4.3')"><span id="s4.3" class="heading2">Runtime Components</span></a></td></tr></table>
+<div id="div4.3" style="display:none">
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.3.1" href="registry.htm" target="hmcontent" onclick="return parent.hilight('s4.3.1')" ondblclick="javascript:parent.toggle('div4.3.1')"><span id="s4.3.1" class="heading3">Registry</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.3.2" href="slave_registry.htm" target="hmcontent" onclick="return parent.hilight('s4.3.2')" ondblclick="javascript:parent.toggle('div4.3.2')"><span id="s4.3.2" class="heading3">Slave Registry</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.3.3" href="node.htm" target="hmcontent" onclick="return parent.hilight('s4.3.3')" ondblclick="javascript:parent.toggle('div4.3.3')"><span id="s4.3.3" class="heading3">Node</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.3.4" href="server.htm" target="hmcontent" onclick="return parent.hilight('s4.3.4')" ondblclick="javascript:parent.toggle('div4.3.4')"><span id="s4.3.4" class="heading3">Server</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.3.5" href="adapter.htm" target="hmcontent" onclick="return parent.hilight('s4.3.5')" ondblclick="javascript:parent.toggle('div4.3.5')"><span id="s4.3.5" class="heading3">Adapter</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.3.6" href="dbenv.htm" target="hmcontent" onclick="return parent.hilight('s4.3.6')" ondblclick="javascript:parent.toggle('div4.3.6')"><span id="s4.3.6" class="heading3">Database Environment</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.3.7" href="service.htm" target="hmcontent" onclick="return parent.hilight('s4.3.7')" ondblclick="javascript:parent.toggle('div4.3.7')"><span id="s4.3.7" class="heading3">Service</span></a></td></tr></table>
+</div>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a4.4" href="log_file_dialog.htm" target="hmcontent" onclick="return parent.hilight('s4.4')" ondblclick="javascript:parent.toggle('div4.4')"><span id="s4.4" class="heading2">Log File Dialog</span></a></td></tr></table>
+</div>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><a href="javascript:parent.toggle('div5')"><img id="i5" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a5" href="application.htm" target="hmcontent" onclick="return parent.hilight('s5')" ondblclick="javascript:parent.toggle('div5')"><span id="s5" class="heading1">Application</span></a></td></tr></table>
+<div id="div5" style="display:none">
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><a href="javascript:parent.toggle('div5.1')"><img id="i5.1" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a5.1" href="app_editing_and_saving.htm" target="hmcontent" onclick="return parent.hilight('s5.1')" ondblclick="javascript:parent.toggle('div5.1')"><span id="s5.1" class="heading2">Editing &amp; Saving</span></a></td></tr></table>
+<div id="div5.1" style="display:none">
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.1.1" href="app_copy__paste.htm" target="hmcontent" onclick="return parent.hilight('s5.1.1')" ondblclick="javascript:parent.toggle('div5.1.1')"><span id="s5.1.1" class="heading3">Copy &amp; Paste</span></a></td></tr></table>
+</div>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.2" href="app_navigation.htm" target="hmcontent" onclick="return parent.hilight('s5.2')" ondblclick="javascript:parent.toggle('div5.2')"><span id="s5.2" class="heading2">Navigation</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.3" href="app_variables.htm" target="hmcontent" onclick="return parent.hilight('s5.3')" ondblclick="javascript:parent.toggle('div5.3')"><span id="s5.3" class="heading2">Variables</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><a href="javascript:parent.toggle('div5.4')"><img id="i5.4" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a5.4" href="app_descriptors.htm" target="hmcontent" onclick="return parent.hilight('s5.4')" ondblclick="javascript:parent.toggle('div5.4')"><span id="s5.4" class="heading2">Descriptors</span></a></td></tr></table>
+<div id="div5.4" style="display:none">
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.1" href="app_application.htm" target="hmcontent" onclick="return parent.hilight('s5.4.1')" ondblclick="javascript:parent.toggle('div5.4.1')"><span id="s5.4.1" class="heading3">Application</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.2" href="app_node.htm" target="hmcontent" onclick="return parent.hilight('s5.4.2')" ondblclick="javascript:parent.toggle('div5.4.2')"><span id="s5.4.2" class="heading3">Node</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><a href="javascript:parent.toggle('div5.4.3')"><img id="i5.4.3" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a5.4.3" href="app_server.htm" target="hmcontent" onclick="return parent.hilight('s5.4.3')" ondblclick="javascript:parent.toggle('div5.4.3')"><span id="s5.4.3" class="heading3">Server</span></a></td></tr></table>
+<div id="div5.4.3" style="display:none">
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.3.1" href="app_plain_server.htm" target="hmcontent" onclick="return parent.hilight('s5.4.3.1')" ondblclick="javascript:parent.toggle('div5.4.3.1')"><span id="s5.4.3.1" class="heading4">Plain Server</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.3.2" href="app_icebox_server.htm" target="hmcontent" onclick="return parent.hilight('s5.4.3.2')" ondblclick="javascript:parent.toggle('div5.4.3.2')"><span id="s5.4.3.2" class="heading4">IceBox Server</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.3.3" href="app_server_instance.htm" target="hmcontent" onclick="return parent.hilight('s5.4.3.3')" ondblclick="javascript:parent.toggle('div5.4.3.3')"><span id="s5.4.3.3" class="heading4">Server Instance</span></a></td></tr></table>
+</div>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.4" href="app_adapter.htm" target="hmcontent" onclick="return parent.hilight('s5.4.4')" ondblclick="javascript:parent.toggle('div5.4.4')"><span id="s5.4.4" class="heading3">Adapter</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.5" href="app_dbenv.htm" target="hmcontent" onclick="return parent.hilight('s5.4.5')" ondblclick="javascript:parent.toggle('div5.4.5')"><span id="s5.4.5" class="heading3">Database Environment</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><a href="javascript:parent.toggle('div5.4.6')"><img id="i5.4.6" name="button_closedbook.gif:button_openbook.gif" class="icon" src="button_closedbook.gif" border="0" alt=""></a></span></td><td class="toc" align="left"><a id="a5.4.6" href="app_service.htm" target="hmcontent" onclick="return parent.hilight('s5.4.6')" ondblclick="javascript:parent.toggle('div5.4.6')"><span id="s5.4.6" class="heading3">Service</span></a></td></tr></table>
+<div id="div5.4.6" style="display:none">
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.6.1" href="app_plain_service.htm" target="hmcontent" onclick="return parent.hilight('s5.4.6.1')" ondblclick="javascript:parent.toggle('div5.4.6.1')"><span id="s5.4.6.1" class="heading4">Plain Service</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.6.2" href="app_service_instance.htm" target="hmcontent" onclick="return parent.hilight('s5.4.6.2')" ondblclick="javascript:parent.toggle('div5.4.6.2')"><span id="s5.4.6.2" class="heading4">Service Instance</span></a></td></tr></table>
+</div>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.7" href="app_property_set.htm" target="hmcontent" onclick="return parent.hilight('s5.4.7')" ondblclick="javascript:parent.toggle('div5.4.7')"><span id="s5.4.7" class="heading3">Property Set</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.8" href="app_replica__group.htm" target="hmcontent" onclick="return parent.hilight('s5.4.8')" ondblclick="javascript:parent.toggle('div5.4.8')"><span id="s5.4.8" class="heading3">Replica Group</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.9" href="app_server_template.htm" target="hmcontent" onclick="return parent.hilight('s5.4.9')" ondblclick="javascript:parent.toggle('div5.4.9')"><span id="s5.4.9" class="heading3">Server Template</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a id="a5.4.10" href="app_service_template.htm" target="hmcontent" onclick="return parent.hilight('s5.4.10')" ondblclick="javascript:parent.toggle('div5.4.10')"><span id="s5.4.10" class="heading3">Service Template</span></a></td></tr></table>
+</div>
+</div>
+</div>
+<script type="text/javascript">
+parent.preloadicons('button_topic.gif','button_openbook.gif','button_closedbook.gif');</script>
+
+<hr size="1" /><p><span style="font-size: 8px">(c) 2007-2010, ZeroC, Inc.</span></p>
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/icegridadmin_content_static.html b/java/resources/IceGridAdmin/icegridadmin_content_static.html
index 2bffb8d8930..356a796badf 100644
--- a/java/resources/IceGridAdmin/icegridadmin_content_static.html
+++ b/java/resources/IceGridAdmin/icegridadmin_content_static.html
@@ -1,90 +1,90 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ --><head>

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-

-<!-- This line includes the general project style sheet (not required) -->

-   <link type="text/css" href="styles.css" rel="stylesheet">

-

-<!-- This block defines the styles of the TOC headings, change them as needed -->

-   <style type="text/css">

-       a { color: black; text-decoration: none }

-       a:visited {color: black}

-       a:hover { text-decoration: underline }

-       .navtitle    { font-size: 14pt; font-weight: bold; margin-bottom: 16px; }

-       .navbar      { font-size: 10pt; }

-

-       SPAN.heading1 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-       SPAN.heading2 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-       SPAN.heading3 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-       SPAN.heading4 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-       SPAN.heading5 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-       SPAN.heading6 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-

-       SPAN.hilight1 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }

-       SPAN.hilight2 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }

-       SPAN.hilight3 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }

-       SPAN.hilight4 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }

-       SPAN.hilight5 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }

-       SPAN.hilight6 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }

-

-   TD.toc { padding-bottom: 2px; padding-right: 3px }

-   TABLE.toc { border: 0 none; margin: 0px 0px 0px 0px; padding: 0px 0px 0px 4px; }

-   IMG.icon {}

-

-</style>

-</head>

-<body bgcolor="#FFFFFF" background="lines.gif">

-<!--  <body style="background: #FFFFFF; url(null) fixed no-repeat;" background="lines.gif"> -->

-<p class="navtitle">IceGrid Admin</p>

-<p class="navbar">

-<b>Contents</b>&nbsp;|&nbsp;<a href="icegridadmin_kwindex_static.html">Index</a>&nbsp;</p>

-<hr size="1" />

-

-<!-- Placeholder for the TOC - this variable is REQUIRED! -->

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="welcome.htm" target="hmcontent"><span id="s1" class="heading1">Welcome</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="introduction.htm" target="hmcontent"><span id="s2" class="heading1">Introduction</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="system_requirements.htm" target="hmcontent"><span id="s2.1" class="heading2">System Requirements</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="starting_icegrid_admin.htm" target="hmcontent"><span id="s2.2" class="heading2">Starting IceGrid Admin</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="command_line_arguments.htm" target="hmcontent"><span id="s2.3" class="heading2">Command-Line Arguments</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="main_window.htm" target="hmcontent"><span id="s3" class="heading1">Main Window</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="live_deployment.htm" target="hmcontent"><span id="s4" class="heading1">Live Deployment</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="login.htm" target="hmcontent"><span id="s4.1" class="heading2">Login</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="ssl_configuration.htm" target="hmcontent"><span id="s4.1.1" class="heading3">SSL Configuration</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="logout.htm" target="hmcontent"><span id="s4.2" class="heading2">Logout</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="runtime_components.htm" target="hmcontent"><span id="s4.3" class="heading2">Runtime Components</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="registry.htm" target="hmcontent"><span id="s4.3.1" class="heading3">Registry</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="slave_registry.htm" target="hmcontent"><span id="s4.3.2" class="heading3">Slave Registry</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="node.htm" target="hmcontent"><span id="s4.3.3" class="heading3">Node</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="server.htm" target="hmcontent"><span id="s4.3.4" class="heading3">Server</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="adapter.htm" target="hmcontent"><span id="s4.3.5" class="heading3">Adapter</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="dbenv.htm" target="hmcontent"><span id="s4.3.6" class="heading3">Database Environment</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="service.htm" target="hmcontent"><span id="s4.3.7" class="heading3">Service</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="log_file_dialog.htm" target="hmcontent"><span id="s4.4" class="heading2">Log File Dialog</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="application.htm" target="hmcontent"><span id="s5" class="heading1">Application</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_editing_and_saving.htm" target="hmcontent"><span id="s5.1" class="heading2">Editing &amp; Saving</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_copy__paste.htm" target="hmcontent"><span id="s5.1.1" class="heading3">Copy &amp; Paste</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_navigation.htm" target="hmcontent"><span id="s5.2" class="heading2">Navigation</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_variables.htm" target="hmcontent"><span id="s5.3" class="heading2">Variables</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_descriptors.htm" target="hmcontent"><span id="s5.4" class="heading2">Descriptors</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_application.htm" target="hmcontent"><span id="s5.4.1" class="heading3">Application</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_node.htm" target="hmcontent"><span id="s5.4.2" class="heading3">Node</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_server.htm" target="hmcontent"><span id="s5.4.3" class="heading3">Server</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_plain_server.htm" target="hmcontent"><span id="s5.4.3.1" class="heading4">Plain Server</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_icebox_server.htm" target="hmcontent"><span id="s5.4.3.2" class="heading4">IceBox Server</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_server_instance.htm" target="hmcontent"><span id="s5.4.3.3" class="heading4">Server Instance</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_adapter.htm" target="hmcontent"><span id="s5.4.4" class="heading3">Adapter</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_dbenv.htm" target="hmcontent"><span id="s5.4.5" class="heading3">Database Environment</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_service.htm" target="hmcontent"><span id="s5.4.6" class="heading3">Service</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_plain_service.htm" target="hmcontent"><span id="s5.4.6.1" class="heading4">Plain Service</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_service_instance.htm" target="hmcontent"><span id="s5.4.6.2" class="heading4">Service Instance</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_property_set.htm" target="hmcontent"><span id="s5.4.7" class="heading3">Property Set</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_replica__group.htm" target="hmcontent"><span id="s5.4.8" class="heading3">Replica Group</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_server_template.htm" target="hmcontent"><span id="s5.4.9" class="heading3">Server Template</span></a></td></tr></table>

-<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_service_template.htm" target="hmcontent"><span id="s5.4.10" class="heading3">Service Template</span></a></td></tr></table>

-

-

-<hr size="1" /><p><span style="font-size: 8px">(c) 2007-2010, ZeroC, Inc.</span></p>

-</body>

-</html>

-

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ --><head>
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<!-- This line includes the general project style sheet (not required) -->
+   <link type="text/css" href="styles.css" rel="stylesheet">
+
+<!-- This block defines the styles of the TOC headings, change them as needed -->
+   <style type="text/css">
+       a { color: black; text-decoration: none }
+       a:visited {color: black}
+       a:hover { text-decoration: underline }
+       .navtitle    { font-size: 14pt; font-weight: bold; margin-bottom: 16px; }
+       .navbar      { font-size: 10pt; }
+
+       SPAN.heading1 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+       SPAN.heading2 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+       SPAN.heading3 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+       SPAN.heading4 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+       SPAN.heading5 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+       SPAN.heading6 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+
+       SPAN.hilight1 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }
+       SPAN.hilight2 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }
+       SPAN.hilight3 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }
+       SPAN.hilight4 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }
+       SPAN.hilight5 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }
+       SPAN.hilight6 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #FFFFFF; background: #002682; text-decoration: none }
+
+   TD.toc { padding-bottom: 2px; padding-right: 3px }
+   TABLE.toc { border: 0 none; margin: 0px 0px 0px 0px; padding: 0px 0px 0px 4px; }
+   IMG.icon {}
+
+</style>
+</head>
+<body bgcolor="#FFFFFF" background="lines.gif">
+<!--  <body style="background: #FFFFFF; url(null) fixed no-repeat;" background="lines.gif"> -->
+<p class="navtitle">IceGrid Admin</p>
+<p class="navbar">
+<b>Contents</b>&nbsp;|&nbsp;<a href="icegridadmin_kwindex_static.html">Index</a>&nbsp;</p>
+<hr size="1" />
+
+<!-- Placeholder for the TOC - this variable is REQUIRED! -->
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="welcome.htm" target="hmcontent"><span id="s1" class="heading1">Welcome</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="introduction.htm" target="hmcontent"><span id="s2" class="heading1">Introduction</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="system_requirements.htm" target="hmcontent"><span id="s2.1" class="heading2">System Requirements</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="starting_icegrid_admin.htm" target="hmcontent"><span id="s2.2" class="heading2">Starting IceGrid Admin</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="command_line_arguments.htm" target="hmcontent"><span id="s2.3" class="heading2">Command-Line Arguments</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="main_window.htm" target="hmcontent"><span id="s3" class="heading1">Main Window</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="live_deployment.htm" target="hmcontent"><span id="s4" class="heading1">Live Deployment</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="login.htm" target="hmcontent"><span id="s4.1" class="heading2">Login</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="ssl_configuration.htm" target="hmcontent"><span id="s4.1.1" class="heading3">SSL Configuration</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="logout.htm" target="hmcontent"><span id="s4.2" class="heading2">Logout</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="runtime_components.htm" target="hmcontent"><span id="s4.3" class="heading2">Runtime Components</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="registry.htm" target="hmcontent"><span id="s4.3.1" class="heading3">Registry</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="slave_registry.htm" target="hmcontent"><span id="s4.3.2" class="heading3">Slave Registry</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="node.htm" target="hmcontent"><span id="s4.3.3" class="heading3">Node</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="server.htm" target="hmcontent"><span id="s4.3.4" class="heading3">Server</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="adapter.htm" target="hmcontent"><span id="s4.3.5" class="heading3">Adapter</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="dbenv.htm" target="hmcontent"><span id="s4.3.6" class="heading3">Database Environment</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="service.htm" target="hmcontent"><span id="s4.3.7" class="heading3">Service</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="log_file_dialog.htm" target="hmcontent"><span id="s4.4" class="heading2">Log File Dialog</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="24" align="right"><span class="heading1"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="application.htm" target="hmcontent"><span id="s5" class="heading1">Application</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_editing_and_saving.htm" target="hmcontent"><span id="s5.1" class="heading2">Editing &amp; Saving</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_copy__paste.htm" target="hmcontent"><span id="s5.1.1" class="heading3">Copy &amp; Paste</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_navigation.htm" target="hmcontent"><span id="s5.2" class="heading2">Navigation</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_variables.htm" target="hmcontent"><span id="s5.3" class="heading2">Variables</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="48" align="right"><span class="heading2"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_descriptors.htm" target="hmcontent"><span id="s5.4" class="heading2">Descriptors</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_application.htm" target="hmcontent"><span id="s5.4.1" class="heading3">Application</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_node.htm" target="hmcontent"><span id="s5.4.2" class="heading3">Node</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_server.htm" target="hmcontent"><span id="s5.4.3" class="heading3">Server</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_plain_server.htm" target="hmcontent"><span id="s5.4.3.1" class="heading4">Plain Server</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_icebox_server.htm" target="hmcontent"><span id="s5.4.3.2" class="heading4">IceBox Server</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_server_instance.htm" target="hmcontent"><span id="s5.4.3.3" class="heading4">Server Instance</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_adapter.htm" target="hmcontent"><span id="s5.4.4" class="heading3">Adapter</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_dbenv.htm" target="hmcontent"><span id="s5.4.5" class="heading3">Database Environment</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_openbook.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_service.htm" target="hmcontent"><span id="s5.4.6" class="heading3">Service</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_plain_service.htm" target="hmcontent"><span id="s5.4.6.1" class="heading4">Plain Service</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="96" align="right"><span class="heading4"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_service_instance.htm" target="hmcontent"><span id="s5.4.6.2" class="heading4">Service Instance</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_property_set.htm" target="hmcontent"><span id="s5.4.7" class="heading3">Property Set</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_replica__group.htm" target="hmcontent"><span id="s5.4.8" class="heading3">Replica Group</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_server_template.htm" target="hmcontent"><span id="s5.4.9" class="heading3">Server Template</span></a></td></tr></table>
+<table class="toc" border="0" cellpadding="0" cellspacing="0"><tr valign="top"><td class="toc" width="72" align="right"><span class="heading3"><img class="icon" src="button_topic.gif" border="0" alt=""></span></td><td class="toc" align="left"><a href="app_service_template.htm" target="hmcontent"><span id="s5.4.10" class="heading3">Service Template</span></a></td></tr></table>
+
+
+<hr size="1" /><p><span style="font-size: 8px">(c) 2007-2010, ZeroC, Inc.</span></p>
+</body>
+</html>
+
diff --git a/java/resources/IceGridAdmin/icegridadmin_ftsearch.html b/java/resources/IceGridAdmin/icegridadmin_ftsearch.html
index 0d279cbf3a0..ae771e4f3f2 100644
--- a/java/resources/IceGridAdmin/icegridadmin_ftsearch.html
+++ b/java/resources/IceGridAdmin/icegridadmin_ftsearch.html
@@ -1,45 +1,45 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ --><head>

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-

-   <!-- This line includes the general project style sheet (not required) -->

-   <link type="text/css" href="styles.css" rel="stylesheet">

-

-   <!-- You can change the fonts, text colors, and styles of your search results with the CSS below -->

-   <style type="text/css">

-        a { color: black; text-decoration: none }

-        a:visited {color: black}

-        a:hover { text-decoration: underline }

-        .navtitle    { font-size: 14pt; font-weight: bold; margin-bottom: 16px; }

-        .navbar      { font-size: 10pt; }

-        .submit { font-size: 14px; }

-        .highlight { background: #FFFF40; }

-        .searchheading { font-size: 14px; font-weight: bold; }

-        .summary { font-size: 12px; font-style: italic; }

-        .results { font-size: 14px; }

-        .description { font-size: 14px; font-style: italic; }

-        .context { font-size: 14px; }

-        .result_title { font-size: 14px; font-weight: bold;}

- 	</style>

-</head>

-<body bgcolor="#FFFFFF" background="lines.gif">

-<p class="navtitle">IceGrid Admin</p>

-<p class="navbar">

-<a href="icegridadmin_content_dyn.html">Contents</a>

- | <a href="icegridadmin_kwindex_dyn.html">Index</a>

- | <b>Search</b>

-</p><hr size="1" />

-<p class="submit">Enter one or more keywords to search ('*' and '?' wildcards are supported):</p>

-<!-- This is where the search form and results will appear -->

-<div id="loadingmsg" align="center"><img src="cicon_loadindex_ani.gif" border="0" alt=""></div>

-<script type="text/javascript" src="settings.js" charset="ISO-8859-1"></script>

-<script type="text/javascript" src="zoom_search.js"></script>

-<script type="text/javascript">ZoomSearch();</script>

-

-

-<noscript>

-   You must have JavaScript enabled to use this version of the search engine.

-</noscript>

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ --><head>
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+   <!-- This line includes the general project style sheet (not required) -->
+   <link type="text/css" href="styles.css" rel="stylesheet">
+
+   <!-- You can change the fonts, text colors, and styles of your search results with the CSS below -->
+   <style type="text/css">
+        a { color: black; text-decoration: none }
+        a:visited {color: black}
+        a:hover { text-decoration: underline }
+        .navtitle    { font-size: 14pt; font-weight: bold; margin-bottom: 16px; }
+        .navbar      { font-size: 10pt; }
+        .submit { font-size: 14px; }
+        .highlight { background: #FFFF40; }
+        .searchheading { font-size: 14px; font-weight: bold; }
+        .summary { font-size: 12px; font-style: italic; }
+        .results { font-size: 14px; }
+        .description { font-size: 14px; font-style: italic; }
+        .context { font-size: 14px; }
+        .result_title { font-size: 14px; font-weight: bold;}
+ 	</style>
+</head>
+<body bgcolor="#FFFFFF" background="lines.gif">
+<p class="navtitle">IceGrid Admin</p>
+<p class="navbar">
+<a href="icegridadmin_content_dyn.html">Contents</a>
+ | <a href="icegridadmin_kwindex_dyn.html">Index</a>
+ | <b>Search</b>
+</p><hr size="1" />
+<p class="submit">Enter one or more keywords to search ('*' and '?' wildcards are supported):</p>
+<!-- This is where the search form and results will appear -->
+<div id="loadingmsg" align="center"><img src="cicon_loadindex_ani.gif" border="0" alt=""></div>
+<script type="text/javascript" src="settings.js" charset="ISO-8859-1"></script>
+<script type="text/javascript" src="zoom_search.js"></script>
+<script type="text/javascript">ZoomSearch();</script>
+
+
+<noscript>
+   You must have JavaScript enabled to use this version of the search engine.
+</noscript>
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/icegridadmin_kwindex_dyn.html b/java/resources/IceGridAdmin/icegridadmin_kwindex_dyn.html
index 5612ad9e86b..0172e5b051f 100644
--- a/java/resources/IceGridAdmin/icegridadmin_kwindex_dyn.html
+++ b/java/resources/IceGridAdmin/icegridadmin_kwindex_dyn.html
@@ -1,157 +1,157 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ --><head>

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-

-   <!-- This line includes the general project style sheet (not required) -->

-   <link type="text/css" href="styles.css" rel="stylesheet">

-

-   <style type="text/css">

-       a { color: black; text-decoration: none }

-       a:visited {color: black}

-       a:hover { text-decoration: underline }

-       .navtitle    { font-size: 14pt; font-weight: bold; margin-bottom: 16px; }

-       .navbar      { font-size: 10pt; }

-       .idxsection  { font-family: Arial,Helvetica; font-weight: bold; font-size: 21px; color: #000000; text-decoration: none;

-                    margin-top: 15px; margin-bottom: 0px; }

-       .idxkeyword  { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-       .idxkeyword2 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-       .idxlink     { font-family: Arial,Helvetica; font-weight: normal; font-size: 14px; color: #000000; text-decoration: none }

-       TABLE.idxtable { background: #F4F4F4; border-width: 1px; border-color: #000000; border-collapse: collapse;

-                        filter: progid:DXImageTransform.Microsoft.Shadow(color=B0B0B0, Direction=135, Strength=4) }

-       TD.idxtable    { background: #F4F4F4; }

-   </style>

-</head>

-<body bgcolor="#FFFFFF" background="lines.gif">

-<p class="navtitle">IceGrid Admin</p>

-<p class="navbar">

-<a href="icegridadmin_content_dyn.html">Contents</a>

- | <b>Index</b>

- | <a href="icegridadmin_ftsearch.html">Search</a>

-</p><hr size="1" />

-

-<br><a href="#A">A</a>

-  <a href="#B">B</a>

-  <a href="#C">C</a>

-  <a href="#D">D</a>

-  <a href="#E">E</a>

-  <a href="#F">F</a>

-  <a href="#H">H</a>

-  <a href="#I">I</a>

-  <a href="#J">J</a>

-  <a href="#K">K</a>

-  <a href="#L">L</a>

-  <a href="#M">M</a>

-  <a href="#N">N</a>

-  <a href="#O">O</a>

-  <a href="#P">P</a>

-  <a href="#R">R</a>

-  <a href="#S">S</a>

-  <a href="#T">T</a>

-  <a href="#U">U</a>

-  <a href="#V">V</a>

-  <a href="#W">W</a>

-  <a href="#X">X</a>

-  <a href="#Y">Y</a>

-  <a href="#Z">Z</a>

-

-<!-- Placeholder for the keyword index - this variable is REQUIRED! -->

-<script type="text/javascript">

-var currentdiv = null;

-var canhidelinks = true;

-function hmshowLinks(divID) {

-   var thisdiv = document.getElementById(divID);

-   canhidelinks = true;

-   hmhideLinks();

-   if (thisdiv) {

-      thisdiv.style.display = "block";

-      currentdiv = thisdiv;

-      thisdiv.onmouseover = divmouseover;

-      thisdiv.onmouseout = divmouseout;

-      document.onmouseup = hmhideLinks;

-   }

-}

-function divmouseover() { canhidelinks = false; }

-function divmouseout() { canhidelinks = true; }

-function hmhideLinks() {

-   if (canhidelinks) {

-      if (currentdiv) {

-         currentdiv.style.display = "none";

-         currentdiv.onmouseover = null;

-         currentdiv.onmouseout = null;

-      }

-      currentdiv = null;

-      document.onmouseout = null;

-   }

-}

-</script>

-<a name="A"></a><p class="idxsection">- A -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="javascript:void(0)" onclick="return hmshowLinks('k1')"><span class="idxkeyword">Activation Timeout</span></a></p>

-<div id="k1" style="position: relative; z-index: 1000; display: none; margin: 0px 0px 0px 20px; top: -3px">

-<table border="1" cellpadding="4" cellspacing="0" class="idxtable"><tr><td class="idxtable"><table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_plain_server.htm" target="hmcontent"><span class="idxlink">Plain Server</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_adapter.htm" target="hmcontent"><span class="idxlink">Adapter</span></a></td></tr></table></td></tr></table>

-</div>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="adapter.htm" target="hmcontent"><span class="idxkeyword">Adapter</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">application</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">application.distrib</span></a></p>

-<a name="D"></a><p class="idxsection">- D -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="dbenv.htm" target="hmcontent"><span class="idxkeyword">Database Environment</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="javascript:void(0)" onclick="return hmshowLinks('k6')"><span class="idxkeyword">DB Home</span></a></p>

-<div id="k6" style="position: relative; z-index: 1000; display: none; margin: 0px 0px 0px 20px; top: -3px">

-<table border="1" cellpadding="4" cellspacing="0" class="idxtable"><tr><td class="idxtable"><table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="dbenv.htm" target="hmcontent"><span class="idxlink">Database Environment</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_dbenv.htm" target="hmcontent"><span class="idxlink">Database Environment</span></a></td></tr></table></td></tr></table>

-</div>

-<a name="G"></a><p class="idxsection">- G -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="login.htm" target="hmcontent"><span class="idxkeyword">Glacier2 router</span></a></p>

-<a name="I"></a><p class="idxsection">- I -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="javascript:void(0)" onclick="return hmshowLinks('k8')"><span class="idxkeyword">Ice::Process</span></a></p>

-<div id="k8" style="position: relative; z-index: 1000; display: none; margin: 0px 0px 0px 20px; top: -3px">

-<table border="1" cellpadding="4" cellspacing="0" class="idxtable"><tr><td class="idxtable"><table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="adapter.htm" target="hmcontent"><span class="idxlink">Adapter</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_icebox_server.htm" target="hmcontent"><span class="idxlink">IceBox Server</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_adapter.htm" target="hmcontent"><span class="idxlink">Adapter</span></a></td></tr></table></td></tr></table>

-</div>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="introduction.htm" target="hmcontent"><span class="idxkeyword">icegridadmin</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.AuthenticateUsingSSL</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Password</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Trace.Observers</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Trace.SaveToRegistry</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Username</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="starting_icegrid_admin.htm" target="hmcontent"><span class="idxkeyword">IceGridGUI.jar</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.Alias</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.Keystore</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.KeystorePassword</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.Password</span></a></p>

-<a name="L"></a><p class="idxsection">- L -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_replica__group.htm" target="hmcontent"><span class="idxkeyword">Load Balancing</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_node.htm" target="hmcontent"><span class="idxkeyword">Load Factor</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_replica__group.htm" target="hmcontent"><span class="idxkeyword">Load Sample</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="log_file_dialog.htm" target="hmcontent"><span class="idxkeyword">Log File Dialog</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="login.htm" target="hmcontent"><span class="idxkeyword">Login dialog</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="logout.htm" target="hmcontent"><span class="idxkeyword">Logout</span></a></p>

-<a name="N"></a><p class="idxsection">- N -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="javascript:void(0)" onclick="return hmshowLinks('k26')"><span class="idxkeyword">node</span></a></p>

-<div id="k26" style="position: relative; z-index: 1000; display: none; margin: 0px 0px 0px 20px; top: -3px">

-<table border="1" cellpadding="4" cellspacing="0" class="idxtable"><tr><td class="idxtable"><table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="node.htm" target="hmcontent"><span class="idxlink">Node</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_variables.htm" target="hmcontent"><span class="idxlink">Variables</span></a></td></tr></table></td></tr></table>

-</div>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.datadir</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.hostname</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.machine</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.os</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.release</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.version</span></a></p>

-<a name="P"></a><p class="idxsection">- P -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">Pre-Defined Variables</span></a></p>

-<a name="R"></a><p class="idxsection">- R -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="registry.htm" target="hmcontent"><span class="idxkeyword">Registry</span></a></p>

-<a name="S"></a><p class="idxsection">- S -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="javascript:void(0)" onclick="return hmshowLinks('k35')"><span class="idxkeyword">server</span></a></p>

-<div id="k35" style="position: relative; z-index: 1000; display: none; margin: 0px 0px 0px 20px; top: -3px">

-<table border="1" cellpadding="4" cellspacing="0" class="idxtable"><tr><td class="idxtable"><table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="server.htm" target="hmcontent"><span class="idxlink">Server</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_variables.htm" target="hmcontent"><span class="idxlink">Variables</span></a></td></tr></table></td></tr></table>

-</div>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">server.distrib</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="javascript:void(0)" onclick="return hmshowLinks('k37')"><span class="idxkeyword">service</span></a></p>

-<div id="k37" style="position: relative; z-index: 1000; display: none; margin: 0px 0px 0px 20px; top: -3px">

-<table border="1" cellpadding="4" cellspacing="0" class="idxtable"><tr><td class="idxtable"><table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="service.htm" target="hmcontent"><span class="idxlink">Service</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_variables.htm" target="hmcontent"><span class="idxlink">Variables</span></a></td></tr></table></td></tr></table>

-</div>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">session.id</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="slave_registry.htm" target="hmcontent"><span class="idxkeyword">Slave Registry</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">SSL Configuration</span></a></p>

-

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ --><head>
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+   <!-- This line includes the general project style sheet (not required) -->
+   <link type="text/css" href="styles.css" rel="stylesheet">
+
+   <style type="text/css">
+       a { color: black; text-decoration: none }
+       a:visited {color: black}
+       a:hover { text-decoration: underline }
+       .navtitle    { font-size: 14pt; font-weight: bold; margin-bottom: 16px; }
+       .navbar      { font-size: 10pt; }
+       .idxsection  { font-family: Arial,Helvetica; font-weight: bold; font-size: 21px; color: #000000; text-decoration: none;
+                    margin-top: 15px; margin-bottom: 0px; }
+       .idxkeyword  { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+       .idxkeyword2 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+       .idxlink     { font-family: Arial,Helvetica; font-weight: normal; font-size: 14px; color: #000000; text-decoration: none }
+       TABLE.idxtable { background: #F4F4F4; border-width: 1px; border-color: #000000; border-collapse: collapse;
+                        filter: progid:DXImageTransform.Microsoft.Shadow(color=B0B0B0, Direction=135, Strength=4) }
+       TD.idxtable    { background: #F4F4F4; }
+   </style>
+</head>
+<body bgcolor="#FFFFFF" background="lines.gif">
+<p class="navtitle">IceGrid Admin</p>
+<p class="navbar">
+<a href="icegridadmin_content_dyn.html">Contents</a>
+ | <b>Index</b>
+ | <a href="icegridadmin_ftsearch.html">Search</a>
+</p><hr size="1" />
+
+<br><a href="#A">A</a>
+  <a href="#B">B</a>
+  <a href="#C">C</a>
+  <a href="#D">D</a>
+  <a href="#E">E</a>
+  <a href="#F">F</a>
+  <a href="#H">H</a>
+  <a href="#I">I</a>
+  <a href="#J">J</a>
+  <a href="#K">K</a>
+  <a href="#L">L</a>
+  <a href="#M">M</a>
+  <a href="#N">N</a>
+  <a href="#O">O</a>
+  <a href="#P">P</a>
+  <a href="#R">R</a>
+  <a href="#S">S</a>
+  <a href="#T">T</a>
+  <a href="#U">U</a>
+  <a href="#V">V</a>
+  <a href="#W">W</a>
+  <a href="#X">X</a>
+  <a href="#Y">Y</a>
+  <a href="#Z">Z</a>
+
+<!-- Placeholder for the keyword index - this variable is REQUIRED! -->
+<script type="text/javascript">
+var currentdiv = null;
+var canhidelinks = true;
+function hmshowLinks(divID) {
+   var thisdiv = document.getElementById(divID);
+   canhidelinks = true;
+   hmhideLinks();
+   if (thisdiv) {
+      thisdiv.style.display = "block";
+      currentdiv = thisdiv;
+      thisdiv.onmouseover = divmouseover;
+      thisdiv.onmouseout = divmouseout;
+      document.onmouseup = hmhideLinks;
+   }
+}
+function divmouseover() { canhidelinks = false; }
+function divmouseout() { canhidelinks = true; }
+function hmhideLinks() {
+   if (canhidelinks) {
+      if (currentdiv) {
+         currentdiv.style.display = "none";
+         currentdiv.onmouseover = null;
+         currentdiv.onmouseout = null;
+      }
+      currentdiv = null;
+      document.onmouseout = null;
+   }
+}
+</script>
+<a name="A"></a><p class="idxsection">- A -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="javascript:void(0)" onclick="return hmshowLinks('k1')"><span class="idxkeyword">Activation Timeout</span></a></p>
+<div id="k1" style="position: relative; z-index: 1000; display: none; margin: 0px 0px 0px 20px; top: -3px">
+<table border="1" cellpadding="4" cellspacing="0" class="idxtable"><tr><td class="idxtable"><table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_plain_server.htm" target="hmcontent"><span class="idxlink">Plain Server</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_adapter.htm" target="hmcontent"><span class="idxlink">Adapter</span></a></td></tr></table></td></tr></table>
+</div>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="adapter.htm" target="hmcontent"><span class="idxkeyword">Adapter</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">application</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">application.distrib</span></a></p>
+<a name="D"></a><p class="idxsection">- D -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="dbenv.htm" target="hmcontent"><span class="idxkeyword">Database Environment</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="javascript:void(0)" onclick="return hmshowLinks('k6')"><span class="idxkeyword">DB Home</span></a></p>
+<div id="k6" style="position: relative; z-index: 1000; display: none; margin: 0px 0px 0px 20px; top: -3px">
+<table border="1" cellpadding="4" cellspacing="0" class="idxtable"><tr><td class="idxtable"><table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="dbenv.htm" target="hmcontent"><span class="idxlink">Database Environment</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_dbenv.htm" target="hmcontent"><span class="idxlink">Database Environment</span></a></td></tr></table></td></tr></table>
+</div>
+<a name="G"></a><p class="idxsection">- G -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="login.htm" target="hmcontent"><span class="idxkeyword">Glacier2 router</span></a></p>
+<a name="I"></a><p class="idxsection">- I -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="javascript:void(0)" onclick="return hmshowLinks('k8')"><span class="idxkeyword">Ice::Process</span></a></p>
+<div id="k8" style="position: relative; z-index: 1000; display: none; margin: 0px 0px 0px 20px; top: -3px">
+<table border="1" cellpadding="4" cellspacing="0" class="idxtable"><tr><td class="idxtable"><table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="adapter.htm" target="hmcontent"><span class="idxlink">Adapter</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_icebox_server.htm" target="hmcontent"><span class="idxlink">IceBox Server</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_adapter.htm" target="hmcontent"><span class="idxlink">Adapter</span></a></td></tr></table></td></tr></table>
+</div>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="introduction.htm" target="hmcontent"><span class="idxkeyword">icegridadmin</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.AuthenticateUsingSSL</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Password</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Trace.Observers</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Trace.SaveToRegistry</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Username</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="starting_icegrid_admin.htm" target="hmcontent"><span class="idxkeyword">IceGridGUI.jar</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.Alias</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.Keystore</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.KeystorePassword</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.Password</span></a></p>
+<a name="L"></a><p class="idxsection">- L -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_replica__group.htm" target="hmcontent"><span class="idxkeyword">Load Balancing</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_node.htm" target="hmcontent"><span class="idxkeyword">Load Factor</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_replica__group.htm" target="hmcontent"><span class="idxkeyword">Load Sample</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="log_file_dialog.htm" target="hmcontent"><span class="idxkeyword">Log File Dialog</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="login.htm" target="hmcontent"><span class="idxkeyword">Login dialog</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="logout.htm" target="hmcontent"><span class="idxkeyword">Logout</span></a></p>
+<a name="N"></a><p class="idxsection">- N -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="javascript:void(0)" onclick="return hmshowLinks('k26')"><span class="idxkeyword">node</span></a></p>
+<div id="k26" style="position: relative; z-index: 1000; display: none; margin: 0px 0px 0px 20px; top: -3px">
+<table border="1" cellpadding="4" cellspacing="0" class="idxtable"><tr><td class="idxtable"><table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="node.htm" target="hmcontent"><span class="idxlink">Node</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_variables.htm" target="hmcontent"><span class="idxlink">Variables</span></a></td></tr></table></td></tr></table>
+</div>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.datadir</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.hostname</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.machine</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.os</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.release</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.version</span></a></p>
+<a name="P"></a><p class="idxsection">- P -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">Pre-Defined Variables</span></a></p>
+<a name="R"></a><p class="idxsection">- R -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="registry.htm" target="hmcontent"><span class="idxkeyword">Registry</span></a></p>
+<a name="S"></a><p class="idxsection">- S -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="javascript:void(0)" onclick="return hmshowLinks('k35')"><span class="idxkeyword">server</span></a></p>
+<div id="k35" style="position: relative; z-index: 1000; display: none; margin: 0px 0px 0px 20px; top: -3px">
+<table border="1" cellpadding="4" cellspacing="0" class="idxtable"><tr><td class="idxtable"><table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="server.htm" target="hmcontent"><span class="idxlink">Server</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_variables.htm" target="hmcontent"><span class="idxlink">Variables</span></a></td></tr></table></td></tr></table>
+</div>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">server.distrib</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="javascript:void(0)" onclick="return hmshowLinks('k37')"><span class="idxkeyword">service</span></a></p>
+<div id="k37" style="position: relative; z-index: 1000; display: none; margin: 0px 0px 0px 20px; top: -3px">
+<table border="1" cellpadding="4" cellspacing="0" class="idxtable"><tr><td class="idxtable"><table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="service.htm" target="hmcontent"><span class="idxlink">Service</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_variables.htm" target="hmcontent"><span class="idxlink">Variables</span></a></td></tr></table></td></tr></table>
+</div>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">session.id</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="slave_registry.htm" target="hmcontent"><span class="idxkeyword">Slave Registry</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">SSL Configuration</span></a></p>
+
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/icegridadmin_kwindex_static.html b/java/resources/IceGridAdmin/icegridadmin_kwindex_static.html
index f87729b9a3e..be77ac3d11d 100644
--- a/java/resources/IceGridAdmin/icegridadmin_kwindex_static.html
+++ b/java/resources/IceGridAdmin/icegridadmin_kwindex_static.html
@@ -1,128 +1,128 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ --><head>

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-

-   <!-- This line includes the general project style sheet (not required) -->

-   <link type="text/css" href="styles.css" rel="stylesheet">

-

-   <style type="text/css">

-       a { color: black; text-decoration: none }

-       a:visited {color: black}

-       a:hover { text-decoration: underline }

-       .navtitle    { font-size: 14pt; font-weight: bold; margin-bottom: 16px; }

-       .navbar      { font-size: 10pt; }

-       .idxsection  { font-family: Arial,Helvetica; font-weight: bold; font-size: 21px; color: #000000; text-decoration: none;

-                    margin-top: 15px; margin-bottom: 0px; }

-       .idxkeyword  { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-       .idxkeyword2 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }

-       .idxlink     { font-family: Arial,Helvetica; font-weight: normal; font-size: 14px; color: #000000; text-decoration: none }

-       TABLE.idxtable { background: #F4F4F4; border-width: 1px; border-color: #000000; border-collapse: collapse;

-                        filter: progid:DXImageTransform.Microsoft.Shadow(color=B0B0B0, Direction=135, Strength=4) }

-       TD.idxtable    { background: #F4F4F4; }

-   </style>

-</head>

-<body bgcolor="#FFFFFF" background="lines.gif">

-<p class="navtitle">IceGrid Admin</p>

-<p class="navbar">

-<a href="icegridadmin_content_static.html">Contents</a>

- | <b>Index</b>

-

-</p><hr size="1" />

-

-<br><a href="#A">A</a>

-  <a href="#B">B</a>

-  <a href="#C">C</a>

-  <a href="#D">D</a>

-  <a href="#E">E</a>

-  <a href="#F">F</a>

-  <a href="#H">H</a>

-  <a href="#I">I</a>

-  <a href="#J">J</a>

-  <a href="#K">K</a>

-  <a href="#L">L</a>

-  <a href="#M">M</a>

-  <a href="#N">N</a>

-  <a href="#O">O</a>

-  <a href="#P">P</a>

-  <a href="#R">R</a>

-  <a href="#S">S</a>

-  <a href="#T">T</a>

-  <a href="#U">U</a>

-  <a href="#V">V</a>

-  <a href="#W">W</a>

-  <a href="#X">X</a>

-  <a href="#Y">Y</a>

-  <a href="#Z">Z</a>

-

-<!-- Placeholder for the keyword index - this variable is REQUIRED! -->

-<a name="A"></a><p class="idxsection">- A -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><span class="idxkeyword">Activation Timeout</span></p>

-<div style="margin: 0px 0px 0px 50px;">

-<table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_plain_server.htm" target="hmcontent"><span class="idxlink">Plain Server</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_adapter.htm" target="hmcontent"><span class="idxlink">Adapter</span></a></td></tr></table>

-</div>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="adapter.htm" target="hmcontent"><span class="idxkeyword">Adapter</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">application</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">application.distrib</span></a></p>

-<a name="D"></a><p class="idxsection">- D -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="dbenv.htm" target="hmcontent"><span class="idxkeyword">Database Environment</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><span class="idxkeyword">DB Home</span></p>

-<div style="margin: 0px 0px 0px 50px;">

-<table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="dbenv.htm" target="hmcontent"><span class="idxlink">Database Environment</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_dbenv.htm" target="hmcontent"><span class="idxlink">Database Environment</span></a></td></tr></table>

-</div>

-<a name="G"></a><p class="idxsection">- G -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="login.htm" target="hmcontent"><span class="idxkeyword">Glacier2 router</span></a></p>

-<a name="I"></a><p class="idxsection">- I -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><span class="idxkeyword">Ice::Process</span></p>

-<div style="margin: 0px 0px 0px 50px;">

-<table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="adapter.htm" target="hmcontent"><span class="idxlink">Adapter</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_icebox_server.htm" target="hmcontent"><span class="idxlink">IceBox Server</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_adapter.htm" target="hmcontent"><span class="idxlink">Adapter</span></a></td></tr></table>

-</div>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="introduction.htm" target="hmcontent"><span class="idxkeyword">icegridadmin</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.AuthenticateUsingSSL</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Password</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Trace.Observers</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Trace.SaveToRegistry</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Username</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="starting_icegrid_admin.htm" target="hmcontent"><span class="idxkeyword">IceGridGUI.jar</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.Alias</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.Keystore</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.KeystorePassword</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.Password</span></a></p>

-<a name="L"></a><p class="idxsection">- L -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_replica__group.htm" target="hmcontent"><span class="idxkeyword">Load Balancing</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_node.htm" target="hmcontent"><span class="idxkeyword">Load Factor</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_replica__group.htm" target="hmcontent"><span class="idxkeyword">Load Sample</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="log_file_dialog.htm" target="hmcontent"><span class="idxkeyword">Log File Dialog</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="login.htm" target="hmcontent"><span class="idxkeyword">Login dialog</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="logout.htm" target="hmcontent"><span class="idxkeyword">Logout</span></a></p>

-<a name="N"></a><p class="idxsection">- N -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><span class="idxkeyword">node</span></p>

-<div style="margin: 0px 0px 0px 50px;">

-<table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="node.htm" target="hmcontent"><span class="idxlink">Node</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_variables.htm" target="hmcontent"><span class="idxlink">Variables</span></a></td></tr></table>

-</div>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.datadir</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.hostname</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.machine</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.os</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.release</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.version</span></a></p>

-<a name="P"></a><p class="idxsection">- P -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">Pre-Defined Variables</span></a></p>

-<a name="R"></a><p class="idxsection">- R -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="registry.htm" target="hmcontent"><span class="idxkeyword">Registry</span></a></p>

-<a name="S"></a><p class="idxsection">- S -</p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><span class="idxkeyword">server</span></p>

-<div style="margin: 0px 0px 0px 50px;">

-<table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="server.htm" target="hmcontent"><span class="idxlink">Server</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_variables.htm" target="hmcontent"><span class="idxlink">Variables</span></a></td></tr></table>

-</div>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">server.distrib</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><span class="idxkeyword">service</span></p>

-<div style="margin: 0px 0px 0px 50px;">

-<table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="service.htm" target="hmcontent"><span class="idxlink">Service</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_variables.htm" target="hmcontent"><span class="idxlink">Variables</span></a></td></tr></table>

-</div>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">session.id</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="slave_registry.htm" target="hmcontent"><span class="idxkeyword">Slave Registry</span></a></p>

-<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">SSL Configuration</span></a></p>

-

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ --><head>
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+   <!-- This line includes the general project style sheet (not required) -->
+   <link type="text/css" href="styles.css" rel="stylesheet">
+
+   <style type="text/css">
+       a { color: black; text-decoration: none }
+       a:visited {color: black}
+       a:hover { text-decoration: underline }
+       .navtitle    { font-size: 14pt; font-weight: bold; margin-bottom: 16px; }
+       .navbar      { font-size: 10pt; }
+       .idxsection  { font-family: Arial,Helvetica; font-weight: bold; font-size: 21px; color: #000000; text-decoration: none;
+                    margin-top: 15px; margin-bottom: 0px; }
+       .idxkeyword  { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+       .idxkeyword2 { font-family: Arial,Helvetica; font-weight: normal; font-size: 15px; color: #000000; text-decoration: none }
+       .idxlink     { font-family: Arial,Helvetica; font-weight: normal; font-size: 14px; color: #000000; text-decoration: none }
+       TABLE.idxtable { background: #F4F4F4; border-width: 1px; border-color: #000000; border-collapse: collapse;
+                        filter: progid:DXImageTransform.Microsoft.Shadow(color=B0B0B0, Direction=135, Strength=4) }
+       TD.idxtable    { background: #F4F4F4; }
+   </style>
+</head>
+<body bgcolor="#FFFFFF" background="lines.gif">
+<p class="navtitle">IceGrid Admin</p>
+<p class="navbar">
+<a href="icegridadmin_content_static.html">Contents</a>
+ | <b>Index</b>
+
+</p><hr size="1" />
+
+<br><a href="#A">A</a>
+  <a href="#B">B</a>
+  <a href="#C">C</a>
+  <a href="#D">D</a>
+  <a href="#E">E</a>
+  <a href="#F">F</a>
+  <a href="#H">H</a>
+  <a href="#I">I</a>
+  <a href="#J">J</a>
+  <a href="#K">K</a>
+  <a href="#L">L</a>
+  <a href="#M">M</a>
+  <a href="#N">N</a>
+  <a href="#O">O</a>
+  <a href="#P">P</a>
+  <a href="#R">R</a>
+  <a href="#S">S</a>
+  <a href="#T">T</a>
+  <a href="#U">U</a>
+  <a href="#V">V</a>
+  <a href="#W">W</a>
+  <a href="#X">X</a>
+  <a href="#Y">Y</a>
+  <a href="#Z">Z</a>
+
+<!-- Placeholder for the keyword index - this variable is REQUIRED! -->
+<a name="A"></a><p class="idxsection">- A -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><span class="idxkeyword">Activation Timeout</span></p>
+<div style="margin: 0px 0px 0px 50px;">
+<table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_plain_server.htm" target="hmcontent"><span class="idxlink">Plain Server</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_adapter.htm" target="hmcontent"><span class="idxlink">Adapter</span></a></td></tr></table>
+</div>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="adapter.htm" target="hmcontent"><span class="idxkeyword">Adapter</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">application</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">application.distrib</span></a></p>
+<a name="D"></a><p class="idxsection">- D -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="dbenv.htm" target="hmcontent"><span class="idxkeyword">Database Environment</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><span class="idxkeyword">DB Home</span></p>
+<div style="margin: 0px 0px 0px 50px;">
+<table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="dbenv.htm" target="hmcontent"><span class="idxlink">Database Environment</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_dbenv.htm" target="hmcontent"><span class="idxlink">Database Environment</span></a></td></tr></table>
+</div>
+<a name="G"></a><p class="idxsection">- G -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="login.htm" target="hmcontent"><span class="idxkeyword">Glacier2 router</span></a></p>
+<a name="I"></a><p class="idxsection">- I -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><span class="idxkeyword">Ice::Process</span></p>
+<div style="margin: 0px 0px 0px 50px;">
+<table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="adapter.htm" target="hmcontent"><span class="idxlink">Adapter</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_icebox_server.htm" target="hmcontent"><span class="idxlink">IceBox Server</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_adapter.htm" target="hmcontent"><span class="idxlink">Adapter</span></a></td></tr></table>
+</div>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="introduction.htm" target="hmcontent"><span class="idxkeyword">icegridadmin</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.AuthenticateUsingSSL</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Password</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Trace.Observers</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Trace.SaveToRegistry</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="command_line_arguments.htm" target="hmcontent"><span class="idxkeyword">IceGridAdmin.Username</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="starting_icegrid_admin.htm" target="hmcontent"><span class="idxkeyword">IceGridGUI.jar</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.Alias</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.Keystore</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.KeystorePassword</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">IceSSL.Password</span></a></p>
+<a name="L"></a><p class="idxsection">- L -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_replica__group.htm" target="hmcontent"><span class="idxkeyword">Load Balancing</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_node.htm" target="hmcontent"><span class="idxkeyword">Load Factor</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_replica__group.htm" target="hmcontent"><span class="idxkeyword">Load Sample</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="log_file_dialog.htm" target="hmcontent"><span class="idxkeyword">Log File Dialog</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="login.htm" target="hmcontent"><span class="idxkeyword">Login dialog</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="logout.htm" target="hmcontent"><span class="idxkeyword">Logout</span></a></p>
+<a name="N"></a><p class="idxsection">- N -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><span class="idxkeyword">node</span></p>
+<div style="margin: 0px 0px 0px 50px;">
+<table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="node.htm" target="hmcontent"><span class="idxlink">Node</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_variables.htm" target="hmcontent"><span class="idxlink">Variables</span></a></td></tr></table>
+</div>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.datadir</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.hostname</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.machine</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.os</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.release</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">node.version</span></a></p>
+<a name="P"></a><p class="idxsection">- P -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">Pre-Defined Variables</span></a></p>
+<a name="R"></a><p class="idxsection">- R -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="registry.htm" target="hmcontent"><span class="idxkeyword">Registry</span></a></p>
+<a name="S"></a><p class="idxsection">- S -</p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><span class="idxkeyword">server</span></p>
+<div style="margin: 0px 0px 0px 50px;">
+<table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="server.htm" target="hmcontent"><span class="idxlink">Server</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_variables.htm" target="hmcontent"><span class="idxlink">Variables</span></a></td></tr></table>
+</div>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">server.distrib</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><span class="idxkeyword">service</span></p>
+<div style="margin: 0px 0px 0px 50px;">
+<table border="0" cellpadding="0" cellspacing="0"><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="service.htm" target="hmcontent"><span class="idxlink">Service</span></a></td></tr><tr valign="baseline"><td><img src="ciconidx.gif" border="0" alt=""></td><td><a href="app_variables.htm" target="hmcontent"><span class="idxlink">Variables</span></a></td></tr></table>
+</div>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="app_variables.htm" target="hmcontent"><span class="idxkeyword">session.id</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="slave_registry.htm" target="hmcontent"><span class="idxkeyword">Slave Registry</span></a></p>
+<p class="idxkeyword" style="margin: 0px 0px 0px 0px"><a href="ssl_configuration.htm" target="hmcontent"><span class="idxkeyword">SSL Configuration</span></a></p>
+
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/icegridadmin_navigation.js b/java/resources/IceGridAdmin/icegridadmin_navigation.js
index a04c2ac4627..04c7ba21fc2 100644
--- a/java/resources/IceGridAdmin/icegridadmin_navigation.js
+++ b/java/resources/IceGridAdmin/icegridadmin_navigation.js
@@ -1,172 +1,172 @@
-/* ---------------- Script © 2005-2007 EC Software -----------------

-   This script was created by Help & Manual and is part of the      

-   "Browser-based Help" export format. This script is designed for  

-   use in combination with the output of Help & Manual and must not 

-   be used outside this context.     http://www.helpandmanual.com   

-                                                                    

-   Do not modify this file! It will be overwritten by Help & Manual.

------------------------------------------------------------------ */

-

-var usecookie = false;

-var tocselecting = false;

-var currentselection;

-var autocollapse = false;

-var treestate = "";  

-

-function fullexpand() { switchall(true); }

-function fullcollapse() { switchall(false); }

-

-function levelexpand(divID) {

-    var div = hmnavigation.document.getElementById(divID).firstChild;

-    while (div) {

-       switchdiv(div, div.id, true);

-       div = div.nextSibling;

-    }

-}

-

-function switchall(divvisible) {

-    var tree = hmnavigation.document.getElementById("tree");

-    if (tree) {

-       var items = tree.getElementsByTagName("div");

-       for(var i = 0; i < items.length; i++) if (divvisible != ((items[i].style.display=="block")?true:false)) switchdiv(items[i], items[i].id, divvisible);

-       if ((divvisible) && (currentselection)) intoview(currentselection, tree, false);

-    }

-}

-

-function loadstate(tree) {

-    var divID;

-    if ((treestate=="") && (usecookie)) treestate = document.cookie;

-    

-    while (treestate != "") {

-       divID = treestate.substring(0,treestate.indexOf(","));

-       treestate = treestate.substring(divID.length+1,treestate.length);

-       toggle(divID);

-    }

-    var topicID = hmcontent.location.href.substring(hmcontent.location.href.lastIndexOf("/")+1,hmcontent.location.href.length);

-    if (topicID.lastIndexOf("#") != -1) topicID = topicID.substring(0,topicID.lastIndexOf("#"));

-    if (topicID.lastIndexOf("?") != -1) topicID = topicID.substring(0,topicID.lastIndexOf("?"));

-    tocselecting = false;

-    currentselection = null;

-    lazysync(topicID);

-}

-

-function savestate(tree) {

-    treestate = "";

-    var items = tree.getElementsByTagName("div");

-    for(var i = 0; i < items.length; i++) if (items[i].style.display=="block") treestate = treestate.concat(items[i].id + ",");

-    if (usecookie) document.cookie = treestate;

-}

-

-function toggle(divID) {

-    var thisdiv = hmnavigation.document.getElementById(divID);

-    if (thisdiv) switchdiv(thisdiv, divID, ((thisdiv.style.display=="none")?true:false));

-}

-

-function switchdiv(thisdiv, divID, divvisible) {

-    var thisicon = hmnavigation.document.getElementById("i"+divID.substring(3,divID.length));

-    var icons = "";

-    if (thisicon) icons = thisicon.getAttribute("name");

-    if (divvisible) {

-       thisdiv.style.display="block";

-       if (thisicon) thisicon.src = icons.substring(icons.lastIndexOf(":")+1, icons.length);

-    }

-    else {

-       thisdiv.style.display="none";

-       if (thisicon) thisicon.src = icons.substring(0, icons.lastIndexOf(":"));

-    }

-}

-

-function hilightexpand(spanID, divID) {

-    hilight(spanID);

-    var thisdiv = hmnavigation.document.getElementById(divID);

-    if (thisdiv) switchdiv(thisdiv, divID, true);

-}

-

-function hilight(spanID) {

-    tocselecting = true;

-    var thisnode = null;

-    var selectionchanged = false;

-    thisnode = hmnavigation.document.getElementById(spanID);

-    if (thisnode) {

-       try {

-          if ((currentselection) && (currentselection != thisnode)) currentselection.className = "heading" + currentselection.className.substr(7,1);

-       }

-       catch(e){}

-       thisnode.className = "hilight"+thisnode.className.substr(7,1);

-       selectionchanged = (currentselection != thisnode);

-       currentselection = thisnode;

-    }

-    return selectionchanged;

-}

-

-function intoview(thisnode, tree, selectionchanged) {

-    var thisparent = thisnode;

-    while (thisparent != tree) {

-       if ((selectionchanged) && (thisparent.nodeName.toLowerCase()=="div")) switchdiv(thisparent,thisparent.id,true);

-       thisparent = thisparent.parentNode;

-    }

-    thisparent = thisnode;

-    for (var t=0; thisparent!=null; t+=thisparent.offsetTop, thisparent=thisparent.offsetParent);

-    var bt = (hmnavigation.window.pageYOffset)?hmnavigation.window.pageYOffset:hmnavigation.document.body.scrollTop;

-    var bh = (hmnavigation.window.innerHeight)?hmnavigation.window.innerHeight:hmnavigation.document.body.offsetHeight;

-    if ((t+thisnode.offsetHeight-bt) > bh) hmnavigation.window.scrollTo(0,(t+24-bh))

-    else if (t < bt) hmnavigation.window.scrollTo(0,t);              

-}

-

-function collapseunfocused(tree, selectedID) {

-    if (tree) {

-       var nodepath = "div"+selectedID.substring(1,selectedID.length);

-       var items = tree.getElementsByTagName("div");

-       for (var i = 0; i < items.length; i++) {

-          if (nodepath.lastIndexOf(items[i].id)<0) { switchdiv(items[i], items[i].id, false); }

-       }

-    }

-}

-

-function quicksync(aID) {

-    if (aID != "") {

-       var tree = hmnavigation.document.getElementById("tree");

-       if ((tree) && (!tocselecting)) {

-          var thisspan = hmnavigation.document.getElementById(aID);

-          if (thisspan) {

-             var selectionchanged = hilight("s"+aID.substring(1,aID.length));

-             intoview(thisspan, tree, selectionchanged);

-          }

-       }

-       if (autocollapse) {

-          if (currentselection) collapseunfocused(tree, currentselection.id);

-          else collapseunfocused(tree, "");

-       }

-    }

-    tocselecting = false;

-}

-

-function lazysync(topicID) {

-    if (topicID != "") {

-       var tree = hmnavigation.document.getElementById("tree");

-       if ((tree) && (!tocselecting)) {

-          var array = new Array(0);

-          var items = tree.getElementsByTagName("a");

-          for(var i = 0; i < items.length; i++) {

-             if (items[i].href.substring(items[i].href.lastIndexOf("/")+1,items[i].href.length)==topicID) {

-                var selectionchanged = hilight("s"+items[i].id.substring(1,items[i].id.length));

-                intoview(items[i], tree, selectionchanged);

-                break;

-             }

-          }

-       }

-       if (autocollapse) {

-          if (currentselection) collapseunfocused(tree, currentselection.id);

-          else collapseunfocused(tree, "");

-       }

-    }

-    tocselecting = false;

-}

-

-function preloadicons() {

-    var icons = new Array();

-    for (i=0; i<preloadicons.arguments.length; i++) {

-       icons[i] = new Image();

-       icons[i].src = preloadicons.arguments[i];

-    }

-}

+/* ---------------- Script © 2005-2007 EC Software -----------------
+   This script was created by Help & Manual and is part of the      
+   "Browser-based Help" export format. This script is designed for  
+   use in combination with the output of Help & Manual and must not 
+   be used outside this context.     http://www.helpandmanual.com   
+                                                                    
+   Do not modify this file! It will be overwritten by Help & Manual.
+----------------------------------------------------------------- */
+
+var usecookie = false;
+var tocselecting = false;
+var currentselection;
+var autocollapse = false;
+var treestate = "";  
+
+function fullexpand() { switchall(true); }
+function fullcollapse() { switchall(false); }
+
+function levelexpand(divID) {
+    var div = hmnavigation.document.getElementById(divID).firstChild;
+    while (div) {
+       switchdiv(div, div.id, true);
+       div = div.nextSibling;
+    }
+}
+
+function switchall(divvisible) {
+    var tree = hmnavigation.document.getElementById("tree");
+    if (tree) {
+       var items = tree.getElementsByTagName("div");
+       for(var i = 0; i < items.length; i++) if (divvisible != ((items[i].style.display=="block")?true:false)) switchdiv(items[i], items[i].id, divvisible);
+       if ((divvisible) && (currentselection)) intoview(currentselection, tree, false);
+    }
+}
+
+function loadstate(tree) {
+    var divID;
+    if ((treestate=="") && (usecookie)) treestate = document.cookie;
+    
+    while (treestate != "") {
+       divID = treestate.substring(0,treestate.indexOf(","));
+       treestate = treestate.substring(divID.length+1,treestate.length);
+       toggle(divID);
+    }
+    var topicID = hmcontent.location.href.substring(hmcontent.location.href.lastIndexOf("/")+1,hmcontent.location.href.length);
+    if (topicID.lastIndexOf("#") != -1) topicID = topicID.substring(0,topicID.lastIndexOf("#"));
+    if (topicID.lastIndexOf("?") != -1) topicID = topicID.substring(0,topicID.lastIndexOf("?"));
+    tocselecting = false;
+    currentselection = null;
+    lazysync(topicID);
+}
+
+function savestate(tree) {
+    treestate = "";
+    var items = tree.getElementsByTagName("div");
+    for(var i = 0; i < items.length; i++) if (items[i].style.display=="block") treestate = treestate.concat(items[i].id + ",");
+    if (usecookie) document.cookie = treestate;
+}
+
+function toggle(divID) {
+    var thisdiv = hmnavigation.document.getElementById(divID);
+    if (thisdiv) switchdiv(thisdiv, divID, ((thisdiv.style.display=="none")?true:false));
+}
+
+function switchdiv(thisdiv, divID, divvisible) {
+    var thisicon = hmnavigation.document.getElementById("i"+divID.substring(3,divID.length));
+    var icons = "";
+    if (thisicon) icons = thisicon.getAttribute("name");
+    if (divvisible) {
+       thisdiv.style.display="block";
+       if (thisicon) thisicon.src = icons.substring(icons.lastIndexOf(":")+1, icons.length);
+    }
+    else {
+       thisdiv.style.display="none";
+       if (thisicon) thisicon.src = icons.substring(0, icons.lastIndexOf(":"));
+    }
+}
+
+function hilightexpand(spanID, divID) {
+    hilight(spanID);
+    var thisdiv = hmnavigation.document.getElementById(divID);
+    if (thisdiv) switchdiv(thisdiv, divID, true);
+}
+
+function hilight(spanID) {
+    tocselecting = true;
+    var thisnode = null;
+    var selectionchanged = false;
+    thisnode = hmnavigation.document.getElementById(spanID);
+    if (thisnode) {
+       try {
+          if ((currentselection) && (currentselection != thisnode)) currentselection.className = "heading" + currentselection.className.substr(7,1);
+       }
+       catch(e){}
+       thisnode.className = "hilight"+thisnode.className.substr(7,1);
+       selectionchanged = (currentselection != thisnode);
+       currentselection = thisnode;
+    }
+    return selectionchanged;
+}
+
+function intoview(thisnode, tree, selectionchanged) {
+    var thisparent = thisnode;
+    while (thisparent != tree) {
+       if ((selectionchanged) && (thisparent.nodeName.toLowerCase()=="div")) switchdiv(thisparent,thisparent.id,true);
+       thisparent = thisparent.parentNode;
+    }
+    thisparent = thisnode;
+    for (var t=0; thisparent!=null; t+=thisparent.offsetTop, thisparent=thisparent.offsetParent);
+    var bt = (hmnavigation.window.pageYOffset)?hmnavigation.window.pageYOffset:hmnavigation.document.body.scrollTop;
+    var bh = (hmnavigation.window.innerHeight)?hmnavigation.window.innerHeight:hmnavigation.document.body.offsetHeight;
+    if ((t+thisnode.offsetHeight-bt) > bh) hmnavigation.window.scrollTo(0,(t+24-bh))
+    else if (t < bt) hmnavigation.window.scrollTo(0,t);              
+}
+
+function collapseunfocused(tree, selectedID) {
+    if (tree) {
+       var nodepath = "div"+selectedID.substring(1,selectedID.length);
+       var items = tree.getElementsByTagName("div");
+       for (var i = 0; i < items.length; i++) {
+          if (nodepath.lastIndexOf(items[i].id)<0) { switchdiv(items[i], items[i].id, false); }
+       }
+    }
+}
+
+function quicksync(aID) {
+    if (aID != "") {
+       var tree = hmnavigation.document.getElementById("tree");
+       if ((tree) && (!tocselecting)) {
+          var thisspan = hmnavigation.document.getElementById(aID);
+          if (thisspan) {
+             var selectionchanged = hilight("s"+aID.substring(1,aID.length));
+             intoview(thisspan, tree, selectionchanged);
+          }
+       }
+       if (autocollapse) {
+          if (currentselection) collapseunfocused(tree, currentselection.id);
+          else collapseunfocused(tree, "");
+       }
+    }
+    tocselecting = false;
+}
+
+function lazysync(topicID) {
+    if (topicID != "") {
+       var tree = hmnavigation.document.getElementById("tree");
+       if ((tree) && (!tocselecting)) {
+          var array = new Array(0);
+          var items = tree.getElementsByTagName("a");
+          for(var i = 0; i < items.length; i++) {
+             if (items[i].href.substring(items[i].href.lastIndexOf("/")+1,items[i].href.length)==topicID) {
+                var selectionchanged = hilight("s"+items[i].id.substring(1,items[i].id.length));
+                intoview(items[i], tree, selectionchanged);
+                break;
+             }
+          }
+       }
+       if (autocollapse) {
+          if (currentselection) collapseunfocused(tree, currentselection.id);
+          else collapseunfocused(tree, "");
+       }
+    }
+    tocselecting = false;
+}
+
+function preloadicons() {
+    var icons = new Array();
+    for (i=0; i<preloadicons.arguments.length; i++) {
+       icons[i] = new Image();
+       icons[i].src = preloadicons.arguments[i];
+    }
+}
diff --git a/java/resources/IceGridAdmin/index.html b/java/resources/IceGridAdmin/index.html
index a43519cacf5..a9962afefa3 100755
--- a/java/resources/IceGridAdmin/index.html
+++ b/java/resources/IceGridAdmin/index.html
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"

-  "http://www.w3.org/TR/html4/frameset.dtd">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head>

-<title>IceGrid Admin</title>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<script type="text/javascript" src="icegridadmin_navigation.js"></script>

-<script type="text/javascript">

-<!--

-var defaulttopic="welcome.htm";

-if (top.location.href.lastIndexOf("?") > 0) defaulttopic=top.location.href.substring(top.location.href.lastIndexOf("?")+1,top.location.href.length).replace(/:/g,"");

-document.write('<frameset cols="30%,*" frameborder="1" framespacing="1">');

-if (document.getElementById) {

-  document.write('<frame name="hmnavigation" src="icegridadmin_content_dyn.html" title="Navigation frame">'); }

-else {

-  document.write('<frame name="hmnavigation" src="icegridadmin_content_static.html" title="Navigation frame">'); }

-document.write('<frame name="hmcontent" src="' + defaulttopic + '" title="content frame">');

-document.write('</frameset>');

-//-->

-</script>

-</head>

-<noscript>

-  <frameset cols="30%,*" frameborder="1" framespacing="1">

-  <frame name="hmnavigation" src="icegridadmin_content_static.html" title="Navigation frame">

-  <frame name="hmcontent" src="welcome.htm" title="Content frame">

-  <noframes>

-    This page requires frames<br><a href="icegridadmin_content_static.html">Click here to view the table of contents without frames</a>

-  </noframes>

-  </frameset>

-</noscript>

-</html>

-

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+  "http://www.w3.org/TR/html4/frameset.dtd">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head>
+<title>IceGrid Admin</title>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<script type="text/javascript" src="icegridadmin_navigation.js"></script>
+<script type="text/javascript">
+<!--
+var defaulttopic="welcome.htm";
+if (top.location.href.lastIndexOf("?") > 0) defaulttopic=top.location.href.substring(top.location.href.lastIndexOf("?")+1,top.location.href.length).replace(/:/g,"");
+document.write('<frameset cols="30%,*" frameborder="1" framespacing="1">');
+if (document.getElementById) {
+  document.write('<frame name="hmnavigation" src="icegridadmin_content_dyn.html" title="Navigation frame">'); }
+else {
+  document.write('<frame name="hmnavigation" src="icegridadmin_content_static.html" title="Navigation frame">'); }
+document.write('<frame name="hmcontent" src="' + defaulttopic + '" title="content frame">');
+document.write('</frameset>');
+//-->
+</script>
+</head>
+<noscript>
+  <frameset cols="30%,*" frameborder="1" framespacing="1">
+  <frame name="hmnavigation" src="icegridadmin_content_static.html" title="Navigation frame">
+  <frame name="hmcontent" src="welcome.htm" title="Content frame">
+  <noframes>
+    This page requires frames<br><a href="icegridadmin_content_static.html">Click here to view the table of contents without frames</a>
+  </noframes>
+  </frameset>
+</noscript>
+</html>
+
diff --git a/java/resources/IceGridAdmin/introduction.htm b/java/resources/IceGridAdmin/introduction.htm
index 8304f95f569..2ce32514fa0 100644
--- a/java/resources/IceGridAdmin/introduction.htm
+++ b/java/resources/IceGridAdmin/introduction.htm
@@ -1,126 +1,126 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?introduction.htm"; }

-  else { parent.lazysync('introduction.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Introduction</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="icegridadmin">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   &raquo;No topics above this level&laquo;

-   </p>

-   <p class="p_Heading1"><span class="f_Heading1">Introduction</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="welcome.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="welcome.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="system_requirements.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p class="p_Heading2"><span class="f_Heading2">Everything you need to deploy IceGrid applications</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">IceGrid Admin is a comprehensive administration tool for IceGrid. With IceGrid Admin, you can:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Manage a live IceGrid deployment: browse the nodes and servers in your deployment, view status information, &nbsp;start/stop these processes, and much more.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Create all the definitions necessary to deploy an IceGrid application. You can start from scratch or retrieve existing definitions directly from a live IceGrid deployment or from an IceGrid XML file.</span></td></tr></table></div><p class="p_Heading2"><span class="f_Heading2">Other Tools</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">Although all IceGrid features are available through IceGrid Admin, it is not the only way to interact with an IceGrid deployment. Sometimes, it can be more convenient to use icegridadmin, a simple command-line tool. icegridadmin provides most IceGrid Admin features, in particular, you can use icegridadmin to add or update application definitions (described using IceGrid XML files) to an IceGrid registry. </span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">If you are writing Python or Ruby scripts, another option is to use directly the IceGrid API, and make remote Ice invocations using Ice-for-Python or Ice-for-Ruby.</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?introduction.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?introduction.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?introduction.htm"; }
+  else { parent.lazysync('introduction.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Introduction</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="icegridadmin">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   &raquo;No topics above this level&laquo;
+   </p>
+   <p class="p_Heading1"><span class="f_Heading1">Introduction</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="welcome.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="welcome.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="system_requirements.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p class="p_Heading2"><span class="f_Heading2">Everything you need to deploy IceGrid applications</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">IceGrid Admin is a comprehensive administration tool for IceGrid. With IceGrid Admin, you can:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Manage a live IceGrid deployment: browse the nodes and servers in your deployment, view status information, &nbsp;start/stop these processes, and much more.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Create all the definitions necessary to deploy an IceGrid application. You can start from scratch or retrieve existing definitions directly from a live IceGrid deployment or from an IceGrid XML file.</span></td></tr></table></div><p class="p_Heading2"><span class="f_Heading2">Other Tools</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">Although all IceGrid features are available through IceGrid Admin, it is not the only way to interact with an IceGrid deployment. Sometimes, it can be more convenient to use icegridadmin, a simple command-line tool. icegridadmin provides most IceGrid Admin features, in particular, you can use icegridadmin to add or update application definitions (described using IceGrid XML files) to an IceGrid registry. </span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">If you are writing Python or Ruby scripts, another option is to use directly the IceGrid API, and make remote Ice invocations using Ice-for-Python or Ice-for-Ruby.</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?introduction.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?introduction.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/live_deployment.htm b/java/resources/IceGridAdmin/live_deployment.htm
index 6047a3a0b81..304fde19c00 100644
--- a/java/resources/IceGridAdmin/live_deployment.htm
+++ b/java/resources/IceGridAdmin/live_deployment.htm
@@ -1,122 +1,122 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?live_deployment.htm"; }

-  else { parent.lazysync('live_deployment.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Live Deployment</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   &raquo;No topics above this level&laquo;

-   </p>

-   <p class="p_Heading1"><span class="f_Heading1">Live Deployment</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="main_window.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="welcome.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="login.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>The Live Deployment pane shows the runtime status and configuration of an existing IceGrid deployment, and allows you to perform various administrative tasks on this deployment, such as:</p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">start or stop a server</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">enable or disable a server</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">send signal to a server</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">retrieve the log files of a server </span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">patch an entire application</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">register a new &quot;well-known&quot; object with the IceGrid registry</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">undeploy a deployed application</span></td></tr></table></div>

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?live_deployment.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?live_deployment.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?live_deployment.htm"; }
+  else { parent.lazysync('live_deployment.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Live Deployment</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   &raquo;No topics above this level&laquo;
+   </p>
+   <p class="p_Heading1"><span class="f_Heading1">Live Deployment</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="main_window.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="welcome.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="login.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>The Live Deployment pane shows the runtime status and configuration of an existing IceGrid deployment, and allows you to perform various administrative tasks on this deployment, such as:</p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">start or stop a server</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">enable or disable a server</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">send signal to a server</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">retrieve the log files of a server </span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">patch an entire application</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">register a new &quot;well-known&quot; object with the IceGrid registry</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">undeploy a deployed application</span></td></tr></table></div>
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?live_deployment.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?live_deployment.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/log_file_dialog.htm b/java/resources/IceGridAdmin/log_file_dialog.htm
index 05a14a3d695..ee83e4a4620 100644
--- a/java/resources/IceGridAdmin/log_file_dialog.htm
+++ b/java/resources/IceGridAdmin/log_file_dialog.htm
@@ -1,141 +1,141 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?log_file_dialog.htm"; }

-  else { parent.lazysync('log_file_dialog.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Log File Dialog</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Log File Dialog">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="live_deployment.htm">Live Deployment</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Log File Dialog</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="service.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="live_deployment.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="application.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>The Log File dialog shows a log file (text file) retrieved through IceGrid. Often, a process will be writing to this log file and the dialog will periodically check for new lines to display.</p>

-<p class="p_IndentList2"><img src="log-file-dialog.png" width="397" height="379" border="0" alt=""></p>

-<p class="p_Heading2"><span class="f_Heading2">States</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A log file dialog is always in one of the following states:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Running</span><br>

-<span class="f_IndentList2">The dialog is periodically checking for new lines.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Paused</span><br>

-<span class="f_IndentList2">The dialog is &quot;connected&quot; to a remote log file but does not currently retrieve new lines.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Stopped</span><br>

-<span class="f_IndentList2">The dialog is not retrieving new lines from the remote log file.</span></td></tr></table></div><p class="p_Heading2"><span class="f_Heading2">Preferences</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">Use the </span><span class="f_T_Menu">Edit &gt; Preferences...</span><span class="f_IndentList2"> menu to open the Preferences dialog. These preferences apply to the current dialog and to any Log File dialog opened later on. </span></p>

-<p class="p_IndentList3"><img src="log-file-dialog-preferences.png" width="267" height="236" border="0" alt=""></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Max lines in buffer</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The maximum number of lines displayed in the log dialog.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Max characters in buffer</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The maximum number of characters displayed in the log dialog.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Initial tail</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When a new dialog is opened, or when restarting a stopped dialog, the dialog retrieves and displays </span><span class="f_T_Entry">Initial tail</span><span class="f_IndentList3"> lines.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Max bytes read per request</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The maximum number of bytes retrieve by each request. Pick a value that is low enough to make the dialog appear responsive and big enough to avoid many round-trips when lots of data are logged. &nbsp;IceGrid Admin requires a value between 100 and</span><span class="f_T_Code"> Ice.MessageSizeMax</span><span class="f_IndentList3"> - 512.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Poll period</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When in the running state, the dialog attempts to retrieve new lines from the log file (through IceGrid) every </span><span class="f_T_Entry">Poll period</span><span class="f_IndentList3"> seconds.</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?log_file_dialog.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?log_file_dialog.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?log_file_dialog.htm"; }
+  else { parent.lazysync('log_file_dialog.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Log File Dialog</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Log File Dialog">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="live_deployment.htm">Live Deployment</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Log File Dialog</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="service.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="live_deployment.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="application.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>The Log File dialog shows a log file (text file) retrieved through IceGrid. Often, a process will be writing to this log file and the dialog will periodically check for new lines to display.</p>
+<p class="p_IndentList2"><img src="log-file-dialog.png" width="397" height="379" border="0" alt=""></p>
+<p class="p_Heading2"><span class="f_Heading2">States</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A log file dialog is always in one of the following states:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Running</span><br>
+<span class="f_IndentList2">The dialog is periodically checking for new lines.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Paused</span><br>
+<span class="f_IndentList2">The dialog is &quot;connected&quot; to a remote log file but does not currently retrieve new lines.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Stopped</span><br>
+<span class="f_IndentList2">The dialog is not retrieving new lines from the remote log file.</span></td></tr></table></div><p class="p_Heading2"><span class="f_Heading2">Preferences</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">Use the </span><span class="f_T_Menu">Edit &gt; Preferences...</span><span class="f_IndentList2"> menu to open the Preferences dialog. These preferences apply to the current dialog and to any Log File dialog opened later on. </span></p>
+<p class="p_IndentList3"><img src="log-file-dialog-preferences.png" width="267" height="236" border="0" alt=""></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Max lines in buffer</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The maximum number of lines displayed in the log dialog.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Max characters in buffer</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The maximum number of characters displayed in the log dialog.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Initial tail</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When a new dialog is opened, or when restarting a stopped dialog, the dialog retrieves and displays </span><span class="f_T_Entry">Initial tail</span><span class="f_IndentList3"> lines.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Max bytes read per request</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The maximum number of bytes retrieve by each request. Pick a value that is low enough to make the dialog appear responsive and big enough to avoid many round-trips when lots of data are logged. &nbsp;IceGrid Admin requires a value between 100 and</span><span class="f_T_Code"> Ice.MessageSizeMax</span><span class="f_IndentList3"> - 512.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Poll period</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When in the running state, the dialog attempts to retrieve new lines from the log file (through IceGrid) every </span><span class="f_T_Entry">Poll period</span><span class="f_IndentList3"> seconds.</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?log_file_dialog.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?log_file_dialog.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/login.htm b/java/resources/IceGridAdmin/login.htm
index 422f5ca604f..ff3b7d91240 100644
--- a/java/resources/IceGridAdmin/login.htm
+++ b/java/resources/IceGridAdmin/login.htm
@@ -1,161 +1,161 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?login.htm"; }

-  else { parent.lazysync('login.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Login</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Login dialog,Glacier2 router">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="live_deployment.htm">Live Deployment</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Login</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="live_deployment.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="live_deployment.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="ssl_configuration.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>The Login dialog allows you to connect to an IceGrid registry and retrieve information about the nodes and servers associated with this registry. Use<span class="f_T_Menu"> File &gt; Login...</span> or press the <img src="login.png" width="24" height="24" border="0" alt=""> button to open the Login dialog:</p>

-<p>&nbsp;</p>

-<p class="p_IndentList3"><img src="login-basic.png" width="455" height="640" border="0" alt=""></p>

-<p class="p_Heading2"><span class="f_Heading2">Direct Connection</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">Select the Direct tab to connect directly to the IceGrid registry, that is, without going through an intermediary Glacier2 router. This is the most common type of login. </span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">An IceGrid registry can support two forms of authentication:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Username and Password</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The IceGrid registry authenticates IceGrid Admin using the provided username and password.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">SSL Authentication</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When you check </span><span class="f_T_Entry">Use SSL for authentication</span><span class="f_IndentList3">, the IceGrid registry uses SSL credentials to authenticate IceGrid Admin. The username and password are not used for this form of login.</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The other fields in the Direct panel are:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Enable IceSSL</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When checked, IceGrid Admin loads the IceSSL plugin. You need to load the IceSSL plugin in order to use &quot;ssl&quot; endpoints.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">IceGrid Instance Name</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The name of your IceGrid instance. This corresponds to the value of the </span><span class="f_T_Entry">IceGrid.InstanceName</span><span class="f_IndentList3"> property of your IceGrid registry.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">IceGrid Registry Endpoint(s)</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The client endpoint(s) of your IceGrid registry, or registries if your deployment has several registry replicas. This corresponds to the value of the </span><span class="f_T_Entry">IceGrid.Registry.Client.Endpoints</span><span class="f_IndentList3"> property (or </span><span class="f_T_Entry">IceGrid.Registry.Client.PublishedEndpoints</span><span class="f_IndentList3">, if set) of your IceGrid registry (or registries).</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Connect to Master Registry</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">If you have a non-replicated IceGrid registry, checking or unchecking this box makes no difference. </span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When you have several IceGrid registry replicas, you may want to connect to a specific registry replica or to the Master registry. If you want to connect to a specific replica, enter the endpoint(s) of this specific replica in the </span><span class="f_T_Entry">IceGrid Registry Endpoint(s) </span><span class="f_IndentList3"> field and leave this box unchecked. If you want to connect to the Master registry, enter the endpoint(s) of any replica in the </span><span class="f_T_Entry">IceGrid Registry Endpoint(s) </span><span class="f_IndentList3"> field and check this box. Note that you can only update application definitions when you are connected to the Master registry.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Routed Connection</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">Select the Routed tab to connect to an IceGrid registry through a Glacier2 router. The fields are similar to the fields in the Direct tab, but an important difference: the target is a Glacier2 router, not an IceGrid registry.</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>

-<p class="p_IndentList3"><img src="login-routed.png" width="437" height="243" border="0" alt=""></p>

-<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A Glacier2 router can support two forms of authentication:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Username and Password</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The router authenticates IceGrid Admin using the provided username and password.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">SSL Authentication</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When you check </span><span class="f_T_Entry">Use SSL for authentication</span><span class="f_IndentList3">, the router uses SSL credentials to authenticate IceGrid Admin. The username and password are not used for this form of login.</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The other fields in the Routed panel are:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Enable IceSSL</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">When checked, IceGrid Admin loads the IceSSL plugin. You need to load the IceSSL plugin in order to use ssl endpoints.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Glacier2 Instance Name</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The name of your Glacier2 instance. This corresponds to the value of the </span><span class="f_T_Entry">Glacier2.InstanceName</span><span class="f_IndentList3"> property of your Glacier2 router.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Glacier2 Router Endpoint(s)</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The client endpoint(s) of your router. This corresponds to the value of the </span><span class="f_T_Entry">Glacier2.Client.Endpoints</span><span class="f_IndentList3"> property (or </span><span class="f_T_Entry">Glacier2.Client.PublishedEndpoints</span><span class="f_IndentList3">, if set) of your Glacier2 router.</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A Glacier2 router can only give access to a specific IceGrid registry instance, even when this instance is part of set of replicated IceGrid registries. As a result, there is nothing equivalent to the </span><span class="f_T_Entry">Connect to Master Registry</span><span class="f_IndentList2"> check-box in the Routed pane.</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?login.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?login.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?login.htm"; }
+  else { parent.lazysync('login.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Login</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Login dialog,Glacier2 router">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="live_deployment.htm">Live Deployment</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Login</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="live_deployment.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="live_deployment.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="ssl_configuration.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>The Login dialog allows you to connect to an IceGrid registry and retrieve information about the nodes and servers associated with this registry. Use<span class="f_T_Menu"> File &gt; Login...</span> or press the <img src="login.png" width="24" height="24" border="0" alt=""> button to open the Login dialog:</p>
+<p>&nbsp;</p>
+<p class="p_IndentList3"><img src="login-basic.png" width="455" height="640" border="0" alt=""></p>
+<p class="p_Heading2"><span class="f_Heading2">Direct Connection</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">Select the Direct tab to connect directly to the IceGrid registry, that is, without going through an intermediary Glacier2 router. This is the most common type of login. </span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">An IceGrid registry can support two forms of authentication:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Username and Password</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The IceGrid registry authenticates IceGrid Admin using the provided username and password.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">SSL Authentication</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When you check </span><span class="f_T_Entry">Use SSL for authentication</span><span class="f_IndentList3">, the IceGrid registry uses SSL credentials to authenticate IceGrid Admin. The username and password are not used for this form of login.</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The other fields in the Direct panel are:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Enable IceSSL</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When checked, IceGrid Admin loads the IceSSL plugin. You need to load the IceSSL plugin in order to use &quot;ssl&quot; endpoints.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">IceGrid Instance Name</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The name of your IceGrid instance. This corresponds to the value of the </span><span class="f_T_Entry">IceGrid.InstanceName</span><span class="f_IndentList3"> property of your IceGrid registry.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">IceGrid Registry Endpoint(s)</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The client endpoint(s) of your IceGrid registry, or registries if your deployment has several registry replicas. This corresponds to the value of the </span><span class="f_T_Entry">IceGrid.Registry.Client.Endpoints</span><span class="f_IndentList3"> property (or </span><span class="f_T_Entry">IceGrid.Registry.Client.PublishedEndpoints</span><span class="f_IndentList3">, if set) of your IceGrid registry (or registries).</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Connect to Master Registry</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">If you have a non-replicated IceGrid registry, checking or unchecking this box makes no difference. </span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When you have several IceGrid registry replicas, you may want to connect to a specific registry replica or to the Master registry. If you want to connect to a specific replica, enter the endpoint(s) of this specific replica in the </span><span class="f_T_Entry">IceGrid Registry Endpoint(s) </span><span class="f_IndentList3"> field and leave this box unchecked. If you want to connect to the Master registry, enter the endpoint(s) of any replica in the </span><span class="f_T_Entry">IceGrid Registry Endpoint(s) </span><span class="f_IndentList3"> field and check this box. Note that you can only update application definitions when you are connected to the Master registry.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Routed Connection</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">Select the Routed tab to connect to an IceGrid registry through a Glacier2 router. The fields are similar to the fields in the Direct tab, but an important difference: the target is a Glacier2 router, not an IceGrid registry.</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>
+<p class="p_IndentList3"><img src="login-routed.png" width="437" height="243" border="0" alt=""></p>
+<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A Glacier2 router can support two forms of authentication:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Username and Password</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The router authenticates IceGrid Admin using the provided username and password.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">SSL Authentication</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When you check </span><span class="f_T_Entry">Use SSL for authentication</span><span class="f_IndentList3">, the router uses SSL credentials to authenticate IceGrid Admin. The username and password are not used for this form of login.</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The other fields in the Routed panel are:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Enable IceSSL</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">When checked, IceGrid Admin loads the IceSSL plugin. You need to load the IceSSL plugin in order to use ssl endpoints.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Glacier2 Instance Name</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The name of your Glacier2 instance. This corresponds to the value of the </span><span class="f_T_Entry">Glacier2.InstanceName</span><span class="f_IndentList3"> property of your Glacier2 router.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Glacier2 Router Endpoint(s)</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The client endpoint(s) of your router. This corresponds to the value of the </span><span class="f_T_Entry">Glacier2.Client.Endpoints</span><span class="f_IndentList3"> property (or </span><span class="f_T_Entry">Glacier2.Client.PublishedEndpoints</span><span class="f_IndentList3">, if set) of your Glacier2 router.</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A Glacier2 router can only give access to a specific IceGrid registry instance, even when this instance is part of set of replicated IceGrid registries. As a result, there is nothing equivalent to the </span><span class="f_T_Entry">Connect to Master Registry</span><span class="f_IndentList2"> check-box in the Routed pane.</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?login.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?login.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/logout.htm b/java/resources/IceGridAdmin/logout.htm
index 022fd180b5d..d6b950ce590 100644
--- a/java/resources/IceGridAdmin/logout.htm
+++ b/java/resources/IceGridAdmin/logout.htm
@@ -1,122 +1,122 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?logout.htm"; }

-  else { parent.lazysync('logout.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Logout</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Logout">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="live_deployment.htm">Live Deployment</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Logout</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="ssl_configuration.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="live_deployment.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="runtime_components.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>Use<span class="f_T_Menu"> File &gt; Logout</span> or press the <img src="logout.png" width="24" height="24" border="0" alt=""> button to disconnect from an IceGrid registry. This clears all information in the Live Deployment pane.</p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?logout.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?logout.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?logout.htm"; }
+  else { parent.lazysync('logout.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Logout</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Logout">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="live_deployment.htm">Live Deployment</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Logout</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="ssl_configuration.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="live_deployment.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="runtime_components.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>Use<span class="f_T_Menu"> File &gt; Logout</span> or press the <img src="logout.png" width="24" height="24" border="0" alt=""> button to disconnect from an IceGrid registry. This clears all information in the Live Deployment pane.</p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?logout.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?logout.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/main_window.htm b/java/resources/IceGridAdmin/main_window.htm
index fdddf92a667..ed2185f2462 100644
--- a/java/resources/IceGridAdmin/main_window.htm
+++ b/java/resources/IceGridAdmin/main_window.htm
@@ -1,129 +1,129 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?main_window.htm"; }

-  else { parent.lazysync('main_window.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Main Window</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   &raquo;No topics above this level&laquo;

-   </p>

-   <p class="p_Heading1"><span class="f_Heading1">Main Window</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="command_line_arguments.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="welcome.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="live_deployment.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>The main IceGrid Admin window allows to navigate between your live deployment and the definitions of several applications.</p>

-<p class="p_Heading2"><span class="f_Heading2">Tabs</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The main IceGrid Admin window shows one or more tabs:</span></p>

-<p class="p_IndentList3"><img src="tabs.png" width="361" height="129" border="0" alt=""></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">The Live Deployment tab (</span><img src="live_deployment.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">) displays information about an IceGrid deployment you have logged into. There is always one and only one Live Deployment tab. When you are not connected to an IceGrid deployment, the corresponding pane is empty.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">A Live Application tab (</span><img src="registry_bound_application.png" width="16" height="16" border="0" alt=""><span class="f_ImageCaption">) </span><span class="f_IndentList2">displays application definitions retrieved from the IceGrid registry you are connected to. As long as you do not change anything in the associated pane, IceGrid Admin will keep the information up-to-date. For example if another administrator adds a new server definition in this application definition, it will appear automatically and immediately in this pane.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_ImageCaption"> </span><span class="f_IndentList2">A File-Based Application tab (</span><img src="file_bound_application.png" width="16" height="16" border="0" alt=""><span class="f_ImageCaption">)</span><span class="f_IndentList2"> displays application definitions retrieved from an IceGrid XML file.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">An icon-less tab displays the definitions of an application that is not bound to an IceGrid registry or to a file, such as a brand new application. A live application with unsaved modifications also becomes icon-less if the connection to its IceGrid registry is lost. </span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">IceGrid Admin may show any number of application tabs, including none at all.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Status Bar</span></p>

-<p><span class="f_IndentList2">The status bar at the bottom of the main window shows information about operations performed by IceGrid Admin, or messages received from the IceGrid registry.</span></p>

-<p class="p_IndentList3"><img src="statusbar.png" width="636" height="65" border="0" alt=""></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?main_window.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?main_window.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?main_window.htm"; }
+  else { parent.lazysync('main_window.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Main Window</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   &raquo;No topics above this level&laquo;
+   </p>
+   <p class="p_Heading1"><span class="f_Heading1">Main Window</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="command_line_arguments.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="welcome.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="live_deployment.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>The main IceGrid Admin window allows to navigate between your live deployment and the definitions of several applications.</p>
+<p class="p_Heading2"><span class="f_Heading2">Tabs</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The main IceGrid Admin window shows one or more tabs:</span></p>
+<p class="p_IndentList3"><img src="tabs.png" width="361" height="129" border="0" alt=""></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">The Live Deployment tab (</span><img src="live_deployment.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">) displays information about an IceGrid deployment you have logged into. There is always one and only one Live Deployment tab. When you are not connected to an IceGrid deployment, the corresponding pane is empty.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">A Live Application tab (</span><img src="registry_bound_application.png" width="16" height="16" border="0" alt=""><span class="f_ImageCaption">) </span><span class="f_IndentList2">displays application definitions retrieved from the IceGrid registry you are connected to. As long as you do not change anything in the associated pane, IceGrid Admin will keep the information up-to-date. For example if another administrator adds a new server definition in this application definition, it will appear automatically and immediately in this pane.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_ImageCaption"> </span><span class="f_IndentList2">A File-Based Application tab (</span><img src="file_bound_application.png" width="16" height="16" border="0" alt=""><span class="f_ImageCaption">)</span><span class="f_IndentList2"> displays application definitions retrieved from an IceGrid XML file.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">An icon-less tab displays the definitions of an application that is not bound to an IceGrid registry or to a file, such as a brand new application. A live application with unsaved modifications also becomes icon-less if the connection to its IceGrid registry is lost. </span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">IceGrid Admin may show any number of application tabs, including none at all.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Status Bar</span></p>
+<p><span class="f_IndentList2">The status bar at the bottom of the main window shows information about operations performed by IceGrid Admin, or messages received from the IceGrid registry.</span></p>
+<p class="p_IndentList3"><img src="statusbar.png" width="636" height="65" border="0" alt=""></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?main_window.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?main_window.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/node.htm b/java/resources/IceGridAdmin/node.htm
index c8ffc461ea2..d2ed7c4ed9b 100644
--- a/java/resources/IceGridAdmin/node.htm
+++ b/java/resources/IceGridAdmin/node.htm
@@ -1,148 +1,148 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?node.htm"; }

-  else { parent.lazysync('node.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Node</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Node">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="runtime_components.htm">Runtime Components</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Node</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="slave_registry.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="runtime_components.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="server.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>A node represents an IceGrid node process registered with the IceGrid registry.</p>

-<p class="p_Heading2"><span class="f_Heading2">States</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A node can be either up (</span><img src="node_up.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">) or down (</span><img src="node_down.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">). A &quot;down&quot; node is shown only when it is described by an application deployed on this IceGrid registry.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Actions</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A node provides the following actions, from its contextual menu and from the </span><span class="f_T_Menu">Tools &gt; Node</span><span class="f_IndentList2"> menu:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stdout</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stdout log file of the IceGrid node into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when the node stdout output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdOut</span><span class="f_IndentList3"> property.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stderr</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stderr log file of the IceGrid node into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when the node stderr output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdErr</span><span class="f_IndentList3"> property.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Shutdown</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Shutdown the IceGrid node process. </span></p>

-<p class="p_IndentList3"><img src="warning.gif" width="24" height="24" border="0" alt=""><span class="f_IndentList3"> You cannot restart an IceGrid node from IceGrid Admin.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><img src="node-properties.png" width="487" height="329" border="0" alt=""></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Node Properties panel shows:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Hostname</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The name of the host on which the IceGrid node process is running.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Operating System</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The operating system name and version of the host on which the IceGrid node process is running.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Machine Type</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The type of CPUs and the number of CPUs of the host on which the IceGrid node process is running.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">CPU Usage (Windows) or Load Average (Linux/Unix)</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">On Windows, shows the percentage of CPU utilization in the past 1, 5, and 15 minutes. On Linux/Unix, shows the load-average in the past 1, 5 and 15 minutes. These values are retrieved when the Node Properties panel is displayed. Click on the Refresh button to retrieve the latest values.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Load Factor</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Shows the load factor defined by each application using this node.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Children</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A registry node can only have two types of children:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="server.htm">Regular Server</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="server.htm">IceBox Server</a></span></td></tr></table></div>

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?node.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?node.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?node.htm"; }
+  else { parent.lazysync('node.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Node</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Node">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="runtime_components.htm">Runtime Components</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Node</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="slave_registry.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="runtime_components.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="server.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>A node represents an IceGrid node process registered with the IceGrid registry.</p>
+<p class="p_Heading2"><span class="f_Heading2">States</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A node can be either up (</span><img src="node_up.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">) or down (</span><img src="node_down.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">). A &quot;down&quot; node is shown only when it is described by an application deployed on this IceGrid registry.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Actions</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A node provides the following actions, from its contextual menu and from the </span><span class="f_T_Menu">Tools &gt; Node</span><span class="f_IndentList2"> menu:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stdout</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stdout log file of the IceGrid node into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when the node stdout output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdOut</span><span class="f_IndentList3"> property.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stderr</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stderr log file of the IceGrid node into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when the node stderr output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdErr</span><span class="f_IndentList3"> property.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Shutdown</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Shutdown the IceGrid node process. </span></p>
+<p class="p_IndentList3"><img src="warning.gif" width="24" height="24" border="0" alt=""><span class="f_IndentList3"> You cannot restart an IceGrid node from IceGrid Admin.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><img src="node-properties.png" width="487" height="329" border="0" alt=""></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Node Properties panel shows:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Hostname</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The name of the host on which the IceGrid node process is running.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Operating System</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The operating system name and version of the host on which the IceGrid node process is running.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Machine Type</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The type of CPUs and the number of CPUs of the host on which the IceGrid node process is running.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">CPU Usage (Windows) or Load Average (Linux/Unix)</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">On Windows, shows the percentage of CPU utilization in the past 1, 5, and 15 minutes. On Linux/Unix, shows the load-average in the past 1, 5 and 15 minutes. These values are retrieved when the Node Properties panel is displayed. Click on the Refresh button to retrieve the latest values.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Load Factor</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Shows the load factor defined by each application using this node.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Children</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A registry node can only have two types of children:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="server.htm">Regular Server</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="server.htm">IceBox Server</a></span></td></tr></table></div>
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?node.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?node.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/nsh.js b/java/resources/IceGridAdmin/nsh.js
index 9d138be2ca1..669e3f8bf28 100644
--- a/java/resources/IceGridAdmin/nsh.js
+++ b/java/resources/IceGridAdmin/nsh.js
@@ -1,24 +1,24 @@
-   function doResize() { 

-     var clheight, headheight;

-     if (self.innerHeight) // all except Explorer 

-     { clheight = self.innerHeight; } 

-     else if (document.documentElement && document.documentElement.clientHeight) // Explorer 6 Strict Mode 

-     { clheight = document.documentElement.clientHeight; } 

-     else if (document.body) // other Explorers 

-     { clheight = document.body.clientHeight; } 

-     headheight = document.getElementById('idheader').clientHeight;

-     if (clheight < headheight ) {clheight = headheight + 1;}

-     document.getElementById('idcontent').style.height = clheight - document.getElementById('idheader').clientHeight +'px'; 

-   } 

-

-   function nsrInit() { 

-     contentbody = document.getElementById('idcontent'); 

-     if (contentbody) { 

-       contentbody.className = 'nonscroll'; 

-       document.getElementsByTagName('body')[0].className = 'nonscroll'; 

-       document.getElementsByTagName('html')[0].className = 'nonscroll'; 

-       window.onresize = doResize; 

-       doResize(); 

-      } 

-   } 

- 
\ No newline at end of file
+   function doResize() { 
+     var clheight, headheight;
+     if (self.innerHeight) // all except Explorer 
+     { clheight = self.innerHeight; } 
+     else if (document.documentElement && document.documentElement.clientHeight) // Explorer 6 Strict Mode 
+     { clheight = document.documentElement.clientHeight; } 
+     else if (document.body) // other Explorers 
+     { clheight = document.body.clientHeight; } 
+     headheight = document.getElementById('idheader').clientHeight;
+     if (clheight < headheight ) {clheight = headheight + 1;}
+     document.getElementById('idcontent').style.height = clheight - document.getElementById('idheader').clientHeight +'px'; 
+   } 
+
+   function nsrInit() { 
+     contentbody = document.getElementById('idcontent'); 
+     if (contentbody) { 
+       contentbody.className = 'nonscroll'; 
+       document.getElementsByTagName('body')[0].className = 'nonscroll'; 
+       document.getElementsByTagName('html')[0].className = 'nonscroll'; 
+       window.onresize = doResize; 
+       doResize(); 
+      } 
+   } 
+ 
diff --git a/java/resources/IceGridAdmin/registry.htm b/java/resources/IceGridAdmin/registry.htm
index 49d80e0f7ae..ee45b879620 100644
--- a/java/resources/IceGridAdmin/registry.htm
+++ b/java/resources/IceGridAdmin/registry.htm
@@ -1,147 +1,147 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?registry.htm"; }

-  else { parent.lazysync('registry.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Registry</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Registry">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="runtime_components.htm">Runtime Components</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Registry</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="runtime_components.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="runtime_components.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="slave_registry.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>The registry is the root node of the Runtime Components tree, and represents the IceGrid registry process administered by IceGrid Admin.</p>

-<p class="p_Heading2"><span class="f_Heading2">Actions</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A registry provides the following actions, from its contextual menu and from the </span><span class="f_T_Menu">Tools &gt; Registry</span><span class="f_IndentList2"> menu:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Add Well-Known Object</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Create a new dynamic well-known object in the IceGrid registry.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stdout</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stdout log file of the IceGrid registry into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when the registry stdout output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdOut</span><span class="f_IndentList3"> property.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stderr</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stderr log file of the IceGrid registry into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when the registry stderr output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdErr</span><span class="f_IndentList3"> property.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Shutdown</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Shutdown the registry process. </span></p>

-<p class="p_IndentList3"><img src="warning.gif" width="24" height="24" border="0" alt=""><span class="f_IndentList3"> You cannot restart an IceGrid registry from IceGrid Admin.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Registry Properties panel shows:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Hostname</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The name of the host on which the IceGrid registry process is running.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Deployed Applications</span></p>

-<p class="p_IndentList3"><img src="deployed-applications.png" width="459" height="131" border="0" alt=""></p>

-<p class="p_IndentList3"><span class="f_IndentList3">This table shows all the applications deployed on this IceGrid registry, along with the date and time of the last update of each application. A contextual menu allows you to:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">open the corresponding application descriptor</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">patch the application, that is, instruct the IceGrid nodes to download the latest version of this application's files</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">show additional details on this application in this registry</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">remove (undeploy) the application from the registry</span></td></tr></table></div><p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Dynamic Well-Known Objects</span></p>

-<p class="p_Heading2Sub2"><img src="dynamic-well-known-objects.png" width="462" height="146" border="0" alt=""></p>

-<p class="p_IndentList3"><span class="f_IndentList3">This table shows the well-known objects registry dynamically with the IceGrid registry: well-known objects defined using adapter and replica-group definitions are not included. A contextual menu allows you to add or remove entries from this table, and to show a given entry in its own dialog.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Dynamic Objects Adapters</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">This table shows the object adapters registered dynamically with the registry. It is typically empty. A registry allows dynamically registered adapters only when its </span><span class="f_T_Code">IceGrid.Registry.DynamicRegistration</span><span class="f_IndentList3"> property is set to a value greater than 0. A contextual menu allows you to remove entries from this table.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Children</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A registry node can have two types of children:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="slave_registry.htm">Slave Registry</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="node.htm">Node</a></span></td></tr></table></div>

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?registry.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?registry.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?registry.htm"; }
+  else { parent.lazysync('registry.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Registry</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Registry">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="runtime_components.htm">Runtime Components</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Registry</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="runtime_components.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="runtime_components.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="slave_registry.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>The registry is the root node of the Runtime Components tree, and represents the IceGrid registry process administered by IceGrid Admin.</p>
+<p class="p_Heading2"><span class="f_Heading2">Actions</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A registry provides the following actions, from its contextual menu and from the </span><span class="f_T_Menu">Tools &gt; Registry</span><span class="f_IndentList2"> menu:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Add Well-Known Object</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Create a new dynamic well-known object in the IceGrid registry.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stdout</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stdout log file of the IceGrid registry into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when the registry stdout output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdOut</span><span class="f_IndentList3"> property.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stderr</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stderr log file of the IceGrid registry into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when the registry stderr output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdErr</span><span class="f_IndentList3"> property.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Shutdown</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Shutdown the registry process. </span></p>
+<p class="p_IndentList3"><img src="warning.gif" width="24" height="24" border="0" alt=""><span class="f_IndentList3"> You cannot restart an IceGrid registry from IceGrid Admin.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Registry Properties panel shows:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Hostname</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The name of the host on which the IceGrid registry process is running.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Deployed Applications</span></p>
+<p class="p_IndentList3"><img src="deployed-applications.png" width="459" height="131" border="0" alt=""></p>
+<p class="p_IndentList3"><span class="f_IndentList3">This table shows all the applications deployed on this IceGrid registry, along with the date and time of the last update of each application. A contextual menu allows you to:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">open the corresponding application descriptor</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">patch the application, that is, instruct the IceGrid nodes to download the latest version of this application's files</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">show additional details on this application in this registry</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 60px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList3">remove (undeploy) the application from the registry</span></td></tr></table></div><p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Dynamic Well-Known Objects</span></p>
+<p class="p_Heading2Sub2"><img src="dynamic-well-known-objects.png" width="462" height="146" border="0" alt=""></p>
+<p class="p_IndentList3"><span class="f_IndentList3">This table shows the well-known objects registry dynamically with the IceGrid registry: well-known objects defined using adapter and replica-group definitions are not included. A contextual menu allows you to add or remove entries from this table, and to show a given entry in its own dialog.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Dynamic Objects Adapters</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">This table shows the object adapters registered dynamically with the registry. It is typically empty. A registry allows dynamically registered adapters only when its </span><span class="f_T_Code">IceGrid.Registry.DynamicRegistration</span><span class="f_IndentList3"> property is set to a value greater than 0. A contextual menu allows you to remove entries from this table.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Children</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A registry node can have two types of children:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="slave_registry.htm">Slave Registry</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="node.htm">Node</a></span></td></tr></table></div>
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?registry.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?registry.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/runtime_components.htm b/java/resources/IceGridAdmin/runtime_components.htm
index 5c8bf7b1f67..3fdcac99826 100644
--- a/java/resources/IceGridAdmin/runtime_components.htm
+++ b/java/resources/IceGridAdmin/runtime_components.htm
@@ -1,132 +1,132 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?runtime_components.htm"; }

-  else { parent.lazysync('runtime_components.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Runtime Components</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="live_deployment.htm">Live Deployment</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Runtime Components</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="logout.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="live_deployment.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="registry.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>IceGrid Admin shows the following runtime components:</p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Registry (</span><img src="registry.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">)</span><br>

-<span class="f_IndentList2">Represents the IceGrid registry process with which IceGrid Admin communicates</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Slave Registry (</span><img src="registry.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">)</span><br>

-<span class="f_IndentList2">Represents a slave registry process, when you have several replicated IceGrid registries</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Node (</span><img src="node.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">)</span><br>

-<span class="f_IndentList2">Represents an IceGrid node process</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Regular Server (</span><img src="server_inactive.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">)</span><br>

-<span class="f_IndentList2">Represents a regular server process, started and monitored by an IceGrid node</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">IceBox Server (</span><img src="icebox_server_inactive.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">)</span><br>

-<span class="f_IndentList2">Represents an IceBox server process, &nbsp;started and monitored by an IceGrid node</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Adapter (</span><img src="adapter_inactive.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">)</span><br>

-<span class="f_IndentList2">Represents an Ice indirect object adapter, deployed within a server or a service.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Database Environment (</span><img src="database.png" width="16" height="16" border="0" alt=""><span class="f_ImageCaption">)</span><br>

-<span class="f_IndentList2">Represents a Freeze/Berkeley DB Database Environment, deployed within a server or a service.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">IceBox Service (</span><img src="service.png" width="16" height="16" border="0" alt=""><span class="f_ImageCaption">)</span><br>

-<span class="f_IndentList2">Represents an IceBox service, deployed on an IceBox server.</span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>

-<p>All actions on these components (through menus, &nbsp;buttons and keyboard short-cuts) affect directly and immediately the running IceGrid deployment.</p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?runtime_components.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?runtime_components.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?runtime_components.htm"; }
+  else { parent.lazysync('runtime_components.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Runtime Components</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="live_deployment.htm">Live Deployment</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Runtime Components</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="logout.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="live_deployment.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="registry.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>IceGrid Admin shows the following runtime components:</p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Registry (</span><img src="registry.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">)</span><br>
+<span class="f_IndentList2">Represents the IceGrid registry process with which IceGrid Admin communicates</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Slave Registry (</span><img src="registry.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">)</span><br>
+<span class="f_IndentList2">Represents a slave registry process, when you have several replicated IceGrid registries</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Node (</span><img src="node.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">)</span><br>
+<span class="f_IndentList2">Represents an IceGrid node process</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Regular Server (</span><img src="server_inactive.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">)</span><br>
+<span class="f_IndentList2">Represents a regular server process, started and monitored by an IceGrid node</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">IceBox Server (</span><img src="icebox_server_inactive.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">)</span><br>
+<span class="f_IndentList2">Represents an IceBox server process, &nbsp;started and monitored by an IceGrid node</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Adapter (</span><img src="adapter_inactive.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">)</span><br>
+<span class="f_IndentList2">Represents an Ice indirect object adapter, deployed within a server or a service.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Database Environment (</span><img src="database.png" width="16" height="16" border="0" alt=""><span class="f_ImageCaption">)</span><br>
+<span class="f_IndentList2">Represents a Freeze/Berkeley DB Database Environment, deployed within a server or a service.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">IceBox Service (</span><img src="service.png" width="16" height="16" border="0" alt=""><span class="f_ImageCaption">)</span><br>
+<span class="f_IndentList2">Represents an IceBox service, deployed on an IceBox server.</span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>
+<p>All actions on these components (through menus, &nbsp;buttons and keyboard short-cuts) affect directly and immediately the running IceGrid deployment.</p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?runtime_components.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?runtime_components.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/server.htm b/java/resources/IceGridAdmin/server.htm
index 95d1c25d610..dc42b9586f8 100644
--- a/java/resources/IceGridAdmin/server.htm
+++ b/java/resources/IceGridAdmin/server.htm
@@ -1,196 +1,196 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?server.htm"; }

-  else { parent.lazysync('server.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Server</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Server">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="runtime_components.htm">Runtime Components</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Server</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="node.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="runtime_components.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="adapter.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>A server represents an Ice server process. It can be either regular server (with typically a single Ice communicator) or an IceBox server hosting a number of IceBox services.</p>

-<p class="p_Heading2"><span class="f_Heading2">States</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A server is always in one of the following states (the first icon is for regular servers, the second for IceBox servers):</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Unknown (<img src="server_unknown.png" width="16" height="16" border="0" alt="">, <img src="icebox_server_unknown.png" width="16" height="16" border="0" alt="">): this state is shown when the parent IceGrid node is down.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Inactive (</span><img src="server_inactive.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">, </span><img src="icebox_server_inactive.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">): the server is not running.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Activating (</span><img src="server_activating.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">, </span><img src="icebox_server_activating.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">): the server is starting up. The IceGrid registry is waiting for the server to register all its object adapters with server lifetime.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Active (</span><img src="server_active.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">, </span><img src="icebox_server_active.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">): the server is running, and has registered all its object adapters with server lifetime with the IceGrid registry.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Deactivating (</span><img src="server_deactivating.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">, </span><img src="icebox_server_deactivating.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">): the server is shutting down. The IceGrid registry is waiting for the server process to exit.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Destroyed (</span><img src="server_destroyed.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">, </span><img src="icebox_server_destroyed.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">): the server being removed of the IceGrid registry. This is a very transient state.</span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">A server can also be either enabled or disabled; when disabled, the icons above are grayed-out. A disabled server cannot be started until it is re-enabled.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Actions</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A server provides the following actions, from its contextual menu, &nbsp;from the </span><span class="f_T_Menu">Tools &gt; Server</span><span class="f_IndentList2"> menu, and from buttons on the Server Properties panel:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Start</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Instruct the IceGrid node to start the server.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Stop</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Instruct the IceGrid node to shutdown the server.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Enable</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Mark the server as &quot;enabled&quot;.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Disable</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Mark the server as &quot;disabled&quot;. A disabled server cannot be started; however an already running server can be marked &quot;disabled&quot;.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Patch Distribution</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Patch the server's distribution, that is, instruct the IceGrid node to download the latest files from the server's distribution.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Write Message</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Open a dialog that allows you to write a message to the server's stdout or stderr. </span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stdout</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stdout log file of this server into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when the server's stdout output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdOut</span><span class="f_IndentList3"> property. This is usually achieved by setting the </span><span class="f_T_Code">IceGrid.Node.Output</span><span class="f_IndentList3"> property in the IceGrid node configuration file.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stderr</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stderr log file of this server into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when the server's stderr output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdErr</span><span class="f_IndentList3"> property. This is usually achieved by setting the </span><span class="f_T_Code">IceGrid.Node.Output</span><span class="f_IndentList3"> property in the IceGrid node configuration file.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve Log</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Retrieve a log file of this server into a <a href="log_file_dialog.htm">Log File Dialog</a>.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Send Signal</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Send a signal to a server, for example SIGQUIT. Available only for non-Windows servers.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Server Properties panel shows first the Runtime Status of the server, i.e. &quot;live&quot; values retrieved from the server:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">State</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The state of the server (Active, Deactivating, Inactive etc., see above)</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Enabled</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A checkbox that is checked when the server is enabled.</span></p>

-<p class="p_IndentList3"><span class="f_Heading2Sub2">Process Id</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The process ID of the server.</span></p>

-<p class="p_IndentList3"><span class="f_Heading2Sub2">Build Id</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The build Id of this server: this corresponds to the Ice property </span><span class="f_T_Code">BuildId</span><span class="f_IndentList3">.</span></p>

-<p class="p_IndentList3"><span class="f_Heading2Sub2">Properties</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A table showing all the Ice properties currently set in this server. These properties are retrieved each time you select a new server in IceGrid Admin, and each time you click on the Refresh button next to the Build Id field.</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The remaining Server Properties come from the IceGrid descriptors associated with this server:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Application</span></p>

-<p class="p_Heading2Sub2"><img src="server-application.png" width="406" height="77" border="0" alt=""></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The name of the application containing this server's definition. The button on the right shows the server definition in an Application tab.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this server.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A table showing all the Ice properties of this server. These properties may come from template definitions, property sets, server-instance properties etc. They are all combined in this table.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Path to Executable</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The path to the server's executable, used by the IceGrid node to start the server.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Ice Version</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The Ice version of this server.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Working Directory</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The path to the server's working directory used by the IceGrid node when starting the server.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Command Arguments</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The command-line arguments given to the server when started by IceGrid.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Run as</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">On Linux/Unix, a server may be started as a specific user when IceGrid node runs as root. </span><span class="f_T_Entry">Run as</span><span class="f_IndentList3"> shows this username. When blank, the server runs as the IceGrid node user except if IceGrid node runs as root (on Linux/Unix); in this case, the server runs as nobody.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Environment Variables</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A server started by IceGrid node gets these environment variables in addition to the environment variables inherited from the IceGrid node.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Activation Mode</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The server's activation mode.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Activation Timeout</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The server's activation timeout.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Deactivation Timeout</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The server's deactivation timeout.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Allocatable</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">This checkbox Shows whether this server is allocatable or not.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Depends on the application distribution</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">If this checkbox is checked, this server depends on the enclosing application's distribution: each time this distribution is patched, the server is automatically shut down before the patch.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">IcePatch2 Proxy</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A stringified (or well-known) proxy for the IcePatch2 server than contains this server's distribution. When blank, this server does not have its own distribution.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Directories</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">List of directories included in the server distribution. When blank, the entire IcePatch2 server repository is used as the server distribution.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Children</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A regular server node can have two types of children:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="adapter.htm">Adapter</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="dbenv.htm">Database Environment</a></span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">An IceBox server node can have only one type of children:</span></p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="service.htm">Service</a></span></td></tr></table></div>

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?server.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?server.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?server.htm"; }
+  else { parent.lazysync('server.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Server</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Server">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="runtime_components.htm">Runtime Components</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Server</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="node.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="runtime_components.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="adapter.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>A server represents an Ice server process. It can be either regular server (with typically a single Ice communicator) or an IceBox server hosting a number of IceBox services.</p>
+<p class="p_Heading2"><span class="f_Heading2">States</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A server is always in one of the following states (the first icon is for regular servers, the second for IceBox servers):</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Unknown (<img src="server_unknown.png" width="16" height="16" border="0" alt="">, <img src="icebox_server_unknown.png" width="16" height="16" border="0" alt="">): this state is shown when the parent IceGrid node is down.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Inactive (</span><img src="server_inactive.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">, </span><img src="icebox_server_inactive.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">): the server is not running.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Activating (</span><img src="server_activating.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">, </span><img src="icebox_server_activating.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">): the server is starting up. The IceGrid registry is waiting for the server to register all its object adapters with server lifetime.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Active (</span><img src="server_active.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">, </span><img src="icebox_server_active.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">): the server is running, and has registered all its object adapters with server lifetime with the IceGrid registry.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Deactivating (</span><img src="server_deactivating.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">, </span><img src="icebox_server_deactivating.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">): the server is shutting down. The IceGrid registry is waiting for the server process to exit.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">Destroyed (</span><img src="server_destroyed.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">, </span><img src="icebox_server_destroyed.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">): the server being removed of the IceGrid registry. This is a very transient state.</span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">A server can also be either enabled or disabled; when disabled, the icons above are grayed-out. A disabled server cannot be started until it is re-enabled.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Actions</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A server provides the following actions, from its contextual menu, &nbsp;from the </span><span class="f_T_Menu">Tools &gt; Server</span><span class="f_IndentList2"> menu, and from buttons on the Server Properties panel:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Start</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Instruct the IceGrid node to start the server.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Stop</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Instruct the IceGrid node to shutdown the server.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Enable</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Mark the server as &quot;enabled&quot;.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Disable</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Mark the server as &quot;disabled&quot;. A disabled server cannot be started; however an already running server can be marked &quot;disabled&quot;.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Patch Distribution</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Patch the server's distribution, that is, instruct the IceGrid node to download the latest files from the server's distribution.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Write Message</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Open a dialog that allows you to write a message to the server's stdout or stderr. </span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stdout</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stdout log file of this server into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when the server's stdout output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdOut</span><span class="f_IndentList3"> property. This is usually achieved by setting the </span><span class="f_T_Code">IceGrid.Node.Output</span><span class="f_IndentList3"> property in the IceGrid node configuration file.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stderr</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stderr log file of this server into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when the server's stderr output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdErr</span><span class="f_IndentList3"> property. This is usually achieved by setting the </span><span class="f_T_Code">IceGrid.Node.Output</span><span class="f_IndentList3"> property in the IceGrid node configuration file.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve Log</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Retrieve a log file of this server into a <a href="log_file_dialog.htm">Log File Dialog</a>.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Send Signal</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Send a signal to a server, for example SIGQUIT. Available only for non-Windows servers.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Server Properties panel shows first the Runtime Status of the server, i.e. &quot;live&quot; values retrieved from the server:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">State</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The state of the server (Active, Deactivating, Inactive etc., see above)</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Enabled</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A checkbox that is checked when the server is enabled.</span></p>
+<p class="p_IndentList3"><span class="f_Heading2Sub2">Process Id</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The process ID of the server.</span></p>
+<p class="p_IndentList3"><span class="f_Heading2Sub2">Build Id</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The build Id of this server: this corresponds to the Ice property </span><span class="f_T_Code">BuildId</span><span class="f_IndentList3">.</span></p>
+<p class="p_IndentList3"><span class="f_Heading2Sub2">Properties</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A table showing all the Ice properties currently set in this server. These properties are retrieved each time you select a new server in IceGrid Admin, and each time you click on the Refresh button next to the Build Id field.</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The remaining Server Properties come from the IceGrid descriptors associated with this server:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Application</span></p>
+<p class="p_Heading2Sub2"><img src="server-application.png" width="406" height="77" border="0" alt=""></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The name of the application containing this server's definition. The button on the right shows the server definition in an Application tab.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this server.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A table showing all the Ice properties of this server. These properties may come from template definitions, property sets, server-instance properties etc. They are all combined in this table.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Path to Executable</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The path to the server's executable, used by the IceGrid node to start the server.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Ice Version</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The Ice version of this server.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Working Directory</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The path to the server's working directory used by the IceGrid node when starting the server.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Command Arguments</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The command-line arguments given to the server when started by IceGrid.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Run as</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">On Linux/Unix, a server may be started as a specific user when IceGrid node runs as root. </span><span class="f_T_Entry">Run as</span><span class="f_IndentList3"> shows this username. When blank, the server runs as the IceGrid node user except if IceGrid node runs as root (on Linux/Unix); in this case, the server runs as nobody.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Environment Variables</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A server started by IceGrid node gets these environment variables in addition to the environment variables inherited from the IceGrid node.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Activation Mode</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The server's activation mode.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Activation Timeout</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The server's activation timeout.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Deactivation Timeout</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The server's deactivation timeout.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Allocatable</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">This checkbox Shows whether this server is allocatable or not.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Depends on the application distribution</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">If this checkbox is checked, this server depends on the enclosing application's distribution: each time this distribution is patched, the server is automatically shut down before the patch.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">IcePatch2 Proxy</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A stringified (or well-known) proxy for the IcePatch2 server than contains this server's distribution. When blank, this server does not have its own distribution.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Directories</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">List of directories included in the server distribution. When blank, the entire IcePatch2 server repository is used as the server distribution.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Children</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A regular server node can have two types of children:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="adapter.htm">Adapter</a></span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="dbenv.htm">Database Environment</a></span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">An IceBox server node can have only one type of children:</span></p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2"><a href="service.htm">Service</a></span></td></tr></table></div>
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?server.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?server.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/service.htm b/java/resources/IceGridAdmin/service.htm
index 963d7ddee01..80eccff5aeb 100644
--- a/java/resources/IceGridAdmin/service.htm
+++ b/java/resources/IceGridAdmin/service.htm
@@ -1,147 +1,147 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?service.htm"; }

-  else { parent.lazysync('service.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Service</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Service">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="runtime_components.htm">Runtime Components</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Service</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="dbenv.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="runtime_components.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="log_file_dialog.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>A service represents an IceBox service loaded (or potentially loaded) within an IceBox server.</p>

-<p class="p_Heading2"><span class="f_Heading2">States</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A service can be either started (</span><img src="service_running.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2"> ) or stopped (</span><img src="service.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">) within an IceBox server.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Actions</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A service provides the following actions, from its contextual menu, &nbsp;from the </span><span class="f_T_Menu">Tools &gt; Service</span><span class="f_IndentList2"> menu, and from buttons on the Service Properties panel:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Start</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Instruct the IceBox server to start the service.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Stop</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Instruct the IceBox server to stop this service.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve Log</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Retrieve a log file of this service into a <a href="log_file_dialog.htm">Log File Dialog</a>.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Service Properties panel shows first the Runtime Status of the service, i.e. &quot;live&quot; values retrieved from the service:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">State</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A checkbox that is checked when the service is started.</span></p>

-<p class="p_IndentList3"><span class="f_Heading2Sub2">Build Id</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The build Id of this service: this corresponds to the Ice property </span><span class="f_T_Code">BuildId</span><span class="f_IndentList3">.</span></p>

-<p class="p_IndentList3"><span class="f_Heading2Sub2">Properties</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A table showing all the Ice properties currently set in this service. These properties are retrieved each time you select a new service in IceGrid Admin, and each time you click on the Refresh button next to the Build Id field.</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The remaining Server Properties come from the IceGrid descriptors associated with this server:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this service.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">A table showing all the Ice properties of this service. These properties may come from template definitions, property sets, service-instance properties etc. They are all combined in this table.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Entry Point</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The entry point for this service. This corresponds to the value of the</span><span class="f_T_Code"> IceBox.Service.</span><span class="f_T_Code" style="font-style: italic;">service-name</span><span class="f_IndentList3"> property.</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?service.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?service.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?service.htm"; }
+  else { parent.lazysync('service.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Service</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Service">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="runtime_components.htm">Runtime Components</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Service</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="dbenv.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="runtime_components.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="log_file_dialog.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>A service represents an IceBox service loaded (or potentially loaded) within an IceBox server.</p>
+<p class="p_Heading2"><span class="f_Heading2">States</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A service can be either started (</span><img src="service_running.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2"> ) or stopped (</span><img src="service.png" width="16" height="16" border="0" alt=""><span class="f_IndentList2">) within an IceBox server.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Actions</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A service provides the following actions, from its contextual menu, &nbsp;from the </span><span class="f_T_Menu">Tools &gt; Service</span><span class="f_IndentList2"> menu, and from buttons on the Service Properties panel:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Start</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Instruct the IceBox server to start the service.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Stop</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Instruct the IceBox server to stop this service.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve Log</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Retrieve a log file of this service into a <a href="log_file_dialog.htm">Log File Dialog</a>.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Service Properties panel shows first the Runtime Status of the service, i.e. &quot;live&quot; values retrieved from the service:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">State</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A checkbox that is checked when the service is started.</span></p>
+<p class="p_IndentList3"><span class="f_Heading2Sub2">Build Id</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The build Id of this service: this corresponds to the Ice property </span><span class="f_T_Code">BuildId</span><span class="f_IndentList3">.</span></p>
+<p class="p_IndentList3"><span class="f_Heading2Sub2">Properties</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A table showing all the Ice properties currently set in this service. These properties are retrieved each time you select a new service in IceGrid Admin, and each time you click on the Refresh button next to the Build Id field.</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The remaining Server Properties come from the IceGrid descriptors associated with this server:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Description</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A free-text description of this service.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Properties</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">A table showing all the Ice properties of this service. These properties may come from template definitions, property sets, service-instance properties etc. They are all combined in this table.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Entry Point</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The entry point for this service. This corresponds to the value of the</span><span class="f_T_Code"> IceBox.Service.</span><span class="f_T_Code" style="font-style: italic;">service-name</span><span class="f_IndentList3"> property.</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?service.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?service.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/settings.js b/java/resources/IceGridAdmin/settings.js
index b82053fac3d..f2c4821f1d4 100644
--- a/java/resources/IceGridAdmin/settings.js
+++ b/java/resources/IceGridAdmin/settings.js
@@ -1,62 +1,62 @@
-

-// WARNING: DO NOT EDIT THIS FILE.

-// This file is automatically generated by the Zoom Indexer application

-// and will be updated each time you re-index your site. You should make all

-// setting changes directly from the Indexer, via the Configuration window.

-// 

-// If you wish to modify the text messages such as "Search results for...",

-// etc. then look up "Zoom Language Files" or "Translating the search page"

-// in the Users Guide for information.

-

-var UseUTF8 = 0;

-var Charset = "windows-1252";

-var NoCharset = 0;

-var MapAccents = 0;

-var MinWordLen = 3;

-var Highlighting = 1;

-var GotoHighlight = 1;

-var PdfHighlight = 1;

-var TemplateFilename = "search_template.html";

-var FormFormat = 2;

-var Logging = 0;

-var LogFileName = "./logs/searchwords.log";

-var MaxKeyWordLineLen = 0;

-var DictIDLen = 3;

-var NumKeywords = 1298;

-var NumPages = 40;

-var MaxMatches = 1000;

-var MaxContextSeeks = 500;

-var DictReservedLimit = 165;

-var DictReservedSuffixes = 83;

-var DictReservedPrefixes = 124;

-var DictReservedNoSpaces = 165;

-var WordSplit = 1;

-var ZoomInfo = 0;

-var Timing = 0;

-var DefaultToAnd = 0;

-var SearchAsSubstring = 1;

-var ToLowerSearchWords = 1;

-var ContextSize = 30;

-var MaxContextKeywords = 3;

-var AllowExactPhrase = 0;

-var UseLinkTarget = 1;

-var LinkTarget = "hmcontent";

-var UseDateTime = 0;

-var UseZoomImage = 0;

-var WordJoinChars = ".-_'";

-var Spelling = 0;

-var Recommended = 0;

-var NumRecommended = 0;

-var RecommendedMax = 0;

-var UseCats = 0;

-var SearchMultiCats = 0;

-var DisplayNumber = 1;

-var DisplayTitle = 1;

-var DisplayMetaDesc = 1;

-var DisplayContext = 0;

-var DisplayTerms = 1;

-var DisplayScore = 1;

-var DisplayURL = 0;

-var DisplayDate = 0;

-var DisplayFilesize = 0;

-var Version = "Version 5.0.1004 (Custom for EC Software) PRO";

+
+// WARNING: DO NOT EDIT THIS FILE.
+// This file is automatically generated by the Zoom Indexer application
+// and will be updated each time you re-index your site. You should make all
+// setting changes directly from the Indexer, via the Configuration window.
+// 
+// If you wish to modify the text messages such as "Search results for...",
+// etc. then look up "Zoom Language Files" or "Translating the search page"
+// in the Users Guide for information.
+
+var UseUTF8 = 0;
+var Charset = "windows-1252";
+var NoCharset = 0;
+var MapAccents = 0;
+var MinWordLen = 3;
+var Highlighting = 1;
+var GotoHighlight = 1;
+var PdfHighlight = 1;
+var TemplateFilename = "search_template.html";
+var FormFormat = 2;
+var Logging = 0;
+var LogFileName = "./logs/searchwords.log";
+var MaxKeyWordLineLen = 0;
+var DictIDLen = 3;
+var NumKeywords = 1298;
+var NumPages = 40;
+var MaxMatches = 1000;
+var MaxContextSeeks = 500;
+var DictReservedLimit = 165;
+var DictReservedSuffixes = 83;
+var DictReservedPrefixes = 124;
+var DictReservedNoSpaces = 165;
+var WordSplit = 1;
+var ZoomInfo = 0;
+var Timing = 0;
+var DefaultToAnd = 0;
+var SearchAsSubstring = 1;
+var ToLowerSearchWords = 1;
+var ContextSize = 30;
+var MaxContextKeywords = 3;
+var AllowExactPhrase = 0;
+var UseLinkTarget = 1;
+var LinkTarget = "hmcontent";
+var UseDateTime = 0;
+var UseZoomImage = 0;
+var WordJoinChars = ".-_'";
+var Spelling = 0;
+var Recommended = 0;
+var NumRecommended = 0;
+var RecommendedMax = 0;
+var UseCats = 0;
+var SearchMultiCats = 0;
+var DisplayNumber = 1;
+var DisplayTitle = 1;
+var DisplayMetaDesc = 1;
+var DisplayContext = 0;
+var DisplayTerms = 1;
+var DisplayScore = 1;
+var DisplayURL = 0;
+var DisplayDate = 0;
+var DisplayFilesize = 0;
+var Version = "Version 5.0.1004 (Custom for EC Software) PRO";
diff --git a/java/resources/IceGridAdmin/slave_registry.htm b/java/resources/IceGridAdmin/slave_registry.htm
index 399b9fe541a..9e5912dfb9c 100644
--- a/java/resources/IceGridAdmin/slave_registry.htm
+++ b/java/resources/IceGridAdmin/slave_registry.htm
@@ -1,135 +1,135 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?slave_registry.htm"; }

-  else { parent.lazysync('slave_registry.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Slave Registry</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="Slave Registry">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="runtime_components.htm">Runtime Components</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Slave Registry</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="registry.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="runtime_components.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="node.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>An IceGrid deployment may use several IceGrid registry replicas, with one Master registry and a number of read-only Slave registries.</p>

-<p class="p_Heading2"><span class="f_Heading2">Actions</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">A slave registry provides the following actions, from its contextual menu and from the </span><span class="f_T_Menu">Tools &gt; Registry</span><span class="f_IndentList2"> menu:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stdout</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stdout log file of the IceGrid registry into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when this registry stdout output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdOut</span><span class="f_IndentList3"> property.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stderr</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stderr log file of the IceGrid registry into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when this registry stderr output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdErr</span><span class="f_IndentList3"> property.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Shutdown</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Shutdown this registry process. </span></p>

-<p class="p_IndentList3"><img src="warning.gif" width="24" height="24" border="0" alt=""><span class="f_IndentList3"> You cannot restart an IceGrid registry from IceGrid Admin.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Registry Properties panel shows:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Hostname</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">The name of the host on which the IceGrid registry process is running.</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?slave_registry.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?slave_registry.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?slave_registry.htm"; }
+  else { parent.lazysync('slave_registry.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Slave Registry</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="Slave Registry">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="runtime_components.htm">Runtime Components</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Slave Registry</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="registry.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="runtime_components.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="node.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>An IceGrid deployment may use several IceGrid registry replicas, with one Master registry and a number of read-only Slave registries.</p>
+<p class="p_Heading2"><span class="f_Heading2">Actions</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">A slave registry provides the following actions, from its contextual menu and from the </span><span class="f_T_Menu">Tools &gt; Registry</span><span class="f_IndentList2"> menu:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stdout</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stdout log file of the IceGrid registry into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when this registry stdout output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdOut</span><span class="f_IndentList3"> property.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Retrieve stderr</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Retrieve the stderr log file of the IceGrid registry into a <a href="log_file_dialog.htm">Log File Dialog</a>. This retrieval succeeds only when this registry stderr output has been redirected to a file using the</span><span class="f_T_Menu"> </span><span class="f_T_Code">Ice.StdErr</span><span class="f_IndentList3"> property.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Shutdown</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Shutdown this registry process. </span></p>
+<p class="p_IndentList3"><img src="warning.gif" width="24" height="24" border="0" alt=""><span class="f_IndentList3"> You cannot restart an IceGrid registry from IceGrid Admin.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Properties</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Registry Properties panel shows:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Hostname</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">The name of the host on which the IceGrid registry process is running.</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?slave_registry.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?slave_registry.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/ssl_configuration.htm b/java/resources/IceGridAdmin/ssl_configuration.htm
index 71a0b0b371c..325a570e6b1 100644
--- a/java/resources/IceGridAdmin/ssl_configuration.htm
+++ b/java/resources/IceGridAdmin/ssl_configuration.htm
@@ -1,140 +1,140 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?ssl_configuration.htm"; }

-  else { parent.lazysync('ssl_configuration.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>SSL Configuration</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="SSL Configuration,IceSSL.Keystore,IceSSL.Password,IceSSL.KeystorePassword,IceSSL.Alias">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="login.htm">Login</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">SSL Configuration</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="login.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="login.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="logout.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>When you check <span class="f_T_Entry">Enable IceSSL</span> in the Direct or Routed pane of the Login dialog, you need to configure the Ice-for-Java IceSSL plugin.</p>

-<p class="p_Heading2"><span class="f_Heading2">Basic SSL Configuration</span></p>

-<p class="p_IndentList3"><img src="login-basic-ssl.png" width="438" height="187" border="0" alt=""></p>

-<p class="p_IndentList2" style="text-align: center;"><span class="f_IndentList2">&nbsp;</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Basic pane shows the mininum configuration required by IceSSL: the location of a Java Keystore file, and a password to unlock the keys in this keystore. This corresponds to the </span><span class="f_T_Code">IceSSL.Keystore</span><span class="f_IndentList2"> and </span><span class="f_T_Code">IceSSL.Password</span><span class="f_IndentList2"> properties.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Advanced SSL Configuration</span></p>

-<p class="p_IndentList3"><img src="login-advanced-ssl.png" width="438" height="314" border="0" alt=""></p>

-<p class="p_IndentList3"><span class="f_ImageCaption">&nbsp;</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">The Advanced SSL configuration pane allows you to specify a few more properties:</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Keystore Integrity Password</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">An optional password used to check the integrity of the Keystore file. This corresponds to the </span><span class="f_T_Code">IceSSL.KeystorePassword</span><span class="f_IndentList3"> property.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Alias</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Selects a particular certificate from the keystore file. This corresponds to the</span><span class="f_T_Code"> IceSSL.Alias</span><span class="f_IndentList3"> property.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Truststore File</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">Specifies a keystore file that contains the certificates of trusted certificate authorities. This corresponds to the </span><span class="f_T_Code">IceSSL.Truststore</span><span class="f_IndentList3"> property.</span></p>

-<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Truststore Integrity Password</span></p>

-<p class="p_IndentList3"><span class="f_IndentList3">An optional password used to check the integrity of the truststore file. This corresponds to the</span><span class="f_T_Code"> IceSSL.TruststorePassword</span><span class="f_IndentList3"> property.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Even more IceSSL Configuration</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">You can provide additional IceSSL configuration by passing command-line arguments to IceGrid Admin. See <a href="command_line_arguments.htm">Command-Line Arguments</a> for details.</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?ssl_configuration.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?ssl_configuration.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?ssl_configuration.htm"; }
+  else { parent.lazysync('ssl_configuration.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>SSL Configuration</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="SSL Configuration,IceSSL.Keystore,IceSSL.Password,IceSSL.KeystorePassword,IceSSL.Alias">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="live_deployment.htm">Live Deployment</a> &gt; <a href="login.htm">Login</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">SSL Configuration</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="login.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="login.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="logout.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>When you check <span class="f_T_Entry">Enable IceSSL</span> in the Direct or Routed pane of the Login dialog, you need to configure the Ice-for-Java IceSSL plugin.</p>
+<p class="p_Heading2"><span class="f_Heading2">Basic SSL Configuration</span></p>
+<p class="p_IndentList3"><img src="login-basic-ssl.png" width="438" height="187" border="0" alt=""></p>
+<p class="p_IndentList2" style="text-align: center;"><span class="f_IndentList2">&nbsp;</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Basic pane shows the mininum configuration required by IceSSL: the location of a Java Keystore file, and a password to unlock the keys in this keystore. This corresponds to the </span><span class="f_T_Code">IceSSL.Keystore</span><span class="f_IndentList2"> and </span><span class="f_T_Code">IceSSL.Password</span><span class="f_IndentList2"> properties.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Advanced SSL Configuration</span></p>
+<p class="p_IndentList3"><img src="login-advanced-ssl.png" width="438" height="314" border="0" alt=""></p>
+<p class="p_IndentList3"><span class="f_ImageCaption">&nbsp;</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">The Advanced SSL configuration pane allows you to specify a few more properties:</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Keystore Integrity Password</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">An optional password used to check the integrity of the Keystore file. This corresponds to the </span><span class="f_T_Code">IceSSL.KeystorePassword</span><span class="f_IndentList3"> property.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Alias</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Selects a particular certificate from the keystore file. This corresponds to the</span><span class="f_T_Code"> IceSSL.Alias</span><span class="f_IndentList3"> property.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Truststore File</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">Specifies a keystore file that contains the certificates of trusted certificate authorities. This corresponds to the </span><span class="f_T_Code">IceSSL.Truststore</span><span class="f_IndentList3"> property.</span></p>
+<p class="p_Heading2Sub2"><span class="f_Heading2Sub2">Truststore Integrity Password</span></p>
+<p class="p_IndentList3"><span class="f_IndentList3">An optional password used to check the integrity of the truststore file. This corresponds to the</span><span class="f_T_Code"> IceSSL.TruststorePassword</span><span class="f_IndentList3"> property.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Even more IceSSL Configuration</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">You can provide additional IceSSL configuration by passing command-line arguments to IceGrid Admin. See <a href="command_line_arguments.htm">Command-Line Arguments</a> for details.</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?ssl_configuration.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?ssl_configuration.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/starting_icegrid_admin.htm b/java/resources/IceGridAdmin/starting_icegrid_admin.htm
index 1bf651d7808..047e52468be 100644
--- a/java/resources/IceGridAdmin/starting_icegrid_admin.htm
+++ b/java/resources/IceGridAdmin/starting_icegrid_admin.htm
@@ -1,130 +1,130 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?starting_icegrid_admin.htm"; }

-  else { parent.lazysync('starting_icegrid_admin.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Starting IceGrid Admin</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="IceGridGUI.jar">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="introduction.htm">Introduction</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">Starting IceGrid Admin</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="system_requirements.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="introduction.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="command_line_arguments.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>In some environments, IceGrid Admin can be started by simply double-clicking on the IceGridGUI.jar file.</p>

-<p>On all platforms, you can start IceGrid Admin from a terminal by typing:</p>

-<p class="p_Example"><span class="f_Example">java -jar </span><span class="f_Example" style="font-style: italic;">path-to-IceGridGUI.jar</span></p>

-<p>For example on Solaris, HP-UX or Mac OS X:</p>

-<p class="p_Example"><span class="f_Example">$ java -jar /opt/Ice-3.4.0/lib/IceGridGUI.jar</span></p>

-<p>On Linux with a RPM installation, you can also use the icegridgui script installer in /usr/bin:</p>

-<p class="p_Example"><span class="f_Example">$ icegridgui</span></p>

-<p>&nbsp;</p>

-<p>&nbsp;</p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?starting_icegrid_admin.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?starting_icegrid_admin.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?starting_icegrid_admin.htm"; }
+  else { parent.lazysync('starting_icegrid_admin.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Starting IceGrid Admin</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="IceGridGUI.jar">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="introduction.htm">Introduction</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">Starting IceGrid Admin</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="system_requirements.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="introduction.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="command_line_arguments.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>In some environments, IceGrid Admin can be started by simply double-clicking on the IceGridGUI.jar file.</p>
+<p>On all platforms, you can start IceGrid Admin from a terminal by typing:</p>
+<p class="p_Example"><span class="f_Example">java -jar </span><span class="f_Example" style="font-style: italic;">path-to-IceGridGUI.jar</span></p>
+<p>For example on Solaris, HP-UX or Mac OS X:</p>
+<p class="p_Example"><span class="f_Example">$ java -jar /opt/Ice-3.4.0/lib/IceGridGUI.jar</span></p>
+<p>On Linux with a RPM installation, you can also use the icegridgui script installer in /usr/bin:</p>
+<p class="p_Example"><span class="f_Example">$ icegridgui</span></p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?starting_icegrid_admin.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?starting_icegrid_admin.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/styles.css b/java/resources/IceGridAdmin/styles.css
index b221f63d85f..9fb64d9c559 100644
--- a/java/resources/IceGridAdmin/styles.css
+++ b/java/resources/IceGridAdmin/styles.css
@@ -1,606 +1,606 @@
-/* Text Styles */

-hr { color: #000000}

-body, table /* Normal */

-{

- font-size: 15px;

- font-family: 'Arial';

- font-style: normal;

- font-weight: normal;

- color: #000000;

- text-decoration: none;

-}

-span.f_BodyText /* Body Text */

-{

- font-size: 13px;

-}

-span.f_Callouts /* Callouts */

-{

- font-size: 13px;

- font-family: 'Verdana';

-}

-span.f_Code /* Code */

-{

- font-size: 11px;

- font-family: 'Courier New';

- color: #000000;

-}

-span.f_CodeExample /* Code Example */

-{

- font-size: 11px;

- font-family: 'Courier New';

-}

-span.f_Comment /* Comment */

-{

-}

-span.f_Example /* Example */

-{

- font-size: 13px;

- font-family: 'Courier New';

- letter-spacing: -1px;

-}

-span.f_ExampleIndent2 /* Example Indent2 */

-{

- font-size: 13px;

- font-family: 'Courier New';

- letter-spacing: -1px;

-}

-span.f_ExampleIndent3 /* Example Indent3 */

-{

- font-size: 13px;

- font-family: 'Courier New';

- letter-spacing: -1px;

-}

-span.f_FAQLinks /* FAQ Links */

-{

- font-size: 12px;

- font-family: 'Verdana';

- font-weight: bold;

-}

-span.f_Heading1 /* Heading1 */

-{

- font-size: 21px;

- font-weight: bold;

- color: #ffffff;

-}

-span.f_Heading2 /* Heading2 */

-{

- font-size: 19px;

- font-style: italic;

- font-weight: bold;

- color: #000080;

-}

-span.f_Heading2Sub /* Heading2 Sub */

-{

- font-size: 17px;

- font-style: italic;

- font-weight: bold;

- color: #000080;

-}

-span.f_Heading2Sub2 /* Heading2 Sub2 */

-{

- font-size: 17px;

- font-style: italic;

- font-weight: bold;

- color: #000080;

-}

-span.f_Heading3 /* Heading3 */

-{

- font-size: 17px;

- font-weight: bold;

- color: ;

-}

-span.f_Heading3HowTo /* Heading3HowTo */

-{

- font-size: 17px;

- font-weight: bold;

- color: ;

-}

-span.f_Heading3Line /* Heading3Line */

-{

- font-size: 17px;

- font-weight: bold;

- color: #000080;

-}

-span.f_Heading4 /* Heading4 */

-{

- font-size: 16px;

- font-weight: bold;

- color: #000080;

- text-decoration: underline;

-}

-span.f_Heading4FAQ /* Heading4 FAQ */

-{

- font-size: 16px;

- font-style: italic;

- font-weight: bold;

- color: #000080;

-}

-span.f_Heading4IconList /* Heading4 IconList */

-{

- font-size: 16px;

- font-weight: bold;

- color: #000080;

-}

-span.f_Heading4Indent /* Heading4 Indent */

-{

- font-size: 16px;

- font-weight: bold;

- color: #000080;

- text-decoration: underline;

-}

-span.f_Heading4IndentNoBefore /* Heading4 Indent NoBefore */

-{

- font-size: 16px;

- font-weight: bold;

- color: #000080;

- text-decoration: underline;

-}

-span.f_Heading4Plain /* Heading4 Plain */

-{

- font-size: 16px;

- font-weight: bold;

- color: #000080;

-}

-span.f_ImageCaption /* Image Caption */

-{

- font-size: 12px;

- font-family: 'Verdana';

- font-style: italic;

-}

-span.f_Indent4 /* Indent4 */

-{

-}

-span.f_IndentListButtonList /* IndentList ButtonList */

-{

-}

-span.f_IndentList1 /* IndentList1 */

-{

-}

-span.f_IndentList115 /* IndentList1 1.5" */

-{

-}

-span.f_IndentList115Callout /* IndentList1 1.5" Callout */

-{

- font-size: 13px;

- font-family: 'Verdana';

- letter-spacing: -1px;

-}

-span.f_IndentList1Header /* IndentList1 Header */

-{

- font-weight: bold;

-}

-span.f_Indentlist1Larger /* Indentlist1 Larger */

-{

-}

-span.f_IndentList115 /* IndentList1+ 1.5" */

-{

-}

-span.f_IndentList2 /* IndentList2 */

-{

-}

-span.f_IndentList2Callout /* IndentList2 Callout */

-{

- font-size: 13px;

- font-family: 'Verdana';

- letter-spacing: -1px;

-}

-span.f_IndentList2Noafter /* IndentList2 Noafter */

-{

-}

-span.f_IndentList2Note /* IndentList2 Note */

-{

-}

-span.f_IndentList2QA /* IndentList2 QA */

-{

- font-style: italic;

- font-weight: bold;

-}

-span.f_IndentList3 /* IndentList3 */

-{

-}

-span.f_IndentList3Buttons /* IndentList3 Buttons */

-{

-}

-span.f_IndentList3Callout /* IndentList3 Callout */

-{

- font-size: 13px;

- font-family: 'Verdana';

- letter-spacing: -1px;

-}

-span.f_IndentList3noafter /* IndentList3noafter */

-{

-}

-span.f_IndentList4Callout /* IndentList4 Callout */

-{

- font-size: 13px;

- font-family: 'Verdana';

- letter-spacing: -1px;

-}

-span.f_InThisTopicHeading /* InThisTopic Heading */

-{

- font-size: 13px;

- font-family: 'Verdana';

- font-weight: bold;

- color: #ffffff;

- letter-spacing: -1px;

- text-transform: uppercase;

-}

-span.f_InThisTopicLinkList /* InThisTopic LinkList */

-{

- font-size: 13px;

- font-family: 'Verdana';

- letter-spacing: -1px;

-}

-span.f_NormalHead /* Normal Head */

-{

- font-weight: bold;

-}

-span.f_NormalHeadIndent1 /* Normal Head Indent1 */

-{

- font-weight: bold;

-}

-span.f_NormalNoAfter /* Normal NoAfter */

-{

-}

-span.f_Notes /* Notes */

-{

-}

-span.f_NotesBox /* NotesBox */

-{

-}

-span.f_PopupBox /* Popup Box */

-{

- font-size: 12px;

-}

-span.f_SeeAlso /* SeeAlso */

-{

- font-size: 16px;

- font-style: italic;

- font-weight: bold;

-}

-span.f_SettingsLocationFoot /* Settings Location Foot */

-{

- font-size: 16px;

- font-family: 'Times New Roman';

- font-weight: bold;

-}

-span.f_SettingsLocationHead /* Settings Location Head */

-{

- font-size: 16px;

- font-style: italic;

- font-weight: bold;

-}

-span.f_SyntaxTableHeading /* SyntaxTable Heading */

-{

- font-size: 16px;

- font-family: 'Verdana';

- font-weight: bold;

- color: #ffffff;

- letter-spacing: -1px;

-}

-span.f_T_Code /* T_Code */

-{

- font-family: 'Courier New';

- letter-spacing: -1px;

-}

-span.f_T_Entry /* T_Entry */

-{

- font-family: 'Verdana';

- font-style: italic;

- letter-spacing: -1px;

-}

-span.f_T_Entry10pt /* T_Entry 10pt */

-{

- font-size: 13px;

- font-family: 'Verdana';

- font-style: italic;

- letter-spacing: -1px;

-}

-span.f_T_Menu /* T_Menu */

-{

- font-family: 'Times New Roman';

- font-weight: bold;

-}

-span.f_T_Menu10p /* T_Menu 10p */

-{

- font-size: 13px;

- font-family: 'Times New Roman';

- font-weight: bold;

-}

-span.f_TableText /* Table Text */

-{

- font-size: 13px;

- font-family: 'Verdana';

-}

-/* Paragraph styles */

-p /* Normal */

-{

- text-align: left;

- text-indent: 0px;

- padding: 0px 0px 0px 0px;

- margin: 0px 0px 10px 0px;

-}

-.p_BodyText /* Body Text */

-{

- text-align: center;

- margin: 0px 0px 18px 0px;

-}

-.p_Callouts /* Callouts */

-{

- margin: 0px 0px 0px 0px;

-}

-.p_Code /* Code */

-{

- margin: 0px 0px 0px 0px;

-}

-.p_CodeExample /* Code Example */

-{

- white-space: nowrap;

- margin: 0px 0px 0px 0px;

-}

-.p_Comment /* Comment */

-{

- text-align: center;

-}

-.p_Example /* Example */

-{

- border-color: #e9e9e9;

- border-style: solid;

- border-width: 5px;

- background: #eaeaea;

- margin: 10px 0px 19px 0px;

-}

-.p_ExampleIndent2 /* Example Indent2 */

-{

- border-color: #e9e9e9;

- border-style: solid;

- border-width: 5px;

- background: #eaeaea;

- margin: 10px 0px 19px 29px;

-}

-.p_ExampleIndent3 /* Example Indent3 */

-{

- border-color: #e9e9e9;

- border-style: solid;

- border-width: 5px;

- background: #eaeaea;

- margin: 10px 0px 19px 60px;

-}

-.p_FAQLinks /* FAQ Links */

-{

- margin: 0px 100px 5px 45px;

-}

-.p_Heading1 /* Heading1 */

-{

- margin: 0px 0px 0px 0px;

-}

-.p_Heading2 /* Heading2 */

-{

- margin: 19px 0px 10px 0px;

-}

-.p_Heading2Sub /* Heading2 Sub */

-{

- margin: 5px 0px 10px 29px;

-}

-.p_Heading2Sub2 /* Heading2 Sub2 */

-{

- margin: 5px 0px 10px 60px;

-}

-.p_Heading3 /* Heading3 */

-{

- margin: 10px 0px 10px 0px;

-}

-.p_Heading3HowTo /* Heading3HowTo */

-{

- border-color: #cdfefd;

- border-style: solid;

- border-width: 5px;

- background: #cdfefd;

- margin: 20px 0px 15px 0px;

-}

-.p_Heading3Line /* Heading3Line */

-{

- border-color: #000000;

- border-style: solid;

- border-width: 1px;

- border-right: none;

- border-bottom: none;

- border-left: none;

- padding: 3px 3px 3px 3px;

- margin: 7px -3px 7px -3px;

-}

-.p_Heading4 /* Heading4 */

-{

- margin: 10px 0px 10px 0px;

-}

-.p_Heading4FAQ /* Heading4 FAQ */

-{

-}

-.p_Heading4IconList /* Heading4 IconList */

-{

- text-indent: -48px;

- margin: 0px 0px 10px 60px;

-}

-.p_Heading4Indent /* Heading4 Indent */

-{

- margin: 10px 0px 10px 29px;

-}

-.p_Heading4IndentNoBefore /* Heading4 Indent NoBefore */

-{

- margin: 0px 0px 10px 29px;

-}

-.p_Heading4Plain /* Heading4 Plain */

-{

- margin: 0px 0px 0px 0px;

-}

-.p_ImageCaption /* Image Caption */

-{

-}

-.p_Indent4 /* Indent4 */

-{

- margin: 0px 0px 10px 80px;

-}

-.p_IndentListButtonList /* IndentList ButtonList */

-{

- text-indent: -154px;

- margin: 0px 0px 10px 183px;

-}

-.p_IndentList1 /* IndentList1 */

-{

- text-indent: -200px;

- margin: 0px 0px 10px 230px;

-}

-.p_IndentList115 /* IndentList1 1.5" */

-{

- text-indent: -144px;

- margin: 0px 0px 10px 173px;

-}

-.p_IndentList115Callout /* IndentList1 1.5" Callout */

-{

- text-indent: -23px;

- margin: 0px 110px 10px 197px;

-}

-.p_IndentList1Header /* IndentList1 Header */

-{

- border-color: #000000;

- border-style: solid;

- border-width: 1px;

- border-top: none;

- border-right: none;

- border-left: none;

- padding: 3px 3px 3px 3px;

- margin: 7px -3px 16px 27px;

-}

-.p_Indentlist1Larger /* Indentlist1 Larger */

-{

- text-indent: -174px;

- margin: 0px 0px 10px 234px;

-}

-.p_IndentList115 /* IndentList1+ 1.5" */

-{

- text-indent: -100px;

- margin: 0px 0px 10px 160px;

-}

-.p_IndentList2 /* IndentList2 */

-{

- margin: 0px 0px 10px 30px;

-}

-.p_IndentList2Callout /* IndentList2 Callout */

-{

- text-indent: -23px;

- margin: 0px 149px 10px 52px;

-}

-.p_IndentList2Noafter /* IndentList2 Noafter */

-{

- margin: 0px 0px 0px 30px;

-}

-.p_IndentList2Note /* IndentList2 Note */

-{

- text-indent: -59px;

- margin: 0px 0px 10px 88px;

-}

-.p_IndentList2QA /* IndentList2 QA */

-{

- margin: 0px 0px 10px 20px;

-}

-.p_IndentList3 /* IndentList3 */

-{

- margin: 0px 0px 10px 60px;

-}

-.p_IndentList3Buttons /* IndentList3 Buttons */

-{

- text-indent: -31px;

- margin: 0px 0px 10px 84px;

-}

-.p_IndentList3Callout /* IndentList3 Callout */

-{

- text-indent: -23px;

- margin: 0px 100px 10px 83px;

-}

-.p_IndentList3noafter /* IndentList3noafter */

-{

- margin: 0px 0px 0px 60px;

-}

-.p_IndentList4Callout /* IndentList4 Callout */

-{

- text-indent: -23px;

- margin: 0px 100px 10px 103px;

-}

-.p_InThisTopicHeading /* InThisTopic Heading */

-{

- text-align: center;

- white-space: nowrap;

- margin: 0px 0px 0px 0px;

-}

-.p_InThisTopicLinkList /* InThisTopic LinkList */

-{

- white-space: nowrap;

- margin: 0px 0px 0px 0px;

-}

-.p_NormalHead /* Normal Head */

-{

- margin: 5px 0px 5px 0px;

-}

-.p_NormalHeadIndent1 /* Normal Head Indent1 */

-{

- margin: 5px 0px 5px 30px;

-}

-.p_NormalNoAfter /* Normal NoAfter */

-{

- margin: 0px 0px 0px 0px;

-}

-.p_Notes /* Notes */

-{

-}

-.p_NotesBox /* NotesBox */

-{

- margin: 10px 0px 10px 0px;

-}

-.p_PopupBox /* Popup Box */

-{

-}

-.p_SeeAlso /* SeeAlso */

-{

- border-color: #000000;

- border-style: solid;

- border-width: 1px;

- border-right: none;

- border-bottom: none;

- border-left: none;

- padding: 4px 4px 4px 4px;

- margin: 15px -4px 6px -4px;

-}

-.p_SettingsLocationFoot /* Settings Location Foot */

-{

- text-align: center;

- border-color: #000000;

- border-style: solid;

- border-width: 1px;

- border-top: none;

- border-right: none;

- border-left: none;

- padding: 6px 6px 6px 6px;

- margin: -6px -6px 4px -6px;

-}

-.p_SettingsLocationHead /* Settings Location Head */

-{

- text-align: center;

- border-color: #000000;

- border-style: solid;

- border-width: 1px;

- border-right: none;

- border-bottom: none;

- border-left: none;

- padding: 4px 4px 4px 4px;

- margin: 15px -4px 6px -4px;

-}

-.p_SyntaxTableHeading /* SyntaxTable Heading */

-{

- text-align: center;

- white-space: nowrap;

- margin: 0px 0px 0px 0px;

-}

-.p_TableText /* Table Text */

-{

- margin: 0px 0px 0px 0px;

-}

+/* Text Styles */
+hr { color: #000000}
+body, table /* Normal */
+{
+ font-size: 15px;
+ font-family: 'Arial';
+ font-style: normal;
+ font-weight: normal;
+ color: #000000;
+ text-decoration: none;
+}
+span.f_BodyText /* Body Text */
+{
+ font-size: 13px;
+}
+span.f_Callouts /* Callouts */
+{
+ font-size: 13px;
+ font-family: 'Verdana';
+}
+span.f_Code /* Code */
+{
+ font-size: 11px;
+ font-family: 'Courier New';
+ color: #000000;
+}
+span.f_CodeExample /* Code Example */
+{
+ font-size: 11px;
+ font-family: 'Courier New';
+}
+span.f_Comment /* Comment */
+{
+}
+span.f_Example /* Example */
+{
+ font-size: 13px;
+ font-family: 'Courier New';
+ letter-spacing: -1px;
+}
+span.f_ExampleIndent2 /* Example Indent2 */
+{
+ font-size: 13px;
+ font-family: 'Courier New';
+ letter-spacing: -1px;
+}
+span.f_ExampleIndent3 /* Example Indent3 */
+{
+ font-size: 13px;
+ font-family: 'Courier New';
+ letter-spacing: -1px;
+}
+span.f_FAQLinks /* FAQ Links */
+{
+ font-size: 12px;
+ font-family: 'Verdana';
+ font-weight: bold;
+}
+span.f_Heading1 /* Heading1 */
+{
+ font-size: 21px;
+ font-weight: bold;
+ color: #ffffff;
+}
+span.f_Heading2 /* Heading2 */
+{
+ font-size: 19px;
+ font-style: italic;
+ font-weight: bold;
+ color: #000080;
+}
+span.f_Heading2Sub /* Heading2 Sub */
+{
+ font-size: 17px;
+ font-style: italic;
+ font-weight: bold;
+ color: #000080;
+}
+span.f_Heading2Sub2 /* Heading2 Sub2 */
+{
+ font-size: 17px;
+ font-style: italic;
+ font-weight: bold;
+ color: #000080;
+}
+span.f_Heading3 /* Heading3 */
+{
+ font-size: 17px;
+ font-weight: bold;
+ color: ;
+}
+span.f_Heading3HowTo /* Heading3HowTo */
+{
+ font-size: 17px;
+ font-weight: bold;
+ color: ;
+}
+span.f_Heading3Line /* Heading3Line */
+{
+ font-size: 17px;
+ font-weight: bold;
+ color: #000080;
+}
+span.f_Heading4 /* Heading4 */
+{
+ font-size: 16px;
+ font-weight: bold;
+ color: #000080;
+ text-decoration: underline;
+}
+span.f_Heading4FAQ /* Heading4 FAQ */
+{
+ font-size: 16px;
+ font-style: italic;
+ font-weight: bold;
+ color: #000080;
+}
+span.f_Heading4IconList /* Heading4 IconList */
+{
+ font-size: 16px;
+ font-weight: bold;
+ color: #000080;
+}
+span.f_Heading4Indent /* Heading4 Indent */
+{
+ font-size: 16px;
+ font-weight: bold;
+ color: #000080;
+ text-decoration: underline;
+}
+span.f_Heading4IndentNoBefore /* Heading4 Indent NoBefore */
+{
+ font-size: 16px;
+ font-weight: bold;
+ color: #000080;
+ text-decoration: underline;
+}
+span.f_Heading4Plain /* Heading4 Plain */
+{
+ font-size: 16px;
+ font-weight: bold;
+ color: #000080;
+}
+span.f_ImageCaption /* Image Caption */
+{
+ font-size: 12px;
+ font-family: 'Verdana';
+ font-style: italic;
+}
+span.f_Indent4 /* Indent4 */
+{
+}
+span.f_IndentListButtonList /* IndentList ButtonList */
+{
+}
+span.f_IndentList1 /* IndentList1 */
+{
+}
+span.f_IndentList115 /* IndentList1 1.5" */
+{
+}
+span.f_IndentList115Callout /* IndentList1 1.5" Callout */
+{
+ font-size: 13px;
+ font-family: 'Verdana';
+ letter-spacing: -1px;
+}
+span.f_IndentList1Header /* IndentList1 Header */
+{
+ font-weight: bold;
+}
+span.f_Indentlist1Larger /* Indentlist1 Larger */
+{
+}
+span.f_IndentList115 /* IndentList1+ 1.5" */
+{
+}
+span.f_IndentList2 /* IndentList2 */
+{
+}
+span.f_IndentList2Callout /* IndentList2 Callout */
+{
+ font-size: 13px;
+ font-family: 'Verdana';
+ letter-spacing: -1px;
+}
+span.f_IndentList2Noafter /* IndentList2 Noafter */
+{
+}
+span.f_IndentList2Note /* IndentList2 Note */
+{
+}
+span.f_IndentList2QA /* IndentList2 QA */
+{
+ font-style: italic;
+ font-weight: bold;
+}
+span.f_IndentList3 /* IndentList3 */
+{
+}
+span.f_IndentList3Buttons /* IndentList3 Buttons */
+{
+}
+span.f_IndentList3Callout /* IndentList3 Callout */
+{
+ font-size: 13px;
+ font-family: 'Verdana';
+ letter-spacing: -1px;
+}
+span.f_IndentList3noafter /* IndentList3noafter */
+{
+}
+span.f_IndentList4Callout /* IndentList4 Callout */
+{
+ font-size: 13px;
+ font-family: 'Verdana';
+ letter-spacing: -1px;
+}
+span.f_InThisTopicHeading /* InThisTopic Heading */
+{
+ font-size: 13px;
+ font-family: 'Verdana';
+ font-weight: bold;
+ color: #ffffff;
+ letter-spacing: -1px;
+ text-transform: uppercase;
+}
+span.f_InThisTopicLinkList /* InThisTopic LinkList */
+{
+ font-size: 13px;
+ font-family: 'Verdana';
+ letter-spacing: -1px;
+}
+span.f_NormalHead /* Normal Head */
+{
+ font-weight: bold;
+}
+span.f_NormalHeadIndent1 /* Normal Head Indent1 */
+{
+ font-weight: bold;
+}
+span.f_NormalNoAfter /* Normal NoAfter */
+{
+}
+span.f_Notes /* Notes */
+{
+}
+span.f_NotesBox /* NotesBox */
+{
+}
+span.f_PopupBox /* Popup Box */
+{
+ font-size: 12px;
+}
+span.f_SeeAlso /* SeeAlso */
+{
+ font-size: 16px;
+ font-style: italic;
+ font-weight: bold;
+}
+span.f_SettingsLocationFoot /* Settings Location Foot */
+{
+ font-size: 16px;
+ font-family: 'Times New Roman';
+ font-weight: bold;
+}
+span.f_SettingsLocationHead /* Settings Location Head */
+{
+ font-size: 16px;
+ font-style: italic;
+ font-weight: bold;
+}
+span.f_SyntaxTableHeading /* SyntaxTable Heading */
+{
+ font-size: 16px;
+ font-family: 'Verdana';
+ font-weight: bold;
+ color: #ffffff;
+ letter-spacing: -1px;
+}
+span.f_T_Code /* T_Code */
+{
+ font-family: 'Courier New';
+ letter-spacing: -1px;
+}
+span.f_T_Entry /* T_Entry */
+{
+ font-family: 'Verdana';
+ font-style: italic;
+ letter-spacing: -1px;
+}
+span.f_T_Entry10pt /* T_Entry 10pt */
+{
+ font-size: 13px;
+ font-family: 'Verdana';
+ font-style: italic;
+ letter-spacing: -1px;
+}
+span.f_T_Menu /* T_Menu */
+{
+ font-family: 'Times New Roman';
+ font-weight: bold;
+}
+span.f_T_Menu10p /* T_Menu 10p */
+{
+ font-size: 13px;
+ font-family: 'Times New Roman';
+ font-weight: bold;
+}
+span.f_TableText /* Table Text */
+{
+ font-size: 13px;
+ font-family: 'Verdana';
+}
+/* Paragraph styles */
+p /* Normal */
+{
+ text-align: left;
+ text-indent: 0px;
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 10px 0px;
+}
+.p_BodyText /* Body Text */
+{
+ text-align: center;
+ margin: 0px 0px 18px 0px;
+}
+.p_Callouts /* Callouts */
+{
+ margin: 0px 0px 0px 0px;
+}
+.p_Code /* Code */
+{
+ margin: 0px 0px 0px 0px;
+}
+.p_CodeExample /* Code Example */
+{
+ white-space: nowrap;
+ margin: 0px 0px 0px 0px;
+}
+.p_Comment /* Comment */
+{
+ text-align: center;
+}
+.p_Example /* Example */
+{
+ border-color: #e9e9e9;
+ border-style: solid;
+ border-width: 5px;
+ background: #eaeaea;
+ margin: 10px 0px 19px 0px;
+}
+.p_ExampleIndent2 /* Example Indent2 */
+{
+ border-color: #e9e9e9;
+ border-style: solid;
+ border-width: 5px;
+ background: #eaeaea;
+ margin: 10px 0px 19px 29px;
+}
+.p_ExampleIndent3 /* Example Indent3 */
+{
+ border-color: #e9e9e9;
+ border-style: solid;
+ border-width: 5px;
+ background: #eaeaea;
+ margin: 10px 0px 19px 60px;
+}
+.p_FAQLinks /* FAQ Links */
+{
+ margin: 0px 100px 5px 45px;
+}
+.p_Heading1 /* Heading1 */
+{
+ margin: 0px 0px 0px 0px;
+}
+.p_Heading2 /* Heading2 */
+{
+ margin: 19px 0px 10px 0px;
+}
+.p_Heading2Sub /* Heading2 Sub */
+{
+ margin: 5px 0px 10px 29px;
+}
+.p_Heading2Sub2 /* Heading2 Sub2 */
+{
+ margin: 5px 0px 10px 60px;
+}
+.p_Heading3 /* Heading3 */
+{
+ margin: 10px 0px 10px 0px;
+}
+.p_Heading3HowTo /* Heading3HowTo */
+{
+ border-color: #cdfefd;
+ border-style: solid;
+ border-width: 5px;
+ background: #cdfefd;
+ margin: 20px 0px 15px 0px;
+}
+.p_Heading3Line /* Heading3Line */
+{
+ border-color: #000000;
+ border-style: solid;
+ border-width: 1px;
+ border-right: none;
+ border-bottom: none;
+ border-left: none;
+ padding: 3px 3px 3px 3px;
+ margin: 7px -3px 7px -3px;
+}
+.p_Heading4 /* Heading4 */
+{
+ margin: 10px 0px 10px 0px;
+}
+.p_Heading4FAQ /* Heading4 FAQ */
+{
+}
+.p_Heading4IconList /* Heading4 IconList */
+{
+ text-indent: -48px;
+ margin: 0px 0px 10px 60px;
+}
+.p_Heading4Indent /* Heading4 Indent */
+{
+ margin: 10px 0px 10px 29px;
+}
+.p_Heading4IndentNoBefore /* Heading4 Indent NoBefore */
+{
+ margin: 0px 0px 10px 29px;
+}
+.p_Heading4Plain /* Heading4 Plain */
+{
+ margin: 0px 0px 0px 0px;
+}
+.p_ImageCaption /* Image Caption */
+{
+}
+.p_Indent4 /* Indent4 */
+{
+ margin: 0px 0px 10px 80px;
+}
+.p_IndentListButtonList /* IndentList ButtonList */
+{
+ text-indent: -154px;
+ margin: 0px 0px 10px 183px;
+}
+.p_IndentList1 /* IndentList1 */
+{
+ text-indent: -200px;
+ margin: 0px 0px 10px 230px;
+}
+.p_IndentList115 /* IndentList1 1.5" */
+{
+ text-indent: -144px;
+ margin: 0px 0px 10px 173px;
+}
+.p_IndentList115Callout /* IndentList1 1.5" Callout */
+{
+ text-indent: -23px;
+ margin: 0px 110px 10px 197px;
+}
+.p_IndentList1Header /* IndentList1 Header */
+{
+ border-color: #000000;
+ border-style: solid;
+ border-width: 1px;
+ border-top: none;
+ border-right: none;
+ border-left: none;
+ padding: 3px 3px 3px 3px;
+ margin: 7px -3px 16px 27px;
+}
+.p_Indentlist1Larger /* Indentlist1 Larger */
+{
+ text-indent: -174px;
+ margin: 0px 0px 10px 234px;
+}
+.p_IndentList115 /* IndentList1+ 1.5" */
+{
+ text-indent: -100px;
+ margin: 0px 0px 10px 160px;
+}
+.p_IndentList2 /* IndentList2 */
+{
+ margin: 0px 0px 10px 30px;
+}
+.p_IndentList2Callout /* IndentList2 Callout */
+{
+ text-indent: -23px;
+ margin: 0px 149px 10px 52px;
+}
+.p_IndentList2Noafter /* IndentList2 Noafter */
+{
+ margin: 0px 0px 0px 30px;
+}
+.p_IndentList2Note /* IndentList2 Note */
+{
+ text-indent: -59px;
+ margin: 0px 0px 10px 88px;
+}
+.p_IndentList2QA /* IndentList2 QA */
+{
+ margin: 0px 0px 10px 20px;
+}
+.p_IndentList3 /* IndentList3 */
+{
+ margin: 0px 0px 10px 60px;
+}
+.p_IndentList3Buttons /* IndentList3 Buttons */
+{
+ text-indent: -31px;
+ margin: 0px 0px 10px 84px;
+}
+.p_IndentList3Callout /* IndentList3 Callout */
+{
+ text-indent: -23px;
+ margin: 0px 100px 10px 83px;
+}
+.p_IndentList3noafter /* IndentList3noafter */
+{
+ margin: 0px 0px 0px 60px;
+}
+.p_IndentList4Callout /* IndentList4 Callout */
+{
+ text-indent: -23px;
+ margin: 0px 100px 10px 103px;
+}
+.p_InThisTopicHeading /* InThisTopic Heading */
+{
+ text-align: center;
+ white-space: nowrap;
+ margin: 0px 0px 0px 0px;
+}
+.p_InThisTopicLinkList /* InThisTopic LinkList */
+{
+ white-space: nowrap;
+ margin: 0px 0px 0px 0px;
+}
+.p_NormalHead /* Normal Head */
+{
+ margin: 5px 0px 5px 0px;
+}
+.p_NormalHeadIndent1 /* Normal Head Indent1 */
+{
+ margin: 5px 0px 5px 30px;
+}
+.p_NormalNoAfter /* Normal NoAfter */
+{
+ margin: 0px 0px 0px 0px;
+}
+.p_Notes /* Notes */
+{
+}
+.p_NotesBox /* NotesBox */
+{
+ margin: 10px 0px 10px 0px;
+}
+.p_PopupBox /* Popup Box */
+{
+}
+.p_SeeAlso /* SeeAlso */
+{
+ border-color: #000000;
+ border-style: solid;
+ border-width: 1px;
+ border-right: none;
+ border-bottom: none;
+ border-left: none;
+ padding: 4px 4px 4px 4px;
+ margin: 15px -4px 6px -4px;
+}
+.p_SettingsLocationFoot /* Settings Location Foot */
+{
+ text-align: center;
+ border-color: #000000;
+ border-style: solid;
+ border-width: 1px;
+ border-top: none;
+ border-right: none;
+ border-left: none;
+ padding: 6px 6px 6px 6px;
+ margin: -6px -6px 4px -6px;
+}
+.p_SettingsLocationHead /* Settings Location Head */
+{
+ text-align: center;
+ border-color: #000000;
+ border-style: solid;
+ border-width: 1px;
+ border-right: none;
+ border-bottom: none;
+ border-left: none;
+ padding: 4px 4px 4px 4px;
+ margin: 15px -4px 6px -4px;
+}
+.p_SyntaxTableHeading /* SyntaxTable Heading */
+{
+ text-align: center;
+ white-space: nowrap;
+ margin: 0px 0px 0px 0px;
+}
+.p_TableText /* Table Text */
+{
+ margin: 0px 0px 0px 0px;
+}
diff --git a/java/resources/IceGridAdmin/system_requirements.htm b/java/resources/IceGridAdmin/system_requirements.htm
index 9793018dd1b..34da14b4ba5 100644
--- a/java/resources/IceGridAdmin/system_requirements.htm
+++ b/java/resources/IceGridAdmin/system_requirements.htm
@@ -1,125 +1,125 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?system_requirements.htm"; }

-  else { parent.lazysync('system_requirements.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>System Requirements</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   

-   <a href="introduction.htm">Introduction</a>&nbsp;&gt;</p>

-   <p class="p_Heading1"><span class="f_Heading1">System Requirements</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <a href="introduction.htm"

-        onmouseover="document.images.prev.src='btn_prev_h.gif'" 

-        onmouseout="document.images.prev.src='btn_prev_n.gif'"

-        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"

-        ></a><a href="introduction.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="starting_icegrid_admin.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p>IceGrid Admin is a Java<span style="font-size: 9px; vertical-align: super;">TM</span> application supported a wide range of platforms including Windows XP, MacOS X and Linux.</p>

-<p>In order to run IceGrid Admin you need:</p>

-<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">the IceGridGUI.jar file, usually installed in the bin or lib directory of your Ice installation. If you are using a Linux RPM installation, IceGridGUI.jar is installed in /usr/share/java/Ice-3.4.0.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">a Java Runtime Environment (JRE) v1.5.0 or later. For Windows, Linux and Solaris, we recommend using a Sun JRE or JDK, available <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://java.sun.com/javase/downloads/index.jsp" target="_blank" class="weblink">here</a>.</span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>

-<p>If you want to read IceGrid XML files from IceGrid Admin, you also need to have the icegridadmin <span class="f_IndentList2">command-line utility (version 3.4.0) in your PATH.</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?system_requirements.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?system_requirements.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?system_requirements.htm"; }
+  else { parent.lazysync('system_requirements.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>System Requirements</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   
+   <a href="introduction.htm">Introduction</a>&nbsp;&gt;</p>
+   <p class="p_Heading1"><span class="f_Heading1">System Requirements</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <a href="introduction.htm"
+        onmouseover="document.images.prev.src='btn_prev_h.gif'" 
+        onmouseout="document.images.prev.src='btn_prev_n.gif'"
+        ><img name=prev src="btn_prev_n.gif" border=0 alt="Previous page"
+        ></a><a href="introduction.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="starting_icegrid_admin.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p>IceGrid Admin is a Java<span style="font-size: 9px; vertical-align: super;">TM</span> application supported a wide range of platforms including Windows XP, MacOS X and Linux.</p>
+<p>In order to run IceGrid Admin you need:</p>
+<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">the IceGridGUI.jar file, usually installed in the bin or lib directory of your Ice installation. If you are using a Linux RPM installation, IceGridGUI.jar is installed in /usr/share/java/Ice-3.4.0.</span></td></tr></table></div><div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 10px 30px;"><table border="0" cellpadding="0" cellspacing="0" style="line-height: normal;"><tr style="vertical-align:baseline" valign="baseline"><td width="13"><span style="font-size: 11pt; font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', 'Arial'; color: #000000;">&#8226;</span></td><td><span class="f_IndentList2">a Java Runtime Environment (JRE) v1.5.0 or later. For Windows, Linux and Solaris, we recommend using a Sun JRE or JDK, available <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://java.sun.com/javase/downloads/index.jsp" target="_blank" class="weblink">here</a>.</span></td></tr></table></div><p class="p_IndentList2"><span class="f_IndentList2">&nbsp;</span></p>
+<p>If you want to read IceGrid XML files from IceGrid Admin, you also need to have the icegridadmin <span class="f_IndentList2">command-line utility (version 3.4.0) in your PATH.</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?system_requirements.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?system_requirements.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/welcome.htm b/java/resources/IceGridAdmin/welcome.htm
index 3f32dd880eb..8061fce9c9b 100644
--- a/java/resources/IceGridAdmin/welcome.htm
+++ b/java/resources/IceGridAdmin/welcome.htm
@@ -1,128 +1,128 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<!-- saved from url=(0029)http://www.helpandmanual.com/ -->

-<head><script type="text/javascript" src="helpman_topicinit.js"></script>

-<!-- Redirect browser to frame page if page is not in the content frame. -->

-<script type="text/javascript">

-<!--

-if (top.location.search.lastIndexOf("toc=0")<=0) {

-  if (top.frames.length==0) { top.location.href="index.html?welcome.htm"; }

-  else { parent.lazysync('welcome.htm'); }

-}

-//-->

-</script>

-<script type="text/javascript" src="highlight.js"></script>

-   <title>Welcome</title>

-   <meta name="generator" content="Help & Manual">

-   <meta name="keywords" content="">

-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-   <link type="text/css" href="styles.css" rel="stylesheet">

-   <link type="text/css" href="custom.css" rel="stylesheet">

-   <script type="text/javascript" src="nsh.js"></script>

-   

-<!-- non-scrolling headers for CHM and browser-based help, local styles-->

-<style TYPE="text/css" media="screen"> 

-   <!-- 

-   body {    

-      margin:0; 

-      padding:0; 

-      overflow: auto; 

-      background: #FFFFFF; 

-   } 

-   #idheader { 

-      width:100%; 

-      height:auto; 

-      padding: 0; 

-      margin: 0; 

-} 

-    #idheaderbg  {

-    background: #6F6F6F; 

-}

-   -->

-   </style>

-   

-<style TYPE="text/css" MEDIA="print">

-<!--

-/* Hide navigation links and add space between header

-     and text in the printed version. Not valid for eBooks. */

-#idnav { display:none;	 }

-.topichead { padding: 5px 5px 20px 5px; }

--->

-</style>   

-</head>

-<body onload="highlight();">

-<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>

-<!--ZOOMSTOP-->

-

-<div id="idheader">

-<div id="idheaderbg">

-<table width="100%" border="0" cellspacing="0" cellpadding="0" 

-       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">

-

-  <tr valign="bottom">

-    <td align="left" valign="bottom" class="topichead">

-   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;

-   &raquo;No topics above this level&laquo;

-   </p>

-   <p class="p_Heading1"><span class="f_Heading1">Welcome</span></p>

-

-    </td>

-    <td align="right" width="120" valign="middle" class="topichead" id="idnav">

-    <a href="javascript: print();"

-    		onmouseover="document.images.prntr.src='print1.gif'" 

-        onmouseout="document.images.prntr.src='print2.gif'"

-        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"

-        ></a>

-     <img src="btn_prev_d.gif" border="0"

-        ><a href="welcome.htm"

-        onmouseover="document.images.main.src='btn_home_h.gif'" 

-        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"

-        ></a><a href="introduction.htm"

-        onmouseover="document.images.next.src='btn_next_h.gif'" 

-        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"

-        ></a>

-    </td>

-  </tr>

-  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>

-</table>

-</div>

-

-<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->

-  

-

-</div>  

-

-

-

-<div id="idcontent"><div id="innerdiv"> 

-<!--ZOOMRESTART-->

-<p class="p_Heading2"><span class="f_Heading2">Welcome to the IceGrid Admin Online Help</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">IceGrid Admin is the graphical administration tool for <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://www.zeroc.com/icegrid/index.html" target="_blank" class="weblink">IceGrid</a>, the server-deployment and monitoring service for Ice.</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">These pages describe how to use the IceGrid Admin tool, and assume some familiarity with both Ice and IceGrid. </span></p>

-<p class="p_Heading2"><span class="f_Heading2">Getting Started with Ice and IceGrid</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">Ice and IceGrid are described in detail in the <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://www.zeroc.com/doc/Ice-3.4.0/manual/" target="_blank" class="weblink" title="Distributed Programming with Ice">Ice manual</a>. </span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">For a quick overview of IceGrid, please read <img src="wblnk.png" width="12" height="10" border="0" alt=""> &quot;<a href="http://www.zeroc.com/newsletter/issue19.pdf" target="_blank" class="weblink">Teach Yourself IceGrid in 10 Minutes</a>&quot; in issue 19 of the <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://www.zeroc.com/newsletter/index.html" target="_blank" class="weblink">Connections newsletter</a>.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">Need Help?</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">If you have trouble with IceGrid Admin or any other Ice component, we recommend to browse the <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://www.zeroc.com/forums" target="_blank" class="weblink">Ice user forums</a> and post your questions there.</span></p>

-<p class="p_IndentList2"><span class="f_IndentList2">ZeroC also offers commercial support by e-mail and by phone. Please contact <a href="mailto:sales@zeroc.com" class="weblink">sales@zeroc.com</a> for details.</span></p>

-<p class="p_Heading2"><span class="f_Heading2">&nbsp;</span></p>

-

-<!--ZOOMSTOP-->

-<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 

-<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?welcome.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?welcome.htm</a>

-</p>

-</div></div>

-<script type="text/javascript"> 

-<!-- 

-var lastSlashPos = document.URL.lastIndexOf("/") >

-document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :

-document.URL.lastIndexOf("\\");

-if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4

-).toLowerCase() != "~hh" )

-{

-    nsrInit();

-}

---> 

-</script> 

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<!-- saved from url=(0029)http://www.helpandmanual.com/ -->
+<head><script type="text/javascript" src="helpman_topicinit.js"></script>
+<!-- Redirect browser to frame page if page is not in the content frame. -->
+<script type="text/javascript">
+<!--
+if (top.location.search.lastIndexOf("toc=0")<=0) {
+  if (top.frames.length==0) { top.location.href="index.html?welcome.htm"; }
+  else { parent.lazysync('welcome.htm'); }
+}
+//-->
+</script>
+<script type="text/javascript" src="highlight.js"></script>
+   <title>Welcome</title>
+   <meta name="generator" content="Help & Manual">
+   <meta name="keywords" content="">
+   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+   <link type="text/css" href="styles.css" rel="stylesheet">
+   <link type="text/css" href="custom.css" rel="stylesheet">
+   <script type="text/javascript" src="nsh.js"></script>
+   
+<!-- non-scrolling headers for CHM and browser-based help, local styles-->
+<style TYPE="text/css" media="screen"> 
+   <!-- 
+   body {    
+      margin:0; 
+      padding:0; 
+      overflow: auto; 
+      background: #FFFFFF; 
+   } 
+   #idheader { 
+      width:100%; 
+      height:auto; 
+      padding: 0; 
+      margin: 0; 
+} 
+    #idheaderbg  {
+    background: #6F6F6F; 
+}
+   -->
+   </style>
+   
+<style TYPE="text/css" MEDIA="print">
+<!--
+/* Hide navigation links and add space between header
+     and text in the printed version. Not valid for eBooks. */
+#idnav { display:none;	 }
+.topichead { padding: 5px 5px 20px 5px; }
+-->
+</style>   
+</head>
+<body onload="highlight();">
+<div id="hmpopupDiv" style="visibility:hidden; position:absolute; z-index:1000; filter:progid:DXImageTransform.Microsoft.DropShadow(color='b0b0b0', Direction=135, OffX='3', OffY='3') progid:DXImageTransform.Microsoft.Fade(Overlap=1.00);"></div>
+<!--ZOOMSTOP-->
+
+<div id="idheader">
+<div id="idheaderbg">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" 
+       style="margin: 0px; color: #6F6F6F; background: url(header_bg.jpg);">
+
+  <tr valign="bottom">
+    <td align="left" valign="bottom" class="topichead">
+   <p class="crumbs" id="idnav"><b>Navigation:</b>&nbsp;
+   &raquo;No topics above this level&laquo;
+   </p>
+   <p class="p_Heading1"><span class="f_Heading1">Welcome</span></p>
+
+    </td>
+    <td align="right" width="120" valign="middle" class="topichead" id="idnav">
+    <a href="javascript: print();"
+    		onmouseover="document.images.prntr.src='print1.gif'" 
+        onmouseout="document.images.prntr.src='print2.gif'"
+        ><img name="prntr" border="0" alt="Print this Topic" title="Print this Topic" src="print2.gif"
+        ></a>
+     <img src="btn_prev_d.gif" border="0"
+        ><a href="welcome.htm"
+        onmouseover="document.images.main.src='btn_home_h.gif'" 
+        onmouseout="document.images.main.src='btn_home_n.gif'"><img name=main src="btn_home_n.gif" border=0 alt="Return to chapter overview"
+        ></a><a href="introduction.htm"
+        onmouseover="document.images.next.src='btn_next_h.gif'" 
+        onmouseout="document.images.next.src='btn_next_n.gif'"><img name=next src="btn_next_n.gif" border=0 alt="Next page"
+        ></a>
+    </td>
+  </tr>
+  <tr><td colspan="2" style="height: 3px; background: url(header_bg_shadow.gif)"></td></tr>
+</table>
+</div>
+
+<!-- The following code displays Expand All/Collapse All links  below the header in topics containing toggles -->
+  
+
+</div>  
+
+
+
+<div id="idcontent"><div id="innerdiv"> 
+<!--ZOOMRESTART-->
+<p class="p_Heading2"><span class="f_Heading2">Welcome to the IceGrid Admin Online Help</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">IceGrid Admin is the graphical administration tool for <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://www.zeroc.com/icegrid/index.html" target="_blank" class="weblink">IceGrid</a>, the server-deployment and monitoring service for Ice.</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">These pages describe how to use the IceGrid Admin tool, and assume some familiarity with both Ice and IceGrid. </span></p>
+<p class="p_Heading2"><span class="f_Heading2">Getting Started with Ice and IceGrid</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">Ice and IceGrid are described in detail in the <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://www.zeroc.com/doc/Ice-3.4.0/manual/" target="_blank" class="weblink" title="Distributed Programming with Ice">Ice manual</a>. </span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">For a quick overview of IceGrid, please read <img src="wblnk.png" width="12" height="10" border="0" alt=""> &quot;<a href="http://www.zeroc.com/newsletter/issue19.pdf" target="_blank" class="weblink">Teach Yourself IceGrid in 10 Minutes</a>&quot; in issue 19 of the <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://www.zeroc.com/newsletter/index.html" target="_blank" class="weblink">Connections newsletter</a>.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">Need Help?</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">If you have trouble with IceGrid Admin or any other Ice component, we recommend to browse the <img src="wblnk.png" width="12" height="10" border="0" alt=""> <a href="http://www.zeroc.com/forums" target="_blank" class="weblink">Ice user forums</a> and post your questions there.</span></p>
+<p class="p_IndentList2"><span class="f_IndentList2">ZeroC also offers commercial support by e-mail and by phone. Please contact <a href="mailto:sales@zeroc.com" class="weblink">sales@zeroc.com</a> for details.</span></p>
+<p class="p_Heading2"><span class="f_Heading2">&nbsp;</span></p>
+
+<!--ZOOMSTOP-->
+<p>&nbsp;</p><hr size="1"><p class="fsmall">Page url: 
+<a href="http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?welcome.htm" target="_top">http://www.zeroc.com/doc/Ice-3.4.0/IceGridAdmin/index.html?welcome.htm</a>
+</p>
+</div></div>
+<script type="text/javascript"> 
+<!-- 
+var lastSlashPos = document.URL.lastIndexOf("/") >
+document.URL.lastIndexOf("\\") ? document.URL.lastIndexOf("/") :
+document.URL.lastIndexOf("\\");
+if( document.URL.substring( lastSlashPos + 1, lastSlashPos + 4
+).toLowerCase() != "~hh" )
+{
+    nsrInit();
+}
+--> 
+</script> 
+</body>
+</html>
diff --git a/java/resources/IceGridAdmin/zoom_index.js b/java/resources/IceGridAdmin/zoom_index.js
index 747496333c2..89557972db4 100644
--- a/java/resources/IceGridAdmin/zoom_index.js
+++ b/java/resources/IceGridAdmin/zoom_index.js
@@ -1,1150 +1,1150 @@
-dictwords = ["adapter 0 293 2 282 4 15 11 45 12 15 14 30 17 15 20 15 31 15 32 30 33 4",

-	"represents 0 15 10 15 14 15 15 15 18 15 21 4 23 15 30 15 31 15 32 120 33 4 34 15",

-	"ice 0 56 2 101 3 15 5 30 8 26 11 45 12 15 13 30 15 90 16 15 19 15 22 90 23 15 24 15 32 15 33 28 34 45 38 15 39 105",

-	"object 0 210 2 135 4 15 8 15 11 30 14 120 25 15 31 45 32 15 33 8",

-	"described 0 15 6 15 21 4 22 15 24 15 30 15 39 15",

-	"icegrid 0 105 1 60 2 105 3 45 5 60 6 45 7 195 10 30 11 360 12 60 13 15 14 75 15 45 18 30 21 16 22 195 23 30 24 225 25 30 26 375 27 15 28 45 29 180 30 165 31 165 32 120 33 80 34 30 35 105 36 15 37 42 38 60 39 150",

-	"registry 0 30 3 45 6 15 7 150 11 30 21 4 22 60 24 15 25 15 26 360 27 15 29 60 30 45 31 353 32 60 33 16 35 203",

-	"resides 0 15",

-	"server 0 105 2 105 3 75 4 15 5 15 7 15 8 102 10 15 11 567 12 30 13 45 15 207 16 222 17 102 18 30 21 51 25 60 29 15 30 30 32 105 33 267 34 90",

-	"icebox 0 15 1 15 8 147 12 30 13 30 15 90 16 30 17 15 18 45 21 4 30 15 32 75 33 16 34 75",

-	"service 0 15 3 15 8 15 12 132 13 75 15 15 17 15 18 132 19 87 20 87 21 31 23 15 32 60 33 4 34 308 39 15",

-	"note 0 15 26 15",

-	"direct 0 15 2 15 26 60 36 15",

-	"adapters 0 30 4 15 11 15 14 135 31 45 33 8",

-	"not 0 15 2 15 3 15 5 45 7 15 11 45 21 28 24 15 26 45 28 30 29 45 31 15 33 12",

-	"displayed 0 15 21 4 28 30 30 15",

-	"since 0 15 22 15",

-	"knows 0 15",

-	"nothing 0 15 26 15",

-	"about 0 15 22 30 26 15 29 30",

-	"them 0 15 1 15 2 15 11 15 12 15 21 4",

-	"states 0 15 28 30 30 15 33 8 34 15",

-	"either 0 15 15 15 30 15 33 8 34 15",

-	"active 0 30 33 8",

-	"inactive 0 45 33 8",

-	"properties 0 30 2 60 3 30 5 75 8 60 10 30 11 75 12 75 13 105 14 30 16 120 17 45 19 75 20 45 22 90 23 75 30 45 31 30 33 44 34 165 35 30 36 30",

-	"panel 0 15 2 15 3 15 5 15 8 30 10 15 11 15 12 15 13 15 14 15 16 15 17 15 19 15 20 15 23 15 26 30 30 30 31 15 33 8 34 30 35 15",

-	"shows 0 30 3 15 5 15 10 15 22 15 23 15 25 15 28 15 29 30 30 60 31 60 32 15 33 16 34 15 35 15 36 15",

-	"status 0 45 24 15 25 15 29 30 33 4 34 15",

-	"this 0 195 2 195 3 120 4 15 5 60 7 60 8 15 9 15 10 60 11 300 12 90 13 30 14 135 15 15 16 45 17 15 19 30 20 15 21 28 22 60 23 45 25 15 26 195 27 15 28 15 29 30 30 60 31 165 33 108 34 165 35 75 36 90",

-	"published 0 30 2 30",

-	"endpoints 0 75 2 105 11 15 14 75 26 30",

-	"registered 0 30 2 15 30 15 31 30 33 4",

-	"blank 0 30 3 30 10 15 11 45 33 12",

-	"when 0 135 2 60 3 30 5 15 7 15 8 15 10 15 11 180 12 30 14 45 21 32 22 75 26 105 28 60 29 15 30 60 31 45 32 15 33 44 34 15 35 30 36 15",

-	"adapter&#39;s 0 45 2 15",

-	"description 0 30 2 30 3 30 5 30 10 30 11 30 12 30 14 30 21 4 22 15 23 30 33 8 34 30",

-	"free-text 0 15 2 15 3 15 5 15 10 15 11 15 12 15 14 15 23 15 33 4 34 15",

-	"ids 0 15 4 30 11 30 12 15 13 15 16 15 19 15 21 4",

-	"unique 0 15 2 30 5 15 11 15 12 15 14 15 17 15 20 15",

-	"within 0 15 2 30 5 15 11 15 12 15 13 45 14 15 17 15 18 15 20 15 21 8 32 30 34 30",

-	"deployment 0 15 2 15 11 30 12 15 14 15 24 60 25 57 26 15 27 15 29 75 32 15 35 15",

-	"replica 0 60 2 60 3 15 10 15 14 162 26 60",

-	"group 0 60 2 60 3 15 10 15 14 162",

-	"belongs 0 30",

-	"otherwise 0 15 5 15",

-	"priority 0 30 2 45 14 15",

-	"used 0 15 2 30 3 15 10 15 11 45 12 30 14 15 17 15 20 15 21 8 22 30 23 15 26 30 33 12 36 30",

-	"only 0 30 2 30 7 15 8 15 10 15 13 15 14 15 17 15 21 16 24 15 26 30 29 15 30 60 31 45 33 16 35 30",

-	"ordered 0 15 14 15",

-	"load 0 15 10 26 14 67 18 15 26 30 30 45",

-	"balancing 0 15 14 26",

-	"policy 0 15 14 60",

-	"configuration 0 30 10 15 15 45 22 30 23 15 25 15 33 8 36 113",

-	"property 0 30 2 90 3 15 10 30 11 105 12 75 13 237 16 60 19 30 21 4 22 30 23 15 26 60 30 30 31 45 33 24 34 45 35 30 36 60",

-	"publishedendpoints 0 15",

-	"register 0 45 2 60 11 15 25 15 33 4",

-	"process 0 56 2 56 8 11 10 15 11 15 28 15 30 75 31 45 32 75 33 16 35 30",

-	"checkbox 0 30 11 15 33 12 34 15",

-	"checked 0 30 2 45 26 30 33 8 34 15",

-	"will 0 15 2 15 5 15 7 30 12 15 28 30 29 30",

-	"upon 0 15",

-	"activation 0 15 2 41 11 86 33 16",

-	"setting 0 15 2 15 8 15 14 15 22 30 33 8",

-	"meaningful 0 15 21 4",

-	"servers 0 15 1 15 2 15 4 30 7 15 10 30 15 15 17 15 21 4 24 15 26 15 33 12",

-	"version 0 15 2 15 11 45 21 4 30 15 31 15 33 8 38 15",

-	"less 0 15",

-	"than 0 15 3 15 11 15 31 15 33 4",

-	"3.3 0 15 2 15",

-	"lifetime 0 30 2 15 11 15 33 8",

-	"considers 0 15",

-	"activated 0 30",

-	"starts 0 15 10 15 11 30",

-	"deactivated 0 15",

-	"shuts 0 15",

-	"down 0 30 18 15 30 30 33 12",

-	"allows 0 15 1 15 25 15 26 15 29 15 31 60 33 4 36 15",

-	"detect 0 15",

-	"fully 0 15",

-	"server-lifetime 0 30",

-	"shutting 0 15 33 4",

-	"least 0 15",

-	"one 0 15 1 15 2 30 6 15 8 15 11 45 14 15 16 15 17 15 28 15 29 45 33 8 35 15",

-	"unregistered 0 15",

-	"well-known 0 45 2 30 3 30 11 30 14 30 25 15 31 75 33 4",

-	"objects 0 60 2 60 11 15 14 30 31 60",

-	"defined 0 30 2 30 3 15 10 15 11 45 13 30 14 15 15 15 16 45 18 30 19 15 21 12 30 15 31 15",

-	"allocatable 0 15 2 30 11 45 33 8",

-	"page 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 15 12 15 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 15 23 15 24 15 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 15 38 15 39 15",

-	"url 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 15 12 15 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 15 23 15 24 15 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 15 38 15 39 15",

-	"http 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 15 12 15 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 15 23 15 24 15 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 15 38 15 39 15",

-	"www.zeroc.com 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 15 12 15 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 15 23 15 24 15 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 15 38 15 39 15",

-	"doc 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 15 12 15 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 15 23 15 24 15 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 15 38 15 39 15",

-	"ice-3.4.0 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 15 12 15 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 30 23 15 24 15 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 30 38 30 39 15",

-	"icegridadmin 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 45 12 30 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 15 23 15 24 71 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 15 38 30 39 15",

-	"index.html 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 15 12 15 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 15 23 15 24 15 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 15 38 15 39 15",

-	"adapter.htm 0 25",

-	"definitions 1 15 3 15 13 15 17 15 20 15 24 45 26 15 29 60 31 15 33 4 34 15",

-	"organized 1 15",

-	"applications 1 30 3 15 10 15 22 15 24 15 29 15 31 30",

-	"typically 1 15 4 15 8 15 9 15 15 15 22 30 23 15 31 15 33 4",

-	"few 1 15 36 15",

-	"deployed 1 30 3 15 10 15 11 15 15 30 18 15 25 15 30 15 31 30 32 45",

-	"given 1 15 11 15 31 15 33 4",

-	"instance 1 30 7 15 11 15 13 45 15 15 16 102 18 15 19 27 21 4 26 90",

-	"application 1 72 3 252 6 30 7 195 9 30 10 15 11 75 13 15 15 15 17 15 20 15 21 59 22 15 24 30 25 30 26 15 29 135 30 30 31 75 33 16 38 15",

-	"pane 1 15 3 30 7 15 9 45 25 15 26 15 27 15 29 45 36 45",

-	"create 1 15 2 30 3 15 5 15 8 15 24 15 31 15",

-	"new 1 15 3 120 4 15 8 15 14 15 21 4 25 15 28 90 29 30 31 15 33 4 34 15",

-	"describe 1 15 39 15",

-	"services 1 15 4 15 15 15 18 45 20 15 33 4",

-	"nodes 1 15 6 15 7 15 9 30 10 15 14 30 24 15 26 15 31 15",

-	"want 1 15 26 45 38 15",

-	"run 1 15 11 30 33 8 38 15",

-	"specify 1 15 2 15 14 30 22 15 36 15",

-	"load-balancing 1 15 10 15 14 30",

-	"policies 1 15",

-	"etc 1 15 4 30 33 8 34 15",

-	"browse 1 30 24 15 39 15",

-	"edit 1 30 4 15 18 30 28 15",

-	"definition 1 30 3 30 6 15 7 75 21 24 29 30 33 8",

-	"existing 1 15 24 15 25 15",

-	"live 1 15 3 15 7 30 11 15 12 15 24 30 25 27 27 15 29 75 33 4 34 15",

-	"stored 1 15 7 15",

-	"xml 1 15 6 30 7 60 24 30 29 15 38 15",

-	"file 1 15 3 45 5 15 7 150 11 30 12 45 15 30 22 45 23 15 24 15 26 15 27 15 28 158 29 30 30 90 31 90 33 40 34 30 35 90 36 90 37 15 38 15",

-	"application.htm 1 25",

-	"each 2 30 9 15 11 30 14 45 15 15 17 15 18 15 20 15 21 12 22 15 28 15 30 15 31 15 33 12 34 30",

-	"indirect 2 15 32 15",

-	"requires 2 15 28 15",

-	"own 2 15 3 15 5 15 11 30 16 15 31 15 33 4",

-	"descriptor 2 15 4 15 6 15 7 15 10 15 18 15 21 4 31 15",

-	"need 2 15 4 15 22 15 24 15 26 30 36 15 38 30 39 15",

-	"simply 2 15 7 15 37 15",

-	"number 2 15 6 15 10 15 11 15 12 15 14 15 15 15 21 4 28 45 29 15 30 15 33 4 35 15",

-	"your 2 15 3 15 5 15 7 60 10 15 11 15 21 4 24 15 26 135 29 15 38 30 39 15",

-	"offers 2 15 3 15 5 15 10 15 11 15 12 15 13 15 14 15 16 15 17 15 19 15 20 15 22 15 39 15",

-	"following 2 15 3 15 5 15 10 15 11 15 12 15 13 15 14 15 16 15 17 15 19 15 20 15 21 12 22 15 28 15 30 15 31 15 32 15 33 8 34 15 35 15",

-	"fields 2 15 3 15 5 15 7 15 10 15 11 15 12 15 13 15 14 15 16 15 17 45 19 15 20 45 21 4 26 60",

-	"name 2 75 3 30 5 45 7 15 8 15 10 45 11 15 12 45 13 30 16 15 19 15 21 48 22 15 26 60 30 30 31 15 33 4 35 15",

-	"must 2 30 5 30 10 15 11 30 12 15 14 30 17 15 20 15",

-	"enclosing 2 15 5 15 10 15 12 30 21 56 33 4",

-	"communicator 2 15 5 15 8 15 15 15 33 4",

-	"lookup 2 15 11 15",

-	"default 2 135 3 75 5 15 7 15 10 15 11 90 14 45 17 15 20 15 22 60",

-	"value 2 45 3 30 5 15 10 30 11 90 12 15 14 30 17 15 20 15 21 80 22 45 26 60 28 30 31 15 34 15",

-	"does 2 15 5 15 21 12 28 15 33 4",

-	"belong 2 15",

-	"any 2 15 4 15 7 30 11 30 16 15 21 8 26 15 28 15 29 15 39 15",

-	"configured 2 30 22 15",

-	"corresponds 2 30 3 15 11 30 23 15 26 60 33 4 34 30 36 75",

-	"adapter-name.endpoints 2 15",

-	"which 2 15 21 4 30 45 31 15 32 15 35 15",

-	"means 2 15",

-	"listen 2 15",

-	"using 2 15 3 30 6 15 9 15 11 45 12 15 15 15 18 30 21 8 22 30 24 30 26 30 30 45 31 45 33 8 35 30 38 30",

-	"protocol 2 15",

-	"tcp 2 15 8 15",

-	"assigned 2 15",

-	"port 2 15",

-	"interfaces 2 15 6 15",

-	"adapter-name.publishedendpoints 2 15",

-	"actual 2 15 14 15",

-	"derived 2 15",

-	"from 2 30 3 15 7 45 14 15 16 15 18 15 21 8 22 15 24 45 27 15 28 30 29 45 30 45 31 90 33 32 34 90 35 45 36 15 37 15 38 15",

-	"field 2 15 3 15 11 15 14 15 26 30 33 4 34 15",

-	"above 2 15 11 15 33 8",

-	"ignored 2 15 11 15",

-	"running 2 15 11 30 28 30 30 45 31 15 32 15 33 12 35 15",

-	"greater 2 15 31 15",

-	"during 2 45 11 15",

-	"such 2 30 7 45 11 15 13 30 21 8 25 15 29 15",

-	"cleanly 2 15",

-	"shutdown 2 30 30 30 31 30 33 4 35 30",

-	"should 2 15 8 15",

-	"expects 2 15",

-	"startup 2 15",

-	"unregister 2 15",

-	"see 2 15 3 30 7 15 8 15 10 30 14 30 22 45 33 4 36 15",

-	"also 2 15 3 30 7 15 9 15 15 15 18 15 29 15 33 4 37 15 38 15 39 15",

-	"timeout 2 26 11 86 33 16",

-	"true 2 15 11 15",

-	"table 2 30 3 15 5 15 10 15 11 15 12 15 14 15 16 15 19 15 21 4 22 15 31 75 33 12 34 45",

-	"set 2 30 3 15 10 15 11 105 12 30 13 192 14 15 16 30 19 15 21 4 22 75 26 45 31 15 33 4 34 15",

-	"generates 2 30 5 15 11 15 12 30 15 30 23 15",

-	"identity 2 30",

-	"app_adapter.htm 2 25",

-	"creating 3 15",

-	"opens 3 30",

-	"empty 3 15 7 15 29 15 31 15",

-	"connected 3 15 26 15 28 15 29 30",

-	"use 3 15 7 15 14 15 16 15 19 15 21 16 22 30 24 45 26 75 27 15 28 15 35 15 37 15 39 15",

-	"templates 3 30",

-	"brand 3 15 29 15",

-	"contains 3 30 11 15 33 4 36 15",

-	"copy 3 15 4 27",

-	"contained 3 15",

-	"template 3 45 7 15 9 15 15 15 16 120 17 117 18 15 19 60 20 102 21 68 33 4 34 15",

-	"icegrid.registry.defaulttemplates 3 15",

-	"manual 3 15 8 15 11 15 22 15 39 15",

-	"editable 3 15",

-	"variables 3 45 10 45 11 75 21 87 33 12",

-	"application-level 3 15",

-	"icepatch2 3 75 11 75 33 12",

-	"proxy 3 45 11 45 33 8",

-	"stringified 3 15 11 15 33 4",

-	"application&#39;s 3 15 31 15 33 4",

-	"distribution 3 60 11 105 21 8 33 40",

-	"possible 3 15 11 30",

-	"values 3 15 11 30 16 15 19 15 30 30 33 4 34 15",

-	"none 3 15 11 15 29 15",

-	"selected 3 15 5 15 11 15 14 30",

-	"server-template 3 15 11 15",

-	"instance-name 3 15 11 15",

-	"parameter 3 15 11 15 17 15 20 15 21 20",

-	"directories 3 30 11 30 33 8",

-	"list 3 15 5 15 11 30 12 15 13 15 14 30 16 15 17 15 19 15 20 15 33 4",

-	"included 3 15 11 15 13 15 31 15 33 4",

-	"entire 3 15 11 15 25 15 33 4",

-	"repository 3 15 11 15 33 4",

-	"children 3 30 8 30 10 30 11 30 12 30 16 30 17 45 20 30 30 30 31 30 33 12",

-	"node 3 30 4 15 5 45 7 15 9 45 10 147 11 180 12 15 13 15 14 30 15 15 21 79 23 15 30 308 31 45 32 60 33 60",

-	"five 3 15",

-	"types 3 15 6 15 7 15 10 15 11 15 12 15 17 15 20 15 30 15 31 15 33 4",

-	"app_application.htm 3 25",

-	"most 4 15 22 15 24 15 26 15",

-	"sub-trees 4 15",

-	"copied 4 30",

-	"later 4 15 28 15 38 15",

-	"pasted 4 15",

-	"copies 4 15",

-	"always 4 15 11 30 28 15 29 15 33 4",

-	"deep-copies 4 15",

-	"example 4 15 7 15 12 15 21 8 22 30 29 15 33 4 37 15",

-	"code 4 15",

-	"including 4 15 16 15 29 15 38 15",

-	"sub-elements 4 15",

-	"these 4 15 5 30 6 15 7 15 9 15 11 15 21 8 22 15 23 15 24 15 28 15 30 15 32 15 33 12 34 30 39 15",

-	"database 4 15 5 72 11 15 12 15 17 15 20 15 23 113 32 30 33 4",

-	"environment 4 15 5 87 11 60 12 15 17 15 20 15 23 113 32 30 33 16 38 15",

-	"after 4 15 7 15 11 30 21 4",

-	"pasting 4 15",

-	"sub-tree 4 15",

-	"check 4 15 26 45 28 15 36 45",

-	"elements 4 15",

-	"avoid 4 15 7 15 28 15",

-	"duplicate 4 15",

-	"app_copy 4 25",

-	"__paste.htm 4 25",

-	"paste 4 12",

-	"freeze 5 15 23 15 32 15",

-	"home 5 56 23 56",

-	"path 5 30 7 15 8 15 11 105 12 60 23 15 33 12 38 15",

-	"directory 5 45 11 60 12 15 21 12 23 45 33 8 38 15",

-	"berkeley 5 30 23 45 32 15",

-	"created 5 15 8 15 16 15 21 8 23 15",

-	"creates 5 15",

-	"automatically 5 15 8 15 29 15 33 4",

-	"local 5 15",

-	"tree 5 15 6 15 31 15",

-	"enter 5 15 11 15 26 30",

-	"exist 5 15",

-	"db_config 5 15 23 15",

-	"settings 5 15",

-	"app_dbenv.htm 5 25",

-	"nested 6 15 21 4",

-	"sub-descriptors 6 15",

-	"sub-sub 6 15",

-	"descriptors 6 57 21 16 33 4 34 15",

-	"correspond 6 15",

-	"slice 6 15",

-	"element 6 15",

-	"representation 6 30 7 15",

-	"admin 6 15 7 60 8 15 11 30 12 15 13 15 18 15 21 4 22 135 24 60 26 90 28 15 29 75 30 15 31 30 32 30 33 4 34 15 35 15 36 15 37 42 38 45 39 60",

-	"maps 6 15",

-	"app_descriptors.htm 6 25",

-	"editing 7 42",

-	"soon 7 15",

-	"make 7 15 24 15 28 15",

-	"update 7 30 11 30 24 15 26 15 31 15",

-	"form 7 30 26 30",

-	"enables 7 15 8 15",

-	"two 7 45 10 15 11 15 12 15 13 15 17 15 18 15 20 15 26 30 30 15 31 15 33 4",

-	"buttons 7 15 9 15 21 4 32 15 33 4 34 15",

-	"bottom 7 15 29 15",

-	"apply 7 45 28 15",

-	"discard 7 75",

-	"navigate 7 15 9 15 29 15",

-	"another 7 30 9 15 24 15 29 15",

-	"without 7 15 26 15",

-	"pressing 7 30",

-	"changes 7 30",

-	"applied 7 15",

-	"in-memory 7 15",

-	"however 7 15 10 15 21 4 33 4",

-	"until 7 15 33 4",

-	"save 7 135 22 15",

-	"below 7 15 14 15 21 12",

-	"disconnects 7 15",

-	"updates 7 105",

-	"made 7 15",

-	"other 7 15 24 15 26 30 39 15",

-	"users 7 15",

-	"longer 7 15",

-	"propagated 7 15",

-	"tab 7 15 11 15 12 15 26 45 29 75 33 4",

-	"error 7 45 21 4",

-	"checking 7 30 26 15 28 15",

-	"performs 7 15",

-	"very 7 15 14 15 33 4",

-	"little 7 15",

-	"while 7 15",

-	"working 7 15 11 60 12 15 33 8",

-	"may 7 30 16 15 21 16 26 15 29 15 33 8 34 15 35 15",

-	"temporarily 7 15",

-	"keep 7 15 29 15",

-	"several 7 30 10 15 17 15 20 15 26 30 29 15 32 15 35 15",

-	"same 7 60 9 15 10 15 11 30 21 8",

-	"leave 7 15 26 15",

-	"some 7 30 8 15 9 15 21 4 37 15 39 15",

-	"parameters 7 15 16 30 17 30 19 30 20 30 21 16",

-	"unset 7 15",

-	"undefined 7 15",

-	"variable 7 15 11 15 21 88",

-	"errors 7 15",

-	"detected 7 15",

-	"there 7 15 26 15 29 15 39 15",

-	"nonetheless 7 15",

-	"constraints 7 15",

-	"enforced 7 15",

-	"times 7 15",

-	"display 7 15 18 15 28 15",

-	"cannot 7 30 11 15 16 15 21 4 30 15 31 15 33 8 35 15",

-	"executable 7 15 8 15 11 30 33 8",

-	"violate 7 15",

-	"constraint 7 15",

-	"prevents 7 15",

-	"applying 7 15",

-	"change 7 15 29 15",

-	"saving 7 27",

-	"menu 7 15 9 15 18 15 28 15 30 30 31 75 33 8 34 30 35 30",

-	"item 7 15",

-	"corresponding 7 30 11 15 13 30 21 4 29 15 31 15",

-	"toolbar 7 30 9 15 21 4",

-	"button 7 30 9 15 26 15 27 15 30 15 33 8 34 15",

-	"saves 7 15",

-	"file-bound 7 15",

-	"associated 7 30 21 4 26 15 29 15 33 4 34 15",

-	"discarding 7 15",

-	"selecting 7 15",

-	"reloads 7 15",

-	"concurrent 7 30",

-	"administrators 7 15",

-	"concurrently 7 15",

-	"last 7 15 31 15",

-	"silently 7 15",

-	"overwrite 7 15",

-	"previous 7 15 9 15",

-	"situation 7 15 21 4",

-	"acquire 7 30",

-	"exclusive 7 45",

-	"write 7 45 22 15 33 8",

-	"access 7 45 26 15",

-	"granted 7 15",

-	"attempt 7 15",

-	"session 7 15 11 45 21 4",

-	"result 7 15 26 15",

-	"app_editing_and_saving.htm 7 25",

-	"identical 8 15 14 15 17 15 20 15",

-	"plain 8 15 11 27 12 27 15 30 16 30 17 45 18 15 20 30",

-	"icebox.instancename 8 15",

-	"ice.admin.endpoints 8 45",

-	"127.0.0.1 8 15",

-	"main 8 15 29 57",

-	"iceboxd 8 15",

-	"java 8 45 22 15 36 15 37 30 38 30",

-	"iceboxcs 8 15",

-	".net 8 15",

-	"command 8 15 11 15 33 4",

-	"arguments 8 15 11 30 22 27 33 8 36 30",

-	"include 8 15 11 15 12 15 13 15 16 15 19 15",

-	"container 8 15",

-	"class 8 15",

-	"icebox.server 8 15",

-	"type 8 15 16 15 26 15 30 30 33 4",

-	"app_icebox_server.htm 8 25",

-	"maintains 9 15",

-	"history 9 15",

-	"visited 9 15",

-	"view 9 30 21 8 24 15",

-	"back 9 15",

-	"next 9 15 14 15 33 4 34 15",

-	"items 9 15 14 15",

-	"equivalent 9 15 10 15 26 15",

-	"forms 9 15 21 8 26 30",

-	"green 9 15",

-	"arrow 9 15",

-	"provides 9 15 13 15 24 15 30 15 31 15 33 4 34 15 35 15",

-	"link 9 15",

-	"app_navigation.htm 9 25",

-	"navigation 9 12",

-	"monitors 10 15",

-	"describes 10 15 21 4",

-	"match 10 15",

-	"icegrid.node.name 10 15",

-	"node-level 10 15",

-	"factor 10 26 30 30",

-	"floating 10 15",

-	"point 10 15 12 45 34 30",

-	"compare 10 15",

-	"different 10 15",

-	"making 10 15",

-	"decision 10 15",

-	"based 10 15",

-	"load-average 10 15 14 45 30 15",

-	"linux 10 30 11 15 14 15 30 30 33 8 37 15 38 45",

-	"unix 10 30 11 15 14 15 21 16 30 30 33 8",

-	"cpu 10 15 14 45 30 30",

-	"utilization 10 15 14 45 30 15",

-	"windows 10 30 14 15 21 20 30 30 38 30",

-	"leaving 10 15",

-	"1.0 10 30",

-	"divided 10 15",

-	"cpus 10 15 30 30",

-	"app_node.htm 10 25",

-	"ice.serverid 11 15",

-	"sets 11 15 12 15 13 60 16 30 19 15 33 4 34 15",

-	"property-set 11 15 12 15 16 15 19 15",

-	"refer 11 15 12 15 13 15 16 15 19 15 21 8",

-	"private 11 45 12 15 13 15 16 15 19 15 23 15",

-	"log 11 75 12 75 22 15 25 15 28 173 30 60 31 60 33 28 34 45 35 60",

-	"files 11 45 12 45 24 15 25 15 31 15 33 4 38 15",

-	"declare 11 30 12 30",

-	"relative 11 60 12 30",

-	"able 11 15 12 15",

-	"conveniently 11 15 12 15",

-	"retrieve 11 15 12 15 24 15 25 15 26 15 28 45 30 75 31 60 33 24 34 30 35 60",

-	"command-line 11 45 12 15 22 42 24 15 33 4 36 30 38 15",

-	"utility 11 30 12 15 38 15",

-	"server&#39;s 11 45 23 15 33 48",

-	"don&#39;t 11 15",

-	"provide 11 15 36 15",

-	"assumes 11 15",

-	"it&#39;s 11 15",

-	"started 11 60 32 30 33 20 34 30 37 15 39 15",

-	"root 11 30 31 15 33 8",

-	"under 11 15",

-	"username 11 30 22 60 26 90 33 4",

-	"desired 11 15",

-	"runs 11 45 33 16",

-	"user 11 15 21 8 22 15 33 8 39 15",

-	"except 11 15 21 4 33 4",

-	"case 11 15 33 4",

-	"nobody 11 15 33 4",

-	"addition 11 15 33 4",

-	"mode 11 60 33 8",

-	"keeps 11 15",

-	"time 11 30 22 15 31 15 33 12 34 30",

-	"manually 11 15",

-	"on-demand 11 15",

-	"resolves 11 30",

-	"object-adapter 11 15",

-	"separate 11 15 15 15",

-	"allocates 11 15",

-	"combination 11 15 16 15",

-	"activating 11 15 33 4",

-	"gives 11 30",

-	"seconds 11 30 28 15",

-	"their 11 15 18 15 21 4",

-	"delayed 11 15",

-	"uses 11 30 26 30",

-	"icegrid.node.waittime 11 30",

-	"deactivation 11 15 33 8",

-	"deactivating 11 15 33 8",

-	"exit 11 15 33 4",

-	"gracefully 11 15",

-	"killed 11 15",

-	"specifies 11 15 36 15",

-	"whether 11 15 33 4",

-	"allocated 11 45",

-	"implicitly 11 15",

-	"false 11 15",

-	"depends 11 30 33 8",

-	"stopped 11 15 28 30 34 15",

-	"disabled 11 15 33 24",

-	"before 11 15 33 4",

-	"re-enabled 11 15 33 4",

-	"app_plain_server.htm 11 25",

-	"entry 12 45 31 15 34 30",

-	"service&#39;s 12 15 18 15",

-	"icestormservice 12 15",

-	"createicestorm 12 15",

-	"append 12 15",

-	"--ice.config 12 15 22 30",

-	"path-to-service-config-file 12 15",

-	"icebox.service.service-name 12 15 34 15",

-	"config 12 15",

-	"app_plain_service.htm 12 25",

-	"defines 13 15 21 8",

-	"supports 13 15 15 15 18 15",

-	"kinds 13 15 15 15 18 15",

-	"named 13 45",

-	"service-instance 13 15 34 15",

-	"child 13 15 16 15",

-	"concrete 13 15",

-	"app_property_set.htm 13 25",

-	"abstract 14 15",

-	"grouping 14 15",

-	"similar 14 15 17 15 20 15 26 15",

-	"joins 14 15",

-	"resolving 14 15 21 4",

-	"proxies 14 15",

-	"adaptive 14 30",

-	"return 14 30",

-	"whose 14 15",

-	"report 14 15",

-	"lowest 14 15",

-	"multiplied 14 15",

-	"node&#39;s 14 15",

-	"load-factor 14 15",

-	"comparison 14 15",

-	"sample 14 56",

-	"highest 14 15",

-	"random 14 30",

-	"returns 14 45",

-	"round-robin 14 15",

-	"puts 14 15",

-	"resolution 14 30",

-	"how 14 30 39 15",

-	"many 14 30 22 15 28 15",

-	"common 14 15 17 15 20 15 26 15",

-	"available 14 15 18 15 24 15 33 4 38 15",

-	"comparing 14 15",

-	"minutes 14 15 30 30 39 15",

-	"app_replica 14 25",

-	"__group.htm 14 25",

-	"part 15 15 26 15",

-	"three 15 15",

-	"normal 15 15",

-	"single 15 30 21 4 33 4",

-	"usually 15 15 33 8 38 15",

-	"itself 15 15 22 15",

-	"app_server.htm 15 25",

-	"assign 16 15 21 4",

-	"server-instance 16 15 33 4",

-	"overall 16 15",

-	"references 16 15 21 4",

-	"augmented 16 15",

-	"possibly 16 15",

-	"overridden 16 15 21 12",

-	"app_server_instance.htm 16 25",

-	"capture 17 15 20 15",

-	"optional 17 15 20 15 36 30",

-	"remaining 17 15 20 15 21 4 33 4 34 15",

-	"kind 17 15",

-	"app_server_template.htm 17 25",

-	"directly 18 15 24 30 26 15 32 15",

-	"order 18 30 21 12 26 30 38 15",

-	"load-order 18 15",

-	"determined 18 15 21 8",

-	"reorder 18 15",

-	"move 18 30",

-	"contextual 18 15 30 15 31 60 33 4 34 15 35 15",

-	"app_service.htm 18 25",

-	"give 19 15 26 15",

-	"app_service_instance.htm 19 25",

-	"app_service_template.htm 20 25",

-	"allow 21 4",

-	"define 21 8",

-	"commonly-used 21 4",

-	"information 21 8 22 45 24 15 26 15 27 15 29 45",

-	"once 21 4",

-	"symbolically 21 4",

-	"throughout 21 4",

-	"syntax 21 4",

-	"substitution 21 24",

-	"attempted 21 4",

-	"whenever 21 4",

-	"symbol 21 8",

-	"encountered 21 4",

-	"subject 21 4",

-	"limitations 21 4",

-	"rules 21 8",

-	"case-sensitive 21 4",

-	"fatal 21 4",

-	"occurs 21 4",

-	"saved 21 4",

-	"where 21 4",

-	"allowed 21 4",

-	"performed 21 4 29 15",

-	"string 21 8",

-	"defining 21 8",

-	"referring 21 4",

-	"names 21 24",

-	"escaping 21 8",

-	"prevent 21 4",

-	"reference 21 24",

-	"additional 21 4 31 15 36 15",

-	"leading 21 4",

-	"character 21 12",

-	"literal 21 4",

-	"abc 21 8",

-	"would 21 4",

-	"variable&#39;s 21 4",

-	"extra 21 4",

-	"immediately 21 4 29 15 32 15",

-	"preceding 21 8",

-	"therefore 21 4",

-	"text 21 4 28 15",

-	"modified 21 4",

-	"occurrence 21 4",

-	"characters 21 4 28 30",

-	"replaced 21 4",

-	"initiate 21 4",

-	"pre-defined 21 23",

-	"read-only 21 8 35 15",

-	"hold 21 4",

-	"reserved 21 4",

-	"purpose 21 4",

-	"context 21 8",

-	"valid 21 4",

-	"application.distrib 21 15",

-	"pathname 21 12",

-	"alias 21 8 36 15",

-	"node.datadir 21 23",

-	"distrib 21 8",

-	"node.os 21 15",

-	"operating 21 4 30 30",

-	"system 21 12 30 30 38 12",

-	"provided 21 16 26 30",

-	"uname 21 16",

-	"node.hostname 21 15",

-	"host 21 4 30 45 31 15 35 15",

-	"node.release 21 15",

-	"operation 21 8",

-	"release 21 4",

-	"obtained 21 4",

-	"osversioninfo 21 4",

-	"data 21 8 28 15",

-	"structure 21 4",

-	"node.version 21 15",

-	"current 21 4 28 15",

-	"pack 21 4",

-	"level 21 12",

-	"node.machine 21 15",

-	"machine 21 4 30 15",

-	"hardware 21 4",

-	"x86 21 4",

-	"x64 21 4",

-	"absolute 21 4",

-	"server.distrib 21 15",

-	"session.id 21 15",

-	"client 21 4 22 15 26 30",

-	"identifier 21 4",

-	"sessions 21 8",

-	"password 21 4 22 60 26 90 36 75",

-	"secure 21 4",

-	"connection 21 8 26 30 29 15",

-	"distinguished 21 4",

-	"availability 21 4",

-	"easily 21 4",

-	"cases 21 4",

-	"but 21 16 26 15 28 15",

-	"readily 21 4",

-	"apparent 21 4",

-	"others 21 4",

-	"because 21 4",

-	"body 21 4",

-	"evaluated 21 4",

-	"instantiated 21 4",

-	"specific 21 4 22 15 26 60 33 4",

-	"substitute 21 8",

-	"respecitive 21 4",

-	"show 21 4 29 15 31 30",

-	"toggle 21 4",

-	"variable-substitution 21 4",

-	"enabled 21 4 33 16",

-	"scoping 21 4",

-	"levels 21 4",

-	"introduces 21 4",

-	"scope 21 24",

-	"overrides 21 8",

-	"modify 21 8",

-	"similarly 21 4",

-	"nearest 21 4",

-	"diagram 21 8",

-	"illustrates 21 4",

-	"concepts 21 4",

-	"nodea 21 8",

-	"whereas 21 4",

-	"remains 21 4",

-	"unchanged 21 4",

-	"nodeb 21 4",

-	"continues 21 4",

-	"resolve 21 4",

-	"var 21 8",

-	"searches 21 4",

-	"precedence 21 8",

-	"applicable 21 12",

-	"initial 21 4 28 30",

-	"resolved 21 4",

-	"recursively 21 4",

-	"visible 21 4",

-	"instances 21 4",

-	"occur 21 4",

-	"instantiates 21 4",

-	"modifying 21 4",

-	"inner 21 8",

-	"outer 21 4",

-	"app_variables.htm 21 14",

-	"like 22 15",

-	"both 22 15 39 15",

-	"regular 22 15 30 15 32 30 33 12",

-	"useful 22 15",

-	"well 22 15",

-	"ice.trace.network 22 15",

-	"get 22 15",

-	"detailed 22 15",

-	"network 22 15",

-	"communications 22 15",

-	"sent 22 15",

-	"stderr 22 45 30 45 31 45 33 16 35 45",

-	"icegridgui 22 15 37 30",

-	"--ice.trace.network 22 15",

-	"detail 22 15 39 15",

-	"icegridadmin.authenticateusingssl 22 26",

-	"logging 22 15",

-	"authentication 22 30 26 90",

-	"instructs 22 15",

-	"offer 22 15",

-	"ssl 22 15 26 120 36 68",

-	"login 22 45 26 113 36 15",

-	"details 22 45 31 15 36 15 39 15",

-	"icegridadmin.username 22 26",

-	"authenticating 22 30",

-	"icegridadmin.password 22 26",

-	"icegridadmin.trace.observers 22 26",

-	"writes 22 15",

-	"message 22 15 33 8",

-	"receives 22 15",

-	"debug 22 30",

-	"problems 22 30",

-	"icegridadmin.trace.savetoregistry 22 26",

-	"logs 22 15",

-	"activities 22 15",

-	"directed 22 15",

-	"good 22 15",

-	"idea 22 15",

-	"argument 22 15",

-	"location 22 15 36 15",

-	"-jar 22 15 37 30",

-	"bin 22 15 37 15 38 15",

-	"icegridgui.jar 22 15 37 41 38 30",

-	"icegridadmin.conf 22 15",

-	"command_line_arguments.htm 22 25",

-	"storage 23 15",

-	"persistence 23 15",

-	"freeze.dbenv.env-name.dbhome 23 15",

-	"often 23 15 28 15",

-	"dbenv.htm 23 25",

-	"everything 24 15",

-	"deploy 24 30",

-	"comprehensive 24 15",

-	"administration 24 15 39 15",

-	"tool 24 30 39 30",

-	"manage 24 15",

-	"start 24 30 25 15 33 12 34 30 37 15",

-	"stop 24 15 25 15 33 4 34 30",

-	"processes 24 15",

-	"much 24 15",

-	"more 24 30 29 15 36 30",

-	"necessary 24 15",

-	"scratch 24 15",

-	"tools 24 15 30 15 31 15 33 4 34 15 35 15",

-	"although 24 15",

-	"features 24 30",

-	"through 24 15 26 30 28 30 32 15",

-	"way 24 15",

-	"interact 24 15",

-	"sometimes 24 15",

-	"convenient 24 15",

-	"simple 24 15",

-	"particular 24 15 36 15",

-	"add 24 15 31 30",

-	"writing 24 15 28 15",

-	"python 24 15",

-	"ruby 24 15",

-	"scripts 24 15",

-	"option 24 15",

-	"api 24 15",

-	"remote 24 15 28 30",

-	"invocations 24 15",

-	"ice-for-python 24 15",

-	"ice-for-ruby 24 15",

-	"introduction.htm 24 25",

-	"introduction 24 12",

-	"runtime 25 15 31 15 32 27 33 4 34 15 38 15",

-	"perform 25 15",

-	"various 25 15",

-	"administrative 25 15",

-	"tasks 25 15",

-	"enable 25 15 26 30 33 4 36 15",

-	"disable 25 15 33 4",

-	"send 25 15 33 8",

-	"signal 25 15 33 8",

-	"patch 25 15 31 15 33 12",

-	"undeploy 25 15 31 15",

-	"live_deployment.htm 25 25",

-	"dialog 26 41 28 263 30 30 31 45 33 16 34 15 35 30 36 15",

-	"connect 26 120",

-	"press 26 15 27 15",

-	"open 26 15 28 15 31 15 33 4",

-	"select 26 30 33 4 34 15",

-	"going 26 15",

-	"intermediary 26 15",

-	"glacier2 26 161",

-	"router 26 176",

-	"support 26 30 39 15",

-	"authenticates 26 30",

-	"credentials 26 30",

-	"authenticate 26 30",

-	"icessl 26 90 36 75",

-	"loads 26 30",

-	"plugin 26 60 36 15",

-	"icegrid.instancename 26 15",

-	"endpoint 26 120",

-	"registries 26 45 32 15 35 15",

-	"replicas 26 30 35 15",

-	"icegrid.registry.client.endpoints 26 15",

-	"icegrid.registry.client.publishede 26 15",

-	"dpoints 26 15",

-	"master 26 75 35 15",

-	"non-replicated 26 15",

-	"unchecking 26 15",

-	"box 26 45",

-	"makes 26 15",

-	"difference 26 30",

-	"unchecked 26 15",

-	"routed 26 60 36 15",

-	"important 26 15",

-	"target 26 15",

-	"glacier2.instancename 26 15",

-	"glacier2.client.endpoints 26 15",

-	"glacier2.client.publishedendpoints 26 15",

-	"even 26 15 36 15",

-	"replicated 26 15 32 15",

-	"check-box 26 15",

-	"login.htm 26 25",

-	"logout 27 38",

-	"disconnect 27 15",

-	"clears 27 15",

-	"logout.htm 27 25",

-	"retrieved 28 15 29 30 30 15 33 8 34 30",

-	"periodically 28 30",

-	"lines 28 120",

-	"paused 28 15",

-	"currently 28 15 33 4 34 15",

-	"retrieving 28 15",

-	"preferences 28 60",

-	"opened 28 30",

-	"max 28 45",

-	"buffer 28 30",

-	"maximum 28 45",

-	"tail 28 30",

-	"restarting 28 15",

-	"retrieves 28 15",

-	"displays 28 15 29 60",

-	"bytes 28 30",

-	"read 28 15 38 15 39 15",

-	"per 28 15",

-	"request 28 30",

-	"pick 28 15",

-	"low 28 15",

-	"enough 28 30",

-	"appear 28 15 29 15",

-	"responsive 28 15",

-	"big 28 15",

-	"round-trips 28 15",

-	"lots 28 15",

-	"logged 28 15 29 15",

-	"between 28 15 29 15",

-	"100 28 15",

-	"ice.messagesizemax 28 15",

-	"512 28 15",

-	"poll 28 30",

-	"period 28 30",

-	"state 28 15 33 16 34 15",

-	"attempts 28 15",

-	"every 28 15",

-	"log_file_dialog.htm 28 25",

-	"window 29 57",

-	"tabs 29 45",

-	"long 29 15",

-	"anything 29 15",

-	"up-to-date 29 15",

-	"administrator 29 15",

-	"adds 29 15",

-	"file-based 29 15",

-	"icon-less 29 30",

-	"bound 29 15",

-	"unsaved 29 15",

-	"modifications 29 15",

-	"becomes 29 15",

-	"lost 29 15",

-	"bar 29 30",

-	"operations 29 15",

-	"messages 29 15",

-	"received 29 15",

-	"main_window.htm 29 25",

-	"shown 30 15 33 4",

-	"actions 30 30 31 30 32 15 33 8 34 30 35 30",

-	"stdout 30 45 31 45 33 16 35 45",

-	"retrieval 30 30 31 30 33 8 35 30",

-	"succeeds 30 30 31 30 33 8 35 30",

-	"output 30 30 31 30 33 8 35 30",

-	"been 30 30 31 30 33 8 35 30",

-	"redirected 30 30 31 30 33 8 35 30",

-	"ice.stdout 30 15 31 15 33 4 35 15",

-	"ice.stderr 30 15 31 15 33 4 35 15",

-	"restart 30 15 31 15 35 15",

-	"hostname 30 15 31 15 35 15",

-	"usage 30 15",

-	"average 30 15",

-	"percentage 30 15",

-	"past 30 30",

-	"click 30 15 33 4 34 15",

-	"refresh 30 15 33 4 34 15",

-	"latest 30 15 31 15 33 4",

-	"node.htm 30 25",

-	"components 31 15 32 42",

-	"administered 31 15",

-	"dynamic 31 45",

-	"along 31 15",

-	"date 31 15",

-	"instruct 31 15 33 12 34 30",

-	"download 31 15 33 4",

-	"remove 31 45",

-	"dynamically 31 45",

-	"replica-group 31 15",

-	"entries 31 30",

-	"icegrid.registry.dynamicregistrati 31 15",

-	"slave 31 15 32 30 35 53",

-	"registry.htm 31 25",

-	"communicates 32 15",

-	"monitored 32 30",

-	"menus 32 15",

-	"keyboard 32 15",

-	"short-cuts 32 15",

-	"affect 32 15",

-	"runtime_components.htm 32 25",

-	"hosting 33 4",

-	"first 33 8 34 15",

-	"icon 33 4",

-	"second 33 4",

-	"unknown 33 4",

-	"parent 33 4",

-	"starting 33 8 37 12",

-	"waiting 33 8",

-	"destroyed 33 4",

-	"being 33 4",

-	"removed 33 4",

-	"transient 33 4",

-	"icons 33 4",

-	"grayed-out 33 4",

-	"mark 33 8",

-	"already 33 4",

-	"marked 33 4",

-	"achieved 33 8",

-	"icegrid.node.output 33 8",

-	"sigquit 33 4",

-	"non-windows 33 4",

-	"i.e 33 4 34 15",

-	"build 33 12 34 45",

-	"buildid 33 4 34 15",

-	"showing 33 8 34 30",

-	"come 33 8 34 30",

-	"containing 33 4",

-	"right 33 4",

-	"they 33 4 34 15",

-	"combined 33 4 34 15",

-	"gets 33 4",

-	"inherited 33 4",

-	"patched 33 4",

-	"shut 33 4",

-	"server.htm 33 14",

-	"loaded 34 30",

-	"potentially 34 15",

-	"service.htm 34 25",

-	"slave_registry.htm 35 25",

-	"configure 36 15",

-	"ice-for-java 36 15",

-	"basic 36 30",

-	"mininum 36 15",

-	"required 36 15",

-	"keystore 36 90",

-	"unlock 36 15",

-	"keys 36 15",

-	"icessl.keystore 36 26",

-	"icessl.password 36 26",

-	"advanced 36 30",

-	"integrity 36 60",

-	"icessl.keystorepassword 36 26",

-	"selects 36 15",

-	"certificate 36 30",

-	"icessl.alias 36 26",

-	"truststore 36 45",

-	"certificates 36 15",

-	"trusted 36 15",

-	"authorities 36 15",

-	"icessl.truststore 36 15",

-	"icessl.truststorepassword 36 15",

-	"passing 36 15",

-	"ssl_configuration.htm 36 25",

-	"environments 37 15",

-	"double-clicking 37 15",

-	"platforms 37 15 38 15",

-	"terminal 37 15",

-	"typing 37 15",

-	"path-to-icegridgui.jar 37 15",

-	"solaris 37 15 38 15",

-	"hp-ux 37 15",

-	"mac 37 15",

-	"opt 37 15",

-	"lib 37 15 38 15",

-	"rpm 37 15 38 15",

-	"installation 37 15 38 30",

-	"script 37 15",

-	"installer 37 15",

-	"usr 37 15 38 15",

-	"starting_icegrid_admin.htm 37 25",

-	"javatm 38 15",

-	"supported 38 15",

-	"wide 38 15",

-	"range 38 15",

-	"macos 38 15",

-	"installed 38 30",

-	"share 38 15",

-	"jre 38 30",

-	"v1.5.0 38 15",

-	"recommend 38 15 39 15",

-	"sun 38 15",

-	"jdk 38 15",

-	"here 38 15",

-	"3.4.0 38 15",

-	"system_requirements.htm 38 25",

-	"requirements 38 12",

-	"welcome 39 27",

-	"online 39 15",

-	"help 39 30",

-	"graphical 39 15",

-	"server-deployment 39 15",

-	"monitoring 39 15",

-	"pages 39 15",

-	"assume 39 15",

-	"familiarity 39 15",

-	"getting 39 15",

-	"quick 39 15",

-	"overview 39 15",

-	"please 39 30",

-	"teach 39 15",

-	"yourself 39 15",

-	"issue 39 15",

-	"connections 39 15",

-	"newsletter 39 15",

-	"trouble 39 15",

-	"component 39 15",

-	"forums 39 15",

-	"post 39 15",

-	"questions 39 15",

-	"zeroc 39 15",

-	"commercial 39 15",

-	"e-mail 39 15",

-	"phone 39 15",

-	"contact 39 15",

-	"sales 39 15",

-	"zeroc.com 39 15",

-	"welcome.htm 39 25"];

-skipwords = ["and",

-	"or",

-	"the",

-	"it",

-	"is",

-	"an",

-	"on",

-	"we",

-	"us",

-	"to",

-	"of",

-	"has",

-	"be",

-	"all",

-	"for",

-	"in",

-	"as",

-	"so",

-	"are",

-	"that",

-	"can",

-	"you",

-	"at",

-	"its",

-	"by",

-	"have",

-	"with",

-	"into"];

-var STR_FORM_SEARCHFOR = "Search for:";

-var STR_FORM_SUBMIT_BUTTON = "Submit";

-var STR_FORM_RESULTS_PER_PAGE = "Results per page:";

-var STR_FORM_MATCH = "Match:";

-var STR_FORM_ANY_SEARCH_WORDS = "any search words";

-var STR_FORM_ALL_SEARCH_WORDS = "all search words";

-var STR_NO_QUERY = "No search query entered.";

-var STR_RESULTS_FOR = "Search results for:";

-var STR_NO_RESULTS = "No results";

-var STR_RESULT = "result";

-var STR_RESULTS = "results";

-var STR_PHRASE_CONTAINS_COMMON_WORDS = "The following phrase contains very common words on this site, resulting in a limited search. Please define a more specific phrase for better results.";

-var STR_SKIPPED_FOLLOWING_WORDS = "The following word(s) are in the skip word list and have been omitted from your search:";

-var STR_SKIPPED_PHRASE = "Note that you can not search for exact phrases beginning with a skipped word";

-var STR_SUMMARY_NO_RESULTS_FOUND = "No results found.";

-var STR_SUMMARY_FOUND_CONTAINING_ALL_TERMS = "found containing all search terms.";

-var STR_SUMMARY_FOUND_CONTAINING_SOME_TERMS = "found containing some search terms.";

-var STR_SUMMARY_FOUND = "found.";

-var STR_PAGES_OF_RESULTS = "pages of results.";

-var STR_POSSIBLY_GET_MORE_RESULTS = "You can possibly get more results searching for";

-var STR_ANY_OF_TERMS = "any of the terms";

-var STR_DIDYOUMEAN = "Did you mean:";

-var STR_SORTEDBY_RELEVANCE = "Sorted by relevance";

-var STR_SORTBY_RELEVANCE = "Sort by relevance";

-var STR_SORTBY_DATE = "Sort by date";

-var STR_SORTEDBY_DATE = "Sorted by date";

-var STR_RESULT_TERMS_MATCHED = "Terms matched: ";

-var STR_RESULT_SCORE = "Score: ";

-var STR_RESULT_URL = "URL:";

-var STR_RESULT_PAGES = "Results Pages:";

-var STR_RESULT_PAGES_PREVIOUS = "Previous";

-var STR_RESULT_PAGES_NEXT = "Next";

-var STR_FORM_CATEGORY = "Category:";

-var STR_FORM_CATEGORY_ALL = "All";

-var STR_RESULTS_IN_ALL_CATEGORIES = "in all categories";

-var STR_RESULTS_IN_CATEGORY = "in category";

-var STR_POWEREDBY = "Search powered by";

-var STR_MORETHAN = "More than";

-var STR_ALL_CATS = "all categories";

-var STR_OR = "or";

-var STR_RECOMMENDED = "Recommended links";

-var STR_SEARCH_TOOK = "Search took";

-var STR_SECONDS = "seconds";

-var STR_MAX_RESULTS = "You have requested more results than served per query. Please try again with a more precise query.";

+dictwords = ["adapter 0 293 2 282 4 15 11 45 12 15 14 30 17 15 20 15 31 15 32 30 33 4",
+	"represents 0 15 10 15 14 15 15 15 18 15 21 4 23 15 30 15 31 15 32 120 33 4 34 15",
+	"ice 0 56 2 101 3 15 5 30 8 26 11 45 12 15 13 30 15 90 16 15 19 15 22 90 23 15 24 15 32 15 33 28 34 45 38 15 39 105",
+	"object 0 210 2 135 4 15 8 15 11 30 14 120 25 15 31 45 32 15 33 8",
+	"described 0 15 6 15 21 4 22 15 24 15 30 15 39 15",
+	"icegrid 0 105 1 60 2 105 3 45 5 60 6 45 7 195 10 30 11 360 12 60 13 15 14 75 15 45 18 30 21 16 22 195 23 30 24 225 25 30 26 375 27 15 28 45 29 180 30 165 31 165 32 120 33 80 34 30 35 105 36 15 37 42 38 60 39 150",
+	"registry 0 30 3 45 6 15 7 150 11 30 21 4 22 60 24 15 25 15 26 360 27 15 29 60 30 45 31 353 32 60 33 16 35 203",
+	"resides 0 15",
+	"server 0 105 2 105 3 75 4 15 5 15 7 15 8 102 10 15 11 567 12 30 13 45 15 207 16 222 17 102 18 30 21 51 25 60 29 15 30 30 32 105 33 267 34 90",
+	"icebox 0 15 1 15 8 147 12 30 13 30 15 90 16 30 17 15 18 45 21 4 30 15 32 75 33 16 34 75",
+	"service 0 15 3 15 8 15 12 132 13 75 15 15 17 15 18 132 19 87 20 87 21 31 23 15 32 60 33 4 34 308 39 15",
+	"note 0 15 26 15",
+	"direct 0 15 2 15 26 60 36 15",
+	"adapters 0 30 4 15 11 15 14 135 31 45 33 8",
+	"not 0 15 2 15 3 15 5 45 7 15 11 45 21 28 24 15 26 45 28 30 29 45 31 15 33 12",
+	"displayed 0 15 21 4 28 30 30 15",
+	"since 0 15 22 15",
+	"knows 0 15",
+	"nothing 0 15 26 15",
+	"about 0 15 22 30 26 15 29 30",
+	"them 0 15 1 15 2 15 11 15 12 15 21 4",
+	"states 0 15 28 30 30 15 33 8 34 15",
+	"either 0 15 15 15 30 15 33 8 34 15",
+	"active 0 30 33 8",
+	"inactive 0 45 33 8",
+	"properties 0 30 2 60 3 30 5 75 8 60 10 30 11 75 12 75 13 105 14 30 16 120 17 45 19 75 20 45 22 90 23 75 30 45 31 30 33 44 34 165 35 30 36 30",
+	"panel 0 15 2 15 3 15 5 15 8 30 10 15 11 15 12 15 13 15 14 15 16 15 17 15 19 15 20 15 23 15 26 30 30 30 31 15 33 8 34 30 35 15",
+	"shows 0 30 3 15 5 15 10 15 22 15 23 15 25 15 28 15 29 30 30 60 31 60 32 15 33 16 34 15 35 15 36 15",
+	"status 0 45 24 15 25 15 29 30 33 4 34 15",
+	"this 0 195 2 195 3 120 4 15 5 60 7 60 8 15 9 15 10 60 11 300 12 90 13 30 14 135 15 15 16 45 17 15 19 30 20 15 21 28 22 60 23 45 25 15 26 195 27 15 28 15 29 30 30 60 31 165 33 108 34 165 35 75 36 90",
+	"published 0 30 2 30",
+	"endpoints 0 75 2 105 11 15 14 75 26 30",
+	"registered 0 30 2 15 30 15 31 30 33 4",
+	"blank 0 30 3 30 10 15 11 45 33 12",
+	"when 0 135 2 60 3 30 5 15 7 15 8 15 10 15 11 180 12 30 14 45 21 32 22 75 26 105 28 60 29 15 30 60 31 45 32 15 33 44 34 15 35 30 36 15",
+	"adapter&#39;s 0 45 2 15",
+	"description 0 30 2 30 3 30 5 30 10 30 11 30 12 30 14 30 21 4 22 15 23 30 33 8 34 30",
+	"free-text 0 15 2 15 3 15 5 15 10 15 11 15 12 15 14 15 23 15 33 4 34 15",
+	"ids 0 15 4 30 11 30 12 15 13 15 16 15 19 15 21 4",
+	"unique 0 15 2 30 5 15 11 15 12 15 14 15 17 15 20 15",
+	"within 0 15 2 30 5 15 11 15 12 15 13 45 14 15 17 15 18 15 20 15 21 8 32 30 34 30",
+	"deployment 0 15 2 15 11 30 12 15 14 15 24 60 25 57 26 15 27 15 29 75 32 15 35 15",
+	"replica 0 60 2 60 3 15 10 15 14 162 26 60",
+	"group 0 60 2 60 3 15 10 15 14 162",
+	"belongs 0 30",
+	"otherwise 0 15 5 15",
+	"priority 0 30 2 45 14 15",
+	"used 0 15 2 30 3 15 10 15 11 45 12 30 14 15 17 15 20 15 21 8 22 30 23 15 26 30 33 12 36 30",
+	"only 0 30 2 30 7 15 8 15 10 15 13 15 14 15 17 15 21 16 24 15 26 30 29 15 30 60 31 45 33 16 35 30",
+	"ordered 0 15 14 15",
+	"load 0 15 10 26 14 67 18 15 26 30 30 45",
+	"balancing 0 15 14 26",
+	"policy 0 15 14 60",
+	"configuration 0 30 10 15 15 45 22 30 23 15 25 15 33 8 36 113",
+	"property 0 30 2 90 3 15 10 30 11 105 12 75 13 237 16 60 19 30 21 4 22 30 23 15 26 60 30 30 31 45 33 24 34 45 35 30 36 60",
+	"publishedendpoints 0 15",
+	"register 0 45 2 60 11 15 25 15 33 4",
+	"process 0 56 2 56 8 11 10 15 11 15 28 15 30 75 31 45 32 75 33 16 35 30",
+	"checkbox 0 30 11 15 33 12 34 15",
+	"checked 0 30 2 45 26 30 33 8 34 15",
+	"will 0 15 2 15 5 15 7 30 12 15 28 30 29 30",
+	"upon 0 15",
+	"activation 0 15 2 41 11 86 33 16",
+	"setting 0 15 2 15 8 15 14 15 22 30 33 8",
+	"meaningful 0 15 21 4",
+	"servers 0 15 1 15 2 15 4 30 7 15 10 30 15 15 17 15 21 4 24 15 26 15 33 12",
+	"version 0 15 2 15 11 45 21 4 30 15 31 15 33 8 38 15",
+	"less 0 15",
+	"than 0 15 3 15 11 15 31 15 33 4",
+	"3.3 0 15 2 15",
+	"lifetime 0 30 2 15 11 15 33 8",
+	"considers 0 15",
+	"activated 0 30",
+	"starts 0 15 10 15 11 30",
+	"deactivated 0 15",
+	"shuts 0 15",
+	"down 0 30 18 15 30 30 33 12",
+	"allows 0 15 1 15 25 15 26 15 29 15 31 60 33 4 36 15",
+	"detect 0 15",
+	"fully 0 15",
+	"server-lifetime 0 30",
+	"shutting 0 15 33 4",
+	"least 0 15",
+	"one 0 15 1 15 2 30 6 15 8 15 11 45 14 15 16 15 17 15 28 15 29 45 33 8 35 15",
+	"unregistered 0 15",
+	"well-known 0 45 2 30 3 30 11 30 14 30 25 15 31 75 33 4",
+	"objects 0 60 2 60 11 15 14 30 31 60",
+	"defined 0 30 2 30 3 15 10 15 11 45 13 30 14 15 15 15 16 45 18 30 19 15 21 12 30 15 31 15",
+	"allocatable 0 15 2 30 11 45 33 8",
+	"page 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 15 12 15 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 15 23 15 24 15 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 15 38 15 39 15",
+	"url 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 15 12 15 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 15 23 15 24 15 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 15 38 15 39 15",
+	"http 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 15 12 15 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 15 23 15 24 15 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 15 38 15 39 15",
+	"www.zeroc.com 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 15 12 15 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 15 23 15 24 15 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 15 38 15 39 15",
+	"doc 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 15 12 15 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 15 23 15 24 15 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 15 38 15 39 15",
+	"ice-3.4.0 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 15 12 15 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 30 23 15 24 15 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 30 38 30 39 15",
+	"icegridadmin 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 45 12 30 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 15 23 15 24 71 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 15 38 30 39 15",
+	"index.html 0 15 1 15 2 15 3 15 4 15 5 15 6 15 7 15 8 15 9 15 10 15 11 15 12 15 13 15 14 15 15 15 16 15 17 15 18 15 19 15 20 15 21 4 22 15 23 15 24 15 25 15 26 15 27 15 28 15 29 15 30 15 31 15 32 15 33 4 34 15 35 15 36 15 37 15 38 15 39 15",
+	"adapter.htm 0 25",
+	"definitions 1 15 3 15 13 15 17 15 20 15 24 45 26 15 29 60 31 15 33 4 34 15",
+	"organized 1 15",
+	"applications 1 30 3 15 10 15 22 15 24 15 29 15 31 30",
+	"typically 1 15 4 15 8 15 9 15 15 15 22 30 23 15 31 15 33 4",
+	"few 1 15 36 15",
+	"deployed 1 30 3 15 10 15 11 15 15 30 18 15 25 15 30 15 31 30 32 45",
+	"given 1 15 11 15 31 15 33 4",
+	"instance 1 30 7 15 11 15 13 45 15 15 16 102 18 15 19 27 21 4 26 90",
+	"application 1 72 3 252 6 30 7 195 9 30 10 15 11 75 13 15 15 15 17 15 20 15 21 59 22 15 24 30 25 30 26 15 29 135 30 30 31 75 33 16 38 15",
+	"pane 1 15 3 30 7 15 9 45 25 15 26 15 27 15 29 45 36 45",
+	"create 1 15 2 30 3 15 5 15 8 15 24 15 31 15",
+	"new 1 15 3 120 4 15 8 15 14 15 21 4 25 15 28 90 29 30 31 15 33 4 34 15",
+	"describe 1 15 39 15",
+	"services 1 15 4 15 15 15 18 45 20 15 33 4",
+	"nodes 1 15 6 15 7 15 9 30 10 15 14 30 24 15 26 15 31 15",
+	"want 1 15 26 45 38 15",
+	"run 1 15 11 30 33 8 38 15",
+	"specify 1 15 2 15 14 30 22 15 36 15",
+	"load-balancing 1 15 10 15 14 30",
+	"policies 1 15",
+	"etc 1 15 4 30 33 8 34 15",
+	"browse 1 30 24 15 39 15",
+	"edit 1 30 4 15 18 30 28 15",
+	"definition 1 30 3 30 6 15 7 75 21 24 29 30 33 8",
+	"existing 1 15 24 15 25 15",
+	"live 1 15 3 15 7 30 11 15 12 15 24 30 25 27 27 15 29 75 33 4 34 15",
+	"stored 1 15 7 15",
+	"xml 1 15 6 30 7 60 24 30 29 15 38 15",
+	"file 1 15 3 45 5 15 7 150 11 30 12 45 15 30 22 45 23 15 24 15 26 15 27 15 28 158 29 30 30 90 31 90 33 40 34 30 35 90 36 90 37 15 38 15",
+	"application.htm 1 25",
+	"each 2 30 9 15 11 30 14 45 15 15 17 15 18 15 20 15 21 12 22 15 28 15 30 15 31 15 33 12 34 30",
+	"indirect 2 15 32 15",
+	"requires 2 15 28 15",
+	"own 2 15 3 15 5 15 11 30 16 15 31 15 33 4",
+	"descriptor 2 15 4 15 6 15 7 15 10 15 18 15 21 4 31 15",
+	"need 2 15 4 15 22 15 24 15 26 30 36 15 38 30 39 15",
+	"simply 2 15 7 15 37 15",
+	"number 2 15 6 15 10 15 11 15 12 15 14 15 15 15 21 4 28 45 29 15 30 15 33 4 35 15",
+	"your 2 15 3 15 5 15 7 60 10 15 11 15 21 4 24 15 26 135 29 15 38 30 39 15",
+	"offers 2 15 3 15 5 15 10 15 11 15 12 15 13 15 14 15 16 15 17 15 19 15 20 15 22 15 39 15",
+	"following 2 15 3 15 5 15 10 15 11 15 12 15 13 15 14 15 16 15 17 15 19 15 20 15 21 12 22 15 28 15 30 15 31 15 32 15 33 8 34 15 35 15",
+	"fields 2 15 3 15 5 15 7 15 10 15 11 15 12 15 13 15 14 15 16 15 17 45 19 15 20 45 21 4 26 60",
+	"name 2 75 3 30 5 45 7 15 8 15 10 45 11 15 12 45 13 30 16 15 19 15 21 48 22 15 26 60 30 30 31 15 33 4 35 15",
+	"must 2 30 5 30 10 15 11 30 12 15 14 30 17 15 20 15",
+	"enclosing 2 15 5 15 10 15 12 30 21 56 33 4",
+	"communicator 2 15 5 15 8 15 15 15 33 4",
+	"lookup 2 15 11 15",
+	"default 2 135 3 75 5 15 7 15 10 15 11 90 14 45 17 15 20 15 22 60",
+	"value 2 45 3 30 5 15 10 30 11 90 12 15 14 30 17 15 20 15 21 80 22 45 26 60 28 30 31 15 34 15",
+	"does 2 15 5 15 21 12 28 15 33 4",
+	"belong 2 15",
+	"any 2 15 4 15 7 30 11 30 16 15 21 8 26 15 28 15 29 15 39 15",
+	"configured 2 30 22 15",
+	"corresponds 2 30 3 15 11 30 23 15 26 60 33 4 34 30 36 75",
+	"adapter-name.endpoints 2 15",
+	"which 2 15 21 4 30 45 31 15 32 15 35 15",
+	"means 2 15",
+	"listen 2 15",
+	"using 2 15 3 30 6 15 9 15 11 45 12 15 15 15 18 30 21 8 22 30 24 30 26 30 30 45 31 45 33 8 35 30 38 30",
+	"protocol 2 15",
+	"tcp 2 15 8 15",
+	"assigned 2 15",
+	"port 2 15",
+	"interfaces 2 15 6 15",
+	"adapter-name.publishedendpoints 2 15",
+	"actual 2 15 14 15",
+	"derived 2 15",
+	"from 2 30 3 15 7 45 14 15 16 15 18 15 21 8 22 15 24 45 27 15 28 30 29 45 30 45 31 90 33 32 34 90 35 45 36 15 37 15 38 15",
+	"field 2 15 3 15 11 15 14 15 26 30 33 4 34 15",
+	"above 2 15 11 15 33 8",
+	"ignored 2 15 11 15",
+	"running 2 15 11 30 28 30 30 45 31 15 32 15 33 12 35 15",
+	"greater 2 15 31 15",
+	"during 2 45 11 15",
+	"such 2 30 7 45 11 15 13 30 21 8 25 15 29 15",
+	"cleanly 2 15",
+	"shutdown 2 30 30 30 31 30 33 4 35 30",
+	"should 2 15 8 15",
+	"expects 2 15",
+	"startup 2 15",
+	"unregister 2 15",
+	"see 2 15 3 30 7 15 8 15 10 30 14 30 22 45 33 4 36 15",
+	"also 2 15 3 30 7 15 9 15 15 15 18 15 29 15 33 4 37 15 38 15 39 15",
+	"timeout 2 26 11 86 33 16",
+	"true 2 15 11 15",
+	"table 2 30 3 15 5 15 10 15 11 15 12 15 14 15 16 15 19 15 21 4 22 15 31 75 33 12 34 45",
+	"set 2 30 3 15 10 15 11 105 12 30 13 192 14 15 16 30 19 15 21 4 22 75 26 45 31 15 33 4 34 15",
+	"generates 2 30 5 15 11 15 12 30 15 30 23 15",
+	"identity 2 30",
+	"app_adapter.htm 2 25",
+	"creating 3 15",
+	"opens 3 30",
+	"empty 3 15 7 15 29 15 31 15",
+	"connected 3 15 26 15 28 15 29 30",
+	"use 3 15 7 15 14 15 16 15 19 15 21 16 22 30 24 45 26 75 27 15 28 15 35 15 37 15 39 15",
+	"templates 3 30",
+	"brand 3 15 29 15",
+	"contains 3 30 11 15 33 4 36 15",
+	"copy 3 15 4 27",
+	"contained 3 15",
+	"template 3 45 7 15 9 15 15 15 16 120 17 117 18 15 19 60 20 102 21 68 33 4 34 15",
+	"icegrid.registry.defaulttemplates 3 15",
+	"manual 3 15 8 15 11 15 22 15 39 15",
+	"editable 3 15",
+	"variables 3 45 10 45 11 75 21 87 33 12",
+	"application-level 3 15",
+	"icepatch2 3 75 11 75 33 12",
+	"proxy 3 45 11 45 33 8",
+	"stringified 3 15 11 15 33 4",
+	"application&#39;s 3 15 31 15 33 4",
+	"distribution 3 60 11 105 21 8 33 40",
+	"possible 3 15 11 30",
+	"values 3 15 11 30 16 15 19 15 30 30 33 4 34 15",
+	"none 3 15 11 15 29 15",
+	"selected 3 15 5 15 11 15 14 30",
+	"server-template 3 15 11 15",
+	"instance-name 3 15 11 15",
+	"parameter 3 15 11 15 17 15 20 15 21 20",
+	"directories 3 30 11 30 33 8",
+	"list 3 15 5 15 11 30 12 15 13 15 14 30 16 15 17 15 19 15 20 15 33 4",
+	"included 3 15 11 15 13 15 31 15 33 4",
+	"entire 3 15 11 15 25 15 33 4",
+	"repository 3 15 11 15 33 4",
+	"children 3 30 8 30 10 30 11 30 12 30 16 30 17 45 20 30 30 30 31 30 33 12",
+	"node 3 30 4 15 5 45 7 15 9 45 10 147 11 180 12 15 13 15 14 30 15 15 21 79 23 15 30 308 31 45 32 60 33 60",
+	"five 3 15",
+	"types 3 15 6 15 7 15 10 15 11 15 12 15 17 15 20 15 30 15 31 15 33 4",
+	"app_application.htm 3 25",
+	"most 4 15 22 15 24 15 26 15",
+	"sub-trees 4 15",
+	"copied 4 30",
+	"later 4 15 28 15 38 15",
+	"pasted 4 15",
+	"copies 4 15",
+	"always 4 15 11 30 28 15 29 15 33 4",
+	"deep-copies 4 15",
+	"example 4 15 7 15 12 15 21 8 22 30 29 15 33 4 37 15",
+	"code 4 15",
+	"including 4 15 16 15 29 15 38 15",
+	"sub-elements 4 15",
+	"these 4 15 5 30 6 15 7 15 9 15 11 15 21 8 22 15 23 15 24 15 28 15 30 15 32 15 33 12 34 30 39 15",
+	"database 4 15 5 72 11 15 12 15 17 15 20 15 23 113 32 30 33 4",
+	"environment 4 15 5 87 11 60 12 15 17 15 20 15 23 113 32 30 33 16 38 15",
+	"after 4 15 7 15 11 30 21 4",
+	"pasting 4 15",
+	"sub-tree 4 15",
+	"check 4 15 26 45 28 15 36 45",
+	"elements 4 15",
+	"avoid 4 15 7 15 28 15",
+	"duplicate 4 15",
+	"app_copy 4 25",
+	"__paste.htm 4 25",
+	"paste 4 12",
+	"freeze 5 15 23 15 32 15",
+	"home 5 56 23 56",
+	"path 5 30 7 15 8 15 11 105 12 60 23 15 33 12 38 15",
+	"directory 5 45 11 60 12 15 21 12 23 45 33 8 38 15",
+	"berkeley 5 30 23 45 32 15",
+	"created 5 15 8 15 16 15 21 8 23 15",
+	"creates 5 15",
+	"automatically 5 15 8 15 29 15 33 4",
+	"local 5 15",
+	"tree 5 15 6 15 31 15",
+	"enter 5 15 11 15 26 30",
+	"exist 5 15",
+	"db_config 5 15 23 15",
+	"settings 5 15",
+	"app_dbenv.htm 5 25",
+	"nested 6 15 21 4",
+	"sub-descriptors 6 15",
+	"sub-sub 6 15",
+	"descriptors 6 57 21 16 33 4 34 15",
+	"correspond 6 15",
+	"slice 6 15",
+	"element 6 15",
+	"representation 6 30 7 15",
+	"admin 6 15 7 60 8 15 11 30 12 15 13 15 18 15 21 4 22 135 24 60 26 90 28 15 29 75 30 15 31 30 32 30 33 4 34 15 35 15 36 15 37 42 38 45 39 60",
+	"maps 6 15",
+	"app_descriptors.htm 6 25",
+	"editing 7 42",
+	"soon 7 15",
+	"make 7 15 24 15 28 15",
+	"update 7 30 11 30 24 15 26 15 31 15",
+	"form 7 30 26 30",
+	"enables 7 15 8 15",
+	"two 7 45 10 15 11 15 12 15 13 15 17 15 18 15 20 15 26 30 30 15 31 15 33 4",
+	"buttons 7 15 9 15 21 4 32 15 33 4 34 15",
+	"bottom 7 15 29 15",
+	"apply 7 45 28 15",
+	"discard 7 75",
+	"navigate 7 15 9 15 29 15",
+	"another 7 30 9 15 24 15 29 15",
+	"without 7 15 26 15",
+	"pressing 7 30",
+	"changes 7 30",
+	"applied 7 15",
+	"in-memory 7 15",
+	"however 7 15 10 15 21 4 33 4",
+	"until 7 15 33 4",
+	"save 7 135 22 15",
+	"below 7 15 14 15 21 12",
+	"disconnects 7 15",
+	"updates 7 105",
+	"made 7 15",
+	"other 7 15 24 15 26 30 39 15",
+	"users 7 15",
+	"longer 7 15",
+	"propagated 7 15",
+	"tab 7 15 11 15 12 15 26 45 29 75 33 4",
+	"error 7 45 21 4",
+	"checking 7 30 26 15 28 15",
+	"performs 7 15",
+	"very 7 15 14 15 33 4",
+	"little 7 15",
+	"while 7 15",
+	"working 7 15 11 60 12 15 33 8",
+	"may 7 30 16 15 21 16 26 15 29 15 33 8 34 15 35 15",
+	"temporarily 7 15",
+	"keep 7 15 29 15",
+	"several 7 30 10 15 17 15 20 15 26 30 29 15 32 15 35 15",
+	"same 7 60 9 15 10 15 11 30 21 8",
+	"leave 7 15 26 15",
+	"some 7 30 8 15 9 15 21 4 37 15 39 15",
+	"parameters 7 15 16 30 17 30 19 30 20 30 21 16",
+	"unset 7 15",
+	"undefined 7 15",
+	"variable 7 15 11 15 21 88",
+	"errors 7 15",
+	"detected 7 15",
+	"there 7 15 26 15 29 15 39 15",
+	"nonetheless 7 15",
+	"constraints 7 15",
+	"enforced 7 15",
+	"times 7 15",
+	"display 7 15 18 15 28 15",
+	"cannot 7 30 11 15 16 15 21 4 30 15 31 15 33 8 35 15",
+	"executable 7 15 8 15 11 30 33 8",
+	"violate 7 15",
+	"constraint 7 15",
+	"prevents 7 15",
+	"applying 7 15",
+	"change 7 15 29 15",
+	"saving 7 27",
+	"menu 7 15 9 15 18 15 28 15 30 30 31 75 33 8 34 30 35 30",
+	"item 7 15",
+	"corresponding 7 30 11 15 13 30 21 4 29 15 31 15",
+	"toolbar 7 30 9 15 21 4",
+	"button 7 30 9 15 26 15 27 15 30 15 33 8 34 15",
+	"saves 7 15",
+	"file-bound 7 15",
+	"associated 7 30 21 4 26 15 29 15 33 4 34 15",
+	"discarding 7 15",
+	"selecting 7 15",
+	"reloads 7 15",
+	"concurrent 7 30",
+	"administrators 7 15",
+	"concurrently 7 15",
+	"last 7 15 31 15",
+	"silently 7 15",
+	"overwrite 7 15",
+	"previous 7 15 9 15",
+	"situation 7 15 21 4",
+	"acquire 7 30",
+	"exclusive 7 45",
+	"write 7 45 22 15 33 8",
+	"access 7 45 26 15",
+	"granted 7 15",
+	"attempt 7 15",
+	"session 7 15 11 45 21 4",
+	"result 7 15 26 15",
+	"app_editing_and_saving.htm 7 25",
+	"identical 8 15 14 15 17 15 20 15",
+	"plain 8 15 11 27 12 27 15 30 16 30 17 45 18 15 20 30",
+	"icebox.instancename 8 15",
+	"ice.admin.endpoints 8 45",
+	"127.0.0.1 8 15",
+	"main 8 15 29 57",
+	"iceboxd 8 15",
+	"java 8 45 22 15 36 15 37 30 38 30",
+	"iceboxcs 8 15",
+	".net 8 15",
+	"command 8 15 11 15 33 4",
+	"arguments 8 15 11 30 22 27 33 8 36 30",
+	"include 8 15 11 15 12 15 13 15 16 15 19 15",
+	"container 8 15",
+	"class 8 15",
+	"icebox.server 8 15",
+	"type 8 15 16 15 26 15 30 30 33 4",
+	"app_icebox_server.htm 8 25",
+	"maintains 9 15",
+	"history 9 15",
+	"visited 9 15",
+	"view 9 30 21 8 24 15",
+	"back 9 15",
+	"next 9 15 14 15 33 4 34 15",
+	"items 9 15 14 15",
+	"equivalent 9 15 10 15 26 15",
+	"forms 9 15 21 8 26 30",
+	"green 9 15",
+	"arrow 9 15",
+	"provides 9 15 13 15 24 15 30 15 31 15 33 4 34 15 35 15",
+	"link 9 15",
+	"app_navigation.htm 9 25",
+	"navigation 9 12",
+	"monitors 10 15",
+	"describes 10 15 21 4",
+	"match 10 15",
+	"icegrid.node.name 10 15",
+	"node-level 10 15",
+	"factor 10 26 30 30",
+	"floating 10 15",
+	"point 10 15 12 45 34 30",
+	"compare 10 15",
+	"different 10 15",
+	"making 10 15",
+	"decision 10 15",
+	"based 10 15",
+	"load-average 10 15 14 45 30 15",
+	"linux 10 30 11 15 14 15 30 30 33 8 37 15 38 45",
+	"unix 10 30 11 15 14 15 21 16 30 30 33 8",
+	"cpu 10 15 14 45 30 30",
+	"utilization 10 15 14 45 30 15",
+	"windows 10 30 14 15 21 20 30 30 38 30",
+	"leaving 10 15",
+	"1.0 10 30",
+	"divided 10 15",
+	"cpus 10 15 30 30",
+	"app_node.htm 10 25",
+	"ice.serverid 11 15",
+	"sets 11 15 12 15 13 60 16 30 19 15 33 4 34 15",
+	"property-set 11 15 12 15 16 15 19 15",
+	"refer 11 15 12 15 13 15 16 15 19 15 21 8",
+	"private 11 45 12 15 13 15 16 15 19 15 23 15",
+	"log 11 75 12 75 22 15 25 15 28 173 30 60 31 60 33 28 34 45 35 60",
+	"files 11 45 12 45 24 15 25 15 31 15 33 4 38 15",
+	"declare 11 30 12 30",
+	"relative 11 60 12 30",
+	"able 11 15 12 15",
+	"conveniently 11 15 12 15",
+	"retrieve 11 15 12 15 24 15 25 15 26 15 28 45 30 75 31 60 33 24 34 30 35 60",
+	"command-line 11 45 12 15 22 42 24 15 33 4 36 30 38 15",
+	"utility 11 30 12 15 38 15",
+	"server&#39;s 11 45 23 15 33 48",
+	"don&#39;t 11 15",
+	"provide 11 15 36 15",
+	"assumes 11 15",
+	"it&#39;s 11 15",
+	"started 11 60 32 30 33 20 34 30 37 15 39 15",
+	"root 11 30 31 15 33 8",
+	"under 11 15",
+	"username 11 30 22 60 26 90 33 4",
+	"desired 11 15",
+	"runs 11 45 33 16",
+	"user 11 15 21 8 22 15 33 8 39 15",
+	"except 11 15 21 4 33 4",
+	"case 11 15 33 4",
+	"nobody 11 15 33 4",
+	"addition 11 15 33 4",
+	"mode 11 60 33 8",
+	"keeps 11 15",
+	"time 11 30 22 15 31 15 33 12 34 30",
+	"manually 11 15",
+	"on-demand 11 15",
+	"resolves 11 30",
+	"object-adapter 11 15",
+	"separate 11 15 15 15",
+	"allocates 11 15",
+	"combination 11 15 16 15",
+	"activating 11 15 33 4",
+	"gives 11 30",
+	"seconds 11 30 28 15",
+	"their 11 15 18 15 21 4",
+	"delayed 11 15",
+	"uses 11 30 26 30",
+	"icegrid.node.waittime 11 30",
+	"deactivation 11 15 33 8",
+	"deactivating 11 15 33 8",
+	"exit 11 15 33 4",
+	"gracefully 11 15",
+	"killed 11 15",
+	"specifies 11 15 36 15",
+	"whether 11 15 33 4",
+	"allocated 11 45",
+	"implicitly 11 15",
+	"false 11 15",
+	"depends 11 30 33 8",
+	"stopped 11 15 28 30 34 15",
+	"disabled 11 15 33 24",
+	"before 11 15 33 4",
+	"re-enabled 11 15 33 4",
+	"app_plain_server.htm 11 25",
+	"entry 12 45 31 15 34 30",
+	"service&#39;s 12 15 18 15",
+	"icestormservice 12 15",
+	"createicestorm 12 15",
+	"append 12 15",
+	"--ice.config 12 15 22 30",
+	"path-to-service-config-file 12 15",
+	"icebox.service.service-name 12 15 34 15",
+	"config 12 15",
+	"app_plain_service.htm 12 25",
+	"defines 13 15 21 8",
+	"supports 13 15 15 15 18 15",
+	"kinds 13 15 15 15 18 15",
+	"named 13 45",
+	"service-instance 13 15 34 15",
+	"child 13 15 16 15",
+	"concrete 13 15",
+	"app_property_set.htm 13 25",
+	"abstract 14 15",
+	"grouping 14 15",
+	"similar 14 15 17 15 20 15 26 15",
+	"joins 14 15",
+	"resolving 14 15 21 4",
+	"proxies 14 15",
+	"adaptive 14 30",
+	"return 14 30",
+	"whose 14 15",
+	"report 14 15",
+	"lowest 14 15",
+	"multiplied 14 15",
+	"node&#39;s 14 15",
+	"load-factor 14 15",
+	"comparison 14 15",
+	"sample 14 56",
+	"highest 14 15",
+	"random 14 30",
+	"returns 14 45",
+	"round-robin 14 15",
+	"puts 14 15",
+	"resolution 14 30",
+	"how 14 30 39 15",
+	"many 14 30 22 15 28 15",
+	"common 14 15 17 15 20 15 26 15",
+	"available 14 15 18 15 24 15 33 4 38 15",
+	"comparing 14 15",
+	"minutes 14 15 30 30 39 15",
+	"app_replica 14 25",
+	"__group.htm 14 25",
+	"part 15 15 26 15",
+	"three 15 15",
+	"normal 15 15",
+	"single 15 30 21 4 33 4",
+	"usually 15 15 33 8 38 15",
+	"itself 15 15 22 15",
+	"app_server.htm 15 25",
+	"assign 16 15 21 4",
+	"server-instance 16 15 33 4",
+	"overall 16 15",
+	"references 16 15 21 4",
+	"augmented 16 15",
+	"possibly 16 15",
+	"overridden 16 15 21 12",
+	"app_server_instance.htm 16 25",
+	"capture 17 15 20 15",
+	"optional 17 15 20 15 36 30",
+	"remaining 17 15 20 15 21 4 33 4 34 15",
+	"kind 17 15",
+	"app_server_template.htm 17 25",
+	"directly 18 15 24 30 26 15 32 15",
+	"order 18 30 21 12 26 30 38 15",
+	"load-order 18 15",
+	"determined 18 15 21 8",
+	"reorder 18 15",
+	"move 18 30",
+	"contextual 18 15 30 15 31 60 33 4 34 15 35 15",
+	"app_service.htm 18 25",
+	"give 19 15 26 15",
+	"app_service_instance.htm 19 25",
+	"app_service_template.htm 20 25",
+	"allow 21 4",
+	"define 21 8",
+	"commonly-used 21 4",
+	"information 21 8 22 45 24 15 26 15 27 15 29 45",
+	"once 21 4",
+	"symbolically 21 4",
+	"throughout 21 4",
+	"syntax 21 4",
+	"substitution 21 24",
+	"attempted 21 4",
+	"whenever 21 4",
+	"symbol 21 8",
+	"encountered 21 4",
+	"subject 21 4",
+	"limitations 21 4",
+	"rules 21 8",
+	"case-sensitive 21 4",
+	"fatal 21 4",
+	"occurs 21 4",
+	"saved 21 4",
+	"where 21 4",
+	"allowed 21 4",
+	"performed 21 4 29 15",
+	"string 21 8",
+	"defining 21 8",
+	"referring 21 4",
+	"names 21 24",
+	"escaping 21 8",
+	"prevent 21 4",
+	"reference 21 24",
+	"additional 21 4 31 15 36 15",
+	"leading 21 4",
+	"character 21 12",
+	"literal 21 4",
+	"abc 21 8",
+	"would 21 4",
+	"variable&#39;s 21 4",
+	"extra 21 4",
+	"immediately 21 4 29 15 32 15",
+	"preceding 21 8",
+	"therefore 21 4",
+	"text 21 4 28 15",
+	"modified 21 4",
+	"occurrence 21 4",
+	"characters 21 4 28 30",
+	"replaced 21 4",
+	"initiate 21 4",
+	"pre-defined 21 23",
+	"read-only 21 8 35 15",
+	"hold 21 4",
+	"reserved 21 4",
+	"purpose 21 4",
+	"context 21 8",
+	"valid 21 4",
+	"application.distrib 21 15",
+	"pathname 21 12",
+	"alias 21 8 36 15",
+	"node.datadir 21 23",
+	"distrib 21 8",
+	"node.os 21 15",
+	"operating 21 4 30 30",
+	"system 21 12 30 30 38 12",
+	"provided 21 16 26 30",
+	"uname 21 16",
+	"node.hostname 21 15",
+	"host 21 4 30 45 31 15 35 15",
+	"node.release 21 15",
+	"operation 21 8",
+	"release 21 4",
+	"obtained 21 4",
+	"osversioninfo 21 4",
+	"data 21 8 28 15",
+	"structure 21 4",
+	"node.version 21 15",
+	"current 21 4 28 15",
+	"pack 21 4",
+	"level 21 12",
+	"node.machine 21 15",
+	"machine 21 4 30 15",
+	"hardware 21 4",
+	"x86 21 4",
+	"x64 21 4",
+	"absolute 21 4",
+	"server.distrib 21 15",
+	"session.id 21 15",
+	"client 21 4 22 15 26 30",
+	"identifier 21 4",
+	"sessions 21 8",
+	"password 21 4 22 60 26 90 36 75",
+	"secure 21 4",
+	"connection 21 8 26 30 29 15",
+	"distinguished 21 4",
+	"availability 21 4",
+	"easily 21 4",
+	"cases 21 4",
+	"but 21 16 26 15 28 15",
+	"readily 21 4",
+	"apparent 21 4",
+	"others 21 4",
+	"because 21 4",
+	"body 21 4",
+	"evaluated 21 4",
+	"instantiated 21 4",
+	"specific 21 4 22 15 26 60 33 4",
+	"substitute 21 8",
+	"respecitive 21 4",
+	"show 21 4 29 15 31 30",
+	"toggle 21 4",
+	"variable-substitution 21 4",
+	"enabled 21 4 33 16",
+	"scoping 21 4",
+	"levels 21 4",
+	"introduces 21 4",
+	"scope 21 24",
+	"overrides 21 8",
+	"modify 21 8",
+	"similarly 21 4",
+	"nearest 21 4",
+	"diagram 21 8",
+	"illustrates 21 4",
+	"concepts 21 4",
+	"nodea 21 8",
+	"whereas 21 4",
+	"remains 21 4",
+	"unchanged 21 4",
+	"nodeb 21 4",
+	"continues 21 4",
+	"resolve 21 4",
+	"var 21 8",
+	"searches 21 4",
+	"precedence 21 8",
+	"applicable 21 12",
+	"initial 21 4 28 30",
+	"resolved 21 4",
+	"recursively 21 4",
+	"visible 21 4",
+	"instances 21 4",
+	"occur 21 4",
+	"instantiates 21 4",
+	"modifying 21 4",
+	"inner 21 8",
+	"outer 21 4",
+	"app_variables.htm 21 14",
+	"like 22 15",
+	"both 22 15 39 15",
+	"regular 22 15 30 15 32 30 33 12",
+	"useful 22 15",
+	"well 22 15",
+	"ice.trace.network 22 15",
+	"get 22 15",
+	"detailed 22 15",
+	"network 22 15",
+	"communications 22 15",
+	"sent 22 15",
+	"stderr 22 45 30 45 31 45 33 16 35 45",
+	"icegridgui 22 15 37 30",
+	"--ice.trace.network 22 15",
+	"detail 22 15 39 15",
+	"icegridadmin.authenticateusingssl 22 26",
+	"logging 22 15",
+	"authentication 22 30 26 90",
+	"instructs 22 15",
+	"offer 22 15",
+	"ssl 22 15 26 120 36 68",
+	"login 22 45 26 113 36 15",
+	"details 22 45 31 15 36 15 39 15",
+	"icegridadmin.username 22 26",
+	"authenticating 22 30",
+	"icegridadmin.password 22 26",
+	"icegridadmin.trace.observers 22 26",
+	"writes 22 15",
+	"message 22 15 33 8",
+	"receives 22 15",
+	"debug 22 30",
+	"problems 22 30",
+	"icegridadmin.trace.savetoregistry 22 26",
+	"logs 22 15",
+	"activities 22 15",
+	"directed 22 15",
+	"good 22 15",
+	"idea 22 15",
+	"argument 22 15",
+	"location 22 15 36 15",
+	"-jar 22 15 37 30",
+	"bin 22 15 37 15 38 15",
+	"icegridgui.jar 22 15 37 41 38 30",
+	"icegridadmin.conf 22 15",
+	"command_line_arguments.htm 22 25",
+	"storage 23 15",
+	"persistence 23 15",
+	"freeze.dbenv.env-name.dbhome 23 15",
+	"often 23 15 28 15",
+	"dbenv.htm 23 25",
+	"everything 24 15",
+	"deploy 24 30",
+	"comprehensive 24 15",
+	"administration 24 15 39 15",
+	"tool 24 30 39 30",
+	"manage 24 15",
+	"start 24 30 25 15 33 12 34 30 37 15",
+	"stop 24 15 25 15 33 4 34 30",
+	"processes 24 15",
+	"much 24 15",
+	"more 24 30 29 15 36 30",
+	"necessary 24 15",
+	"scratch 24 15",
+	"tools 24 15 30 15 31 15 33 4 34 15 35 15",
+	"although 24 15",
+	"features 24 30",
+	"through 24 15 26 30 28 30 32 15",
+	"way 24 15",
+	"interact 24 15",
+	"sometimes 24 15",
+	"convenient 24 15",
+	"simple 24 15",
+	"particular 24 15 36 15",
+	"add 24 15 31 30",
+	"writing 24 15 28 15",
+	"python 24 15",
+	"ruby 24 15",
+	"scripts 24 15",
+	"option 24 15",
+	"api 24 15",
+	"remote 24 15 28 30",
+	"invocations 24 15",
+	"ice-for-python 24 15",
+	"ice-for-ruby 24 15",
+	"introduction.htm 24 25",
+	"introduction 24 12",
+	"runtime 25 15 31 15 32 27 33 4 34 15 38 15",
+	"perform 25 15",
+	"various 25 15",
+	"administrative 25 15",
+	"tasks 25 15",
+	"enable 25 15 26 30 33 4 36 15",
+	"disable 25 15 33 4",
+	"send 25 15 33 8",
+	"signal 25 15 33 8",
+	"patch 25 15 31 15 33 12",
+	"undeploy 25 15 31 15",
+	"live_deployment.htm 25 25",
+	"dialog 26 41 28 263 30 30 31 45 33 16 34 15 35 30 36 15",
+	"connect 26 120",
+	"press 26 15 27 15",
+	"open 26 15 28 15 31 15 33 4",
+	"select 26 30 33 4 34 15",
+	"going 26 15",
+	"intermediary 26 15",
+	"glacier2 26 161",
+	"router 26 176",
+	"support 26 30 39 15",
+	"authenticates 26 30",
+	"credentials 26 30",
+	"authenticate 26 30",
+	"icessl 26 90 36 75",
+	"loads 26 30",
+	"plugin 26 60 36 15",
+	"icegrid.instancename 26 15",
+	"endpoint 26 120",
+	"registries 26 45 32 15 35 15",
+	"replicas 26 30 35 15",
+	"icegrid.registry.client.endpoints 26 15",
+	"icegrid.registry.client.publishede 26 15",
+	"dpoints 26 15",
+	"master 26 75 35 15",
+	"non-replicated 26 15",
+	"unchecking 26 15",
+	"box 26 45",
+	"makes 26 15",
+	"difference 26 30",
+	"unchecked 26 15",
+	"routed 26 60 36 15",
+	"important 26 15",
+	"target 26 15",
+	"glacier2.instancename 26 15",
+	"glacier2.client.endpoints 26 15",
+	"glacier2.client.publishedendpoints 26 15",
+	"even 26 15 36 15",
+	"replicated 26 15 32 15",
+	"check-box 26 15",
+	"login.htm 26 25",
+	"logout 27 38",
+	"disconnect 27 15",
+	"clears 27 15",
+	"logout.htm 27 25",
+	"retrieved 28 15 29 30 30 15 33 8 34 30",
+	"periodically 28 30",
+	"lines 28 120",
+	"paused 28 15",
+	"currently 28 15 33 4 34 15",
+	"retrieving 28 15",
+	"preferences 28 60",
+	"opened 28 30",
+	"max 28 45",
+	"buffer 28 30",
+	"maximum 28 45",
+	"tail 28 30",
+	"restarting 28 15",
+	"retrieves 28 15",
+	"displays 28 15 29 60",
+	"bytes 28 30",
+	"read 28 15 38 15 39 15",
+	"per 28 15",
+	"request 28 30",
+	"pick 28 15",
+	"low 28 15",
+	"enough 28 30",
+	"appear 28 15 29 15",
+	"responsive 28 15",
+	"big 28 15",
+	"round-trips 28 15",
+	"lots 28 15",
+	"logged 28 15 29 15",
+	"between 28 15 29 15",
+	"100 28 15",
+	"ice.messagesizemax 28 15",
+	"512 28 15",
+	"poll 28 30",
+	"period 28 30",
+	"state 28 15 33 16 34 15",
+	"attempts 28 15",
+	"every 28 15",
+	"log_file_dialog.htm 28 25",
+	"window 29 57",
+	"tabs 29 45",
+	"long 29 15",
+	"anything 29 15",
+	"up-to-date 29 15",
+	"administrator 29 15",
+	"adds 29 15",
+	"file-based 29 15",
+	"icon-less 29 30",
+	"bound 29 15",
+	"unsaved 29 15",
+	"modifications 29 15",
+	"becomes 29 15",
+	"lost 29 15",
+	"bar 29 30",
+	"operations 29 15",
+	"messages 29 15",
+	"received 29 15",
+	"main_window.htm 29 25",
+	"shown 30 15 33 4",
+	"actions 30 30 31 30 32 15 33 8 34 30 35 30",
+	"stdout 30 45 31 45 33 16 35 45",
+	"retrieval 30 30 31 30 33 8 35 30",
+	"succeeds 30 30 31 30 33 8 35 30",
+	"output 30 30 31 30 33 8 35 30",
+	"been 30 30 31 30 33 8 35 30",
+	"redirected 30 30 31 30 33 8 35 30",
+	"ice.stdout 30 15 31 15 33 4 35 15",
+	"ice.stderr 30 15 31 15 33 4 35 15",
+	"restart 30 15 31 15 35 15",
+	"hostname 30 15 31 15 35 15",
+	"usage 30 15",
+	"average 30 15",
+	"percentage 30 15",
+	"past 30 30",
+	"click 30 15 33 4 34 15",
+	"refresh 30 15 33 4 34 15",
+	"latest 30 15 31 15 33 4",
+	"node.htm 30 25",
+	"components 31 15 32 42",
+	"administered 31 15",
+	"dynamic 31 45",
+	"along 31 15",
+	"date 31 15",
+	"instruct 31 15 33 12 34 30",
+	"download 31 15 33 4",
+	"remove 31 45",
+	"dynamically 31 45",
+	"replica-group 31 15",
+	"entries 31 30",
+	"icegrid.registry.dynamicregistrati 31 15",
+	"slave 31 15 32 30 35 53",
+	"registry.htm 31 25",
+	"communicates 32 15",
+	"monitored 32 30",
+	"menus 32 15",
+	"keyboard 32 15",
+	"short-cuts 32 15",
+	"affect 32 15",
+	"runtime_components.htm 32 25",
+	"hosting 33 4",
+	"first 33 8 34 15",
+	"icon 33 4",
+	"second 33 4",
+	"unknown 33 4",
+	"parent 33 4",
+	"starting 33 8 37 12",
+	"waiting 33 8",
+	"destroyed 33 4",
+	"being 33 4",
+	"removed 33 4",
+	"transient 33 4",
+	"icons 33 4",
+	"grayed-out 33 4",
+	"mark 33 8",
+	"already 33 4",
+	"marked 33 4",
+	"achieved 33 8",
+	"icegrid.node.output 33 8",
+	"sigquit 33 4",
+	"non-windows 33 4",
+	"i.e 33 4 34 15",
+	"build 33 12 34 45",
+	"buildid 33 4 34 15",
+	"showing 33 8 34 30",
+	"come 33 8 34 30",
+	"containing 33 4",
+	"right 33 4",
+	"they 33 4 34 15",
+	"combined 33 4 34 15",
+	"gets 33 4",
+	"inherited 33 4",
+	"patched 33 4",
+	"shut 33 4",
+	"server.htm 33 14",
+	"loaded 34 30",
+	"potentially 34 15",
+	"service.htm 34 25",
+	"slave_registry.htm 35 25",
+	"configure 36 15",
+	"ice-for-java 36 15",
+	"basic 36 30",
+	"mininum 36 15",
+	"required 36 15",
+	"keystore 36 90",
+	"unlock 36 15",
+	"keys 36 15",
+	"icessl.keystore 36 26",
+	"icessl.password 36 26",
+	"advanced 36 30",
+	"integrity 36 60",
+	"icessl.keystorepassword 36 26",
+	"selects 36 15",
+	"certificate 36 30",
+	"icessl.alias 36 26",
+	"truststore 36 45",
+	"certificates 36 15",
+	"trusted 36 15",
+	"authorities 36 15",
+	"icessl.truststore 36 15",
+	"icessl.truststorepassword 36 15",
+	"passing 36 15",
+	"ssl_configuration.htm 36 25",
+	"environments 37 15",
+	"double-clicking 37 15",
+	"platforms 37 15 38 15",
+	"terminal 37 15",
+	"typing 37 15",
+	"path-to-icegridgui.jar 37 15",
+	"solaris 37 15 38 15",
+	"hp-ux 37 15",
+	"mac 37 15",
+	"opt 37 15",
+	"lib 37 15 38 15",
+	"rpm 37 15 38 15",
+	"installation 37 15 38 30",
+	"script 37 15",
+	"installer 37 15",
+	"usr 37 15 38 15",
+	"starting_icegrid_admin.htm 37 25",
+	"javatm 38 15",
+	"supported 38 15",
+	"wide 38 15",
+	"range 38 15",
+	"macos 38 15",
+	"installed 38 30",
+	"share 38 15",
+	"jre 38 30",
+	"v1.5.0 38 15",
+	"recommend 38 15 39 15",
+	"sun 38 15",
+	"jdk 38 15",
+	"here 38 15",
+	"3.4.0 38 15",
+	"system_requirements.htm 38 25",
+	"requirements 38 12",
+	"welcome 39 27",
+	"online 39 15",
+	"help 39 30",
+	"graphical 39 15",
+	"server-deployment 39 15",
+	"monitoring 39 15",
+	"pages 39 15",
+	"assume 39 15",
+	"familiarity 39 15",
+	"getting 39 15",
+	"quick 39 15",
+	"overview 39 15",
+	"please 39 30",
+	"teach 39 15",
+	"yourself 39 15",
+	"issue 39 15",
+	"connections 39 15",
+	"newsletter 39 15",
+	"trouble 39 15",
+	"component 39 15",
+	"forums 39 15",
+	"post 39 15",
+	"questions 39 15",
+	"zeroc 39 15",
+	"commercial 39 15",
+	"e-mail 39 15",
+	"phone 39 15",
+	"contact 39 15",
+	"sales 39 15",
+	"zeroc.com 39 15",
+	"welcome.htm 39 25"];
+skipwords = ["and",
+	"or",
+	"the",
+	"it",
+	"is",
+	"an",
+	"on",
+	"we",
+	"us",
+	"to",
+	"of",
+	"has",
+	"be",
+	"all",
+	"for",
+	"in",
+	"as",
+	"so",
+	"are",
+	"that",
+	"can",
+	"you",
+	"at",
+	"its",
+	"by",
+	"have",
+	"with",
+	"into"];
+var STR_FORM_SEARCHFOR = "Search for:";
+var STR_FORM_SUBMIT_BUTTON = "Submit";
+var STR_FORM_RESULTS_PER_PAGE = "Results per page:";
+var STR_FORM_MATCH = "Match:";
+var STR_FORM_ANY_SEARCH_WORDS = "any search words";
+var STR_FORM_ALL_SEARCH_WORDS = "all search words";
+var STR_NO_QUERY = "No search query entered.";
+var STR_RESULTS_FOR = "Search results for:";
+var STR_NO_RESULTS = "No results";
+var STR_RESULT = "result";
+var STR_RESULTS = "results";
+var STR_PHRASE_CONTAINS_COMMON_WORDS = "The following phrase contains very common words on this site, resulting in a limited search. Please define a more specific phrase for better results.";
+var STR_SKIPPED_FOLLOWING_WORDS = "The following word(s) are in the skip word list and have been omitted from your search:";
+var STR_SKIPPED_PHRASE = "Note that you can not search for exact phrases beginning with a skipped word";
+var STR_SUMMARY_NO_RESULTS_FOUND = "No results found.";
+var STR_SUMMARY_FOUND_CONTAINING_ALL_TERMS = "found containing all search terms.";
+var STR_SUMMARY_FOUND_CONTAINING_SOME_TERMS = "found containing some search terms.";
+var STR_SUMMARY_FOUND = "found.";
+var STR_PAGES_OF_RESULTS = "pages of results.";
+var STR_POSSIBLY_GET_MORE_RESULTS = "You can possibly get more results searching for";
+var STR_ANY_OF_TERMS = "any of the terms";
+var STR_DIDYOUMEAN = "Did you mean:";
+var STR_SORTEDBY_RELEVANCE = "Sorted by relevance";
+var STR_SORTBY_RELEVANCE = "Sort by relevance";
+var STR_SORTBY_DATE = "Sort by date";
+var STR_SORTEDBY_DATE = "Sorted by date";
+var STR_RESULT_TERMS_MATCHED = "Terms matched: ";
+var STR_RESULT_SCORE = "Score: ";
+var STR_RESULT_URL = "URL:";
+var STR_RESULT_PAGES = "Results Pages:";
+var STR_RESULT_PAGES_PREVIOUS = "Previous";
+var STR_RESULT_PAGES_NEXT = "Next";
+var STR_FORM_CATEGORY = "Category:";
+var STR_FORM_CATEGORY_ALL = "All";
+var STR_RESULTS_IN_ALL_CATEGORIES = "in all categories";
+var STR_RESULTS_IN_CATEGORY = "in category";
+var STR_POWEREDBY = "Search powered by";
+var STR_MORETHAN = "More than";
+var STR_ALL_CATS = "all categories";
+var STR_OR = "or";
+var STR_RECOMMENDED = "Recommended links";
+var STR_SEARCH_TOOK = "Search took";
+var STR_SECONDS = "seconds";
+var STR_MAX_RESULTS = "You have requested more results than served per query. Please try again with a more precise query.";
diff --git a/java/resources/IceGridAdmin/zoom_pageinfo.js b/java/resources/IceGridAdmin/zoom_pageinfo.js
index 616e9cf372e..8fce9242a8d 100644
--- a/java/resources/IceGridAdmin/zoom_pageinfo.js
+++ b/java/resources/IceGridAdmin/zoom_pageinfo.js
@@ -38,43 +38,43 @@ pageinfo = [[1205537659,8790],
 	[1205530147,5263],
 	[1232748869,6391],
 	[1205528283,6456]];
-pagedata = [ ["./adapter.htm","Adapter","An adapter represents an Ice object adapter described in the IceGrid registry that resides in a server or an IceBox service. Note that direct obje...",""],

-["./application.htm","Application","IceGrid definitions are organized in \"applications\", with typically one or a few applications deployed on a given IceGrid instance. An Application...",""],

-["./app_adapter.htm","Adapter","Each indirect object adapter registered with IceGrid requires its own Adapter descriptor. If you need to specify a direct adapter, simply create a...",""],

-["./app_application.htm","Application","Creating a new Application You can create a new application using File &#62; New Application: this opens a new Application pane, with an empty applica...",""],

-["./app_copy__paste.htm","Copy &#38; Paste","Most descriptor sub-trees can be copied and later pasted. Copies are always deep-copies: for example if you copy a node, all the servers on this c...",""],

-["./app_dbenv.htm","Database Environment","Properties The Database Environment Properties panel offers the following fields: Name The name of the Freeze Database Environment. This name must...",""],

-["./app_descriptors.htm","Descriptors","An application definition is described using one application descriptor with a number of nested sub-descriptors (and sub-sub descriptors). The des...",""],

-["./app_editing_and_saving.htm","Editing &#38; Saving","Editing As soon as you make any update in a form, IceGrid Admin enables two buttons at the bottom of this form: Apply and Discard. If you navigate...",""],

-["./app_icebox_server.htm","IceBox Server","Properties The Properties panel for an IceBox server is identical to the Properties panel for a Plain Server . When you create a new IceBox server...",""],

-["./app_navigation.htm","Navigation","Each Application pane maintains a history of the nodes you have visited in this pane. You can navigate these nodes using the View &#62; Go Back to the...",""],

-["./app_node.htm","Node","Anode represents an IceGrid node that starts and monitors your servers. Several applications can be deployed on the same node; however a node desc...",""],

-["./app_plain_server.htm","Plain Server","Properties The Server Properties panel offers the following fields: Server ID The ID of the server; corresponds to the Ice.ServerID property. Each...",""],

-["./app_plain_service.htm","Plain Service","Properties The Service Properties panel offers the following fields: Service Name The name of the service. Must be unique within the enclosing Ice...",""],

-["./app_property_set.htm","Property Set","AProperty Set defines a set of Ice properties. IceGrid Admin supports two kinds of Property Sets: • Named Property Set, defined within an applicat...",""],

-["./app_replica__group.htm","Replica Group","Areplica group represents an abstract grouping of identical, or very similar, object adapters. An object adapter joins this group by setting this ...",""],

-["./app_server.htm","Server","Aserver represents an Ice server deployed on a node as part of an application. IceGrid supports three kinds of servers: • Plain Server : a normal ...",""],

-["./app_server_instance.htm","Server Instance","Aserver instance is a server created from a server template; it may be a plain server or an IceBox server. Properties The Server Instance Properti...",""],

-["./app_server_template.htm","Server Template","Aserver template is used to capture the common definitions of several similar or identical servers. Properties The Server Template Properties pane...",""],

-["./app_service.htm","Service","Aservice represents an IceBox service deployed on an IceBox server. IceGrid supports two kinds of services: • Plain Service : a service defined di...",""],

-["./app_service_instance.htm","Service Instance","Properties The Service Instance Properties panel offers the following fields: Template The name of the Service Template . Parameters Use this tabl...",""],

-["./app_service_template.htm","Service Template","Aservice template is used to capture the common definitions of several similar or identical services. Properties The Service Template Properties p...",""],

-["./app_variables.htm","Variables","Variables allow you to define commonly-used information once and refer to them symbolically throughout your application descriptors. Syntax Substi...",""],

-["./command_line_arguments.htm","Command-Line Arguments","IceGrid Admin can be configured using Ice properties, and like with most Ice applications, these properties can be set using command-line argument...",""],

-["./dbenv.htm","Database Environment","ADatabase Environment represents a Berkeley DB database environment, typically used for storage by the Freeze persistence service. Properties The ...",""],

-["./introduction.htm","Introduction","Everything you need to deploy IceGrid applications IceGrid Admin is a comprehensive administration tool for IceGrid. With IceGrid Admin, you can: ...",""],

-["./live_deployment.htm","Live Deployment","The Live Deployment pane shows the runtime status and configuration of an existing IceGrid deployment, and allows you to perform various administr...",""],

-["./login.htm","Login","The Login dialog allows you to connect to an IceGrid registry and retrieve information about the nodes and servers associated with this registry. ...",""],

-["./logout.htm","Logout","Use File &#62; Logout or press the button to disconnect from an IceGrid registry. This clears all information in the Live Deployment pane. Page url: h...",""],

-["./log_file_dialog.htm","Log File Dialog","The Log File dialog shows a log file (text file) retrieved through IceGrid. Often, a process will be writing to this log file and the dialog will ...",""],

-["./main_window.htm","Main Window","The main IceGrid Admin window allows to navigate between your live deployment and the definitions of several applications. Tabs The main IceGrid A...",""],

-["./node.htm","Node","Anode represents an IceGrid node process registered with the IceGrid registry. States A node can be either up () or down (). A \"down\" node is show...",""],

-["./registry.htm","Registry","The registry is the root node of the Runtime Components tree, and represents the IceGrid registry process administered by IceGrid Admin. Actions A...",""],

-["./runtime_components.htm","Runtime Components","IceGrid Admin shows the following runtime components: • Registry () Represents the IceGrid registry process with which IceGrid Admin communicates ...",""],

-["./server.htm","Server","Aserver represents an Ice server process. It can be either regular server (with typically a single Ice communicator) or an IceBox server hosting a...",""],

-["./service.htm","Service","Aservice represents an IceBox service loaded (or potentially loaded) within an IceBox server. States A service can be either started ( ) or stoppe...",""],

-["./slave_registry.htm","Slave Registry","An IceGrid deployment may use several IceGrid registry replicas, with one Master registry and a number of read-only Slave registries. Actions A sl...",""],

-["./ssl_configuration.htm","SSL Configuration","When you check Enable IceSSL in the Direct or Routed pane of the Login dialog, you need to configure the Ice-for-Java IceSSL plugin. Basic SSL Con...",""],

-["./starting_icegrid_admin.htm","Starting IceGrid Admin","In some environments, IceGrid Admin can be started by simply double-clicking on the IceGridGUI.jar file. On all platforms, you can start IceGrid A...",""],

-["./system_requirements.htm","System Requirements","IceGrid Admin is a JavaTM application supported a wide range of platforms including Windows XP, MacOS X and Linux. In order to run IceGrid Admin y...",""],

-["./welcome.htm","Welcome","Welcome to the IceGrid Admin Online Help IceGrid Admin is the graphical administration tool for IceGrid , the server-deployment and monitoring ser...",""]];

+pagedata = [ ["./adapter.htm","Adapter","An adapter represents an Ice object adapter described in the IceGrid registry that resides in a server or an IceBox service. Note that direct obje...",""],
+["./application.htm","Application","IceGrid definitions are organized in \"applications\", with typically one or a few applications deployed on a given IceGrid instance. An Application...",""],
+["./app_adapter.htm","Adapter","Each indirect object adapter registered with IceGrid requires its own Adapter descriptor. If you need to specify a direct adapter, simply create a...",""],
+["./app_application.htm","Application","Creating a new Application You can create a new application using File &#62; New Application: this opens a new Application pane, with an empty applica...",""],
+["./app_copy__paste.htm","Copy &#38; Paste","Most descriptor sub-trees can be copied and later pasted. Copies are always deep-copies: for example if you copy a node, all the servers on this c...",""],
+["./app_dbenv.htm","Database Environment","Properties The Database Environment Properties panel offers the following fields: Name The name of the Freeze Database Environment. This name must...",""],
+["./app_descriptors.htm","Descriptors","An application definition is described using one application descriptor with a number of nested sub-descriptors (and sub-sub descriptors). The des...",""],
+["./app_editing_and_saving.htm","Editing &#38; Saving","Editing As soon as you make any update in a form, IceGrid Admin enables two buttons at the bottom of this form: Apply and Discard. If you navigate...",""],
+["./app_icebox_server.htm","IceBox Server","Properties The Properties panel for an IceBox server is identical to the Properties panel for a Plain Server . When you create a new IceBox server...",""],
+["./app_navigation.htm","Navigation","Each Application pane maintains a history of the nodes you have visited in this pane. You can navigate these nodes using the View &#62; Go Back to the...",""],
+["./app_node.htm","Node","Anode represents an IceGrid node that starts and monitors your servers. Several applications can be deployed on the same node; however a node desc...",""],
+["./app_plain_server.htm","Plain Server","Properties The Server Properties panel offers the following fields: Server ID The ID of the server; corresponds to the Ice.ServerID property. Each...",""],
+["./app_plain_service.htm","Plain Service","Properties The Service Properties panel offers the following fields: Service Name The name of the service. Must be unique within the enclosing Ice...",""],
+["./app_property_set.htm","Property Set","AProperty Set defines a set of Ice properties. IceGrid Admin supports two kinds of Property Sets: • Named Property Set, defined within an applicat...",""],
+["./app_replica__group.htm","Replica Group","Areplica group represents an abstract grouping of identical, or very similar, object adapters. An object adapter joins this group by setting this ...",""],
+["./app_server.htm","Server","Aserver represents an Ice server deployed on a node as part of an application. IceGrid supports three kinds of servers: • Plain Server : a normal ...",""],
+["./app_server_instance.htm","Server Instance","Aserver instance is a server created from a server template; it may be a plain server or an IceBox server. Properties The Server Instance Properti...",""],
+["./app_server_template.htm","Server Template","Aserver template is used to capture the common definitions of several similar or identical servers. Properties The Server Template Properties pane...",""],
+["./app_service.htm","Service","Aservice represents an IceBox service deployed on an IceBox server. IceGrid supports two kinds of services: • Plain Service : a service defined di...",""],
+["./app_service_instance.htm","Service Instance","Properties The Service Instance Properties panel offers the following fields: Template The name of the Service Template . Parameters Use this tabl...",""],
+["./app_service_template.htm","Service Template","Aservice template is used to capture the common definitions of several similar or identical services. Properties The Service Template Properties p...",""],
+["./app_variables.htm","Variables","Variables allow you to define commonly-used information once and refer to them symbolically throughout your application descriptors. Syntax Substi...",""],
+["./command_line_arguments.htm","Command-Line Arguments","IceGrid Admin can be configured using Ice properties, and like with most Ice applications, these properties can be set using command-line argument...",""],
+["./dbenv.htm","Database Environment","ADatabase Environment represents a Berkeley DB database environment, typically used for storage by the Freeze persistence service. Properties The ...",""],
+["./introduction.htm","Introduction","Everything you need to deploy IceGrid applications IceGrid Admin is a comprehensive administration tool for IceGrid. With IceGrid Admin, you can: ...",""],
+["./live_deployment.htm","Live Deployment","The Live Deployment pane shows the runtime status and configuration of an existing IceGrid deployment, and allows you to perform various administr...",""],
+["./login.htm","Login","The Login dialog allows you to connect to an IceGrid registry and retrieve information about the nodes and servers associated with this registry. ...",""],
+["./logout.htm","Logout","Use File &#62; Logout or press the button to disconnect from an IceGrid registry. This clears all information in the Live Deployment pane. Page url: h...",""],
+["./log_file_dialog.htm","Log File Dialog","The Log File dialog shows a log file (text file) retrieved through IceGrid. Often, a process will be writing to this log file and the dialog will ...",""],
+["./main_window.htm","Main Window","The main IceGrid Admin window allows to navigate between your live deployment and the definitions of several applications. Tabs The main IceGrid A...",""],
+["./node.htm","Node","Anode represents an IceGrid node process registered with the IceGrid registry. States A node can be either up () or down (). A \"down\" node is show...",""],
+["./registry.htm","Registry","The registry is the root node of the Runtime Components tree, and represents the IceGrid registry process administered by IceGrid Admin. Actions A...",""],
+["./runtime_components.htm","Runtime Components","IceGrid Admin shows the following runtime components: • Registry () Represents the IceGrid registry process with which IceGrid Admin communicates ...",""],
+["./server.htm","Server","Aserver represents an Ice server process. It can be either regular server (with typically a single Ice communicator) or an IceBox server hosting a...",""],
+["./service.htm","Service","Aservice represents an IceBox service loaded (or potentially loaded) within an IceBox server. States A service can be either started ( ) or stoppe...",""],
+["./slave_registry.htm","Slave Registry","An IceGrid deployment may use several IceGrid registry replicas, with one Master registry and a number of read-only Slave registries. Actions A sl...",""],
+["./ssl_configuration.htm","SSL Configuration","When you check Enable IceSSL in the Direct or Routed pane of the Login dialog, you need to configure the Ice-for-Java IceSSL plugin. Basic SSL Con...",""],
+["./starting_icegrid_admin.htm","Starting IceGrid Admin","In some environments, IceGrid Admin can be started by simply double-clicking on the IceGridGUI.jar file. On all platforms, you can start IceGrid A...",""],
+["./system_requirements.htm","System Requirements","IceGrid Admin is a JavaTM application supported a wide range of platforms including Windows XP, MacOS X and Linux. In order to run IceGrid Admin y...",""],
+["./welcome.htm","Welcome","Welcome to the IceGrid Admin Online Help IceGrid Admin is the graphical administration tool for IceGrid , the server-deployment and monitoring ser...",""]];
diff --git a/java/resources/IceGridAdmin/zoom_search.js b/java/resources/IceGridAdmin/zoom_search.js
index d9c53a2c685..b985599096a 100644
--- a/java/resources/IceGridAdmin/zoom_search.js
+++ b/java/resources/IceGridAdmin/zoom_search.js
@@ -1,992 +1,992 @@
-// ----------------------------------------------------------------------------

-// Zoom Search Engine 5.0 (30/4/2007)

-//

-// This file (search.js) is the JavaScript search front-end for client side

-// searches using index files created by the Zoom Search Engine Indexer.

-//

-// email: zoom@wrensoft.com

-// www: http://www.wrensoft.com

-//

-// Copyright (C) Wrensoft 2000-2007

-//

-// This script performs client-side searching with the index data file

-// (zoom_index.js) generated by the Zoom Search Engine Indexer. It allows you

-// to run searches on mediums such as CD-ROMs, or other local data, where a

-// web server is not available.

-//

-// We recommend against using client-side searches for online websites because

-// it requires the entire index data file to be downloaded onto the user's

-// local machine. This can be very slow for large websites, and our server-side

-// search scripts (available for PHP, ASP and CGI) are far better suited for this.

-// However, JavaScript is still an option for smaller websites in a limited

-// hosting situation (eg: your web host does not support PHP, ASP or CGI).

-// ----------------------------------------------------------------------------

-

-// Include required files for index data, settings, etc.

-document.write("<script language=\"JavaScript\" src=\"zoom_index.js\" charset=\"" + Charset + "\"><\/script>");

-document.write("<script language=\"JavaScript\" src=\"zoom_pageinfo.js\" charset=\"" + Charset + "\"><\/script>");

-

-document.write("<meta http-equiv=\"content-type\" content=\"text/html; charset=" + Charset + "\">");

-

-// ----------------------------------------------------------------------------

-// Settings (change if necessary)

-// ----------------------------------------------------------------------------

-

-// The options available in the dropdown menu for number of results

-// per page

-var PerPageOptions = new Array(10, 20, 50, 100);

-

-// Globals

-var SkippedWords = 0;

-var searchWords = new Array();

-var RegExpSearchWords = new Array();

-var SkippedOutputStr = "";

-

-var months = new Array('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');

-

-// Index format

-var PAGEDATA_URL = 0;

-var PAGEDATA_TITLE = 1;

-var PAGEDATA_DESC = 2;

-var PAGEDATA_IMG = 3;

-var PAGEINFO_DATETIME = 0;

-var PAGEINFO_FILESIZE = 1;

-var PAGEINFO_CAT = 2;

-

-// ----------------------------------------------------------------------------

-// Helper Functions

-// ----------------------------------------------------------------------------

-

-// This function will return the value of a GET parameter

-function getParam(paramName)

-{

-    paramStr = document.location.search;

-    if (paramStr == "")

-        return "";

-

-    // remove '?' in front of paramStr

-    if (paramStr.charAt(0) == "?")

-        paramStr = paramStr.substr(1);

-

-    arg = (paramStr.split("&"));

-    for (i=0; i < arg.length; i++) {

-        arg_values = arg[i].split("=")

-        if (unescape(arg_values[0]) == paramName) {

-            if (UseUTF8 == 1 && self.decodeURIComponent) // check if decodeURIComponent() is defined

-                ret = decodeURIComponent(arg_values[1]);

-            else

-                ret = unescape(arg_values[1]);  // IE 5.0 and older does not have decodeURI

-            return ret;

-        }

-    }

-    return "";

-}

-

-function getParamArray(paramName)

-{

-    paramStr = document.location.search;

-

-	var retArray = new Array();

-	var retCount = 0;

-

-    if (paramStr == "")

-        return retArray;

-

-    // remove '?' in front of paramStr

-    if (paramStr.charAt(0) == "?")

-        paramStr = paramStr.substr(1);

-

-    arg = (paramStr.split("&"));

-    for (i=0; i < arg.length; i++) 

-    {

-        arg_values = arg[i].split("=")

-        if (unescape(arg_values[0]) == paramName) 

-        {

-            if (UseUTF8 == 1 && self.decodeURIComponent) // check if decodeURIComponent() is defined

-                ret = decodeURIComponent(arg_values[1]);

-            else

-                ret = unescape(arg_values[1]);  // IE 5.0 and older does not have decodeURI            

-            retArray[retCount] = ret;

-            retCount++;            

-        }

-    }

-    return retArray;	

-}

-

-// Compares the two values, used for sorting output results

-// Results that match all search terms are put first, highest score

-function SortCompare (a, b)

-{

-    if (a[2] < b[2]) return 1;

-    else if (a[2] > b[2]) return -1;

-    else if (a[1] < b[1]) return 1;

-    else if (a[1] > b[1]) return -1;

-    else return 0;

-}

-

-function SortByDate(a, b)

-{	

-	if (pageinfo[a[0]][PAGEINFO_DATETIME] < pageinfo[b[0]][PAGEINFO_DATETIME]) return 1;

-	else if (pageinfo[a[0]][PAGEINFO_DATETIME] > pageinfo[b[0]][PAGEINFO_DATETIME]) return -1;

-	else return SortCompare(a, b);

-}

-

-function sw_compare(a, b)

-{

-	if (a.charAt(0) == '-') 

-		return 1;

-	

-	if (b.charAt(0) == '-') 

-		return -1;

-	

-	return 0;

-}

-

-function pattern2regexp(pattern)

-{

-    pattern = pattern.replace(/\#/g, "\\#");

-    pattern = pattern.replace(/\$/g, "\\$");

-    pattern = pattern.replace(/\./g, "\\.");

-    pattern = pattern.replace(/\*/g, "[\\d\\S]*");

-    pattern = pattern.replace(/\?/g, ".?");

-    return pattern;

-}

-

-function PrintHighlightDescription(line) 

-{

-	if (Highlighting == 0)

-	{

-		document.writeln(line);

-		return;

-	}

-		

-    res = " " + line + " ";

-    for (i = 0; i < numwords; i++) {

-        if (RegExpSearchWords[i] == "")

-            continue;

-

-        if (SearchAsSubstring == 1)

-            res = res.replace(new RegExp("("+RegExpSearchWords[i]+")", "gi"), "[;:]$1[:;]");

-        else

-            res = res.replace(new RegExp("(\\W|^|\\b)("+RegExpSearchWords[i]+")(\\W|$|\\b)", "gi"), "$1[;:]$2[:;]$3");

-    }

-    // replace the marker text with the html text

-    // this is to avoid finding previous <span>'ed text.

-    res = res.replace(/\[;:\]/g, "<span class=\"highlight\">");

-    res = res.replace(/\[:;\]/g, "</span>");

-    document.writeln(res);

-}

-

-function PrintNumResults(num)

-{

-    if (num == 0)

-        return STR_NO_RESULTS;

-    else if (num == 1)

-        return num + " " + STR_RESULT;

-    else

-        return num + " " + STR_RESULTS;

-}

-

-function AddParamToURL(url, paramStr)

-{

-	// add GET parameters to URL depending on 

-	// whether there are any existing parameters

-	if (url.indexOf("?") > -1)	

-		return url + "&amp;" + paramStr;

-	else		

-		return url + "?" + paramStr;			

-}

-

-function SkipSearchWord(sw) {

-    if (searchWords[sw] != "") {

-        if (SkippedWords > 0)

-            SkippedOutputStr += ", ";

-        SkippedOutputStr += "\"<b>" + searchWords[sw] + "</b>\"";

-        searchWords[sw] = "";

-    }

-}

-

-function wordcasecmp(word1, word2) {

-	if (word1 == word2)

-		return 0;

-	else

-		return -1;	

-}

-

-function htmlspecialchars(query) {

-	query = query.replace(/\&/g, "&#38;");

-	query = query.replace(/\</g, "&#60;");

-	query = query.replace(/\>/g, "&#62;");	

-	query = query.replace(/\"/g, "&#34;");

-	query = query.replace(/\'/g, "&#39;");

-	return query;

-}

-

-function QueryEntities(query) {	

-	query = query.replace(/\&/g, "&#38;");	

-	query = query.replace(/\</g, "&#60;");

-	query = query.replace(/\>/g, "&#62;");

-	query = query.replace(/\'/g, "&#39;");	

-	return query;

-}

-

-function FixQueryForAsianWords(query) {

-	currCharType = 0;

-	lastCharType = 0;	// 0 is normal, 1 is hiragana, 2 is katakana, 3 is "han"

-	

-	// check for hiragana/katakana splitting required

-	newquery = "";

-    for (i = 0; i < query.length; i++)

-    {

-    	ch = query.charAt(i);

-    	chVal = query.charCodeAt(i);

-    	

-    	if (chVal >= 12352 && chVal <= 12447)

-    		currCharType = 1;

-    	else if (chVal >= 12448 && chVal <= 12543)

-    		currCharType = 2;

-    	else if (chVal >= 13312 && chVal <= 44031)

-			currCharType = 3;

-    	else

-    		currCharType = 0;

-    			    	

-    	if (lastCharType != currCharType && ch != " ")

-    		newquery += " ";	    	

-    	lastCharType = currCharType;	    		

-    	newquery += ch;

-    }

-    return newquery;

-}

-

-// ----------------------------------------------------------------------------

-// Parameters initialisation (globals)

-// ----------------------------------------------------------------------------

-

-var query = getParam("zoom_query");

-query = query.replace(/[\++]/g, " ");  // replace the '+' with spaces

-SearchAsSubstring = (query == query.replace(/[\"+]/g, " "));

-query = query.replace(/[\"+]/g, " ");

-

-var per_page = parseInt(getParam("zoom_per_page"));

-if (isNaN(per_page)) per_page = 10;

-

-var page = parseInt(getParam("zoom_page"));

-if (isNaN(page)) page = 1;

-

-var andq = parseInt(getParam("zoom_and"));

-if (isNaN(andq))

-{

-	if (typeof(DefaultToAnd) != "undefined" && DefaultToAnd == 1)

-		andq = 1;

-	else

-		andq = 0;

-}

-

-var cat = getParamArray("zoom_cat[]");

-if (cat.length == 0)

-{

-	cat[0] = parseInt(getParam("zoom_cat"));

-	if (isNaN(cat))

-		cat[0] = -1;	// search all categories

-}

-var num_zoom_cats = cat.length;	

-

-

-// for sorting options. zero is default (relevance)

-// 1 is sort by date (if date/time is available)

-var sort = parseInt(getParam("zoom_sort"));

-if (isNaN(sort)) sort = 0;

-

-var SelfURL = "";

-if (typeof(LinkBackURL) == "undefined")

-{

-    SelfURL = document.location.href;

-    // strip off parameters and anchors

-    var paramIndex;

-    paramIndex = SelfURL.indexOf("?");    

-    if (paramIndex > -1)

-        SelfURL = SelfURL.substr(0, paramIndex);

-    paramIndex = SelfURL.indexOf("#");

-    if (paramIndex > -1)

-        SelfURL = SelfURL.substr(0, paramIndex);        

-}

-else

-    SelfURL = LinkBackURL;

-// encode invalid URL characters

-SelfURL = SelfURL.replace(/\</g, "&lt;");

-SelfURL = SelfURL.replace(/\"/g, "&quot;");

-

-var data = new Array();

-var output = new Array();

-

-target = "";

-if (UseLinkTarget == 1)

-    target = " target=\"" + LinkTarget + "\" ";

-

-// ----------------------------------------------------------------------------

-// Main search function starts here

-// ----------------------------------------------------------------------------

-

-function ZoomSearch() 

-{

-        var loadingmsg = document.getElementById("loadingmsg");

-        if (loadingmsg) loadingmsg.style.display = "None";

-	if (UseCats)

-		NumCats = catnames.length;

-

-    if (Timing == 1) {

-        timeStart = new Date();

-    }        

-		

-    // Display the form

-    if (FormFormat > 0) {

-        document.writeln("<form method=\"get\" action=\"" + SelfURL + "\" class=\"zoom_searchform\">");

-        document.writeln("<input type=\"text\" name=\"zoom_query\" size=\"20\" value=\"" + htmlspecialchars(query) + "\" class=\"zoom_searchbox\" />");

-        document.writeln("<input type=\"submit\" value=\"" + STR_FORM_SUBMIT_BUTTON + "\" class=\"zoom_button\" /><br />");

-        if (FormFormat == 2) {

-            document.writeln("<span class=\"zoom_results_per_page\">" + STR_FORM_RESULTS_PER_PAGE + "\n");

-            document.writeln("<select name=\"zoom_per_page\">");

-            for (i = 0; i < PerPageOptions.length; i++) {

-                document.write("<option");

-                if (PerPageOptions[i] == per_page)

-                    document.write(" selected=\"selected\"");

-                document.writeln(">" + PerPageOptions[i] + "</option>");

-            }

-            document.writeln("</select><br /><br /></span>");

-            if (UseCats) {

-            	document.writeln("<span class=\"zoom_categories\">");

-                document.write(STR_FORM_CATEGORY + " ");

-                if (SearchMultiCats)

-                {                                                	

-	        		document.writeln("<ul>");

-	        		document.write("<li><input type=\"checkbox\" name=\"zoom_cat[]\" value=\"-1\"");

-	        		if (cat[0] == -1)

-		        		document.write(" checked=\"checked\"");

-		        	document.writeln(">" + STR_FORM_CATEGORY_ALL + "</input></li>");        		        		

-	        		for (i = 0; i < NumCats; i++)  

-	        		{      		

-	        			document.write("<li><input type=\"checkbox\" name=\"zoom_cat[]\" value=\"" +i+ "\"");

-	        			if (cat[0] != -1)

-	        			{

-		        			for (catit = 0; catit < num_zoom_cats; catit++)

-		        			{

-		        				if (i == cat[catit])

-		        				{

-		        					document.write(" checked=\"checked\"");

-		        					break;

-		        				}

-		        			}

-		        		}

-	        			document.writeln(">"+catnames[i]+"</input></li>");

-	        		}

-	        		document.writeln("</ul><br /><br />");

-                }

-                else

-                {                		

-	                document.write("<select name='zoom_cat[]'>");

-	                // 'all cats option

-	                document.write("<option value=\"-1\">" + STR_FORM_CATEGORY_ALL + "</option>");

-	                for (i = 0; i < NumCats; i++) {

-	                    document.write("<option value=\"" + i + "\"");

-	                    if (i == cat[0])

-	                        document.write(" selected=\"selected\"");

-	                    document.writeln(">" + catnames[i] + "</option>");

-	                }

-	                document.writeln("</select>&nbsp;&nbsp;");

-	            }

-	            document.writeln("</span>");

-            }

-            document.writeln("<span class=\"zoom_match\">" + STR_FORM_MATCH + " ");

-            if (andq == 0) {

-                document.writeln("<input type=\"radio\" name=\"zoom_and\" value=\"0\" checked=\"checked\" />" + STR_FORM_ANY_SEARCH_WORDS);

-                document.writeln("<input type=\"radio\" name=\"zoom_and\" value=\"1\" />" + STR_FORM_ALL_SEARCH_WORDS);                                

-            } else {

-                document.writeln("<input type=\"radio\" name=\"zoom_and\" value=\"0\" />" + STR_FORM_ANY_SEARCH_WORDS);

-                document.writeln("<input type=\"radio\" name=\"zoom_and\" value=\"1\" checked=\"checked\" />" + STR_FORM_ALL_SEARCH_WORDS);                

-            }

-            document.writeln("<input type=\"hidden\" name=\"zoom_sort\" value=\"" + sort + "\" />");

-            document.writeln("<br /><br /></span>");

-        }

-        else

-        {

-        	document.writeln("<input type=\"hidden\" name=\"zoom_per_page\" value=\"" + per_page + "\" />");

-        	document.writeln("<input type=\"hidden\" name=\"zoom_and\" value=\"" + andq + "\" />");

-        	document.writeln("<input type=\"hidden\" name=\"zoom_sort\" value=\"" + sort + "\" />");

-        }

-        

-        document.writeln("</form>");

-    }

-

-    // give up early if no search words provided

-    if (query.length == 0) {

-        //document.writeln("No search query entered.<br />");        

-        if (ZoomInfo == 1)

-            document.writeln("<center><p><small>" + STR_POWEREDBY + " <a href=\"http://www.wrensoft.com/zoom/\" target=\"_blank\"><b>Zoom Search Engine</b></a></small></p></center>");

-        return;

-    }

-

-    if (MapAccents == 1) {

-        for (i = 0; i < NormalChars.length; i++) {

-            query = query.replace(AccentChars[i], NormalChars[i]);

-        }

-    }

-

-	// Special query processing required when SearchAsSubstring is enabled

-	if (SearchAsSubstring == 1 && UseUTF8 == 1)

-		query = FixQueryForAsianWords(query);

-

-    // prepare search query, strip quotes, trim whitespace

-    if (WordJoinChars.indexOf(".") == -1)

-        query = query.replace(/[\.+]/g, " ");

-

-    if (WordJoinChars.indexOf("-") == -1)

-        query = query.replace(/(\S)\-/g, "$1 ");

-

-    if (WordJoinChars.indexOf("_") == -1)

-        query = query.replace(/[\_+]/g, " ");

-

-    if (WordJoinChars.indexOf("'") == -1)

-        query = query.replace(/[\'+]/g, " ");

-

-    if (WordJoinChars.indexOf("#") == -1)

-        query = query.replace(/[\#+]/g, " ");

-

-    if (WordJoinChars.indexOf("$") == -1)

-        query = query.replace(/[\$+]/g, " ");

-

-    if (WordJoinChars.indexOf("&") == -1)

-        query = query.replace(/[\&+]/g, " ");

-

-    if (WordJoinChars.indexOf(":") == -1)

-        query = query.replace(/[\:+]/g, " ");

-

-    if (WordJoinChars.indexOf(",") == -1)

-    	query = query.replace(/[\,+]/g, " ");

-

-    if (WordJoinChars.indexOf("/") == -1)

-    	query = query.replace(/[\/+]/g, " ");

-

-    if (WordJoinChars.indexOf("\\") == -1)

-    	query = query.replace(/[\\+]/g, " ");

-    	

-    // substitute multiple whitespace chars to single character

-    // also strip any of the wordjoinchars if followed immediately by a space

-    query = query.replace(/[\s\(\)\^\[\]\|\+\{\}\%]+|[\-._',:&\/\\\\](\s|$)/g, " ");   

-    

-    // trim trailing/leading whitespace

-    query = query.replace(/^\s*|\s*$/g,""); 

-    

-    var queryForHTML = htmlspecialchars(query);

-    var queryForSearch;

-    if (ToLowerSearchWords == 1)

-        queryForSearch = query.toLowerCase();

-    else

-    	queryForSearch = query;    

-    queryForSearch = htmlspecialchars(queryForSearch);    

-

-    // split search phrase into words

-    searchWords = queryForSearch.split(" "); // split by spaces.

-    

-    // Sort search words if there are negative signs

-    if (queryForSearch.indexOf("-") != -1)

-    	searchWords.sort(sw_compare);      

-

-	var query_zoom_cats = "";

-

-    document.write("<div class=\"searchheading\">" + STR_RESULTS_FOR + " " + queryForHTML);

-    if (UseCats) {

-        if (cat[0] == -1)

-        {

-            document.writeln(" " + STR_RESULTS_IN_ALL_CATEGORIES);

-            query_zoom_cats = "&amp;zoom_cat%5B%5D=-1";

-        }

-        else

-        {

-            document.writeln(" " + STR_RESULTS_IN_CATEGORY + " ");

-            for (catit = 0; catit < num_zoom_cats; catit++)

-            {

-            	if (catit > 0)

-            		document.write(", ");

-            	document.write("\"" + catnames[cat[catit]] + "\"");

-            	query_zoom_cats += "&amp;zoom_cat%5B%5D="+cat[catit];

-            }

-        }

-    }

-    document.writeln("<br /><br /></div>");

-

-    document.writeln("<div class=\"results\">");

-

-    numwords = searchWords.length;

-    kw_ptr = 0;

-    outputline = 0;    

-    ipage = 0;

-    matches = 0;

-    var SWord;

-    pagesCount = pageinfo.length;

-    

-    exclude_count = 0;

-    ExcludeTerm = 0;

-    

-    // Initialise a result table the size of all pages

-    res_table = new Array(pagesCount);

-    for (i = 0; i < pagesCount; i++)

-    {

-        res_table[i] = new Array(3);

-        res_table[i][0] = 0;

-        res_table[i][1] = 0;

-        res_table[i][2] = 0;

-    }

-    

-    var UseWildCards = new Array(numwords);    

-        

-    for (sw = 0; sw < numwords; sw++) {

-

-    	UseWildCards[sw] = 0;

-

-    	if (skipwords) {

-            // check min length

-            if (searchWords[sw].length < MinWordLen) {

-                SkipSearchWord(sw);

-                continue;

-            }

-            // check skip word list

-            for (i = 0; i < skipwords.length; i++) {

-                if (searchWords[sw] == skipwords[i]) {

-                    SkipSearchWord(sw);

-                    break;

-                }

-            }

-        }

-

-        if (searchWords[sw].indexOf("*") == -1 && searchWords[sw].indexOf("?") == -1) {

-            UseWildCards[sw] = 0;

-        } else {

-            UseWildCards[sw] = 1;

-            RegExpSearchWords[sw] = pattern2regexp(searchWords[sw]);

-        }

-        

-        if (Highlighting == 1 && UseWildCards[sw] == 0)

-        	RegExpSearchWords[sw] = searchWords[sw];        	    	

-    }

-                   

-    // Begin searching...

-    for (sw = 0; sw < numwords; sw++) {

-

-        if (searchWords[sw] == "") {

-        	SkippedWords++;

-            continue;

-        }

-

-		if (searchWords[sw].charAt(0) == '-')

-		{			

-			searchWords[sw] = searchWords[sw].substr(1);			

-			ExcludeTerm = 1;

-			exclude_count++;			

-		}

-		

-		if (UseWildCards[sw] == 1) {            

-            if (SearchAsSubstring == 0)

-                pattern = "^" + RegExpSearchWords[sw] + "$";

-            else

-                pattern = RegExpSearchWords[sw];

-            re = new RegExp(pattern, "g");

-        }

-

-        for (kw_ptr = 0; kw_ptr < dictwords.length; kw_ptr++) {

-

-            data = dictwords[kw_ptr].split(" ");

-

-            if (UseWildCards[sw] == 0) {

-                if (SearchAsSubstring == 0)

-                    match_result = wordcasecmp(data[0], searchWords[sw]);

-                else

-                    match_result = data[0].indexOf(searchWords[sw]);

-            } else

-                match_result = data[0].search(re);

-

-

-            if (match_result != -1) {

-                // keyword found, include it in the output list

-                for (kw = 1; kw < data.length; kw += 2) {

-                    // check if page is already in output list

-                    pageexists = 0;

-                    ipage = data[kw];

-                    

-                    if (ExcludeTerm == 1)

-                    {

-                    	// we clear out the score entry so that it'll be excluded in the filter stage

-                    	res_table[ipage][0] = 0;

-                    }                    

-                    else if (res_table[ipage][0] == 0) {

-                        matches++;

-                        res_table[ipage][0] += parseInt(data[kw+1]);

-                    }

-                    else {

-

-                        if (res_table[ipage][0] > 10000) {

-                            // take it easy if its too big to prevent gigantic scores

-                            res_table[ipage][0] += 1;

-                        } else {

-                            res_table[ipage][0] += parseInt(data[kw+1]); // add in score

-                            res_table[ipage][0] *= 2;           // double score as we have two words matching

-                        }

-                    }

-                    res_table[ipage][1] += 1;

-                    // store the 'and' user search terms matched' value

-                    if (res_table[ipage][2] == sw || res_table[ipage][2] == sw-SkippedWords-exclude_count)

-                        res_table[ipage][2] += 1;

-

-                }

-                if (UseWildCards[sw] == 0 && SearchAsSubstring == 0)

-                    break;    // this search word was found, so skip to next

-            }

-        }

-	}

-    

-    if (SkippedWords > 0)

-        document.writeln("<div class=\"summary\">" + STR_SKIPPED_FOLLOWING_WORDS + " " + SkippedOutputStr + ".<br /><br /></div>");

-

-    // Count number of output lines that match ALL search terms

-    oline = 0;

-    fullmatches = 0;    

-    output = new Array();

-    var full_numwords = numwords - SkippedWords - exclude_count;

-    for (i = 0; i < pagesCount; i++) {

-        IsFiltered = false;

-        if (res_table[i][0] > 0) {

-            if (UseCats && cat[0] != -1) {

-                // using cats and not doing an "all cats" search

-                if (SearchMultiCats) {

-                	for (cati = 0; cati < num_zoom_cats; cati++) {                		

-                		if (pageinfo[i][PAGEINFO_CAT].charAt(cat[cati]) == "1")

-                			break;

-                	}

-                	if (cati == num_zoom_cats)

-                		IsFiltered = true;

-                }

-                else {                		                

-	                if (pageinfo[i][PAGEINFO_CAT].charAt(cat[0]) == "0") {

-	                    IsFiltered = true;

-	                }

-	            }

-            }

-            if (IsFiltered == false) {

-                if (res_table[i][2] >= full_numwords) {

-                    fullmatches++;

-                } else {

-                    if (andq == 1)

-                        IsFiltered = true;

-                }

-            }

-            if (IsFiltered == false) {

-                // copy if not filtered out

-                output[oline] = new Array(3);

-                output[oline][0] = i;

-                output[oline][1] = res_table[i][0];

-                output[oline][2] = res_table[i][1];

-                oline++;

-            }

-        }

-    }

-    matches = oline;    

-

-    // Sort results in order of score, use "SortCompare" function

-    if (matches > 1)    

-   	{

-   		if (sort == 1 && UseDateTime == 1)

-   			output.sort(SortByDate);	// sort by date

-   		else

-        	output.sort(SortCompare);	// sort by relevance

-    }

-    

-    // prepare queryForURL

-    var queryForURL = query.replace(/\s/g, "+");

-	if (UseUTF8 == 1 && self.encodeURIComponent)

-    	queryForURL = encodeURIComponent(queryForURL);

-	else

-    	queryForURL = escape(queryForURL);    

-

-    //Display search result information

-    document.writeln("<div class=\"summary\">");

-    if (matches == 0)

-        document.writeln(STR_SUMMARY_NO_RESULTS_FOUND + "<br />");

-    else if (numwords > 1 && andq == 0) {

-        //OR

-        SomeTermMatches = matches - fullmatches;

-        document.writeln(PrintNumResults(fullmatches) + " " + STR_SUMMARY_FOUND_CONTAINING_ALL_TERMS + " ");

-        if (SomeTermMatches > 0)

-            document.writeln(PrintNumResults(SomeTermMatches) + " " + STR_SUMMARY_FOUND_CONTAINING_SOME_TERMS);

-        document.writeln("<br />");

-    }

-    else if (numwords > 1 && andq == 1) //AND

-        document.writeln(PrintNumResults(fullmatches) + " " + STR_SUMMARY_FOUND_CONTAINING_ALL_TERMS + "<br />");

-    else

-        document.writeln(PrintNumResults(matches) + " " + STR_SUMMARY_FOUND + "<br />");

-

-    document.writeln("</div>\n");

-

-    // number of pages of results

-    num_pages = Math.ceil(matches / per_page);

-    if (num_pages > 1)

-        document.writeln("<div class=\"result_pagescount\"><br />" + num_pages + " " + STR_PAGES_OF_RESULTS + "</div>\n");

-        

-    // Show recommended links if any

-    if (Recommended == 1)

-    {

-    	num_recs_found = 0;

-    	rec_count = recommended.length;

-    	for (rl = 0; rl < rec_count && num_recs_found < RecommendedMax; rl++)

-    	{

-    		sep = recommended[rl].lastIndexOf(" ");

-    		if (sep > -1)

-    		{

-    			rec_word = recommended[rl].slice(0, sep);

-    			rec_idx = parseInt(recommended[rl].slice(sep));

-				for (sw = 0; sw <= numwords; sw++)	

-				{

-					if (sw == numwords)

-					{

-						match_result = wordcasecmp(rec_word, queryForSearch);

-					}

-					else

-					{

-						if (UseWildCards[sw] == 1)

-						{

-				            if (SearchAsSubstring == 0)

-				                pattern = "^" + RegExpSearchWords[sw] + "$";

-				            else

-				                pattern = RegExpSearchWords[sw];

-				            re = new RegExp(pattern, "g");

-				            match_result = rec_word.search(re);							

-						}

-						else if (SearchAsSubstring == 0)

-						{

-							match_result = wordcasecmp(rec_word, searchWords[sw]);

-						}

-						else

-							match_result = rec_word.indexOf(searchWords[sw]);

-					}

-					if (match_result != -1)

-					{

-						if (num_recs_found == 0)

-						{

-							document.writeln("<div class=\"recommended\">");

-							document.writeln("<div class=\"recommended_heading\">" + STR_RECOMMENDED + "</div>");

-						}

-						pgurl = pagedata[rec_idx][PAGEDATA_URL];

-						pgtitle = pagedata[rec_idx][PAGEDATA_TITLE];

-						pgdesc = pagedata[rec_idx][PAGEDATA_DESC];

-				        urlLink = pgurl;				        

-				    	if (GotoHighlight == 1)				

-				    	{

-				    		if (SearchAsSubstring == 1)

-				    			urlLink = AddParamToURL(urlLink, "zoom_highlightsub=" + queryForURL);

-				    		else

-				    			urlLink = AddParamToURL(urlLink, "zoom_highlight=" + queryForURL);

-						}			

-					    if (PdfHighlight == 1)

-					    {

-					    	if (urlLink.indexOf(".pdf") != -1)

-					    		urlLink = urlLink+"#search=&quot;"+query+"&quot;";

-					    } 						

-						document.writeln("<div class=\"recommend_block\">");

-						document.writeln("<div class=\"recommend_title\">");

-			       		document.writeln("<a href=\"" + urlLink + "\"" + target + ">");

-			       		if (pgtitle.length > 1)

-			       			PrintHighlightDescription(pgtitle);

-			       		else

-			       			PrintHighlightDescription(pgurl);

-			       		document.writeln("</a></div>");					       		

-			       		document.writeln("<div class=\"recommend_description\">")

-			       		PrintHighlightDescription(pgdesc);

-			       		document.writeln("</div>");			       		

-			       		document.writeln("<div class=\"recommend_infoline\">" + pgurl + "</div>");

-			       		document.writeln("</div>");

-			       		num_recs_found++;			       		

-			       		break;				

-					}

-				}    			

-    		}

-    	}

-    	if (num_recs_found > 0)

-    		document.writeln("</div");

-    }

-    

-    // Show sorting options

-    if (matches > 1)

-    {

-    	if (UseDateTime == 1)

-    	{

-    		document.writeln("<div class=\"sorting\">");

-    		if (sort == 1)

-				document.writeln("<a href=\"" + SelfURL + "?zoom_query=" + queryForURL + "&amp;zoom_page=" + page + "&amp;zoom_per_page=" + per_page + query_zoom_cats + "&amp;zoom_and=" + andq + "&amp;zoom_sort=0\">" + STR_SORTBY_RELEVANCE + "</a> / <b>" + STR_SORTEDBY_DATE + "</b>");

-			else

-				document.writeln("<b>" + STR_SORTEDBY_RELEVANCE + "</b> / <a href=\"" + SelfURL + "?zoom_query=" + queryForURL + "&amp;zoom_page=" + page + "&amp;zoom_per_page=" + per_page + query_zoom_cats + "&amp;zoom_and=" + andq + "&amp;zoom_sort=1\">" + STR_SORTBY_DATE + "</a>");

-			document.writeln("</div>");

-    	}    	

-    }    

-

-    // determine current line of result from the output array

-    if (page == 1) {

-        arrayline = 0;

-    } else {

-        arrayline = ((page - 1) * per_page);

-    }

-

-    // the last result to show on this page

-    result_limit = arrayline + per_page;

-

-    // display the results

-    while (arrayline < matches && arrayline < result_limit) {

-        ipage = output[arrayline][0];

-        score = output[arrayline][1];

-        

-		pgurl = pagedata[ipage][PAGEDATA_URL];

-		pgtitle = pagedata[ipage][PAGEDATA_TITLE];

-		pgdesc = pagedata[ipage][PAGEDATA_DESC];

-		pgimage = pagedata[ipage][PAGEDATA_IMG];		

-		pgdate = pageinfo[ipage][PAGEINFO_DATETIME];

-		filesize = pageinfo[ipage][PAGEINFO_FILESIZE];

-		filesize = Math.ceil(filesize / 1024);

-		if (filesize < 1)

-			filesize = 1;

-		catpage = pageinfo[ipage][PAGEINFO_CAT];

-		

-        urlLink = pgurl;				                        

-    	if (GotoHighlight == 1)				

-    	{

-    		if (SearchAsSubstring == 1)

-    			urlLink = AddParamToURL(urlLink, "zoom_highlightsub=" + queryForURL);

-    		else

-    			urlLink = AddParamToURL(urlLink, "zoom_highlight=" + queryForURL);

-		}		

-	    if (PdfHighlight == 1)

-	    {

-	    	if (urlLink.indexOf(".pdf") != -1)

-	    		urlLink = urlLink+"#search=&quot;"+query+"&quot;";

-	    } 

-                

-	    if (arrayline % 2 == 0)

-    		document.writeln("<div class=\"result_block\">");

-    	else

-    		document.writeln("<div class=\"result_altblock\">");

-    	

-	    if (UseZoomImage == 1)

-	    {	    	

-	    	if (pgimage.length > 1)

-	    	{

-	    		document.writeln("<div class=\"result_image\">");    		

-	    		document.writeln("<a href=\"" + urlLink + "\"" + target + "><img src=\"" + pgimage + "\" class=\"result_image\"></a>");

-	    		document.writeln("</div>");

-	    	}

-	    }

-    		                

-        document.writeln("<div class=\"result_title\">");

-        if (DisplayNumber == 1)

-        	document.writeln("<b>" + (arrayline+1) + ".</b>&nbsp;");

-        	

-        if (DisplayTitle == 1)

-        {

-       		document.writeln("<a href=\"" + urlLink + "\"" + target + ">");

-			PrintHighlightDescription(pgtitle);

-       		document.writeln("</a>");

-        }        

-        else

-        	document.writeln("<a href=\"" + urlLink + "\"" + target + ">" + pgurl + "</a>");

-                   

-        if (UseCats) 

-        {        	

-            document.write("<span class=\"category\">");

-            for (cati = 0; cati < NumCats; cati++)

-            {

-            	if (catpage.charAt(cati) == "1")

-            		document.write(" ["+catnames[cati]+"]");

-            }             

-            document.writeln("</span>");

-        }

-        document.writeln("</div>");

-        

-        if (DisplayMetaDesc == 1)

-        {

-        	// print meta description

-            document.writeln("<div class=\"description\">");            

-            PrintHighlightDescription(pgdesc);

-            document.writeln("</div>\n");

-        }

-        

-        info_str = "";

-        

-        if (DisplayTerms == 1)

-        	info_str += STR_RESULT_TERMS_MATCHED + " " + output[arrayline][2];

-        	

-        if (DisplayScore == 1) {

-        	if (info_str.length > 0)

-        		info_str += "&nbsp; - &nbsp;";

-        	info_str += STR_RESULT_SCORE + " " + score;

-        }

-        

-        if (DisplayDate == 1 && pgdate > 0) 

-        {

-        	datetime = new Date(pgdate*1000);

-        	if (info_str.length > 0)

-        		info_str += "&nbsp; - &nbsp;";

-        	info_str += datetime.getDate() + " " + months[datetime.getMonth()] + " " + datetime.getFullYear();

-        }

-        

-        if (DisplayFilesize == 1) {

-        	if (info_str.length > 0)

-        		info_str += "&nbsp; - &nbsp;";

-        	info_str += filesize + "k";

-        }        

-             

-        if (DisplayURL == 1) {

-        	if (info_str.length > 0)

-        		info_str += "&nbsp; - &nbsp;";

-			info_str += STR_RESULT_URL + " " + pgurl;

-        }

-                   

-        document.writeln("<div class=\"infoline\">");

-        document.writeln(info_str);                        

-        document.writeln("</div></div>\n");

-        arrayline++;

-    }

-

-    // Show links to other result pages

-    if (num_pages > 1) {

-        // 10 results to the left of the current page

-        start_range = page - 10;

-        if (start_range < 1)

-            start_range = 1;

-

-        // 10 to the right

-        end_range = page + 10;

-        if (end_range > num_pages)

-            end_range = num_pages;

-

-        document.writeln("<div class=\"result_pages\">" + STR_RESULT_PAGES + " ");

-        if (page > 1)

-            document.writeln("<a href=\"" + SelfURL + "?zoom_query=" + queryForURL + "&amp;zoom_page=" + (page-1) + "&amp;zoom_per_page=" + per_page + query_zoom_cats + "&amp;zoom_and=" + andq + "&amp;zoom_sort=" + sort + "\">&lt;&lt; " + STR_RESULT_PAGES_PREVIOUS + "</a> ");

-        for (i = start_range; i <= end_range; i++) 

-        {

-            if (i == page)

-                document.writeln(page + " ");

-            else

-                document.writeln("<a href=\"" + SelfURL + "?zoom_query=" + queryForURL + "&amp;zoom_page=" + i + "&amp;zoom_per_page=" + per_page + query_zoom_cats + "&amp;zoom_and=" + andq + "&amp;zoom_sort=" + sort + "\">" + i + "</a> ");            

-        }

-        if (page != num_pages)

-            document.writeln("<a href=\"" + SelfURL + "?zoom_query=" + queryForURL + "&amp;zoom_page=" + (page+1) + "&amp;zoom_per_page=" + per_page + query_zoom_cats + "&amp;zoom_and=" + andq + "&amp;zoom_sort=" + sort + "\">" + STR_RESULT_PAGES_NEXT + " &gt;&gt;</a> ");

-        document.writeln("</div>");

-    }

-

-    document.writeln("</div>"); // end results style tag

-

-    if (Timing == 1) {

-        timeEnd = new Date();

-        timeDifference = timeEnd - timeStart;

-        document.writeln("<div class=\"searchtime\"><br /><br />" + STR_SEARCH_TOOK + " " + (timeDifference/1000) + " " + STR_SECONDS + ".</div>\n");

-    }

-

-    if (ZoomInfo == 1)

-        document.writeln("<center><p><small>" + STR_POWEREDBY + " <a href=\"http://www.wrensoft.com/zoom/\" target=\"_blank\"><b>Zoom Search Engine</b></a></small></p></center>");

-}

-

+// ----------------------------------------------------------------------------
+// Zoom Search Engine 5.0 (30/4/2007)
+//
+// This file (search.js) is the JavaScript search front-end for client side
+// searches using index files created by the Zoom Search Engine Indexer.
+//
+// email: zoom@wrensoft.com
+// www: http://www.wrensoft.com
+//
+// Copyright (C) Wrensoft 2000-2007
+//
+// This script performs client-side searching with the index data file
+// (zoom_index.js) generated by the Zoom Search Engine Indexer. It allows you
+// to run searches on mediums such as CD-ROMs, or other local data, where a
+// web server is not available.
+//
+// We recommend against using client-side searches for online websites because
+// it requires the entire index data file to be downloaded onto the user's
+// local machine. This can be very slow for large websites, and our server-side
+// search scripts (available for PHP, ASP and CGI) are far better suited for this.
+// However, JavaScript is still an option for smaller websites in a limited
+// hosting situation (eg: your web host does not support PHP, ASP or CGI).
+// ----------------------------------------------------------------------------
+
+// Include required files for index data, settings, etc.
+document.write("<script language=\"JavaScript\" src=\"zoom_index.js\" charset=\"" + Charset + "\"><\/script>");
+document.write("<script language=\"JavaScript\" src=\"zoom_pageinfo.js\" charset=\"" + Charset + "\"><\/script>");
+
+document.write("<meta http-equiv=\"content-type\" content=\"text/html; charset=" + Charset + "\">");
+
+// ----------------------------------------------------------------------------
+// Settings (change if necessary)
+// ----------------------------------------------------------------------------
+
+// The options available in the dropdown menu for number of results
+// per page
+var PerPageOptions = new Array(10, 20, 50, 100);
+
+// Globals
+var SkippedWords = 0;
+var searchWords = new Array();
+var RegExpSearchWords = new Array();
+var SkippedOutputStr = "";
+
+var months = new Array('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
+
+// Index format
+var PAGEDATA_URL = 0;
+var PAGEDATA_TITLE = 1;
+var PAGEDATA_DESC = 2;
+var PAGEDATA_IMG = 3;
+var PAGEINFO_DATETIME = 0;
+var PAGEINFO_FILESIZE = 1;
+var PAGEINFO_CAT = 2;
+
+// ----------------------------------------------------------------------------
+// Helper Functions
+// ----------------------------------------------------------------------------
+
+// This function will return the value of a GET parameter
+function getParam(paramName)
+{
+    paramStr = document.location.search;
+    if (paramStr == "")
+        return "";
+
+    // remove '?' in front of paramStr
+    if (paramStr.charAt(0) == "?")
+        paramStr = paramStr.substr(1);
+
+    arg = (paramStr.split("&"));
+    for (i=0; i < arg.length; i++) {
+        arg_values = arg[i].split("=")
+        if (unescape(arg_values[0]) == paramName) {
+            if (UseUTF8 == 1 && self.decodeURIComponent) // check if decodeURIComponent() is defined
+                ret = decodeURIComponent(arg_values[1]);
+            else
+                ret = unescape(arg_values[1]);  // IE 5.0 and older does not have decodeURI
+            return ret;
+        }
+    }
+    return "";
+}
+
+function getParamArray(paramName)
+{
+    paramStr = document.location.search;
+
+	var retArray = new Array();
+	var retCount = 0;
+
+    if (paramStr == "")
+        return retArray;
+
+    // remove '?' in front of paramStr
+    if (paramStr.charAt(0) == "?")
+        paramStr = paramStr.substr(1);
+
+    arg = (paramStr.split("&"));
+    for (i=0; i < arg.length; i++) 
+    {
+        arg_values = arg[i].split("=")
+        if (unescape(arg_values[0]) == paramName) 
+        {
+            if (UseUTF8 == 1 && self.decodeURIComponent) // check if decodeURIComponent() is defined
+                ret = decodeURIComponent(arg_values[1]);
+            else
+                ret = unescape(arg_values[1]);  // IE 5.0 and older does not have decodeURI            
+            retArray[retCount] = ret;
+            retCount++;            
+        }
+    }
+    return retArray;	
+}
+
+// Compares the two values, used for sorting output results
+// Results that match all search terms are put first, highest score
+function SortCompare (a, b)
+{
+    if (a[2] < b[2]) return 1;
+    else if (a[2] > b[2]) return -1;
+    else if (a[1] < b[1]) return 1;
+    else if (a[1] > b[1]) return -1;
+    else return 0;
+}
+
+function SortByDate(a, b)
+{	
+	if (pageinfo[a[0]][PAGEINFO_DATETIME] < pageinfo[b[0]][PAGEINFO_DATETIME]) return 1;
+	else if (pageinfo[a[0]][PAGEINFO_DATETIME] > pageinfo[b[0]][PAGEINFO_DATETIME]) return -1;
+	else return SortCompare(a, b);
+}
+
+function sw_compare(a, b)
+{
+	if (a.charAt(0) == '-') 
+		return 1;
+	
+	if (b.charAt(0) == '-') 
+		return -1;
+	
+	return 0;
+}
+
+function pattern2regexp(pattern)
+{
+    pattern = pattern.replace(/\#/g, "\\#");
+    pattern = pattern.replace(/\$/g, "\\$");
+    pattern = pattern.replace(/\./g, "\\.");
+    pattern = pattern.replace(/\*/g, "[\\d\\S]*");
+    pattern = pattern.replace(/\?/g, ".?");
+    return pattern;
+}
+
+function PrintHighlightDescription(line) 
+{
+	if (Highlighting == 0)
+	{
+		document.writeln(line);
+		return;
+	}
+		
+    res = " " + line + " ";
+    for (i = 0; i < numwords; i++) {
+        if (RegExpSearchWords[i] == "")
+            continue;
+
+        if (SearchAsSubstring == 1)
+            res = res.replace(new RegExp("("+RegExpSearchWords[i]+")", "gi"), "[;:]$1[:;]");
+        else
+            res = res.replace(new RegExp("(\\W|^|\\b)("+RegExpSearchWords[i]+")(\\W|$|\\b)", "gi"), "$1[;:]$2[:;]$3");
+    }
+    // replace the marker text with the html text
+    // this is to avoid finding previous <span>'ed text.
+    res = res.replace(/\[;:\]/g, "<span class=\"highlight\">");
+    res = res.replace(/\[:;\]/g, "</span>");
+    document.writeln(res);
+}
+
+function PrintNumResults(num)
+{
+    if (num == 0)
+        return STR_NO_RESULTS;
+    else if (num == 1)
+        return num + " " + STR_RESULT;
+    else
+        return num + " " + STR_RESULTS;
+}
+
+function AddParamToURL(url, paramStr)
+{
+	// add GET parameters to URL depending on 
+	// whether there are any existing parameters
+	if (url.indexOf("?") > -1)	
+		return url + "&amp;" + paramStr;
+	else		
+		return url + "?" + paramStr;			
+}
+
+function SkipSearchWord(sw) {
+    if (searchWords[sw] != "") {
+        if (SkippedWords > 0)
+            SkippedOutputStr += ", ";
+        SkippedOutputStr += "\"<b>" + searchWords[sw] + "</b>\"";
+        searchWords[sw] = "";
+    }
+}
+
+function wordcasecmp(word1, word2) {
+	if (word1 == word2)
+		return 0;
+	else
+		return -1;	
+}
+
+function htmlspecialchars(query) {
+	query = query.replace(/\&/g, "&#38;");
+	query = query.replace(/\</g, "&#60;");
+	query = query.replace(/\>/g, "&#62;");	
+	query = query.replace(/\"/g, "&#34;");
+	query = query.replace(/\'/g, "&#39;");
+	return query;
+}
+
+function QueryEntities(query) {	
+	query = query.replace(/\&/g, "&#38;");	
+	query = query.replace(/\</g, "&#60;");
+	query = query.replace(/\>/g, "&#62;");
+	query = query.replace(/\'/g, "&#39;");	
+	return query;
+}
+
+function FixQueryForAsianWords(query) {
+	currCharType = 0;
+	lastCharType = 0;	// 0 is normal, 1 is hiragana, 2 is katakana, 3 is "han"
+	
+	// check for hiragana/katakana splitting required
+	newquery = "";
+    for (i = 0; i < query.length; i++)
+    {
+    	ch = query.charAt(i);
+    	chVal = query.charCodeAt(i);
+    	
+    	if (chVal >= 12352 && chVal <= 12447)
+    		currCharType = 1;
+    	else if (chVal >= 12448 && chVal <= 12543)
+    		currCharType = 2;
+    	else if (chVal >= 13312 && chVal <= 44031)
+			currCharType = 3;
+    	else
+    		currCharType = 0;
+    			    	
+    	if (lastCharType != currCharType && ch != " ")
+    		newquery += " ";	    	
+    	lastCharType = currCharType;	    		
+    	newquery += ch;
+    }
+    return newquery;
+}
+
+// ----------------------------------------------------------------------------
+// Parameters initialisation (globals)
+// ----------------------------------------------------------------------------
+
+var query = getParam("zoom_query");
+query = query.replace(/[\++]/g, " ");  // replace the '+' with spaces
+SearchAsSubstring = (query == query.replace(/[\"+]/g, " "));
+query = query.replace(/[\"+]/g, " ");
+
+var per_page = parseInt(getParam("zoom_per_page"));
+if (isNaN(per_page)) per_page = 10;
+
+var page = parseInt(getParam("zoom_page"));
+if (isNaN(page)) page = 1;
+
+var andq = parseInt(getParam("zoom_and"));
+if (isNaN(andq))
+{
+	if (typeof(DefaultToAnd) != "undefined" && DefaultToAnd == 1)
+		andq = 1;
+	else
+		andq = 0;
+}
+
+var cat = getParamArray("zoom_cat[]");
+if (cat.length == 0)
+{
+	cat[0] = parseInt(getParam("zoom_cat"));
+	if (isNaN(cat))
+		cat[0] = -1;	// search all categories
+}
+var num_zoom_cats = cat.length;	
+
+
+// for sorting options. zero is default (relevance)
+// 1 is sort by date (if date/time is available)
+var sort = parseInt(getParam("zoom_sort"));
+if (isNaN(sort)) sort = 0;
+
+var SelfURL = "";
+if (typeof(LinkBackURL) == "undefined")
+{
+    SelfURL = document.location.href;
+    // strip off parameters and anchors
+    var paramIndex;
+    paramIndex = SelfURL.indexOf("?");    
+    if (paramIndex > -1)
+        SelfURL = SelfURL.substr(0, paramIndex);
+    paramIndex = SelfURL.indexOf("#");
+    if (paramIndex > -1)
+        SelfURL = SelfURL.substr(0, paramIndex);        
+}
+else
+    SelfURL = LinkBackURL;
+// encode invalid URL characters
+SelfURL = SelfURL.replace(/\</g, "&lt;");
+SelfURL = SelfURL.replace(/\"/g, "&quot;");
+
+var data = new Array();
+var output = new Array();
+
+target = "";
+if (UseLinkTarget == 1)
+    target = " target=\"" + LinkTarget + "\" ";
+
+// ----------------------------------------------------------------------------
+// Main search function starts here
+// ----------------------------------------------------------------------------
+
+function ZoomSearch() 
+{
+        var loadingmsg = document.getElementById("loadingmsg");
+        if (loadingmsg) loadingmsg.style.display = "None";
+	if (UseCats)
+		NumCats = catnames.length;
+
+    if (Timing == 1) {
+        timeStart = new Date();
+    }        
+		
+    // Display the form
+    if (FormFormat > 0) {
+        document.writeln("<form method=\"get\" action=\"" + SelfURL + "\" class=\"zoom_searchform\">");
+        document.writeln("<input type=\"text\" name=\"zoom_query\" size=\"20\" value=\"" + htmlspecialchars(query) + "\" class=\"zoom_searchbox\" />");
+        document.writeln("<input type=\"submit\" value=\"" + STR_FORM_SUBMIT_BUTTON + "\" class=\"zoom_button\" /><br />");
+        if (FormFormat == 2) {
+            document.writeln("<span class=\"zoom_results_per_page\">" + STR_FORM_RESULTS_PER_PAGE + "\n");
+            document.writeln("<select name=\"zoom_per_page\">");
+            for (i = 0; i < PerPageOptions.length; i++) {
+                document.write("<option");
+                if (PerPageOptions[i] == per_page)
+                    document.write(" selected=\"selected\"");
+                document.writeln(">" + PerPageOptions[i] + "</option>");
+            }
+            document.writeln("</select><br /><br /></span>");
+            if (UseCats) {
+            	document.writeln("<span class=\"zoom_categories\">");
+                document.write(STR_FORM_CATEGORY + " ");
+                if (SearchMultiCats)
+                {                                                	
+	        		document.writeln("<ul>");
+	        		document.write("<li><input type=\"checkbox\" name=\"zoom_cat[]\" value=\"-1\"");
+	        		if (cat[0] == -1)
+		        		document.write(" checked=\"checked\"");
+		        	document.writeln(">" + STR_FORM_CATEGORY_ALL + "</input></li>");        		        		
+	        		for (i = 0; i < NumCats; i++)  
+	        		{      		
+	        			document.write("<li><input type=\"checkbox\" name=\"zoom_cat[]\" value=\"" +i+ "\"");
+	        			if (cat[0] != -1)
+	        			{
+		        			for (catit = 0; catit < num_zoom_cats; catit++)
+		        			{
+		        				if (i == cat[catit])
+		        				{
+		        					document.write(" checked=\"checked\"");
+		        					break;
+		        				}
+		        			}
+		        		}
+	        			document.writeln(">"+catnames[i]+"</input></li>");
+	        		}
+	        		document.writeln("</ul><br /><br />");
+                }
+                else
+                {                		
+	                document.write("<select name='zoom_cat[]'>");
+	                // 'all cats option
+	                document.write("<option value=\"-1\">" + STR_FORM_CATEGORY_ALL + "</option>");
+	                for (i = 0; i < NumCats; i++) {
+	                    document.write("<option value=\"" + i + "\"");
+	                    if (i == cat[0])
+	                        document.write(" selected=\"selected\"");
+	                    document.writeln(">" + catnames[i] + "</option>");
+	                }
+	                document.writeln("</select>&nbsp;&nbsp;");
+	            }
+	            document.writeln("</span>");
+            }
+            document.writeln("<span class=\"zoom_match\">" + STR_FORM_MATCH + " ");
+            if (andq == 0) {
+                document.writeln("<input type=\"radio\" name=\"zoom_and\" value=\"0\" checked=\"checked\" />" + STR_FORM_ANY_SEARCH_WORDS);
+                document.writeln("<input type=\"radio\" name=\"zoom_and\" value=\"1\" />" + STR_FORM_ALL_SEARCH_WORDS);                                
+            } else {
+                document.writeln("<input type=\"radio\" name=\"zoom_and\" value=\"0\" />" + STR_FORM_ANY_SEARCH_WORDS);
+                document.writeln("<input type=\"radio\" name=\"zoom_and\" value=\"1\" checked=\"checked\" />" + STR_FORM_ALL_SEARCH_WORDS);                
+            }
+            document.writeln("<input type=\"hidden\" name=\"zoom_sort\" value=\"" + sort + "\" />");
+            document.writeln("<br /><br /></span>");
+        }
+        else
+        {
+        	document.writeln("<input type=\"hidden\" name=\"zoom_per_page\" value=\"" + per_page + "\" />");
+        	document.writeln("<input type=\"hidden\" name=\"zoom_and\" value=\"" + andq + "\" />");
+        	document.writeln("<input type=\"hidden\" name=\"zoom_sort\" value=\"" + sort + "\" />");
+        }
+        
+        document.writeln("</form>");
+    }
+
+    // give up early if no search words provided
+    if (query.length == 0) {
+        //document.writeln("No search query entered.<br />");        
+        if (ZoomInfo == 1)
+            document.writeln("<center><p><small>" + STR_POWEREDBY + " <a href=\"http://www.wrensoft.com/zoom/\" target=\"_blank\"><b>Zoom Search Engine</b></a></small></p></center>");
+        return;
+    }
+
+    if (MapAccents == 1) {
+        for (i = 0; i < NormalChars.length; i++) {
+            query = query.replace(AccentChars[i], NormalChars[i]);
+        }
+    }
+
+	// Special query processing required when SearchAsSubstring is enabled
+	if (SearchAsSubstring == 1 && UseUTF8 == 1)
+		query = FixQueryForAsianWords(query);
+
+    // prepare search query, strip quotes, trim whitespace
+    if (WordJoinChars.indexOf(".") == -1)
+        query = query.replace(/[\.+]/g, " ");
+
+    if (WordJoinChars.indexOf("-") == -1)
+        query = query.replace(/(\S)\-/g, "$1 ");
+
+    if (WordJoinChars.indexOf("_") == -1)
+        query = query.replace(/[\_+]/g, " ");
+
+    if (WordJoinChars.indexOf("'") == -1)
+        query = query.replace(/[\'+]/g, " ");
+
+    if (WordJoinChars.indexOf("#") == -1)
+        query = query.replace(/[\#+]/g, " ");
+
+    if (WordJoinChars.indexOf("$") == -1)
+        query = query.replace(/[\$+]/g, " ");
+
+    if (WordJoinChars.indexOf("&") == -1)
+        query = query.replace(/[\&+]/g, " ");
+
+    if (WordJoinChars.indexOf(":") == -1)
+        query = query.replace(/[\:+]/g, " ");
+
+    if (WordJoinChars.indexOf(",") == -1)
+    	query = query.replace(/[\,+]/g, " ");
+
+    if (WordJoinChars.indexOf("/") == -1)
+    	query = query.replace(/[\/+]/g, " ");
+
+    if (WordJoinChars.indexOf("\\") == -1)
+    	query = query.replace(/[\\+]/g, " ");
+    	
+    // substitute multiple whitespace chars to single character
+    // also strip any of the wordjoinchars if followed immediately by a space
+    query = query.replace(/[\s\(\)\^\[\]\|\+\{\}\%]+|[\-._',:&\/\\\\](\s|$)/g, " ");   
+    
+    // trim trailing/leading whitespace
+    query = query.replace(/^\s*|\s*$/g,""); 
+    
+    var queryForHTML = htmlspecialchars(query);
+    var queryForSearch;
+    if (ToLowerSearchWords == 1)
+        queryForSearch = query.toLowerCase();
+    else
+    	queryForSearch = query;    
+    queryForSearch = htmlspecialchars(queryForSearch);    
+
+    // split search phrase into words
+    searchWords = queryForSearch.split(" "); // split by spaces.
+    
+    // Sort search words if there are negative signs
+    if (queryForSearch.indexOf("-") != -1)
+    	searchWords.sort(sw_compare);      
+
+	var query_zoom_cats = "";
+
+    document.write("<div class=\"searchheading\">" + STR_RESULTS_FOR + " " + queryForHTML);
+    if (UseCats) {
+        if (cat[0] == -1)
+        {
+            document.writeln(" " + STR_RESULTS_IN_ALL_CATEGORIES);
+            query_zoom_cats = "&amp;zoom_cat%5B%5D=-1";
+        }
+        else
+        {
+            document.writeln(" " + STR_RESULTS_IN_CATEGORY + " ");
+            for (catit = 0; catit < num_zoom_cats; catit++)
+            {
+            	if (catit > 0)
+            		document.write(", ");
+            	document.write("\"" + catnames[cat[catit]] + "\"");
+            	query_zoom_cats += "&amp;zoom_cat%5B%5D="+cat[catit];
+            }
+        }
+    }
+    document.writeln("<br /><br /></div>");
+
+    document.writeln("<div class=\"results\">");
+
+    numwords = searchWords.length;
+    kw_ptr = 0;
+    outputline = 0;    
+    ipage = 0;
+    matches = 0;
+    var SWord;
+    pagesCount = pageinfo.length;
+    
+    exclude_count = 0;
+    ExcludeTerm = 0;
+    
+    // Initialise a result table the size of all pages
+    res_table = new Array(pagesCount);
+    for (i = 0; i < pagesCount; i++)
+    {
+        res_table[i] = new Array(3);
+        res_table[i][0] = 0;
+        res_table[i][1] = 0;
+        res_table[i][2] = 0;
+    }
+    
+    var UseWildCards = new Array(numwords);    
+        
+    for (sw = 0; sw < numwords; sw++) {
+
+    	UseWildCards[sw] = 0;
+
+    	if (skipwords) {
+            // check min length
+            if (searchWords[sw].length < MinWordLen) {
+                SkipSearchWord(sw);
+                continue;
+            }
+            // check skip word list
+            for (i = 0; i < skipwords.length; i++) {
+                if (searchWords[sw] == skipwords[i]) {
+                    SkipSearchWord(sw);
+                    break;
+                }
+            }
+        }
+
+        if (searchWords[sw].indexOf("*") == -1 && searchWords[sw].indexOf("?") == -1) {
+            UseWildCards[sw] = 0;
+        } else {
+            UseWildCards[sw] = 1;
+            RegExpSearchWords[sw] = pattern2regexp(searchWords[sw]);
+        }
+        
+        if (Highlighting == 1 && UseWildCards[sw] == 0)
+        	RegExpSearchWords[sw] = searchWords[sw];        	    	
+    }
+                   
+    // Begin searching...
+    for (sw = 0; sw < numwords; sw++) {
+
+        if (searchWords[sw] == "") {
+        	SkippedWords++;
+            continue;
+        }
+
+		if (searchWords[sw].charAt(0) == '-')
+		{			
+			searchWords[sw] = searchWords[sw].substr(1);			
+			ExcludeTerm = 1;
+			exclude_count++;			
+		}
+		
+		if (UseWildCards[sw] == 1) {            
+            if (SearchAsSubstring == 0)
+                pattern = "^" + RegExpSearchWords[sw] + "$";
+            else
+                pattern = RegExpSearchWords[sw];
+            re = new RegExp(pattern, "g");
+        }
+
+        for (kw_ptr = 0; kw_ptr < dictwords.length; kw_ptr++) {
+
+            data = dictwords[kw_ptr].split(" ");
+
+            if (UseWildCards[sw] == 0) {
+                if (SearchAsSubstring == 0)
+                    match_result = wordcasecmp(data[0], searchWords[sw]);
+                else
+                    match_result = data[0].indexOf(searchWords[sw]);
+            } else
+                match_result = data[0].search(re);
+
+
+            if (match_result != -1) {
+                // keyword found, include it in the output list
+                for (kw = 1; kw < data.length; kw += 2) {
+                    // check if page is already in output list
+                    pageexists = 0;
+                    ipage = data[kw];
+                    
+                    if (ExcludeTerm == 1)
+                    {
+                    	// we clear out the score entry so that it'll be excluded in the filter stage
+                    	res_table[ipage][0] = 0;
+                    }                    
+                    else if (res_table[ipage][0] == 0) {
+                        matches++;
+                        res_table[ipage][0] += parseInt(data[kw+1]);
+                    }
+                    else {
+
+                        if (res_table[ipage][0] > 10000) {
+                            // take it easy if its too big to prevent gigantic scores
+                            res_table[ipage][0] += 1;
+                        } else {
+                            res_table[ipage][0] += parseInt(data[kw+1]); // add in score
+                            res_table[ipage][0] *= 2;           // double score as we have two words matching
+                        }
+                    }
+                    res_table[ipage][1] += 1;
+                    // store the 'and' user search terms matched' value
+                    if (res_table[ipage][2] == sw || res_table[ipage][2] == sw-SkippedWords-exclude_count)
+                        res_table[ipage][2] += 1;
+
+                }
+                if (UseWildCards[sw] == 0 && SearchAsSubstring == 0)
+                    break;    // this search word was found, so skip to next
+            }
+        }
+	}
+    
+    if (SkippedWords > 0)
+        document.writeln("<div class=\"summary\">" + STR_SKIPPED_FOLLOWING_WORDS + " " + SkippedOutputStr + ".<br /><br /></div>");
+
+    // Count number of output lines that match ALL search terms
+    oline = 0;
+    fullmatches = 0;    
+    output = new Array();
+    var full_numwords = numwords - SkippedWords - exclude_count;
+    for (i = 0; i < pagesCount; i++) {
+        IsFiltered = false;
+        if (res_table[i][0] > 0) {
+            if (UseCats && cat[0] != -1) {
+                // using cats and not doing an "all cats" search
+                if (SearchMultiCats) {
+                	for (cati = 0; cati < num_zoom_cats; cati++) {                		
+                		if (pageinfo[i][PAGEINFO_CAT].charAt(cat[cati]) == "1")
+                			break;
+                	}
+                	if (cati == num_zoom_cats)
+                		IsFiltered = true;
+                }
+                else {                		                
+	                if (pageinfo[i][PAGEINFO_CAT].charAt(cat[0]) == "0") {
+	                    IsFiltered = true;
+	                }
+	            }
+            }
+            if (IsFiltered == false) {
+                if (res_table[i][2] >= full_numwords) {
+                    fullmatches++;
+                } else {
+                    if (andq == 1)
+                        IsFiltered = true;
+                }
+            }
+            if (IsFiltered == false) {
+                // copy if not filtered out
+                output[oline] = new Array(3);
+                output[oline][0] = i;
+                output[oline][1] = res_table[i][0];
+                output[oline][2] = res_table[i][1];
+                oline++;
+            }
+        }
+    }
+    matches = oline;    
+
+    // Sort results in order of score, use "SortCompare" function
+    if (matches > 1)    
+   	{
+   		if (sort == 1 && UseDateTime == 1)
+   			output.sort(SortByDate);	// sort by date
+   		else
+        	output.sort(SortCompare);	// sort by relevance
+    }
+    
+    // prepare queryForURL
+    var queryForURL = query.replace(/\s/g, "+");
+	if (UseUTF8 == 1 && self.encodeURIComponent)
+    	queryForURL = encodeURIComponent(queryForURL);
+	else
+    	queryForURL = escape(queryForURL);    
+
+    //Display search result information
+    document.writeln("<div class=\"summary\">");
+    if (matches == 0)
+        document.writeln(STR_SUMMARY_NO_RESULTS_FOUND + "<br />");
+    else if (numwords > 1 && andq == 0) {
+        //OR
+        SomeTermMatches = matches - fullmatches;
+        document.writeln(PrintNumResults(fullmatches) + " " + STR_SUMMARY_FOUND_CONTAINING_ALL_TERMS + " ");
+        if (SomeTermMatches > 0)
+            document.writeln(PrintNumResults(SomeTermMatches) + " " + STR_SUMMARY_FOUND_CONTAINING_SOME_TERMS);
+        document.writeln("<br />");
+    }
+    else if (numwords > 1 && andq == 1) //AND
+        document.writeln(PrintNumResults(fullmatches) + " " + STR_SUMMARY_FOUND_CONTAINING_ALL_TERMS + "<br />");
+    else
+        document.writeln(PrintNumResults(matches) + " " + STR_SUMMARY_FOUND + "<br />");
+
+    document.writeln("</div>\n");
+
+    // number of pages of results
+    num_pages = Math.ceil(matches / per_page);
+    if (num_pages > 1)
+        document.writeln("<div class=\"result_pagescount\"><br />" + num_pages + " " + STR_PAGES_OF_RESULTS + "</div>\n");
+        
+    // Show recommended links if any
+    if (Recommended == 1)
+    {
+    	num_recs_found = 0;
+    	rec_count = recommended.length;
+    	for (rl = 0; rl < rec_count && num_recs_found < RecommendedMax; rl++)
+    	{
+    		sep = recommended[rl].lastIndexOf(" ");
+    		if (sep > -1)
+    		{
+    			rec_word = recommended[rl].slice(0, sep);
+    			rec_idx = parseInt(recommended[rl].slice(sep));
+				for (sw = 0; sw <= numwords; sw++)	
+				{
+					if (sw == numwords)
+					{
+						match_result = wordcasecmp(rec_word, queryForSearch);
+					}
+					else
+					{
+						if (UseWildCards[sw] == 1)
+						{
+				            if (SearchAsSubstring == 0)
+				                pattern = "^" + RegExpSearchWords[sw] + "$";
+				            else
+				                pattern = RegExpSearchWords[sw];
+				            re = new RegExp(pattern, "g");
+				            match_result = rec_word.search(re);							
+						}
+						else if (SearchAsSubstring == 0)
+						{
+							match_result = wordcasecmp(rec_word, searchWords[sw]);
+						}
+						else
+							match_result = rec_word.indexOf(searchWords[sw]);
+					}
+					if (match_result != -1)
+					{
+						if (num_recs_found == 0)
+						{
+							document.writeln("<div class=\"recommended\">");
+							document.writeln("<div class=\"recommended_heading\">" + STR_RECOMMENDED + "</div>");
+						}
+						pgurl = pagedata[rec_idx][PAGEDATA_URL];
+						pgtitle = pagedata[rec_idx][PAGEDATA_TITLE];
+						pgdesc = pagedata[rec_idx][PAGEDATA_DESC];
+				        urlLink = pgurl;				        
+				    	if (GotoHighlight == 1)				
+				    	{
+				    		if (SearchAsSubstring == 1)
+				    			urlLink = AddParamToURL(urlLink, "zoom_highlightsub=" + queryForURL);
+				    		else
+				    			urlLink = AddParamToURL(urlLink, "zoom_highlight=" + queryForURL);
+						}			
+					    if (PdfHighlight == 1)
+					    {
+					    	if (urlLink.indexOf(".pdf") != -1)
+					    		urlLink = urlLink+"#search=&quot;"+query+"&quot;";
+					    } 						
+						document.writeln("<div class=\"recommend_block\">");
+						document.writeln("<div class=\"recommend_title\">");
+			       		document.writeln("<a href=\"" + urlLink + "\"" + target + ">");
+			       		if (pgtitle.length > 1)
+			       			PrintHighlightDescription(pgtitle);
+			       		else
+			       			PrintHighlightDescription(pgurl);
+			       		document.writeln("</a></div>");					       		
+			       		document.writeln("<div class=\"recommend_description\">")
+			       		PrintHighlightDescription(pgdesc);
+			       		document.writeln("</div>");			       		
+			       		document.writeln("<div class=\"recommend_infoline\">" + pgurl + "</div>");
+			       		document.writeln("</div>");
+			       		num_recs_found++;			       		
+			       		break;				
+					}
+				}    			
+    		}
+    	}
+    	if (num_recs_found > 0)
+    		document.writeln("</div");
+    }
+    
+    // Show sorting options
+    if (matches > 1)
+    {
+    	if (UseDateTime == 1)
+    	{
+    		document.writeln("<div class=\"sorting\">");
+    		if (sort == 1)
+				document.writeln("<a href=\"" + SelfURL + "?zoom_query=" + queryForURL + "&amp;zoom_page=" + page + "&amp;zoom_per_page=" + per_page + query_zoom_cats + "&amp;zoom_and=" + andq + "&amp;zoom_sort=0\">" + STR_SORTBY_RELEVANCE + "</a> / <b>" + STR_SORTEDBY_DATE + "</b>");
+			else
+				document.writeln("<b>" + STR_SORTEDBY_RELEVANCE + "</b> / <a href=\"" + SelfURL + "?zoom_query=" + queryForURL + "&amp;zoom_page=" + page + "&amp;zoom_per_page=" + per_page + query_zoom_cats + "&amp;zoom_and=" + andq + "&amp;zoom_sort=1\">" + STR_SORTBY_DATE + "</a>");
+			document.writeln("</div>");
+    	}    	
+    }    
+
+    // determine current line of result from the output array
+    if (page == 1) {
+        arrayline = 0;
+    } else {
+        arrayline = ((page - 1) * per_page);
+    }
+
+    // the last result to show on this page
+    result_limit = arrayline + per_page;
+
+    // display the results
+    while (arrayline < matches && arrayline < result_limit) {
+        ipage = output[arrayline][0];
+        score = output[arrayline][1];
+        
+		pgurl = pagedata[ipage][PAGEDATA_URL];
+		pgtitle = pagedata[ipage][PAGEDATA_TITLE];
+		pgdesc = pagedata[ipage][PAGEDATA_DESC];
+		pgimage = pagedata[ipage][PAGEDATA_IMG];		
+		pgdate = pageinfo[ipage][PAGEINFO_DATETIME];
+		filesize = pageinfo[ipage][PAGEINFO_FILESIZE];
+		filesize = Math.ceil(filesize / 1024);
+		if (filesize < 1)
+			filesize = 1;
+		catpage = pageinfo[ipage][PAGEINFO_CAT];
+		
+        urlLink = pgurl;				                        
+    	if (GotoHighlight == 1)				
+    	{
+    		if (SearchAsSubstring == 1)
+    			urlLink = AddParamToURL(urlLink, "zoom_highlightsub=" + queryForURL);
+    		else
+    			urlLink = AddParamToURL(urlLink, "zoom_highlight=" + queryForURL);
+		}		
+	    if (PdfHighlight == 1)
+	    {
+	    	if (urlLink.indexOf(".pdf") != -1)
+	    		urlLink = urlLink+"#search=&quot;"+query+"&quot;";
+	    } 
+                
+	    if (arrayline % 2 == 0)
+    		document.writeln("<div class=\"result_block\">");
+    	else
+    		document.writeln("<div class=\"result_altblock\">");
+    	
+	    if (UseZoomImage == 1)
+	    {	    	
+	    	if (pgimage.length > 1)
+	    	{
+	    		document.writeln("<div class=\"result_image\">");    		
+	    		document.writeln("<a href=\"" + urlLink + "\"" + target + "><img src=\"" + pgimage + "\" class=\"result_image\"></a>");
+	    		document.writeln("</div>");
+	    	}
+	    }
+    		                
+        document.writeln("<div class=\"result_title\">");
+        if (DisplayNumber == 1)
+        	document.writeln("<b>" + (arrayline+1) + ".</b>&nbsp;");
+        	
+        if (DisplayTitle == 1)
+        {
+       		document.writeln("<a href=\"" + urlLink + "\"" + target + ">");
+			PrintHighlightDescription(pgtitle);
+       		document.writeln("</a>");
+        }        
+        else
+        	document.writeln("<a href=\"" + urlLink + "\"" + target + ">" + pgurl + "</a>");
+                   
+        if (UseCats) 
+        {        	
+            document.write("<span class=\"category\">");
+            for (cati = 0; cati < NumCats; cati++)
+            {
+            	if (catpage.charAt(cati) == "1")
+            		document.write(" ["+catnames[cati]+"]");
+            }             
+            document.writeln("</span>");
+        }
+        document.writeln("</div>");
+        
+        if (DisplayMetaDesc == 1)
+        {
+        	// print meta description
+            document.writeln("<div class=\"description\">");            
+            PrintHighlightDescription(pgdesc);
+            document.writeln("</div>\n");
+        }
+        
+        info_str = "";
+        
+        if (DisplayTerms == 1)
+        	info_str += STR_RESULT_TERMS_MATCHED + " " + output[arrayline][2];
+        	
+        if (DisplayScore == 1) {
+        	if (info_str.length > 0)
+        		info_str += "&nbsp; - &nbsp;";
+        	info_str += STR_RESULT_SCORE + " " + score;
+        }
+        
+        if (DisplayDate == 1 && pgdate > 0) 
+        {
+        	datetime = new Date(pgdate*1000);
+        	if (info_str.length > 0)
+        		info_str += "&nbsp; - &nbsp;";
+        	info_str += datetime.getDate() + " " + months[datetime.getMonth()] + " " + datetime.getFullYear();
+        }
+        
+        if (DisplayFilesize == 1) {
+        	if (info_str.length > 0)
+        		info_str += "&nbsp; - &nbsp;";
+        	info_str += filesize + "k";
+        }        
+             
+        if (DisplayURL == 1) {
+        	if (info_str.length > 0)
+        		info_str += "&nbsp; - &nbsp;";
+			info_str += STR_RESULT_URL + " " + pgurl;
+        }
+                   
+        document.writeln("<div class=\"infoline\">");
+        document.writeln(info_str);                        
+        document.writeln("</div></div>\n");
+        arrayline++;
+    }
+
+    // Show links to other result pages
+    if (num_pages > 1) {
+        // 10 results to the left of the current page
+        start_range = page - 10;
+        if (start_range < 1)
+            start_range = 1;
+
+        // 10 to the right
+        end_range = page + 10;
+        if (end_range > num_pages)
+            end_range = num_pages;
+
+        document.writeln("<div class=\"result_pages\">" + STR_RESULT_PAGES + " ");
+        if (page > 1)
+            document.writeln("<a href=\"" + SelfURL + "?zoom_query=" + queryForURL + "&amp;zoom_page=" + (page-1) + "&amp;zoom_per_page=" + per_page + query_zoom_cats + "&amp;zoom_and=" + andq + "&amp;zoom_sort=" + sort + "\">&lt;&lt; " + STR_RESULT_PAGES_PREVIOUS + "</a> ");
+        for (i = start_range; i <= end_range; i++) 
+        {
+            if (i == page)
+                document.writeln(page + " ");
+            else
+                document.writeln("<a href=\"" + SelfURL + "?zoom_query=" + queryForURL + "&amp;zoom_page=" + i + "&amp;zoom_per_page=" + per_page + query_zoom_cats + "&amp;zoom_and=" + andq + "&amp;zoom_sort=" + sort + "\">" + i + "</a> ");            
+        }
+        if (page != num_pages)
+            document.writeln("<a href=\"" + SelfURL + "?zoom_query=" + queryForURL + "&amp;zoom_page=" + (page+1) + "&amp;zoom_per_page=" + per_page + query_zoom_cats + "&amp;zoom_and=" + andq + "&amp;zoom_sort=" + sort + "\">" + STR_RESULT_PAGES_NEXT + " &gt;&gt;</a> ");
+        document.writeln("</div>");
+    }
+
+    document.writeln("</div>"); // end results style tag
+
+    if (Timing == 1) {
+        timeEnd = new Date();
+        timeDifference = timeEnd - timeStart;
+        document.writeln("<div class=\"searchtime\"><br /><br />" + STR_SEARCH_TOOK + " " + (timeDifference/1000) + " " + STR_SECONDS + ".</div>\n");
+    }
+
+    if (ZoomInfo == 1)
+        document.writeln("<center><p><small>" + STR_POWEREDBY + " <a href=\"http://www.wrensoft.com/zoom/\" target=\"_blank\"><b>Zoom Search Engine</b></a></small></p></center>");
+}
+
diff --git a/java/src/Ice/AMDCallback.java b/java/src/Ice/AMDCallback.java
index d884f5ac243..be31358faef 100644
--- a/java/src/Ice/AMDCallback.java
+++ b/java/src/Ice/AMDCallback.java
@@ -17,4 +17,4 @@ public interface AMDCallback
      * @param ex The exception to be raised.
      **/
     public void ice_exception(java.lang.Exception ex);
-}
\ No newline at end of file
+}
diff --git a/java/src/IceInternal/ConnectionReaper.java b/java/src/IceInternal/ConnectionReaper.java
index 0ad8def0747..bacbbdbe42e 100644
--- a/java/src/IceInternal/ConnectionReaper.java
+++ b/java/src/IceInternal/ConnectionReaper.java
@@ -30,4 +30,4 @@ public class ConnectionReaper
     }
 
     private java.util.List<Ice.ConnectionI> _connections = new java.util.ArrayList<Ice.ConnectionI>();
-};
\ No newline at end of file
+};
diff --git a/java/src/IceInternal/ThreadPoolWorkQueue.java b/java/src/IceInternal/ThreadPoolWorkQueue.java
index 0a4c643b37b..9e12bd03c37 100644
--- a/java/src/IceInternal/ThreadPoolWorkQueue.java
+++ b/java/src/IceInternal/ThreadPoolWorkQueue.java
@@ -179,4 +179,4 @@ final class ThreadPoolWorkQueue extends EventHandler
     private java.nio.channels.WritableByteChannel _fdIntrWrite;
 
     private java.util.LinkedList<ThreadPoolWorkItem> _workItems = new java.util.LinkedList<ThreadPoolWorkItem>();
-}
\ No newline at end of file
+}
diff --git a/java/test/Ice/interceptor/MyObjectI.java b/java/test/Ice/interceptor/MyObjectI.java
index ed3a3846d40..ba6f14ecf0f 100644
--- a/java/test/Ice/interceptor/MyObjectI.java
+++ b/java/test/Ice/interceptor/MyObjectI.java
@@ -183,4 +183,4 @@ class MyObjectI extends _MyObjectDisp
         thread.setDaemon(true);
         thread.start();
     } 
-}
\ No newline at end of file
+}
diff --git a/java/test/Ice/threadPoolPriority/PriorityI.java b/java/test/Ice/threadPoolPriority/PriorityI.java
index 93a35774abd..ea28df2425d 100644
--- a/java/test/Ice/threadPoolPriority/PriorityI.java
+++ b/java/test/Ice/threadPoolPriority/PriorityI.java
@@ -15,4 +15,4 @@ public class PriorityI extends _PriorityDisp
     {
         return Thread.currentThread().getPriority();
     }
-}
\ No newline at end of file
+}
diff --git a/java/test/IceBox/configuration/config.service1-2 b/java/test/IceBox/configuration/config.service1-2
index 76064138212..c173914db2a 100644
--- a/java/test/IceBox/configuration/config.service1-2
+++ b/java/test/IceBox/configuration/config.service1-2
@@ -8,4 +8,4 @@ OverrideMe=2
 UnsetMe=
 
 
-Ice.PrintAdapterReady=0
\ No newline at end of file
+Ice.PrintAdapterReady=0
diff --git a/java/test/IceBox/configuration/config.service2-2 b/java/test/IceBox/configuration/config.service2-2
index c1a99d112c1..36c8d0812cb 100644
--- a/java/test/IceBox/configuration/config.service2-2
+++ b/java/test/IceBox/configuration/config.service2-2
@@ -6,4 +6,4 @@ Service2.Prop=1
 OverrideMe=3
 UnsetMe=
 
-Ice.PrintAdapterReady=0
\ No newline at end of file
+Ice.PrintAdapterReady=0
diff --git a/vb/demo/Glacier2/callback/Client.vb b/vb/demo/Glacier2/callback/Client.vb
index a366ebb0621..36d239712c2 100644
--- a/vb/demo/Glacier2/callback/Client.vb
+++ b/vb/demo/Glacier2/callback/Client.vb
@@ -65,10 +65,10 @@ Module Glacier2callbackC
                 Catch ex As Glacier2.CannotCreateSessionException
                     Console.Out.WriteLine("cannot create session:\n" + ex.reason)
                 End Try
-            End While

+            End While
 
             Return session
-        End Function

+        End Function
 
 
         Public Overloads Overrides Function runWithSession(ByVal args() As String) As Integer
diff --git a/vb/demo/Ice/bidir/CallbackReceiverI.vb b/vb/demo/Ice/bidir/CallbackReceiverI.vb
index 8329f41159c..c3aa23cfd8f 100644
--- a/vb/demo/Ice/bidir/CallbackReceiverI.vb
+++ b/vb/demo/Ice/bidir/CallbackReceiverI.vb
@@ -6,14 +6,14 @@
 ' ICE_LICENSE file included in this distribution.
 '
 ' **********************************************************************
-

-Imports BidirDemo

-

-Public NotInheritable Class CallbackReceiverI

-    Inherits CallbackReceiverDisp_

-

-    Public Overloads Overrides Sub callback(ByVal num As Integer, ByVal current As Ice.Current)

-        System.Console.Out.WriteLine("received callback #" & num)

-    End Sub

-

-End Class

+
+Imports BidirDemo
+
+Public NotInheritable Class CallbackReceiverI
+    Inherits CallbackReceiverDisp_
+
+    Public Overloads Overrides Sub callback(ByVal num As Integer, ByVal current As Ice.Current)
+        System.Console.Out.WriteLine("received callback #" & num)
+    End Sub
+
+End Class
diff --git a/vb/demo/Ice/bidir/CallbackSenderI.vb b/vb/demo/Ice/bidir/CallbackSenderI.vb
index ce245dadab8..165126326be 100644
--- a/vb/demo/Ice/bidir/CallbackSenderI.vb
+++ b/vb/demo/Ice/bidir/CallbackSenderI.vb
@@ -6,69 +6,69 @@
 ' ICE_LICENSE file included in this distribution.
 '
 ' **********************************************************************
-

-Imports BidirDemo

-Imports System.Collections

-

-Class CallbackSenderI

-    Inherits CallbackSenderDisp_

-

-    Public Sub New(ByVal communicator As Ice.Communicator)

-        _communicator = communicator

-        _destroy = False

-        _clients = New ArrayList

-    End Sub

-

-    Public Sub destroy()

-        SyncLock Me

-            System.Console.Out.WriteLine("destroying callback sender")

-            _destroy = True

-

-            System.Threading.Monitor.Pulse(Me)

-        End SyncLock

-    End Sub

-

-    Public Overloads Overrides Sub addClient(ByVal ident As Ice.Identity, ByVal current As Ice.Current)

-        SyncLock Me

-            System.Console.Out.WriteLine("adding client `" & current.adapter.getCommunicator().identityToString(ident) & "'")

-

-            Dim base As Ice.ObjectPrx = current.con.createProxy(ident)

-            Dim client As CallbackReceiverPrx = CallbackReceiverPrxHelper.uncheckedCast(base)

-            _clients.Add(client)

-        End SyncLock

-    End Sub

-

-    Public Sub Run()

-        Dim num As Integer = 0

-        While True

-            Dim clients As ArrayList

-            SyncLock Me

-                System.Threading.Monitor.Wait(Me, 2000)

-                If _destroy Then

-                    Exit While

-                End If

-                clients = New ArrayList(_clients)

-            End SyncLock

-

-            If clients.Count > 0 Then

-                num += 1

-

-                For Each c As CallbackReceiverPrx In clients

-                    Try

-                        c.callback(num)

-                    Catch ex As Ice.LocalException

-                        System.Console.Out.WriteLine("removing client `" & _communicator.identityToString(c.ice_getIdentity()) & "'")

-                        SyncLock Me

-                            _clients.Remove(c)

-                        End SyncLock

-                    End Try

-                Next

-            End If

-        End While

-    End Sub

-

-    Private _communicator As Ice.Communicator

-    Private _destroy As Boolean

-    Private _clients As ArrayList

-

-End Class

+
+Imports BidirDemo
+Imports System.Collections
+
+Class CallbackSenderI
+    Inherits CallbackSenderDisp_
+
+    Public Sub New(ByVal communicator As Ice.Communicator)
+        _communicator = communicator
+        _destroy = False
+        _clients = New ArrayList
+    End Sub
+
+    Public Sub destroy()
+        SyncLock Me
+            System.Console.Out.WriteLine("destroying callback sender")
+            _destroy = True
+
+            System.Threading.Monitor.Pulse(Me)
+        End SyncLock
+    End Sub
+
+    Public Overloads Overrides Sub addClient(ByVal ident As Ice.Identity, ByVal current As Ice.Current)
+        SyncLock Me
+            System.Console.Out.WriteLine("adding client `" & current.adapter.getCommunicator().identityToString(ident) & "'")
+
+            Dim base As Ice.ObjectPrx = current.con.createProxy(ident)
+            Dim client As CallbackReceiverPrx = CallbackReceiverPrxHelper.uncheckedCast(base)
+            _clients.Add(client)
+        End SyncLock
+    End Sub
+
+    Public Sub Run()
+        Dim num As Integer = 0
+        While True
+            Dim clients As ArrayList
+            SyncLock Me
+                System.Threading.Monitor.Wait(Me, 2000)
+                If _destroy Then
+                    Exit While
+                End If
+                clients = New ArrayList(_clients)
+            End SyncLock
+
+            If clients.Count > 0 Then
+                num += 1
+
+                For Each c As CallbackReceiverPrx In clients
+                    Try
+                        c.callback(num)
+                    Catch ex As Ice.LocalException
+                        System.Console.Out.WriteLine("removing client `" & _communicator.identityToString(c.ice_getIdentity()) & "'")
+                        SyncLock Me
+                            _clients.Remove(c)
+                        End SyncLock
+                    End Try
+                Next
+            End If
+        End While
+    End Sub
+
+    Private _communicator As Ice.Communicator
+    Private _destroy As Boolean
+    Private _clients As ArrayList
+
+End Class
diff --git a/vb/demo/Ice/bidir/Client.vb b/vb/demo/Ice/bidir/Client.vb
index dca1dd0c2bb..c594abdd8e6 100644
--- a/vb/demo/Ice/bidir/Client.vb
+++ b/vb/demo/Ice/bidir/Client.vb
@@ -7,7 +7,7 @@
 '
 ' **********************************************************************
 
-Imports BidirDemo

+Imports BidirDemo
 
 Module BidirC
     Class Client
diff --git a/vb/demo/Ice/session/SessionI.vb b/vb/demo/Ice/session/SessionI.vb
index d808060b73d..069361d65b2 100644
--- a/vb/demo/Ice/session/SessionI.vb
+++ b/vb/demo/Ice/session/SessionI.vb
@@ -98,4 +98,4 @@ Public Class SessionI
     Private _nextId As Integer ' The per-session id of the next hello object. This is used for tracing purposes.
     Private _objs As ArrayList  ' List of per-session allocated hello objects.
     Private _destroy As Boolean
-End Class
\ No newline at end of file
+End Class
diff --git a/vb/demo/Ice/throughput/Client.vb b/vb/demo/Ice/throughput/Client.vb
index ab06b94b138..e2749d64736 100644
--- a/vb/demo/Ice/throughput/Client.vb
+++ b/vb/demo/Ice/throughput/Client.vb
@@ -13,7 +13,7 @@ Imports Demo
 Module ThroughputC
 
     Class Client
-        Inherits Ice.Application

+        Inherits Ice.Application
 
         Private Sub menu()
             Console.Out.WriteLine("usage:")
diff --git a/vb/demo/Ice/value/DerivedPrinterI.vb b/vb/demo/Ice/value/DerivedPrinterI.vb
index 5c644326382..8f86182145c 100644
--- a/vb/demo/Ice/value/DerivedPrinterI.vb
+++ b/vb/demo/Ice/value/DerivedPrinterI.vb
@@ -7,7 +7,7 @@
 '
 ' **********************************************************************
 
-Imports Demo

+Imports Demo
 
 Public Class DerivedPrinterI
     Inherits DerivedPrinter
diff --git a/vb/demo/IceBox/hello/config.admin b/vb/demo/IceBox/hello/config.admin
index 32ee394107a..4ea31400809 100644
--- a/vb/demo/IceBox/hello/config.admin
+++ b/vb/demo/IceBox/hello/config.admin
@@ -1,12 +1,12 @@
-#

-# The IceBox instance name is used to set the category field of the

-# IceBox ServiceManager identity.

-#

-IceBox.InstanceName=DemoIceBox

-

-#

-# The IceBox server endpoint configuration

-#

-IceBox.ServiceManager.Endpoints=tcp -p 9998

-

-

+#
+# The IceBox instance name is used to set the category field of the
+# IceBox ServiceManager identity.
+#
+IceBox.InstanceName=DemoIceBox
+
+#
+# The IceBox server endpoint configuration
+#
+IceBox.ServiceManager.Endpoints=tcp -p 9998
+
+
diff --git a/vb/demo/book/simple_filesystem/Client.vb b/vb/demo/book/simple_filesystem/Client.vb
index f1503065173..88180f6d055 100644
--- a/vb/demo/book/simple_filesystem/Client.vb
+++ b/vb/demo/book/simple_filesystem/Client.vb
@@ -1,75 +1,75 @@
-Imports Microsoft.VisualBasic

-Imports System

-Imports FileSystem

-

-Module Client

-

-    ' Recursively print the contents of directory "dir"

-    ' in tree fashion. For files, show the contents of

-    ' each file. The "depth" parameter is the current

-    ' nesting level (for indentation).

-

-    Sub listRecursive(ByVal dir As DirectoryPrx, ByVal depth As Integer)

-        depth += 1

-        Dim indent As String = New String(Chr(9), depth)

-

-        Dim contents As NodePrx() = dir.list()

-

-        For Each node As NodePrx In contents

-            Dim subdir As DirectoryPrx = DirectoryPrxHelper.checkedCast(node)

-            Dim file As FilePrx = FilePrxHelper.uncheckedCast(node)

-            Console.Write(indent & node.name())

-            If Not subdir Is Nothing Then

-                Console.WriteLine(" (directory):")

-            Else

-                Console.WriteLine(" (file):")

-            End If

-            If Not subdir Is Nothing Then

-                listRecursive(subdir, depth)

-            Else

-                Dim text As String() = file.read()

-                For j As Integer = 0 To text.Length - 1

-                    Console.WriteLine(indent & "    " & text(j))

-                Next

-            End If

-        Next

-    End Sub

-

-    Public Sub Main(ByVal args() As String)

-        Dim status As Integer = 0

-        Dim ic As Ice.Communicator = Nothing

-        Try

-            ' Create a communicator

-            '

-            ic = Ice.Util.initialize(args)

-

-            ' Create a proxy for the root directory

-            '

-            Dim obj As Ice.ObjectPrx = ic.stringToProxy("RootDir:default -p 10000")

-

-            ' Down-cast the proxy to a Directory proxy

-            '

-            Dim rootDir As DirectoryPrx = DirectoryPrxHelper.checkedCast(obj)

-

-            ' Recursively list the contents of the root directory

-            '

-            Console.WriteLine("Contents of root directory:")

-            listRecursive(rootDir, 0)

-        Catch e As Exception

-            Console.Error.WriteLine(e)

-            status = 1

-        End Try

-        If Not ic Is Nothing Then

-            ' Clean up

-            '

-            Try

-                ic.destroy()

-            Catch e As Exception

-                Console.Error.WriteLine(e)

-                status = 1

-            End Try

-        End If

-        Environment.Exit(status)

-    End Sub

-

-End Module

+Imports Microsoft.VisualBasic
+Imports System
+Imports FileSystem
+
+Module Client
+
+    ' Recursively print the contents of directory "dir"
+    ' in tree fashion. For files, show the contents of
+    ' each file. The "depth" parameter is the current
+    ' nesting level (for indentation).
+
+    Sub listRecursive(ByVal dir As DirectoryPrx, ByVal depth As Integer)
+        depth += 1
+        Dim indent As String = New String(Chr(9), depth)
+
+        Dim contents As NodePrx() = dir.list()
+
+        For Each node As NodePrx In contents
+            Dim subdir As DirectoryPrx = DirectoryPrxHelper.checkedCast(node)
+            Dim file As FilePrx = FilePrxHelper.uncheckedCast(node)
+            Console.Write(indent & node.name())
+            If Not subdir Is Nothing Then
+                Console.WriteLine(" (directory):")
+            Else
+                Console.WriteLine(" (file):")
+            End If
+            If Not subdir Is Nothing Then
+                listRecursive(subdir, depth)
+            Else
+                Dim text As String() = file.read()
+                For j As Integer = 0 To text.Length - 1
+                    Console.WriteLine(indent & "    " & text(j))
+                Next
+            End If
+        Next
+    End Sub
+
+    Public Sub Main(ByVal args() As String)
+        Dim status As Integer = 0
+        Dim ic As Ice.Communicator = Nothing
+        Try
+            ' Create a communicator
+            '
+            ic = Ice.Util.initialize(args)
+
+            ' Create a proxy for the root directory
+            '
+            Dim obj As Ice.ObjectPrx = ic.stringToProxy("RootDir:default -p 10000")
+
+            ' Down-cast the proxy to a Directory proxy
+            '
+            Dim rootDir As DirectoryPrx = DirectoryPrxHelper.checkedCast(obj)
+
+            ' Recursively list the contents of the root directory
+            '
+            Console.WriteLine("Contents of root directory:")
+            listRecursive(rootDir, 0)
+        Catch e As Exception
+            Console.Error.WriteLine(e)
+            status = 1
+        End Try
+        If Not ic Is Nothing Then
+            ' Clean up
+            '
+            Try
+                ic.destroy()
+            Catch e As Exception
+                Console.Error.WriteLine(e)
+                status = 1
+            End Try
+        End If
+        Environment.Exit(status)
+    End Sub
+
+End Module
diff --git a/vb/demo/book/simple_filesystem/DirectoryI.vb b/vb/demo/book/simple_filesystem/DirectoryI.vb
index 522449cfa49..06c19747465 100644
--- a/vb/demo/book/simple_filesystem/DirectoryI.vb
+++ b/vb/demo/book/simple_filesystem/DirectoryI.vb
@@ -1,52 +1,52 @@
-Imports System

-Imports System.Collections

-Imports Filesystem

-

-Public Class DirectoryI

-    Inherits DirectoryDisp_

-

-    Public Sub New(ByVal name As String, ByVal parent As DirectoryI)

-        _name = name

-        _parent = parent

-

-        ' Create an identity. The

-        ' root directory as the fixed identity "RootDir"

-        '

-        Dim myId As Ice.Identity = New Ice.Identity

-        If Not _parent Is Nothing Then

-            myId.name = System.Guid.NewGuid().ToString()

-        Else

-            myId.name = "RootDir"

-        End If

-

-        ' Add the identity to the object adapter

-        '

-        _adapter.add(Me, myId)

-

-        ' Create a proxy for the new node and

-        ' add it as a child to the parent

-        '

-        Dim thisNode As NodePrx = NodePrxHelper.uncheckedCast(_adapter.createProxy(myId))

-        If Not _parent Is Nothing Then

-            _parent.addChild(thisNode)

-        End If

-    End Sub

-

-    Public Sub addChild(ByVal child As NodePrx)

-        _contents.Add(child)

-    End Sub

-

-    Public Overloads Overrides Function name(ByVal current As Ice.Current) As String

-        Return _name

-    End Function

-

-    Public Overloads Overrides Function list(ByVal current As Ice.Current) As NodePrx()

-        Return CType(_contents.ToArray(GetType(NodePrx)), NodePrx())

-    End Function

-

-    Public Shared _adapter As Ice.ObjectAdapter

-    Private _name As String

-    Private _parent As DirectoryI

-    Private _contents As ArrayList = New ArrayList

-

-End Class

+Imports System
+Imports System.Collections
+Imports Filesystem
+
+Public Class DirectoryI
+    Inherits DirectoryDisp_
+
+    Public Sub New(ByVal name As String, ByVal parent As DirectoryI)
+        _name = name
+        _parent = parent
+
+        ' Create an identity. The
+        ' root directory as the fixed identity "RootDir"
+        '
+        Dim myId As Ice.Identity = New Ice.Identity
+        If Not _parent Is Nothing Then
+            myId.name = System.Guid.NewGuid().ToString()
+        Else
+            myId.name = "RootDir"
+        End If
+
+        ' Add the identity to the object adapter
+        '
+        _adapter.add(Me, myId)
+
+        ' Create a proxy for the new node and
+        ' add it as a child to the parent
+        '
+        Dim thisNode As NodePrx = NodePrxHelper.uncheckedCast(_adapter.createProxy(myId))
+        If Not _parent Is Nothing Then
+            _parent.addChild(thisNode)
+        End If
+    End Sub
+
+    Public Sub addChild(ByVal child As NodePrx)
+        _contents.Add(child)
+    End Sub
+
+    Public Overloads Overrides Function name(ByVal current As Ice.Current) As String
+        Return _name
+    End Function
+
+    Public Overloads Overrides Function list(ByVal current As Ice.Current) As NodePrx()
+        Return CType(_contents.ToArray(GetType(NodePrx)), NodePrx())
+    End Function
+
+    Public Shared _adapter As Ice.ObjectAdapter
+    Private _name As String
+    Private _parent As DirectoryI
+    Private _contents As ArrayList = New ArrayList
+
+End Class
diff --git a/vb/demo/book/simple_filesystem/FileI.vb b/vb/demo/book/simple_filesystem/FileI.vb
index f7ea17e5bcd..9c03b10d6dd 100644
--- a/vb/demo/book/simple_filesystem/FileI.vb
+++ b/vb/demo/book/simple_filesystem/FileI.vb
@@ -1,53 +1,53 @@
-Imports System

-Imports System.Diagnostics

-Imports Filesystem

-

-Public Class FileI

-    Inherits FileDisp_

-

-    Public Sub New(ByVal name As String, ByVal parent As DirectoryI)

-        _name = name

-        _parent = parent

-

-        Debug.Assert(Not _parent Is Nothing)

-

-        ' Create an identity

-        '

-        Dim myId As Ice.Identity = New Ice.Identity

-        myId.name = System.Guid.NewGuid().ToString()

-

-        ' Add the identity to the object adapter

-        '

-        _adapter.add(Me, myId)

-

-        ' Create a proxy for the new node and

-        ' add it as a child to the parent

-        '

-        Dim thisNode As NodePrx = NodePrxHelper.uncheckedCast(_adapter.createProxy(myId))

-        _parent.addChild(thisNode)

-    End Sub

-

-    ' Slice Node::name() operation

-

-    Public Overloads Overrides Function name(ByVal current As Ice.Current) As String

-        Return _name

-    End Function

-

-    ' Slice File::read() operation

-

-    Public Overloads Overrides Function read(ByVal current As Ice.Current) As String()

-        Return _lines

-    End Function

-

-    ' Slice File::write() operation

-

-    Public Overloads Overrides Sub write(ByVal text As String(), ByVal current As Ice.Current)

-        _lines = text

-    End Sub

-

-    Public Shared _adapter As Ice.ObjectAdapter

-    Private _name As String

-    Private _parent As DirectoryI

-    Private _lines As String()

-

-End Class

+Imports System
+Imports System.Diagnostics
+Imports Filesystem
+
+Public Class FileI
+    Inherits FileDisp_
+
+    Public Sub New(ByVal name As String, ByVal parent As DirectoryI)
+        _name = name
+        _parent = parent
+
+        Debug.Assert(Not _parent Is Nothing)
+
+        ' Create an identity
+        '
+        Dim myId As Ice.Identity = New Ice.Identity
+        myId.name = System.Guid.NewGuid().ToString()
+
+        ' Add the identity to the object adapter
+        '
+        _adapter.add(Me, myId)
+
+        ' Create a proxy for the new node and
+        ' add it as a child to the parent
+        '
+        Dim thisNode As NodePrx = NodePrxHelper.uncheckedCast(_adapter.createProxy(myId))
+        _parent.addChild(thisNode)
+    End Sub
+
+    ' Slice Node::name() operation
+
+    Public Overloads Overrides Function name(ByVal current As Ice.Current) As String
+        Return _name
+    End Function
+
+    ' Slice File::read() operation
+
+    Public Overloads Overrides Function read(ByVal current As Ice.Current) As String()
+        Return _lines
+    End Function
+
+    ' Slice File::write() operation
+
+    Public Overloads Overrides Sub write(ByVal text As String(), ByVal current As Ice.Current)
+        _lines = text
+    End Sub
+
+    Public Shared _adapter As Ice.ObjectAdapter
+    Private _name As String
+    Private _parent As DirectoryI
+    Private _lines As String()
+
+End Class
diff --git a/vb/demo/book/simple_filesystem/Server.vb b/vb/demo/book/simple_filesystem/Server.vb
index 0145b36e59d..24385351caf 100644
--- a/vb/demo/book/simple_filesystem/Server.vb
+++ b/vb/demo/book/simple_filesystem/Server.vb
@@ -1,79 +1,79 @@
-Imports System

-Imports FileSystem

-

-Module Server

-

-    Public Class Server

-        Inherits Ice.Application

-

-        Public Overrides Function run(ByVal args As String()) As Integer

-            ' Terminate cleanly on receipt of a signal

-            '

-            shutdownOnInterrupt()

-

-            ' Create an object adapter (stored in the _adapter

-            ' static members)

-            '

-            Dim adapter As Ice.ObjectAdapter = communicator().createObjectAdapterWithEndpoints( _

-                     "SimpleFilesystem", "default -h 127.0.0.1 -p 10000")

-            DirectoryI._adapter = adapter

-            FileI._adapter = adapter

-

-            ' Create the root directory (with name "/" and no parent)

-            '

-            Dim root As DirectoryI = New DirectoryI("/", Nothing)

-

-            ' Create a file called "README" in the root directory

-            '

-            Dim file As FileI = New FileI("README", root)

-            Dim text As String() = New String() {"This file system contains a collection of poetry."}

-            Try

-                file.write(text)

-            Catch e As GenericError

-                Console.Error.WriteLine(e.reason)

-            End Try

-

-            ' Create a directory called "Coleridge"

-            ' in the root directory

-            '

-            Dim coleridge As DirectoryI = New DirectoryI("Coleridge", root)

-

-            ' Create a file called "Kubla_Khan"

-            ' in the Coleridge directory

-            '

-            file = New FileI("Kubla_Khan", coleridge)

-            text = New String() {"In Xanadu did Kubla Khan", _

-            "A stately pleasure-dome decree:", _

-            "Where Alph, the sacred river, ran", _

-            "Through caverns measureless to man", _

-            "Down to a sunless sea."}

-            Try

-                CType(file, FileOperationsNC_).write(text)

-                file.write(text)

-            Catch e As GenericError

-                Console.Error.WriteLine(e.reason)

-            End Try

-

-            ' All objects are created, allow client requests now

-            '

-            adapter.activate()

-

-            ' Wait until we are done

-            '

-            communicator().waitForShutdown()

-

-            If interrupted() Then

-                Console.Error.WriteLine(appName() & ": terminating")

-            End If

-

-            Return 0

-        End Function

-

-    End Class

-

-    Public Sub Main(ByVal args As String())

-        Dim app As Server = New Server

-        Environment.Exit(app.Main(args))

-    End Sub

-

-End Module

+Imports System
+Imports FileSystem
+
+Module Server
+
+    Public Class Server
+        Inherits Ice.Application
+
+        Public Overrides Function run(ByVal args As String()) As Integer
+            ' Terminate cleanly on receipt of a signal
+            '
+            shutdownOnInterrupt()
+
+            ' Create an object adapter (stored in the _adapter
+            ' static members)
+            '
+            Dim adapter As Ice.ObjectAdapter = communicator().createObjectAdapterWithEndpoints( _
+                     "SimpleFilesystem", "default -h 127.0.0.1 -p 10000")
+            DirectoryI._adapter = adapter
+            FileI._adapter = adapter
+
+            ' Create the root directory (with name "/" and no parent)
+            '
+            Dim root As DirectoryI = New DirectoryI("/", Nothing)
+
+            ' Create a file called "README" in the root directory
+            '
+            Dim file As FileI = New FileI("README", root)
+            Dim text As String() = New String() {"This file system contains a collection of poetry."}
+            Try
+                file.write(text)
+            Catch e As GenericError
+                Console.Error.WriteLine(e.reason)
+            End Try
+
+            ' Create a directory called "Coleridge"
+            ' in the root directory
+            '
+            Dim coleridge As DirectoryI = New DirectoryI("Coleridge", root)
+
+            ' Create a file called "Kubla_Khan"
+            ' in the Coleridge directory
+            '
+            file = New FileI("Kubla_Khan", coleridge)
+            text = New String() {"In Xanadu did Kubla Khan", _
+            "A stately pleasure-dome decree:", _
+            "Where Alph, the sacred river, ran", _
+            "Through caverns measureless to man", _
+            "Down to a sunless sea."}
+            Try
+                CType(file, FileOperationsNC_).write(text)
+                file.write(text)
+            Catch e As GenericError
+                Console.Error.WriteLine(e.reason)
+            End Try
+
+            ' All objects are created, allow client requests now
+            '
+            adapter.activate()
+
+            ' Wait until we are done
+            '
+            communicator().waitForShutdown()
+
+            If interrupted() Then
+                Console.Error.WriteLine(appName() & ": terminating")
+            End If
+
+            Return 0
+        End Function
+
+    End Class
+
+    Public Sub Main(ByVal args As String())
+        Dim app As Server = New Server
+        Environment.Exit(app.Main(args))
+    End Sub
+
+End Module
diff --git a/vsplugin/config/Ice-VS2008.AddIn b/vsplugin/config/Ice-VS2008.AddIn
index 976634d8cad..8bf00555783 100755
--- a/vsplugin/config/Ice-VS2008.AddIn
+++ b/vsplugin/config/Ice-VS2008.AddIn
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<Extensibility xmlns="http://schemas.microsoft.com/AutomationExtensibility">
-    <HostApplication>
-        <Name>Microsoft Visual Studio</Name>
-        <Version>9.0</Version>
-    </HostApplication>
-    <Addin>
-        <FriendlyName>Ice-@ver@ Visual Studio Extension</FriendlyName>
-        <Description>Ice-@ver@ Visual Studio Extension for Visual Studio 2008</Description>
-        <AboutBoxDetails>The Ice Visual Studio Extension integrates Ice projects into the Visual Studio IDE. 
-The extension supports C++, .NET, and Silverlight projects. 
-To know more about Ice visit ZeroC website at http://www.zeroc.com</AboutBoxDetails>
-        <AboutIconData>0000010006002020100000000000E8020000660000001010100000000000280100004E0300002020000001000800A8080000760400001010000001000800680500001E0D00002020000001002000A8100000861200001010000001002000680400002E2300002800000020000000400000000100040000000000000000000000000000000000000000000000000000000000000000000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF001111111111111111111111111111111111111111111111111111111000001111111111111111111111111110ABA01111111111111111111111111110BAB01111111111111111111111111110ABA01111111111110000000000F00000BAB00000111111118888888888F0ABABABABABA0111111118F77777777F0BABABABABAB0111111118F77777777F0ABABABABABA0111111118F77777777F00000BAB00000110001118F77777777FFFFF0ABA01111108880118F777777777777F0BAB01111887788008F777777777777F0ABA011118FF770778F777777777777F0000011118FFF78088F777777777777FFFFFF111118FF70118F7777777777777777801111118881118F7777777777777777801111111111118F7777777777777777801111111111118F7777777777777777801111111111118F7777777777777777801111111111118FFFFFFFFFFFFFFFFF801111111111118888888888888888888011111111111111111870111118701111111111111111111118F0111118F011111111111111111111108011111080111111111111111111110808011108080111111111111111111877788018777880111111111111111118FF778018FF7780111111111111111118FFF78018FFF7801111111111111111118FF701118FF7011111111111111111111777111117771111111111111111111111111111111111111111FFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFF000000FF000000FF000000FF000000FF000000C700000F8300000F0000000F0000000F0000000F8300000FC700000FFF00000FFF00000FFF00000FFF00000FFF00000FFFF8F8FFFFF8F8FFFFF8F8FFFFF0707FFFE0203FFFE0203FFFE0203FFFF0707FFFF8F8FFFFFFFFFF2800000010000000200000000100040000000000000000000000000000000000000000000000000000000000000000000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF0011111111111111111111111111100011111111111110A011111111111000B00011110000F0ABABA011118F88F000B00011118F77FFF0A01170718F7777F000110F008F7777FFFF1170718F777777801111118FFFFFFF801111118888888880111111111101111111111111170711111111111110F01111111111111707111111FFFF1111FFE37777FFE3ABABFF80ABA0F0001111F0007777F0030000100300000003011110037777F003FFF0F0031111FF7F8011FE3F7777FE3F77F0FE3F1111280000002000000040000000010008000000000000000000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000C0DCC000F0CAA600AA3F2A00FF3F2A00005F2A00555F2A00AA5F2A00FF5F2A00007F2A00557F2A00AA7F2A00FF7F2A00009F2A00559F2A00AA9F2A00FF9F2A0000BF2A0055BF2A00AABF2A00FFBF2A0000DF2A0055DF2A00AADF2A00FFDF2A0000FF2A0055FF2A00AAFF2A00FFFF2A000000550055005500AA005500FF005500001F5500551F5500AA1F5500FF1F5500003F5500553F5500AA3F5500FF3F5500005F5500555F5500AA5F5500FF5F5500007F5500557F5500AA7F5500FF7F5500009F5500559F5500AA9F5500FF9F550000BF550055BF5500AABF5500FFBF550000DF550055DF5500AADF5500FFDF550000FF550055FF5500AAFF5500FFFF550000007F0055007F00AA007F00FF007F00001F7F00551F7F00AA1F7F00FF1F7F00003F7F00553F7F00AA3F7F00FF3F7F00005F7F00555F7F00AA5F7F00FF5F7F00007F7F00557F7F00AA7F7F00FF7F7F00009F7F00559F7F00AA9F7F00FF9F7F0000BF7F0055BF7F00AABF7F00FFBF7F0000DF7F0055DF7F00AADF7F00FFDF7F0000FF7F0055FF7F00AAFF7F00FFFF7F000000AA005500AA00AA00AA00FF00AA00001FAA00551FAA00AA1FAA00FF1FAA00003FAA00553FAA00AA3FAA00FF3FAA00005FAA00555FAA00AA5FAA00FF5FAA00007FAA00557FAA00AA7FAA00FF7FAA00009FAA00559FAA00AA9FAA00FF9FAA0000BFAA0055BFAA00AABFAA00FFBFAA0000DFAA0055DFAA00AADFAA00FFDFAA0000FFAA0055FFAA00AAFFAA00FFFFAA000000D4005500D400AA00D400FF00D400001FD400551FD400AA1FD400FF1FD400003FD400553FD400AA3FD400FF3FD400005FD400555FD400AA5FD400FF5FD400007FD400557FD400AA7FD400FF7FD400009FD400559FD400AA9FD400FF9FD40000BFD40055BFD400AABFD400FFBFD40000DFD40055DFD400AADFD400FFDFD40000FFD40055FFD400AAFFD400FFFFD4005500FF00AA00FF00001FFF00551FFF00AA1FFF00FF1FFF00003FFF00553FFF00AA3FFF00FF3FFF00005FFF00555FFF00AA5FFF00FF5FFF00007FFF00557FFF00AA7FFF00FF7FFF00009FFF00559FFF00AA9FFF00FF9FFF0000BFFF0055BFFF00AABFFF00FFBFFF0000DFFF0055DFFF00AADFFF00FFDFFF0055FFFF00AAFFFF00FFCCCC00FFCCFF00FFFF3300FFFF6600FFFF9900FFFFCC00007F0000557F0000AA7F0000FF7F0000009F0000559F0000AA9F0000FF9F000000BF000055BF0000AABF0000FFBF000000DF000055DF0000AADF0000FFDF000055FF0000AAFF000000002A0055002A00AA002A00FF002A00001F2A00551F2A00AA1F2A00FF1F2A00003F2A00553F2A00F0FBFF00A4A0A000808080000000FF0000FF000000FFFF00FF00000000000000FFFF0000FFFFFF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0C0CF50CF5FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0D3938350CFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD303939380DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD11395D390CFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD35353535356139393110310D30FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD39666162616161613939393811FDFDFDFDFDFDFDFDFDFD3231073231323132083D858A61666261616161393935FDFDFDFDFDFDFDFDFD5E080909820982838608398A8A8A856165626161613D35FDFDFDFDFDFDFDFD82B3AF08080808080808AB39393939398A86613935353535FDFDFDFDFDFDFDFD86D1F6AFAFAFAFAF08AF0808D408D4398A6586390886FDFDFD5A073632FDFDFD86B3F6F6F6AFF6AFAFAFAF08AB0808398A8A8A39D432FDFD8286D4825A35FDFD82FFF6AFF6F6AFF6AF08D1AF08AFD43D8A8A8A610831FDFD5EFFAF088232363286FFFFF6F6AFF6AFF6AFAF08AF08085D61613D5DD4F5FDFD82F6F6AF085A825E82FFFFFFFFF6D1F6AFF6AFF6AFAFAF080808D408D431FDFD86D4FFFF095EFDFD09FFFFFFFFFFF6B3F6F6AFAFD108AFAFAF08AB09860DFDFDFD08825E86FDFDFD82FFFFFFFFFFFFF6F6AFF6F6AFF6AF08D1AF08088232FDFDFDFDFDFDFDFDFDFD86FFFFFFFFFFFFFFFFFFF6AFF6AFF6AFAF08AF088331FDFDFDFDFDFDFDFDFDFDFD86FFFFFFFFFFFFFFFFFFFFF6F6AFF6AFAFAF0807FDFDFDFDFDFDFDFDFDFDFDFDFD86828682825EF75E5E5E5A5E5A5A07360736FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5E31FDFDFDFDFDFD5E31FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8232FDFDFDFDFDFD8232FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5A360732FDFDFDFD5A360732FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8286D4823607FDFD8286D4823607FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFFAF088232FDFD5EFFAF088232FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF7D1FFAF0807FDFDF7D1FFAF0807FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0808FFFF095EFDFD0808FFFF095EFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0982F786FDFDFDFD0982F786FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFFFFE000FFFFE000FFC00000FF800000FF000000FF000003870000030300000300000003000000030300000387000003FF000003FF800007FFC0000FFFFCFCFFFFFCFCFFFFF8787FFFF0303FFFF0303FFFF0303FFFF0303FFFF8787FFFFFFFFFFFFFFFFF280000001000000020000000010008000000000000000000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000C0DCC000F0CAA600AA3F2A00FF3F2A00005F2A00555F2A00AA5F2A00FF5F2A00007F2A00557F2A00AA7F2A00FF7F2A00009F2A00559F2A00AA9F2A00FF9F2A0000BF2A0055BF2A00AABF2A00FFBF2A0000DF2A0055DF2A00AADF2A00FFDF2A0000FF2A0055FF2A00AAFF2A00FFFF2A000000550055005500AA005500FF005500001F5500551F5500AA1F5500FF1F5500003F5500553F5500AA3F5500FF3F5500005F5500555F5500AA5F5500FF5F5500007F5500557F5500AA7F5500FF7F5500009F5500559F5500AA9F5500FF9F550000BF550055BF5500AABF5500FFBF550000DF550055DF5500AADF5500FFDF550000FF550055FF5500AAFF5500FFFF550000007F0055007F00AA007F00FF007F00001F7F00551F7F00AA1F7F00FF1F7F00003F7F00553F7F00AA3F7F00FF3F7F00005F7F00555F7F00AA5F7F00FF5F7F00007F7F00557F7F00AA7F7F00FF7F7F00009F7F00559F7F00AA9F7F00FF9F7F0000BF7F0055BF7F00AABF7F00FFBF7F0000DF7F0055DF7F00AADF7F00FFDF7F0000FF7F0055FF7F00AAFF7F00FFFF7F000000AA005500AA00AA00AA00FF00AA00001FAA00551FAA00AA1FAA00FF1FAA00003FAA00553FAA00AA3FAA00FF3FAA00005FAA00555FAA00AA5FAA00FF5FAA00007FAA00557FAA00AA7FAA00FF7FAA00009FAA00559FAA00AA9FAA00FF9FAA0000BFAA0055BFAA00AABFAA00FFBFAA0000DFAA0055DFAA00AADFAA00FFDFAA0000FFAA0055FFAA00AAFFAA00FFFFAA000000D4005500D400AA00D400FF00D400001FD400551FD400AA1FD400FF1FD400003FD400553FD400AA3FD400FF3FD400005FD400555FD400AA5FD400FF5FD400007FD400557FD400AA7FD400FF7FD400009FD400559FD400AA9FD400FF9FD40000BFD40055BFD400AABFD400FFBFD40000DFD40055DFD400AADFD400FFDFD40000FFD40055FFD400AAFFD400FFFFD4005500FF00AA00FF00001FFF00551FFF00AA1FFF00FF1FFF00003FFF00553FFF00AA3FFF00FF3FFF00005FFF00555FFF00AA5FFF00FF5FFF00007FFF00557FFF00AA7FFF00FF7FFF00009FFF00559FFF00AA9FFF00FF9FFF0000BFFF0055BFFF00AABFFF00FFBFFF0000DFFF0055DFFF00AADFFF00FFDFFF0055FFFF00AAFFFF00FFCCCC00FFCCFF00FFFF3300FFFF6600FFFF9900FFFFCC00007F0000557F0000AA7F0000FF7F0000009F0000559F0000AA9F0000FF9F000000BF000055BF0000AABF0000FFBF000000DF000055DF0000AADF0000FFDF000055FF0000AAFF000000002A0055002A00AA002A00FF002A00001F2A00551F2A00AA1F2A00FF1F2A00003F2A00553F2A00F0FBFF00A4A0A000808080000000FF0000FF000000FFFF00FF00000000000000FFFF0000FFFFFF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD353535FDFDFDFDFDFDFDFDFDFDFDFDFD356535FDFDFDFDFDFDFDFDFDFDFD39393985351111FDFDFDFDFDFDFDFDFD398A8A8A8A8935FDFDFDFDFDFD3131823D39398A393535FDFDFDFDFD32AF820808AB3DB239FDFDFDFDF5FDFD5AF6AFAFAF08393939FDFDFD5EFFF5F55EFFF6F6AFF6AF0886FDFDFDFD5EFDFD5EFFFFF6F6AFAFD4F5FDFDFDFDFDFDFDFDF75E5E5A5A0731FDFDFDFDFDFDFDFDFDFDFDFDF5FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF5FDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFFF5FDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFDFDFFC7FDFDFFC7FDFDFF01FDFDFF01FD39F8016261F0076139B00738110007FDFDB007FDFDF80F3231FF7F3132FF7F083DFE3F6166FF7F6161FFFF39352800000020000000400000000100200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002E5B35FC295231FF274F2FFF264D2EFF27502FFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000306138FE329A4FFF2C9649FF259244FF2A5432FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000356A3DFC3FA259FF389D54FF319A4EFF2E5D36FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000397341FE4DAB66FF45A65FFF3DA158FF316439FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045874CFF43854BFF42824AFF407E47FF3F7C46FF5BB471FF53AF6AFF4BAA64FF356B3DFF34683CFF33673BFF326439FF306038FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000519F58FF85CF94FF7FCA8FFF77C689FF70C183FF69BD7DFF61B876FF59B370FF51AE6AFF49A963FF42A55CFF3B9F56FF387040FF00000000000000000000000000000000000000000000000000000000000000000000000089715F4689715FFF866E5BFF846B59FF816855FF7E6552FF7B624FFF79604CFF846E5CFFCAC1B9FF55A85DFF8FD59CFF8AD198FF84CD93FF7DCA8EFF76C688FF6EC082FF67BB7CFF5FB775FF58B26EFF50AD67FF48A861FF3E7A46FF000000000000000000000000000000000000000000000000000000000000000089715F46AE998AFFD2C0B6FFD0BDB3FFCEBBB1FFCCB9AEFFCBB6ABFFCAB4A9FFC7B2A6FFCCB8ADFFD4C4BCFF5AB061FF97DAA3FF93D8A0FF8ED49CFF88D097FF83CC92FF7BC98CFF75C487FF6DC081FF65BB7AFF5EB673FF56B16DFF43854AFF0000000000000000000000000000000000000000000000000000000000000000C3AFA2FFF3EFECFFE6DEDAFFE0D4CEFFDFD2CAFFDDCEC7FFDACCC3FFD8C9C1FFD6C6BDFFD8C8C1FFE1D6CFFF59AB60FF58AA5EFF56A75DFF55A65DFF57AA5EFF8DD39BFF87CF97FF81CC91FF4F9B57FF4B9352FF498D50FF478C4FFC46894DFC0000000000000000000000000000000000000000000000000000000000000000C4B0A3FFF7F3F1FFF5F0EEFFF2EDEBFFEFEAE7FFEEE6E3FFEBE3DFFFE8DFDBFFE6DCD6FFE4D8D2FFE1D4CEFFDED0CAFFDCCDC6FFD9C9C2FFD6C6BDFF57AB5EFF95D9A2FF91D69EFF8CD29AFF519E58FFDED2CBFFC4BAB2FF0000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C0826855310000000000000000C5B1A4FFF9F7F5FFF7F4F3FFF5F2EFFFF3EEECFFF0EBE8FFEFE8E4FFEDE4E1FFEAE1DDFFE7DDD8FFE4DAD4FFE2D7D0FFDFD3CCFFDCCEC8FFDACBC3FF5AAE62FF99DBA5FF99DAA4FF94D8A2FF54A45BFFDFD4CEFF846E5EFF0000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC00000000000000000C5B2A4FFFBFAF9FFF9F8F6FFF8F5F3FFF6F3F0FFF4EFEEFFF2ECEAFFF0EAE6FFEEE6E2FFEBE3DEFFE8DFDAFFE5DBD6FFE3D8D2FFE0D4CDFFDDD0C9FF5DB564FF99DBA5FF99DBA5FF99DBA5FF69B570FFDDD1CAFF69503BFF0000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF8866E5BFF846B59FFC6B2A5FFFDFDFDFFFCFAFAFFFBF9F8FFF9F6F5FFF7F3F2FFF5F0EEFFF2EEECFFF0EBE8FFEEE7E4FFECE4E0FFE9E1DCFFE6DDD7FFE4D9D4FFE2D6D0FF5DB263FF62BF69FF62BF69FF61BE68FF6AB671FFDED2CBFF6C523EFF0000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF8C7B1A6FFB39A8AFFC6B3A5FFFFFFFFFFFFFDFEFFFDFBFBFFFBFAF9FFF9F8F6FFF7F5F3FFF5F2F0FFF3EFEDFFF1ECE9FFEFE9E5FFEDE6E2FFEBE3DEFFE8DFDAFFE6DBD5FFE2D8D2FFE0D4CDFFDDCFC9FFDFD1CBFFDED2CBFFDDCFC7FF6F5541FF0000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C00000000000000000C7B3A6FFFFFFFFFFFFFFFFFFFFFFFEFFFDFCFDFFFCFBFAFFFAF9F8FFF8F6F5FFF7F3F2FFF5F0EFFFF2EDEAFFF0EAE7FFEEE7E3FFEBE4DFFFE9E0DCFFE6DDD7FFE4D9D3FFE1D5CFFFDFD1CBFFD0BDB4FFC5B0A4FF725945FF0000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB310000000000000000C7B5A7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFEFDFFFCFCFBFFFBFAF8FFFAF7F6FFF7F5F2FFF6F2EFFFF3EFEDFFF2ECE9FFEFE9E5FFECE5E1FFEAE2DDFFE7DED9FFE5DBD5FFE2D7D1FFD3C2BAFFC8B3A8FF755C49FF00000000000000000000000000000000000000000000000000000000000000000000000000000000C8B5A8CAFFFFFFDAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFDFCFCFFFCFBFAFFFAF8F8FFF8F6F4FFF6F3F1FFF5F0EEFFF2EDEAFFF0EAE6FFEDE6E3FFEBE4DFFFE9E0DBFFE6DCD7FFDCCFC8FFCBB7ABFF795F4CFF0000000000000000000000000000000000000000000000000000000000000000000000000000000089715F31C5B1A4B2FFFFFFCDFFFFFFEAFFFFFFF4FFFFFFFFFFFFFFFFFFFFFFFFFEFDFDFFFDFCFBFFFBFAF9FFFAF6F5FFF7F4F3FFF5F2EFFFF3EEECFFF1EBE8FFEFE8E5FFECE5E1FFEAE1DDFFE4DAD5FF866E5CFF866E5C46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000089715F31C5B1A4B2C3AFA2D3C0AD9EE8BDA99CFFBBA698FFB7A495FFB5A091FFB19C8DFFAE9989FFAB9585FFA79281FFA48E7DFFA08A7AFF9C8675FF988271FF957E6DFF917A68FF8A7260FF866E5C460000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B39A8AFF846B59FF000000000000000000000000000000000000000000000000B39A8AFF846B59FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C7B1A6FF866E5BFF000000000000000000000000000000000000000000000000C7B1A6FF866E5BFF0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C0826855310000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C082685531000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC00000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF80000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF80000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C00000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB310000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB3100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFFFFE000FFFFE000FF800000FF000000FF000000FF000003030000030300000300000003000000030300000303000003FF000003FF000003FF800007FFFCFCFFFFFCFCFFFFF0303FFFF0303FFFF0303FFFF0303FFFF0303FFFF0303FFFFFFFFFFFFFFFFF2800000010000000200000000100200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFF4643854BFF407D47FF3B7643FFFFFFFF46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000488E50FF7BC88DFF3F7D47FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055A65CFF519E58FF4D9554FF8AD29AFF43854BFF407E47FF3C7643FF00000000000000000000000000000000000000000000000000000000000000000000000059AE60FFA4E3B2FF9FE0ADFF9ADCA8FF94D9A3FF8ED59FFF407E47FF000000000000000000000000000000000000000000000000755B46FF6E5541FFC0B5ACFF5CB463FF59AE60FF55A65CFFAAE7B7FF4C9653FF478D4FFF44854BFF00000000000000000000000000000000FFFFFF31856D5AFFEDE6E3FFBFA79AFFD5C6BDFFD7C8C0FFD3C5BCFF59AE60FFB9F0C3FF509E58FF0000000000000000000000006348333B634833FF6348333BFFFFFF6A97806FFFF6F2F1FFF2EDEAFFEDE6E3FFE8E0DCFFE4D9D3FF5DB464FF59AE60FF55A75CFF000000000000000000000000AE9A8BFFFFFFFFFF634833FF634833FFA99484FFFDFBFCFFF9F7F7FFF6F3F0FFF2EDEAFFEDE7E3FFEBE3E0FFD9CEC7FFC4BAB2FF0000000000000000000000006348333BAE9A8BFF6348333BFFFFFF79B29D8EFFFFFFFFFFFCFCFBFFFAF8F7FFF6F2F1FFF2EDEAFFE9E0DBFFDFD2CBFF694E3AFF000000000000000000000000000000000000000000000000FFFFFF4600000000B6A193FFAE9A8BFFA79181FF9F8979FF97806FFF876F5DFF785F4CFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000634833FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006348333F634833FF6348333F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000AE9A8BFFFFFFFFFF634833FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006348333FAE9A8BFF6348333F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFF0000FF830000FFC70000FF010000FF010000F8010000E0070000000700000007000000070000E80F0000FF7F0000FE3F0000FE3F0000FE3F0000FFFF0000</AboutIconData>
-        <Assembly>C:\Ice-@ver@\bin\IceVisualStudioAddin-VS2008.dll</Assembly>
-        <FullClassName>Ice.VisualStudio.Connect</FullClassName>
-        <LoadBehavior>1</LoadBehavior>
-        <CommandPreload>1</CommandPreload>
-        <CommandLineSafe>1</CommandLineSafe>
-    </Addin>
-</Extensibility>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<Extensibility xmlns="http://schemas.microsoft.com/AutomationExtensibility">

+    <HostApplication>

+        <Name>Microsoft Visual Studio</Name>

+        <Version>9.0</Version>

+    </HostApplication>

+    <Addin>

+        <FriendlyName>Ice-@ver@ Visual Studio Extension</FriendlyName>

+        <Description>Ice-@ver@ Visual Studio Extension for Visual Studio 2008</Description>

+        <AboutBoxDetails>The Ice Visual Studio Extension integrates Ice projects into the Visual Studio IDE. 

+The extension supports C++, .NET, and Silverlight projects. 

+To know more about Ice visit ZeroC website at http://www.zeroc.com</AboutBoxDetails>

+        <AboutIconData>0000010006002020100000000000E8020000660000001010100000000000280100004E0300002020000001000800A8080000760400001010000001000800680500001E0D00002020000001002000A8100000861200001010000001002000680400002E2300002800000020000000400000000100040000000000000000000000000000000000000000000000000000000000000000000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF001111111111111111111111111111111111111111111111111111111000001111111111111111111111111110ABA01111111111111111111111111110BAB01111111111111111111111111110ABA01111111111110000000000F00000BAB00000111111118888888888F0ABABABABABA0111111118F77777777F0BABABABABAB0111111118F77777777F0ABABABABABA0111111118F77777777F00000BAB00000110001118F77777777FFFFF0ABA01111108880118F777777777777F0BAB01111887788008F777777777777F0ABA011118FF770778F777777777777F0000011118FFF78088F777777777777FFFFFF111118FF70118F7777777777777777801111118881118F7777777777777777801111111111118F7777777777777777801111111111118F7777777777777777801111111111118F7777777777777777801111111111118FFFFFFFFFFFFFFFFF801111111111118888888888888888888011111111111111111870111118701111111111111111111118F0111118F011111111111111111111108011111080111111111111111111110808011108080111111111111111111877788018777880111111111111111118FF778018FF7780111111111111111118FFF78018FFF7801111111111111111118FF701118FF7011111111111111111111777111117771111111111111111111111111111111111111111FFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFF000000FF000000FF000000FF000000FF000000C700000F8300000F0000000F0000000F0000000F8300000FC700000FFF00000FFF00000FFF00000FFF00000FFF00000FFFF8F8FFFFF8F8FFFFF8F8FFFFF0707FFFE0203FFFE0203FFFE0203FFFF0707FFFF8F8FFFFFFFFFF2800000010000000200000000100040000000000000000000000000000000000000000000000000000000000000000000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF0011111111111111111111111111100011111111111110A011111111111000B00011110000F0ABABA011118F88F000B00011118F77FFF0A01170718F7777F000110F008F7777FFFF1170718F777777801111118FFFFFFF801111118888888880111111111101111111111111170711111111111110F01111111111111707111111FFFF1111FFE37777FFE3ABABFF80ABA0F0001111F0007777F0030000100300000003011110037777F003FFF0F0031111FF7F8011FE3F7777FE3F77F0FE3F1111280000002000000040000000010008000000000000000000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000C0DCC000F0CAA600AA3F2A00FF3F2A00005F2A00555F2A00AA5F2A00FF5F2A00007F2A00557F2A00AA7F2A00FF7F2A00009F2A00559F2A00AA9F2A00FF9F2A0000BF2A0055BF2A00AABF2A00FFBF2A0000DF2A0055DF2A00AADF2A00FFDF2A0000FF2A0055FF2A00AAFF2A00FFFF2A000000550055005500AA005500FF005500001F5500551F5500AA1F5500FF1F5500003F5500553F5500AA3F5500FF3F5500005F5500555F5500AA5F5500FF5F5500007F5500557F5500AA7F5500FF7F5500009F5500559F5500AA9F5500FF9F550000BF550055BF5500AABF5500FFBF550000DF550055DF5500AADF5500FFDF550000FF550055FF5500AAFF5500FFFF550000007F0055007F00AA007F00FF007F00001F7F00551F7F00AA1F7F00FF1F7F00003F7F00553F7F00AA3F7F00FF3F7F00005F7F00555F7F00AA5F7F00FF5F7F00007F7F00557F7F00AA7F7F00FF7F7F00009F7F00559F7F00AA9F7F00FF9F7F0000BF7F0055BF7F00AABF7F00FFBF7F0000DF7F0055DF7F00AADF7F00FFDF7F0000FF7F0055FF7F00AAFF7F00FFFF7F000000AA005500AA00AA00AA00FF00AA00001FAA00551FAA00AA1FAA00FF1FAA00003FAA00553FAA00AA3FAA00FF3FAA00005FAA00555FAA00AA5FAA00FF5FAA00007FAA00557FAA00AA7FAA00FF7FAA00009FAA00559FAA00AA9FAA00FF9FAA0000BFAA0055BFAA00AABFAA00FFBFAA0000DFAA0055DFAA00AADFAA00FFDFAA0000FFAA0055FFAA00AAFFAA00FFFFAA000000D4005500D400AA00D400FF00D400001FD400551FD400AA1FD400FF1FD400003FD400553FD400AA3FD400FF3FD400005FD400555FD400AA5FD400FF5FD400007FD400557FD400AA7FD400FF7FD400009FD400559FD400AA9FD400FF9FD40000BFD40055BFD400AABFD400FFBFD40000DFD40055DFD400AADFD400FFDFD40000FFD40055FFD400AAFFD400FFFFD4005500FF00AA00FF00001FFF00551FFF00AA1FFF00FF1FFF00003FFF00553FFF00AA3FFF00FF3FFF00005FFF00555FFF00AA5FFF00FF5FFF00007FFF00557FFF00AA7FFF00FF7FFF00009FFF00559FFF00AA9FFF00FF9FFF0000BFFF0055BFFF00AABFFF00FFBFFF0000DFFF0055DFFF00AADFFF00FFDFFF0055FFFF00AAFFFF00FFCCCC00FFCCFF00FFFF3300FFFF6600FFFF9900FFFFCC00007F0000557F0000AA7F0000FF7F0000009F0000559F0000AA9F0000FF9F000000BF000055BF0000AABF0000FFBF000000DF000055DF0000AADF0000FFDF000055FF0000AAFF000000002A0055002A00AA002A00FF002A00001F2A00551F2A00AA1F2A00FF1F2A00003F2A00553F2A00F0FBFF00A4A0A000808080000000FF0000FF000000FFFF00FF00000000000000FFFF0000FFFFFF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0C0CF50CF5FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0D3938350CFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD303939380DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD11395D390CFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD35353535356139393110310D30FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD39666162616161613939393811FDFDFDFDFDFDFDFDFDFD3231073231323132083D858A61666261616161393935FDFDFDFDFDFDFDFDFD5E080909820982838608398A8A8A856165626161613D35FDFDFDFDFDFDFDFD82B3AF08080808080808AB39393939398A86613935353535FDFDFDFDFDFDFDFD86D1F6AFAFAFAFAF08AF0808D408D4398A6586390886FDFDFD5A073632FDFDFD86B3F6F6F6AFF6AFAFAFAF08AB0808398A8A8A39D432FDFD8286D4825A35FDFD82FFF6AFF6F6AFF6AF08D1AF08AFD43D8A8A8A610831FDFD5EFFAF088232363286FFFFF6F6AFF6AFF6AFAF08AF08085D61613D5DD4F5FDFD82F6F6AF085A825E82FFFFFFFFF6D1F6AFF6AFF6AFAFAF080808D408D431FDFD86D4FFFF095EFDFD09FFFFFFFFFFF6B3F6F6AFAFD108AFAFAF08AB09860DFDFDFD08825E86FDFDFD82FFFFFFFFFFFFF6F6AFF6F6AFF6AF08D1AF08088232FDFDFDFDFDFDFDFDFDFD86FFFFFFFFFFFFFFFFFFF6AFF6AFF6AFAF08AF088331FDFDFDFDFDFDFDFDFDFDFD86FFFFFFFFFFFFFFFFFFFFF6F6AFF6AFAFAF0807FDFDFDFDFDFDFDFDFDFDFDFDFD86828682825EF75E5E5E5A5E5A5A07360736FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5E31FDFDFDFDFDFD5E31FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8232FDFDFDFDFDFD8232FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5A360732FDFDFDFD5A360732FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8286D4823607FDFD8286D4823607FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFFAF088232FDFD5EFFAF088232FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF7D1FFAF0807FDFDF7D1FFAF0807FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0808FFFF095EFDFD0808FFFF095EFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0982F786FDFDFDFD0982F786FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFFFFE000FFFFE000FFC00000FF800000FF000000FF000003870000030300000300000003000000030300000387000003FF000003FF800007FFC0000FFFFCFCFFFFFCFCFFFFF8787FFFF0303FFFF0303FFFF0303FFFF0303FFFF8787FFFFFFFFFFFFFFFFF280000001000000020000000010008000000000000000000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000C0DCC000F0CAA600AA3F2A00FF3F2A00005F2A00555F2A00AA5F2A00FF5F2A00007F2A00557F2A00AA7F2A00FF7F2A00009F2A00559F2A00AA9F2A00FF9F2A0000BF2A0055BF2A00AABF2A00FFBF2A0000DF2A0055DF2A00AADF2A00FFDF2A0000FF2A0055FF2A00AAFF2A00FFFF2A000000550055005500AA005500FF005500001F5500551F5500AA1F5500FF1F5500003F5500553F5500AA3F5500FF3F5500005F5500555F5500AA5F5500FF5F5500007F5500557F5500AA7F5500FF7F5500009F5500559F5500AA9F5500FF9F550000BF550055BF5500AABF5500FFBF550000DF550055DF5500AADF5500FFDF550000FF550055FF5500AAFF5500FFFF550000007F0055007F00AA007F00FF007F00001F7F00551F7F00AA1F7F00FF1F7F00003F7F00553F7F00AA3F7F00FF3F7F00005F7F00555F7F00AA5F7F00FF5F7F00007F7F00557F7F00AA7F7F00FF7F7F00009F7F00559F7F00AA9F7F00FF9F7F0000BF7F0055BF7F00AABF7F00FFBF7F0000DF7F0055DF7F00AADF7F00FFDF7F0000FF7F0055FF7F00AAFF7F00FFFF7F000000AA005500AA00AA00AA00FF00AA00001FAA00551FAA00AA1FAA00FF1FAA00003FAA00553FAA00AA3FAA00FF3FAA00005FAA00555FAA00AA5FAA00FF5FAA00007FAA00557FAA00AA7FAA00FF7FAA00009FAA00559FAA00AA9FAA00FF9FAA0000BFAA0055BFAA00AABFAA00FFBFAA0000DFAA0055DFAA00AADFAA00FFDFAA0000FFAA0055FFAA00AAFFAA00FFFFAA000000D4005500D400AA00D400FF00D400001FD400551FD400AA1FD400FF1FD400003FD400553FD400AA3FD400FF3FD400005FD400555FD400AA5FD400FF5FD400007FD400557FD400AA7FD400FF7FD400009FD400559FD400AA9FD400FF9FD40000BFD40055BFD400AABFD400FFBFD40000DFD40055DFD400AADFD400FFDFD40000FFD40055FFD400AAFFD400FFFFD4005500FF00AA00FF00001FFF00551FFF00AA1FFF00FF1FFF00003FFF00553FFF00AA3FFF00FF3FFF00005FFF00555FFF00AA5FFF00FF5FFF00007FFF00557FFF00AA7FFF00FF7FFF00009FFF00559FFF00AA9FFF00FF9FFF0000BFFF0055BFFF00AABFFF00FFBFFF0000DFFF0055DFFF00AADFFF00FFDFFF0055FFFF00AAFFFF00FFCCCC00FFCCFF00FFFF3300FFFF6600FFFF9900FFFFCC00007F0000557F0000AA7F0000FF7F0000009F0000559F0000AA9F0000FF9F000000BF000055BF0000AABF0000FFBF000000DF000055DF0000AADF0000FFDF000055FF0000AAFF000000002A0055002A00AA002A00FF002A00001F2A00551F2A00AA1F2A00FF1F2A00003F2A00553F2A00F0FBFF00A4A0A000808080000000FF0000FF000000FFFF00FF00000000000000FFFF0000FFFFFF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD353535FDFDFDFDFDFDFDFDFDFDFDFDFD356535FDFDFDFDFDFDFDFDFDFDFD39393985351111FDFDFDFDFDFDFDFDFD398A8A8A8A8935FDFDFDFDFDFD3131823D39398A393535FDFDFDFDFD32AF820808AB3DB239FDFDFDFDF5FDFD5AF6AFAFAF08393939FDFDFD5EFFF5F55EFFF6F6AFF6AF0886FDFDFDFD5EFDFD5EFFFFF6F6AFAFD4F5FDFDFDFDFDFDFDFDF75E5E5A5A0731FDFDFDFDFDFDFDFDFDFDFDFDF5FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF5FDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFFF5FDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFDFDFFC7FDFDFFC7FDFDFF01FDFDFF01FD39F8016261F0076139B00738110007FDFDB007FDFDF80F3231FF7F3132FF7F083DFE3F6166FF7F6161FFFF39352800000020000000400000000100200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002E5B35FC295231FF274F2FFF264D2EFF27502FFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000306138FE329A4FFF2C9649FF259244FF2A5432FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000356A3DFC3FA259FF389D54FF319A4EFF2E5D36FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000397341FE4DAB66FF45A65FFF3DA158FF316439FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045874CFF43854BFF42824AFF407E47FF3F7C46FF5BB471FF53AF6AFF4BAA64FF356B3DFF34683CFF33673BFF326439FF306038FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000519F58FF85CF94FF7FCA8FFF77C689FF70C183FF69BD7DFF61B876FF59B370FF51AE6AFF49A963FF42A55CFF3B9F56FF387040FF00000000000000000000000000000000000000000000000000000000000000000000000089715F4689715FFF866E5BFF846B59FF816855FF7E6552FF7B624FFF79604CFF846E5CFFCAC1B9FF55A85DFF8FD59CFF8AD198FF84CD93FF7DCA8EFF76C688FF6EC082FF67BB7CFF5FB775FF58B26EFF50AD67FF48A861FF3E7A46FF000000000000000000000000000000000000000000000000000000000000000089715F46AE998AFFD2C0B6FFD0BDB3FFCEBBB1FFCCB9AEFFCBB6ABFFCAB4A9FFC7B2A6FFCCB8ADFFD4C4BCFF5AB061FF97DAA3FF93D8A0FF8ED49CFF88D097FF83CC92FF7BC98CFF75C487FF6DC081FF65BB7AFF5EB673FF56B16DFF43854AFF0000000000000000000000000000000000000000000000000000000000000000C3AFA2FFF3EFECFFE6DEDAFFE0D4CEFFDFD2CAFFDDCEC7FFDACCC3FFD8C9C1FFD6C6BDFFD8C8C1FFE1D6CFFF59AB60FF58AA5EFF56A75DFF55A65DFF57AA5EFF8DD39BFF87CF97FF81CC91FF4F9B57FF4B9352FF498D50FF478C4FFC46894DFC0000000000000000000000000000000000000000000000000000000000000000C4B0A3FFF7F3F1FFF5F0EEFFF2EDEBFFEFEAE7FFEEE6E3FFEBE3DFFFE8DFDBFFE6DCD6FFE4D8D2FFE1D4CEFFDED0CAFFDCCDC6FFD9C9C2FFD6C6BDFF57AB5EFF95D9A2FF91D69EFF8CD29AFF519E58FFDED2CBFFC4BAB2FF0000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C0826855310000000000000000C5B1A4FFF9F7F5FFF7F4F3FFF5F2EFFFF3EEECFFF0EBE8FFEFE8E4FFEDE4E1FFEAE1DDFFE7DDD8FFE4DAD4FFE2D7D0FFDFD3CCFFDCCEC8FFDACBC3FF5AAE62FF99DBA5FF99DAA4FF94D8A2FF54A45BFFDFD4CEFF846E5EFF0000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC00000000000000000C5B2A4FFFBFAF9FFF9F8F6FFF8F5F3FFF6F3F0FFF4EFEEFFF2ECEAFFF0EAE6FFEEE6E2FFEBE3DEFFE8DFDAFFE5DBD6FFE3D8D2FFE0D4CDFFDDD0C9FF5DB564FF99DBA5FF99DBA5FF99DBA5FF69B570FFDDD1CAFF69503BFF0000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF8866E5BFF846B59FFC6B2A5FFFDFDFDFFFCFAFAFFFBF9F8FFF9F6F5FFF7F3F2FFF5F0EEFFF2EEECFFF0EBE8FFEEE7E4FFECE4E0FFE9E1DCFFE6DDD7FFE4D9D4FFE2D6D0FF5DB263FF62BF69FF62BF69FF61BE68FF6AB671FFDED2CBFF6C523EFF0000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF8C7B1A6FFB39A8AFFC6B3A5FFFFFFFFFFFFFDFEFFFDFBFBFFFBFAF9FFF9F8F6FFF7F5F3FFF5F2F0FFF3EFEDFFF1ECE9FFEFE9E5FFEDE6E2FFEBE3DEFFE8DFDAFFE6DBD5FFE2D8D2FFE0D4CDFFDDCFC9FFDFD1CBFFDED2CBFFDDCFC7FF6F5541FF0000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C00000000000000000C7B3A6FFFFFFFFFFFFFFFFFFFFFFFEFFFDFCFDFFFCFBFAFFFAF9F8FFF8F6F5FFF7F3F2FFF5F0EFFFF2EDEAFFF0EAE7FFEEE7E3FFEBE4DFFFE9E0DCFFE6DDD7FFE4D9D3FFE1D5CFFFDFD1CBFFD0BDB4FFC5B0A4FF725945FF0000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB310000000000000000C7B5A7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFEFDFFFCFCFBFFFBFAF8FFFAF7F6FFF7F5F2FFF6F2EFFFF3EFEDFFF2ECE9FFEFE9E5FFECE5E1FFEAE2DDFFE7DED9FFE5DBD5FFE2D7D1FFD3C2BAFFC8B3A8FF755C49FF00000000000000000000000000000000000000000000000000000000000000000000000000000000C8B5A8CAFFFFFFDAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFDFCFCFFFCFBFAFFFAF8F8FFF8F6F4FFF6F3F1FFF5F0EEFFF2EDEAFFF0EAE6FFEDE6E3FFEBE4DFFFE9E0DBFFE6DCD7FFDCCFC8FFCBB7ABFF795F4CFF0000000000000000000000000000000000000000000000000000000000000000000000000000000089715F31C5B1A4B2FFFFFFCDFFFFFFEAFFFFFFF4FFFFFFFFFFFFFFFFFFFFFFFFFEFDFDFFFDFCFBFFFBFAF9FFFAF6F5FFF7F4F3FFF5F2EFFFF3EEECFFF1EBE8FFEFE8E5FFECE5E1FFEAE1DDFFE4DAD5FF866E5CFF866E5C46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000089715F31C5B1A4B2C3AFA2D3C0AD9EE8BDA99CFFBBA698FFB7A495FFB5A091FFB19C8DFFAE9989FFAB9585FFA79281FFA48E7DFFA08A7AFF9C8675FF988271FF957E6DFF917A68FF8A7260FF866E5C460000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B39A8AFF846B59FF000000000000000000000000000000000000000000000000B39A8AFF846B59FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C7B1A6FF866E5BFF000000000000000000000000000000000000000000000000C7B1A6FF866E5BFF0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C0826855310000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C082685531000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC00000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF80000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF80000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C00000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB310000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB3100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFFFFE000FFFFE000FF800000FF000000FF000000FF000003030000030300000300000003000000030300000303000003FF000003FF000003FF800007FFFCFCFFFFFCFCFFFFF0303FFFF0303FFFF0303FFFF0303FFFF0303FFFF0303FFFFFFFFFFFFFFFFF2800000010000000200000000100200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFF4643854BFF407D47FF3B7643FFFFFFFF46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000488E50FF7BC88DFF3F7D47FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055A65CFF519E58FF4D9554FF8AD29AFF43854BFF407E47FF3C7643FF00000000000000000000000000000000000000000000000000000000000000000000000059AE60FFA4E3B2FF9FE0ADFF9ADCA8FF94D9A3FF8ED59FFF407E47FF000000000000000000000000000000000000000000000000755B46FF6E5541FFC0B5ACFF5CB463FF59AE60FF55A65CFFAAE7B7FF4C9653FF478D4FFF44854BFF00000000000000000000000000000000FFFFFF31856D5AFFEDE6E3FFBFA79AFFD5C6BDFFD7C8C0FFD3C5BCFF59AE60FFB9F0C3FF509E58FF0000000000000000000000006348333B634833FF6348333BFFFFFF6A97806FFFF6F2F1FFF2EDEAFFEDE6E3FFE8E0DCFFE4D9D3FF5DB464FF59AE60FF55A75CFF000000000000000000000000AE9A8BFFFFFFFFFF634833FF634833FFA99484FFFDFBFCFFF9F7F7FFF6F3F0FFF2EDEAFFEDE7E3FFEBE3E0FFD9CEC7FFC4BAB2FF0000000000000000000000006348333BAE9A8BFF6348333BFFFFFF79B29D8EFFFFFFFFFFFCFCFBFFFAF8F7FFF6F2F1FFF2EDEAFFE9E0DBFFDFD2CBFF694E3AFF000000000000000000000000000000000000000000000000FFFFFF4600000000B6A193FFAE9A8BFFA79181FF9F8979FF97806FFF876F5DFF785F4CFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000634833FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006348333F634833FF6348333F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000AE9A8BFFFFFFFFFF634833FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006348333FAE9A8BFF6348333F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFF0000FF830000FFC70000FF010000FF010000F8010000E0070000000700000007000000070000E80F0000FF7F0000FE3F0000FE3F0000FE3F0000FFFF0000</AboutIconData>

+        <Assembly>C:\Ice-@ver@\bin\IceVisualStudioAddin-VS2008.dll</Assembly>

+        <FullClassName>Ice.VisualStudio.Connect</FullClassName>

+        <LoadBehavior>1</LoadBehavior>

+        <CommandPreload>1</CommandPreload>

+        <CommandLineSafe>1</CommandLineSafe>

+    </Addin>

+</Extensibility>

diff --git a/vsplugin/config/Make.rules.mak b/vsplugin/config/Make.rules.mak
index b98c3a256c3..10537b9dde9 100644
--- a/vsplugin/config/Make.rules.mak
+++ b/vsplugin/config/Make.rules.mak
@@ -1,100 +1,100 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-#
-# Select an installation base directory. The directory will be created
-# if it does not exist.
-#
-
-prefix			= C:\Ice-$(VERSION)
-
-#
-# Define DEBUG as yes if you want to build with debug information and
-# assertions enabled.
-#
-
-DEBUG			= yes
-
-#
-# Define OPTIMIZE as yes if you want to build with optimization.
-#
-
-OPTIMIZE		= yes
-
-#
-# Set the key file used to sign assemblies.
-#
-
-!if "$(KEYFILE)" == ""
-KEYFILE			= $(top_srcdir)\config\IceDevKey.snk
-!endif
-
-# ----------------------------------------------------------------------
-# Don't change anything below this line!
-# ----------------------------------------------------------------------
-
-#
-# Common definitions
-#
-ice_language = cs
-
-!if exist ($(top_srcdir)\..\config\Make.common.rules.mak)
-!include $(top_srcdir)\..\config\Make.common.rules.mak
-!else
-!include $(top_srcdir)\config\Make.common.rules.mak
-!endif
-
-EVERYTHING      = all install clean
-
-VS_HOME 		= $(VSINSTALLDIR)
-VSSDK_HOME		= $(VSSDK90INSTALL)
-PKG_PREFIX 		= VS2008
-
-bindir 			= ..\bin
-
-install_bindir 		= $(prefix)\bin
-install_configdir 	= $(prefix)\config
-
-OBJEXT			= .obj
-
-MCS			= csc -nologo
-
-MCSFLAGS 		= -d:MAKEFILE_BUILD -target:library -keyfile:$(KEYFILE) -warnaserror+
-
-#
-# Supress EnvDTE redirection warning.
-#
-MCSFLAGS 		= $(MCSFLAGS) -nowarn:1701
-
-!if "$(DEBUG)" == "yes"
-MCSFLAGS 		= $(MCSFLAGS) -debug -define:DEBUG
-!endif
-
-!if "$(OPTIMIZE)" == "yes"
-MCSFLAGS 		= $(MCSFLAGS) -optimize+
-!endif
-
-MCSFLAGS = $(MCSFLAGS) -define:VS2008
-
-MCSFLAGS = $(MCSFLAGS) /reference:"C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll"
-MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\EnvDTE.dll"
-MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\EnvDTE80.dll"
-MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Visual Studio Tools for Office\PIA\Office11\Extensibility.dll"
-MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.CommandBars.dll"
-MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\VSLangProj.dll"
-
-MCSFLAGS = $(MCSFLAGS) /reference:"$(VS_HOME)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll"
-MCSFLAGS = $(MCSFLAGS) /reference:"$(VS_HOME)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll"
-
-MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.OLE.Interop.dll"
-MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Shell.dll"
-MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Shell.Interop.dll"
-MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Shell.Interop.8.0.dll"
-
-all::
+# **********************************************************************

+#

+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

+#

+# This copy of Ice is licensed to you under the terms described in the

+# LICENSE file included in this distribution.

+#

+# **********************************************************************

+

+#

+# Select an installation base directory. The directory will be created

+# if it does not exist.

+#

+

+prefix			= C:\Ice-$(VERSION)

+

+#

+# Define DEBUG as yes if you want to build with debug information and

+# assertions enabled.

+#

+

+DEBUG			= yes

+

+#

+# Define OPTIMIZE as yes if you want to build with optimization.

+#

+

+OPTIMIZE		= yes

+

+#

+# Set the key file used to sign assemblies.

+#

+

+!if "$(KEYFILE)" == ""

+KEYFILE			= $(top_srcdir)\config\IceDevKey.snk

+!endif

+

+# ----------------------------------------------------------------------

+# Don't change anything below this line!

+# ----------------------------------------------------------------------

+

+#

+# Common definitions

+#

+ice_language = cs

+

+!if exist ($(top_srcdir)\..\config\Make.common.rules.mak)

+!include $(top_srcdir)\..\config\Make.common.rules.mak

+!else

+!include $(top_srcdir)\config\Make.common.rules.mak

+!endif

+

+EVERYTHING      = all install clean

+

+VS_HOME 		= $(VSINSTALLDIR)

+VSSDK_HOME		= $(VSSDK90INSTALL)

+PKG_PREFIX 		= VS2008

+

+bindir 			= ..\bin

+

+install_bindir 		= $(prefix)\bin

+install_configdir 	= $(prefix)\config

+

+OBJEXT			= .obj

+

+MCS			= csc -nologo

+

+MCSFLAGS 		= -d:MAKEFILE_BUILD -target:library -keyfile:$(KEYFILE) -warnaserror+

+

+#

+# Supress EnvDTE redirection warning.

+#

+MCSFLAGS 		= $(MCSFLAGS) -nowarn:1701

+

+!if "$(DEBUG)" == "yes"

+MCSFLAGS 		= $(MCSFLAGS) -debug -define:DEBUG

+!endif

+

+!if "$(OPTIMIZE)" == "yes"

+MCSFLAGS 		= $(MCSFLAGS) -optimize+

+!endif

+

+MCSFLAGS = $(MCSFLAGS) -define:VS2008

+

+MCSFLAGS = $(MCSFLAGS) /reference:"C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll"

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\EnvDTE.dll"

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\EnvDTE80.dll"

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Visual Studio Tools for Office\PIA\Office11\Extensibility.dll"

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.CommandBars.dll"

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\VSLangProj.dll"

+

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VS_HOME)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll"

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VS_HOME)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll"

+

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.OLE.Interop.dll"

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Shell.dll"

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Shell.Interop.dll"

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Shell.Interop.8.0.dll"

+

+all::

diff --git a/vsplugin/src/AssemblyInfo.cs b/vsplugin/src/AssemblyInfo.cs
index a30f2f95160..6d5f7965ec2 100644
--- a/vsplugin/src/AssemblyInfo.cs
+++ b/vsplugin/src/AssemblyInfo.cs
@@ -1,23 +1,23 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Reflection;

-using System.Runtime.CompilerServices;

-

-[assembly: AssemblyTitle("IceVisualStudioExtension")]

-[assembly: AssemblyDescription("Ice Extension for Visual Studio")]

-[assembly: AssemblyCompany("ZeroC, Inc.")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyProduct("Ice Extension for Visual Studio")]

-[assembly: AssemblyCopyright("Copyright (c) 2003-2010 ZeroC, Inc.")]

-[assembly: AssemblyTrademark("Ice")]

-[assembly: AssemblyCulture("")]

-[assembly: AssemblyVersion("3.4.0")]

-[assembly: AssemblyDelaySign(false)]

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("IceVisualStudioExtension")]
+[assembly: AssemblyDescription("Ice Extension for Visual Studio")]
+[assembly: AssemblyCompany("ZeroC, Inc.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyProduct("Ice Extension for Visual Studio")]
+[assembly: AssemblyCopyright("Copyright (c) 2003-2010 ZeroC, Inc.")]
+[assembly: AssemblyTrademark("Ice")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("3.4.0")]
+[assembly: AssemblyDelaySign(false)]
diff --git a/vsplugin/src/Builder.cs b/vsplugin/src/Builder.cs
index ee97d0e9589..a6c5b211539 100644
--- a/vsplugin/src/Builder.cs
+++ b/vsplugin/src/Builder.cs
@@ -1,2400 +1,2400 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Text;

-using System.IO;

-using System.Diagnostics;

-using System.Collections.Generic;

-using Extensibility;

-using EnvDTE;

-using EnvDTE80;

-using Microsoft.VisualStudio;

-using Microsoft.VisualStudio.CommandBars;

-using Microsoft.VisualStudio.VCProjectEngine;

-using Microsoft.VisualStudio.VCProject;

-using Microsoft.VisualStudio.Shell;

-using Microsoft.VisualStudio.Shell.Interop;

-using System.Resources;

-using System.Reflection;

-using VSLangProj;

-using System.Globalization;

-using Microsoft.VisualStudio.OLE.Interop;

-using System.Runtime.InteropServices;

-

-

-namespace Ice.VisualStudio

-{

-    public class Builder : IDisposable

-    {

-        protected virtual void Dispose(bool disposing)

-        {

-            if(disposing)

-            {

-                _serviceProvider.Dispose();

-                _errorListProvider.Dispose();

-            }

-        }

-        

-        public void Dispose()

-        {

-            Dispose(true);

-            GC.SuppressFinalize(this);

-        }

-

-        public DTE getCurrentDTE()

-        {

-            return _applicationObject.DTE;

-        }

-

-        public void init(DTE2 application, AddIn addInInstance)

-        {

-            _applicationObject = application;

-            _addInInstance = addInInstance;

-

-            //

-            // Subscribe to solution events.

-            //

-            _solutionEvents = application.Events.SolutionEvents;

-            _solutionEvents.Opened += new _dispSolutionEvents_OpenedEventHandler(solutionOpened);

-            _solutionEvents.AfterClosing += new _dispSolutionEvents_AfterClosingEventHandler(afterClosing);

-            _solutionEvents.ProjectAdded += new _dispSolutionEvents_ProjectAddedEventHandler(projectAdded);

-            _solutionEvents.ProjectRemoved += new _dispSolutionEvents_ProjectRemovedEventHandler(projectRemoved);

-            _solutionEvents.ProjectRenamed += new _dispSolutionEvents_ProjectRenamedEventHandler(projectRenamed);

-

-            _buildEvents = _applicationObject.Events.BuildEvents;

-            _buildEvents.OnBuildBegin += new _dispBuildEvents_OnBuildBeginEventHandler(buildBegin);

-            _buildEvents.OnBuildDone += new _dispBuildEvents_OnBuildDoneEventHandler(buildDone);

-            foreach(Command c in _applicationObject.Commands)

-            {

-                if(c.Name.Equals("Project.AddNewItem"))

-                {

-                    _addNewItemEvent = application.Events.get_CommandEvents(c.Guid, c.ID);

-                    _addNewItemEvent.AfterExecute += new _dispCommandEvents_AfterExecuteEventHandler(afterAddNewItem);

-                }

-                else if(c.Name.Equals("Edit.Remove"))

-                {

-                    _editRemoveEvent = application.Events.get_CommandEvents(c.Guid, c.ID);

-                    _editRemoveEvent.AfterExecute += new _dispCommandEvents_AfterExecuteEventHandler(editDeleteEvent);

-                }

-                else if(c.Name.Equals("Edit.Delete"))

-                {

-                    _editDeleteEvent = application.Events.get_CommandEvents(c.Guid, c.ID);

-                    _editDeleteEvent.AfterExecute += new _dispCommandEvents_AfterExecuteEventHandler(editDeleteEvent);

-                }

-                else if(c.Name.Equals("Project.AddExistingItem"))

-                {

-                    _addExistingItemEvent = application.Events.get_CommandEvents(c.Guid, c.ID);

-                    _addExistingItemEvent.AfterExecute +=

-                        new _dispCommandEvents_AfterExecuteEventHandler(afterAddExistingItem);

-                }

-            }

-            

-            //

-            // Subscribe to active configuration changed.

-            //

-            _serviceProvider =

-                new ServiceProvider((Microsoft.VisualStudio.OLE.Interop.IServiceProvider)_applicationObject.DTE);

-            initErrorListProvider();

-            setupCommandBars();

-        }

-

-        void editDeleteEvent(string Guid, int ID, object CustomIn, object CustomOut)

-        {

-            if(_deletedFile != null)

-            {

-                Project project = getActiveProject();

-                if(project != null)

-                {

-                    removeDependency(project, _deletedFile);

-                    _deletedFile = null;

-                    clearErrors(project);

-                    buildProject(project, false, vsBuildScope.vsBuildScopeProject);

-                }

-            }

-        }

-

-        public IVsSolution getIVsSolution()

-        {

-            return (IVsSolution) _serviceProvider.GetService(typeof(IVsSolution));

-        }

-

-        public void buildDone(vsBuildScope Scope, vsBuildAction Action)

-        {

-            _building = false;

-        }

-        

-        public bool isBuilding()

-        {

-            return _building;

-        }

-        

-

-        public void afterAddNewItem(string Guid, int ID, object obj, object CustomOut)

-        {

-            foreach(String path in _deleted)

-            {

-                if(path == null)

-                {

-                    continue;

-                }

-                if(File.Exists(path))

-                {

-                    File.Delete(path);

-                }

-            }

-            _deleted.Clear();

-        }

-

-        public void afterAddExistingItem(string Guid, int ID, object obj, object CustomOut)

-        {

-            _deleted.Clear();

-        }

-        

-        public void disconnect()

-        {

-            if(_iceConfigurationCmd != null)

-            {

-                _iceConfigurationCmd.Delete();

-            }

-            

-            _solutionEvents.Opened -= new _dispSolutionEvents_OpenedEventHandler(solutionOpened);

-            _solutionEvents.AfterClosing -= new _dispSolutionEvents_AfterClosingEventHandler(afterClosing);

-            _solutionEvents.ProjectAdded -= new _dispSolutionEvents_ProjectAddedEventHandler(projectAdded);

-            _solutionEvents.ProjectRemoved -= new _dispSolutionEvents_ProjectRemovedEventHandler(projectRemoved);

-            _solutionEvents.ProjectRenamed -= new _dispSolutionEvents_ProjectRenamedEventHandler(projectRenamed);

-            _solutionEvents = null;

-

-            _buildEvents.OnBuildBegin -= new _dispBuildEvents_OnBuildBeginEventHandler(buildBegin);

-            _buildEvents = null;

-            

-            if(_dependenciesMap != null)

-            {

-                _dependenciesMap.Clear();

-                _dependenciesMap = null;

-            }

-            

-            _errorCount = 0;

-            if(_errors != null)

-            {

-                _errors.Clear();

-                _errors = null;

-            }

-

-            if(_fileTracker != null)

-            {

-                _fileTracker.clear();

-                _fileTracker = null;

-            }

-        }

-

-        private void setupCommandBars()

-        {

-            _iceConfigurationCmd = null;

-            try

-            {

-                _iceConfigurationCmd =

-                    _applicationObject.Commands.Item(_addInInstance.ProgID + ".IceConfiguration", -1);

-            }

-            catch(ArgumentException)

-            {

-                object[] contextGUIDS = new object[] { };

-                _iceConfigurationCmd = 

-                    ((Commands2)_applicationObject.Commands).AddNamedCommand2(_addInInstance, 

-                                "IceConfiguration",

-                                "Ice Configuration...",

-                                "Ice Configuration...",

-                                true, -1, ref contextGUIDS,

-                                (int)vsCommandStatus.vsCommandStatusSupported +

-                                (int)vsCommandStatus.vsCommandStatusEnabled,

-                                (int)vsCommandStyle.vsCommandStylePictAndText,

-                                vsCommandControlType.vsCommandControlTypeButton);

-            }

-

-            if(_iceConfigurationCmd == null)

-            {

-                System.Windows.Forms.MessageBox.Show("Error initializing Ice Visual Studio Extension.\n" +

-                                                     "Cannot create required commands",

-                                                     "Ice Visual Studio Extension",

-                                                     System.Windows.Forms.MessageBoxButtons.OK,

-                                                     System.Windows.Forms.MessageBoxIcon.Error,

-                                                     System.Windows.Forms.MessageBoxDefaultButton.Button1,

-                                                     System.Windows.Forms.MessageBoxOptions.RightAlign);

-                return;

-            }

-

-            CommandBar toolsCmdBar = ((CommandBars)_applicationObject.CommandBars)["Tools"];

-            _iceConfigurationCmd.AddControl(toolsCmdBar, toolsCmdBar.Controls.Count + 1);

-

-            CommandBar projectCmdBar = projectCommandBar();

-            _iceConfigurationCmd.AddControl(projectCmdBar, projectCmdBar.Controls.Count + 1);   

-        }

-

-        public void afterClosing()

-        {

-            clearErrors();

-            removeDocumentEvents();

-            if(_dependenciesMap != null)

-            {

-                _dependenciesMap.Clear();

-                _dependenciesMap = null;

-            }

-            

-            trackFiles();

-        }

-

-        private void trackFiles()

-        {

-            if(_fileTracker == null)

-            {

-                return;

-            }

-            foreach(Project p in _applicationObject.Solution.Projects)

-            {

-                if(p == null)

-                {

-                    continue;

-                }

-                if(!Util.isSliceBuilderEnabled(p))

-                {

-                    continue;

-                }

-                _fileTracker.reap(p);

-            }

-        }

-

-        public void solutionOpened()

-        {

-            try

-            {

-                _dependenciesMap = new Dictionary<string, Dictionary<string, List<string>>>();

-                _fileTracker = new FileTracker();

-                initDocumentEvents();

-                foreach(Project p in _applicationObject.Solution.Projects)

-                {

-                    if((Util.isCSharpProject(p) || Util.isVBProject(p) || Util.isCppProject(p)) && 

-                        Util.isSliceBuilderEnabled(p))

-                    {

-                        //

-                        // Update Ice Home if expansion does not match old setting.

-                        //

-                        if(!Util.subEnvironmentVars(Util.getIceHomeRaw(p, false)).Equals(Util.getIceHome(p), 

-                                                                          StringComparison.CurrentCultureIgnoreCase))

-                        {

-                            Util.updateIceHome(p, Util.getIceHomeRaw(p, false), true);

-                        }

-

-                        if(!Util.isVBProject(p))

-                        {

-                            _dependenciesMap[p.Name] = new Dictionary<string, List<string>>();

-                            buildProject(p, true, vsBuildScope.vsBuildScopeSolution);

-                        }

-                    }

-                }

-                if(hasErrors())

-                {

-                    bringErrorsToFront();

-                }

-            }

-            catch(Exception ex)

-            {

-                writeBuildOutput(ex.ToString() + "\n");

-            }

-        }

-

-        public void addBuilderToProject(Project project)

-        {

-            if(Util.isCppProject(project))

-            {

-                Util.getIceHomeRaw(project, true);

-                Util.addIceCppConfigurations(project);

-                ComponentList components = 

-                    new ComponentList(Util.getProjectProperty(project, Util.PropertyIceComponents));

-                if(components.Count == 0)

-                {

-                    components.Add("Ice");

-                    components.Add("IceUtil");

-                }

-                Util.addIceCppLibs(project, components);

-                Util.setProjectProperty(project, Util.PropertyIce, true.ToString());

-                buildCppProject(project, true);

-            }

-            else if(Util.isCSharpProject(project))

-            {

-                Util.getIceHomeRaw(project, true);

-                if(Util.isSilverlightProject(project))

-                {

-                    Util.addDotNetReference(project, "IceSL");

-                }

-                else

-                {

-                    ComponentList components = 

-                        new ComponentList(Util.getProjectProperty(project, Util.PropertyIceComponents));

-                    if(components.Count == 0)

-                    {

-                        components.Add("Ice");

-                    }

-                    foreach(string component in components)

-                    {

-                        Util.addDotNetReference(project, component);

-                    }

-                }

-                Util.setProjectProperty(project, Util.PropertyIce, true.ToString());

-                buildCSharpProject(project, true);

-            }

-            else if(Util.isVBProject(project))

-            {

-                Util.getIceHomeRaw(project, true);

-                ComponentList components = 

-                    new ComponentList(Util.getProjectProperty(project, Util.PropertyIceComponents));

-                if(components.Count == 0)

-                {

-                    components.Add("Ice");

-                }

-                foreach(string component in components)

-                {

-                    Util.addDotNetReference(project, component);

-                }

-                Util.setProjectProperty(project, Util.PropertyIce, true.ToString());

-            }

-            if(hasErrors(project))

-            {

-                bringErrorsToFront();

-            }

-        }

-

-        public void removeBuilderFromProject(Project project)

-        {

-            cleanProject(project);

-            if(Util.isCppProject(project))

-            {

-                Util.removeIceCppConfigurations(project);

-                ComponentList libs = Util.removeIceCppLibs(project);

-                Util.setProjectProperty(project, Util.PropertyIceComponents, libs.ToString());

-                Util.setProjectProperty(project, Util.PropertyIce, false.ToString());

-            }

-            else if(Util.isCSharpProject(project))

-            {

-                if(Util.isSilverlightProject(project))

-                {

-                    Util.removeDotNetReference(project, "IceSL");

-                }

-                else

-                {

-                    ComponentList refs = new ComponentList();

-                    foreach(string component in Util.getDotNetNames())

-                    {

-                        if(Util.removeDotNetReference(project, component))

-                        {

-                            refs.Add(component);

-                        }

-                        Util.setProjectProperty(project, Util.PropertyIceComponents, refs.ToString());

-                    }

-                }

-                Util.setProjectProperty(project, Util.PropertyIce, false.ToString());

-            }

-            else if(Util.isVBProject(project))

-            {

-                ComponentList refs = new ComponentList();

-                foreach(string component in Util.getDotNetNames())

-                {

-                    if(Util.removeDotNetReference(project, component))

-                    {

-                        refs.Add(component);

-                    }

-                    Util.setProjectProperty(project, Util.PropertyIceComponents, refs.ToString());

-                }

-                Util.setProjectProperty(project, Util.PropertyIce, false.ToString());

-            }

-        }

-

-        private void documentOpened(Document document)

-        {

-            if(_fileTracker.hasGeneratedFile(document.ProjectItem.ContainingProject, document.FullName))

-            {

-                if(!document.ReadOnly)

-                {

-                    document.ReadOnly = true;

-                }

-            }

-        }

-

-        public void documentSaved(Document document)

-        {

-            Project project = null;

-            try

-            {

-                project = document.ProjectItem.ContainingProject;

-            }

-            catch(COMException)

-            {

-                // Expected when documents are create during project initialization

-                // and the ProjectItem is not yet available.

-                return;

-            }

-            if(!Util.isSliceBuilderEnabled(project))

-            {

-                return;

-            }

-            if(!document.Name.EndsWith(".ice", StringComparison.Ordinal))

-            {

-                return;

-            }

-

-            _fileTracker.reap(project);

-            clearErrors(project);

-            buildProject(project, false, vsBuildScope.vsBuildScopeProject);

-        }

-        

-        public void projectAdded(Project project)

-        {

-            if(Util.isSliceBuilderEnabled(project))

-            {

-                updateDependencies(project);

-            }

-        }

-

-        public void projectRemoved(Project project)

-        {

-            if(_dependenciesMap.ContainsKey(project.Name))

-            {

-                _dependenciesMap.Remove(project.Name);

-            }

-        }

-

-        public void projectRenamed(Project project, string oldName)

-        {

-            if(_dependenciesMap.ContainsKey(oldName))

-            {

-                _dependenciesMap.Remove(oldName);

-            }

-            updateDependencies(project);

-        }

-

-        public void cleanProject(Project project)

-        {

-            if(project == null)

-            {

-                return;

-            }

-            if(!Util.isSliceBuilderEnabled(project))

-            {

-                return;

-            }

-            clearErrors(project);

-            _fileTracker.reap(project);

-

-            if(Util.isCSharpProject(project))

-            {

-                removeCSharpGeneratedItems(project, project.ProjectItems, false);

-            }

-            else if(Util.isCppProject(project))

-            {

-                removeCppGeneratedItems(project.ProjectItems, false);

-            }

-        }

-

-        public void removeCSharpGeneratedItems(Project project, ProjectItems items, bool remove)

-        {

-            if(project == null)

-            {

-                return;

-            }

-            if(items == null)

-            {

-                return;

-            }

-

-            foreach(ProjectItem i in items)

-            {

-                if(i == null)

-                {

-                    continue;

-                }

-

-                if(Util.isProjectItemFolder(i))

-                {

-                    removeCSharpGeneratedItems(project, i.ProjectItems, remove);

-                }

-                else if(Util.isProjectItemFile(i))

-                {

-                    removeCSharpGeneratedItems(i, remove);

-                }

-            }

-        }

-

-        public void buildProject(Project project, bool force, vsBuildScope scope)

-        {

-            buildProject(project, force, null, scope);

-        }

-

-        public void buildProject(Project project, bool force, ProjectItem excludeItem, vsBuildScope scope)

-        {

-            if(project == null)

-            {

-                return;

-            }

-

-            if(!Util.isSliceBuilderEnabled(project))

-            {

-                return;

-            }

-

-            if(vsBuildScope.vsBuildScopeProject == scope)

-            {

-                BuildDependencies dependencies = _applicationObject.Solution.SolutionBuild.BuildDependencies;

-                for(int i = 0; i < dependencies.Count; ++i)

-                {

-                    BuildDependency dp = dependencies.Item(i + 1);

-                    if(dp.Project.Equals(project))

-                    {

-                        System.Array projects = dp.RequiredProjects as System.Array;

-                        foreach(Project p in projects)

-                        {

-                            buildProject(p, force, vsBuildScope.vsBuildScopeProject);

-                        }

-                    }

-                }

-            }

-

-            bool consoleOutput = Util.getProjectPropertyAsBool(project, Util.PropertyConsoleOutput);

-            if(consoleOutput)

-            {

-                writeBuildOutput("------ Slice compilation started: Project: " + project.Name + " ------\n");

-            }

-            _fileTracker.reap(project);

-            if(Util.isCSharpProject(project))

-            {

-                buildCSharpProject(project, force, excludeItem);

-            }

-            else if(Util.isCppProject(project))

-            {

-                buildCppProject(project, force);

-            }

-            if(consoleOutput)

-            {

-                if(hasErrors(project))

-                {

-                    writeBuildOutput("------ Slice compilation failed: Project: " + project.Name + " ------\n");

-                }

-                else

-                {

-                    writeBuildOutput("------ Slice compilation succeeded: Project: " + project.Name + " ------\n");

-                }

-            }

-        }

-

-        public bool buildCppProject(Project project, bool force)

-        {

-            return buildCppProject(project, project.ProjectItems, force);

-        }

-

-        public bool buildCppProject(Project project, ProjectItems items, bool force)

-        {

-            bool success = true;

-            foreach(ProjectItem i in items)

-            {

-                if(i == null)

-                {

-                    continue;

-                }

-

-                if(Util.isProjectItemFilter(i))

-                {

-                    if(!buildCppProject(project, i.ProjectItems, force))

-                    {

-                        success = false;

-                    }

-                }

-                else if(Util.isProjectItemFile(i))

-                {

-                    if(!buildCppProjectItem(project, i, force))

-                    {

-                        success = false;

-                    }

-                }

-            }

-            return success;

-        }

-

-        public bool buildCppProjectItem(Project project, ProjectItem item, bool force)

-        {

-            if(project == null)

-            {

-                return true;

-            }

-

-            if(item == null)

-            {

-                return true;

-            }

-

-            if(item.Name == null)

-            {

-                return true;

-            }

-

-            if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))

-            {

-                return true;

-            }

-

-            FileInfo iceFileInfo = new FileInfo(item.Properties.Item("FullPath").Value.ToString());

-            FileInfo hFileInfo = new FileInfo(getCppGeneratedFileName(Path.GetDirectoryName(project.FullName),

-                                              iceFileInfo.FullName, "h"));

-            FileInfo cppFileInfo = new FileInfo(Path.ChangeExtension(hFileInfo.FullName, "cpp"));

-

-            string output = Path.GetDirectoryName(cppFileInfo.FullName);

-            return buildCppProjectItem(project, output, iceFileInfo, cppFileInfo, hFileInfo, force);

-        }

-

-        public bool buildCppProjectItem(Project project, String output, FileSystemInfo ice, FileSystemInfo cpp,

-                                        FileSystemInfo h, bool force)

-        {

-            bool updated = false;

-            bool success = false;

-            

-            if(!h.Exists || !cpp.Exists)

-            {

-                updated = true;

-            }

-            else if(Util.findItem(h.FullName, project.ProjectItems) == null || 

-                    Util.findItem(cpp.FullName, project.ProjectItems) == null)

-            {

-                updated = true;

-            }

-            else if(ice.LastWriteTime > h.LastWriteTime || ice.LastWriteTime > cpp.LastWriteTime)

-            {

-                if(!Directory.Exists(output))

-                {

-                    Directory.CreateDirectory(output);

-                }

-                updated = true;

-            }

-            else

-            {

-                //

-                // Now check it any of the dependencies has changed.

-                //

-                if(_dependenciesMap.ContainsKey(project.Name))

-                {

-                    Dictionary<string, List<string>> dependenciesMap = _dependenciesMap[project.Name];

-                    if(dependenciesMap.ContainsKey(ice.FullName))

-                    {

-                        List<string> fileDependencies = dependenciesMap[ice.FullName];

-                        foreach(string name in fileDependencies)

-                        {

-                            FileInfo dependency =

-                                new FileInfo(Path.Combine(Path.GetDirectoryName(project.FileName), name));

-                            if(!dependency.Exists)

-                            {

-                                updated = true;

-                                break;

-                            }

-                            

-                            if(dependency.LastWriteTime > cpp.LastWriteTime ||

-                               dependency.LastWriteTime > h.LastWriteTime)

-                            {

-                                updated = true;

-                                break;

-                            }

-                        }

-                    }

-                }

-            }

-            

-            if(updated || force)

-            {

-                if(!Directory.Exists(output))

-                {

-                    Directory.CreateDirectory(output);

-                }

-

-                if(updateDependencies(project, null, ice.FullName, getSliceCompilerArgs(project, true)) && updated)

-                {

-                    if(runSliceCompiler(project, ice.FullName, output))

-                    {

-                        addCppGeneratedFiles(project, ice, cpp, h);

-                        success = true;

-                    }

-                }

-            }

-            else

-            {

-                //

-                // Make sure generated files are part of project.

-                //

-                addCppGeneratedFiles(project, ice, cpp, h);

-            }

-            return !updated | success;

-        }

-

-        public void addCppGeneratedFiles(Project project, FileSystemInfo ice, FileSystemInfo cpp, FileSystemInfo h)

-        {

-            if(project == null)

-            {

-                return;

-            }

-

-            VCProject vcProject = (VCProject)project.Object;

-

-            if(File.Exists(cpp.FullName))

-            {

-                _fileTracker.trackFile(project, ice.FullName, h.FullName);

-                VCFile file = Util.findVCFile((IVCCollection)vcProject.Files, cpp.Name, cpp.FullName);

-                if(file == null)

-                {

-                    vcProject.AddFile(cpp.FullName);

-                }

-            }

-

-            if(File.Exists(h.FullName))

-            {

-                _fileTracker.trackFile(project, ice.FullName, cpp.FullName);

-                VCFile file = Util.findVCFile((IVCCollection)vcProject.Files, h.Name, h.FullName);            

-                if(file == null)

-                {

-                    vcProject.AddFile(h.FullName);

-                }

-            }

-        }

-

-        public void buildCSharpProject(Project project, bool force)

-        {

-            buildCSharpProject(project, force, null);

-        }

-        

-        public void buildCSharpProject(Project project, bool force, ProjectItem excludeItem)

-        {

-            string projectDir = Path.GetDirectoryName(project.FileName);

-            buildCSharpProject(project, projectDir, project.ProjectItems, force, excludeItem);

-        }

-

-        public void buildCSharpProject(Project project, string projectDir, ProjectItems items, bool force, 

-                                       ProjectItem excludeItem)

-        {

-            foreach(ProjectItem i in items)

-            {

-                if(i == null || i == excludeItem)

-                {

-                    continue;

-                }

-

-                if(Util.isProjectItemFolder(i))

-                {

-                    buildCSharpProject(project, projectDir, i.ProjectItems, force, excludeItem);

-                }

-                else if(Util.isProjectItemFile(i))

-                {

-                    buildCSharpProjectItem(project, i, force);

-                }

-            }

-        }

-

-        public static String getCppGeneratedFileName(String projectDir, String fullPath, string extension)

-        {

-            if(String.IsNullOrEmpty(projectDir) || String.IsNullOrEmpty(fullPath))

-            {

-                return "";

-            }

-

-            if(!fullPath.EndsWith(".ice", StringComparison.Ordinal))

-            {

-                return "";

-            }

-

-            if(Path.GetFullPath(fullPath).StartsWith(Path.GetFullPath(projectDir),

-                                                     StringComparison.CurrentCultureIgnoreCase))

-            {

-                return Path.ChangeExtension(fullPath, extension);

-            }

-            return Path.ChangeExtension(Path.Combine(projectDir, Path.GetFileName(fullPath)), extension);

-        }

-

-        public static string getCSharpGeneratedFileName(Project project, ProjectItem item, string extension)

-        {

-            if(project == null)

-            {

-                return "";

-            }

-

-            if(item == null)

-            {

-                return "";

-            }

-

-            if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))

-            {

-                return "";

-            }

-

-            string projectDir = Path.GetDirectoryName(project.FileName);

-            string itemRelativePath = Util.getPathRelativeToProject(item);

-            if(!String.IsNullOrEmpty(itemRelativePath))

-            {

-                string generatedDir = Path.GetDirectoryName(itemRelativePath);

-                string path = System.IO.Path.Combine(projectDir, generatedDir);

-                return System.IO.Path.Combine(path, Path.ChangeExtension(item.Name, extension));

-            }

-            return "";

-        }

-

-        public bool buildCSharpProjectItem(Project project, ProjectItem item, bool force)

-        {

-            if(project == null)

-            {

-                return true;

-            }

-

-            if(item == null)

-            {

-                return true;

-            }

-

-            if(item.Name == null)

-            {

-                return true;

-            }

-

-            if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))

-            {

-                return true;

-            }

-

-            FileInfo iceFileInfo = new FileInfo(item.Properties.Item("FullPath").Value.ToString());

-            FileInfo generatedFileInfo = new FileInfo(getCSharpGeneratedFileName(project, item, "cs"));

-            bool success = false;

-            bool updated = false;

-            if(!generatedFileInfo.Exists)

-            {

-                updated = true;

-            }

-            else if(iceFileInfo.LastWriteTime > generatedFileInfo.LastWriteTime)

-            {

-                updated = true;

-            }

-            else

-            {

-                //

-                // Now check it any of the dependencies has changed.

-                //

-                //

-                if(_dependenciesMap.ContainsKey(project.Name))

-                {

-                    Dictionary<string, List<string>> dependenciesMap = _dependenciesMap[project.Name];

-                    if(dependenciesMap.ContainsKey(iceFileInfo.FullName))

-                    {

-                        List<string> fileDependencies = dependenciesMap[iceFileInfo.FullName];

-                        foreach(string name in fileDependencies)

-                        {

-                            FileInfo dependency =

-                                new FileInfo(Path.Combine(Path.GetDirectoryName(project.FileName), name));

-                            if(!dependency.Exists)

-                            {

-                                updated = true;

-                                break;

-                            }

-    

-                            if(dependency.LastWriteTime > generatedFileInfo.LastWriteTime)

-                            {

-                                updated = true;

-                                break;

-                            }

-                        }

-                    }

-                }

-            }

-            if(updated || force)

-            {

-                if(updateDependencies(project, item, iceFileInfo.FullName, getSliceCompilerArgs(project, true)) && 

-                   updated)

-                {

-                    if(runSliceCompiler(project, iceFileInfo.FullName, generatedFileInfo.DirectoryName))

-                    {

-                        addCSharpGeneratedFiles(project, iceFileInfo, generatedFileInfo);

-                        success = true;

-                    }

-                }

-            }

-            else

-            {

-                //

-                // Make sure generated files are part of project.

-                //

-                addCSharpGeneratedFiles(project, iceFileInfo, generatedFileInfo);

-            }

-            return !updated | success;

-        }

-

-        private void addCSharpGeneratedFiles(Project project, FileInfo ice, FileInfo file)

-        {

-            if(File.Exists(file.FullName))

-            {

-                _fileTracker.trackFile(project, ice.FullName, file.FullName);

-

-                ProjectItem generatedItem = Util.findItem(file.FullName, project.ProjectItems);

-                if(generatedItem == null)

-                {

-                    project.ProjectItems.AddFromFile(file.FullName);

-                }

-            }

-        }

-

-        private static string quoteArg(string arg)

-        {

-            return "\"" + arg + "\"";

-        }

-        

-        private static string getSliceCompilerPath(Project project)

-        {

-            String compiler = Util.slice2cpp;

-            if(Util.isCSharpProject(project))

-            {

-                if(Util.isSilverlightProject(project))

-                {

-                    compiler = Util.slice2sl;

-                }

-                else

-                {

-                    compiler = Util.slice2cs;

-                }

-            }

-

-            String iceHome = Util.getAbsoluteIceHome(project);

-            if(Directory.Exists(Path.Combine(iceHome, "cpp")))

-            {

-                iceHome = Path.Combine(iceHome, "cpp\\bin");

-            }

-            else

-            {

-                iceHome = Path.Combine(iceHome, "bin");

-                if(!File.Exists(Path.Combine(iceHome, compiler)))

-                {

-                    iceHome = Path.Combine(iceHome, "x64");

-                }

-            }

-            return Path.Combine(iceHome, compiler);

-        }

-        

-        private static string getSliceCompilerVesrion(Project project)

-        {

-            System.Diagnostics.Process process;

-            String args = "/c" + quoteArg(getSliceCompilerPath(project)) + " -v";

-            ProcessStartInfo processInfo = new ProcessStartInfo("cmd.exe", args);

-            processInfo.CreateNoWindow = true;

-            processInfo.UseShellExecute = false;

-            processInfo.RedirectStandardError = true;

-            processInfo.RedirectStandardOutput = true;

-            processInfo.WorkingDirectory = Path.GetDirectoryName(project.FileName);

-

-            process = System.Diagnostics.Process.Start(processInfo);

-            process.WaitForExit();

-            String version = process.StandardOutput.ReadLine();

-            return version;

-        }

-

-        private static string getSliceCompilerArgs(Project project, bool depend)

-        {

-            IncludePathList includes = 

-                new IncludePathList(Util.getProjectProperty(project, Util.PropertyIceIncludePath));

-            string extraOpts = Util.getProjectProperty(project, Util.PropertyIceExtraOptions).Trim();

-            bool tie = Util.getProjectPropertyAsBool(project, Util.PropertyIceTie);

-            bool ice = Util.getProjectPropertyAsBool(project, Util.PropertyIcePrefix);

-            bool streaming = Util.getProjectPropertyAsBool(project, Util.PropertyIceStreaming);

-            bool checksum = Util.getProjectPropertyAsBool(project, Util.PropertyIceChecksum);

-

-            string sliceCompiler = getSliceCompilerPath(project);

-

-            string args = quoteArg(sliceCompiler) + " ";

-

-            if(depend)

-            {

-                args += "--depend ";

-            }

-

-            if(Util.isCppProject(project))

-            {

-                String dllExportSymbol = Util.getProjectProperty(project, Util.PropertyIceDllExport);

-                if(!String.IsNullOrEmpty(dllExportSymbol))

-                {

-                    args += "--dll-export=" + dllExportSymbol + " ";

-                }

-

-                String preCompiledHeader = Util.getPrecompileHeader(project);

-                if(!String.IsNullOrEmpty(preCompiledHeader))

-                {

-                    args += "--add-header=" + preCompiledHeader + " ";

-                }

-            }

-

-            args += "-I\"" + Util.getIceHome(project) + "\\slice\" "; 

-

-            foreach(string i in includes)

-            {

-                if(string.IsNullOrEmpty(i))

-                {

-                    continue;

-                }

-                String include = Util.subEnvironmentVars(i);

-                if(include.EndsWith("\\", StringComparison.Ordinal) &&

-                   include.Split(new char[]{'\\'}, StringSplitOptions.RemoveEmptyEntries).Length == 1)

-                {

-                    include += ".";

-                }

-

-                if(include.EndsWith("\\", StringComparison.Ordinal) && 

-                   !include.EndsWith("\\\\", StringComparison.Ordinal))

-                {

-                   include += "\\";

-                }

-                args += "-I" + quoteArg(include) + " ";

-            }

-

-            if(extraOpts.Length != 0)

-            {

-                args += Util.subEnvironmentVars(extraOpts) + " ";

-            }

-

-            if(tie && Util.isCSharpProject(project) && !Util.isSilverlightProject(project))

-            {

-                args += "--tie ";

-            }

-

-            if(ice)

-            {

-                args += "--ice ";

-            }

-

-            if(streaming)

-            {

-                args += "--stream ";

-            }

-

-            if(checksum)

-            {

-                args += "--checksum ";

-            }

-

-            return args;

-        }

-        

-        public bool updateDependencies(Project project)

-        {

-            return updateDependencies(project, null);

-        }

-        

-        public bool updateDependencies(Project project, ProjectItem excludeItem)

-        {

-            _dependenciesMap[project.Name] = new Dictionary<string, List<string>>();

-            return updateDependencies(project, project.ProjectItems, getSliceCompilerArgs(project, true), excludeItem);

-        }

-

-        public void cleanDependencies(Project project, string file)

-        {

-            if(project == null || file == null)

-            {

-                return;

-            }

-            if(String.IsNullOrEmpty(project.Name))

-            {

-                return;

-            }

-            if(!_dependenciesMap.ContainsKey(project.Name))

-            {

-                return;

-            }

-

-            Dictionary<string, List<string>> projectDependencies = _dependenciesMap[project.Name];

-            if(!projectDependencies.ContainsKey(file))

-            {

-                return;

-            }

-            projectDependencies.Remove(file);

-            _dependenciesMap[project.Name] = projectDependencies;

-        }

-

-        public bool updateDependencies(Project project, ProjectItems items, string args, ProjectItem excludeItem)

-        {

-            bool success = true;

-            foreach(ProjectItem item in items)

-            {

-                if(item == null || item == excludeItem)

-                {

-                    continue;

-                }

-

-                if(Util.isProjectItemFolder(item) || Util.isProjectItemFilter(item))

-                {

-                    if(!updateDependencies(project, item.ProjectItems, args, excludeItem))

-                    {

-                        success = false;

-                    }

-                }

-                else if(Util.isProjectItemFile(item))

-                {

-                    if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))

-                    {

-                        continue;

-                    }

-

-                    string fullPath = item.Properties.Item("FullPath").Value.ToString();

-                    if(!updateDependencies(project, item, fullPath, args))

-                    {

-                        success = false;

-                    }

-                }

-            }

-            return success;

-        }

-

-        public bool updateDependencies(Project project, ProjectItem item, string file, string args)

-        {

-            bool consoleOutput = Util.getProjectPropertyAsBool(project, Util.PropertyConsoleOutput);

-            ProcessStartInfo processInfo;

-            System.Diagnostics.Process process;

-

-            args += quoteArg(file);

-            args = "/c " + quoteArg(args);

-

-            processInfo = new ProcessStartInfo("cmd.exe", args);

-            processInfo.CreateNoWindow = true;

-            processInfo.UseShellExecute = false;

-            processInfo.RedirectStandardError = true;

-            processInfo.RedirectStandardOutput = true;

-            processInfo.WorkingDirectory = Path.GetDirectoryName(project.FileName);

-

-            String compiler = getSliceCompilerPath(project);

-            if(!File.Exists(compiler))

-            {

-                addError(project, file, TaskErrorCategory.Error, 0, 0, compiler +

-                                            " not found. Review 'Ice Home' setting.");

-                return false;

-            }

-

-            if(consoleOutput)

-            {

-                writeBuildOutput("cmd.exe " + args + "\n");

-            }

-            

-            process = System.Diagnostics.Process.Start(processInfo);

-            process.WaitForExit();

-            

-            if(parseErrors(project, file, process.StandardError, consoleOutput))

-            {

-                bringErrorsToFront();

-                process.Close();

-                if(Util.isCppProject(project))

-                {

-                    removeCppGeneratedItems(project, file, false);

-                }

-                else if(Util.isCSharpProject(project))

-                {

-                    removeCSharpGeneratedItems(item, false);

-                }

-                return false;

-            }

-            

-            List<string> dependencies = new List<string>();

-            TextReader output = process.StandardOutput;

-            

-            string line = null;

-

-            if(!_dependenciesMap.ContainsKey(project.Name))

-            {

-                _dependenciesMap[project.Name] = new Dictionary<string,List<string>>();

-            }

-            

-            Dictionary<string, List<string>> projectDeps = _dependenciesMap[project.Name];

-            while((line = output.ReadLine()) != null)

-            {

-                writeBuildOutput(line);

-                if(!String.IsNullOrEmpty(line))

-                {

-                    if(line.EndsWith(" \\", StringComparison.Ordinal))

-                    {

-                        line = line.Substring(0, line.Length - 2);

-                    }

-                    line = line.Trim();

-                    //

-                    // Unescape white spaces.

-                    //

-                    line = line.Replace("\\ ", " ");

-

-                    if(line.EndsWith(".ice", StringComparison.Ordinal) &&

-                       System.IO.Path.GetFileName(line) != System.IO.Path.GetFileName(file))

-                    {

-                        line = line.Replace('/', '\\');

-                        dependencies.Add(line);

-                    }

-                }

-            }

-            projectDeps[file] = dependencies;

-            _dependenciesMap[project.Name] = projectDeps;

-

-            process.Close();

-            return true;

-        }

-

-        public void initDocumentEvents()

-        {

-            //Csharp project item events.

-            _csProjectItemsEvents = 

-                (EnvDTE.ProjectItemsEvents)_applicationObject.Events.GetObject("CSharpProjectItemsEvents");

-            if(_csProjectItemsEvents != null)

-            {

-                _csProjectItemsEvents.ItemAdded +=

-                    new _dispProjectItemsEvents_ItemAddedEventHandler(csharpItemAdded);

-                _csProjectItemsEvents.ItemRemoved +=

-                    new _dispProjectItemsEvents_ItemRemovedEventHandler(csharpItemRemoved);

-                _csProjectItemsEvents.ItemRenamed +=

-                    new _dispProjectItemsEvents_ItemRenamedEventHandler(csharpItemRenamed);

-            }

-

-            //Cpp project item events.

-            _vcProjectItemsEvents = 

-                (VCProjectEngineEvents)_applicationObject.Events.GetObject("VCProjectEngineEventsObject");

-            if(_vcProjectItemsEvents != null)

-            {

-                _vcProjectItemsEvents.ItemAdded +=

-                    new _dispVCProjectEngineEvents_ItemAddedEventHandler(cppItemAdded);

-                _vcProjectItemsEvents.ItemRemoved +=

-                    new _dispVCProjectEngineEvents_ItemRemovedEventHandler(cppItemRemoved);

-                _vcProjectItemsEvents.ItemRenamed +=

-                    new _dispVCProjectEngineEvents_ItemRenamedEventHandler(cppItemRenamed);

-            }

-

-            //Visual Studio document events.

-            _docEvents = _applicationObject.Events.get_DocumentEvents(null);

-            if(_docEvents != null)

-            {

-                _docEvents.DocumentSaved += new _dispDocumentEvents_DocumentSavedEventHandler(documentSaved);

-                _docEvents.DocumentOpened += new _dispDocumentEvents_DocumentOpenedEventHandler(documentOpened);

-            }

-        }

-

-        public void removeDocumentEvents()

-        {

-            //Csharp project item events.

-            if(_csProjectItemsEvents != null)

-            {

-                _csProjectItemsEvents.ItemAdded -= 

-                    new _dispProjectItemsEvents_ItemAddedEventHandler(csharpItemAdded);

-                _csProjectItemsEvents.ItemRemoved -= 

-                    new _dispProjectItemsEvents_ItemRemovedEventHandler(csharpItemRemoved);

-                _csProjectItemsEvents.ItemRenamed -=

-                    new _dispProjectItemsEvents_ItemRenamedEventHandler(csharpItemRenamed);

-                _csProjectItemsEvents = null;

-            }

-

-            //Cpp project item events.

-            if(_vcProjectItemsEvents != null)

-            {

-                _vcProjectItemsEvents.ItemAdded -= 

-                    new _dispVCProjectEngineEvents_ItemAddedEventHandler(cppItemAdded);

-                _vcProjectItemsEvents.ItemRemoved -=

-                    new _dispVCProjectEngineEvents_ItemRemovedEventHandler(cppItemRemoved);

-                _vcProjectItemsEvents.ItemRenamed -=

-                    new _dispVCProjectEngineEvents_ItemRenamedEventHandler(cppItemRenamed);

-                _vcProjectItemsEvents = null;

-            }

-

-            //Visual Studio document events.

-            if(_docEvents != null)

-            {

-                _docEvents.DocumentSaved -= new _dispDocumentEvents_DocumentSavedEventHandler(documentSaved);

-                _docEvents.DocumentOpened -= new _dispDocumentEvents_DocumentOpenedEventHandler(documentOpened);

-                _docEvents = null;

-            }

-        }

-

-        public Project getSelectedProject()

-        {

-            return Util.getSelectedProject(_applicationObject.DTE);

-        }

-        

-        public Project getActiveProject()

-        {

-            Array projects = (Array)_applicationObject.ActiveSolutionProjects;

-            if(projects == null)

-            {

-                return null;

-            }

-            return projects.GetValue(0) as Project;

-        }

-

-        private void cppItemRenamed(object obj, object parent, string oldName)

-        {

-            try

-            {

-                if(obj == null)

-                {

-                    return;

-                }

-                VCFile file = obj as VCFile;

-                if(file == null)

-                {

-                    return;

-                }

-                if(!file.Name.EndsWith(".ice", StringComparison.Ordinal))

-                {

-                    return;

-                }

-                Array projects = (Array)_applicationObject.ActiveSolutionProjects;

-                if(projects == null)

-                {

-                    return;

-                }

-                Project project = projects.GetValue(0) as Project;

-                if(project == null)

-                {

-                    return;

-                }

-                if(!Util.isSliceBuilderEnabled(project))

-                {

-                    return;

-                }

-                _fileTracker.reap(project);

-                ProjectItem item = Util.findItem(file.FullPath, project.ProjectItems);

-

-                string fullPath = file.FullPath;

-                if(Util.isCppProject(project))

-                {

-                    string cppPath = Path.ChangeExtension(fullPath, ".cpp");

-                    string hPath = Path.ChangeExtension(cppPath, ".h");

-                    if(File.Exists(cppPath) || Util.hasItemNamed(project.ProjectItems, Path.GetFileName(cppPath)))

-                    {

-                        System.Windows.Forms.MessageBox.Show("A file named '" + Path.GetFileName(cppPath) + 

-                                                             "' already exists.\n" + "If you want to add '" + 

-                                                             Path.GetFileName(fullPath) + "' first remove " + " '" + 

-                                                             Path.GetFileName(cppPath) + "' and '" +

-                                                             Path.GetFileName(hPath) + "' from your project.",

-                                                             "Ice Visual Studio Extension",

-                                                             System.Windows.Forms.MessageBoxButtons.OK,

-                                                             System.Windows.Forms.MessageBoxIcon.Error,

-                                                             System.Windows.Forms.MessageBoxDefaultButton.Button1,

-                                                             System.Windows.Forms.MessageBoxOptions.RightAlign);

-                        item.Name = oldName;

-                        return;

-                    }

-

-                    if(File.Exists(hPath) || Util.hasItemNamed(project.ProjectItems, Path.GetFileName(hPath)))

-                    {

-                        System.Windows.Forms.MessageBox.Show("A file named '" + Path.GetFileName(hPath) +

-                                                             "' already exists.\n" + "If you want to add '" +

-                                                             Path.GetFileName(fullPath) + "' first remove " +

-                                                             " '" + Path.GetFileName(cppPath) + "' and '" +

-                                                             Path.GetFileName(hPath) + "' from your project.",

-                                                             "Ice Visual Studio Extension",

-                                                             System.Windows.Forms.MessageBoxButtons.OK,

-                                                             System.Windows.Forms.MessageBoxIcon.Error,

-                                                             System.Windows.Forms.MessageBoxDefaultButton.Button1,

-                                                             System.Windows.Forms.MessageBoxOptions.RightAlign);

-                        item.Name = oldName;

-                        return;

-                    }

-                }

-

-                // Do a full build on a rename

-                clearErrors(project);

-                buildProject(project, false, vsBuildScope.vsBuildScopeProject);

-            }

-            catch(Exception ex)

-            {

-                writeBuildOutput(ex.ToString() + "\n");

-            }

-        }

-        

-        private void removeDependency(Project project, String path)

-        {

-            if(_dependenciesMap.ContainsKey(project.Name))

-            {

-                if(_dependenciesMap[project.Name].ContainsKey(path))

-                {

-                    _dependenciesMap[project.Name].Remove(path);

-                }

-            }

-        }

-        

-        private void cppItemRemoved(object obj, object parent)

-        {

-            try

-            {

-                if(obj == null)

-                {

-                    return;

-                }

-

-                VCFile file = obj as VCFile;

-                if(file == null)

-                {

-                    return;

-                }

-

-                Array projects = (Array)_applicationObject.ActiveSolutionProjects;

-                if(projects == null)

-                {

-                    return;

-                }

-

-                if(projects.Length <= 0)

-                {

-                    return;

-                }

-                Project project = projects.GetValue(0) as Project;

-                if(project == null)

-                {

-                    return;

-                }

-                if(!Util.isSliceBuilderEnabled(project))

-                {

-                    return;

-                }

-                if(!file.Name.EndsWith(".ice", StringComparison.Ordinal))

-                {

-                    _fileTracker.reap(project);

-                    return;

-                }

-                clearErrors(file.FullPath);

-                removeCppGeneratedItems(project, file.FullPath, true);

-

-                //

-                // It appears that file is not actually removed from disk at this

-                // point. Thus we need to delay dependency update until after delete,

-                // or after remove command has been executed.

-                //

-                _deletedFile = file.FullPath;

-            }

-            catch(Exception ex)

-            {

-                writeBuildOutput(ex.ToString() + "\n");

-            }

-        }

-

-        void cppItemAdded(object obj, object parent)

-        {

-            try

-            {

-                if(obj == null)

-                {

-                    return;

-                }

-                VCFile file = obj as VCFile;

-                if(file == null)

-                {

-                    return;

-                }

-                if(!file.Name.EndsWith(".ice", StringComparison.Ordinal))

-                {

-                    return;

-                }

-

-                string fullPath = file.FullPath;

-                Array projects = (Array)_applicationObject.ActiveSolutionProjects;

-                if(projects == null)

-                {

-                    return;

-                }

-                if(projects.Length <= 0)

-                {

-                    return;

-                }

-                Project project = projects.GetValue(0) as Project;

-                if(project == null)

-                {

-                    return;

-                }

-                if(!Util.isSliceBuilderEnabled(project))

-                {

-                    return;

-                }

-                ProjectItem item = Util.findItem(fullPath, project.ProjectItems);

-                if(item == null)

-                {

-                    return;

-                }

-                if(Util.isCppProject(project))

-                {

-                    string cppPath = 

-                        getCppGeneratedFileName(Path.GetDirectoryName(project.FullName), file.FullPath, "cpp");

-                    string hPath = Path.ChangeExtension(cppPath, ".h");

-                    if(File.Exists(cppPath) || Util.hasItemNamed(project.ProjectItems, Path.GetFileName(cppPath)))

-                    {

-                        System.Windows.Forms.MessageBox.Show("A file named '" + Path.GetFileName(cppPath) +

-                                                             "' already exists.\n" + "If you want to add '" +

-                                                             Path.GetFileName(fullPath) + "' first remove " +

-                                                             " '" + Path.GetFileName(cppPath) + "' and '" +

-                                                             Path.GetFileName(hPath) + "'.",

-                                                             "Ice Visual Studio Extension",

-                                                             System.Windows.Forms.MessageBoxButtons.OK,

-                                                             System.Windows.Forms.MessageBoxIcon.Error,

-                                                             System.Windows.Forms.MessageBoxDefaultButton.Button1,

-                                                             System.Windows.Forms.MessageBoxOptions.RightAlign);

-                        _deleted.Add(fullPath);

-                        item.Remove();

-                        return;

-                    }

-

-                    if(File.Exists(hPath) || Util.hasItemNamed(project.ProjectItems, Path.GetFileName(hPath)))

-                    {

-                        System.Windows.Forms.MessageBox.Show("A file named '" + Path.GetFileName(hPath) +

-                                                             "' already exists.\n" + "If you want to add '" +

-                                                             Path.GetFileName(fullPath) + "' first remove " +

-                                                             " '" + Path.GetFileName(cppPath) + "' and '" +

-                                                             Path.GetFileName(hPath) + "'.",

-                                                             "Ice Visual Studio Extension",

-                                                             System.Windows.Forms.MessageBoxButtons.OK,

-                                                             System.Windows.Forms.MessageBoxIcon.Error,

-                                                             System.Windows.Forms.MessageBoxDefaultButton.Button1,

-                                                             System.Windows.Forms.MessageBoxOptions.RightAlign);

-                        _deleted.Add(fullPath);

-                        item.Remove();

-                        return;

-                    }

-                }

-

-                clearErrors(project);

-                buildProject(project, false, vsBuildScope.vsBuildScopeProject);

-            }

-            catch(Exception ex)

-            {

-                writeBuildOutput(ex.ToString() + "\n");

-            }

-        }

-

-        private void csharpItemRenamed(ProjectItem item, string oldName)

-        {

-            try

-            {

-                if(item == null || _fileTracker == null || String.IsNullOrEmpty(oldName) || 

-                   item.ContainingProject == null)

-                {

-                    return;

-                }

-                if(!Util.isSliceBuilderEnabled(item.ContainingProject))

-                {

-                    return;

-                }

-                if(!oldName.EndsWith(".ice", StringComparison.Ordinal) || !Util.isProjectItemFile(item))

-                {

-                    return;

-                }

-

-                //Get rid of generated files, for the .ice removed file.

-                _fileTracker.reap(item.ContainingProject);

-

-                string fullPath = item.Properties.Item("FullPath").Value.ToString();

-                if(Util.isCSharpProject(item.ContainingProject))

-                {

-                    string csPath = Path.ChangeExtension(fullPath, ".cs");

-                    if(File.Exists(csPath) || 

-                       Util.hasItemNamed(item.ContainingProject.ProjectItems, Path.GetFileName(csPath)))

-                    {

-                        System.Windows.Forms.MessageBox.Show("A file named '" + Path.GetFileName(csPath) +

-                                                             "' already exists.\n" + oldName +

-                                                             " could not be renamed to '" + item.Name + "'.",

-                                                             "Ice Visual Studio Extension",

-                                                             System.Windows.Forms.MessageBoxButtons.OK,

-                                                             System.Windows.Forms.MessageBoxIcon.Error,

-                                                             System.Windows.Forms.MessageBoxDefaultButton.Button1,

-                                                             System.Windows.Forms.MessageBoxOptions.RightAlign);

-                        item.Name = oldName;

-                        return;

-                    }

-                }

-

-                clearErrors(item.ContainingProject);

-                buildProject(item.ContainingProject, false, vsBuildScope.vsBuildScopeProject);

-            }

-            catch(Exception ex)

-            {

-                writeBuildOutput(ex.ToString() + "\n");

-            }

-        }

-

-        private void csharpItemRemoved(ProjectItem item)

-        {

-            try

-            {

-                if(item == null || _fileTracker == null)

-                {

-                    return;

-                }

-                if(String.IsNullOrEmpty(item.Name) ||  item.ContainingProject == null)

-                {

-                    return;

-                }

-                if(!Util.isSliceBuilderEnabled(item.ContainingProject))

-                {

-                    return;

-                }

-                if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))

-                {

-                    return;

-                }

-

-                string fullName = item.Properties.Item("FullPath").Value.ToString();

-                clearErrors(fullName);

-                removeCSharpGeneratedItems(item, true);

-                _fileTracker.reap(item.ContainingProject);

-

-                removeDependency(item.ContainingProject, fullName);

-                clearErrors(item.ContainingProject);

-                buildProject(item.ContainingProject, false, item, vsBuildScope.vsBuildScopeProject);

-            }

-            catch(Exception ex)

-            {

-                writeBuildOutput(ex.ToString() + "\n");

-            }

-        }

-

-        private void csharpItemAdded(ProjectItem item)

-        {

-            try

-            {

-                if(item == null)

-                {

-                    return;

-                }

-

-                if(String.IsNullOrEmpty(item.Name) || item.ContainingProject == null)

-                {

-                    return;

-                }

-

-                if(!Util.isSliceBuilderEnabled(item.ContainingProject))

-                {

-                    return;

-                }

-

-                if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))

-                {

-                    return;

-                }

-

-                string fullPath = item.Properties.Item("FullPath").Value.ToString();

-                Project project = item.ContainingProject;

-                if(project == null)

-                {

-                    return;

-                }

-

-                String csPath = getCSharpGeneratedFileName(project, item, "cs");

-                ProjectItem csItem = Util.findItem(csPath, project.ProjectItems);

-

-                if(File.Exists(csPath) || csItem != null)

-                {

-                    System.Windows.Forms.MessageBox.Show("A file named '" + Path.GetFileName(csPath) +

-                                                         "' already exists.\n" + "If you want to add '" +

-                                                         Path.GetFileName(fullPath) + "' first remove " +

-                                                         " '" + Path.GetFileName(csPath) + "'.",

-                                                         "Ice Visual Studio Extension",

-                                                         System.Windows.Forms.MessageBoxButtons.OK,

-                                                         System.Windows.Forms.MessageBoxIcon.Error,

-                                                         System.Windows.Forms.MessageBoxDefaultButton.Button1,

-                                                         System.Windows.Forms.MessageBoxOptions.RightAlign);

-                    _deleted.Add(fullPath);

-                    item.Remove();

-                    return;

-                }

-

-                clearErrors(project);

-                buildProject(project, false, vsBuildScope.vsBuildScopeProject);

-            }

-            catch(Exception ex)

-            {

-                writeBuildOutput(ex.ToString() + "\n");

-            }

-        }

-

-        private static void removeCSharpGeneratedItems(ProjectItem item, bool remove)

-        {

-            if(item == null)

-            {

-                return;

-            }

-

-            if(item.Name == null)

-            {

-                return;

-            }

-

-            if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))

-            {

-                return;

-            }

-

-            String generatedPath = getCSharpGeneratedFileName(item.ContainingProject, item, "cs");

-            if(!String.IsNullOrEmpty(generatedPath))

-            {

-                FileInfo generatedFileInfo = new FileInfo(generatedPath);

-                if(File.Exists(generatedFileInfo.FullName))

-                {

-                    File.Delete(generatedFileInfo.FullName);

-                }

-

-                if(remove)

-                {

-                    ProjectItem generated =

-                        Util.findItem(generatedFileInfo.FullName, item.ContainingProject.ProjectItems);

-                    if(generated != null)

-                    {

-                        generated.Remove();

-                    }

-                }

-            }

-        }

-

-        private static void removeCppGeneratedItems(ProjectItems items, bool remove)

-        {

-            foreach(ProjectItem i in items)

-            {

-                if(Util.isProjectItemFile(i))

-                {

-                    string path = i.Properties.Item("FullPath").Value.ToString();

-                    if(!String.IsNullOrEmpty(path))

-                    {

-                        if(path.EndsWith(".ice", StringComparison.Ordinal))

-                        {

-                            removeCppGeneratedItems(i, remove);

-                        }

-                    }

-                }

-                else if(Util.isProjectItemFilter(i))

-                {

-                    removeCppGeneratedItems(i.ProjectItems, remove);

-                }

-            }

-        }

-

-        private static void removeCppGeneratedItems(ProjectItem item, bool remove)

-        {

-            if(item == null)

-            {

-                return;

-            }

-

-            if(item.Name == null)

-            {

-                return;

-            }

-

-            if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))

-            {

-                return;

-            }

-            removeCppGeneratedItems(item.ContainingProject, item.Properties.Item("FullPath").Value.ToString(), remove);

-        }

-

-        public static void removeCppGeneratedItems(Project project, String slice, bool remove)

-        {

-            String projectDir = Path.GetDirectoryName(project.FileName);

-            FileInfo hFileInfo = new FileInfo(getCppGeneratedFileName(projectDir, slice, "h"));

-            FileInfo cppFileInfo = new FileInfo(Path.ChangeExtension(hFileInfo.FullName, "cpp"));

-

-            if(remove)

-            {

-                ProjectItem generated = Util.findItem(hFileInfo.FullName, project.ProjectItems);

-                if(generated != null)

-                {

-                    generated.Remove();

-                }

-                generated = Util.findItem(cppFileInfo.FullName, project.ProjectItems);

-                

-                if(generated != null)

-                {

-                    generated.Remove();

-                }

-            }

-            if(File.Exists(hFileInfo.FullName))

-            {

-                File.Delete(hFileInfo.FullName);

-            }

-

-            if(File.Exists(cppFileInfo.FullName))

-            {

-                File.Delete(cppFileInfo.FullName);

-            }

-        }

-

-        private bool runSliceCompiler(Project project, string file, string outputDir)

-        {

-            bool consoleOutput = Util.getProjectPropertyAsBool(project, Util.PropertyConsoleOutput);

-            string args = getSliceCompilerArgs(project, false);

-            if(!String.IsNullOrEmpty(outputDir))

-            {

-                if(outputDir.EndsWith("\\", StringComparison.Ordinal))

-                {

-                    outputDir = outputDir.Replace("\\", "\\\\");

-                }

-                args += "--output-dir \"" + outputDir + "\" ";

-            }

-

-            args += quoteArg(file);

-            args = "/c " + quoteArg(args);

-            ProcessStartInfo processInfo = new ProcessStartInfo("cmd.exe", args);

-            processInfo.CreateNoWindow = true;

-            processInfo.UseShellExecute = false;

-            processInfo.RedirectStandardOutput = true;

-            processInfo.RedirectStandardError = true;

-            processInfo.WorkingDirectory = System.IO.Path.GetDirectoryName(project.FileName);

-

-

-            String compiler = getSliceCompilerPath(project);

-            if(!File.Exists(compiler))

-            {

-                addError(project, file, TaskErrorCategory.Error, 0, 0, compiler +

-                                            " not found. Review 'Ice Home' setting.");

-                return false;

-            }

-

-            if(consoleOutput)

-            {

-                writeBuildOutput("cmd.exe " + args + "\n");

-            }

-            System.Diagnostics.Process process = System.Diagnostics.Process.Start(processInfo);

-

-            process.WaitForExit();

-

-            bool standardError = true;

-            if(Util.isSilverlightProject(project))

-            {

-                string version = getSliceCompilerVesrion(project);

-                List<String> tokens = new List<string>(version.Split(new char[]{'.'}, 

-                                                                     StringSplitOptions.RemoveEmptyEntries));

-                                                                     

-                int mayor = Int32.Parse(tokens[0], CultureInfo.InvariantCulture);

-                int minor = Int32.Parse(tokens[1], CultureInfo.InvariantCulture);

-                if(mayor == 0 && minor <= 3)

-                {

-                    standardError = false;

-                }

-            }

-

-            bool hasErrors = parseErrors(project, file, process.StandardError, consoleOutput);

-            if(!standardError)

-            {

-                hasErrors = hasErrors || parseErrors(project, file, process.StandardOutput, consoleOutput);

-            }

-            process.Close();

-            if(hasErrors)

-            {

-                bringErrorsToFront();

-                if(Util.isCppProject(project))

-                {

-                    removeCppGeneratedItems(project, file, false);

-                }

-                else if(Util.isCSharpProject(project))

-                {

-                    ProjectItem item = Util.findItem(file, project.ProjectItems);

-                    if(item != null)

-                    {

-                        removeCSharpGeneratedItems(item, false);

-                    }

-                }

-            }

-            return !hasErrors;

-        }

-

-        private bool parseErrors(Project project, string file, TextReader strer, bool consoleOutput)

-        {

-            bool hasErrors = false;

-            string errorMessage = strer.ReadLine();

-            bool firstLine = true;

-            string sliceCompiler = getSliceCompilerPath(project);

-            while(!String.IsNullOrEmpty(errorMessage))

-            {

-                if(errorMessage.StartsWith(sliceCompiler, StringComparison.Ordinal))

-                {

-                    hasErrors = true;

-                    String message = strer.ReadLine();

-                    while(!String.IsNullOrEmpty(message))

-                    {

-                        message = message.Trim();

-                        if(message.StartsWith("Usage:", StringComparison.CurrentCultureIgnoreCase))

-                        {

-                            break;

-                        }

-                        errorMessage += "\n" + message;

-                        message = strer.ReadLine();

-                    }

-                    if(consoleOutput)

-                    {

-                        writeBuildOutput(errorMessage + "\n");

-                    }

-                    addError(project, file, TaskErrorCategory.Error, 0, 0, errorMessage.Replace("error:", ""));

-                    break;

-                }

-                int i = errorMessage.IndexOf(':');

-                if(i == -1)

-                {

-                    if(firstLine)

-                    {

-                        errorMessage += strer.ReadToEnd();

-                        if(consoleOutput)

-                        {

-                            writeBuildOutput(errorMessage + "\n");

-                        }

-                        addError(project, "", TaskErrorCategory.Error, 1, 1, errorMessage);

-                        hasErrors = true;

-                        break;

-                    }

-                    errorMessage = strer.ReadLine();

-                    continue;

-                }

-                if(consoleOutput)

-                {

-                    writeBuildOutput(errorMessage + "\n");

-                }

-

-                if(errorMessage.StartsWith("    ", StringComparison.Ordinal)) // Still the same mcpp warning

-                {

-                    errorMessage = strer.ReadLine();

-                    continue;

-                }

-                errorMessage = errorMessage.Trim();

-                firstLine = false;

-                i = errorMessage.IndexOf(':', i + 1);

-                if(i == -1)

-                {

-                    errorMessage = strer.ReadLine();

-                    continue;

-                }

-                string f = errorMessage.Substring(0, i);

-                if(String.IsNullOrEmpty(f))

-                {

-                    errorMessage = strer.ReadLine();

-                    continue;

-                }

-

-                if(!File.Exists(f))

-                {

-                    errorMessage = strer.ReadLine();

-                    continue;

-                }

-

-                errorMessage = errorMessage.Substring(i + 1, errorMessage.Length - i - 1);

-                i = errorMessage.IndexOf(':');

-                string n = errorMessage.Substring(0, i);

-                int l;

-                try

-                {

-                    l = Int16.Parse(n, CultureInfo.InvariantCulture);

-                }

-                catch(Exception)

-                {

-                    l = 0;

-                }

-

-                errorMessage = errorMessage.Substring(i + 1, errorMessage.Length - i - 1).Trim();

-                if(errorMessage.Equals("warning: End of input with no newline, supplemented newline"))

-                {

-                    errorMessage = strer.ReadLine();

-                    continue;

-                }

-

-                if(!String.IsNullOrEmpty(errorMessage))

-                {

-                    //

-                    // Display only errors from this file or files outside the project.

-                    //

-                    bool currentFile = Path.GetFullPath(f).Equals(Path.GetFullPath(file),

-                                                                  StringComparison.CurrentCultureIgnoreCase);

-                    bool found = Util.findItem(f, project.ProjectItems) != null;

-                    TaskErrorCategory category = TaskErrorCategory.Error;

-                    if(errorMessage.StartsWith("warning:", StringComparison.CurrentCultureIgnoreCase))

-                    {

-                        category = TaskErrorCategory.Warning;

-                    }

-                    else

-                    {

-                        hasErrors = true;

-                    }

-                    if(currentFile || !found)

-                    {

-                        if(found)

-                        {

-                            addError(project, file, category, l, 1, errorMessage);

-                        }

-                        else

-                        {

-                            addError(project, file, category, l, 1, "from file: " + f + "\n" + errorMessage);

-                        }

-                    }

-                }

-                errorMessage = strer.ReadLine();

-            }

-            return hasErrors;

-        }

-

-        public CommandBar projectCommandBar()

-        {

-            return findCommandBar(new Guid("{D309F791-903F-11D0-9EFC-00A0C911004F}"), 1026);

-        }

-

-        public CommandBar findCommandBar(Guid guidCmdGroup, uint menuID)

-        {

-            // Retrieve IVsProfferComands via DTE's IOleServiceProvider interface

-            IOleServiceProvider sp = (IOleServiceProvider)_applicationObject;

-            Guid guidSvc = typeof(IVsProfferCommands).GUID;

-            object objService;

-            int rc = sp.QueryService(ref guidSvc, ref guidSvc, out objService);

-            if(ErrorHandler.Failed(rc))

-            {

-                try

-                {

-                    ErrorHandler.ThrowOnFailure(rc);

-                }

-                catch(Exception ex)

-                {

-                    writeBuildOutput(ex.ToString() + "\n");

-                }

-                return null;

-            }

-            IVsProfferCommands vsProfferCmds = (IVsProfferCommands)objService;

-            return vsProfferCmds.FindCommandBar(IntPtr.Zero, ref guidCmdGroup, menuID) as CommandBar;

-        }

-

-        [ComImport,Guid("6D5140C1-7436-11CE-8034-00AA006009FA"),

-         InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]

-        internal interface IOleServiceProvider 

-        {

-            [PreserveSig]

-            int QueryService([In]ref Guid guidService, [In]ref Guid riid, 

-                             [MarshalAs(UnmanagedType.Interface)] out System.Object obj);

-        }

-

-        private void buildBegin(vsBuildScope scope, vsBuildAction action)

-        {

-            try

-            {

-                _building = true;

-                if(action == vsBuildAction.vsBuildActionBuild || action == vsBuildAction.vsBuildActionRebuildAll)

-                {

-                    switch(scope)

-                    {

-                        case vsBuildScope.vsBuildScopeProject:

-                        {

-                            Project project = getSelectedProject();

-                            if(project != null)

-                            {

-                                if(!Util.isSliceBuilderEnabled(project))

-                                {

-                                    break;

-                                }

-                                clearErrors(project);

-                                if(action == vsBuildAction.vsBuildActionRebuildAll)

-                                {

-                                    cleanProject(project);

-                                }

-                                buildProject(project, false, scope);

-                            }

-                            if(hasErrors(project))

-                            {

-                                bringErrorsToFront();

-                                _applicationObject.DTE.ExecuteCommand("Build.Cancel", "");

-                                writeBuildOutput("------ Slice compilation contains errors. Build canceled. ------\n");

-                            }

-                            break;

-                        }

-                        default:

-                        {

-                            clearErrors();

-                            foreach(Project p in _applicationObject.Solution.Projects)

-                            {

-                                if(p != null)

-                                {

-                                    if(!Util.isSliceBuilderEnabled(p))

-                                    {

-                                        continue;

-                                    }

-                                    if(action == vsBuildAction.vsBuildActionRebuildAll)

-                                    {

-                                        cleanProject(p);

-                                    }

-                                    buildProject(p, false, scope);

-                                }

-                            }

-                            if(hasErrors())

-                            {

-                                bringErrorsToFront();

-                                _applicationObject.DTE.ExecuteCommand("Build.Cancel", "");

-                                writeBuildOutput("------ Slice compilation contains errors. Build canceled. ------\n");

-                            }

-                            break;

-                        }

-                    }

-                }

-                else if(action == vsBuildAction.vsBuildActionClean)

-                {

-                    switch(scope)

-                    {

-                        case vsBuildScope.vsBuildScopeProject:

-                        {

-                            Project project = getSelectedProject();

-                            if(project != null)

-                            {

-                                cleanProject(project);

-                            }

-                            break;

-                        }

-                        default:

-                        {

-                            foreach(Project p in _applicationObject.Solution.Projects)

-                            {

-                                if(p != null)

-                                {

-                                    cleanProject(p);

-                                }

-                            }

-                            break;

-                        }

-                    }

-                }

-            }

-            catch(Exception ex)

-            {

-                writeBuildOutput(ex.ToString() + "\n");

-            }

-        }

-

-        //

-        // Initialize slice builder error list provider

-        //

-        private void initErrorListProvider()

-        {

-            _errors = new List<ErrorTask>();

-            _errorListProvider = new Microsoft.VisualStudio.Shell.ErrorListProvider(_serviceProvider);

-            _errorListProvider.ProviderName = "Slice Error Provider";

-            _errorListProvider.ProviderGuid = new Guid("B8DA84E8-7AE3-4c71-8E43-F273A20D40D1");

-            _errorListProvider.Show();

-        }

-

-        //

-        // Remove all errors from slice builder error list provider

-        //

-        private void clearErrors()

-        {

-            _errorCount = 0;

-            _errors.Clear();

-            _errorListProvider.Tasks.Clear();

-        }

-

-        private void clearErrors(Project project)

-        {

-            if(project == null || _errors == null)

-            {

-                return;

-            }

-

-            List<ErrorTask> remove = new List<ErrorTask>();

-            foreach(ErrorTask error in _errors)

-            {

-                if(!error.HierarchyItem.Equals(getProjectHierarchy(project)))

-                {

-                    continue;

-                }

-                if(!_errorListProvider.Tasks.Contains(error))

-                {

-                    continue;

-                }

-                remove.Add(error);

-                _errorListProvider.Tasks.Remove(error);

-            }

-

-            foreach(ErrorTask error in remove)

-            {

-                _errors.Remove(error);

-            }

-        }

-

-        private void clearErrors(String file)

-        {

-            if(file == null || _errors == null)

-            {

-                return;

-            }

-

-            List<ErrorTask> remove = new List<ErrorTask>();

-            foreach(ErrorTask error in _errors)

-            {

-                if(error.Document.Equals(file, StringComparison.CurrentCultureIgnoreCase))

-                {

-                    remove.Add(error);

-                    _errorListProvider.Tasks.Remove(error);

-                }

-            }

-

-            foreach(ErrorTask error in remove)

-            {

-                _errors.Remove(error);

-            }

-

-        }

-        

-        private IVsHierarchy getProjectHierarchy(Project project)

-        {

-            IVsSolution ivSSolution = getIVsSolution();

-            IVsHierarchy hierarchy = null;

-            if(ivSSolution != null)

-            {

-                int hr = ivSSolution.GetProjectOfUniqueName(project.UniqueName, out hierarchy);

-                if(ErrorHandler.Failed(hr))

-                { 

-                    try

-                    {

-                        ErrorHandler.ThrowOnFailure(hr);

-                    }

-                    catch(Exception ex)

-                    {

-                        writeBuildOutput(ex.ToString() + "\n");

-                    }

-                }

-            }

-            return hierarchy;

-        }

-        

-        //

-        // Add a error to slice builder error list provider.

-        //

-        private void addError(Project project, string file, TaskErrorCategory category, int line, int column,

-                              string text)

-        {

-            IVsHierarchy hierarchy = getProjectHierarchy(project);

-

-            ErrorTask errorTask = new ErrorTask();

-            errorTask.ErrorCategory = category;

-            // Visual Studio uses indexes starting at 0 

-            // while the automation model uses indexes starting at 1

-            errorTask.Line = line - 1;

-            errorTask.Column = column - 1;

-            if(hierarchy != null)

-            {

-                errorTask.HierarchyItem = hierarchy;

-            }

-            errorTask.Navigate += new EventHandler(errorTaskNavigate);

-            errorTask.Document = file;

-            errorTask.Category = TaskCategory.BuildCompile;

-            errorTask.Text = text;

-            _errors.Add(errorTask);

-            _errorListProvider.Tasks.Add(errorTask);

-            if(category == TaskErrorCategory.Error)

-            {

-                _errorCount++;

-            }

-        }

-

-        //

-        // True if there was any errors in last slice compilation.

-        //

-        private bool hasErrors()

-        {

-            return _errorCount > 0;

-        }

-

-        private bool hasErrors(Project project)

-        {

-            if(project == null || _errors == null)

-            {

-                return false;

-            }

-

-            bool errors = false;

-            foreach(ErrorTask error in _errors)

-            {

-                if(error.HierarchyItem.Equals(getProjectHierarchy(project)))

-                {

-                    if(error.ErrorCategory == TaskErrorCategory.Error)

-                    {

-                        errors = true;

-                        break;

-                    }

-                }

-            }

-            return errors;

-        }

-

-        private OutputWindowPane buildOutput()

-        {

-            if(_output == null)

-            {

-                OutputWindow window = 

-                    (OutputWindow)_applicationObject.Windows.Item(EnvDTE.Constants.vsWindowKindOutput).Object;

-                _output = window.OutputWindowPanes.Item("Build");

-            }

-            return _output;

-        }

-

-        private void writeBuildOutput(string message)

-        {

-            OutputWindowPane pane = buildOutput();

-            if(pane == null)

-            {

-                return;

-            }

-            pane.Activate();

-            pane.OutputString(message);

-        }

-

-        //

-        // Force the error list to show.

-        //

-        private void bringErrorsToFront()

-        {

-            if(_errorListProvider == null)

-            {

-                return;

-            }

-            _errorListProvider.BringToFront();

-            _errorListProvider.ForceShowErrors();

-        }

-

-        //

-        // Navigate to a file when the error is clicked.

-        //

-        private void errorTaskNavigate(object sender, EventArgs e)

-        {

-            ErrorTask task;

-            try

-            {

-                task = (ErrorTask)sender;

-                task.Line += 1;

-                _errorListProvider.Navigate(task, new Guid(EnvDTE.Constants.vsViewKindTextView));

-                task.Line -= 1;

-            }

-            catch(Exception)

-            {

-            }

-        }

-

-        private DTE2 _applicationObject;

-        private AddIn _addInInstance;

-        private SolutionEvents _solutionEvents;

-        private BuildEvents _buildEvents;

-        private DocumentEvents _docEvents;

-        private ProjectItemsEvents _csProjectItemsEvents;

-        private VCProjectEngineEvents _vcProjectItemsEvents;

-        private ServiceProvider _serviceProvider;

-

-        private ErrorListProvider _errorListProvider;

-        private List<ErrorTask> _errors;

-        private int _errorCount;

-        private FileTracker _fileTracker;

-        private Dictionary<string, Dictionary<string, List<string>>> _dependenciesMap;

-        private string _deletedFile;

-        private OutputWindowPane _output;

-

-        private CommandEvents _addNewItemEvent;

-        private CommandEvents _addExistingItemEvent;

-        private CommandEvents _editRemoveEvent;

-        private CommandEvents _editDeleteEvent;

-        private List<String> _deleted = new List<String>();

-        private Command _iceConfigurationCmd;

-        private bool _building;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Text;
+using System.IO;
+using System.Diagnostics;
+using System.Collections.Generic;
+using Extensibility;
+using EnvDTE;
+using EnvDTE80;
+using Microsoft.VisualStudio;
+using Microsoft.VisualStudio.CommandBars;
+using Microsoft.VisualStudio.VCProjectEngine;
+using Microsoft.VisualStudio.VCProject;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
+using System.Resources;
+using System.Reflection;
+using VSLangProj;
+using System.Globalization;
+using Microsoft.VisualStudio.OLE.Interop;
+using System.Runtime.InteropServices;
+
+
+namespace Ice.VisualStudio
+{
+    public class Builder : IDisposable
+    {
+        protected virtual void Dispose(bool disposing)
+        {
+            if(disposing)
+            {
+                _serviceProvider.Dispose();
+                _errorListProvider.Dispose();
+            }
+        }
+        
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        public DTE getCurrentDTE()
+        {
+            return _applicationObject.DTE;
+        }
+
+        public void init(DTE2 application, AddIn addInInstance)
+        {
+            _applicationObject = application;
+            _addInInstance = addInInstance;
+
+            //
+            // Subscribe to solution events.
+            //
+            _solutionEvents = application.Events.SolutionEvents;
+            _solutionEvents.Opened += new _dispSolutionEvents_OpenedEventHandler(solutionOpened);
+            _solutionEvents.AfterClosing += new _dispSolutionEvents_AfterClosingEventHandler(afterClosing);
+            _solutionEvents.ProjectAdded += new _dispSolutionEvents_ProjectAddedEventHandler(projectAdded);
+            _solutionEvents.ProjectRemoved += new _dispSolutionEvents_ProjectRemovedEventHandler(projectRemoved);
+            _solutionEvents.ProjectRenamed += new _dispSolutionEvents_ProjectRenamedEventHandler(projectRenamed);
+
+            _buildEvents = _applicationObject.Events.BuildEvents;
+            _buildEvents.OnBuildBegin += new _dispBuildEvents_OnBuildBeginEventHandler(buildBegin);
+            _buildEvents.OnBuildDone += new _dispBuildEvents_OnBuildDoneEventHandler(buildDone);
+            foreach(Command c in _applicationObject.Commands)
+            {
+                if(c.Name.Equals("Project.AddNewItem"))
+                {
+                    _addNewItemEvent = application.Events.get_CommandEvents(c.Guid, c.ID);
+                    _addNewItemEvent.AfterExecute += new _dispCommandEvents_AfterExecuteEventHandler(afterAddNewItem);
+                }
+                else if(c.Name.Equals("Edit.Remove"))
+                {
+                    _editRemoveEvent = application.Events.get_CommandEvents(c.Guid, c.ID);
+                    _editRemoveEvent.AfterExecute += new _dispCommandEvents_AfterExecuteEventHandler(editDeleteEvent);
+                }
+                else if(c.Name.Equals("Edit.Delete"))
+                {
+                    _editDeleteEvent = application.Events.get_CommandEvents(c.Guid, c.ID);
+                    _editDeleteEvent.AfterExecute += new _dispCommandEvents_AfterExecuteEventHandler(editDeleteEvent);
+                }
+                else if(c.Name.Equals("Project.AddExistingItem"))
+                {
+                    _addExistingItemEvent = application.Events.get_CommandEvents(c.Guid, c.ID);
+                    _addExistingItemEvent.AfterExecute +=
+                        new _dispCommandEvents_AfterExecuteEventHandler(afterAddExistingItem);
+                }
+            }
+            
+            //
+            // Subscribe to active configuration changed.
+            //
+            _serviceProvider =
+                new ServiceProvider((Microsoft.VisualStudio.OLE.Interop.IServiceProvider)_applicationObject.DTE);
+            initErrorListProvider();
+            setupCommandBars();
+        }
+
+        void editDeleteEvent(string Guid, int ID, object CustomIn, object CustomOut)
+        {
+            if(_deletedFile != null)
+            {
+                Project project = getActiveProject();
+                if(project != null)
+                {
+                    removeDependency(project, _deletedFile);
+                    _deletedFile = null;
+                    clearErrors(project);
+                    buildProject(project, false, vsBuildScope.vsBuildScopeProject);
+                }
+            }
+        }
+
+        public IVsSolution getIVsSolution()
+        {
+            return (IVsSolution) _serviceProvider.GetService(typeof(IVsSolution));
+        }
+
+        public void buildDone(vsBuildScope Scope, vsBuildAction Action)
+        {
+            _building = false;
+        }
+        
+        public bool isBuilding()
+        {
+            return _building;
+        }
+        
+
+        public void afterAddNewItem(string Guid, int ID, object obj, object CustomOut)
+        {
+            foreach(String path in _deleted)
+            {
+                if(path == null)
+                {
+                    continue;
+                }
+                if(File.Exists(path))
+                {
+                    File.Delete(path);
+                }
+            }
+            _deleted.Clear();
+        }
+
+        public void afterAddExistingItem(string Guid, int ID, object obj, object CustomOut)
+        {
+            _deleted.Clear();
+        }
+        
+        public void disconnect()
+        {
+            if(_iceConfigurationCmd != null)
+            {
+                _iceConfigurationCmd.Delete();
+            }
+            
+            _solutionEvents.Opened -= new _dispSolutionEvents_OpenedEventHandler(solutionOpened);
+            _solutionEvents.AfterClosing -= new _dispSolutionEvents_AfterClosingEventHandler(afterClosing);
+            _solutionEvents.ProjectAdded -= new _dispSolutionEvents_ProjectAddedEventHandler(projectAdded);
+            _solutionEvents.ProjectRemoved -= new _dispSolutionEvents_ProjectRemovedEventHandler(projectRemoved);
+            _solutionEvents.ProjectRenamed -= new _dispSolutionEvents_ProjectRenamedEventHandler(projectRenamed);
+            _solutionEvents = null;
+
+            _buildEvents.OnBuildBegin -= new _dispBuildEvents_OnBuildBeginEventHandler(buildBegin);
+            _buildEvents = null;
+            
+            if(_dependenciesMap != null)
+            {
+                _dependenciesMap.Clear();
+                _dependenciesMap = null;
+            }
+            
+            _errorCount = 0;
+            if(_errors != null)
+            {
+                _errors.Clear();
+                _errors = null;
+            }
+
+            if(_fileTracker != null)
+            {
+                _fileTracker.clear();
+                _fileTracker = null;
+            }
+        }
+
+        private void setupCommandBars()
+        {
+            _iceConfigurationCmd = null;
+            try
+            {
+                _iceConfigurationCmd =
+                    _applicationObject.Commands.Item(_addInInstance.ProgID + ".IceConfiguration", -1);
+            }
+            catch(ArgumentException)
+            {
+                object[] contextGUIDS = new object[] { };
+                _iceConfigurationCmd = 
+                    ((Commands2)_applicationObject.Commands).AddNamedCommand2(_addInInstance, 
+                                "IceConfiguration",
+                                "Ice Configuration...",
+                                "Ice Configuration...",
+                                true, -1, ref contextGUIDS,
+                                (int)vsCommandStatus.vsCommandStatusSupported +
+                                (int)vsCommandStatus.vsCommandStatusEnabled,
+                                (int)vsCommandStyle.vsCommandStylePictAndText,
+                                vsCommandControlType.vsCommandControlTypeButton);
+            }
+
+            if(_iceConfigurationCmd == null)
+            {
+                System.Windows.Forms.MessageBox.Show("Error initializing Ice Visual Studio Extension.\n" +
+                                                     "Cannot create required commands",
+                                                     "Ice Visual Studio Extension",
+                                                     System.Windows.Forms.MessageBoxButtons.OK,
+                                                     System.Windows.Forms.MessageBoxIcon.Error,
+                                                     System.Windows.Forms.MessageBoxDefaultButton.Button1,
+                                                     System.Windows.Forms.MessageBoxOptions.RightAlign);
+                return;
+            }
+
+            CommandBar toolsCmdBar = ((CommandBars)_applicationObject.CommandBars)["Tools"];
+            _iceConfigurationCmd.AddControl(toolsCmdBar, toolsCmdBar.Controls.Count + 1);
+
+            CommandBar projectCmdBar = projectCommandBar();
+            _iceConfigurationCmd.AddControl(projectCmdBar, projectCmdBar.Controls.Count + 1);   
+        }
+
+        public void afterClosing()
+        {
+            clearErrors();
+            removeDocumentEvents();
+            if(_dependenciesMap != null)
+            {
+                _dependenciesMap.Clear();
+                _dependenciesMap = null;
+            }
+            
+            trackFiles();
+        }
+
+        private void trackFiles()
+        {
+            if(_fileTracker == null)
+            {
+                return;
+            }
+            foreach(Project p in _applicationObject.Solution.Projects)
+            {
+                if(p == null)
+                {
+                    continue;
+                }
+                if(!Util.isSliceBuilderEnabled(p))
+                {
+                    continue;
+                }
+                _fileTracker.reap(p);
+            }
+        }
+
+        public void solutionOpened()
+        {
+            try
+            {
+                _dependenciesMap = new Dictionary<string, Dictionary<string, List<string>>>();
+                _fileTracker = new FileTracker();
+                initDocumentEvents();
+                foreach(Project p in _applicationObject.Solution.Projects)
+                {
+                    if((Util.isCSharpProject(p) || Util.isVBProject(p) || Util.isCppProject(p)) && 
+                        Util.isSliceBuilderEnabled(p))
+                    {
+                        //
+                        // Update Ice Home if expansion does not match old setting.
+                        //
+                        if(!Util.subEnvironmentVars(Util.getIceHomeRaw(p, false)).Equals(Util.getIceHome(p), 
+                                                                          StringComparison.CurrentCultureIgnoreCase))
+                        {
+                            Util.updateIceHome(p, Util.getIceHomeRaw(p, false), true);
+                        }
+
+                        if(!Util.isVBProject(p))
+                        {
+                            _dependenciesMap[p.Name] = new Dictionary<string, List<string>>();
+                            buildProject(p, true, vsBuildScope.vsBuildScopeSolution);
+                        }
+                    }
+                }
+                if(hasErrors())
+                {
+                    bringErrorsToFront();
+                }
+            }
+            catch(Exception ex)
+            {
+                writeBuildOutput(ex.ToString() + "\n");
+            }
+        }
+
+        public void addBuilderToProject(Project project)
+        {
+            if(Util.isCppProject(project))
+            {
+                Util.getIceHomeRaw(project, true);
+                Util.addIceCppConfigurations(project);
+                ComponentList components = 
+                    new ComponentList(Util.getProjectProperty(project, Util.PropertyIceComponents));
+                if(components.Count == 0)
+                {
+                    components.Add("Ice");
+                    components.Add("IceUtil");
+                }
+                Util.addIceCppLibs(project, components);
+                Util.setProjectProperty(project, Util.PropertyIce, true.ToString());
+                buildCppProject(project, true);
+            }
+            else if(Util.isCSharpProject(project))
+            {
+                Util.getIceHomeRaw(project, true);
+                if(Util.isSilverlightProject(project))
+                {
+                    Util.addDotNetReference(project, "IceSL");
+                }
+                else
+                {
+                    ComponentList components = 
+                        new ComponentList(Util.getProjectProperty(project, Util.PropertyIceComponents));
+                    if(components.Count == 0)
+                    {
+                        components.Add("Ice");
+                    }
+                    foreach(string component in components)
+                    {
+                        Util.addDotNetReference(project, component);
+                    }
+                }
+                Util.setProjectProperty(project, Util.PropertyIce, true.ToString());
+                buildCSharpProject(project, true);
+            }
+            else if(Util.isVBProject(project))
+            {
+                Util.getIceHomeRaw(project, true);
+                ComponentList components = 
+                    new ComponentList(Util.getProjectProperty(project, Util.PropertyIceComponents));
+                if(components.Count == 0)
+                {
+                    components.Add("Ice");
+                }
+                foreach(string component in components)
+                {
+                    Util.addDotNetReference(project, component);
+                }
+                Util.setProjectProperty(project, Util.PropertyIce, true.ToString());
+            }
+            if(hasErrors(project))
+            {
+                bringErrorsToFront();
+            }
+        }
+
+        public void removeBuilderFromProject(Project project)
+        {
+            cleanProject(project);
+            if(Util.isCppProject(project))
+            {
+                Util.removeIceCppConfigurations(project);
+                ComponentList libs = Util.removeIceCppLibs(project);
+                Util.setProjectProperty(project, Util.PropertyIceComponents, libs.ToString());
+                Util.setProjectProperty(project, Util.PropertyIce, false.ToString());
+            }
+            else if(Util.isCSharpProject(project))
+            {
+                if(Util.isSilverlightProject(project))
+                {
+                    Util.removeDotNetReference(project, "IceSL");
+                }
+                else
+                {
+                    ComponentList refs = new ComponentList();
+                    foreach(string component in Util.getDotNetNames())
+                    {
+                        if(Util.removeDotNetReference(project, component))
+                        {
+                            refs.Add(component);
+                        }
+                        Util.setProjectProperty(project, Util.PropertyIceComponents, refs.ToString());
+                    }
+                }
+                Util.setProjectProperty(project, Util.PropertyIce, false.ToString());
+            }
+            else if(Util.isVBProject(project))
+            {
+                ComponentList refs = new ComponentList();
+                foreach(string component in Util.getDotNetNames())
+                {
+                    if(Util.removeDotNetReference(project, component))
+                    {
+                        refs.Add(component);
+                    }
+                    Util.setProjectProperty(project, Util.PropertyIceComponents, refs.ToString());
+                }
+                Util.setProjectProperty(project, Util.PropertyIce, false.ToString());
+            }
+        }
+
+        private void documentOpened(Document document)
+        {
+            if(_fileTracker.hasGeneratedFile(document.ProjectItem.ContainingProject, document.FullName))
+            {
+                if(!document.ReadOnly)
+                {
+                    document.ReadOnly = true;
+                }
+            }
+        }
+
+        public void documentSaved(Document document)
+        {
+            Project project = null;
+            try
+            {
+                project = document.ProjectItem.ContainingProject;
+            }
+            catch(COMException)
+            {
+                // Expected when documents are create during project initialization
+                // and the ProjectItem is not yet available.
+                return;
+            }
+            if(!Util.isSliceBuilderEnabled(project))
+            {
+                return;
+            }
+            if(!document.Name.EndsWith(".ice", StringComparison.Ordinal))
+            {
+                return;
+            }
+
+            _fileTracker.reap(project);
+            clearErrors(project);
+            buildProject(project, false, vsBuildScope.vsBuildScopeProject);
+        }
+        
+        public void projectAdded(Project project)
+        {
+            if(Util.isSliceBuilderEnabled(project))
+            {
+                updateDependencies(project);
+            }
+        }
+
+        public void projectRemoved(Project project)
+        {
+            if(_dependenciesMap.ContainsKey(project.Name))
+            {
+                _dependenciesMap.Remove(project.Name);
+            }
+        }
+
+        public void projectRenamed(Project project, string oldName)
+        {
+            if(_dependenciesMap.ContainsKey(oldName))
+            {
+                _dependenciesMap.Remove(oldName);
+            }
+            updateDependencies(project);
+        }
+
+        public void cleanProject(Project project)
+        {
+            if(project == null)
+            {
+                return;
+            }
+            if(!Util.isSliceBuilderEnabled(project))
+            {
+                return;
+            }
+            clearErrors(project);
+            _fileTracker.reap(project);
+
+            if(Util.isCSharpProject(project))
+            {
+                removeCSharpGeneratedItems(project, project.ProjectItems, false);
+            }
+            else if(Util.isCppProject(project))
+            {
+                removeCppGeneratedItems(project.ProjectItems, false);
+            }
+        }
+
+        public void removeCSharpGeneratedItems(Project project, ProjectItems items, bool remove)
+        {
+            if(project == null)
+            {
+                return;
+            }
+            if(items == null)
+            {
+                return;
+            }
+
+            foreach(ProjectItem i in items)
+            {
+                if(i == null)
+                {
+                    continue;
+                }
+
+                if(Util.isProjectItemFolder(i))
+                {
+                    removeCSharpGeneratedItems(project, i.ProjectItems, remove);
+                }
+                else if(Util.isProjectItemFile(i))
+                {
+                    removeCSharpGeneratedItems(i, remove);
+                }
+            }
+        }
+
+        public void buildProject(Project project, bool force, vsBuildScope scope)
+        {
+            buildProject(project, force, null, scope);
+        }
+
+        public void buildProject(Project project, bool force, ProjectItem excludeItem, vsBuildScope scope)
+        {
+            if(project == null)
+            {
+                return;
+            }
+
+            if(!Util.isSliceBuilderEnabled(project))
+            {
+                return;
+            }
+
+            if(vsBuildScope.vsBuildScopeProject == scope)
+            {
+                BuildDependencies dependencies = _applicationObject.Solution.SolutionBuild.BuildDependencies;
+                for(int i = 0; i < dependencies.Count; ++i)
+                {
+                    BuildDependency dp = dependencies.Item(i + 1);
+                    if(dp.Project.Equals(project))
+                    {
+                        System.Array projects = dp.RequiredProjects as System.Array;
+                        foreach(Project p in projects)
+                        {
+                            buildProject(p, force, vsBuildScope.vsBuildScopeProject);
+                        }
+                    }
+                }
+            }
+
+            bool consoleOutput = Util.getProjectPropertyAsBool(project, Util.PropertyConsoleOutput);
+            if(consoleOutput)
+            {
+                writeBuildOutput("------ Slice compilation started: Project: " + project.Name + " ------\n");
+            }
+            _fileTracker.reap(project);
+            if(Util.isCSharpProject(project))
+            {
+                buildCSharpProject(project, force, excludeItem);
+            }
+            else if(Util.isCppProject(project))
+            {
+                buildCppProject(project, force);
+            }
+            if(consoleOutput)
+            {
+                if(hasErrors(project))
+                {
+                    writeBuildOutput("------ Slice compilation failed: Project: " + project.Name + " ------\n");
+                }
+                else
+                {
+                    writeBuildOutput("------ Slice compilation succeeded: Project: " + project.Name + " ------\n");
+                }
+            }
+        }
+
+        public bool buildCppProject(Project project, bool force)
+        {
+            return buildCppProject(project, project.ProjectItems, force);
+        }
+
+        public bool buildCppProject(Project project, ProjectItems items, bool force)
+        {
+            bool success = true;
+            foreach(ProjectItem i in items)
+            {
+                if(i == null)
+                {
+                    continue;
+                }
+
+                if(Util.isProjectItemFilter(i))
+                {
+                    if(!buildCppProject(project, i.ProjectItems, force))
+                    {
+                        success = false;
+                    }
+                }
+                else if(Util.isProjectItemFile(i))
+                {
+                    if(!buildCppProjectItem(project, i, force))
+                    {
+                        success = false;
+                    }
+                }
+            }
+            return success;
+        }
+
+        public bool buildCppProjectItem(Project project, ProjectItem item, bool force)
+        {
+            if(project == null)
+            {
+                return true;
+            }
+
+            if(item == null)
+            {
+                return true;
+            }
+
+            if(item.Name == null)
+            {
+                return true;
+            }
+
+            if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))
+            {
+                return true;
+            }
+
+            FileInfo iceFileInfo = new FileInfo(item.Properties.Item("FullPath").Value.ToString());
+            FileInfo hFileInfo = new FileInfo(getCppGeneratedFileName(Path.GetDirectoryName(project.FullName),
+                                              iceFileInfo.FullName, "h"));
+            FileInfo cppFileInfo = new FileInfo(Path.ChangeExtension(hFileInfo.FullName, "cpp"));
+
+            string output = Path.GetDirectoryName(cppFileInfo.FullName);
+            return buildCppProjectItem(project, output, iceFileInfo, cppFileInfo, hFileInfo, force);
+        }
+
+        public bool buildCppProjectItem(Project project, String output, FileSystemInfo ice, FileSystemInfo cpp,
+                                        FileSystemInfo h, bool force)
+        {
+            bool updated = false;
+            bool success = false;
+            
+            if(!h.Exists || !cpp.Exists)
+            {
+                updated = true;
+            }
+            else if(Util.findItem(h.FullName, project.ProjectItems) == null || 
+                    Util.findItem(cpp.FullName, project.ProjectItems) == null)
+            {
+                updated = true;
+            }
+            else if(ice.LastWriteTime > h.LastWriteTime || ice.LastWriteTime > cpp.LastWriteTime)
+            {
+                if(!Directory.Exists(output))
+                {
+                    Directory.CreateDirectory(output);
+                }
+                updated = true;
+            }
+            else
+            {
+                //
+                // Now check it any of the dependencies has changed.
+                //
+                if(_dependenciesMap.ContainsKey(project.Name))
+                {
+                    Dictionary<string, List<string>> dependenciesMap = _dependenciesMap[project.Name];
+                    if(dependenciesMap.ContainsKey(ice.FullName))
+                    {
+                        List<string> fileDependencies = dependenciesMap[ice.FullName];
+                        foreach(string name in fileDependencies)
+                        {
+                            FileInfo dependency =
+                                new FileInfo(Path.Combine(Path.GetDirectoryName(project.FileName), name));
+                            if(!dependency.Exists)
+                            {
+                                updated = true;
+                                break;
+                            }
+                            
+                            if(dependency.LastWriteTime > cpp.LastWriteTime ||
+                               dependency.LastWriteTime > h.LastWriteTime)
+                            {
+                                updated = true;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            
+            if(updated || force)
+            {
+                if(!Directory.Exists(output))
+                {
+                    Directory.CreateDirectory(output);
+                }
+
+                if(updateDependencies(project, null, ice.FullName, getSliceCompilerArgs(project, true)) && updated)
+                {
+                    if(runSliceCompiler(project, ice.FullName, output))
+                    {
+                        addCppGeneratedFiles(project, ice, cpp, h);
+                        success = true;
+                    }
+                }
+            }
+            else
+            {
+                //
+                // Make sure generated files are part of project.
+                //
+                addCppGeneratedFiles(project, ice, cpp, h);
+            }
+            return !updated | success;
+        }
+
+        public void addCppGeneratedFiles(Project project, FileSystemInfo ice, FileSystemInfo cpp, FileSystemInfo h)
+        {
+            if(project == null)
+            {
+                return;
+            }
+
+            VCProject vcProject = (VCProject)project.Object;
+
+            if(File.Exists(cpp.FullName))
+            {
+                _fileTracker.trackFile(project, ice.FullName, h.FullName);
+                VCFile file = Util.findVCFile((IVCCollection)vcProject.Files, cpp.Name, cpp.FullName);
+                if(file == null)
+                {
+                    vcProject.AddFile(cpp.FullName);
+                }
+            }
+
+            if(File.Exists(h.FullName))
+            {
+                _fileTracker.trackFile(project, ice.FullName, cpp.FullName);
+                VCFile file = Util.findVCFile((IVCCollection)vcProject.Files, h.Name, h.FullName);            
+                if(file == null)
+                {
+                    vcProject.AddFile(h.FullName);
+                }
+            }
+        }
+
+        public void buildCSharpProject(Project project, bool force)
+        {
+            buildCSharpProject(project, force, null);
+        }
+        
+        public void buildCSharpProject(Project project, bool force, ProjectItem excludeItem)
+        {
+            string projectDir = Path.GetDirectoryName(project.FileName);
+            buildCSharpProject(project, projectDir, project.ProjectItems, force, excludeItem);
+        }
+
+        public void buildCSharpProject(Project project, string projectDir, ProjectItems items, bool force, 
+                                       ProjectItem excludeItem)
+        {
+            foreach(ProjectItem i in items)
+            {
+                if(i == null || i == excludeItem)
+                {
+                    continue;
+                }
+
+                if(Util.isProjectItemFolder(i))
+                {
+                    buildCSharpProject(project, projectDir, i.ProjectItems, force, excludeItem);
+                }
+                else if(Util.isProjectItemFile(i))
+                {
+                    buildCSharpProjectItem(project, i, force);
+                }
+            }
+        }
+
+        public static String getCppGeneratedFileName(String projectDir, String fullPath, string extension)
+        {
+            if(String.IsNullOrEmpty(projectDir) || String.IsNullOrEmpty(fullPath))
+            {
+                return "";
+            }
+
+            if(!fullPath.EndsWith(".ice", StringComparison.Ordinal))
+            {
+                return "";
+            }
+
+            if(Path.GetFullPath(fullPath).StartsWith(Path.GetFullPath(projectDir),
+                                                     StringComparison.CurrentCultureIgnoreCase))
+            {
+                return Path.ChangeExtension(fullPath, extension);
+            }
+            return Path.ChangeExtension(Path.Combine(projectDir, Path.GetFileName(fullPath)), extension);
+        }
+
+        public static string getCSharpGeneratedFileName(Project project, ProjectItem item, string extension)
+        {
+            if(project == null)
+            {
+                return "";
+            }
+
+            if(item == null)
+            {
+                return "";
+            }
+
+            if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))
+            {
+                return "";
+            }
+
+            string projectDir = Path.GetDirectoryName(project.FileName);
+            string itemRelativePath = Util.getPathRelativeToProject(item);
+            if(!String.IsNullOrEmpty(itemRelativePath))
+            {
+                string generatedDir = Path.GetDirectoryName(itemRelativePath);
+                string path = System.IO.Path.Combine(projectDir, generatedDir);
+                return System.IO.Path.Combine(path, Path.ChangeExtension(item.Name, extension));
+            }
+            return "";
+        }
+
+        public bool buildCSharpProjectItem(Project project, ProjectItem item, bool force)
+        {
+            if(project == null)
+            {
+                return true;
+            }
+
+            if(item == null)
+            {
+                return true;
+            }
+
+            if(item.Name == null)
+            {
+                return true;
+            }
+
+            if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))
+            {
+                return true;
+            }
+
+            FileInfo iceFileInfo = new FileInfo(item.Properties.Item("FullPath").Value.ToString());
+            FileInfo generatedFileInfo = new FileInfo(getCSharpGeneratedFileName(project, item, "cs"));
+            bool success = false;
+            bool updated = false;
+            if(!generatedFileInfo.Exists)
+            {
+                updated = true;
+            }
+            else if(iceFileInfo.LastWriteTime > generatedFileInfo.LastWriteTime)
+            {
+                updated = true;
+            }
+            else
+            {
+                //
+                // Now check it any of the dependencies has changed.
+                //
+                //
+                if(_dependenciesMap.ContainsKey(project.Name))
+                {
+                    Dictionary<string, List<string>> dependenciesMap = _dependenciesMap[project.Name];
+                    if(dependenciesMap.ContainsKey(iceFileInfo.FullName))
+                    {
+                        List<string> fileDependencies = dependenciesMap[iceFileInfo.FullName];
+                        foreach(string name in fileDependencies)
+                        {
+                            FileInfo dependency =
+                                new FileInfo(Path.Combine(Path.GetDirectoryName(project.FileName), name));
+                            if(!dependency.Exists)
+                            {
+                                updated = true;
+                                break;
+                            }
+    
+                            if(dependency.LastWriteTime > generatedFileInfo.LastWriteTime)
+                            {
+                                updated = true;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            if(updated || force)
+            {
+                if(updateDependencies(project, item, iceFileInfo.FullName, getSliceCompilerArgs(project, true)) && 
+                   updated)
+                {
+                    if(runSliceCompiler(project, iceFileInfo.FullName, generatedFileInfo.DirectoryName))
+                    {
+                        addCSharpGeneratedFiles(project, iceFileInfo, generatedFileInfo);
+                        success = true;
+                    }
+                }
+            }
+            else
+            {
+                //
+                // Make sure generated files are part of project.
+                //
+                addCSharpGeneratedFiles(project, iceFileInfo, generatedFileInfo);
+            }
+            return !updated | success;
+        }
+
+        private void addCSharpGeneratedFiles(Project project, FileInfo ice, FileInfo file)
+        {
+            if(File.Exists(file.FullName))
+            {
+                _fileTracker.trackFile(project, ice.FullName, file.FullName);
+
+                ProjectItem generatedItem = Util.findItem(file.FullName, project.ProjectItems);
+                if(generatedItem == null)
+                {
+                    project.ProjectItems.AddFromFile(file.FullName);
+                }
+            }
+        }
+
+        private static string quoteArg(string arg)
+        {
+            return "\"" + arg + "\"";
+        }
+        
+        private static string getSliceCompilerPath(Project project)
+        {
+            String compiler = Util.slice2cpp;
+            if(Util.isCSharpProject(project))
+            {
+                if(Util.isSilverlightProject(project))
+                {
+                    compiler = Util.slice2sl;
+                }
+                else
+                {
+                    compiler = Util.slice2cs;
+                }
+            }
+
+            String iceHome = Util.getAbsoluteIceHome(project);
+            if(Directory.Exists(Path.Combine(iceHome, "cpp")))
+            {
+                iceHome = Path.Combine(iceHome, "cpp\\bin");
+            }
+            else
+            {
+                iceHome = Path.Combine(iceHome, "bin");
+                if(!File.Exists(Path.Combine(iceHome, compiler)))
+                {
+                    iceHome = Path.Combine(iceHome, "x64");
+                }
+            }
+            return Path.Combine(iceHome, compiler);
+        }
+        
+        private static string getSliceCompilerVesrion(Project project)
+        {
+            System.Diagnostics.Process process;
+            String args = "/c" + quoteArg(getSliceCompilerPath(project)) + " -v";
+            ProcessStartInfo processInfo = new ProcessStartInfo("cmd.exe", args);
+            processInfo.CreateNoWindow = true;
+            processInfo.UseShellExecute = false;
+            processInfo.RedirectStandardError = true;
+            processInfo.RedirectStandardOutput = true;
+            processInfo.WorkingDirectory = Path.GetDirectoryName(project.FileName);
+
+            process = System.Diagnostics.Process.Start(processInfo);
+            process.WaitForExit();
+            String version = process.StandardOutput.ReadLine();
+            return version;
+        }
+
+        private static string getSliceCompilerArgs(Project project, bool depend)
+        {
+            IncludePathList includes = 
+                new IncludePathList(Util.getProjectProperty(project, Util.PropertyIceIncludePath));
+            string extraOpts = Util.getProjectProperty(project, Util.PropertyIceExtraOptions).Trim();
+            bool tie = Util.getProjectPropertyAsBool(project, Util.PropertyIceTie);
+            bool ice = Util.getProjectPropertyAsBool(project, Util.PropertyIcePrefix);
+            bool streaming = Util.getProjectPropertyAsBool(project, Util.PropertyIceStreaming);
+            bool checksum = Util.getProjectPropertyAsBool(project, Util.PropertyIceChecksum);
+
+            string sliceCompiler = getSliceCompilerPath(project);
+
+            string args = quoteArg(sliceCompiler) + " ";
+
+            if(depend)
+            {
+                args += "--depend ";
+            }
+
+            if(Util.isCppProject(project))
+            {
+                String dllExportSymbol = Util.getProjectProperty(project, Util.PropertyIceDllExport);
+                if(!String.IsNullOrEmpty(dllExportSymbol))
+                {
+                    args += "--dll-export=" + dllExportSymbol + " ";
+                }
+
+                String preCompiledHeader = Util.getPrecompileHeader(project);
+                if(!String.IsNullOrEmpty(preCompiledHeader))
+                {
+                    args += "--add-header=" + preCompiledHeader + " ";
+                }
+            }
+
+            args += "-I\"" + Util.getIceHome(project) + "\\slice\" "; 
+
+            foreach(string i in includes)
+            {
+                if(string.IsNullOrEmpty(i))
+                {
+                    continue;
+                }
+                String include = Util.subEnvironmentVars(i);
+                if(include.EndsWith("\\", StringComparison.Ordinal) &&
+                   include.Split(new char[]{'\\'}, StringSplitOptions.RemoveEmptyEntries).Length == 1)
+                {
+                    include += ".";
+                }
+
+                if(include.EndsWith("\\", StringComparison.Ordinal) && 
+                   !include.EndsWith("\\\\", StringComparison.Ordinal))
+                {
+                   include += "\\";
+                }
+                args += "-I" + quoteArg(include) + " ";
+            }
+
+            if(extraOpts.Length != 0)
+            {
+                args += Util.subEnvironmentVars(extraOpts) + " ";
+            }
+
+            if(tie && Util.isCSharpProject(project) && !Util.isSilverlightProject(project))
+            {
+                args += "--tie ";
+            }
+
+            if(ice)
+            {
+                args += "--ice ";
+            }
+
+            if(streaming)
+            {
+                args += "--stream ";
+            }
+
+            if(checksum)
+            {
+                args += "--checksum ";
+            }
+
+            return args;
+        }
+        
+        public bool updateDependencies(Project project)
+        {
+            return updateDependencies(project, null);
+        }
+        
+        public bool updateDependencies(Project project, ProjectItem excludeItem)
+        {
+            _dependenciesMap[project.Name] = new Dictionary<string, List<string>>();
+            return updateDependencies(project, project.ProjectItems, getSliceCompilerArgs(project, true), excludeItem);
+        }
+
+        public void cleanDependencies(Project project, string file)
+        {
+            if(project == null || file == null)
+            {
+                return;
+            }
+            if(String.IsNullOrEmpty(project.Name))
+            {
+                return;
+            }
+            if(!_dependenciesMap.ContainsKey(project.Name))
+            {
+                return;
+            }
+
+            Dictionary<string, List<string>> projectDependencies = _dependenciesMap[project.Name];
+            if(!projectDependencies.ContainsKey(file))
+            {
+                return;
+            }
+            projectDependencies.Remove(file);
+            _dependenciesMap[project.Name] = projectDependencies;
+        }
+
+        public bool updateDependencies(Project project, ProjectItems items, string args, ProjectItem excludeItem)
+        {
+            bool success = true;
+            foreach(ProjectItem item in items)
+            {
+                if(item == null || item == excludeItem)
+                {
+                    continue;
+                }
+
+                if(Util.isProjectItemFolder(item) || Util.isProjectItemFilter(item))
+                {
+                    if(!updateDependencies(project, item.ProjectItems, args, excludeItem))
+                    {
+                        success = false;
+                    }
+                }
+                else if(Util.isProjectItemFile(item))
+                {
+                    if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))
+                    {
+                        continue;
+                    }
+
+                    string fullPath = item.Properties.Item("FullPath").Value.ToString();
+                    if(!updateDependencies(project, item, fullPath, args))
+                    {
+                        success = false;
+                    }
+                }
+            }
+            return success;
+        }
+
+        public bool updateDependencies(Project project, ProjectItem item, string file, string args)
+        {
+            bool consoleOutput = Util.getProjectPropertyAsBool(project, Util.PropertyConsoleOutput);
+            ProcessStartInfo processInfo;
+            System.Diagnostics.Process process;
+
+            args += quoteArg(file);
+            args = "/c " + quoteArg(args);
+
+            processInfo = new ProcessStartInfo("cmd.exe", args);
+            processInfo.CreateNoWindow = true;
+            processInfo.UseShellExecute = false;
+            processInfo.RedirectStandardError = true;
+            processInfo.RedirectStandardOutput = true;
+            processInfo.WorkingDirectory = Path.GetDirectoryName(project.FileName);
+
+            String compiler = getSliceCompilerPath(project);
+            if(!File.Exists(compiler))
+            {
+                addError(project, file, TaskErrorCategory.Error, 0, 0, compiler +
+                                            " not found. Review 'Ice Home' setting.");
+                return false;
+            }
+
+            if(consoleOutput)
+            {
+                writeBuildOutput("cmd.exe " + args + "\n");
+            }
+            
+            process = System.Diagnostics.Process.Start(processInfo);
+            process.WaitForExit();
+            
+            if(parseErrors(project, file, process.StandardError, consoleOutput))
+            {
+                bringErrorsToFront();
+                process.Close();
+                if(Util.isCppProject(project))
+                {
+                    removeCppGeneratedItems(project, file, false);
+                }
+                else if(Util.isCSharpProject(project))
+                {
+                    removeCSharpGeneratedItems(item, false);
+                }
+                return false;
+            }
+            
+            List<string> dependencies = new List<string>();
+            TextReader output = process.StandardOutput;
+            
+            string line = null;
+
+            if(!_dependenciesMap.ContainsKey(project.Name))
+            {
+                _dependenciesMap[project.Name] = new Dictionary<string,List<string>>();
+            }
+            
+            Dictionary<string, List<string>> projectDeps = _dependenciesMap[project.Name];
+            while((line = output.ReadLine()) != null)
+            {
+                writeBuildOutput(line);
+                if(!String.IsNullOrEmpty(line))
+                {
+                    if(line.EndsWith(" \\", StringComparison.Ordinal))
+                    {
+                        line = line.Substring(0, line.Length - 2);
+                    }
+                    line = line.Trim();
+                    //
+                    // Unescape white spaces.
+                    //
+                    line = line.Replace("\\ ", " ");
+
+                    if(line.EndsWith(".ice", StringComparison.Ordinal) &&
+                       System.IO.Path.GetFileName(line) != System.IO.Path.GetFileName(file))
+                    {
+                        line = line.Replace('/', '\\');
+                        dependencies.Add(line);
+                    }
+                }
+            }
+            projectDeps[file] = dependencies;
+            _dependenciesMap[project.Name] = projectDeps;
+
+            process.Close();
+            return true;
+        }
+
+        public void initDocumentEvents()
+        {
+            //Csharp project item events.
+            _csProjectItemsEvents = 
+                (EnvDTE.ProjectItemsEvents)_applicationObject.Events.GetObject("CSharpProjectItemsEvents");
+            if(_csProjectItemsEvents != null)
+            {
+                _csProjectItemsEvents.ItemAdded +=
+                    new _dispProjectItemsEvents_ItemAddedEventHandler(csharpItemAdded);
+                _csProjectItemsEvents.ItemRemoved +=
+                    new _dispProjectItemsEvents_ItemRemovedEventHandler(csharpItemRemoved);
+                _csProjectItemsEvents.ItemRenamed +=
+                    new _dispProjectItemsEvents_ItemRenamedEventHandler(csharpItemRenamed);
+            }
+
+            //Cpp project item events.
+            _vcProjectItemsEvents = 
+                (VCProjectEngineEvents)_applicationObject.Events.GetObject("VCProjectEngineEventsObject");
+            if(_vcProjectItemsEvents != null)
+            {
+                _vcProjectItemsEvents.ItemAdded +=
+                    new _dispVCProjectEngineEvents_ItemAddedEventHandler(cppItemAdded);
+                _vcProjectItemsEvents.ItemRemoved +=
+                    new _dispVCProjectEngineEvents_ItemRemovedEventHandler(cppItemRemoved);
+                _vcProjectItemsEvents.ItemRenamed +=
+                    new _dispVCProjectEngineEvents_ItemRenamedEventHandler(cppItemRenamed);
+            }
+
+            //Visual Studio document events.
+            _docEvents = _applicationObject.Events.get_DocumentEvents(null);
+            if(_docEvents != null)
+            {
+                _docEvents.DocumentSaved += new _dispDocumentEvents_DocumentSavedEventHandler(documentSaved);
+                _docEvents.DocumentOpened += new _dispDocumentEvents_DocumentOpenedEventHandler(documentOpened);
+            }
+        }
+
+        public void removeDocumentEvents()
+        {
+            //Csharp project item events.
+            if(_csProjectItemsEvents != null)
+            {
+                _csProjectItemsEvents.ItemAdded -= 
+                    new _dispProjectItemsEvents_ItemAddedEventHandler(csharpItemAdded);
+                _csProjectItemsEvents.ItemRemoved -= 
+                    new _dispProjectItemsEvents_ItemRemovedEventHandler(csharpItemRemoved);
+                _csProjectItemsEvents.ItemRenamed -=
+                    new _dispProjectItemsEvents_ItemRenamedEventHandler(csharpItemRenamed);
+                _csProjectItemsEvents = null;
+            }
+
+            //Cpp project item events.
+            if(_vcProjectItemsEvents != null)
+            {
+                _vcProjectItemsEvents.ItemAdded -= 
+                    new _dispVCProjectEngineEvents_ItemAddedEventHandler(cppItemAdded);
+                _vcProjectItemsEvents.ItemRemoved -=
+                    new _dispVCProjectEngineEvents_ItemRemovedEventHandler(cppItemRemoved);
+                _vcProjectItemsEvents.ItemRenamed -=
+                    new _dispVCProjectEngineEvents_ItemRenamedEventHandler(cppItemRenamed);
+                _vcProjectItemsEvents = null;
+            }
+
+            //Visual Studio document events.
+            if(_docEvents != null)
+            {
+                _docEvents.DocumentSaved -= new _dispDocumentEvents_DocumentSavedEventHandler(documentSaved);
+                _docEvents.DocumentOpened -= new _dispDocumentEvents_DocumentOpenedEventHandler(documentOpened);
+                _docEvents = null;
+            }
+        }
+
+        public Project getSelectedProject()
+        {
+            return Util.getSelectedProject(_applicationObject.DTE);
+        }
+        
+        public Project getActiveProject()
+        {
+            Array projects = (Array)_applicationObject.ActiveSolutionProjects;
+            if(projects == null)
+            {
+                return null;
+            }
+            return projects.GetValue(0) as Project;
+        }
+
+        private void cppItemRenamed(object obj, object parent, string oldName)
+        {
+            try
+            {
+                if(obj == null)
+                {
+                    return;
+                }
+                VCFile file = obj as VCFile;
+                if(file == null)
+                {
+                    return;
+                }
+                if(!file.Name.EndsWith(".ice", StringComparison.Ordinal))
+                {
+                    return;
+                }
+                Array projects = (Array)_applicationObject.ActiveSolutionProjects;
+                if(projects == null)
+                {
+                    return;
+                }
+                Project project = projects.GetValue(0) as Project;
+                if(project == null)
+                {
+                    return;
+                }
+                if(!Util.isSliceBuilderEnabled(project))
+                {
+                    return;
+                }
+                _fileTracker.reap(project);
+                ProjectItem item = Util.findItem(file.FullPath, project.ProjectItems);
+
+                string fullPath = file.FullPath;
+                if(Util.isCppProject(project))
+                {
+                    string cppPath = Path.ChangeExtension(fullPath, ".cpp");
+                    string hPath = Path.ChangeExtension(cppPath, ".h");
+                    if(File.Exists(cppPath) || Util.hasItemNamed(project.ProjectItems, Path.GetFileName(cppPath)))
+                    {
+                        System.Windows.Forms.MessageBox.Show("A file named '" + Path.GetFileName(cppPath) + 
+                                                             "' already exists.\n" + "If you want to add '" + 
+                                                             Path.GetFileName(fullPath) + "' first remove " + " '" + 
+                                                             Path.GetFileName(cppPath) + "' and '" +
+                                                             Path.GetFileName(hPath) + "' from your project.",
+                                                             "Ice Visual Studio Extension",
+                                                             System.Windows.Forms.MessageBoxButtons.OK,
+                                                             System.Windows.Forms.MessageBoxIcon.Error,
+                                                             System.Windows.Forms.MessageBoxDefaultButton.Button1,
+                                                             System.Windows.Forms.MessageBoxOptions.RightAlign);
+                        item.Name = oldName;
+                        return;
+                    }
+
+                    if(File.Exists(hPath) || Util.hasItemNamed(project.ProjectItems, Path.GetFileName(hPath)))
+                    {
+                        System.Windows.Forms.MessageBox.Show("A file named '" + Path.GetFileName(hPath) +
+                                                             "' already exists.\n" + "If you want to add '" +
+                                                             Path.GetFileName(fullPath) + "' first remove " +
+                                                             " '" + Path.GetFileName(cppPath) + "' and '" +
+                                                             Path.GetFileName(hPath) + "' from your project.",
+                                                             "Ice Visual Studio Extension",
+                                                             System.Windows.Forms.MessageBoxButtons.OK,
+                                                             System.Windows.Forms.MessageBoxIcon.Error,
+                                                             System.Windows.Forms.MessageBoxDefaultButton.Button1,
+                                                             System.Windows.Forms.MessageBoxOptions.RightAlign);
+                        item.Name = oldName;
+                        return;
+                    }
+                }
+
+                // Do a full build on a rename
+                clearErrors(project);
+                buildProject(project, false, vsBuildScope.vsBuildScopeProject);
+            }
+            catch(Exception ex)
+            {
+                writeBuildOutput(ex.ToString() + "\n");
+            }
+        }
+        
+        private void removeDependency(Project project, String path)
+        {
+            if(_dependenciesMap.ContainsKey(project.Name))
+            {
+                if(_dependenciesMap[project.Name].ContainsKey(path))
+                {
+                    _dependenciesMap[project.Name].Remove(path);
+                }
+            }
+        }
+        
+        private void cppItemRemoved(object obj, object parent)
+        {
+            try
+            {
+                if(obj == null)
+                {
+                    return;
+                }
+
+                VCFile file = obj as VCFile;
+                if(file == null)
+                {
+                    return;
+                }
+
+                Array projects = (Array)_applicationObject.ActiveSolutionProjects;
+                if(projects == null)
+                {
+                    return;
+                }
+
+                if(projects.Length <= 0)
+                {
+                    return;
+                }
+                Project project = projects.GetValue(0) as Project;
+                if(project == null)
+                {
+                    return;
+                }
+                if(!Util.isSliceBuilderEnabled(project))
+                {
+                    return;
+                }
+                if(!file.Name.EndsWith(".ice", StringComparison.Ordinal))
+                {
+                    _fileTracker.reap(project);
+                    return;
+                }
+                clearErrors(file.FullPath);
+                removeCppGeneratedItems(project, file.FullPath, true);
+
+                //
+                // It appears that file is not actually removed from disk at this
+                // point. Thus we need to delay dependency update until after delete,
+                // or after remove command has been executed.
+                //
+                _deletedFile = file.FullPath;
+            }
+            catch(Exception ex)
+            {
+                writeBuildOutput(ex.ToString() + "\n");
+            }
+        }
+
+        void cppItemAdded(object obj, object parent)
+        {
+            try
+            {
+                if(obj == null)
+                {
+                    return;
+                }
+                VCFile file = obj as VCFile;
+                if(file == null)
+                {
+                    return;
+                }
+                if(!file.Name.EndsWith(".ice", StringComparison.Ordinal))
+                {
+                    return;
+                }
+
+                string fullPath = file.FullPath;
+                Array projects = (Array)_applicationObject.ActiveSolutionProjects;
+                if(projects == null)
+                {
+                    return;
+                }
+                if(projects.Length <= 0)
+                {
+                    return;
+                }
+                Project project = projects.GetValue(0) as Project;
+                if(project == null)
+                {
+                    return;
+                }
+                if(!Util.isSliceBuilderEnabled(project))
+                {
+                    return;
+                }
+                ProjectItem item = Util.findItem(fullPath, project.ProjectItems);
+                if(item == null)
+                {
+                    return;
+                }
+                if(Util.isCppProject(project))
+                {
+                    string cppPath = 
+                        getCppGeneratedFileName(Path.GetDirectoryName(project.FullName), file.FullPath, "cpp");
+                    string hPath = Path.ChangeExtension(cppPath, ".h");
+                    if(File.Exists(cppPath) || Util.hasItemNamed(project.ProjectItems, Path.GetFileName(cppPath)))
+                    {
+                        System.Windows.Forms.MessageBox.Show("A file named '" + Path.GetFileName(cppPath) +
+                                                             "' already exists.\n" + "If you want to add '" +
+                                                             Path.GetFileName(fullPath) + "' first remove " +
+                                                             " '" + Path.GetFileName(cppPath) + "' and '" +
+                                                             Path.GetFileName(hPath) + "'.",
+                                                             "Ice Visual Studio Extension",
+                                                             System.Windows.Forms.MessageBoxButtons.OK,
+                                                             System.Windows.Forms.MessageBoxIcon.Error,
+                                                             System.Windows.Forms.MessageBoxDefaultButton.Button1,
+                                                             System.Windows.Forms.MessageBoxOptions.RightAlign);
+                        _deleted.Add(fullPath);
+                        item.Remove();
+                        return;
+                    }
+
+                    if(File.Exists(hPath) || Util.hasItemNamed(project.ProjectItems, Path.GetFileName(hPath)))
+                    {
+                        System.Windows.Forms.MessageBox.Show("A file named '" + Path.GetFileName(hPath) +
+                                                             "' already exists.\n" + "If you want to add '" +
+                                                             Path.GetFileName(fullPath) + "' first remove " +
+                                                             " '" + Path.GetFileName(cppPath) + "' and '" +
+                                                             Path.GetFileName(hPath) + "'.",
+                                                             "Ice Visual Studio Extension",
+                                                             System.Windows.Forms.MessageBoxButtons.OK,
+                                                             System.Windows.Forms.MessageBoxIcon.Error,
+                                                             System.Windows.Forms.MessageBoxDefaultButton.Button1,
+                                                             System.Windows.Forms.MessageBoxOptions.RightAlign);
+                        _deleted.Add(fullPath);
+                        item.Remove();
+                        return;
+                    }
+                }
+
+                clearErrors(project);
+                buildProject(project, false, vsBuildScope.vsBuildScopeProject);
+            }
+            catch(Exception ex)
+            {
+                writeBuildOutput(ex.ToString() + "\n");
+            }
+        }
+
+        private void csharpItemRenamed(ProjectItem item, string oldName)
+        {
+            try
+            {
+                if(item == null || _fileTracker == null || String.IsNullOrEmpty(oldName) || 
+                   item.ContainingProject == null)
+                {
+                    return;
+                }
+                if(!Util.isSliceBuilderEnabled(item.ContainingProject))
+                {
+                    return;
+                }
+                if(!oldName.EndsWith(".ice", StringComparison.Ordinal) || !Util.isProjectItemFile(item))
+                {
+                    return;
+                }
+
+                //Get rid of generated files, for the .ice removed file.
+                _fileTracker.reap(item.ContainingProject);
+
+                string fullPath = item.Properties.Item("FullPath").Value.ToString();
+                if(Util.isCSharpProject(item.ContainingProject))
+                {
+                    string csPath = Path.ChangeExtension(fullPath, ".cs");
+                    if(File.Exists(csPath) || 
+                       Util.hasItemNamed(item.ContainingProject.ProjectItems, Path.GetFileName(csPath)))
+                    {
+                        System.Windows.Forms.MessageBox.Show("A file named '" + Path.GetFileName(csPath) +
+                                                             "' already exists.\n" + oldName +
+                                                             " could not be renamed to '" + item.Name + "'.",
+                                                             "Ice Visual Studio Extension",
+                                                             System.Windows.Forms.MessageBoxButtons.OK,
+                                                             System.Windows.Forms.MessageBoxIcon.Error,
+                                                             System.Windows.Forms.MessageBoxDefaultButton.Button1,
+                                                             System.Windows.Forms.MessageBoxOptions.RightAlign);
+                        item.Name = oldName;
+                        return;
+                    }
+                }
+
+                clearErrors(item.ContainingProject);
+                buildProject(item.ContainingProject, false, vsBuildScope.vsBuildScopeProject);
+            }
+            catch(Exception ex)
+            {
+                writeBuildOutput(ex.ToString() + "\n");
+            }
+        }
+
+        private void csharpItemRemoved(ProjectItem item)
+        {
+            try
+            {
+                if(item == null || _fileTracker == null)
+                {
+                    return;
+                }
+                if(String.IsNullOrEmpty(item.Name) ||  item.ContainingProject == null)
+                {
+                    return;
+                }
+                if(!Util.isSliceBuilderEnabled(item.ContainingProject))
+                {
+                    return;
+                }
+                if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))
+                {
+                    return;
+                }
+
+                string fullName = item.Properties.Item("FullPath").Value.ToString();
+                clearErrors(fullName);
+                removeCSharpGeneratedItems(item, true);
+                _fileTracker.reap(item.ContainingProject);
+
+                removeDependency(item.ContainingProject, fullName);
+                clearErrors(item.ContainingProject);
+                buildProject(item.ContainingProject, false, item, vsBuildScope.vsBuildScopeProject);
+            }
+            catch(Exception ex)
+            {
+                writeBuildOutput(ex.ToString() + "\n");
+            }
+        }
+
+        private void csharpItemAdded(ProjectItem item)
+        {
+            try
+            {
+                if(item == null)
+                {
+                    return;
+                }
+
+                if(String.IsNullOrEmpty(item.Name) || item.ContainingProject == null)
+                {
+                    return;
+                }
+
+                if(!Util.isSliceBuilderEnabled(item.ContainingProject))
+                {
+                    return;
+                }
+
+                if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))
+                {
+                    return;
+                }
+
+                string fullPath = item.Properties.Item("FullPath").Value.ToString();
+                Project project = item.ContainingProject;
+                if(project == null)
+                {
+                    return;
+                }
+
+                String csPath = getCSharpGeneratedFileName(project, item, "cs");
+                ProjectItem csItem = Util.findItem(csPath, project.ProjectItems);
+
+                if(File.Exists(csPath) || csItem != null)
+                {
+                    System.Windows.Forms.MessageBox.Show("A file named '" + Path.GetFileName(csPath) +
+                                                         "' already exists.\n" + "If you want to add '" +
+                                                         Path.GetFileName(fullPath) + "' first remove " +
+                                                         " '" + Path.GetFileName(csPath) + "'.",
+                                                         "Ice Visual Studio Extension",
+                                                         System.Windows.Forms.MessageBoxButtons.OK,
+                                                         System.Windows.Forms.MessageBoxIcon.Error,
+                                                         System.Windows.Forms.MessageBoxDefaultButton.Button1,
+                                                         System.Windows.Forms.MessageBoxOptions.RightAlign);
+                    _deleted.Add(fullPath);
+                    item.Remove();
+                    return;
+                }
+
+                clearErrors(project);
+                buildProject(project, false, vsBuildScope.vsBuildScopeProject);
+            }
+            catch(Exception ex)
+            {
+                writeBuildOutput(ex.ToString() + "\n");
+            }
+        }
+
+        private static void removeCSharpGeneratedItems(ProjectItem item, bool remove)
+        {
+            if(item == null)
+            {
+                return;
+            }
+
+            if(item.Name == null)
+            {
+                return;
+            }
+
+            if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))
+            {
+                return;
+            }
+
+            String generatedPath = getCSharpGeneratedFileName(item.ContainingProject, item, "cs");
+            if(!String.IsNullOrEmpty(generatedPath))
+            {
+                FileInfo generatedFileInfo = new FileInfo(generatedPath);
+                if(File.Exists(generatedFileInfo.FullName))
+                {
+                    File.Delete(generatedFileInfo.FullName);
+                }
+
+                if(remove)
+                {
+                    ProjectItem generated =
+                        Util.findItem(generatedFileInfo.FullName, item.ContainingProject.ProjectItems);
+                    if(generated != null)
+                    {
+                        generated.Remove();
+                    }
+                }
+            }
+        }
+
+        private static void removeCppGeneratedItems(ProjectItems items, bool remove)
+        {
+            foreach(ProjectItem i in items)
+            {
+                if(Util.isProjectItemFile(i))
+                {
+                    string path = i.Properties.Item("FullPath").Value.ToString();
+                    if(!String.IsNullOrEmpty(path))
+                    {
+                        if(path.EndsWith(".ice", StringComparison.Ordinal))
+                        {
+                            removeCppGeneratedItems(i, remove);
+                        }
+                    }
+                }
+                else if(Util.isProjectItemFilter(i))
+                {
+                    removeCppGeneratedItems(i.ProjectItems, remove);
+                }
+            }
+        }
+
+        private static void removeCppGeneratedItems(ProjectItem item, bool remove)
+        {
+            if(item == null)
+            {
+                return;
+            }
+
+            if(item.Name == null)
+            {
+                return;
+            }
+
+            if(!item.Name.EndsWith(".ice", StringComparison.Ordinal))
+            {
+                return;
+            }
+            removeCppGeneratedItems(item.ContainingProject, item.Properties.Item("FullPath").Value.ToString(), remove);
+        }
+
+        public static void removeCppGeneratedItems(Project project, String slice, bool remove)
+        {
+            String projectDir = Path.GetDirectoryName(project.FileName);
+            FileInfo hFileInfo = new FileInfo(getCppGeneratedFileName(projectDir, slice, "h"));
+            FileInfo cppFileInfo = new FileInfo(Path.ChangeExtension(hFileInfo.FullName, "cpp"));
+
+            if(remove)
+            {
+                ProjectItem generated = Util.findItem(hFileInfo.FullName, project.ProjectItems);
+                if(generated != null)
+                {
+                    generated.Remove();
+                }
+                generated = Util.findItem(cppFileInfo.FullName, project.ProjectItems);
+                
+                if(generated != null)
+                {
+                    generated.Remove();
+                }
+            }
+            if(File.Exists(hFileInfo.FullName))
+            {
+                File.Delete(hFileInfo.FullName);
+            }
+
+            if(File.Exists(cppFileInfo.FullName))
+            {
+                File.Delete(cppFileInfo.FullName);
+            }
+        }
+
+        private bool runSliceCompiler(Project project, string file, string outputDir)
+        {
+            bool consoleOutput = Util.getProjectPropertyAsBool(project, Util.PropertyConsoleOutput);
+            string args = getSliceCompilerArgs(project, false);
+            if(!String.IsNullOrEmpty(outputDir))
+            {
+                if(outputDir.EndsWith("\\", StringComparison.Ordinal))
+                {
+                    outputDir = outputDir.Replace("\\", "\\\\");
+                }
+                args += "--output-dir \"" + outputDir + "\" ";
+            }
+
+            args += quoteArg(file);
+            args = "/c " + quoteArg(args);
+            ProcessStartInfo processInfo = new ProcessStartInfo("cmd.exe", args);
+            processInfo.CreateNoWindow = true;
+            processInfo.UseShellExecute = false;
+            processInfo.RedirectStandardOutput = true;
+            processInfo.RedirectStandardError = true;
+            processInfo.WorkingDirectory = System.IO.Path.GetDirectoryName(project.FileName);
+
+
+            String compiler = getSliceCompilerPath(project);
+            if(!File.Exists(compiler))
+            {
+                addError(project, file, TaskErrorCategory.Error, 0, 0, compiler +
+                                            " not found. Review 'Ice Home' setting.");
+                return false;
+            }
+
+            if(consoleOutput)
+            {
+                writeBuildOutput("cmd.exe " + args + "\n");
+            }
+            System.Diagnostics.Process process = System.Diagnostics.Process.Start(processInfo);
+
+            process.WaitForExit();
+
+            bool standardError = true;
+            if(Util.isSilverlightProject(project))
+            {
+                string version = getSliceCompilerVesrion(project);
+                List<String> tokens = new List<string>(version.Split(new char[]{'.'}, 
+                                                                     StringSplitOptions.RemoveEmptyEntries));
+                                                                     
+                int mayor = Int32.Parse(tokens[0], CultureInfo.InvariantCulture);
+                int minor = Int32.Parse(tokens[1], CultureInfo.InvariantCulture);
+                if(mayor == 0 && minor <= 3)
+                {
+                    standardError = false;
+                }
+            }
+
+            bool hasErrors = parseErrors(project, file, process.StandardError, consoleOutput);
+            if(!standardError)
+            {
+                hasErrors = hasErrors || parseErrors(project, file, process.StandardOutput, consoleOutput);
+            }
+            process.Close();
+            if(hasErrors)
+            {
+                bringErrorsToFront();
+                if(Util.isCppProject(project))
+                {
+                    removeCppGeneratedItems(project, file, false);
+                }
+                else if(Util.isCSharpProject(project))
+                {
+                    ProjectItem item = Util.findItem(file, project.ProjectItems);
+                    if(item != null)
+                    {
+                        removeCSharpGeneratedItems(item, false);
+                    }
+                }
+            }
+            return !hasErrors;
+        }
+
+        private bool parseErrors(Project project, string file, TextReader strer, bool consoleOutput)
+        {
+            bool hasErrors = false;
+            string errorMessage = strer.ReadLine();
+            bool firstLine = true;
+            string sliceCompiler = getSliceCompilerPath(project);
+            while(!String.IsNullOrEmpty(errorMessage))
+            {
+                if(errorMessage.StartsWith(sliceCompiler, StringComparison.Ordinal))
+                {
+                    hasErrors = true;
+                    String message = strer.ReadLine();
+                    while(!String.IsNullOrEmpty(message))
+                    {
+                        message = message.Trim();
+                        if(message.StartsWith("Usage:", StringComparison.CurrentCultureIgnoreCase))
+                        {
+                            break;
+                        }
+                        errorMessage += "\n" + message;
+                        message = strer.ReadLine();
+                    }
+                    if(consoleOutput)
+                    {
+                        writeBuildOutput(errorMessage + "\n");
+                    }
+                    addError(project, file, TaskErrorCategory.Error, 0, 0, errorMessage.Replace("error:", ""));
+                    break;
+                }
+                int i = errorMessage.IndexOf(':');
+                if(i == -1)
+                {
+                    if(firstLine)
+                    {
+                        errorMessage += strer.ReadToEnd();
+                        if(consoleOutput)
+                        {
+                            writeBuildOutput(errorMessage + "\n");
+                        }
+                        addError(project, "", TaskErrorCategory.Error, 1, 1, errorMessage);
+                        hasErrors = true;
+                        break;
+                    }
+                    errorMessage = strer.ReadLine();
+                    continue;
+                }
+                if(consoleOutput)
+                {
+                    writeBuildOutput(errorMessage + "\n");
+                }
+
+                if(errorMessage.StartsWith("    ", StringComparison.Ordinal)) // Still the same mcpp warning
+                {
+                    errorMessage = strer.ReadLine();
+                    continue;
+                }
+                errorMessage = errorMessage.Trim();
+                firstLine = false;
+                i = errorMessage.IndexOf(':', i + 1);
+                if(i == -1)
+                {
+                    errorMessage = strer.ReadLine();
+                    continue;
+                }
+                string f = errorMessage.Substring(0, i);
+                if(String.IsNullOrEmpty(f))
+                {
+                    errorMessage = strer.ReadLine();
+                    continue;
+                }
+
+                if(!File.Exists(f))
+                {
+                    errorMessage = strer.ReadLine();
+                    continue;
+                }
+
+                errorMessage = errorMessage.Substring(i + 1, errorMessage.Length - i - 1);
+                i = errorMessage.IndexOf(':');
+                string n = errorMessage.Substring(0, i);
+                int l;
+                try
+                {
+                    l = Int16.Parse(n, CultureInfo.InvariantCulture);
+                }
+                catch(Exception)
+                {
+                    l = 0;
+                }
+
+                errorMessage = errorMessage.Substring(i + 1, errorMessage.Length - i - 1).Trim();
+                if(errorMessage.Equals("warning: End of input with no newline, supplemented newline"))
+                {
+                    errorMessage = strer.ReadLine();
+                    continue;
+                }
+
+                if(!String.IsNullOrEmpty(errorMessage))
+                {
+                    //
+                    // Display only errors from this file or files outside the project.
+                    //
+                    bool currentFile = Path.GetFullPath(f).Equals(Path.GetFullPath(file),
+                                                                  StringComparison.CurrentCultureIgnoreCase);
+                    bool found = Util.findItem(f, project.ProjectItems) != null;
+                    TaskErrorCategory category = TaskErrorCategory.Error;
+                    if(errorMessage.StartsWith("warning:", StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        category = TaskErrorCategory.Warning;
+                    }
+                    else
+                    {
+                        hasErrors = true;
+                    }
+                    if(currentFile || !found)
+                    {
+                        if(found)
+                        {
+                            addError(project, file, category, l, 1, errorMessage);
+                        }
+                        else
+                        {
+                            addError(project, file, category, l, 1, "from file: " + f + "\n" + errorMessage);
+                        }
+                    }
+                }
+                errorMessage = strer.ReadLine();
+            }
+            return hasErrors;
+        }
+
+        public CommandBar projectCommandBar()
+        {
+            return findCommandBar(new Guid("{D309F791-903F-11D0-9EFC-00A0C911004F}"), 1026);
+        }
+
+        public CommandBar findCommandBar(Guid guidCmdGroup, uint menuID)
+        {
+            // Retrieve IVsProfferComands via DTE's IOleServiceProvider interface
+            IOleServiceProvider sp = (IOleServiceProvider)_applicationObject;
+            Guid guidSvc = typeof(IVsProfferCommands).GUID;
+            object objService;
+            int rc = sp.QueryService(ref guidSvc, ref guidSvc, out objService);
+            if(ErrorHandler.Failed(rc))
+            {
+                try
+                {
+                    ErrorHandler.ThrowOnFailure(rc);
+                }
+                catch(Exception ex)
+                {
+                    writeBuildOutput(ex.ToString() + "\n");
+                }
+                return null;
+            }
+            IVsProfferCommands vsProfferCmds = (IVsProfferCommands)objService;
+            return vsProfferCmds.FindCommandBar(IntPtr.Zero, ref guidCmdGroup, menuID) as CommandBar;
+        }
+
+        [ComImport,Guid("6D5140C1-7436-11CE-8034-00AA006009FA"),
+         InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
+        internal interface IOleServiceProvider 
+        {
+            [PreserveSig]
+            int QueryService([In]ref Guid guidService, [In]ref Guid riid, 
+                             [MarshalAs(UnmanagedType.Interface)] out System.Object obj);
+        }
+
+        private void buildBegin(vsBuildScope scope, vsBuildAction action)
+        {
+            try
+            {
+                _building = true;
+                if(action == vsBuildAction.vsBuildActionBuild || action == vsBuildAction.vsBuildActionRebuildAll)
+                {
+                    switch(scope)
+                    {
+                        case vsBuildScope.vsBuildScopeProject:
+                        {
+                            Project project = getSelectedProject();
+                            if(project != null)
+                            {
+                                if(!Util.isSliceBuilderEnabled(project))
+                                {
+                                    break;
+                                }
+                                clearErrors(project);
+                                if(action == vsBuildAction.vsBuildActionRebuildAll)
+                                {
+                                    cleanProject(project);
+                                }
+                                buildProject(project, false, scope);
+                            }
+                            if(hasErrors(project))
+                            {
+                                bringErrorsToFront();
+                                _applicationObject.DTE.ExecuteCommand("Build.Cancel", "");
+                                writeBuildOutput("------ Slice compilation contains errors. Build canceled. ------\n");
+                            }
+                            break;
+                        }
+                        default:
+                        {
+                            clearErrors();
+                            foreach(Project p in _applicationObject.Solution.Projects)
+                            {
+                                if(p != null)
+                                {
+                                    if(!Util.isSliceBuilderEnabled(p))
+                                    {
+                                        continue;
+                                    }
+                                    if(action == vsBuildAction.vsBuildActionRebuildAll)
+                                    {
+                                        cleanProject(p);
+                                    }
+                                    buildProject(p, false, scope);
+                                }
+                            }
+                            if(hasErrors())
+                            {
+                                bringErrorsToFront();
+                                _applicationObject.DTE.ExecuteCommand("Build.Cancel", "");
+                                writeBuildOutput("------ Slice compilation contains errors. Build canceled. ------\n");
+                            }
+                            break;
+                        }
+                    }
+                }
+                else if(action == vsBuildAction.vsBuildActionClean)
+                {
+                    switch(scope)
+                    {
+                        case vsBuildScope.vsBuildScopeProject:
+                        {
+                            Project project = getSelectedProject();
+                            if(project != null)
+                            {
+                                cleanProject(project);
+                            }
+                            break;
+                        }
+                        default:
+                        {
+                            foreach(Project p in _applicationObject.Solution.Projects)
+                            {
+                                if(p != null)
+                                {
+                                    cleanProject(p);
+                                }
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+            catch(Exception ex)
+            {
+                writeBuildOutput(ex.ToString() + "\n");
+            }
+        }
+
+        //
+        // Initialize slice builder error list provider
+        //
+        private void initErrorListProvider()
+        {
+            _errors = new List<ErrorTask>();
+            _errorListProvider = new Microsoft.VisualStudio.Shell.ErrorListProvider(_serviceProvider);
+            _errorListProvider.ProviderName = "Slice Error Provider";
+            _errorListProvider.ProviderGuid = new Guid("B8DA84E8-7AE3-4c71-8E43-F273A20D40D1");
+            _errorListProvider.Show();
+        }
+
+        //
+        // Remove all errors from slice builder error list provider
+        //
+        private void clearErrors()
+        {
+            _errorCount = 0;
+            _errors.Clear();
+            _errorListProvider.Tasks.Clear();
+        }
+
+        private void clearErrors(Project project)
+        {
+            if(project == null || _errors == null)
+            {
+                return;
+            }
+
+            List<ErrorTask> remove = new List<ErrorTask>();
+            foreach(ErrorTask error in _errors)
+            {
+                if(!error.HierarchyItem.Equals(getProjectHierarchy(project)))
+                {
+                    continue;
+                }
+                if(!_errorListProvider.Tasks.Contains(error))
+                {
+                    continue;
+                }
+                remove.Add(error);
+                _errorListProvider.Tasks.Remove(error);
+            }
+
+            foreach(ErrorTask error in remove)
+            {
+                _errors.Remove(error);
+            }
+        }
+
+        private void clearErrors(String file)
+        {
+            if(file == null || _errors == null)
+            {
+                return;
+            }
+
+            List<ErrorTask> remove = new List<ErrorTask>();
+            foreach(ErrorTask error in _errors)
+            {
+                if(error.Document.Equals(file, StringComparison.CurrentCultureIgnoreCase))
+                {
+                    remove.Add(error);
+                    _errorListProvider.Tasks.Remove(error);
+                }
+            }
+
+            foreach(ErrorTask error in remove)
+            {
+                _errors.Remove(error);
+            }
+
+        }
+        
+        private IVsHierarchy getProjectHierarchy(Project project)
+        {
+            IVsSolution ivSSolution = getIVsSolution();
+            IVsHierarchy hierarchy = null;
+            if(ivSSolution != null)
+            {
+                int hr = ivSSolution.GetProjectOfUniqueName(project.UniqueName, out hierarchy);
+                if(ErrorHandler.Failed(hr))
+                { 
+                    try
+                    {
+                        ErrorHandler.ThrowOnFailure(hr);
+                    }
+                    catch(Exception ex)
+                    {
+                        writeBuildOutput(ex.ToString() + "\n");
+                    }
+                }
+            }
+            return hierarchy;
+        }
+        
+        //
+        // Add a error to slice builder error list provider.
+        //
+        private void addError(Project project, string file, TaskErrorCategory category, int line, int column,
+                              string text)
+        {
+            IVsHierarchy hierarchy = getProjectHierarchy(project);
+
+            ErrorTask errorTask = new ErrorTask();
+            errorTask.ErrorCategory = category;
+            // Visual Studio uses indexes starting at 0 
+            // while the automation model uses indexes starting at 1
+            errorTask.Line = line - 1;
+            errorTask.Column = column - 1;
+            if(hierarchy != null)
+            {
+                errorTask.HierarchyItem = hierarchy;
+            }
+            errorTask.Navigate += new EventHandler(errorTaskNavigate);
+            errorTask.Document = file;
+            errorTask.Category = TaskCategory.BuildCompile;
+            errorTask.Text = text;
+            _errors.Add(errorTask);
+            _errorListProvider.Tasks.Add(errorTask);
+            if(category == TaskErrorCategory.Error)
+            {
+                _errorCount++;
+            }
+        }
+
+        //
+        // True if there was any errors in last slice compilation.
+        //
+        private bool hasErrors()
+        {
+            return _errorCount > 0;
+        }
+
+        private bool hasErrors(Project project)
+        {
+            if(project == null || _errors == null)
+            {
+                return false;
+            }
+
+            bool errors = false;
+            foreach(ErrorTask error in _errors)
+            {
+                if(error.HierarchyItem.Equals(getProjectHierarchy(project)))
+                {
+                    if(error.ErrorCategory == TaskErrorCategory.Error)
+                    {
+                        errors = true;
+                        break;
+                    }
+                }
+            }
+            return errors;
+        }
+
+        private OutputWindowPane buildOutput()
+        {
+            if(_output == null)
+            {
+                OutputWindow window = 
+                    (OutputWindow)_applicationObject.Windows.Item(EnvDTE.Constants.vsWindowKindOutput).Object;
+                _output = window.OutputWindowPanes.Item("Build");
+            }
+            return _output;
+        }
+
+        private void writeBuildOutput(string message)
+        {
+            OutputWindowPane pane = buildOutput();
+            if(pane == null)
+            {
+                return;
+            }
+            pane.Activate();
+            pane.OutputString(message);
+        }
+
+        //
+        // Force the error list to show.
+        //
+        private void bringErrorsToFront()
+        {
+            if(_errorListProvider == null)
+            {
+                return;
+            }
+            _errorListProvider.BringToFront();
+            _errorListProvider.ForceShowErrors();
+        }
+
+        //
+        // Navigate to a file when the error is clicked.
+        //
+        private void errorTaskNavigate(object sender, EventArgs e)
+        {
+            ErrorTask task;
+            try
+            {
+                task = (ErrorTask)sender;
+                task.Line += 1;
+                _errorListProvider.Navigate(task, new Guid(EnvDTE.Constants.vsViewKindTextView));
+                task.Line -= 1;
+            }
+            catch(Exception)
+            {
+            }
+        }
+
+        private DTE2 _applicationObject;
+        private AddIn _addInInstance;
+        private SolutionEvents _solutionEvents;
+        private BuildEvents _buildEvents;
+        private DocumentEvents _docEvents;
+        private ProjectItemsEvents _csProjectItemsEvents;
+        private VCProjectEngineEvents _vcProjectItemsEvents;
+        private ServiceProvider _serviceProvider;
+
+        private ErrorListProvider _errorListProvider;
+        private List<ErrorTask> _errors;
+        private int _errorCount;
+        private FileTracker _fileTracker;
+        private Dictionary<string, Dictionary<string, List<string>>> _dependenciesMap;
+        private string _deletedFile;
+        private OutputWindowPane _output;
+
+        private CommandEvents _addNewItemEvent;
+        private CommandEvents _addExistingItemEvent;
+        private CommandEvents _editRemoveEvent;
+        private CommandEvents _editDeleteEvent;
+        private List<String> _deleted = new List<String>();
+        private Command _iceConfigurationCmd;
+        private bool _building;
+    }
+}
diff --git a/vsplugin/src/Connect.cs b/vsplugin/src/Connect.cs
index 88b01590492..38475ea16a1 100644
--- a/vsplugin/src/Connect.cs
+++ b/vsplugin/src/Connect.cs
@@ -1,204 +1,204 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Text;

-using System.IO;

-using System.Diagnostics;

-using System.Collections.Generic;

-using Extensibility;

-using EnvDTE;

-using EnvDTE80;

-using Microsoft.VisualStudio.CommandBars;

-using Microsoft.VisualStudio.VCProjectEngine;

-using Microsoft.VisualStudio.VCProject;

-using Microsoft.VisualStudio.Shell;

-using Microsoft.VisualStudio.Shell.Interop;

-using System.Resources;

-using System.Reflection;

-using System.Globalization;

-using System.Runtime.InteropServices;

-

-namespace Ice.VisualStudio

-{

-    public class Connect : IDTExtensibility2, IDTCommandTarget

-    {

-

-        public static Builder getBuilder()

-        {

-            return _builder;

-        }

-

-        public static DTE getCurrentDTE()

-        {

-            return _builder.getCurrentDTE();

-        }

-

-

-        public void OnConnection(object application, ext_ConnectMode connectMode, object addInInst, ref Array custom)

-        {

-            _applicationObject = (DTE2)application;

-            _addInInstance = (AddIn)addInInst;

-

-            if(connectMode == ext_ConnectMode.ext_cm_Startup)

-            {

-                if(_builder == null)

-                {

-

-                    //

-                    // This property is set to false to avoid VC++ "not maching rule" dialog

-                    //

-                    EnvDTE.Properties props = _applicationObject.get_Properties("Projects", "VCGeneral");

-                    EnvDTE.Property prop = props.Item("ShowNoMatchingRuleDlg");

-                    prop.Value = false;

-

-                    _builder = new Builder();

-                    _builder.init(_applicationObject, _addInInstance);

-                }

-            }

-        }

-

-

-        //

-        // VS call this method to retrive the status of AddIn commands.

-        //

-        public void QueryStatus(string commandName, vsCommandStatusTextWanted neededText, ref vsCommandStatus status,

-                                ref object commandText)

-        {

-            if(neededText == vsCommandStatusTextWanted.vsCommandStatusTextWantedNone)

-            {

-                if(commandName == "Ice.VisualStudio.Connect.IceConfiguration")

-                {

-                    Builder builder = getBuilder();

-                    if(builder == null)

-                    {

-                        status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported;

-                        return;

-                    }

-                    if(builder.isBuilding())

-                    {

-                        status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported;

-                        return;

-                    }

-                    Project project = builder.getSelectedProject();

-

-                    if(project == null)

-                    {

-                       ProjectItem item = Util.getSelectedProjectItem(_applicationObject.DTE);

-                       if(item != null)

-                       {

-                           project = item.ContainingProject;

-                       }

-                    }

-

-                    if(project == null)

-                    {

-                        status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported;

-                        return;

-                    }

-

-                    if(!Util.isCppProject(project) && !Util.isCSharpProject(project) && !Util.isVBProject(project))

-                    {

-                        status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported;

-                        return;

-                    }

-                    status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported |

-                                              vsCommandStatus.vsCommandStatusEnabled;

-                }

-            }

-        }

-

-        public void Exec(string commandName, vsCommandExecOption executeOption, ref object varIn, ref object varOut,

-                         ref bool handled)

-        {

-            handled = false;

-            Builder builder = getBuilder();

-            if(builder == null)

-            {

-                return;

-            }

-

-            if(executeOption == vsCommandExecOption.vsCommandExecOptionDoDefault)

-            {

-                if(commandName == "Ice.VisualStudio.Connect.IceConfiguration")

-                {

-                    Project project = builder.getSelectedProject();

-                    if(project == null)

-                    {

-                       ProjectItem item = Util.getSelectedProjectItem(_applicationObject.DTE);

-                       if(item != null)

-                       {

-                           project = item.ContainingProject;

-                       }

-                    }

-

-                    if(project == null)

-                    {

-                        handled = false;

-                        return;

-                    }

-

-                    if(Util.isCSharpProject(project))

-                    {

-                        if(Util.isSilverlightProject(project))

-                        {

-                            IceSilverlightConfigurationDialog dialog = new IceSilverlightConfigurationDialog(project);

-                            dialog.ShowDialog();

-                        }

-                        else

-                        {

-                            IceCsharpConfigurationDialog dialog = new IceCsharpConfigurationDialog(project);

-                            dialog.ShowDialog();

-                        }

-                    }

-                    else if(Util.isVBProject(project))

-                    {

-                        IceVBConfigurationDialog dialog = new IceVBConfigurationDialog(project);

-                        dialog.ShowDialog();

-                    }

-                    else if(Util.isCppProject(project))

-                    {

-                        IceCppConfigurationDialog dialog = new IceCppConfigurationDialog(project);

-                        dialog.ShowDialog();

-                    }

-                    handled = true;

-                }

-            }

-        }

-

-        public void OnDisconnection(ext_DisconnectMode disconnectMode, ref Array custom)

-        {

-            if(disconnectMode == ext_DisconnectMode.ext_dm_HostShutdown ||

-               disconnectMode == ext_DisconnectMode.ext_dm_UserClosed)

-            {

-                if(_builder != null)

-                {

-                    _builder.disconnect();

-                    _builder.Dispose();

-                    _builder = null;

-                }

-            }

-        }

-

-        public void OnAddInsUpdate(ref Array custom)

-        {

-        }

-

-        public void OnStartupComplete(ref Array custom)

-        {

-        }

-        public void OnBeginShutdown(ref Array custom)

-        {

-        }

-

-        private DTE2 _applicationObject;

-        private AddIn _addInInstance;

-        private static Builder _builder;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Text;
+using System.IO;
+using System.Diagnostics;
+using System.Collections.Generic;
+using Extensibility;
+using EnvDTE;
+using EnvDTE80;
+using Microsoft.VisualStudio.CommandBars;
+using Microsoft.VisualStudio.VCProjectEngine;
+using Microsoft.VisualStudio.VCProject;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
+using System.Resources;
+using System.Reflection;
+using System.Globalization;
+using System.Runtime.InteropServices;
+
+namespace Ice.VisualStudio
+{
+    public class Connect : IDTExtensibility2, IDTCommandTarget
+    {
+
+        public static Builder getBuilder()
+        {
+            return _builder;
+        }
+
+        public static DTE getCurrentDTE()
+        {
+            return _builder.getCurrentDTE();
+        }
+
+
+        public void OnConnection(object application, ext_ConnectMode connectMode, object addInInst, ref Array custom)
+        {
+            _applicationObject = (DTE2)application;
+            _addInInstance = (AddIn)addInInst;
+
+            if(connectMode == ext_ConnectMode.ext_cm_Startup)
+            {
+                if(_builder == null)
+                {
+
+                    //
+                    // This property is set to false to avoid VC++ "not maching rule" dialog
+                    //
+                    EnvDTE.Properties props = _applicationObject.get_Properties("Projects", "VCGeneral");
+                    EnvDTE.Property prop = props.Item("ShowNoMatchingRuleDlg");
+                    prop.Value = false;
+
+                    _builder = new Builder();
+                    _builder.init(_applicationObject, _addInInstance);
+                }
+            }
+        }
+
+
+        //
+        // VS call this method to retrive the status of AddIn commands.
+        //
+        public void QueryStatus(string commandName, vsCommandStatusTextWanted neededText, ref vsCommandStatus status,
+                                ref object commandText)
+        {
+            if(neededText == vsCommandStatusTextWanted.vsCommandStatusTextWantedNone)
+            {
+                if(commandName == "Ice.VisualStudio.Connect.IceConfiguration")
+                {
+                    Builder builder = getBuilder();
+                    if(builder == null)
+                    {
+                        status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported;
+                        return;
+                    }
+                    if(builder.isBuilding())
+                    {
+                        status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported;
+                        return;
+                    }
+                    Project project = builder.getSelectedProject();
+
+                    if(project == null)
+                    {
+                       ProjectItem item = Util.getSelectedProjectItem(_applicationObject.DTE);
+                       if(item != null)
+                       {
+                           project = item.ContainingProject;
+                       }
+                    }
+
+                    if(project == null)
+                    {
+                        status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported;
+                        return;
+                    }
+
+                    if(!Util.isCppProject(project) && !Util.isCSharpProject(project) && !Util.isVBProject(project))
+                    {
+                        status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported;
+                        return;
+                    }
+                    status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported |
+                                              vsCommandStatus.vsCommandStatusEnabled;
+                }
+            }
+        }
+
+        public void Exec(string commandName, vsCommandExecOption executeOption, ref object varIn, ref object varOut,
+                         ref bool handled)
+        {
+            handled = false;
+            Builder builder = getBuilder();
+            if(builder == null)
+            {
+                return;
+            }
+
+            if(executeOption == vsCommandExecOption.vsCommandExecOptionDoDefault)
+            {
+                if(commandName == "Ice.VisualStudio.Connect.IceConfiguration")
+                {
+                    Project project = builder.getSelectedProject();
+                    if(project == null)
+                    {
+                       ProjectItem item = Util.getSelectedProjectItem(_applicationObject.DTE);
+                       if(item != null)
+                       {
+                           project = item.ContainingProject;
+                       }
+                    }
+
+                    if(project == null)
+                    {
+                        handled = false;
+                        return;
+                    }
+
+                    if(Util.isCSharpProject(project))
+                    {
+                        if(Util.isSilverlightProject(project))
+                        {
+                            IceSilverlightConfigurationDialog dialog = new IceSilverlightConfigurationDialog(project);
+                            dialog.ShowDialog();
+                        }
+                        else
+                        {
+                            IceCsharpConfigurationDialog dialog = new IceCsharpConfigurationDialog(project);
+                            dialog.ShowDialog();
+                        }
+                    }
+                    else if(Util.isVBProject(project))
+                    {
+                        IceVBConfigurationDialog dialog = new IceVBConfigurationDialog(project);
+                        dialog.ShowDialog();
+                    }
+                    else if(Util.isCppProject(project))
+                    {
+                        IceCppConfigurationDialog dialog = new IceCppConfigurationDialog(project);
+                        dialog.ShowDialog();
+                    }
+                    handled = true;
+                }
+            }
+        }
+
+        public void OnDisconnection(ext_DisconnectMode disconnectMode, ref Array custom)
+        {
+            if(disconnectMode == ext_DisconnectMode.ext_dm_HostShutdown ||
+               disconnectMode == ext_DisconnectMode.ext_dm_UserClosed)
+            {
+                if(_builder != null)
+                {
+                    _builder.disconnect();
+                    _builder.Dispose();
+                    _builder = null;
+                }
+            }
+        }
+
+        public void OnAddInsUpdate(ref Array custom)
+        {
+        }
+
+        public void OnStartupComplete(ref Array custom)
+        {
+        }
+        public void OnBeginShutdown(ref Array custom)
+        {
+        }
+
+        private DTE2 _applicationObject;
+        private AddIn _addInInstance;
+        private static Builder _builder;
+    }
+}
diff --git a/vsplugin/src/IceCppConfigurationDialog.Designer.cs b/vsplugin/src/IceCppConfigurationDialog.Designer.cs
index 027f67861f7..e736bae0987 100644
--- a/vsplugin/src/IceCppConfigurationDialog.Designer.cs
+++ b/vsplugin/src/IceCppConfigurationDialog.Designer.cs
@@ -1,514 +1,514 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-namespace Ice.VisualStudio

-{

-    partial class IceCppConfigurationDialog

-    {

-        /// <summary>

-        /// Required designer variable.

-        /// </summary>

-        private System.ComponentModel.IContainer components = null;

-

-        /// <summary>

-        /// Clean up any resources being used.

-        /// </summary>

-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>

-        protected override void Dispose(bool disposing)

-        {

-            if (disposing && (components != null))

-            {

-                components.Dispose();

-            }

-            base.Dispose(disposing);

-        }

-

-        #region Windows Form Designer generated code

-

-        /// <summary>

-        /// Required method for Designer support - do not modify

-        /// the contents of this method with the code editor.

-        /// </summary>

-        private void InitializeComponent()

-        {

-            this.components = new System.ComponentModel.Container();

-            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();

-            this.groupBox1 = new System.Windows.Forms.GroupBox();

-            this.btnEditInclude = new System.Windows.Forms.Button();

-            this.includeInfo = new System.Windows.Forms.Label();

-            this.btnMoveIncludeDown = new System.Windows.Forms.Button();

-            this.btnMoveIncludeUp = new System.Windows.Forms.Button();

-            this.btnRemoveInclude = new System.Windows.Forms.Button();

-            this.btnAddInclude = new System.Windows.Forms.Button();

-            this.includeDirList = new System.Windows.Forms.CheckedListBox();

-            this.groupBox2 = new System.Windows.Forms.GroupBox();

-            this.txtExtraOptions = new System.Windows.Forms.TextBox();

-            this.groupBox3 = new System.Windows.Forms.GroupBox();

-            this.chkIceUtil = new System.Windows.Forms.CheckBox();

-            this.chkFreeze = new System.Windows.Forms.CheckBox();

-            this.chkIceStorm = new System.Windows.Forms.CheckBox();

-            this.chkIceSSL = new System.Windows.Forms.CheckBox();

-            this.chkIcePatch2 = new System.Windows.Forms.CheckBox();

-            this.chkIceGrid = new System.Windows.Forms.CheckBox();

-            this.chkIceBox = new System.Windows.Forms.CheckBox();

-            this.chkGlacier2 = new System.Windows.Forms.CheckBox();

-            this.chkIce = new System.Windows.Forms.CheckBox();

-            this.groupBox4 = new System.Windows.Forms.GroupBox();

-            this.chkChecksum = new System.Windows.Forms.CheckBox();

-            this.chkConsole = new System.Windows.Forms.CheckBox();

-            this.chkIcePrefix = new System.Windows.Forms.CheckBox();

-            this.chkStreaming = new System.Windows.Forms.CheckBox();

-            this.btnClose = new System.Windows.Forms.Button();

-            this.groupBox5 = new System.Windows.Forms.GroupBox();

-            this.btnSelectIceHome = new System.Windows.Forms.Button();

-            this.txtIceHome = new System.Windows.Forms.TextBox();

-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);

-            this.grouDllExportSymbol = new System.Windows.Forms.GroupBox();

-            this.txtDllExportSymbol = new System.Windows.Forms.TextBox();

-            this.groupBox1.SuspendLayout();

-            this.groupBox2.SuspendLayout();

-            this.groupBox3.SuspendLayout();

-            this.groupBox4.SuspendLayout();

-            this.groupBox5.SuspendLayout();

-            this.grouDllExportSymbol.SuspendLayout();

-            this.SuspendLayout();

-            // 

-            // chkEnableBuilder

-            // 

-            this.chkEnableBuilder.AutoSize = true;

-            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);

-            this.chkEnableBuilder.Name = "chkEnableBuilder";

-            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);

-            this.chkEnableBuilder.TabIndex = 0;

-            this.chkEnableBuilder.Text = "Enable Ice Builder";

-            this.chkEnableBuilder.UseVisualStyleBackColor = true;

-            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);

-            // 

-            // groupBox1

-            // 

-            this.groupBox1.Controls.Add(this.btnEditInclude);

-            this.groupBox1.Controls.Add(this.includeInfo);

-            this.groupBox1.Controls.Add(this.btnMoveIncludeDown);

-            this.groupBox1.Controls.Add(this.btnMoveIncludeUp);

-            this.groupBox1.Controls.Add(this.btnRemoveInclude);

-            this.groupBox1.Controls.Add(this.btnAddInclude);

-            this.groupBox1.Controls.Add(this.includeDirList);

-            this.groupBox1.Location = new System.Drawing.Point(12, 214);

-            this.groupBox1.Name = "groupBox1";

-            this.groupBox1.Size = new System.Drawing.Size(487, 169);

-            this.groupBox1.TabIndex = 1;

-            this.groupBox1.TabStop = false;

-            this.groupBox1.Text = "Slice Include Path";

-            // 

-            // btnEditInclude

-            // 

-            this.btnEditInclude.Location = new System.Drawing.Point(405, 46);

-            this.btnEditInclude.Name = "btnEditInclude";

-            this.btnEditInclude.Size = new System.Drawing.Size(75, 23);

-            this.btnEditInclude.TabIndex = 13;

-            this.btnEditInclude.Text = "Edit";

-            this.btnEditInclude.UseVisualStyleBackColor = true;

-            this.btnEditInclude.Click += new System.EventHandler(this.btnEdit_Click);

-            // 

-            // includeInfo

-            // 

-            this.includeInfo.AutoSize = true;

-            this.includeInfo.Location = new System.Drawing.Point(7, 146);

-            this.includeInfo.Name = "includeInfo";

-            this.includeInfo.Size = new System.Drawing.Size(315, 13);

-            this.includeInfo.TabIndex = 12;

-            this.includeInfo.Text = "Select checkboxes for absolute paths, deselect for relative paths.";

-            // 

-            // btnMoveIncludeDown

-            // 

-            this.btnMoveIncludeDown.Location = new System.Drawing.Point(405, 127);

-            this.btnMoveIncludeDown.Name = "btnMoveIncludeDown";

-            this.btnMoveIncludeDown.Size = new System.Drawing.Size(75, 23);

-            this.btnMoveIncludeDown.TabIndex = 11;

-            this.btnMoveIncludeDown.Text = "Down";

-            this.btnMoveIncludeDown.UseVisualStyleBackColor = true;

-            this.btnMoveIncludeDown.Click += new System.EventHandler(this.btnMoveIncludeDown_Click);

-            // 

-            // btnMoveIncludeUp

-            // 

-            this.btnMoveIncludeUp.Location = new System.Drawing.Point(405, 100);

-            this.btnMoveIncludeUp.Name = "btnMoveIncludeUp";

-            this.btnMoveIncludeUp.Size = new System.Drawing.Size(75, 23);

-            this.btnMoveIncludeUp.TabIndex = 10;

-            this.btnMoveIncludeUp.Text = "Up";

-            this.btnMoveIncludeUp.UseVisualStyleBackColor = true;

-            this.btnMoveIncludeUp.Click += new System.EventHandler(this.btnMoveIncludeUp_Click);

-            // 

-            // btnRemoveInclude

-            // 

-            this.btnRemoveInclude.Location = new System.Drawing.Point(405, 73);

-            this.btnRemoveInclude.Name = "btnRemoveInclude";

-            this.btnRemoveInclude.Size = new System.Drawing.Size(75, 23);

-            this.btnRemoveInclude.TabIndex = 9;

-            this.btnRemoveInclude.Text = "Remove";

-            this.btnRemoveInclude.UseVisualStyleBackColor = true;

-            this.btnRemoveInclude.Click += new System.EventHandler(this.btnRemoveInclude_Click);

-            // 

-            // btnAddInclude

-            // 

-            this.btnAddInclude.Location = new System.Drawing.Point(405, 19);

-            this.btnAddInclude.Name = "btnAddInclude";

-            this.btnAddInclude.Size = new System.Drawing.Size(75, 23);

-            this.btnAddInclude.TabIndex = 8;

-            this.btnAddInclude.Text = "Add";

-            this.btnAddInclude.UseVisualStyleBackColor = true;

-            this.btnAddInclude.Click += new System.EventHandler(this.btnAddInclude_Click);

-            // 

-            // includeDirList

-            // 

-            this.includeDirList.FormattingEnabled = true;

-            this.includeDirList.Location = new System.Drawing.Point(10, 19);

-            this.includeDirList.Name = "includeDirList";

-            this.includeDirList.Size = new System.Drawing.Size(390, 124);

-            this.includeDirList.TabIndex = 7;

-            this.includeDirList.SelectedIndexChanged += new System.EventHandler(this.includeDirList_SelectedIndexChanged);

-            this.includeDirList.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.includeDirList_ItemCheck);

-            // 

-            // groupBox2

-            // 

-            this.groupBox2.Controls.Add(this.txtExtraOptions);

-            this.groupBox2.Location = new System.Drawing.Point(12, 138);

-            this.groupBox2.Name = "groupBox2";

-            this.groupBox2.Size = new System.Drawing.Size(487, 70);

-            this.groupBox2.TabIndex = 2;

-            this.groupBox2.TabStop = false;

-            this.groupBox2.Text = "Extra Compiler Options";

-            // 

-            // txtExtraOptions

-            // 

-            this.txtExtraOptions.Location = new System.Drawing.Point(6, 19);

-            this.txtExtraOptions.Multiline = true;

-            this.txtExtraOptions.Name = "txtExtraOptions";

-            this.txtExtraOptions.Size = new System.Drawing.Size(474, 40);

-            this.txtExtraOptions.TabIndex = 6;

-            this.txtExtraOptions.LostFocus += new System.EventHandler(this.txtExtraOptions_LostFocus);

-            this.txtExtraOptions.Enter += new System.EventHandler(this.txtExtraOptions_Focus);

-            // 

-            // groupBox3

-            // 

-            this.groupBox3.Controls.Add(this.chkIceUtil);

-            this.groupBox3.Controls.Add(this.chkFreeze);

-            this.groupBox3.Controls.Add(this.chkIceStorm);

-            this.groupBox3.Controls.Add(this.chkIceSSL);

-            this.groupBox3.Controls.Add(this.chkIcePatch2);

-            this.groupBox3.Controls.Add(this.chkIceGrid);

-            this.groupBox3.Controls.Add(this.chkIceBox);

-            this.groupBox3.Controls.Add(this.chkGlacier2);

-            this.groupBox3.Controls.Add(this.chkIce);

-            this.groupBox3.Location = new System.Drawing.Point(12, 438);

-            this.groupBox3.Name = "groupBox3";

-            this.groupBox3.Size = new System.Drawing.Size(486, 62);

-            this.groupBox3.TabIndex = 3;

-            this.groupBox3.TabStop = false;

-            this.groupBox3.Text = "Ice Components";

-            // 

-            // chkIceUtil

-            // 

-            this.chkIceUtil.AutoSize = true;

-            this.chkIceUtil.Location = new System.Drawing.Point(74, 39);

-            this.chkIceUtil.Name = "chkIceUtil";

-            this.chkIceUtil.Size = new System.Drawing.Size(56, 17);

-            this.chkIceUtil.TabIndex = 8;

-            this.chkIceUtil.TabStop = false;

-            this.chkIceUtil.Text = "IceUtil";

-            this.chkIceUtil.UseVisualStyleBackColor = true;

-            this.chkIceUtil.CheckedChanged += new System.EventHandler(this.chkIceUtil_CheckedChanged);

-            // 

-            // chkFreeze

-            // 

-            this.chkFreeze.AutoSize = true;

-            this.chkFreeze.Location = new System.Drawing.Point(7, 19);

-            this.chkFreeze.Name = "chkFreeze";

-            this.chkFreeze.Size = new System.Drawing.Size(58, 17);

-            this.chkFreeze.TabIndex = 7;

-            this.chkFreeze.Text = "Freeze";

-            this.chkFreeze.UseVisualStyleBackColor = true;

-            this.chkFreeze.CheckedChanged += new System.EventHandler(this.chkFreeze_CheckedChanged);

-            // 

-            // chkIceStorm

-            // 

-            this.chkIceStorm.AutoSize = true;

-            this.chkIceStorm.Location = new System.Drawing.Point(7, 39);

-            this.chkIceStorm.Name = "chkIceStorm";

-            this.chkIceStorm.Size = new System.Drawing.Size(68, 17);

-            this.chkIceStorm.TabIndex = 6;

-            this.chkIceStorm.TabStop = false;

-            this.chkIceStorm.Text = "IceStorm";

-            this.chkIceStorm.UseVisualStyleBackColor = true;

-            this.chkIceStorm.CheckedChanged += new System.EventHandler(this.chkIceStorm_CheckedChanged);

-            // 

-            // chkIceSSL

-            // 

-            this.chkIceSSL.AutoSize = true;

-            this.chkIceSSL.Location = new System.Drawing.Point(419, 19);

-            this.chkIceSSL.Name = "chkIceSSL";

-            this.chkIceSSL.Size = new System.Drawing.Size(61, 17);

-            this.chkIceSSL.TabIndex = 5;

-            this.chkIceSSL.TabStop = false;

-            this.chkIceSSL.Text = "IceSSL";

-            this.chkIceSSL.UseVisualStyleBackColor = true;

-            this.chkIceSSL.CheckedChanged += new System.EventHandler(this.chkIceSSL_CheckedChanged);

-            // 

-            // chkIcePatch2

-            // 

-            this.chkIcePatch2.AutoSize = true;

-            this.chkIcePatch2.Location = new System.Drawing.Point(335, 19);

-            this.chkIcePatch2.Name = "chkIcePatch2";

-            this.chkIcePatch2.Size = new System.Drawing.Size(75, 17);

-            this.chkIcePatch2.TabIndex = 4;

-            this.chkIcePatch2.TabStop = false;

-            this.chkIcePatch2.Text = "IcePatch2";

-            this.chkIcePatch2.UseVisualStyleBackColor = true;

-            this.chkIcePatch2.CheckedChanged += new System.EventHandler(this.chkIcePatch2_CheckedChanged);

-            // 

-            // chkIceGrid

-            // 

-            this.chkIceGrid.AutoSize = true;

-            this.chkIceGrid.Location = new System.Drawing.Point(266, 19);

-            this.chkIceGrid.Name = "chkIceGrid";

-            this.chkIceGrid.Size = new System.Drawing.Size(60, 17);

-            this.chkIceGrid.TabIndex = 3;

-            this.chkIceGrid.TabStop = false;

-            this.chkIceGrid.Text = "IceGrid";

-            this.chkIceGrid.UseVisualStyleBackColor = true;

-            this.chkIceGrid.CheckedChanged += new System.EventHandler(this.chkIceGrid_CheckedChanged);

-            // 

-            // chkIceBox

-            // 

-            this.chkIceBox.AutoSize = true;

-            this.chkIceBox.Location = new System.Drawing.Point(198, 19);

-            this.chkIceBox.Name = "chkIceBox";

-            this.chkIceBox.Size = new System.Drawing.Size(59, 17);

-            this.chkIceBox.TabIndex = 2;

-            this.chkIceBox.TabStop = false;

-            this.chkIceBox.Text = "IceBox";

-            this.chkIceBox.UseVisualStyleBackColor = true;

-            this.chkIceBox.CheckedChanged += new System.EventHandler(this.chkIceBox_CheckedChanged);

-            // 

-            // chkGlacier2

-            // 

-            this.chkGlacier2.AutoSize = true;

-            this.chkGlacier2.Location = new System.Drawing.Point(74, 19);

-            this.chkGlacier2.Name = "chkGlacier2";

-            this.chkGlacier2.Size = new System.Drawing.Size(65, 17);

-            this.chkGlacier2.TabIndex = 0;

-            this.chkGlacier2.TabStop = false;

-            this.chkGlacier2.Text = "Glacier2";

-            this.chkGlacier2.UseVisualStyleBackColor = true;

-            this.chkGlacier2.CheckedChanged += new System.EventHandler(this.chkGlacier2_CheckedChanged);

-            // 

-            // chkIce

-            // 

-            this.chkIce.AutoSize = true;

-            this.chkIce.Location = new System.Drawing.Point(148, 19);

-            this.chkIce.Name = "chkIce";

-            this.chkIce.Size = new System.Drawing.Size(41, 17);

-            this.chkIce.TabIndex = 1;

-            this.chkIce.TabStop = false;

-            this.chkIce.Text = "Ice";

-            this.chkIce.UseVisualStyleBackColor = true;

-            this.chkIce.CheckedChanged += new System.EventHandler(this.chkIce_CheckedChanged);

-            // 

-            // groupBox4

-            // 

-            this.groupBox4.Controls.Add(this.chkChecksum);

-            this.groupBox4.Controls.Add(this.chkConsole);

-            this.groupBox4.Controls.Add(this.chkIcePrefix);

-            this.groupBox4.Controls.Add(this.chkStreaming);

-            this.groupBox4.Location = new System.Drawing.Point(12, 88);

-            this.groupBox4.Name = "groupBox4";

-            this.groupBox4.Size = new System.Drawing.Size(487, 44);

-            this.groupBox4.TabIndex = 4;

-            this.groupBox4.TabStop = false;

-            this.groupBox4.Text = "Slice Compiler Options";

-            // 

-            // chkChecksum

-            // 

-            this.chkChecksum.AutoSize = true;

-            this.chkChecksum.Location = new System.Drawing.Point(181, 19);

-            this.chkChecksum.Name = "chkChecksum";

-            this.chkChecksum.Size = new System.Drawing.Size(76, 17);

-            this.chkChecksum.TabIndex = 4;

-            this.chkChecksum.Text = "Checksum";

-            this.chkChecksum.UseVisualStyleBackColor = true;

-            this.chkChecksum.CheckedChanged += new System.EventHandler(this.chkChecksum_CheckedChanged);

-            // 

-            // chkConsole

-            // 

-            this.chkConsole.AutoSize = true;

-            this.chkConsole.Location = new System.Drawing.Point(275, 19);

-            this.chkConsole.Name = "chkConsole";

-            this.chkConsole.Size = new System.Drawing.Size(99, 17);

-            this.chkConsole.TabIndex = 3;

-            this.chkConsole.Text = "Console Output";

-            this.chkConsole.UseVisualStyleBackColor = true;

-            this.chkConsole.CheckedChanged += new System.EventHandler(this.chkConsole_CheckedChanged);

-            // 

-            // chkIcePrefix

-            // 

-            this.chkIcePrefix.AutoSize = true;

-            this.chkIcePrefix.Location = new System.Drawing.Point(10, 19);

-            this.chkIcePrefix.Name = "chkIcePrefix";

-            this.chkIcePrefix.Size = new System.Drawing.Size(41, 17);

-            this.chkIcePrefix.TabIndex = 2;

-            this.chkIcePrefix.Text = "Ice";

-            this.chkIcePrefix.UseVisualStyleBackColor = true;

-            this.chkIcePrefix.CheckedChanged += new System.EventHandler(this.chkIcePrefix_CheckedChanged);

-            // 

-            // chkStreaming

-            // 

-            this.chkStreaming.AutoSize = true;

-            this.chkStreaming.Location = new System.Drawing.Point(86, 19);

-            this.chkStreaming.Name = "chkStreaming";

-            this.chkStreaming.Size = new System.Drawing.Size(73, 17);

-            this.chkStreaming.TabIndex = 1;

-            this.chkStreaming.Text = "Streaming";

-            this.chkStreaming.UseVisualStyleBackColor = true;

-            this.chkStreaming.CheckedChanged += new System.EventHandler(this.chkStreaming_CheckedChanged);

-            // 

-            // btnClose

-            // 

-            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;

-            this.btnClose.Location = new System.Drawing.Point(424, 506);

-            this.btnClose.Name = "btnClose";

-            this.btnClose.Size = new System.Drawing.Size(75, 23);

-            this.btnClose.TabIndex = 5;

-            this.btnClose.Text = "Close";

-            this.btnClose.UseVisualStyleBackColor = true;

-            this.btnClose.Click += new System.EventHandler(this.btnCancel_Click);

-            // 

-            // groupBox5

-            // 

-            this.groupBox5.Controls.Add(this.btnSelectIceHome);

-            this.groupBox5.Controls.Add(this.txtIceHome);

-            this.groupBox5.Location = new System.Drawing.Point(12, 37);

-            this.groupBox5.Name = "groupBox5";

-            this.groupBox5.Size = new System.Drawing.Size(486, 45);

-            this.groupBox5.TabIndex = 6;

-            this.groupBox5.TabStop = false;

-            this.groupBox5.Text = "Ice Home";

-            // 

-            // btnSelectIceHome

-            // 

-            this.btnSelectIceHome.Location = new System.Drawing.Point(405, 16);

-            this.btnSelectIceHome.Name = "btnSelectIceHome";

-            this.btnSelectIceHome.Size = new System.Drawing.Size(75, 23);

-            this.btnSelectIceHome.TabIndex = 1;

-            this.btnSelectIceHome.Text = "....";

-            this.btnSelectIceHome.UseVisualStyleBackColor = true;

-            this.btnSelectIceHome.Click += new System.EventHandler(this.btnSelectIceHome_Click);

-            // 

-            // txtIceHome

-            // 

-            this.txtIceHome.Location = new System.Drawing.Point(10, 20);

-            this.txtIceHome.Name = "txtIceHome";

-            this.txtIceHome.Size = new System.Drawing.Size(386, 20);

-            this.txtIceHome.TabIndex = 0;

-            this.txtIceHome.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtIceHome_KeyPress);

-            this.txtIceHome.LostFocus += new System.EventHandler(this.txtIceHome_LostFocus);

-            this.txtIceHome.Enter += new System.EventHandler(this.txtIceHome_Focus);

-            // 

-            // grouDllExportSymbol

-            // 

-            this.grouDllExportSymbol.Controls.Add(this.txtDllExportSymbol);

-            this.grouDllExportSymbol.Location = new System.Drawing.Point(12, 389);

-            this.grouDllExportSymbol.Name = "grouDllExportSymbol";

-            this.grouDllExportSymbol.Size = new System.Drawing.Size(486, 43);

-            this.grouDllExportSymbol.TabIndex = 7;

-            this.grouDllExportSymbol.TabStop = false;

-            this.grouDllExportSymbol.Text = "DLL Export Symbol";

-            // 

-            // txtDllExportSymbol

-            // 

-            this.txtDllExportSymbol.Location = new System.Drawing.Point(6, 16);

-            this.txtDllExportSymbol.Name = "txtDllExportSymbol";

-            this.txtDllExportSymbol.Size = new System.Drawing.Size(474, 20);

-            this.txtDllExportSymbol.TabIndex = 1;

-            this.txtDllExportSymbol.LostFocus += new System.EventHandler(this.txtDllExportSymbol_LostFocus);

-            this.txtDllExportSymbol.Enter += new System.EventHandler(this.txtDllExportSymbol_Focus);

-            // 

-            // IceCppConfigurationDialog

-            // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.CancelButton = this.btnClose;

-            this.ClientSize = new System.Drawing.Size(515, 536);

-            this.Controls.Add(this.grouDllExportSymbol);

-            this.Controls.Add(this.groupBox3);

-            this.Controls.Add(this.groupBox5);

-            this.Controls.Add(this.btnClose);

-            this.Controls.Add(this.groupBox4);

-            this.Controls.Add(this.groupBox2);

-            this.Controls.Add(this.groupBox1);

-            this.Controls.Add(this.chkEnableBuilder);

-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;

-            this.MaximizeBox = false;

-            this.Name = "IceCppConfigurationDialog";

-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

-            this.Text = "Ice Configuration";

-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing);

-            this.groupBox1.ResumeLayout(false);

-            this.groupBox1.PerformLayout();

-            this.groupBox2.ResumeLayout(false);

-            this.groupBox2.PerformLayout();

-            this.groupBox3.ResumeLayout(false);

-            this.groupBox3.PerformLayout();

-            this.groupBox4.ResumeLayout(false);

-            this.groupBox4.PerformLayout();

-            this.groupBox5.ResumeLayout(false);

-            this.groupBox5.PerformLayout();

-            this.grouDllExportSymbol.ResumeLayout(false);

-            this.grouDllExportSymbol.PerformLayout();

-            this.ResumeLayout(false);

-            this.PerformLayout();

-

-       } 

-

-        #endregion

-

-        private System.Windows.Forms.CheckBox chkEnableBuilder;

-        private System.Windows.Forms.GroupBox groupBox1;

-        private System.Windows.Forms.Button btnMoveIncludeDown;

-        private System.Windows.Forms.Button btnMoveIncludeUp;

-        private System.Windows.Forms.Button btnRemoveInclude;

-        private System.Windows.Forms.Button btnAddInclude;

-        private System.Windows.Forms.CheckedListBox includeDirList;

-        private System.Windows.Forms.GroupBox groupBox2;

-        private System.Windows.Forms.TextBox txtExtraOptions;

-        private System.Windows.Forms.GroupBox groupBox3;

-        private System.Windows.Forms.CheckBox chkIceStorm;

-        private System.Windows.Forms.CheckBox chkIceSSL;

-        private System.Windows.Forms.CheckBox chkIcePatch2;

-        private System.Windows.Forms.CheckBox chkIceGrid;

-        private System.Windows.Forms.CheckBox chkIceBox;

-        private System.Windows.Forms.CheckBox chkGlacier2;

-        private System.Windows.Forms.CheckBox chkIce;

-        private System.Windows.Forms.GroupBox groupBox4;

-        private System.Windows.Forms.CheckBox chkIcePrefix;

-        private System.Windows.Forms.CheckBox chkStreaming;

-        private System.Windows.Forms.Button btnClose;

-        private System.Windows.Forms.GroupBox groupBox5;

-        private System.Windows.Forms.Button btnSelectIceHome;

-        private System.Windows.Forms.TextBox txtIceHome;

-        private System.Windows.Forms.ToolTip toolTip;

-        private System.Windows.Forms.CheckBox chkFreeze;

-        private System.Windows.Forms.CheckBox chkIceUtil;

-        private System.Windows.Forms.CheckBox chkConsole;

-        private System.Windows.Forms.GroupBox grouDllExportSymbol;

-        private System.Windows.Forms.TextBox txtDllExportSymbol;

-        private System.Windows.Forms.CheckBox chkChecksum;

-        private System.Windows.Forms.Label includeInfo;

-        private System.Windows.Forms.Button btnEditInclude;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+namespace Ice.VisualStudio
+{
+    partial class IceCppConfigurationDialog
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.btnEditInclude = new System.Windows.Forms.Button();
+            this.includeInfo = new System.Windows.Forms.Label();
+            this.btnMoveIncludeDown = new System.Windows.Forms.Button();
+            this.btnMoveIncludeUp = new System.Windows.Forms.Button();
+            this.btnRemoveInclude = new System.Windows.Forms.Button();
+            this.btnAddInclude = new System.Windows.Forms.Button();
+            this.includeDirList = new System.Windows.Forms.CheckedListBox();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.txtExtraOptions = new System.Windows.Forms.TextBox();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.chkIceUtil = new System.Windows.Forms.CheckBox();
+            this.chkFreeze = new System.Windows.Forms.CheckBox();
+            this.chkIceStorm = new System.Windows.Forms.CheckBox();
+            this.chkIceSSL = new System.Windows.Forms.CheckBox();
+            this.chkIcePatch2 = new System.Windows.Forms.CheckBox();
+            this.chkIceGrid = new System.Windows.Forms.CheckBox();
+            this.chkIceBox = new System.Windows.Forms.CheckBox();
+            this.chkGlacier2 = new System.Windows.Forms.CheckBox();
+            this.chkIce = new System.Windows.Forms.CheckBox();
+            this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.chkChecksum = new System.Windows.Forms.CheckBox();
+            this.chkConsole = new System.Windows.Forms.CheckBox();
+            this.chkIcePrefix = new System.Windows.Forms.CheckBox();
+            this.chkStreaming = new System.Windows.Forms.CheckBox();
+            this.btnClose = new System.Windows.Forms.Button();
+            this.groupBox5 = new System.Windows.Forms.GroupBox();
+            this.btnSelectIceHome = new System.Windows.Forms.Button();
+            this.txtIceHome = new System.Windows.Forms.TextBox();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.grouDllExportSymbol = new System.Windows.Forms.GroupBox();
+            this.txtDllExportSymbol = new System.Windows.Forms.TextBox();
+            this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            this.groupBox3.SuspendLayout();
+            this.groupBox4.SuspendLayout();
+            this.groupBox5.SuspendLayout();
+            this.grouDllExportSymbol.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // chkEnableBuilder
+            // 
+            this.chkEnableBuilder.AutoSize = true;
+            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);
+            this.chkEnableBuilder.Name = "chkEnableBuilder";
+            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);
+            this.chkEnableBuilder.TabIndex = 0;
+            this.chkEnableBuilder.Text = "Enable Ice Builder";
+            this.chkEnableBuilder.UseVisualStyleBackColor = true;
+            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.btnEditInclude);
+            this.groupBox1.Controls.Add(this.includeInfo);
+            this.groupBox1.Controls.Add(this.btnMoveIncludeDown);
+            this.groupBox1.Controls.Add(this.btnMoveIncludeUp);
+            this.groupBox1.Controls.Add(this.btnRemoveInclude);
+            this.groupBox1.Controls.Add(this.btnAddInclude);
+            this.groupBox1.Controls.Add(this.includeDirList);
+            this.groupBox1.Location = new System.Drawing.Point(12, 214);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(487, 169);
+            this.groupBox1.TabIndex = 1;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Slice Include Path";
+            // 
+            // btnEditInclude
+            // 
+            this.btnEditInclude.Location = new System.Drawing.Point(405, 46);
+            this.btnEditInclude.Name = "btnEditInclude";
+            this.btnEditInclude.Size = new System.Drawing.Size(75, 23);
+            this.btnEditInclude.TabIndex = 13;
+            this.btnEditInclude.Text = "Edit";
+            this.btnEditInclude.UseVisualStyleBackColor = true;
+            this.btnEditInclude.Click += new System.EventHandler(this.btnEdit_Click);
+            // 
+            // includeInfo
+            // 
+            this.includeInfo.AutoSize = true;
+            this.includeInfo.Location = new System.Drawing.Point(7, 146);
+            this.includeInfo.Name = "includeInfo";
+            this.includeInfo.Size = new System.Drawing.Size(315, 13);
+            this.includeInfo.TabIndex = 12;
+            this.includeInfo.Text = "Select checkboxes for absolute paths, deselect for relative paths.";
+            // 
+            // btnMoveIncludeDown
+            // 
+            this.btnMoveIncludeDown.Location = new System.Drawing.Point(405, 127);
+            this.btnMoveIncludeDown.Name = "btnMoveIncludeDown";
+            this.btnMoveIncludeDown.Size = new System.Drawing.Size(75, 23);
+            this.btnMoveIncludeDown.TabIndex = 11;
+            this.btnMoveIncludeDown.Text = "Down";
+            this.btnMoveIncludeDown.UseVisualStyleBackColor = true;
+            this.btnMoveIncludeDown.Click += new System.EventHandler(this.btnMoveIncludeDown_Click);
+            // 
+            // btnMoveIncludeUp
+            // 
+            this.btnMoveIncludeUp.Location = new System.Drawing.Point(405, 100);
+            this.btnMoveIncludeUp.Name = "btnMoveIncludeUp";
+            this.btnMoveIncludeUp.Size = new System.Drawing.Size(75, 23);
+            this.btnMoveIncludeUp.TabIndex = 10;
+            this.btnMoveIncludeUp.Text = "Up";
+            this.btnMoveIncludeUp.UseVisualStyleBackColor = true;
+            this.btnMoveIncludeUp.Click += new System.EventHandler(this.btnMoveIncludeUp_Click);
+            // 
+            // btnRemoveInclude
+            // 
+            this.btnRemoveInclude.Location = new System.Drawing.Point(405, 73);
+            this.btnRemoveInclude.Name = "btnRemoveInclude";
+            this.btnRemoveInclude.Size = new System.Drawing.Size(75, 23);
+            this.btnRemoveInclude.TabIndex = 9;
+            this.btnRemoveInclude.Text = "Remove";
+            this.btnRemoveInclude.UseVisualStyleBackColor = true;
+            this.btnRemoveInclude.Click += new System.EventHandler(this.btnRemoveInclude_Click);
+            // 
+            // btnAddInclude
+            // 
+            this.btnAddInclude.Location = new System.Drawing.Point(405, 19);
+            this.btnAddInclude.Name = "btnAddInclude";
+            this.btnAddInclude.Size = new System.Drawing.Size(75, 23);
+            this.btnAddInclude.TabIndex = 8;
+            this.btnAddInclude.Text = "Add";
+            this.btnAddInclude.UseVisualStyleBackColor = true;
+            this.btnAddInclude.Click += new System.EventHandler(this.btnAddInclude_Click);
+            // 
+            // includeDirList
+            // 
+            this.includeDirList.FormattingEnabled = true;
+            this.includeDirList.Location = new System.Drawing.Point(10, 19);
+            this.includeDirList.Name = "includeDirList";
+            this.includeDirList.Size = new System.Drawing.Size(390, 124);
+            this.includeDirList.TabIndex = 7;
+            this.includeDirList.SelectedIndexChanged += new System.EventHandler(this.includeDirList_SelectedIndexChanged);
+            this.includeDirList.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.includeDirList_ItemCheck);
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.txtExtraOptions);
+            this.groupBox2.Location = new System.Drawing.Point(12, 138);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(487, 70);
+            this.groupBox2.TabIndex = 2;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "Extra Compiler Options";
+            // 
+            // txtExtraOptions
+            // 
+            this.txtExtraOptions.Location = new System.Drawing.Point(6, 19);
+            this.txtExtraOptions.Multiline = true;
+            this.txtExtraOptions.Name = "txtExtraOptions";
+            this.txtExtraOptions.Size = new System.Drawing.Size(474, 40);
+            this.txtExtraOptions.TabIndex = 6;
+            this.txtExtraOptions.LostFocus += new System.EventHandler(this.txtExtraOptions_LostFocus);
+            this.txtExtraOptions.Enter += new System.EventHandler(this.txtExtraOptions_Focus);
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.chkIceUtil);
+            this.groupBox3.Controls.Add(this.chkFreeze);
+            this.groupBox3.Controls.Add(this.chkIceStorm);
+            this.groupBox3.Controls.Add(this.chkIceSSL);
+            this.groupBox3.Controls.Add(this.chkIcePatch2);
+            this.groupBox3.Controls.Add(this.chkIceGrid);
+            this.groupBox3.Controls.Add(this.chkIceBox);
+            this.groupBox3.Controls.Add(this.chkGlacier2);
+            this.groupBox3.Controls.Add(this.chkIce);
+            this.groupBox3.Location = new System.Drawing.Point(12, 438);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(486, 62);
+            this.groupBox3.TabIndex = 3;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "Ice Components";
+            // 
+            // chkIceUtil
+            // 
+            this.chkIceUtil.AutoSize = true;
+            this.chkIceUtil.Location = new System.Drawing.Point(74, 39);
+            this.chkIceUtil.Name = "chkIceUtil";
+            this.chkIceUtil.Size = new System.Drawing.Size(56, 17);
+            this.chkIceUtil.TabIndex = 8;
+            this.chkIceUtil.TabStop = false;
+            this.chkIceUtil.Text = "IceUtil";
+            this.chkIceUtil.UseVisualStyleBackColor = true;
+            this.chkIceUtil.CheckedChanged += new System.EventHandler(this.chkIceUtil_CheckedChanged);
+            // 
+            // chkFreeze
+            // 
+            this.chkFreeze.AutoSize = true;
+            this.chkFreeze.Location = new System.Drawing.Point(7, 19);
+            this.chkFreeze.Name = "chkFreeze";
+            this.chkFreeze.Size = new System.Drawing.Size(58, 17);
+            this.chkFreeze.TabIndex = 7;
+            this.chkFreeze.Text = "Freeze";
+            this.chkFreeze.UseVisualStyleBackColor = true;
+            this.chkFreeze.CheckedChanged += new System.EventHandler(this.chkFreeze_CheckedChanged);
+            // 
+            // chkIceStorm
+            // 
+            this.chkIceStorm.AutoSize = true;
+            this.chkIceStorm.Location = new System.Drawing.Point(7, 39);
+            this.chkIceStorm.Name = "chkIceStorm";
+            this.chkIceStorm.Size = new System.Drawing.Size(68, 17);
+            this.chkIceStorm.TabIndex = 6;
+            this.chkIceStorm.TabStop = false;
+            this.chkIceStorm.Text = "IceStorm";
+            this.chkIceStorm.UseVisualStyleBackColor = true;
+            this.chkIceStorm.CheckedChanged += new System.EventHandler(this.chkIceStorm_CheckedChanged);
+            // 
+            // chkIceSSL
+            // 
+            this.chkIceSSL.AutoSize = true;
+            this.chkIceSSL.Location = new System.Drawing.Point(419, 19);
+            this.chkIceSSL.Name = "chkIceSSL";
+            this.chkIceSSL.Size = new System.Drawing.Size(61, 17);
+            this.chkIceSSL.TabIndex = 5;
+            this.chkIceSSL.TabStop = false;
+            this.chkIceSSL.Text = "IceSSL";
+            this.chkIceSSL.UseVisualStyleBackColor = true;
+            this.chkIceSSL.CheckedChanged += new System.EventHandler(this.chkIceSSL_CheckedChanged);
+            // 
+            // chkIcePatch2
+            // 
+            this.chkIcePatch2.AutoSize = true;
+            this.chkIcePatch2.Location = new System.Drawing.Point(335, 19);
+            this.chkIcePatch2.Name = "chkIcePatch2";
+            this.chkIcePatch2.Size = new System.Drawing.Size(75, 17);
+            this.chkIcePatch2.TabIndex = 4;
+            this.chkIcePatch2.TabStop = false;
+            this.chkIcePatch2.Text = "IcePatch2";
+            this.chkIcePatch2.UseVisualStyleBackColor = true;
+            this.chkIcePatch2.CheckedChanged += new System.EventHandler(this.chkIcePatch2_CheckedChanged);
+            // 
+            // chkIceGrid
+            // 
+            this.chkIceGrid.AutoSize = true;
+            this.chkIceGrid.Location = new System.Drawing.Point(266, 19);
+            this.chkIceGrid.Name = "chkIceGrid";
+            this.chkIceGrid.Size = new System.Drawing.Size(60, 17);
+            this.chkIceGrid.TabIndex = 3;
+            this.chkIceGrid.TabStop = false;
+            this.chkIceGrid.Text = "IceGrid";
+            this.chkIceGrid.UseVisualStyleBackColor = true;
+            this.chkIceGrid.CheckedChanged += new System.EventHandler(this.chkIceGrid_CheckedChanged);
+            // 
+            // chkIceBox
+            // 
+            this.chkIceBox.AutoSize = true;
+            this.chkIceBox.Location = new System.Drawing.Point(198, 19);
+            this.chkIceBox.Name = "chkIceBox";
+            this.chkIceBox.Size = new System.Drawing.Size(59, 17);
+            this.chkIceBox.TabIndex = 2;
+            this.chkIceBox.TabStop = false;
+            this.chkIceBox.Text = "IceBox";
+            this.chkIceBox.UseVisualStyleBackColor = true;
+            this.chkIceBox.CheckedChanged += new System.EventHandler(this.chkIceBox_CheckedChanged);
+            // 
+            // chkGlacier2
+            // 
+            this.chkGlacier2.AutoSize = true;
+            this.chkGlacier2.Location = new System.Drawing.Point(74, 19);
+            this.chkGlacier2.Name = "chkGlacier2";
+            this.chkGlacier2.Size = new System.Drawing.Size(65, 17);
+            this.chkGlacier2.TabIndex = 0;
+            this.chkGlacier2.TabStop = false;
+            this.chkGlacier2.Text = "Glacier2";
+            this.chkGlacier2.UseVisualStyleBackColor = true;
+            this.chkGlacier2.CheckedChanged += new System.EventHandler(this.chkGlacier2_CheckedChanged);
+            // 
+            // chkIce
+            // 
+            this.chkIce.AutoSize = true;
+            this.chkIce.Location = new System.Drawing.Point(148, 19);
+            this.chkIce.Name = "chkIce";
+            this.chkIce.Size = new System.Drawing.Size(41, 17);
+            this.chkIce.TabIndex = 1;
+            this.chkIce.TabStop = false;
+            this.chkIce.Text = "Ice";
+            this.chkIce.UseVisualStyleBackColor = true;
+            this.chkIce.CheckedChanged += new System.EventHandler(this.chkIce_CheckedChanged);
+            // 
+            // groupBox4
+            // 
+            this.groupBox4.Controls.Add(this.chkChecksum);
+            this.groupBox4.Controls.Add(this.chkConsole);
+            this.groupBox4.Controls.Add(this.chkIcePrefix);
+            this.groupBox4.Controls.Add(this.chkStreaming);
+            this.groupBox4.Location = new System.Drawing.Point(12, 88);
+            this.groupBox4.Name = "groupBox4";
+            this.groupBox4.Size = new System.Drawing.Size(487, 44);
+            this.groupBox4.TabIndex = 4;
+            this.groupBox4.TabStop = false;
+            this.groupBox4.Text = "Slice Compiler Options";
+            // 
+            // chkChecksum
+            // 
+            this.chkChecksum.AutoSize = true;
+            this.chkChecksum.Location = new System.Drawing.Point(181, 19);
+            this.chkChecksum.Name = "chkChecksum";
+            this.chkChecksum.Size = new System.Drawing.Size(76, 17);
+            this.chkChecksum.TabIndex = 4;
+            this.chkChecksum.Text = "Checksum";
+            this.chkChecksum.UseVisualStyleBackColor = true;
+            this.chkChecksum.CheckedChanged += new System.EventHandler(this.chkChecksum_CheckedChanged);
+            // 
+            // chkConsole
+            // 
+            this.chkConsole.AutoSize = true;
+            this.chkConsole.Location = new System.Drawing.Point(275, 19);
+            this.chkConsole.Name = "chkConsole";
+            this.chkConsole.Size = new System.Drawing.Size(99, 17);
+            this.chkConsole.TabIndex = 3;
+            this.chkConsole.Text = "Console Output";
+            this.chkConsole.UseVisualStyleBackColor = true;
+            this.chkConsole.CheckedChanged += new System.EventHandler(this.chkConsole_CheckedChanged);
+            // 
+            // chkIcePrefix
+            // 
+            this.chkIcePrefix.AutoSize = true;
+            this.chkIcePrefix.Location = new System.Drawing.Point(10, 19);
+            this.chkIcePrefix.Name = "chkIcePrefix";
+            this.chkIcePrefix.Size = new System.Drawing.Size(41, 17);
+            this.chkIcePrefix.TabIndex = 2;
+            this.chkIcePrefix.Text = "Ice";
+            this.chkIcePrefix.UseVisualStyleBackColor = true;
+            this.chkIcePrefix.CheckedChanged += new System.EventHandler(this.chkIcePrefix_CheckedChanged);
+            // 
+            // chkStreaming
+            // 
+            this.chkStreaming.AutoSize = true;
+            this.chkStreaming.Location = new System.Drawing.Point(86, 19);
+            this.chkStreaming.Name = "chkStreaming";
+            this.chkStreaming.Size = new System.Drawing.Size(73, 17);
+            this.chkStreaming.TabIndex = 1;
+            this.chkStreaming.Text = "Streaming";
+            this.chkStreaming.UseVisualStyleBackColor = true;
+            this.chkStreaming.CheckedChanged += new System.EventHandler(this.chkStreaming_CheckedChanged);
+            // 
+            // btnClose
+            // 
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnClose.Location = new System.Drawing.Point(424, 506);
+            this.btnClose.Name = "btnClose";
+            this.btnClose.Size = new System.Drawing.Size(75, 23);
+            this.btnClose.TabIndex = 5;
+            this.btnClose.Text = "Close";
+            this.btnClose.UseVisualStyleBackColor = true;
+            this.btnClose.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // groupBox5
+            // 
+            this.groupBox5.Controls.Add(this.btnSelectIceHome);
+            this.groupBox5.Controls.Add(this.txtIceHome);
+            this.groupBox5.Location = new System.Drawing.Point(12, 37);
+            this.groupBox5.Name = "groupBox5";
+            this.groupBox5.Size = new System.Drawing.Size(486, 45);
+            this.groupBox5.TabIndex = 6;
+            this.groupBox5.TabStop = false;
+            this.groupBox5.Text = "Ice Home";
+            // 
+            // btnSelectIceHome
+            // 
+            this.btnSelectIceHome.Location = new System.Drawing.Point(405, 16);
+            this.btnSelectIceHome.Name = "btnSelectIceHome";
+            this.btnSelectIceHome.Size = new System.Drawing.Size(75, 23);
+            this.btnSelectIceHome.TabIndex = 1;
+            this.btnSelectIceHome.Text = "....";
+            this.btnSelectIceHome.UseVisualStyleBackColor = true;
+            this.btnSelectIceHome.Click += new System.EventHandler(this.btnSelectIceHome_Click);
+            // 
+            // txtIceHome
+            // 
+            this.txtIceHome.Location = new System.Drawing.Point(10, 20);
+            this.txtIceHome.Name = "txtIceHome";
+            this.txtIceHome.Size = new System.Drawing.Size(386, 20);
+            this.txtIceHome.TabIndex = 0;
+            this.txtIceHome.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtIceHome_KeyPress);
+            this.txtIceHome.LostFocus += new System.EventHandler(this.txtIceHome_LostFocus);
+            this.txtIceHome.Enter += new System.EventHandler(this.txtIceHome_Focus);
+            // 
+            // grouDllExportSymbol
+            // 
+            this.grouDllExportSymbol.Controls.Add(this.txtDllExportSymbol);
+            this.grouDllExportSymbol.Location = new System.Drawing.Point(12, 389);
+            this.grouDllExportSymbol.Name = "grouDllExportSymbol";
+            this.grouDllExportSymbol.Size = new System.Drawing.Size(486, 43);
+            this.grouDllExportSymbol.TabIndex = 7;
+            this.grouDllExportSymbol.TabStop = false;
+            this.grouDllExportSymbol.Text = "DLL Export Symbol";
+            // 
+            // txtDllExportSymbol
+            // 
+            this.txtDllExportSymbol.Location = new System.Drawing.Point(6, 16);
+            this.txtDllExportSymbol.Name = "txtDllExportSymbol";
+            this.txtDllExportSymbol.Size = new System.Drawing.Size(474, 20);
+            this.txtDllExportSymbol.TabIndex = 1;
+            this.txtDllExportSymbol.LostFocus += new System.EventHandler(this.txtDllExportSymbol_LostFocus);
+            this.txtDllExportSymbol.Enter += new System.EventHandler(this.txtDllExportSymbol_Focus);
+            // 
+            // IceCppConfigurationDialog
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnClose;
+            this.ClientSize = new System.Drawing.Size(515, 536);
+            this.Controls.Add(this.grouDllExportSymbol);
+            this.Controls.Add(this.groupBox3);
+            this.Controls.Add(this.groupBox5);
+            this.Controls.Add(this.btnClose);
+            this.Controls.Add(this.groupBox4);
+            this.Controls.Add(this.groupBox2);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.chkEnableBuilder);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.MaximizeBox = false;
+            this.Name = "IceCppConfigurationDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Ice Configuration";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
+            this.groupBox4.ResumeLayout(false);
+            this.groupBox4.PerformLayout();
+            this.groupBox5.ResumeLayout(false);
+            this.groupBox5.PerformLayout();
+            this.grouDllExportSymbol.ResumeLayout(false);
+            this.grouDllExportSymbol.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+       } 
+
+        #endregion
+
+        private System.Windows.Forms.CheckBox chkEnableBuilder;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.Button btnMoveIncludeDown;
+        private System.Windows.Forms.Button btnMoveIncludeUp;
+        private System.Windows.Forms.Button btnRemoveInclude;
+        private System.Windows.Forms.Button btnAddInclude;
+        private System.Windows.Forms.CheckedListBox includeDirList;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.TextBox txtExtraOptions;
+        private System.Windows.Forms.GroupBox groupBox3;
+        private System.Windows.Forms.CheckBox chkIceStorm;
+        private System.Windows.Forms.CheckBox chkIceSSL;
+        private System.Windows.Forms.CheckBox chkIcePatch2;
+        private System.Windows.Forms.CheckBox chkIceGrid;
+        private System.Windows.Forms.CheckBox chkIceBox;
+        private System.Windows.Forms.CheckBox chkGlacier2;
+        private System.Windows.Forms.CheckBox chkIce;
+        private System.Windows.Forms.GroupBox groupBox4;
+        private System.Windows.Forms.CheckBox chkIcePrefix;
+        private System.Windows.Forms.CheckBox chkStreaming;
+        private System.Windows.Forms.Button btnClose;
+        private System.Windows.Forms.GroupBox groupBox5;
+        private System.Windows.Forms.Button btnSelectIceHome;
+        private System.Windows.Forms.TextBox txtIceHome;
+        private System.Windows.Forms.ToolTip toolTip;
+        private System.Windows.Forms.CheckBox chkFreeze;
+        private System.Windows.Forms.CheckBox chkIceUtil;
+        private System.Windows.Forms.CheckBox chkConsole;
+        private System.Windows.Forms.GroupBox grouDllExportSymbol;
+        private System.Windows.Forms.TextBox txtDllExportSymbol;
+        private System.Windows.Forms.CheckBox chkChecksum;
+        private System.Windows.Forms.Label includeInfo;
+        private System.Windows.Forms.Button btnEditInclude;
+    }
+}
diff --git a/vsplugin/src/IceCppConfigurationDialog.cs b/vsplugin/src/IceCppConfigurationDialog.cs
index 01702d5ef1d..b45f65cf443 100644
--- a/vsplugin/src/IceCppConfigurationDialog.cs
+++ b/vsplugin/src/IceCppConfigurationDialog.cs
@@ -1,767 +1,767 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.ComponentModel;

-using System.Data;

-using System.Drawing;

-using System.IO;

-using System.Text;

-using System.Windows.Forms;

-

-using EnvDTE;

-

-namespace Ice.VisualStudio

-{

-    public partial class IceCppConfigurationDialog : Form

-    {

-        public IceCppConfigurationDialog(Project project)

-        {

-            InitializeComponent();

-            _project = project;

-            

-            //

-            // Set the toolTip messages.

-            //

-            toolTip.SetToolTip(txtIceHome, "Ice installation directory.");

-            toolTip.SetToolTip(btnSelectIceHome, "Ice installation directory.");

-            toolTip.SetToolTip(chkStreaming, "Generate marshalling support for stream API (--stream).");

-            toolTip.SetToolTip(chkChecksum, "Generate checksums for Slice definitions (--checksum).");

-            toolTip.SetToolTip(chkIcePrefix, "Permit Ice prefixes (--ice).");

-            toolTip.SetToolTip(chkConsole, "Enable console output.");

-

-            if(_project != null)

-            {

-                this.Text = "Ice Configuration - Project: " + _project.Name;

-                bool enabled = Util.isSliceBuilderEnabled(project);

-                setEnabled(enabled);

-                chkEnableBuilder.Checked = enabled;

-                load();

-                _initialized = true;

-            }

-        }

-        

-        private void load()

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_project != null)

-            {

-                includeDirList.Items.Clear();

-                txtIceHome.Text = Util.getIceHomeRaw(_project, false);

-                txtIceHome.Modified = false;

-                txtExtraOptions.Text = Util.getProjectProperty(_project, Util.PropertyIceExtraOptions);

-

-                chkIcePrefix.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIcePrefix);

-

-                chkStreaming.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIceStreaming);

-                chkChecksum.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIceChecksum);

-                chkConsole.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyConsoleOutput);

-

-                IncludePathList list =

-                    new IncludePathList(Util.getProjectProperty(_project, Util.PropertyIceIncludePath));

-                foreach(String s in list)

-                {

-                    includeDirList.Items.Add(s.Trim());

-                    if(Path.IsPathRooted(s.Trim()))

-                    {

-                        includeDirList.SetItemCheckState(includeDirList.Items.Count - 1, CheckState.Checked);

-                    }

-                }

-

-                ComponentList selectedComponents = Util.getIceCppComponents(_project);

-                foreach(String s in Util.getCppNames())

-                {

-                    if(selectedComponents.Contains(s))

-                    {

-                        checkComponent(s, true);

-                    }

-                    else

-                    {

-                        checkComponent(s, false);

-                    }

-                }

-                txtDllExportSymbol.Text = Util.getProjectProperty(_project, Util.PropertyIceDllExport);

-            }

-            Cursor = Cursors.Default;  

-        }

-

-        private void checkComponent(String component, bool check)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            switch (component)

-            {

-                case "Glacier2":

-                {

-                    chkGlacier2.Checked = check;

-                    break;

-                }

-                case "Ice":

-                {

-                    chkIce.Checked = check;

-                    break;

-                }

-                case "IceBox":

-                {

-                    chkIceBox.Checked = check;

-                    break;

-                }

-                case "IceGrid":

-                {

-                    chkIceGrid.Checked = check;

-                    break;

-                }

-                case "IcePatch2":

-                {

-                    chkIcePatch2.Checked = check;

-                    break;

-                }

-                case "IceSSL":

-                {

-                    chkIceSSL.Checked = check;

-                    break;

-                }

-                case "IceStorm":

-                {

-                    chkIceStorm.Checked = check;

-                    break;

-                }

-                case "Freeze":

-                {

-                    chkFreeze.Checked = check;

-                    break;

-                }

-                case "IceUtil":

-                {

-                    chkIceUtil.Checked = check;

-                    break;

-                }

-                default:

-                {

-                    break;

-                }

-            }

-        }

-        

-        private void chkEnableBuilder_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            if(_initialized)

-            {

-                _initialized = false;

-                setEnabled(false);

-                chkEnableBuilder.Enabled = false;

-                Builder builder = Connect.getBuilder();

-                if(chkEnableBuilder.Checked)

-                {

-                    builder.addBuilderToProject(_project);

-                }

-                else

-                {

-                    builder.removeBuilderFromProject(_project);

-                }

-                load();

-                setEnabled(chkEnableBuilder.Checked);

-                chkEnableBuilder.Enabled = true;

-                _initialized = true;

-            }

-            Cursor = Cursors.Default;

-        }

-        

-        private void setEnabled(bool enabled)

-        {

-            txtIceHome.Enabled = enabled;

-            btnSelectIceHome.Enabled = enabled;

-

-            chkIcePrefix.Enabled = enabled;

-            

-            chkStreaming.Enabled = enabled;

-            chkChecksum.Enabled = enabled;

-            chkConsole.Enabled = enabled;

-            includeDirList.Enabled = enabled;

-            btnAddInclude.Enabled = enabled;

-            btnEditInclude.Enabled = enabled;

-            btnRemoveInclude.Enabled = enabled;

-            btnMoveIncludeUp.Enabled = enabled;

-            btnMoveIncludeDown.Enabled = enabled;

-

-            txtExtraOptions.Enabled = enabled;

-

-            chkFreeze.Enabled = enabled;

-            chkGlacier2.Enabled = enabled;

-            chkIce.Enabled = enabled;

-            chkIceBox.Enabled = enabled;

-            chkIceGrid.Enabled = enabled;

-            chkIcePatch2.Enabled = enabled;

-            chkIceSSL.Enabled = enabled;

-            chkIceStorm.Enabled = enabled;

-            chkIceUtil.Enabled = enabled;

-            txtDllExportSymbol.Enabled = enabled;

-        }

-

-        private void formClosing(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            if(!_changed)

-            {

-                if(txtDllExportSymbol.Modified)

-                {

-                    _changed = true;

-                }

-                else if(txtExtraOptions.Modified)

-                {

-                    _changed = true;

-                }

-                else if(txtIceHome.Modified)

-                {

-                    _changed = true;

-                }

-            }

-

-            if(_changed && Util.isSliceBuilderEnabled(_project))

-            {

-                Builder builder = Connect.getBuilder();

-                builder.cleanProject(_project);

-                builder.buildProject(_project, true, vsBuildScope.vsBuildScopeProject);

-            }

-            Cursor = Cursors.Default;

-        }

-

-        private void btnCancel_Click(object sender, EventArgs e)

-        {

-            Close();

-        }

-

-        private void btnSelectIceHome_Click(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            FolderBrowserDialog dialog = new FolderBrowserDialog();

-            dialog.SelectedPath = Util.getAbsoluteIceHome(_project);

-            dialog.Description = "Select Ice Home Installation Directory";

-            DialogResult result = dialog.ShowDialog();

-            if(result == DialogResult.OK)

-            {

-                Util.updateIceHome(_project, dialog.SelectedPath, false);

-                load();

-                _changed = true;

-            }

-        }

-

-        private void txtIceHome_KeyPress(object sender, KeyPressEventArgs e)

-        {

-            if(e.KeyChar == (char)Keys.Return)

-            {

-                updateIceHome();

-                e.Handled = true;

-            }

-        }

-        

-        private void txtIceHome_Focus(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-        }

-        

-        private void txtIceHome_LostFocus(object sender, EventArgs e)

-        {

-            updateIceHome();

-        }

-        

-        private void updateIceHome()

-        {

-            if(!_iceHomeUpdating)

-            {

-                _iceHomeUpdating = true;

-                if(!txtIceHome.Text.Equals(Util.getProjectProperty(_project, Util.PropertyIceHome),

-                                           StringComparison.CurrentCultureIgnoreCase))

-                {

-                    Util.updateIceHome(_project, txtIceHome.Text, false);

-                    load();

-                    _changed = true;

-                    txtIceHome.Modified = false;

-                }

-                _iceHomeUpdating = false;

-            }

-        }

-

-        private void chkIcePrefix_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-

-            Util.setProjectProperty(_project, Util.PropertyIcePrefix, chkIcePrefix.Checked.ToString());

-            _changed = true;

-            Cursor = Cursors.Default;

-        }

-        

-        private void chkStreaming_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            Util.setProjectProperty(_project, Util.PropertyIceStreaming, chkStreaming.Checked.ToString());

-            _changed = true;

-            Cursor = Cursors.Default;

-        }

-        

-        private void chkChecksum_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            Util.setProjectProperty(_project, Util.PropertyIceChecksum, chkChecksum.Checked.ToString());

-            _changed = true;

-            Cursor = Cursors.Default;

-        }

-

-        private void saveSliceIncludes()

-        {

-            IncludePathList paths = new IncludePathList();

-            foreach(String s in includeDirList.Items)

-            {

-                paths.Add(s.Trim());

-            }

-            String p = paths.ToString();

-            Util.setProjectProperty(_project, Util.PropertyIceIncludePath, p);

-            _changed = true;

-        }

-

-        private void btnAddInclude_Click(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            includeDirList.Items.Add("");

-            includeDirList.SelectedIndex = includeDirList.Items.Count - 1;

-            _editingIndex = includeDirList.SelectedIndex;

-            beginEditIncludeDir();

-        }

-

-        private void btnRemoveInclude_Click(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            int index = includeDirList.SelectedIndex;

-            if(_editingIncludes)

-            {

-                index = _editingIndex;

-                endEditIncludeDir(false);

-            }

-            if(index > -1 && index < includeDirList.Items.Count)

-            {

-                int selected = index;

-                includeDirList.Items.RemoveAt(selected);

-                if(includeDirList.Items.Count > 0)

-                {

-                    if(selected > 0)

-                    {

-                        selected -= 1;

-                    }

-                    includeDirList.SelectedIndex = selected;

-                }

-                saveSliceIncludes();

-            }

-            Cursor = Cursors.Default;

-        }

-

-        private void btnMoveIncludeUp_Click(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            int index = includeDirList.SelectedIndex;

-            if(index > 0)

-            {

-                string current = includeDirList.SelectedItem.ToString();

-                includeDirList.Items.RemoveAt(index);

-                includeDirList.Items.Insert(index - 1, current);

-                includeDirList.SelectedIndex = index - 1;

-                saveSliceIncludes();

-            }

-            resetIncludeDirChecks();

-            Cursor = Cursors.Default;

-        }

-

-        private void btnMoveIncludeDown_Click(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            int index = includeDirList.SelectedIndex;

-            if(index < includeDirList.Items.Count - 1 && index > -1)

-            {

-                string current = includeDirList.SelectedItem.ToString();

-                includeDirList.Items.RemoveAt(index);

-                includeDirList.Items.Insert(index + 1, current);

-                includeDirList.SelectedIndex = index + 1;

-                saveSliceIncludes();

-                resetIncludeDirChecks();

-            }

-            Cursor = Cursors.Default;

-        }

-

-        private void resetIncludeDirChecks()

-        {

-            _initialized = false;

-            for(int i = 0; i < includeDirList.Items.Count; i++)

-            {

-                String path = includeDirList.Items[i].ToString();

-                if(String.IsNullOrEmpty(path))

-                {

-                    continue;

-                }

-

-                if(Path.IsPathRooted(path))

-                {

-                    includeDirList.SetItemCheckState(i, CheckState.Checked);

-                }

-                else

-                {

-                    includeDirList.SetItemCheckState(i, CheckState.Unchecked);

-                }

-            }

-            _initialized = true;

-        }

-

-        private void includeDirList_ItemCheck(object sender, ItemCheckEventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                return;

-            }

-            string path = includeDirList.Items[e.Index].ToString();

-            if(!Util.containsEnvironmentVars(path))

-            {

-                if(e.NewValue == CheckState.Unchecked)

-                {

-                   path = Util.relativePath(Path.GetDirectoryName(_project.FileName), path);

-                }

-                else if(e.NewValue == CheckState.Checked)

-                {

-                   if(!Path.IsPathRooted(path))

-                   {

-                       path = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(_project.FileName), path));

-                   }

-                }

-            }

-            includeDirList.Items[e.Index] = path;

-            if(_initialized)

-            {

-                saveSliceIncludes();

-            }

-        }

-

-        private void txtExtraOptions_Focus(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-        }

-        

-        private void txtExtraOptions_LostFocus(object sender, EventArgs e)

-        {

-            if(txtExtraOptions.Modified)

-            {

-                Util.setProjectProperty(_project, Util.PropertyIceExtraOptions, txtExtraOptions.Text);

-                _changed = true;

-            }

-        }

-

-        private void chkGlacier2_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("Glacier2", chkGlacier2.Checked);

-        }

-

-        private void chkIce_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("Ice", chkIce.Checked);

-        }

-

-        private void chkIceBox_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IceBox", chkIceBox.Checked);

-        }

-

-        private void chkIceGrid_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IceGrid", chkIceGrid.Checked);

-        }

-

-        private void chkIcePatch2_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IcePatch2", chkIcePatch2.Checked);

-        }

-

-        private void chkIceSSL_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IceSSL", chkIceSSL.Checked);

-        }

-

-        private void chkIceStorm_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IceStorm", chkIceStorm.Checked);

-        }

-

-        private void chkIceUtil_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IceUtil", chkIceUtil.Checked);

-        }

-

-        private void chkFreeze_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("Freeze", chkFreeze.Checked);

-        }

-

-        private void componentChanged(String name, bool isChecked)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            if(_initialized)

-            {

-                if(isChecked)

-                {

-                    Util.addIceCppLibs(_project, new ComponentList(name));

-                }

-                else

-                {

-                    Util.removeIceCppLibs(_project, new ComponentList(name));

-                }

-                _changed = true;

-            }

-            Cursor = Cursors.Default;

-        }

-

-        private void chkConsole_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            Util.setProjectProperty(_project, Util.PropertyConsoleOutput, chkConsole.Checked.ToString());

-            Cursor = Cursors.Default;

-        }

-

-        private void txtDllExportSymbol_Focus(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-        }

-        

-        private void txtDllExportSymbol_LostFocus(object sender, EventArgs e)

-        {

-            if(txtDllExportSymbol.Modified)

-            {

-                Util.setProjectProperty(_project, Util.PropertyIceDllExport, txtDllExportSymbol.Text);

-                _changed = true;

-            }

-        }

-

-        private void btnEdit_Click(object sender, EventArgs e)

-        {

-            if(includeDirList.SelectedIndex != -1)

-            {

-                _editingIndex = includeDirList.SelectedIndex;

-                beginEditIncludeDir();

-            }

-        }

-

-        private void includeDirList_SelectedIndexChanged(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-        }

-        

-        private void beginEditIncludeDir()

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            _editingIncludes = true;

-            CancelButton = null;

-            if(_editingIndex != -1)

-            {

-                _txtIncludeDir = new TextBox();

-                _txtIncludeDir.Text = includeDirList.Items[includeDirList.SelectedIndex].ToString();

-

-                includeDirList.SelectionMode = SelectionMode.One;

-

-                Rectangle rect = includeDirList.GetItemRectangle(includeDirList.SelectedIndex);

-                _txtIncludeDir.Location = new Point(includeDirList.Location.X + 2, 

-                                                    includeDirList.Location.Y + rect.Y);

-                _txtIncludeDir.Width = includeDirList.Width - 50;

-                _txtIncludeDir.Parent = includeDirList;

-                _txtIncludeDir.KeyDown += new KeyEventHandler(includeDirKeyDown);

-                groupBox1.Controls.Add(_txtIncludeDir);

-                

-                _btnSelectInclude = new Button();

-                _btnSelectInclude.Text = "...";

-                _btnSelectInclude.Location = new Point(includeDirList.Location.X + _txtIncludeDir.Width,

-                                                       includeDirList.Location.Y + rect.Y);

-                _btnSelectInclude.Width = 49;

-                _btnSelectInclude.Height = _txtIncludeDir.Height;

-                _btnSelectInclude.Click += new EventHandler(selectIncludeClicked);

-                groupBox1.Controls.Add(_btnSelectInclude);

-                

-                

-                _txtIncludeDir.Show();

-                _txtIncludeDir.BringToFront();

-                _txtIncludeDir.Focus();

-

-                _btnSelectInclude.Show();

-                _btnSelectInclude.BringToFront();

-            }

-        }

-        

-        private void endEditIncludeDir(bool saveChanges)

-        {

-            _initialized = false;

-            if(!_editingIncludes)

-            {

-                _initialized = true;

-                return;

-            }

-            _editingIncludes = false;

-            String path = null;

-            if(_editingIndex > -1 && _editingIndex < includeDirList.Items.Count)

-            {

-                path = includeDirList.Items[_editingIndex].ToString();

-            }

-            

-            lock(this)

-            {

-                CancelButton = btnClose;

-                if(_txtIncludeDir == null || _btnSelectInclude == null)

-                {

-                    _initialized = true;

-                    return;

-                }

-                if(saveChanges)

-                {

-                    path = _txtIncludeDir.Text;

-                    if(path != null)

-                    {

-                        path = path.Trim();

-                    }

-                }

-                

-                this.groupBox1.Controls.Remove(_txtIncludeDir);

-                _txtIncludeDir = null;

-                

-                this.groupBox1.Controls.Remove(_btnSelectInclude);

-                _btnSelectInclude = null;

-            }

-

-            if(String.IsNullOrEmpty(path))

-            {

-                if(_editingIndex != -1)

-                {

-                    includeDirList.Items.RemoveAt(_editingIndex);

-                    includeDirList.SelectedIndex = includeDirList.Items.Count - 1;

-                    _editingIndex = -1;

-                    saveSliceIncludes();

-                }

-            }

-            else if(_editingIndex != -1 && saveChanges)

-            {

-                if(!path.Equals(includeDirList.Items[_editingIndex].ToString(),

-                                               StringComparison.CurrentCultureIgnoreCase))

-                {

-                    includeDirList.Items[_editingIndex] = path;

-                    if(Path.IsPathRooted(path))

-                    {

-                        includeDirList.SetItemCheckState(_editingIndex, CheckState.Checked);

-                    }

-                    else

-                    {

-                        includeDirList.SetItemCheckState(_editingIndex, CheckState.Unchecked);

-                    }

-                    saveSliceIncludes();

-                }

-            }

-            resetIncludeDirChecks();

-        }

-

-        private void includeDirKeyDown(object sender, KeyEventArgs e)

-        {

-            if(e.KeyCode.Equals(Keys.Escape))

-            {

-                endEditIncludeDir(false);

-            }

-            if(e.KeyCode.Equals(Keys.Enter))

-            {

-                endEditIncludeDir(true);

-            }

-        }

-

-        private void selectIncludeClicked(object sender, EventArgs e)

-        {

-            FolderBrowserDialog dialog = new FolderBrowserDialog();

-            string projectDir = Path.GetFullPath(Path.GetDirectoryName(_project.FileName));

-            dialog.SelectedPath = projectDir;

-            dialog.Description = "Slice Include Directory";

-            DialogResult result = dialog.ShowDialog();

-            if(result == DialogResult.OK)

-            {

-                string path = dialog.SelectedPath;

-                if(!Util.containsEnvironmentVars(path))

-                {

-                    path = Util.relativePath(projectDir, Path.GetFullPath(path));

-                }

-                _txtIncludeDir.Text = path;

-            }

-            endEditIncludeDir(true);

-        }

-

-        private int _editingIndex = -1;

-        private bool _editingIncludes;        

-        private bool _initialized;

-        private bool _changed;

-        private Project _project;

-        private bool _iceHomeUpdating;

-        private TextBox _txtIncludeDir;

-        private Button _btnSelectInclude;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Text;
+using System.Windows.Forms;
+
+using EnvDTE;
+
+namespace Ice.VisualStudio
+{
+    public partial class IceCppConfigurationDialog : Form
+    {
+        public IceCppConfigurationDialog(Project project)
+        {
+            InitializeComponent();
+            _project = project;
+            
+            //
+            // Set the toolTip messages.
+            //
+            toolTip.SetToolTip(txtIceHome, "Ice installation directory.");
+            toolTip.SetToolTip(btnSelectIceHome, "Ice installation directory.");
+            toolTip.SetToolTip(chkStreaming, "Generate marshalling support for stream API (--stream).");
+            toolTip.SetToolTip(chkChecksum, "Generate checksums for Slice definitions (--checksum).");
+            toolTip.SetToolTip(chkIcePrefix, "Permit Ice prefixes (--ice).");
+            toolTip.SetToolTip(chkConsole, "Enable console output.");
+
+            if(_project != null)
+            {
+                this.Text = "Ice Configuration - Project: " + _project.Name;
+                bool enabled = Util.isSliceBuilderEnabled(project);
+                setEnabled(enabled);
+                chkEnableBuilder.Checked = enabled;
+                load();
+                _initialized = true;
+            }
+        }
+        
+        private void load()
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_project != null)
+            {
+                includeDirList.Items.Clear();
+                txtIceHome.Text = Util.getIceHomeRaw(_project, false);
+                txtIceHome.Modified = false;
+                txtExtraOptions.Text = Util.getProjectProperty(_project, Util.PropertyIceExtraOptions);
+
+                chkIcePrefix.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIcePrefix);
+
+                chkStreaming.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIceStreaming);
+                chkChecksum.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIceChecksum);
+                chkConsole.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyConsoleOutput);
+
+                IncludePathList list =
+                    new IncludePathList(Util.getProjectProperty(_project, Util.PropertyIceIncludePath));
+                foreach(String s in list)
+                {
+                    includeDirList.Items.Add(s.Trim());
+                    if(Path.IsPathRooted(s.Trim()))
+                    {
+                        includeDirList.SetItemCheckState(includeDirList.Items.Count - 1, CheckState.Checked);
+                    }
+                }
+
+                ComponentList selectedComponents = Util.getIceCppComponents(_project);
+                foreach(String s in Util.getCppNames())
+                {
+                    if(selectedComponents.Contains(s))
+                    {
+                        checkComponent(s, true);
+                    }
+                    else
+                    {
+                        checkComponent(s, false);
+                    }
+                }
+                txtDllExportSymbol.Text = Util.getProjectProperty(_project, Util.PropertyIceDllExport);
+            }
+            Cursor = Cursors.Default;  
+        }
+
+        private void checkComponent(String component, bool check)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            switch (component)
+            {
+                case "Glacier2":
+                {
+                    chkGlacier2.Checked = check;
+                    break;
+                }
+                case "Ice":
+                {
+                    chkIce.Checked = check;
+                    break;
+                }
+                case "IceBox":
+                {
+                    chkIceBox.Checked = check;
+                    break;
+                }
+                case "IceGrid":
+                {
+                    chkIceGrid.Checked = check;
+                    break;
+                }
+                case "IcePatch2":
+                {
+                    chkIcePatch2.Checked = check;
+                    break;
+                }
+                case "IceSSL":
+                {
+                    chkIceSSL.Checked = check;
+                    break;
+                }
+                case "IceStorm":
+                {
+                    chkIceStorm.Checked = check;
+                    break;
+                }
+                case "Freeze":
+                {
+                    chkFreeze.Checked = check;
+                    break;
+                }
+                case "IceUtil":
+                {
+                    chkIceUtil.Checked = check;
+                    break;
+                }
+                default:
+                {
+                    break;
+                }
+            }
+        }
+        
+        private void chkEnableBuilder_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            if(_initialized)
+            {
+                _initialized = false;
+                setEnabled(false);
+                chkEnableBuilder.Enabled = false;
+                Builder builder = Connect.getBuilder();
+                if(chkEnableBuilder.Checked)
+                {
+                    builder.addBuilderToProject(_project);
+                }
+                else
+                {
+                    builder.removeBuilderFromProject(_project);
+                }
+                load();
+                setEnabled(chkEnableBuilder.Checked);
+                chkEnableBuilder.Enabled = true;
+                _initialized = true;
+            }
+            Cursor = Cursors.Default;
+        }
+        
+        private void setEnabled(bool enabled)
+        {
+            txtIceHome.Enabled = enabled;
+            btnSelectIceHome.Enabled = enabled;
+
+            chkIcePrefix.Enabled = enabled;
+            
+            chkStreaming.Enabled = enabled;
+            chkChecksum.Enabled = enabled;
+            chkConsole.Enabled = enabled;
+            includeDirList.Enabled = enabled;
+            btnAddInclude.Enabled = enabled;
+            btnEditInclude.Enabled = enabled;
+            btnRemoveInclude.Enabled = enabled;
+            btnMoveIncludeUp.Enabled = enabled;
+            btnMoveIncludeDown.Enabled = enabled;
+
+            txtExtraOptions.Enabled = enabled;
+
+            chkFreeze.Enabled = enabled;
+            chkGlacier2.Enabled = enabled;
+            chkIce.Enabled = enabled;
+            chkIceBox.Enabled = enabled;
+            chkIceGrid.Enabled = enabled;
+            chkIcePatch2.Enabled = enabled;
+            chkIceSSL.Enabled = enabled;
+            chkIceStorm.Enabled = enabled;
+            chkIceUtil.Enabled = enabled;
+            txtDllExportSymbol.Enabled = enabled;
+        }
+
+        private void formClosing(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            if(!_changed)
+            {
+                if(txtDllExportSymbol.Modified)
+                {
+                    _changed = true;
+                }
+                else if(txtExtraOptions.Modified)
+                {
+                    _changed = true;
+                }
+                else if(txtIceHome.Modified)
+                {
+                    _changed = true;
+                }
+            }
+
+            if(_changed && Util.isSliceBuilderEnabled(_project))
+            {
+                Builder builder = Connect.getBuilder();
+                builder.cleanProject(_project);
+                builder.buildProject(_project, true, vsBuildScope.vsBuildScopeProject);
+            }
+            Cursor = Cursors.Default;
+        }
+
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            Close();
+        }
+
+        private void btnSelectIceHome_Click(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            FolderBrowserDialog dialog = new FolderBrowserDialog();
+            dialog.SelectedPath = Util.getAbsoluteIceHome(_project);
+            dialog.Description = "Select Ice Home Installation Directory";
+            DialogResult result = dialog.ShowDialog();
+            if(result == DialogResult.OK)
+            {
+                Util.updateIceHome(_project, dialog.SelectedPath, false);
+                load();
+                _changed = true;
+            }
+        }
+
+        private void txtIceHome_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if(e.KeyChar == (char)Keys.Return)
+            {
+                updateIceHome();
+                e.Handled = true;
+            }
+        }
+        
+        private void txtIceHome_Focus(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+        }
+        
+        private void txtIceHome_LostFocus(object sender, EventArgs e)
+        {
+            updateIceHome();
+        }
+        
+        private void updateIceHome()
+        {
+            if(!_iceHomeUpdating)
+            {
+                _iceHomeUpdating = true;
+                if(!txtIceHome.Text.Equals(Util.getProjectProperty(_project, Util.PropertyIceHome),
+                                           StringComparison.CurrentCultureIgnoreCase))
+                {
+                    Util.updateIceHome(_project, txtIceHome.Text, false);
+                    load();
+                    _changed = true;
+                    txtIceHome.Modified = false;
+                }
+                _iceHomeUpdating = false;
+            }
+        }
+
+        private void chkIcePrefix_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+
+            Util.setProjectProperty(_project, Util.PropertyIcePrefix, chkIcePrefix.Checked.ToString());
+            _changed = true;
+            Cursor = Cursors.Default;
+        }
+        
+        private void chkStreaming_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            Util.setProjectProperty(_project, Util.PropertyIceStreaming, chkStreaming.Checked.ToString());
+            _changed = true;
+            Cursor = Cursors.Default;
+        }
+        
+        private void chkChecksum_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            Util.setProjectProperty(_project, Util.PropertyIceChecksum, chkChecksum.Checked.ToString());
+            _changed = true;
+            Cursor = Cursors.Default;
+        }
+
+        private void saveSliceIncludes()
+        {
+            IncludePathList paths = new IncludePathList();
+            foreach(String s in includeDirList.Items)
+            {
+                paths.Add(s.Trim());
+            }
+            String p = paths.ToString();
+            Util.setProjectProperty(_project, Util.PropertyIceIncludePath, p);
+            _changed = true;
+        }
+
+        private void btnAddInclude_Click(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            includeDirList.Items.Add("");
+            includeDirList.SelectedIndex = includeDirList.Items.Count - 1;
+            _editingIndex = includeDirList.SelectedIndex;
+            beginEditIncludeDir();
+        }
+
+        private void btnRemoveInclude_Click(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            int index = includeDirList.SelectedIndex;
+            if(_editingIncludes)
+            {
+                index = _editingIndex;
+                endEditIncludeDir(false);
+            }
+            if(index > -1 && index < includeDirList.Items.Count)
+            {
+                int selected = index;
+                includeDirList.Items.RemoveAt(selected);
+                if(includeDirList.Items.Count > 0)
+                {
+                    if(selected > 0)
+                    {
+                        selected -= 1;
+                    }
+                    includeDirList.SelectedIndex = selected;
+                }
+                saveSliceIncludes();
+            }
+            Cursor = Cursors.Default;
+        }
+
+        private void btnMoveIncludeUp_Click(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            int index = includeDirList.SelectedIndex;
+            if(index > 0)
+            {
+                string current = includeDirList.SelectedItem.ToString();
+                includeDirList.Items.RemoveAt(index);
+                includeDirList.Items.Insert(index - 1, current);
+                includeDirList.SelectedIndex = index - 1;
+                saveSliceIncludes();
+            }
+            resetIncludeDirChecks();
+            Cursor = Cursors.Default;
+        }
+
+        private void btnMoveIncludeDown_Click(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            int index = includeDirList.SelectedIndex;
+            if(index < includeDirList.Items.Count - 1 && index > -1)
+            {
+                string current = includeDirList.SelectedItem.ToString();
+                includeDirList.Items.RemoveAt(index);
+                includeDirList.Items.Insert(index + 1, current);
+                includeDirList.SelectedIndex = index + 1;
+                saveSliceIncludes();
+                resetIncludeDirChecks();
+            }
+            Cursor = Cursors.Default;
+        }
+
+        private void resetIncludeDirChecks()
+        {
+            _initialized = false;
+            for(int i = 0; i < includeDirList.Items.Count; i++)
+            {
+                String path = includeDirList.Items[i].ToString();
+                if(String.IsNullOrEmpty(path))
+                {
+                    continue;
+                }
+
+                if(Path.IsPathRooted(path))
+                {
+                    includeDirList.SetItemCheckState(i, CheckState.Checked);
+                }
+                else
+                {
+                    includeDirList.SetItemCheckState(i, CheckState.Unchecked);
+                }
+            }
+            _initialized = true;
+        }
+
+        private void includeDirList_ItemCheck(object sender, ItemCheckEventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                return;
+            }
+            string path = includeDirList.Items[e.Index].ToString();
+            if(!Util.containsEnvironmentVars(path))
+            {
+                if(e.NewValue == CheckState.Unchecked)
+                {
+                   path = Util.relativePath(Path.GetDirectoryName(_project.FileName), path);
+                }
+                else if(e.NewValue == CheckState.Checked)
+                {
+                   if(!Path.IsPathRooted(path))
+                   {
+                       path = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(_project.FileName), path));
+                   }
+                }
+            }
+            includeDirList.Items[e.Index] = path;
+            if(_initialized)
+            {
+                saveSliceIncludes();
+            }
+        }
+
+        private void txtExtraOptions_Focus(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+        }
+        
+        private void txtExtraOptions_LostFocus(object sender, EventArgs e)
+        {
+            if(txtExtraOptions.Modified)
+            {
+                Util.setProjectProperty(_project, Util.PropertyIceExtraOptions, txtExtraOptions.Text);
+                _changed = true;
+            }
+        }
+
+        private void chkGlacier2_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("Glacier2", chkGlacier2.Checked);
+        }
+
+        private void chkIce_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("Ice", chkIce.Checked);
+        }
+
+        private void chkIceBox_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IceBox", chkIceBox.Checked);
+        }
+
+        private void chkIceGrid_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IceGrid", chkIceGrid.Checked);
+        }
+
+        private void chkIcePatch2_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IcePatch2", chkIcePatch2.Checked);
+        }
+
+        private void chkIceSSL_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IceSSL", chkIceSSL.Checked);
+        }
+
+        private void chkIceStorm_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IceStorm", chkIceStorm.Checked);
+        }
+
+        private void chkIceUtil_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IceUtil", chkIceUtil.Checked);
+        }
+
+        private void chkFreeze_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("Freeze", chkFreeze.Checked);
+        }
+
+        private void componentChanged(String name, bool isChecked)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            if(_initialized)
+            {
+                if(isChecked)
+                {
+                    Util.addIceCppLibs(_project, new ComponentList(name));
+                }
+                else
+                {
+                    Util.removeIceCppLibs(_project, new ComponentList(name));
+                }
+                _changed = true;
+            }
+            Cursor = Cursors.Default;
+        }
+
+        private void chkConsole_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            Util.setProjectProperty(_project, Util.PropertyConsoleOutput, chkConsole.Checked.ToString());
+            Cursor = Cursors.Default;
+        }
+
+        private void txtDllExportSymbol_Focus(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+        }
+        
+        private void txtDllExportSymbol_LostFocus(object sender, EventArgs e)
+        {
+            if(txtDllExportSymbol.Modified)
+            {
+                Util.setProjectProperty(_project, Util.PropertyIceDllExport, txtDllExportSymbol.Text);
+                _changed = true;
+            }
+        }
+
+        private void btnEdit_Click(object sender, EventArgs e)
+        {
+            if(includeDirList.SelectedIndex != -1)
+            {
+                _editingIndex = includeDirList.SelectedIndex;
+                beginEditIncludeDir();
+            }
+        }
+
+        private void includeDirList_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+        }
+        
+        private void beginEditIncludeDir()
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            _editingIncludes = true;
+            CancelButton = null;
+            if(_editingIndex != -1)
+            {
+                _txtIncludeDir = new TextBox();
+                _txtIncludeDir.Text = includeDirList.Items[includeDirList.SelectedIndex].ToString();
+
+                includeDirList.SelectionMode = SelectionMode.One;
+
+                Rectangle rect = includeDirList.GetItemRectangle(includeDirList.SelectedIndex);
+                _txtIncludeDir.Location = new Point(includeDirList.Location.X + 2, 
+                                                    includeDirList.Location.Y + rect.Y);
+                _txtIncludeDir.Width = includeDirList.Width - 50;
+                _txtIncludeDir.Parent = includeDirList;
+                _txtIncludeDir.KeyDown += new KeyEventHandler(includeDirKeyDown);
+                groupBox1.Controls.Add(_txtIncludeDir);
+                
+                _btnSelectInclude = new Button();
+                _btnSelectInclude.Text = "...";
+                _btnSelectInclude.Location = new Point(includeDirList.Location.X + _txtIncludeDir.Width,
+                                                       includeDirList.Location.Y + rect.Y);
+                _btnSelectInclude.Width = 49;
+                _btnSelectInclude.Height = _txtIncludeDir.Height;
+                _btnSelectInclude.Click += new EventHandler(selectIncludeClicked);
+                groupBox1.Controls.Add(_btnSelectInclude);
+                
+                
+                _txtIncludeDir.Show();
+                _txtIncludeDir.BringToFront();
+                _txtIncludeDir.Focus();
+
+                _btnSelectInclude.Show();
+                _btnSelectInclude.BringToFront();
+            }
+        }
+        
+        private void endEditIncludeDir(bool saveChanges)
+        {
+            _initialized = false;
+            if(!_editingIncludes)
+            {
+                _initialized = true;
+                return;
+            }
+            _editingIncludes = false;
+            String path = null;
+            if(_editingIndex > -1 && _editingIndex < includeDirList.Items.Count)
+            {
+                path = includeDirList.Items[_editingIndex].ToString();
+            }
+            
+            lock(this)
+            {
+                CancelButton = btnClose;
+                if(_txtIncludeDir == null || _btnSelectInclude == null)
+                {
+                    _initialized = true;
+                    return;
+                }
+                if(saveChanges)
+                {
+                    path = _txtIncludeDir.Text;
+                    if(path != null)
+                    {
+                        path = path.Trim();
+                    }
+                }
+                
+                this.groupBox1.Controls.Remove(_txtIncludeDir);
+                _txtIncludeDir = null;
+                
+                this.groupBox1.Controls.Remove(_btnSelectInclude);
+                _btnSelectInclude = null;
+            }
+
+            if(String.IsNullOrEmpty(path))
+            {
+                if(_editingIndex != -1)
+                {
+                    includeDirList.Items.RemoveAt(_editingIndex);
+                    includeDirList.SelectedIndex = includeDirList.Items.Count - 1;
+                    _editingIndex = -1;
+                    saveSliceIncludes();
+                }
+            }
+            else if(_editingIndex != -1 && saveChanges)
+            {
+                if(!path.Equals(includeDirList.Items[_editingIndex].ToString(),
+                                               StringComparison.CurrentCultureIgnoreCase))
+                {
+                    includeDirList.Items[_editingIndex] = path;
+                    if(Path.IsPathRooted(path))
+                    {
+                        includeDirList.SetItemCheckState(_editingIndex, CheckState.Checked);
+                    }
+                    else
+                    {
+                        includeDirList.SetItemCheckState(_editingIndex, CheckState.Unchecked);
+                    }
+                    saveSliceIncludes();
+                }
+            }
+            resetIncludeDirChecks();
+        }
+
+        private void includeDirKeyDown(object sender, KeyEventArgs e)
+        {
+            if(e.KeyCode.Equals(Keys.Escape))
+            {
+                endEditIncludeDir(false);
+            }
+            if(e.KeyCode.Equals(Keys.Enter))
+            {
+                endEditIncludeDir(true);
+            }
+        }
+
+        private void selectIncludeClicked(object sender, EventArgs e)
+        {
+            FolderBrowserDialog dialog = new FolderBrowserDialog();
+            string projectDir = Path.GetFullPath(Path.GetDirectoryName(_project.FileName));
+            dialog.SelectedPath = projectDir;
+            dialog.Description = "Slice Include Directory";
+            DialogResult result = dialog.ShowDialog();
+            if(result == DialogResult.OK)
+            {
+                string path = dialog.SelectedPath;
+                if(!Util.containsEnvironmentVars(path))
+                {
+                    path = Util.relativePath(projectDir, Path.GetFullPath(path));
+                }
+                _txtIncludeDir.Text = path;
+            }
+            endEditIncludeDir(true);
+        }
+
+        private int _editingIndex = -1;
+        private bool _editingIncludes;        
+        private bool _initialized;
+        private bool _changed;
+        private Project _project;
+        private bool _iceHomeUpdating;
+        private TextBox _txtIncludeDir;
+        private Button _btnSelectInclude;
+    }
+}
diff --git a/vsplugin/src/IceCppConfigurationDialog.resx b/vsplugin/src/IceCppConfigurationDialog.resx
index a5979aadfff..a499e2cedc5 100644
--- a/vsplugin/src/IceCppConfigurationDialog.resx
+++ b/vsplugin/src/IceCppConfigurationDialog.resx
@@ -120,4 +120,4 @@
   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>17, 17</value>

   </metadata>

-</root>
\ No newline at end of file
+</root>

diff --git a/vsplugin/src/IceCsharpConfigurationDialog.Designer.cs b/vsplugin/src/IceCsharpConfigurationDialog.Designer.cs
index d52230d9162..878da281365 100644
--- a/vsplugin/src/IceCsharpConfigurationDialog.Designer.cs
+++ b/vsplugin/src/IceCsharpConfigurationDialog.Designer.cs
@@ -1,473 +1,473 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-namespace Ice.VisualStudio

-{

-    partial class IceCsharpConfigurationDialog

-    {

-        /// <summary>

-        /// Required designer variable.

-        /// </summary>

-        private System.ComponentModel.IContainer components = null;

-

-        /// <summary>

-        /// Clean up any resources being used.

-        /// </summary>

-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>

-        protected override void Dispose(bool disposing)

-        {

-            if (disposing && (components != null))

-            {

-                components.Dispose();

-            }

-            base.Dispose(disposing);

-        }

-

-        #region Windows Form Designer generated code

-

-        /// <summary>

-        /// Required method for Designer support - do not modify

-        /// the contents of this method with the code editor.

-        /// </summary>

-        private void InitializeComponent()

-        {

-            this.components = new System.ComponentModel.Container();

-            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();

-            this.groupBox1 = new System.Windows.Forms.GroupBox();

-            this.btnEditInclude = new System.Windows.Forms.Button();

-            this.includeInfo = new System.Windows.Forms.Label();

-            this.btnMoveIncludeDown = new System.Windows.Forms.Button();

-            this.btnMoveIncludeUp = new System.Windows.Forms.Button();

-            this.btnRemoveInclude = new System.Windows.Forms.Button();

-            this.btnAddInclude = new System.Windows.Forms.Button();

-            this.includeDirList = new System.Windows.Forms.CheckedListBox();

-            this.groupBox2 = new System.Windows.Forms.GroupBox();

-            this.txtExtraOptions = new System.Windows.Forms.TextBox();

-            this.groupBox3 = new System.Windows.Forms.GroupBox();

-            this.chkIceStorm = new System.Windows.Forms.CheckBox();

-            this.chkIceSSL = new System.Windows.Forms.CheckBox();

-            this.chkIcePatch2 = new System.Windows.Forms.CheckBox();

-            this.chkIceGrid = new System.Windows.Forms.CheckBox();

-            this.chkIceBox = new System.Windows.Forms.CheckBox();

-            this.chkGlacier2 = new System.Windows.Forms.CheckBox();

-            this.chkIce = new System.Windows.Forms.CheckBox();

-            this.groupBox4 = new System.Windows.Forms.GroupBox();

-            this.chkChecksum = new System.Windows.Forms.CheckBox();

-            this.chkConsole = new System.Windows.Forms.CheckBox();

-            this.chkIcePrefix = new System.Windows.Forms.CheckBox();

-            this.chkStreaming = new System.Windows.Forms.CheckBox();

-            this.chkTie = new System.Windows.Forms.CheckBox();

-            this.btnClose = new System.Windows.Forms.Button();

-            this.groupBox5 = new System.Windows.Forms.GroupBox();

-            this.btnSelectIceHome = new System.Windows.Forms.Button();

-            this.txtIceHome = new System.Windows.Forms.TextBox();

-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);

-            this.groupBox1.SuspendLayout();

-            this.groupBox2.SuspendLayout();

-            this.groupBox3.SuspendLayout();

-            this.groupBox4.SuspendLayout();

-            this.groupBox5.SuspendLayout();

-            this.SuspendLayout();

-            // 

-            // chkEnableBuilder

-            // 

-            this.chkEnableBuilder.AutoSize = true;

-            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);

-            this.chkEnableBuilder.Name = "chkEnableBuilder";

-            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);

-            this.chkEnableBuilder.TabIndex = 0;

-            this.chkEnableBuilder.Text = "Enable Ice Builder";

-            this.chkEnableBuilder.UseVisualStyleBackColor = true;

-            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);

-            // 

-            // groupBox1

-            // 

-            this.groupBox1.Controls.Add(this.btnEditInclude);

-            this.groupBox1.Controls.Add(this.includeInfo);

-            this.groupBox1.Controls.Add(this.btnMoveIncludeDown);

-            this.groupBox1.Controls.Add(this.btnMoveIncludeUp);

-            this.groupBox1.Controls.Add(this.btnRemoveInclude);

-            this.groupBox1.Controls.Add(this.btnAddInclude);

-            this.groupBox1.Controls.Add(this.includeDirList);

-            this.groupBox1.Location = new System.Drawing.Point(12, 209);

-            this.groupBox1.Name = "groupBox1";

-            this.groupBox1.Size = new System.Drawing.Size(487, 169);

-            this.groupBox1.TabIndex = 1;

-            this.groupBox1.TabStop = false;

-            this.groupBox1.Text = "Slice Include Path";

-            // 

-            // btnEditInclude

-            // 

-            this.btnEditInclude.Location = new System.Drawing.Point(406, 46);

-            this.btnEditInclude.Name = "btnEditInclude";

-            this.btnEditInclude.Size = new System.Drawing.Size(75, 23);

-            this.btnEditInclude.TabIndex = 13;

-            this.btnEditInclude.Text = "Edit";

-            this.btnEditInclude.UseVisualStyleBackColor = true;

-            this.btnEditInclude.Click += new System.EventHandler(this.btnEdit_Click);

-            // 

-            // includeInfo

-            // 

-            this.includeInfo.AutoSize = true;

-            this.includeInfo.Location = new System.Drawing.Point(3, 149);

-            this.includeInfo.Name = "includeInfo";

-            this.includeInfo.Size = new System.Drawing.Size(315, 13);

-            this.includeInfo.TabIndex = 12;

-            this.includeInfo.Text = "Select checkboxes for absolute paths, deselect for relative paths.";

-            // 

-            // btnMoveIncludeDown

-            // 

-            this.btnMoveIncludeDown.Location = new System.Drawing.Point(405, 127);

-            this.btnMoveIncludeDown.Name = "btnMoveIncludeDown";

-            this.btnMoveIncludeDown.Size = new System.Drawing.Size(75, 23);

-            this.btnMoveIncludeDown.TabIndex = 11;

-            this.btnMoveIncludeDown.Text = "Down";

-            this.btnMoveIncludeDown.UseVisualStyleBackColor = true;

-            this.btnMoveIncludeDown.Click += new System.EventHandler(this.btnMoveIncludeDown_Click);

-            // 

-            // btnMoveIncludeUp

-            // 

-            this.btnMoveIncludeUp.Location = new System.Drawing.Point(405, 100);

-            this.btnMoveIncludeUp.Name = "btnMoveIncludeUp";

-            this.btnMoveIncludeUp.Size = new System.Drawing.Size(75, 23);

-            this.btnMoveIncludeUp.TabIndex = 10;

-            this.btnMoveIncludeUp.Text = "Up";

-            this.btnMoveIncludeUp.UseVisualStyleBackColor = true;

-            this.btnMoveIncludeUp.Click += new System.EventHandler(this.btnMoveIncludeUp_Click);

-            // 

-            // btnRemoveInclude

-            // 

-            this.btnRemoveInclude.Location = new System.Drawing.Point(405, 73);

-            this.btnRemoveInclude.Name = "btnRemoveInclude";

-            this.btnRemoveInclude.Size = new System.Drawing.Size(75, 23);

-            this.btnRemoveInclude.TabIndex = 9;

-            this.btnRemoveInclude.Text = "Remove";

-            this.btnRemoveInclude.UseVisualStyleBackColor = true;

-            this.btnRemoveInclude.Click += new System.EventHandler(this.btnRemoveInclude_Click);

-            // 

-            // btnAddInclude

-            // 

-            this.btnAddInclude.Location = new System.Drawing.Point(405, 19);

-            this.btnAddInclude.Name = "btnAddInclude";

-            this.btnAddInclude.Size = new System.Drawing.Size(75, 23);

-            this.btnAddInclude.TabIndex = 8;

-            this.btnAddInclude.Text = "Add";

-            this.btnAddInclude.UseVisualStyleBackColor = true;

-            this.btnAddInclude.Click += new System.EventHandler(this.btnAddInclude_Click);

-            // 

-            // includeDirList

-            // 

-            this.includeDirList.FormattingEnabled = true;

-            this.includeDirList.Location = new System.Drawing.Point(6, 22);

-            this.includeDirList.Name = "includeDirList";

-            this.includeDirList.Size = new System.Drawing.Size(390, 124);

-            this.includeDirList.TabIndex = 7;

-            this.includeDirList.SelectedIndexChanged += new System.EventHandler(this.includeDirList_SelectedIndexChanged);

-            this.includeDirList.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.includeDirList_ItemCheck);

-            // 

-            // groupBox2

-            // 

-            this.groupBox2.Controls.Add(this.txtExtraOptions);

-            this.groupBox2.Location = new System.Drawing.Point(12, 138);

-            this.groupBox2.Name = "groupBox2";

-            this.groupBox2.Size = new System.Drawing.Size(487, 65);

-            this.groupBox2.TabIndex = 2;

-            this.groupBox2.TabStop = false;

-            this.groupBox2.Text = "Extra Compiler Options";

-            // 

-            // txtExtraOptions

-            // 

-            this.txtExtraOptions.Location = new System.Drawing.Point(6, 19);

-            this.txtExtraOptions.Multiline = true;

-            this.txtExtraOptions.Name = "txtExtraOptions";

-            this.txtExtraOptions.Size = new System.Drawing.Size(474, 40);

-            this.txtExtraOptions.TabIndex = 6;

-            this.txtExtraOptions.LostFocus += new System.EventHandler(this.txtExtraOptions_LostFocus);

-            this.txtExtraOptions.Enter += new System.EventHandler(this.txtExtraOptions_Focus);

-            

-            // 

-            // groupBox3

-            // 

-            this.groupBox3.Controls.Add(this.chkIceStorm);

-            this.groupBox3.Controls.Add(this.chkIceSSL);

-            this.groupBox3.Controls.Add(this.chkIcePatch2);

-            this.groupBox3.Controls.Add(this.chkIceGrid);

-            this.groupBox3.Controls.Add(this.chkIceBox);

-            this.groupBox3.Controls.Add(this.chkGlacier2);

-            this.groupBox3.Controls.Add(this.chkIce);

-            this.groupBox3.Location = new System.Drawing.Point(12, 384);

-            this.groupBox3.Name = "groupBox3";

-            this.groupBox3.Size = new System.Drawing.Size(487, 47);

-            this.groupBox3.TabIndex = 3;

-            this.groupBox3.TabStop = false;

-            this.groupBox3.Text = "Ice Components";

-            // 

-            // chkIceStorm

-            // 

-            this.chkIceStorm.AutoSize = true;

-            this.chkIceStorm.Location = new System.Drawing.Point(404, 19);

-            this.chkIceStorm.Name = "chkIceStorm";

-            this.chkIceStorm.Size = new System.Drawing.Size(68, 17);

-            this.chkIceStorm.TabIndex = 6;

-            this.chkIceStorm.TabStop = false;

-            this.chkIceStorm.Text = "IceStorm";

-            this.chkIceStorm.UseVisualStyleBackColor = true;

-            this.chkIceStorm.CheckedChanged += new System.EventHandler(this.chkIceStorm_CheckedChanged);

-            // 

-            // chkIceSSL

-            // 

-            this.chkIceSSL.AutoSize = true;

-            this.chkIceSSL.Location = new System.Drawing.Point(337, 19);

-            this.chkIceSSL.Name = "chkIceSSL";

-            this.chkIceSSL.Size = new System.Drawing.Size(61, 17);

-            this.chkIceSSL.TabIndex = 5;

-            this.chkIceSSL.TabStop = false;

-            this.chkIceSSL.Text = "IceSSL";

-            this.chkIceSSL.UseVisualStyleBackColor = true;

-            this.chkIceSSL.CheckedChanged += new System.EventHandler(this.chkIceSSL_CheckedChanged);

-            // 

-            // chkIcePatch2

-            // 

-            this.chkIcePatch2.AutoSize = true;

-            this.chkIcePatch2.Location = new System.Drawing.Point(256, 19);

-            this.chkIcePatch2.Name = "chkIcePatch2";

-            this.chkIcePatch2.Size = new System.Drawing.Size(75, 17);

-            this.chkIcePatch2.TabIndex = 4;

-            this.chkIcePatch2.TabStop = false;

-            this.chkIcePatch2.Text = "IcePatch2";

-            this.chkIcePatch2.UseVisualStyleBackColor = true;

-            this.chkIcePatch2.CheckedChanged += new System.EventHandler(this.chkIcePatch2_CheckedChanged);

-            // 

-            // chkIceGrid

-            // 

-            this.chkIceGrid.AutoSize = true;

-            this.chkIceGrid.Location = new System.Drawing.Point(190, 19);

-            this.chkIceGrid.Name = "chkIceGrid";

-            this.chkIceGrid.Size = new System.Drawing.Size(60, 17);

-            this.chkIceGrid.TabIndex = 3;

-            this.chkIceGrid.TabStop = false;

-            this.chkIceGrid.Text = "IceGrid";

-            this.chkIceGrid.UseVisualStyleBackColor = true;

-            this.chkIceGrid.CheckedChanged += new System.EventHandler(this.chkIceGrid_CheckedChanged);

-            // 

-            // chkIceBox

-            // 

-            this.chkIceBox.AutoSize = true;

-            this.chkIceBox.Location = new System.Drawing.Point(125, 19);

-            this.chkIceBox.Name = "chkIceBox";

-            this.chkIceBox.Size = new System.Drawing.Size(59, 17);

-            this.chkIceBox.TabIndex = 2;

-            this.chkIceBox.TabStop = false;

-            this.chkIceBox.Text = "IceBox";

-            this.chkIceBox.UseVisualStyleBackColor = true;

-            this.chkIceBox.CheckedChanged += new System.EventHandler(this.chkIceBox_CheckedChanged);

-            // 

-            // chkGlacier2

-            // 

-            this.chkGlacier2.AutoSize = true;

-            this.chkGlacier2.Location = new System.Drawing.Point(7, 19);

-            this.chkGlacier2.Name = "chkGlacier2";

-            this.chkGlacier2.Size = new System.Drawing.Size(65, 17);

-            this.chkGlacier2.TabIndex = 0;

-            this.chkGlacier2.TabStop = false;

-            this.chkGlacier2.Text = "Glacier2";

-            this.chkGlacier2.UseVisualStyleBackColor = true;

-            this.chkGlacier2.CheckedChanged += new System.EventHandler(this.chkGlacier2_CheckedChanged);

-            // 

-            // chkIce

-            // 

-            this.chkIce.AutoSize = true;

-            this.chkIce.Location = new System.Drawing.Point(78, 19);

-            this.chkIce.Name = "chkIce";

-            this.chkIce.Size = new System.Drawing.Size(41, 17);

-            this.chkIce.TabIndex = 1;

-            this.chkIce.TabStop = false;

-            this.chkIce.Text = "Ice";

-            this.chkIce.UseVisualStyleBackColor = true;

-            this.chkIce.CheckedChanged += new System.EventHandler(this.chkIce_CheckedChanged);

-            // 

-            // groupBox4

-            // 

-            this.groupBox4.Controls.Add(this.chkChecksum);

-            this.groupBox4.Controls.Add(this.chkConsole);

-            this.groupBox4.Controls.Add(this.chkIcePrefix);

-            this.groupBox4.Controls.Add(this.chkStreaming);

-            this.groupBox4.Controls.Add(this.chkTie);

-            this.groupBox4.Location = new System.Drawing.Point(12, 88);

-            this.groupBox4.Name = "groupBox4";

-            this.groupBox4.Size = new System.Drawing.Size(487, 44);

-            this.groupBox4.TabIndex = 4;

-            this.groupBox4.TabStop = false;

-            this.groupBox4.Text = "Slice Compiler Options";

-            // 

-            // chkChecksum

-            // 

-            this.chkChecksum.AutoSize = true;

-            this.chkChecksum.Location = new System.Drawing.Point(213, 19);

-            this.chkChecksum.Name = "chkChecksum";

-            this.chkChecksum.Size = new System.Drawing.Size(76, 17);

-            this.chkChecksum.TabIndex = 5;

-            this.chkChecksum.Text = "Checksum";

-            this.chkChecksum.UseVisualStyleBackColor = true;

-            this.chkChecksum.CheckedChanged += new System.EventHandler(this.chkChecksum_CheckedChanged);

-            // 

-            // chkConsole

-            // 

-            this.chkConsole.AutoSize = true;

-            this.chkConsole.Location = new System.Drawing.Point(299, 19);

-            this.chkConsole.Name = "chkConsole";

-            this.chkConsole.Size = new System.Drawing.Size(99, 17);

-            this.chkConsole.TabIndex = 4;

-            this.chkConsole.Text = "Console Output";

-            this.chkConsole.UseVisualStyleBackColor = true;

-            this.chkConsole.CheckedChanged += new System.EventHandler(this.chkConsole_CheckedChanged);

-            // 

-            // chkIcePrefix

-            // 

-            this.chkIcePrefix.AutoSize = true;

-            this.chkIcePrefix.Location = new System.Drawing.Point(10, 19);

-            this.chkIcePrefix.Name = "chkIcePrefix";

-            this.chkIcePrefix.Size = new System.Drawing.Size(41, 17);

-            this.chkIcePrefix.TabIndex = 2;

-            this.chkIcePrefix.Text = "Ice";

-            this.chkIcePrefix.UseVisualStyleBackColor = true;

-            this.chkIcePrefix.CheckedChanged += new System.EventHandler(this.chkIcePrefix_CheckedChanged);

-            // 

-            // chkStreaming

-            // 

-            this.chkStreaming.AutoSize = true;

-            this.chkStreaming.Location = new System.Drawing.Point(125, 19);

-            this.chkStreaming.Name = "chkStreaming";

-            this.chkStreaming.Size = new System.Drawing.Size(73, 17);

-            this.chkStreaming.TabIndex = 1;

-            this.chkStreaming.Text = "Streaming";

-            this.chkStreaming.UseVisualStyleBackColor = true;

-            this.chkStreaming.CheckedChanged += new System.EventHandler(this.chkStreaming_CheckedChanged);

-            // 

-            // chkTie

-            // 

-            this.chkTie.AutoSize = true;

-            this.chkTie.Location = new System.Drawing.Point(71, 19);

-            this.chkTie.Name = "chkTie";

-            this.chkTie.Size = new System.Drawing.Size(41, 17);

-            this.chkTie.TabIndex = 0;

-            this.chkTie.Text = "Tie";

-            this.chkTie.UseVisualStyleBackColor = true;

-            this.chkTie.CheckedChanged += new System.EventHandler(this.chkTie_CheckedChanged);

-            // 

-            // btnClose

-            // 

-            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;

-            this.btnClose.Location = new System.Drawing.Point(424, 437);

-            this.btnClose.Name = "btnClose";

-            this.btnClose.Size = new System.Drawing.Size(75, 23);

-            this.btnClose.TabIndex = 5;

-            this.btnClose.Text = "Close";

-            this.btnClose.UseVisualStyleBackColor = true;

-            this.btnClose.Click += new System.EventHandler(this.btnCancel_Click);

-            // 

-            // groupBox5

-            // 

-            this.groupBox5.Controls.Add(this.btnSelectIceHome);

-            this.groupBox5.Controls.Add(this.txtIceHome);

-            this.groupBox5.Location = new System.Drawing.Point(12, 37);

-            this.groupBox5.Name = "groupBox5";

-            this.groupBox5.Size = new System.Drawing.Size(486, 45);

-            this.groupBox5.TabIndex = 6;

-            this.groupBox5.TabStop = false;

-            this.groupBox5.Text = "Ice Home";

-            // 

-            // btnSelectIceHome

-            // 

-            this.btnSelectIceHome.Location = new System.Drawing.Point(405, 16);

-            this.btnSelectIceHome.Name = "btnSelectIceHome";

-            this.btnSelectIceHome.Size = new System.Drawing.Size(75, 23);

-            this.btnSelectIceHome.TabIndex = 1;

-            this.btnSelectIceHome.Text = "....";

-            this.btnSelectIceHome.UseVisualStyleBackColor = true;

-            this.btnSelectIceHome.Click += new System.EventHandler(this.btnSelectIceHome_Click);

-            // 

-            // txtIceHome

-            // 

-            this.txtIceHome.Location = new System.Drawing.Point(10, 20);

-            this.txtIceHome.Name = "txtIceHome";

-            this.txtIceHome.Size = new System.Drawing.Size(386, 20);

-            this.txtIceHome.TabIndex = 0;

-            this.txtIceHome.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtIceHome_KeyPress);

-            this.txtIceHome.LostFocus += new System.EventHandler(this.txtIceHome_LostFocus);

-            this.txtIceHome.Enter += new System.EventHandler(this.txtIceHome_Focus);

-            // 

-            // IceCsharpConfigurationDialog

-            // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.CancelButton = this.btnClose;

-            this.ClientSize = new System.Drawing.Size(512, 469);

-            this.Controls.Add(this.groupBox5);

-            this.Controls.Add(this.btnClose);

-            this.Controls.Add(this.groupBox4);

-            this.Controls.Add(this.groupBox3);

-            this.Controls.Add(this.groupBox2);

-            this.Controls.Add(this.groupBox1);

-            this.Controls.Add(this.chkEnableBuilder);

-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;

-            this.MaximizeBox = false;

-            this.Name = "IceCsharpConfigurationDialog";

-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

-            this.Text = "Ice Configuration";

-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing);

-            this.groupBox1.ResumeLayout(false);

-            this.groupBox1.PerformLayout();

-            this.groupBox2.ResumeLayout(false);

-            this.groupBox2.PerformLayout();

-            this.groupBox3.ResumeLayout(false);

-            this.groupBox3.PerformLayout();

-            this.groupBox4.ResumeLayout(false);

-            this.groupBox4.PerformLayout();

-            this.groupBox5.ResumeLayout(false);

-            this.groupBox5.PerformLayout();

-            this.ResumeLayout(false);

-            this.PerformLayout();

-

-        }

-

-        #endregion

-

-        private System.Windows.Forms.CheckBox chkEnableBuilder;

-        private System.Windows.Forms.GroupBox groupBox1;

-        private System.Windows.Forms.Button btnMoveIncludeDown;

-        private System.Windows.Forms.Button btnMoveIncludeUp;

-        private System.Windows.Forms.Button btnRemoveInclude;

-        private System.Windows.Forms.Button btnAddInclude;

-        private System.Windows.Forms.CheckedListBox includeDirList;

-        private System.Windows.Forms.GroupBox groupBox2;

-        private System.Windows.Forms.TextBox txtExtraOptions;

-        private System.Windows.Forms.GroupBox groupBox3;

-        private System.Windows.Forms.CheckBox chkIceStorm;

-        private System.Windows.Forms.CheckBox chkIceSSL;

-        private System.Windows.Forms.CheckBox chkIcePatch2;

-        private System.Windows.Forms.CheckBox chkIceGrid;

-        private System.Windows.Forms.CheckBox chkIceBox;

-        private System.Windows.Forms.CheckBox chkGlacier2;

-        private System.Windows.Forms.CheckBox chkIce;

-        private System.Windows.Forms.GroupBox groupBox4;

-        private System.Windows.Forms.CheckBox chkTie;

-        private System.Windows.Forms.CheckBox chkIcePrefix;

-        private System.Windows.Forms.CheckBox chkStreaming;

-        private System.Windows.Forms.Button btnClose;

-        private System.Windows.Forms.GroupBox groupBox5;

-        private System.Windows.Forms.Button btnSelectIceHome;

-        private System.Windows.Forms.TextBox txtIceHome;

-        private System.Windows.Forms.ToolTip toolTip;

-        private System.Windows.Forms.CheckBox chkConsole;

-        private System.Windows.Forms.CheckBox chkChecksum;

-        private System.Windows.Forms.Label includeInfo;

-        private System.Windows.Forms.Button btnEditInclude;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+namespace Ice.VisualStudio
+{
+    partial class IceCsharpConfigurationDialog
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.btnEditInclude = new System.Windows.Forms.Button();
+            this.includeInfo = new System.Windows.Forms.Label();
+            this.btnMoveIncludeDown = new System.Windows.Forms.Button();
+            this.btnMoveIncludeUp = new System.Windows.Forms.Button();
+            this.btnRemoveInclude = new System.Windows.Forms.Button();
+            this.btnAddInclude = new System.Windows.Forms.Button();
+            this.includeDirList = new System.Windows.Forms.CheckedListBox();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.txtExtraOptions = new System.Windows.Forms.TextBox();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.chkIceStorm = new System.Windows.Forms.CheckBox();
+            this.chkIceSSL = new System.Windows.Forms.CheckBox();
+            this.chkIcePatch2 = new System.Windows.Forms.CheckBox();
+            this.chkIceGrid = new System.Windows.Forms.CheckBox();
+            this.chkIceBox = new System.Windows.Forms.CheckBox();
+            this.chkGlacier2 = new System.Windows.Forms.CheckBox();
+            this.chkIce = new System.Windows.Forms.CheckBox();
+            this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.chkChecksum = new System.Windows.Forms.CheckBox();
+            this.chkConsole = new System.Windows.Forms.CheckBox();
+            this.chkIcePrefix = new System.Windows.Forms.CheckBox();
+            this.chkStreaming = new System.Windows.Forms.CheckBox();
+            this.chkTie = new System.Windows.Forms.CheckBox();
+            this.btnClose = new System.Windows.Forms.Button();
+            this.groupBox5 = new System.Windows.Forms.GroupBox();
+            this.btnSelectIceHome = new System.Windows.Forms.Button();
+            this.txtIceHome = new System.Windows.Forms.TextBox();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            this.groupBox3.SuspendLayout();
+            this.groupBox4.SuspendLayout();
+            this.groupBox5.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // chkEnableBuilder
+            // 
+            this.chkEnableBuilder.AutoSize = true;
+            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);
+            this.chkEnableBuilder.Name = "chkEnableBuilder";
+            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);
+            this.chkEnableBuilder.TabIndex = 0;
+            this.chkEnableBuilder.Text = "Enable Ice Builder";
+            this.chkEnableBuilder.UseVisualStyleBackColor = true;
+            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.btnEditInclude);
+            this.groupBox1.Controls.Add(this.includeInfo);
+            this.groupBox1.Controls.Add(this.btnMoveIncludeDown);
+            this.groupBox1.Controls.Add(this.btnMoveIncludeUp);
+            this.groupBox1.Controls.Add(this.btnRemoveInclude);
+            this.groupBox1.Controls.Add(this.btnAddInclude);
+            this.groupBox1.Controls.Add(this.includeDirList);
+            this.groupBox1.Location = new System.Drawing.Point(12, 209);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(487, 169);
+            this.groupBox1.TabIndex = 1;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Slice Include Path";
+            // 
+            // btnEditInclude
+            // 
+            this.btnEditInclude.Location = new System.Drawing.Point(406, 46);
+            this.btnEditInclude.Name = "btnEditInclude";
+            this.btnEditInclude.Size = new System.Drawing.Size(75, 23);
+            this.btnEditInclude.TabIndex = 13;
+            this.btnEditInclude.Text = "Edit";
+            this.btnEditInclude.UseVisualStyleBackColor = true;
+            this.btnEditInclude.Click += new System.EventHandler(this.btnEdit_Click);
+            // 
+            // includeInfo
+            // 
+            this.includeInfo.AutoSize = true;
+            this.includeInfo.Location = new System.Drawing.Point(3, 149);
+            this.includeInfo.Name = "includeInfo";
+            this.includeInfo.Size = new System.Drawing.Size(315, 13);
+            this.includeInfo.TabIndex = 12;
+            this.includeInfo.Text = "Select checkboxes for absolute paths, deselect for relative paths.";
+            // 
+            // btnMoveIncludeDown
+            // 
+            this.btnMoveIncludeDown.Location = new System.Drawing.Point(405, 127);
+            this.btnMoveIncludeDown.Name = "btnMoveIncludeDown";
+            this.btnMoveIncludeDown.Size = new System.Drawing.Size(75, 23);
+            this.btnMoveIncludeDown.TabIndex = 11;
+            this.btnMoveIncludeDown.Text = "Down";
+            this.btnMoveIncludeDown.UseVisualStyleBackColor = true;
+            this.btnMoveIncludeDown.Click += new System.EventHandler(this.btnMoveIncludeDown_Click);
+            // 
+            // btnMoveIncludeUp
+            // 
+            this.btnMoveIncludeUp.Location = new System.Drawing.Point(405, 100);
+            this.btnMoveIncludeUp.Name = "btnMoveIncludeUp";
+            this.btnMoveIncludeUp.Size = new System.Drawing.Size(75, 23);
+            this.btnMoveIncludeUp.TabIndex = 10;
+            this.btnMoveIncludeUp.Text = "Up";
+            this.btnMoveIncludeUp.UseVisualStyleBackColor = true;
+            this.btnMoveIncludeUp.Click += new System.EventHandler(this.btnMoveIncludeUp_Click);
+            // 
+            // btnRemoveInclude
+            // 
+            this.btnRemoveInclude.Location = new System.Drawing.Point(405, 73);
+            this.btnRemoveInclude.Name = "btnRemoveInclude";
+            this.btnRemoveInclude.Size = new System.Drawing.Size(75, 23);
+            this.btnRemoveInclude.TabIndex = 9;
+            this.btnRemoveInclude.Text = "Remove";
+            this.btnRemoveInclude.UseVisualStyleBackColor = true;
+            this.btnRemoveInclude.Click += new System.EventHandler(this.btnRemoveInclude_Click);
+            // 
+            // btnAddInclude
+            // 
+            this.btnAddInclude.Location = new System.Drawing.Point(405, 19);
+            this.btnAddInclude.Name = "btnAddInclude";
+            this.btnAddInclude.Size = new System.Drawing.Size(75, 23);
+            this.btnAddInclude.TabIndex = 8;
+            this.btnAddInclude.Text = "Add";
+            this.btnAddInclude.UseVisualStyleBackColor = true;
+            this.btnAddInclude.Click += new System.EventHandler(this.btnAddInclude_Click);
+            // 
+            // includeDirList
+            // 
+            this.includeDirList.FormattingEnabled = true;
+            this.includeDirList.Location = new System.Drawing.Point(6, 22);
+            this.includeDirList.Name = "includeDirList";
+            this.includeDirList.Size = new System.Drawing.Size(390, 124);
+            this.includeDirList.TabIndex = 7;
+            this.includeDirList.SelectedIndexChanged += new System.EventHandler(this.includeDirList_SelectedIndexChanged);
+            this.includeDirList.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.includeDirList_ItemCheck);
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.txtExtraOptions);
+            this.groupBox2.Location = new System.Drawing.Point(12, 138);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(487, 65);
+            this.groupBox2.TabIndex = 2;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "Extra Compiler Options";
+            // 
+            // txtExtraOptions
+            // 
+            this.txtExtraOptions.Location = new System.Drawing.Point(6, 19);
+            this.txtExtraOptions.Multiline = true;
+            this.txtExtraOptions.Name = "txtExtraOptions";
+            this.txtExtraOptions.Size = new System.Drawing.Size(474, 40);
+            this.txtExtraOptions.TabIndex = 6;
+            this.txtExtraOptions.LostFocus += new System.EventHandler(this.txtExtraOptions_LostFocus);
+            this.txtExtraOptions.Enter += new System.EventHandler(this.txtExtraOptions_Focus);
+            
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.chkIceStorm);
+            this.groupBox3.Controls.Add(this.chkIceSSL);
+            this.groupBox3.Controls.Add(this.chkIcePatch2);
+            this.groupBox3.Controls.Add(this.chkIceGrid);
+            this.groupBox3.Controls.Add(this.chkIceBox);
+            this.groupBox3.Controls.Add(this.chkGlacier2);
+            this.groupBox3.Controls.Add(this.chkIce);
+            this.groupBox3.Location = new System.Drawing.Point(12, 384);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(487, 47);
+            this.groupBox3.TabIndex = 3;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "Ice Components";
+            // 
+            // chkIceStorm
+            // 
+            this.chkIceStorm.AutoSize = true;
+            this.chkIceStorm.Location = new System.Drawing.Point(404, 19);
+            this.chkIceStorm.Name = "chkIceStorm";
+            this.chkIceStorm.Size = new System.Drawing.Size(68, 17);
+            this.chkIceStorm.TabIndex = 6;
+            this.chkIceStorm.TabStop = false;
+            this.chkIceStorm.Text = "IceStorm";
+            this.chkIceStorm.UseVisualStyleBackColor = true;
+            this.chkIceStorm.CheckedChanged += new System.EventHandler(this.chkIceStorm_CheckedChanged);
+            // 
+            // chkIceSSL
+            // 
+            this.chkIceSSL.AutoSize = true;
+            this.chkIceSSL.Location = new System.Drawing.Point(337, 19);
+            this.chkIceSSL.Name = "chkIceSSL";
+            this.chkIceSSL.Size = new System.Drawing.Size(61, 17);
+            this.chkIceSSL.TabIndex = 5;
+            this.chkIceSSL.TabStop = false;
+            this.chkIceSSL.Text = "IceSSL";
+            this.chkIceSSL.UseVisualStyleBackColor = true;
+            this.chkIceSSL.CheckedChanged += new System.EventHandler(this.chkIceSSL_CheckedChanged);
+            // 
+            // chkIcePatch2
+            // 
+            this.chkIcePatch2.AutoSize = true;
+            this.chkIcePatch2.Location = new System.Drawing.Point(256, 19);
+            this.chkIcePatch2.Name = "chkIcePatch2";
+            this.chkIcePatch2.Size = new System.Drawing.Size(75, 17);
+            this.chkIcePatch2.TabIndex = 4;
+            this.chkIcePatch2.TabStop = false;
+            this.chkIcePatch2.Text = "IcePatch2";
+            this.chkIcePatch2.UseVisualStyleBackColor = true;
+            this.chkIcePatch2.CheckedChanged += new System.EventHandler(this.chkIcePatch2_CheckedChanged);
+            // 
+            // chkIceGrid
+            // 
+            this.chkIceGrid.AutoSize = true;
+            this.chkIceGrid.Location = new System.Drawing.Point(190, 19);
+            this.chkIceGrid.Name = "chkIceGrid";
+            this.chkIceGrid.Size = new System.Drawing.Size(60, 17);
+            this.chkIceGrid.TabIndex = 3;
+            this.chkIceGrid.TabStop = false;
+            this.chkIceGrid.Text = "IceGrid";
+            this.chkIceGrid.UseVisualStyleBackColor = true;
+            this.chkIceGrid.CheckedChanged += new System.EventHandler(this.chkIceGrid_CheckedChanged);
+            // 
+            // chkIceBox
+            // 
+            this.chkIceBox.AutoSize = true;
+            this.chkIceBox.Location = new System.Drawing.Point(125, 19);
+            this.chkIceBox.Name = "chkIceBox";
+            this.chkIceBox.Size = new System.Drawing.Size(59, 17);
+            this.chkIceBox.TabIndex = 2;
+            this.chkIceBox.TabStop = false;
+            this.chkIceBox.Text = "IceBox";
+            this.chkIceBox.UseVisualStyleBackColor = true;
+            this.chkIceBox.CheckedChanged += new System.EventHandler(this.chkIceBox_CheckedChanged);
+            // 
+            // chkGlacier2
+            // 
+            this.chkGlacier2.AutoSize = true;
+            this.chkGlacier2.Location = new System.Drawing.Point(7, 19);
+            this.chkGlacier2.Name = "chkGlacier2";
+            this.chkGlacier2.Size = new System.Drawing.Size(65, 17);
+            this.chkGlacier2.TabIndex = 0;
+            this.chkGlacier2.TabStop = false;
+            this.chkGlacier2.Text = "Glacier2";
+            this.chkGlacier2.UseVisualStyleBackColor = true;
+            this.chkGlacier2.CheckedChanged += new System.EventHandler(this.chkGlacier2_CheckedChanged);
+            // 
+            // chkIce
+            // 
+            this.chkIce.AutoSize = true;
+            this.chkIce.Location = new System.Drawing.Point(78, 19);
+            this.chkIce.Name = "chkIce";
+            this.chkIce.Size = new System.Drawing.Size(41, 17);
+            this.chkIce.TabIndex = 1;
+            this.chkIce.TabStop = false;
+            this.chkIce.Text = "Ice";
+            this.chkIce.UseVisualStyleBackColor = true;
+            this.chkIce.CheckedChanged += new System.EventHandler(this.chkIce_CheckedChanged);
+            // 
+            // groupBox4
+            // 
+            this.groupBox4.Controls.Add(this.chkChecksum);
+            this.groupBox4.Controls.Add(this.chkConsole);
+            this.groupBox4.Controls.Add(this.chkIcePrefix);
+            this.groupBox4.Controls.Add(this.chkStreaming);
+            this.groupBox4.Controls.Add(this.chkTie);
+            this.groupBox4.Location = new System.Drawing.Point(12, 88);
+            this.groupBox4.Name = "groupBox4";
+            this.groupBox4.Size = new System.Drawing.Size(487, 44);
+            this.groupBox4.TabIndex = 4;
+            this.groupBox4.TabStop = false;
+            this.groupBox4.Text = "Slice Compiler Options";
+            // 
+            // chkChecksum
+            // 
+            this.chkChecksum.AutoSize = true;
+            this.chkChecksum.Location = new System.Drawing.Point(213, 19);
+            this.chkChecksum.Name = "chkChecksum";
+            this.chkChecksum.Size = new System.Drawing.Size(76, 17);
+            this.chkChecksum.TabIndex = 5;
+            this.chkChecksum.Text = "Checksum";
+            this.chkChecksum.UseVisualStyleBackColor = true;
+            this.chkChecksum.CheckedChanged += new System.EventHandler(this.chkChecksum_CheckedChanged);
+            // 
+            // chkConsole
+            // 
+            this.chkConsole.AutoSize = true;
+            this.chkConsole.Location = new System.Drawing.Point(299, 19);
+            this.chkConsole.Name = "chkConsole";
+            this.chkConsole.Size = new System.Drawing.Size(99, 17);
+            this.chkConsole.TabIndex = 4;
+            this.chkConsole.Text = "Console Output";
+            this.chkConsole.UseVisualStyleBackColor = true;
+            this.chkConsole.CheckedChanged += new System.EventHandler(this.chkConsole_CheckedChanged);
+            // 
+            // chkIcePrefix
+            // 
+            this.chkIcePrefix.AutoSize = true;
+            this.chkIcePrefix.Location = new System.Drawing.Point(10, 19);
+            this.chkIcePrefix.Name = "chkIcePrefix";
+            this.chkIcePrefix.Size = new System.Drawing.Size(41, 17);
+            this.chkIcePrefix.TabIndex = 2;
+            this.chkIcePrefix.Text = "Ice";
+            this.chkIcePrefix.UseVisualStyleBackColor = true;
+            this.chkIcePrefix.CheckedChanged += new System.EventHandler(this.chkIcePrefix_CheckedChanged);
+            // 
+            // chkStreaming
+            // 
+            this.chkStreaming.AutoSize = true;
+            this.chkStreaming.Location = new System.Drawing.Point(125, 19);
+            this.chkStreaming.Name = "chkStreaming";
+            this.chkStreaming.Size = new System.Drawing.Size(73, 17);
+            this.chkStreaming.TabIndex = 1;
+            this.chkStreaming.Text = "Streaming";
+            this.chkStreaming.UseVisualStyleBackColor = true;
+            this.chkStreaming.CheckedChanged += new System.EventHandler(this.chkStreaming_CheckedChanged);
+            // 
+            // chkTie
+            // 
+            this.chkTie.AutoSize = true;
+            this.chkTie.Location = new System.Drawing.Point(71, 19);
+            this.chkTie.Name = "chkTie";
+            this.chkTie.Size = new System.Drawing.Size(41, 17);
+            this.chkTie.TabIndex = 0;
+            this.chkTie.Text = "Tie";
+            this.chkTie.UseVisualStyleBackColor = true;
+            this.chkTie.CheckedChanged += new System.EventHandler(this.chkTie_CheckedChanged);
+            // 
+            // btnClose
+            // 
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnClose.Location = new System.Drawing.Point(424, 437);
+            this.btnClose.Name = "btnClose";
+            this.btnClose.Size = new System.Drawing.Size(75, 23);
+            this.btnClose.TabIndex = 5;
+            this.btnClose.Text = "Close";
+            this.btnClose.UseVisualStyleBackColor = true;
+            this.btnClose.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // groupBox5
+            // 
+            this.groupBox5.Controls.Add(this.btnSelectIceHome);
+            this.groupBox5.Controls.Add(this.txtIceHome);
+            this.groupBox5.Location = new System.Drawing.Point(12, 37);
+            this.groupBox5.Name = "groupBox5";
+            this.groupBox5.Size = new System.Drawing.Size(486, 45);
+            this.groupBox5.TabIndex = 6;
+            this.groupBox5.TabStop = false;
+            this.groupBox5.Text = "Ice Home";
+            // 
+            // btnSelectIceHome
+            // 
+            this.btnSelectIceHome.Location = new System.Drawing.Point(405, 16);
+            this.btnSelectIceHome.Name = "btnSelectIceHome";
+            this.btnSelectIceHome.Size = new System.Drawing.Size(75, 23);
+            this.btnSelectIceHome.TabIndex = 1;
+            this.btnSelectIceHome.Text = "....";
+            this.btnSelectIceHome.UseVisualStyleBackColor = true;
+            this.btnSelectIceHome.Click += new System.EventHandler(this.btnSelectIceHome_Click);
+            // 
+            // txtIceHome
+            // 
+            this.txtIceHome.Location = new System.Drawing.Point(10, 20);
+            this.txtIceHome.Name = "txtIceHome";
+            this.txtIceHome.Size = new System.Drawing.Size(386, 20);
+            this.txtIceHome.TabIndex = 0;
+            this.txtIceHome.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtIceHome_KeyPress);
+            this.txtIceHome.LostFocus += new System.EventHandler(this.txtIceHome_LostFocus);
+            this.txtIceHome.Enter += new System.EventHandler(this.txtIceHome_Focus);
+            // 
+            // IceCsharpConfigurationDialog
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnClose;
+            this.ClientSize = new System.Drawing.Size(512, 469);
+            this.Controls.Add(this.groupBox5);
+            this.Controls.Add(this.btnClose);
+            this.Controls.Add(this.groupBox4);
+            this.Controls.Add(this.groupBox3);
+            this.Controls.Add(this.groupBox2);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.chkEnableBuilder);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.MaximizeBox = false;
+            this.Name = "IceCsharpConfigurationDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Ice Configuration";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
+            this.groupBox4.ResumeLayout(false);
+            this.groupBox4.PerformLayout();
+            this.groupBox5.ResumeLayout(false);
+            this.groupBox5.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.CheckBox chkEnableBuilder;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.Button btnMoveIncludeDown;
+        private System.Windows.Forms.Button btnMoveIncludeUp;
+        private System.Windows.Forms.Button btnRemoveInclude;
+        private System.Windows.Forms.Button btnAddInclude;
+        private System.Windows.Forms.CheckedListBox includeDirList;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.TextBox txtExtraOptions;
+        private System.Windows.Forms.GroupBox groupBox3;
+        private System.Windows.Forms.CheckBox chkIceStorm;
+        private System.Windows.Forms.CheckBox chkIceSSL;
+        private System.Windows.Forms.CheckBox chkIcePatch2;
+        private System.Windows.Forms.CheckBox chkIceGrid;
+        private System.Windows.Forms.CheckBox chkIceBox;
+        private System.Windows.Forms.CheckBox chkGlacier2;
+        private System.Windows.Forms.CheckBox chkIce;
+        private System.Windows.Forms.GroupBox groupBox4;
+        private System.Windows.Forms.CheckBox chkTie;
+        private System.Windows.Forms.CheckBox chkIcePrefix;
+        private System.Windows.Forms.CheckBox chkStreaming;
+        private System.Windows.Forms.Button btnClose;
+        private System.Windows.Forms.GroupBox groupBox5;
+        private System.Windows.Forms.Button btnSelectIceHome;
+        private System.Windows.Forms.TextBox txtIceHome;
+        private System.Windows.Forms.ToolTip toolTip;
+        private System.Windows.Forms.CheckBox chkConsole;
+        private System.Windows.Forms.CheckBox chkChecksum;
+        private System.Windows.Forms.Label includeInfo;
+        private System.Windows.Forms.Button btnEditInclude;
+    }
+}
diff --git a/vsplugin/src/IceCsharpConfigurationDialog.cs b/vsplugin/src/IceCsharpConfigurationDialog.cs
index 3539ef1a871..62cfaa932d9 100644
--- a/vsplugin/src/IceCsharpConfigurationDialog.cs
+++ b/vsplugin/src/IceCsharpConfigurationDialog.cs
@@ -1,734 +1,734 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.ComponentModel;

-using System.Data;

-using System.Drawing;

-using System.IO;

-using System.Text;

-using System.Windows.Forms;

-

-using EnvDTE;

-

-namespace Ice.VisualStudio

-{

-    public partial class IceCsharpConfigurationDialog : Form

-    {

-        public IceCsharpConfigurationDialog(Project project)

-        {

-            InitializeComponent();

-            _project = project;

-            

-            //

-            // Set the toolTip messages.

-            //

-            toolTip.SetToolTip(txtIceHome, "Ice installation directory.");

-            toolTip.SetToolTip(btnSelectIceHome, "Ice installation directory.");

-            toolTip.SetToolTip(chkStreaming, "Generate marshaling support for stream API (--stream).");

-            toolTip.SetToolTip(chkChecksum, "Generate checksums for Slice definitions (--checksum).");

-            toolTip.SetToolTip(chkIcePrefix, "Permit Ice prefixes (--ice).");

-            toolTip.SetToolTip(chkTie, "Generate TIE classes (--tie).");

-            toolTip.SetToolTip(chkConsole, "Enable console output.");

-

-            if(_project != null)

-            {

-                this.Text = "Ice Configuration - Project: " + _project.Name;

-                bool enabled = Util.isSliceBuilderEnabled(project);

-                setEnabled(enabled);

-                chkEnableBuilder.Checked = enabled;

-                load();

-                _initialized = true;

-            }

-        }

-        

-        private void load()

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_project != null)

-            {

-                includeDirList.Items.Clear();

-                txtIceHome.Text = Util.getIceHomeRaw(_project, false);

-                txtExtraOptions.Text = Util.getProjectProperty(_project, Util.PropertyIceExtraOptions);

-

-                chkIcePrefix.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIcePrefix);

-                chkTie.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIceTie);

-                chkStreaming.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIceStreaming);

-                chkChecksum.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIceChecksum);

-                chkConsole.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyConsoleOutput);

-                

-                IncludePathList list =

-                    new IncludePathList(Util.getProjectProperty(_project, Util.PropertyIceIncludePath));

-                foreach(String s in list)

-                {

-                    includeDirList.Items.Add(s.Trim());

-                    if(Path.IsPathRooted(s.Trim()))

-                    {

-                        includeDirList.SetItemCheckState(includeDirList.Items.Count - 1, CheckState.Checked);

-                    }

-                }

-

-                ComponentList selectedComponents = Util.getIceDotNetComponents(_project);

-                foreach(String s in Util.getDotNetNames())

-                {

-                    if(selectedComponents.Contains(s))

-                    {

-                        checkComponent(s, true);

-                    }

-                    else

-                    {

-                        checkComponent(s, false);

-                    }

-                }

-            }

-            Cursor = Cursors.Default;  

-        }

-

-        private void checkComponent(String component, bool check)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            switch (component)

-            {

-                case "Glacier2":

-                {

-                    chkGlacier2.Checked = check;

-                    break;

-                }

-                case "Ice":

-                {

-                    chkIce.Checked = check;

-                    break;

-                }

-                case "IceBox":

-                {

-                    chkIceBox.Checked = check;

-                    break;

-                }

-                case "IceGrid":

-                {

-                    chkIceGrid.Checked = check;

-                    break;

-                }

-                case "IcePatch2":

-                {

-                    chkIcePatch2.Checked = check;

-                    break;

-                }

-                case "IceSSL":

-                {

-                    chkIceSSL.Checked = check;

-                    break;

-                }

-                case "IceStorm":

-                {

-                    chkIceStorm.Checked = check;

-                    break;

-                }

-                default:

-                {

-                    break;

-                }

-            }

-        }

-        private void chkEnableBuilder_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            if(_initialized)

-            {

-                _initialized = false;

-                setEnabled(false);

-                chkEnableBuilder.Enabled = false;

-                Builder builder = Connect.getBuilder();

-                if(chkEnableBuilder.Checked)

-                {

-                    builder.addBuilderToProject(_project);

-                }

-                else

-                {

-                    builder.removeBuilderFromProject(_project);

-                }

-                load();

-                setEnabled(chkEnableBuilder.Checked);

-                chkEnableBuilder.Enabled = true;

-                _initialized = true;

-            }

-            Cursor = Cursors.Default;

-        }

-        

-        private void setEnabled(bool enabled)

-        {

-            txtIceHome.Enabled = enabled;

-            btnSelectIceHome.Enabled = enabled;

-

-            chkIcePrefix.Enabled = enabled;

-            chkTie.Enabled = enabled;

-            chkStreaming.Enabled = enabled;

-            chkChecksum.Enabled = enabled;

-            chkConsole.Enabled = enabled;

-            includeDirList.Enabled = enabled;

-            btnAddInclude.Enabled = enabled;

-            btnEditInclude.Enabled = enabled;

-            btnRemoveInclude.Enabled = enabled;

-            btnMoveIncludeUp.Enabled = enabled;

-            btnMoveIncludeDown.Enabled = enabled;

-

-            txtExtraOptions.Enabled = enabled;

-

-            chkGlacier2.Enabled = enabled;

-            chkIce.Enabled = enabled;

-            chkIceBox.Enabled = enabled;

-            chkIceGrid.Enabled = enabled;

-            chkIcePatch2.Enabled = enabled;

-            chkIceSSL.Enabled = enabled;

-            chkIceStorm.Enabled = enabled;

-        }

-

-        private void formClosing(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            if(!_changed)

-            {

-                if(txtExtraOptions.Modified)

-                {

-                    _changed = true;

-                }

-                else if(txtIceHome.Modified)

-                {

-                    _changed = true;

-                }

-            }

-

-            if(_changed && Util.isSliceBuilderEnabled(_project))

-            {

-                Builder builder = Connect.getBuilder();

-                builder.cleanProject(_project);

-                builder.buildProject(_project, true, vsBuildScope.vsBuildScopeProject);

-            }

-            Cursor = Cursors.Default;

-        }

-

-        private void btnCancel_Click(object sender, EventArgs e)

-        {

-            Close();

-        }

-

-        private void btnSelectIceHome_Click(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            FolderBrowserDialog dialog = new FolderBrowserDialog();

-            dialog.SelectedPath = Util.getAbsoluteIceHome(_project);

-            dialog.Description = "Select Ice Home Installation Directory";

-            DialogResult result = dialog.ShowDialog();

-            if(result == DialogResult.OK)

-            {

-                Util.updateIceHome(_project, dialog.SelectedPath, false);

-                load();

-                _changed = true;

-            }

-        }

-

-        private void txtIceHome_KeyPress(object sender, KeyPressEventArgs e)

-        {

-            if(e.KeyChar == (char)Keys.Return)

-            {

-                updateIceHome();

-                e.Handled = true;

-            }

-        }

-

-        private void txtIceHome_Focus(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-        }

-

-        private void txtIceHome_LostFocus(object sender, EventArgs e)

-        {

-            updateIceHome();

-        }

-

-        private void updateIceHome()

-        {

-            if(!_iceHomeUpdating)

-            {

-                _iceHomeUpdating = true;

-                if(!txtIceHome.Text.Equals(Util.getProjectProperty(_project, Util.PropertyIceHome),

-                                           StringComparison.CurrentCultureIgnoreCase))

-                {

-                    Util.updateIceHome(_project, txtIceHome.Text, false);

-                    load();

-                    _changed = true;

-                    txtIceHome.Modified = false;

-                }

-                _iceHomeUpdating = false;

-            }

-        }

-

-        private void chkIcePrefix_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            Util.setProjectProperty(_project, Util.PropertyIcePrefix, chkIcePrefix.Checked.ToString());

-            _changed = true;

-            Cursor = Cursors.Default;

-        }

-

-        private void chkTie_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            Util.setProjectProperty(_project, Util.PropertyIceTie, chkTie.Checked.ToString());

-            _changed = true;

-            Cursor = Cursors.Default;

-        }

-

-        private void chkStreaming_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            Util.setProjectProperty(_project, Util.PropertyIceStreaming, chkStreaming.Checked.ToString());

-            _changed = true;

-            Cursor = Cursors.Default;

-        }

-        

-        private void chkChecksum_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            Util.setProjectProperty(_project, Util.PropertyIceChecksum, chkChecksum.Checked.ToString());

-            _changed = true;

-            Cursor = Cursors.Default;

-        }

-        

-        private void saveSliceIncludes()

-        {

-            Cursor = Cursors.WaitCursor;

-            IncludePathList paths = new IncludePathList();

-            foreach(String s in includeDirList.Items)

-            {

-                paths.Add(s.Trim());

-            }

-            Util.setProjectProperty(_project, Util.PropertyIceIncludePath, paths.ToString());

-            _changed = true;

-            Cursor = Cursors.Default;

-        }

-

-        private void btnAddInclude_Click(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            includeDirList.Items.Add("");

-            includeDirList.SelectedIndex = includeDirList.Items.Count - 1;

-            _editingIndex = includeDirList.SelectedIndex;

-            beginEditIncludeDir();

-        }

-

-        private void btnRemoveInclude_Click(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            int index = includeDirList.SelectedIndex;

-            if(_editingIncludes)

-            {

-                index = _editingIndex;

-                endEditIncludeDir(false);

-            }

-            

-            if(index > -1 && index < includeDirList.Items.Count)

-            {

-                int selected = index;

-                includeDirList.Items.RemoveAt(selected);

-                if(includeDirList.Items.Count > 0)

-                {

-                    if(selected > 0)

-                    {

-                        selected -= 1;

-                    }

-                    includeDirList.SelectedIndex = selected;

-                }

-                saveSliceIncludes();

-            }

-            Cursor = Cursors.Default;

-        }

-

-        private void btnMoveIncludeUp_Click(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            int index = includeDirList.SelectedIndex;

-            if(index > 0)

-            {

-                string current = includeDirList.SelectedItem.ToString();

-                includeDirList.Items.RemoveAt(index);

-                includeDirList.Items.Insert(index - 1, current);

-                includeDirList.SelectedIndex = index - 1;

-                saveSliceIncludes();

-            }

-            resetIncludeDirChecks();

-            Cursor = Cursors.Default;

-        }

-

-        private void btnMoveIncludeDown_Click(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            int index = includeDirList.SelectedIndex;

-            if(index < includeDirList.Items.Count - 1 && index > -1)

-            {

-                string current = includeDirList.SelectedItem.ToString();

-                includeDirList.Items.RemoveAt(index);

-                includeDirList.Items.Insert(index + 1, current);

-                includeDirList.SelectedIndex = index + 1;

-                saveSliceIncludes();

-                resetIncludeDirChecks();

-            }

-            Cursor = Cursors.Default;

-        }

-

-        private void resetIncludeDirChecks()

-        {

-            _initialized = false;

-            for(int i = 0; i < includeDirList.Items.Count; i++)

-            {

-                String path = includeDirList.Items[i].ToString();

-                if(String.IsNullOrEmpty(path))

-                {

-                    continue;

-                }

-

-                if(Path.IsPathRooted(path))

-                {

-                    includeDirList.SetItemCheckState(i, CheckState.Checked);

-                }

-                else

-                {

-                    includeDirList.SetItemCheckState(i, CheckState.Unchecked);

-                }

-            }

-            _initialized = true;

-        }

-

-        private void includeDirList_ItemCheck(object sender, ItemCheckEventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                return;

-            }

-            string path = includeDirList.Items[e.Index].ToString();

-            if(!Util.containsEnvironmentVars(path))

-            {

-                if (e.NewValue == CheckState.Unchecked)

-                {

-                    path = Util.relativePath(Path.GetDirectoryName(_project.FileName), path);

-                }

-                else if(e.NewValue == CheckState.Checked)

-                {

-                    if (!Path.IsPathRooted(path))

-                    {

-                        path = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(_project.FileName), path));

-                    }

-                }

-            }

-            includeDirList.Items[e.Index] = path;

-            if(_initialized)

-            {

-                saveSliceIncludes();

-            }

-        }

-

-        private void txtExtraOptions_Focus(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-        }

-

-        private void txtExtraOptions_LostFocus(object sender, EventArgs e)

-        {

-            if(txtExtraOptions.Modified)

-            {

-                Util.setProjectProperty(_project, Util.PropertyIceExtraOptions, txtExtraOptions.Text);

-                _changed = true;

-            }

-        }

-        

-        private void componentChanged(string name, bool value)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            if(_initialized)

-            {

-                if(value)

-                {

-                    Util.addDotNetReference(_project, name);

-                }

-                else

-                {

-                    Util.removeDotNetReference(_project, name);

-                }

-                _changed = true;

-            }

-            Cursor = Cursors.Default;        

-        }

-

-        private void chkGlacier2_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("Glacier2", chkGlacier2.Checked);

-        }

-

-        private void chkIce_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("Ice", chkIce.Checked);

-        }

-

-        private void chkIceBox_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IceBox", chkIceBox.Checked);

-        }

-

-        private void chkIceGrid_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IceGrid", chkIceGrid.Checked);

-        }

-

-        private void chkIcePatch2_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IcePatch2", chkIcePatch2.Checked);

-        }

-

-        private void chkIceSSL_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IceSSL", chkIceSSL.Checked);

-        }

-

-        private void chkIceStorm_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IceStorm", chkIceStorm.Checked);

-        }

-

-        private void chkConsole_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            Util.setProjectProperty(_project, Util.PropertyConsoleOutput, chkConsole.Checked.ToString());

-            Cursor = Cursors.Default;

-        }

-

-        private void btnEdit_Click(object sender, EventArgs e)

-        {

-            if(includeDirList.SelectedIndex != -1)

-            {

-                _editingIndex = includeDirList.SelectedIndex;

-                beginEditIncludeDir();

-            }

-        }

-

-        private void includeDirList_SelectedIndexChanged(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-        }

-

-        private void beginEditIncludeDir()

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            _editingIncludes = true;

-            CancelButton = null;

-            if(_editingIndex != -1)

-            {

-                _txtIncludeDir = new TextBox();

-                _txtIncludeDir.Text = includeDirList.Items[includeDirList.SelectedIndex].ToString();

-

-                includeDirList.SelectionMode = SelectionMode.One;

-

-                Rectangle rect = includeDirList.GetItemRectangle(includeDirList.SelectedIndex);

-                _txtIncludeDir.Location = new Point(includeDirList.Location.X + 2,

-                                                    includeDirList.Location.Y + rect.Y);

-                _txtIncludeDir.Width = includeDirList.Width - 50;

-                _txtIncludeDir.Parent = includeDirList;

-                _txtIncludeDir.KeyDown += new KeyEventHandler(includeDirKeyDown);

-                groupBox1.Controls.Add(_txtIncludeDir);

-

-                _btnSelectInclude = new Button();

-                _btnSelectInclude.Text = "...";

-                _btnSelectInclude.Location = new Point(includeDirList.Location.X + _txtIncludeDir.Width,

-                                                       includeDirList.Location.Y + rect.Y);

-                _btnSelectInclude.Width = 49;

-                _btnSelectInclude.Height = _txtIncludeDir.Height;

-                _btnSelectInclude.Click += new EventHandler(selectIncludeClicked);

-                groupBox1.Controls.Add(_btnSelectInclude);

-

-

-                _txtIncludeDir.Show();

-                _txtIncludeDir.BringToFront();

-                _txtIncludeDir.Focus();

-

-                _btnSelectInclude.Show();

-                _btnSelectInclude.BringToFront();

-            }

-        }

-

-        private void endEditIncludeDir(bool saveChanges)

-        {

-            _initialized = false;

-            if(!_editingIncludes)

-            {

-                _initialized = true;

-                return;

-            }

-            _editingIncludes = false;

-            String path = null;

-            if(_editingIndex > -1 && _editingIndex < includeDirList.Items.Count)

-            {

-                path = includeDirList.Items[_editingIndex].ToString();

-            }

-

-            lock(this)

-            {

-                CancelButton = btnClose;

-                if(_txtIncludeDir == null || _btnSelectInclude == null)

-                {

-                    _initialized = true;

-                    return;

-                }

-                if(saveChanges)

-                {

-                    path = _txtIncludeDir.Text;

-                    if(path != null)

-                    {

-                        path = path.Trim();

-                    }

-                }

-

-                this.groupBox1.Controls.Remove(_txtIncludeDir);

-                _txtIncludeDir = null;

-

-                this.groupBox1.Controls.Remove(_btnSelectInclude);

-                _btnSelectInclude = null;

-            }

-

-            if(String.IsNullOrEmpty(path))

-            {

-                if(_editingIndex != -1)

-                {

-                    includeDirList.Items.RemoveAt(_editingIndex);

-                    includeDirList.SelectedIndex = includeDirList.Items.Count - 1;

-                    _editingIndex = -1;

-                    saveSliceIncludes();

-                }

-            }

-            else if(_editingIndex != -1 && saveChanges)

-            {

-                if(!path.Equals(includeDirList.Items[_editingIndex].ToString(),

-                                               StringComparison.CurrentCultureIgnoreCase))

-                {

-                    includeDirList.Items[_editingIndex] = path;

-                    if(Path.IsPathRooted(path))

-                    {

-                        includeDirList.SetItemCheckState(_editingIndex, CheckState.Checked);

-                    }

-                    else

-                    {

-                        includeDirList.SetItemCheckState(_editingIndex, CheckState.Unchecked);

-                    }

-                    saveSliceIncludes();

-                }

-            }

-            resetIncludeDirChecks();

-        }

-

-        private void includeDirKeyDown(object sender, KeyEventArgs e)

-        {

-            if(e.KeyCode.Equals(Keys.Escape))

-            {

-                endEditIncludeDir(false);

-            }

-            if(e.KeyCode.Equals(Keys.Enter))

-            {

-                endEditIncludeDir(true);

-            }

-        }

-

-        private void selectIncludeClicked(object sender, EventArgs e)

-        {

-            FolderBrowserDialog dialog = new FolderBrowserDialog();

-            string projectDir = Path.GetFullPath(Path.GetDirectoryName(_project.FileName));

-            dialog.SelectedPath = projectDir;

-            dialog.Description = "Slice Include Directory";

-            DialogResult result = dialog.ShowDialog();

-            if(result == DialogResult.OK)

-            {

-                string path = dialog.SelectedPath;

-                if(!Util.containsEnvironmentVars(path))

-                {

-                    path = Util.relativePath(projectDir, Path.GetFullPath(path));

-                }

-                _txtIncludeDir.Text = path;

-            }

-            endEditIncludeDir(true);

-        }

-

-        private int _editingIndex = -1;

-        private bool _editingIncludes;

-        private bool _changed;

-        private bool _initialized;

-        private Project _project;

-        private bool _iceHomeUpdating;

-        private TextBox _txtIncludeDir;

-        private Button _btnSelectInclude;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Text;
+using System.Windows.Forms;
+
+using EnvDTE;
+
+namespace Ice.VisualStudio
+{
+    public partial class IceCsharpConfigurationDialog : Form
+    {
+        public IceCsharpConfigurationDialog(Project project)
+        {
+            InitializeComponent();
+            _project = project;
+            
+            //
+            // Set the toolTip messages.
+            //
+            toolTip.SetToolTip(txtIceHome, "Ice installation directory.");
+            toolTip.SetToolTip(btnSelectIceHome, "Ice installation directory.");
+            toolTip.SetToolTip(chkStreaming, "Generate marshaling support for stream API (--stream).");
+            toolTip.SetToolTip(chkChecksum, "Generate checksums for Slice definitions (--checksum).");
+            toolTip.SetToolTip(chkIcePrefix, "Permit Ice prefixes (--ice).");
+            toolTip.SetToolTip(chkTie, "Generate TIE classes (--tie).");
+            toolTip.SetToolTip(chkConsole, "Enable console output.");
+
+            if(_project != null)
+            {
+                this.Text = "Ice Configuration - Project: " + _project.Name;
+                bool enabled = Util.isSliceBuilderEnabled(project);
+                setEnabled(enabled);
+                chkEnableBuilder.Checked = enabled;
+                load();
+                _initialized = true;
+            }
+        }
+        
+        private void load()
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_project != null)
+            {
+                includeDirList.Items.Clear();
+                txtIceHome.Text = Util.getIceHomeRaw(_project, false);
+                txtExtraOptions.Text = Util.getProjectProperty(_project, Util.PropertyIceExtraOptions);
+
+                chkIcePrefix.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIcePrefix);
+                chkTie.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIceTie);
+                chkStreaming.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIceStreaming);
+                chkChecksum.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIceChecksum);
+                chkConsole.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyConsoleOutput);
+                
+                IncludePathList list =
+                    new IncludePathList(Util.getProjectProperty(_project, Util.PropertyIceIncludePath));
+                foreach(String s in list)
+                {
+                    includeDirList.Items.Add(s.Trim());
+                    if(Path.IsPathRooted(s.Trim()))
+                    {
+                        includeDirList.SetItemCheckState(includeDirList.Items.Count - 1, CheckState.Checked);
+                    }
+                }
+
+                ComponentList selectedComponents = Util.getIceDotNetComponents(_project);
+                foreach(String s in Util.getDotNetNames())
+                {
+                    if(selectedComponents.Contains(s))
+                    {
+                        checkComponent(s, true);
+                    }
+                    else
+                    {
+                        checkComponent(s, false);
+                    }
+                }
+            }
+            Cursor = Cursors.Default;  
+        }
+
+        private void checkComponent(String component, bool check)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            switch (component)
+            {
+                case "Glacier2":
+                {
+                    chkGlacier2.Checked = check;
+                    break;
+                }
+                case "Ice":
+                {
+                    chkIce.Checked = check;
+                    break;
+                }
+                case "IceBox":
+                {
+                    chkIceBox.Checked = check;
+                    break;
+                }
+                case "IceGrid":
+                {
+                    chkIceGrid.Checked = check;
+                    break;
+                }
+                case "IcePatch2":
+                {
+                    chkIcePatch2.Checked = check;
+                    break;
+                }
+                case "IceSSL":
+                {
+                    chkIceSSL.Checked = check;
+                    break;
+                }
+                case "IceStorm":
+                {
+                    chkIceStorm.Checked = check;
+                    break;
+                }
+                default:
+                {
+                    break;
+                }
+            }
+        }
+        private void chkEnableBuilder_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            if(_initialized)
+            {
+                _initialized = false;
+                setEnabled(false);
+                chkEnableBuilder.Enabled = false;
+                Builder builder = Connect.getBuilder();
+                if(chkEnableBuilder.Checked)
+                {
+                    builder.addBuilderToProject(_project);
+                }
+                else
+                {
+                    builder.removeBuilderFromProject(_project);
+                }
+                load();
+                setEnabled(chkEnableBuilder.Checked);
+                chkEnableBuilder.Enabled = true;
+                _initialized = true;
+            }
+            Cursor = Cursors.Default;
+        }
+        
+        private void setEnabled(bool enabled)
+        {
+            txtIceHome.Enabled = enabled;
+            btnSelectIceHome.Enabled = enabled;
+
+            chkIcePrefix.Enabled = enabled;
+            chkTie.Enabled = enabled;
+            chkStreaming.Enabled = enabled;
+            chkChecksum.Enabled = enabled;
+            chkConsole.Enabled = enabled;
+            includeDirList.Enabled = enabled;
+            btnAddInclude.Enabled = enabled;
+            btnEditInclude.Enabled = enabled;
+            btnRemoveInclude.Enabled = enabled;
+            btnMoveIncludeUp.Enabled = enabled;
+            btnMoveIncludeDown.Enabled = enabled;
+
+            txtExtraOptions.Enabled = enabled;
+
+            chkGlacier2.Enabled = enabled;
+            chkIce.Enabled = enabled;
+            chkIceBox.Enabled = enabled;
+            chkIceGrid.Enabled = enabled;
+            chkIcePatch2.Enabled = enabled;
+            chkIceSSL.Enabled = enabled;
+            chkIceStorm.Enabled = enabled;
+        }
+
+        private void formClosing(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            if(!_changed)
+            {
+                if(txtExtraOptions.Modified)
+                {
+                    _changed = true;
+                }
+                else if(txtIceHome.Modified)
+                {
+                    _changed = true;
+                }
+            }
+
+            if(_changed && Util.isSliceBuilderEnabled(_project))
+            {
+                Builder builder = Connect.getBuilder();
+                builder.cleanProject(_project);
+                builder.buildProject(_project, true, vsBuildScope.vsBuildScopeProject);
+            }
+            Cursor = Cursors.Default;
+        }
+
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            Close();
+        }
+
+        private void btnSelectIceHome_Click(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            FolderBrowserDialog dialog = new FolderBrowserDialog();
+            dialog.SelectedPath = Util.getAbsoluteIceHome(_project);
+            dialog.Description = "Select Ice Home Installation Directory";
+            DialogResult result = dialog.ShowDialog();
+            if(result == DialogResult.OK)
+            {
+                Util.updateIceHome(_project, dialog.SelectedPath, false);
+                load();
+                _changed = true;
+            }
+        }
+
+        private void txtIceHome_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if(e.KeyChar == (char)Keys.Return)
+            {
+                updateIceHome();
+                e.Handled = true;
+            }
+        }
+
+        private void txtIceHome_Focus(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+        }
+
+        private void txtIceHome_LostFocus(object sender, EventArgs e)
+        {
+            updateIceHome();
+        }
+
+        private void updateIceHome()
+        {
+            if(!_iceHomeUpdating)
+            {
+                _iceHomeUpdating = true;
+                if(!txtIceHome.Text.Equals(Util.getProjectProperty(_project, Util.PropertyIceHome),
+                                           StringComparison.CurrentCultureIgnoreCase))
+                {
+                    Util.updateIceHome(_project, txtIceHome.Text, false);
+                    load();
+                    _changed = true;
+                    txtIceHome.Modified = false;
+                }
+                _iceHomeUpdating = false;
+            }
+        }
+
+        private void chkIcePrefix_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            Util.setProjectProperty(_project, Util.PropertyIcePrefix, chkIcePrefix.Checked.ToString());
+            _changed = true;
+            Cursor = Cursors.Default;
+        }
+
+        private void chkTie_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            Util.setProjectProperty(_project, Util.PropertyIceTie, chkTie.Checked.ToString());
+            _changed = true;
+            Cursor = Cursors.Default;
+        }
+
+        private void chkStreaming_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            Util.setProjectProperty(_project, Util.PropertyIceStreaming, chkStreaming.Checked.ToString());
+            _changed = true;
+            Cursor = Cursors.Default;
+        }
+        
+        private void chkChecksum_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            Util.setProjectProperty(_project, Util.PropertyIceChecksum, chkChecksum.Checked.ToString());
+            _changed = true;
+            Cursor = Cursors.Default;
+        }
+        
+        private void saveSliceIncludes()
+        {
+            Cursor = Cursors.WaitCursor;
+            IncludePathList paths = new IncludePathList();
+            foreach(String s in includeDirList.Items)
+            {
+                paths.Add(s.Trim());
+            }
+            Util.setProjectProperty(_project, Util.PropertyIceIncludePath, paths.ToString());
+            _changed = true;
+            Cursor = Cursors.Default;
+        }
+
+        private void btnAddInclude_Click(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            includeDirList.Items.Add("");
+            includeDirList.SelectedIndex = includeDirList.Items.Count - 1;
+            _editingIndex = includeDirList.SelectedIndex;
+            beginEditIncludeDir();
+        }
+
+        private void btnRemoveInclude_Click(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            int index = includeDirList.SelectedIndex;
+            if(_editingIncludes)
+            {
+                index = _editingIndex;
+                endEditIncludeDir(false);
+            }
+            
+            if(index > -1 && index < includeDirList.Items.Count)
+            {
+                int selected = index;
+                includeDirList.Items.RemoveAt(selected);
+                if(includeDirList.Items.Count > 0)
+                {
+                    if(selected > 0)
+                    {
+                        selected -= 1;
+                    }
+                    includeDirList.SelectedIndex = selected;
+                }
+                saveSliceIncludes();
+            }
+            Cursor = Cursors.Default;
+        }
+
+        private void btnMoveIncludeUp_Click(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            int index = includeDirList.SelectedIndex;
+            if(index > 0)
+            {
+                string current = includeDirList.SelectedItem.ToString();
+                includeDirList.Items.RemoveAt(index);
+                includeDirList.Items.Insert(index - 1, current);
+                includeDirList.SelectedIndex = index - 1;
+                saveSliceIncludes();
+            }
+            resetIncludeDirChecks();
+            Cursor = Cursors.Default;
+        }
+
+        private void btnMoveIncludeDown_Click(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            int index = includeDirList.SelectedIndex;
+            if(index < includeDirList.Items.Count - 1 && index > -1)
+            {
+                string current = includeDirList.SelectedItem.ToString();
+                includeDirList.Items.RemoveAt(index);
+                includeDirList.Items.Insert(index + 1, current);
+                includeDirList.SelectedIndex = index + 1;
+                saveSliceIncludes();
+                resetIncludeDirChecks();
+            }
+            Cursor = Cursors.Default;
+        }
+
+        private void resetIncludeDirChecks()
+        {
+            _initialized = false;
+            for(int i = 0; i < includeDirList.Items.Count; i++)
+            {
+                String path = includeDirList.Items[i].ToString();
+                if(String.IsNullOrEmpty(path))
+                {
+                    continue;
+                }
+
+                if(Path.IsPathRooted(path))
+                {
+                    includeDirList.SetItemCheckState(i, CheckState.Checked);
+                }
+                else
+                {
+                    includeDirList.SetItemCheckState(i, CheckState.Unchecked);
+                }
+            }
+            _initialized = true;
+        }
+
+        private void includeDirList_ItemCheck(object sender, ItemCheckEventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                return;
+            }
+            string path = includeDirList.Items[e.Index].ToString();
+            if(!Util.containsEnvironmentVars(path))
+            {
+                if (e.NewValue == CheckState.Unchecked)
+                {
+                    path = Util.relativePath(Path.GetDirectoryName(_project.FileName), path);
+                }
+                else if(e.NewValue == CheckState.Checked)
+                {
+                    if (!Path.IsPathRooted(path))
+                    {
+                        path = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(_project.FileName), path));
+                    }
+                }
+            }
+            includeDirList.Items[e.Index] = path;
+            if(_initialized)
+            {
+                saveSliceIncludes();
+            }
+        }
+
+        private void txtExtraOptions_Focus(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+        }
+
+        private void txtExtraOptions_LostFocus(object sender, EventArgs e)
+        {
+            if(txtExtraOptions.Modified)
+            {
+                Util.setProjectProperty(_project, Util.PropertyIceExtraOptions, txtExtraOptions.Text);
+                _changed = true;
+            }
+        }
+        
+        private void componentChanged(string name, bool value)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            if(_initialized)
+            {
+                if(value)
+                {
+                    Util.addDotNetReference(_project, name);
+                }
+                else
+                {
+                    Util.removeDotNetReference(_project, name);
+                }
+                _changed = true;
+            }
+            Cursor = Cursors.Default;        
+        }
+
+        private void chkGlacier2_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("Glacier2", chkGlacier2.Checked);
+        }
+
+        private void chkIce_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("Ice", chkIce.Checked);
+        }
+
+        private void chkIceBox_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IceBox", chkIceBox.Checked);
+        }
+
+        private void chkIceGrid_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IceGrid", chkIceGrid.Checked);
+        }
+
+        private void chkIcePatch2_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IcePatch2", chkIcePatch2.Checked);
+        }
+
+        private void chkIceSSL_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IceSSL", chkIceSSL.Checked);
+        }
+
+        private void chkIceStorm_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IceStorm", chkIceStorm.Checked);
+        }
+
+        private void chkConsole_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            Util.setProjectProperty(_project, Util.PropertyConsoleOutput, chkConsole.Checked.ToString());
+            Cursor = Cursors.Default;
+        }
+
+        private void btnEdit_Click(object sender, EventArgs e)
+        {
+            if(includeDirList.SelectedIndex != -1)
+            {
+                _editingIndex = includeDirList.SelectedIndex;
+                beginEditIncludeDir();
+            }
+        }
+
+        private void includeDirList_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+        }
+
+        private void beginEditIncludeDir()
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            _editingIncludes = true;
+            CancelButton = null;
+            if(_editingIndex != -1)
+            {
+                _txtIncludeDir = new TextBox();
+                _txtIncludeDir.Text = includeDirList.Items[includeDirList.SelectedIndex].ToString();
+
+                includeDirList.SelectionMode = SelectionMode.One;
+
+                Rectangle rect = includeDirList.GetItemRectangle(includeDirList.SelectedIndex);
+                _txtIncludeDir.Location = new Point(includeDirList.Location.X + 2,
+                                                    includeDirList.Location.Y + rect.Y);
+                _txtIncludeDir.Width = includeDirList.Width - 50;
+                _txtIncludeDir.Parent = includeDirList;
+                _txtIncludeDir.KeyDown += new KeyEventHandler(includeDirKeyDown);
+                groupBox1.Controls.Add(_txtIncludeDir);
+
+                _btnSelectInclude = new Button();
+                _btnSelectInclude.Text = "...";
+                _btnSelectInclude.Location = new Point(includeDirList.Location.X + _txtIncludeDir.Width,
+                                                       includeDirList.Location.Y + rect.Y);
+                _btnSelectInclude.Width = 49;
+                _btnSelectInclude.Height = _txtIncludeDir.Height;
+                _btnSelectInclude.Click += new EventHandler(selectIncludeClicked);
+                groupBox1.Controls.Add(_btnSelectInclude);
+
+
+                _txtIncludeDir.Show();
+                _txtIncludeDir.BringToFront();
+                _txtIncludeDir.Focus();
+
+                _btnSelectInclude.Show();
+                _btnSelectInclude.BringToFront();
+            }
+        }
+
+        private void endEditIncludeDir(bool saveChanges)
+        {
+            _initialized = false;
+            if(!_editingIncludes)
+            {
+                _initialized = true;
+                return;
+            }
+            _editingIncludes = false;
+            String path = null;
+            if(_editingIndex > -1 && _editingIndex < includeDirList.Items.Count)
+            {
+                path = includeDirList.Items[_editingIndex].ToString();
+            }
+
+            lock(this)
+            {
+                CancelButton = btnClose;
+                if(_txtIncludeDir == null || _btnSelectInclude == null)
+                {
+                    _initialized = true;
+                    return;
+                }
+                if(saveChanges)
+                {
+                    path = _txtIncludeDir.Text;
+                    if(path != null)
+                    {
+                        path = path.Trim();
+                    }
+                }
+
+                this.groupBox1.Controls.Remove(_txtIncludeDir);
+                _txtIncludeDir = null;
+
+                this.groupBox1.Controls.Remove(_btnSelectInclude);
+                _btnSelectInclude = null;
+            }
+
+            if(String.IsNullOrEmpty(path))
+            {
+                if(_editingIndex != -1)
+                {
+                    includeDirList.Items.RemoveAt(_editingIndex);
+                    includeDirList.SelectedIndex = includeDirList.Items.Count - 1;
+                    _editingIndex = -1;
+                    saveSliceIncludes();
+                }
+            }
+            else if(_editingIndex != -1 && saveChanges)
+            {
+                if(!path.Equals(includeDirList.Items[_editingIndex].ToString(),
+                                               StringComparison.CurrentCultureIgnoreCase))
+                {
+                    includeDirList.Items[_editingIndex] = path;
+                    if(Path.IsPathRooted(path))
+                    {
+                        includeDirList.SetItemCheckState(_editingIndex, CheckState.Checked);
+                    }
+                    else
+                    {
+                        includeDirList.SetItemCheckState(_editingIndex, CheckState.Unchecked);
+                    }
+                    saveSliceIncludes();
+                }
+            }
+            resetIncludeDirChecks();
+        }
+
+        private void includeDirKeyDown(object sender, KeyEventArgs e)
+        {
+            if(e.KeyCode.Equals(Keys.Escape))
+            {
+                endEditIncludeDir(false);
+            }
+            if(e.KeyCode.Equals(Keys.Enter))
+            {
+                endEditIncludeDir(true);
+            }
+        }
+
+        private void selectIncludeClicked(object sender, EventArgs e)
+        {
+            FolderBrowserDialog dialog = new FolderBrowserDialog();
+            string projectDir = Path.GetFullPath(Path.GetDirectoryName(_project.FileName));
+            dialog.SelectedPath = projectDir;
+            dialog.Description = "Slice Include Directory";
+            DialogResult result = dialog.ShowDialog();
+            if(result == DialogResult.OK)
+            {
+                string path = dialog.SelectedPath;
+                if(!Util.containsEnvironmentVars(path))
+                {
+                    path = Util.relativePath(projectDir, Path.GetFullPath(path));
+                }
+                _txtIncludeDir.Text = path;
+            }
+            endEditIncludeDir(true);
+        }
+
+        private int _editingIndex = -1;
+        private bool _editingIncludes;
+        private bool _changed;
+        private bool _initialized;
+        private Project _project;
+        private bool _iceHomeUpdating;
+        private TextBox _txtIncludeDir;
+        private Button _btnSelectInclude;
+    }
+}
diff --git a/vsplugin/src/IceCsharpConfigurationDialog.resx b/vsplugin/src/IceCsharpConfigurationDialog.resx
index a5979aadfff..a499e2cedc5 100644
--- a/vsplugin/src/IceCsharpConfigurationDialog.resx
+++ b/vsplugin/src/IceCsharpConfigurationDialog.resx
@@ -120,4 +120,4 @@
   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>17, 17</value>

   </metadata>

-</root>
\ No newline at end of file
+</root>

diff --git a/vsplugin/src/IceSilverlightConfigurationDialog.Designer.cs b/vsplugin/src/IceSilverlightConfigurationDialog.Designer.cs
index 3e561fa6a02..8a5f54666aa 100644
--- a/vsplugin/src/IceSilverlightConfigurationDialog.Designer.cs
+++ b/vsplugin/src/IceSilverlightConfigurationDialog.Designer.cs
@@ -1,340 +1,340 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-namespace Ice.VisualStudio

-{

-    partial class IceSilverlightConfigurationDialog

-    {

-        /// <summary>

-        /// Required designer variable.

-        /// </summary>

-        private System.ComponentModel.IContainer components = null;

-

-        /// <summary>

-        /// Clean up any resources being used.

-        /// </summary>

-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>

-        protected override void Dispose(bool disposing)

-        {

-            if (disposing && (components != null))

-            {

-                components.Dispose();

-            }

-            base.Dispose(disposing);

-        }

-

-        #region Windows Form Designer generated code

-

-        /// <summary>

-        /// Required method for Designer support - do not modify

-        /// the contents of this method with the code editor.

-        /// </summary>

-        private void InitializeComponent()

-        {

-            this.components = new System.ComponentModel.Container();

-            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();

-            this.groupBox1 = new System.Windows.Forms.GroupBox();

-            this.btnEditInclude = new System.Windows.Forms.Button();

-            this.includeInfo = new System.Windows.Forms.Label();

-            this.btnMoveIncludeDown = new System.Windows.Forms.Button();

-            this.btnMoveIncludeUp = new System.Windows.Forms.Button();

-            this.btnRemoveInclude = new System.Windows.Forms.Button();

-            this.btnAddInclude = new System.Windows.Forms.Button();

-            this.includeDirList = new System.Windows.Forms.CheckedListBox();

-            this.groupBox2 = new System.Windows.Forms.GroupBox();

-            this.txtExtraOptions = new System.Windows.Forms.TextBox();

-            this.groupBox3 = new System.Windows.Forms.GroupBox();

-            this.chkIceSl = new System.Windows.Forms.CheckBox();

-            this.groupBox4 = new System.Windows.Forms.GroupBox();

-            this.chkConsole = new System.Windows.Forms.CheckBox();

-            this.chkIcePrefix = new System.Windows.Forms.CheckBox();

-            this.btnClose = new System.Windows.Forms.Button();

-            this.groupBox5 = new System.Windows.Forms.GroupBox();

-            this.btnSelectIceHome = new System.Windows.Forms.Button();

-            this.txtIceHome = new System.Windows.Forms.TextBox();

-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);

-            this.groupBox1.SuspendLayout();

-            this.groupBox2.SuspendLayout();

-            this.groupBox3.SuspendLayout();

-            this.groupBox4.SuspendLayout();

-            this.groupBox5.SuspendLayout();

-            this.SuspendLayout();

-            // 

-            // chkEnableBuilder

-            // 

-            this.chkEnableBuilder.AutoSize = true;

-            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);

-            this.chkEnableBuilder.Name = "chkEnableBuilder";

-            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);

-            this.chkEnableBuilder.TabIndex = 0;

-            this.chkEnableBuilder.Text = "Enable Ice Builder";

-            this.chkEnableBuilder.UseVisualStyleBackColor = true;

-            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);

-            // 

-            // groupBox1

-            // 

-            this.groupBox1.Controls.Add(this.btnEditInclude);

-            this.groupBox1.Controls.Add(this.includeInfo);

-            this.groupBox1.Controls.Add(this.btnMoveIncludeDown);

-            this.groupBox1.Controls.Add(this.btnMoveIncludeUp);

-            this.groupBox1.Controls.Add(this.btnRemoveInclude);

-            this.groupBox1.Controls.Add(this.btnAddInclude);

-            this.groupBox1.Controls.Add(this.includeDirList);

-            this.groupBox1.Location = new System.Drawing.Point(12, 210);

-            this.groupBox1.Name = "groupBox1";

-            this.groupBox1.Size = new System.Drawing.Size(487, 169);

-            this.groupBox1.TabIndex = 1;

-            this.groupBox1.TabStop = false;

-            this.groupBox1.Text = "Slice Include Path";

-            // 

-            // btnEditInclude

-            // 

-            this.btnEditInclude.Location = new System.Drawing.Point(405, 49);

-            this.btnEditInclude.Name = "btnEditInclude";

-            this.btnEditInclude.Size = new System.Drawing.Size(75, 23);

-            this.btnEditInclude.TabIndex = 13;

-            this.btnEditInclude.Text = "Edit";

-            this.btnEditInclude.UseVisualStyleBackColor = true;

-            this.btnEditInclude.Click += new System.EventHandler(this.btnEdit_Click);

-            // 

-            // includeInfo

-            // 

-            this.includeInfo.AutoSize = true;

-            this.includeInfo.Location = new System.Drawing.Point(7, 149);

-            this.includeInfo.Name = "includeInfo";

-            this.includeInfo.Size = new System.Drawing.Size(315, 13);

-            this.includeInfo.TabIndex = 12;

-            this.includeInfo.Text = "Select checkboxes for absolute paths, deselect for relative paths.";

-            // 

-            // btnMoveIncludeDown

-            // 

-            this.btnMoveIncludeDown.Location = new System.Drawing.Point(405, 139);

-            this.btnMoveIncludeDown.Name = "btnMoveIncludeDown";

-            this.btnMoveIncludeDown.Size = new System.Drawing.Size(75, 23);

-            this.btnMoveIncludeDown.TabIndex = 11;

-            this.btnMoveIncludeDown.Text = "Down";

-            this.btnMoveIncludeDown.UseVisualStyleBackColor = true;

-            this.btnMoveIncludeDown.Click += new System.EventHandler(this.btnMoveIncludeDown_Click);

-            // 

-            // btnMoveIncludeUp

-            // 

-            this.btnMoveIncludeUp.Location = new System.Drawing.Point(405, 109);

-            this.btnMoveIncludeUp.Name = "btnMoveIncludeUp";

-            this.btnMoveIncludeUp.Size = new System.Drawing.Size(75, 23);

-            this.btnMoveIncludeUp.TabIndex = 10;

-            this.btnMoveIncludeUp.Text = "Up";

-            this.btnMoveIncludeUp.UseVisualStyleBackColor = true;

-            this.btnMoveIncludeUp.Click += new System.EventHandler(this.btnMoveIncludeUp_Click);

-            // 

-            // btnRemoveInclude

-            // 

-            this.btnRemoveInclude.Location = new System.Drawing.Point(405, 79);

-            this.btnRemoveInclude.Name = "btnRemoveInclude";

-            this.btnRemoveInclude.Size = new System.Drawing.Size(75, 23);

-            this.btnRemoveInclude.TabIndex = 9;

-            this.btnRemoveInclude.Text = "Remove";

-            this.btnRemoveInclude.UseVisualStyleBackColor = true;

-            this.btnRemoveInclude.Click += new System.EventHandler(this.btnRemoveInclude_Click);

-            // 

-            // btnAddInclude

-            // 

-            this.btnAddInclude.Location = new System.Drawing.Point(405, 19);

-            this.btnAddInclude.Name = "btnAddInclude";

-            this.btnAddInclude.Size = new System.Drawing.Size(75, 23);

-            this.btnAddInclude.TabIndex = 8;

-            this.btnAddInclude.Text = "Add";

-            this.btnAddInclude.UseVisualStyleBackColor = true;

-            this.btnAddInclude.Click += new System.EventHandler(this.btnAddInclude_Click);

-            // 

-            // includeDirList

-            // 

-            this.includeDirList.FormattingEnabled = true;

-            this.includeDirList.Location = new System.Drawing.Point(6, 22);

-            this.includeDirList.Name = "includeDirList";

-            this.includeDirList.Size = new System.Drawing.Size(390, 124);

-            this.includeDirList.TabIndex = 7;

-            this.includeDirList.SelectedIndexChanged += new System.EventHandler(this.includeDirList_SelectedIndexChanged);

-            this.includeDirList.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.includeDirList_ItemCheck);

-            // 

-            // groupBox2

-            // 

-            this.groupBox2.Controls.Add(this.txtExtraOptions);

-            this.groupBox2.Location = new System.Drawing.Point(12, 138);

-            this.groupBox2.Name = "groupBox2";

-            this.groupBox2.Size = new System.Drawing.Size(487, 66);

-            this.groupBox2.TabIndex = 2;

-            this.groupBox2.TabStop = false;

-            this.groupBox2.Text = "Extra Compiler Options";

-            // 

-            // txtExtraOptions

-            // 

-            this.txtExtraOptions.Location = new System.Drawing.Point(6, 19);

-            this.txtExtraOptions.Multiline = true;

-            this.txtExtraOptions.Name = "txtExtraOptions";

-            this.txtExtraOptions.Size = new System.Drawing.Size(474, 40);

-            this.txtExtraOptions.TabIndex = 6;

-            this.txtExtraOptions.LostFocus += new System.EventHandler(this.txtExtraOptions_LostFocus);

-            this.txtExtraOptions.Enter += new System.EventHandler(this.txtExtraOptions_Focus);

-            // 

-            // groupBox3

-            // 

-            this.groupBox3.Controls.Add(this.chkIceSl);

-            this.groupBox3.Location = new System.Drawing.Point(12, 385);

-            this.groupBox3.Name = "groupBox3";

-            this.groupBox3.Size = new System.Drawing.Size(487, 47);

-            this.groupBox3.TabIndex = 3;

-            this.groupBox3.TabStop = false;

-            this.groupBox3.Text = "Ice Components";

-            // 

-            // chkIceSl

-            // 

-            this.chkIceSl.AutoSize = true;

-            this.chkIceSl.Location = new System.Drawing.Point(10, 19);

-            this.chkIceSl.Name = "chkIceSl";

-            this.chkIceSl.Size = new System.Drawing.Size(50, 17);

-            this.chkIceSl.TabIndex = 1;

-            this.chkIceSl.TabStop = false;

-            this.chkIceSl.Text = "IceSl";

-            this.chkIceSl.UseVisualStyleBackColor = true;

-            this.chkIceSl.CheckedChanged += new System.EventHandler(this.chkIce_CheckedChanged);

-            // 

-            // groupBox4

-            // 

-            this.groupBox4.Controls.Add(this.chkConsole);

-            this.groupBox4.Controls.Add(this.chkIcePrefix);

-            this.groupBox4.Location = new System.Drawing.Point(12, 88);

-            this.groupBox4.Name = "groupBox4";

-            this.groupBox4.Size = new System.Drawing.Size(487, 44);

-            this.groupBox4.TabIndex = 4;

-            this.groupBox4.TabStop = false;

-            this.groupBox4.Text = "Slice Compiler Options";

-            // 

-            // chkConsole

-            // 

-            this.chkConsole.AutoSize = true;

-            this.chkConsole.Location = new System.Drawing.Point(86, 19);

-            this.chkConsole.Name = "chkConsole";

-            this.chkConsole.Size = new System.Drawing.Size(99, 17);

-            this.chkConsole.TabIndex = 4;

-            this.chkConsole.Text = "Console Output";

-            this.chkConsole.UseVisualStyleBackColor = true;

-            this.chkConsole.CheckedChanged += new System.EventHandler(this.chkConsole_CheckedChanged);

-            // 

-            // chkIcePrefix

-            // 

-            this.chkIcePrefix.AutoSize = true;

-            this.chkIcePrefix.Location = new System.Drawing.Point(10, 19);

-            this.chkIcePrefix.Name = "chkIcePrefix";

-            this.chkIcePrefix.Size = new System.Drawing.Size(41, 17);

-            this.chkIcePrefix.TabIndex = 2;

-            this.chkIcePrefix.Text = "Ice";

-            this.chkIcePrefix.UseVisualStyleBackColor = true;

-            this.chkIcePrefix.CheckedChanged += new System.EventHandler(this.chkIcePrefix_CheckedChanged);

-            // 

-            // btnClose

-            // 

-            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;

-            this.btnClose.Location = new System.Drawing.Point(423, 438);

-            this.btnClose.Name = "btnClose";

-            this.btnClose.Size = new System.Drawing.Size(75, 23);

-            this.btnClose.TabIndex = 5;

-            this.btnClose.Text = "Close";

-            this.btnClose.UseVisualStyleBackColor = true;

-            this.btnClose.Click += new System.EventHandler(this.btnCancel_Click);

-            // 

-            // groupBox5

-            // 

-            this.groupBox5.Controls.Add(this.btnSelectIceHome);

-            this.groupBox5.Controls.Add(this.txtIceHome);

-            this.groupBox5.Location = new System.Drawing.Point(12, 37);

-            this.groupBox5.Name = "groupBox5";

-            this.groupBox5.Size = new System.Drawing.Size(486, 45);

-            this.groupBox5.TabIndex = 6;

-            this.groupBox5.TabStop = false;

-            this.groupBox5.Text = "Ice Home";

-            // 

-            // btnSelectIceHome

-            // 

-            this.btnSelectIceHome.Location = new System.Drawing.Point(405, 16);

-            this.btnSelectIceHome.Name = "btnSelectIceHome";

-            this.btnSelectIceHome.Size = new System.Drawing.Size(75, 23);

-            this.btnSelectIceHome.TabIndex = 1;

-            this.btnSelectIceHome.Text = "....";

-            this.btnSelectIceHome.UseVisualStyleBackColor = true;

-            this.btnSelectIceHome.Click += new System.EventHandler(this.btnSelectIceHome_Click);

-            // 

-            // txtIceHome

-            // 

-            this.txtIceHome.Location = new System.Drawing.Point(10, 20);

-            this.txtIceHome.Name = "txtIceHome";

-            this.txtIceHome.Size = new System.Drawing.Size(386, 20);

-            this.txtIceHome.TabIndex = 0;

-            this.txtIceHome.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtIceHome_KeyPress);

-            this.txtIceHome.LostFocus += new System.EventHandler(this.txtIceHome_LostFocus);

-            this.txtIceHome.Enter += new System.EventHandler(this.txtIceHome_Focus);

-            // 

-            // IceSilverlightConfigurationDialog

-            // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.CancelButton = this.btnClose;

-            this.ClientSize = new System.Drawing.Size(515, 472);

-            this.Controls.Add(this.groupBox5);

-            this.Controls.Add(this.btnClose);

-            this.Controls.Add(this.groupBox4);

-            this.Controls.Add(this.groupBox3);

-            this.Controls.Add(this.groupBox2);

-            this.Controls.Add(this.groupBox1);

-            this.Controls.Add(this.chkEnableBuilder);

-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;

-            this.MaximizeBox = false;

-            this.Name = "IceSilverlightConfigurationDialog";

-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

-            this.Text = "Ice Configuration";

-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing);

-            this.groupBox1.ResumeLayout(false);

-            this.groupBox1.PerformLayout();

-            this.groupBox2.ResumeLayout(false);

-            this.groupBox2.PerformLayout();

-            this.groupBox3.ResumeLayout(false);

-            this.groupBox3.PerformLayout();

-            this.groupBox4.ResumeLayout(false);

-            this.groupBox4.PerformLayout();

-            this.groupBox5.ResumeLayout(false);

-            this.groupBox5.PerformLayout();

-            this.ResumeLayout(false);

-            this.PerformLayout();

-

-        }

-

-        #endregion

-

-        private System.Windows.Forms.CheckBox chkEnableBuilder;

-        private System.Windows.Forms.GroupBox groupBox1;

-        private System.Windows.Forms.Button btnMoveIncludeDown;

-        private System.Windows.Forms.Button btnMoveIncludeUp;

-        private System.Windows.Forms.Button btnRemoveInclude;

-        private System.Windows.Forms.Button btnAddInclude;

-        private System.Windows.Forms.CheckedListBox includeDirList;

-        private System.Windows.Forms.GroupBox groupBox2;

-        private System.Windows.Forms.TextBox txtExtraOptions;

-        private System.Windows.Forms.GroupBox groupBox3;

-        private System.Windows.Forms.CheckBox chkIceSl;

-        private System.Windows.Forms.GroupBox groupBox4;

-        private System.Windows.Forms.CheckBox chkIcePrefix;

-        private System.Windows.Forms.Button btnClose;

-        private System.Windows.Forms.GroupBox groupBox5;

-        private System.Windows.Forms.Button btnSelectIceHome;

-        private System.Windows.Forms.TextBox txtIceHome;

-        private System.Windows.Forms.ToolTip toolTip;

-        private System.Windows.Forms.CheckBox chkConsole;

-        private System.Windows.Forms.Label includeInfo;

-        private System.Windows.Forms.Button btnEditInclude;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+namespace Ice.VisualStudio
+{
+    partial class IceSilverlightConfigurationDialog
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.btnEditInclude = new System.Windows.Forms.Button();
+            this.includeInfo = new System.Windows.Forms.Label();
+            this.btnMoveIncludeDown = new System.Windows.Forms.Button();
+            this.btnMoveIncludeUp = new System.Windows.Forms.Button();
+            this.btnRemoveInclude = new System.Windows.Forms.Button();
+            this.btnAddInclude = new System.Windows.Forms.Button();
+            this.includeDirList = new System.Windows.Forms.CheckedListBox();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.txtExtraOptions = new System.Windows.Forms.TextBox();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.chkIceSl = new System.Windows.Forms.CheckBox();
+            this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.chkConsole = new System.Windows.Forms.CheckBox();
+            this.chkIcePrefix = new System.Windows.Forms.CheckBox();
+            this.btnClose = new System.Windows.Forms.Button();
+            this.groupBox5 = new System.Windows.Forms.GroupBox();
+            this.btnSelectIceHome = new System.Windows.Forms.Button();
+            this.txtIceHome = new System.Windows.Forms.TextBox();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            this.groupBox3.SuspendLayout();
+            this.groupBox4.SuspendLayout();
+            this.groupBox5.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // chkEnableBuilder
+            // 
+            this.chkEnableBuilder.AutoSize = true;
+            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);
+            this.chkEnableBuilder.Name = "chkEnableBuilder";
+            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);
+            this.chkEnableBuilder.TabIndex = 0;
+            this.chkEnableBuilder.Text = "Enable Ice Builder";
+            this.chkEnableBuilder.UseVisualStyleBackColor = true;
+            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.btnEditInclude);
+            this.groupBox1.Controls.Add(this.includeInfo);
+            this.groupBox1.Controls.Add(this.btnMoveIncludeDown);
+            this.groupBox1.Controls.Add(this.btnMoveIncludeUp);
+            this.groupBox1.Controls.Add(this.btnRemoveInclude);
+            this.groupBox1.Controls.Add(this.btnAddInclude);
+            this.groupBox1.Controls.Add(this.includeDirList);
+            this.groupBox1.Location = new System.Drawing.Point(12, 210);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(487, 169);
+            this.groupBox1.TabIndex = 1;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Slice Include Path";
+            // 
+            // btnEditInclude
+            // 
+            this.btnEditInclude.Location = new System.Drawing.Point(405, 49);
+            this.btnEditInclude.Name = "btnEditInclude";
+            this.btnEditInclude.Size = new System.Drawing.Size(75, 23);
+            this.btnEditInclude.TabIndex = 13;
+            this.btnEditInclude.Text = "Edit";
+            this.btnEditInclude.UseVisualStyleBackColor = true;
+            this.btnEditInclude.Click += new System.EventHandler(this.btnEdit_Click);
+            // 
+            // includeInfo
+            // 
+            this.includeInfo.AutoSize = true;
+            this.includeInfo.Location = new System.Drawing.Point(7, 149);
+            this.includeInfo.Name = "includeInfo";
+            this.includeInfo.Size = new System.Drawing.Size(315, 13);
+            this.includeInfo.TabIndex = 12;
+            this.includeInfo.Text = "Select checkboxes for absolute paths, deselect for relative paths.";
+            // 
+            // btnMoveIncludeDown
+            // 
+            this.btnMoveIncludeDown.Location = new System.Drawing.Point(405, 139);
+            this.btnMoveIncludeDown.Name = "btnMoveIncludeDown";
+            this.btnMoveIncludeDown.Size = new System.Drawing.Size(75, 23);
+            this.btnMoveIncludeDown.TabIndex = 11;
+            this.btnMoveIncludeDown.Text = "Down";
+            this.btnMoveIncludeDown.UseVisualStyleBackColor = true;
+            this.btnMoveIncludeDown.Click += new System.EventHandler(this.btnMoveIncludeDown_Click);
+            // 
+            // btnMoveIncludeUp
+            // 
+            this.btnMoveIncludeUp.Location = new System.Drawing.Point(405, 109);
+            this.btnMoveIncludeUp.Name = "btnMoveIncludeUp";
+            this.btnMoveIncludeUp.Size = new System.Drawing.Size(75, 23);
+            this.btnMoveIncludeUp.TabIndex = 10;
+            this.btnMoveIncludeUp.Text = "Up";
+            this.btnMoveIncludeUp.UseVisualStyleBackColor = true;
+            this.btnMoveIncludeUp.Click += new System.EventHandler(this.btnMoveIncludeUp_Click);
+            // 
+            // btnRemoveInclude
+            // 
+            this.btnRemoveInclude.Location = new System.Drawing.Point(405, 79);
+            this.btnRemoveInclude.Name = "btnRemoveInclude";
+            this.btnRemoveInclude.Size = new System.Drawing.Size(75, 23);
+            this.btnRemoveInclude.TabIndex = 9;
+            this.btnRemoveInclude.Text = "Remove";
+            this.btnRemoveInclude.UseVisualStyleBackColor = true;
+            this.btnRemoveInclude.Click += new System.EventHandler(this.btnRemoveInclude_Click);
+            // 
+            // btnAddInclude
+            // 
+            this.btnAddInclude.Location = new System.Drawing.Point(405, 19);
+            this.btnAddInclude.Name = "btnAddInclude";
+            this.btnAddInclude.Size = new System.Drawing.Size(75, 23);
+            this.btnAddInclude.TabIndex = 8;
+            this.btnAddInclude.Text = "Add";
+            this.btnAddInclude.UseVisualStyleBackColor = true;
+            this.btnAddInclude.Click += new System.EventHandler(this.btnAddInclude_Click);
+            // 
+            // includeDirList
+            // 
+            this.includeDirList.FormattingEnabled = true;
+            this.includeDirList.Location = new System.Drawing.Point(6, 22);
+            this.includeDirList.Name = "includeDirList";
+            this.includeDirList.Size = new System.Drawing.Size(390, 124);
+            this.includeDirList.TabIndex = 7;
+            this.includeDirList.SelectedIndexChanged += new System.EventHandler(this.includeDirList_SelectedIndexChanged);
+            this.includeDirList.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.includeDirList_ItemCheck);
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.txtExtraOptions);
+            this.groupBox2.Location = new System.Drawing.Point(12, 138);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(487, 66);
+            this.groupBox2.TabIndex = 2;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "Extra Compiler Options";
+            // 
+            // txtExtraOptions
+            // 
+            this.txtExtraOptions.Location = new System.Drawing.Point(6, 19);
+            this.txtExtraOptions.Multiline = true;
+            this.txtExtraOptions.Name = "txtExtraOptions";
+            this.txtExtraOptions.Size = new System.Drawing.Size(474, 40);
+            this.txtExtraOptions.TabIndex = 6;
+            this.txtExtraOptions.LostFocus += new System.EventHandler(this.txtExtraOptions_LostFocus);
+            this.txtExtraOptions.Enter += new System.EventHandler(this.txtExtraOptions_Focus);
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.chkIceSl);
+            this.groupBox3.Location = new System.Drawing.Point(12, 385);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(487, 47);
+            this.groupBox3.TabIndex = 3;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "Ice Components";
+            // 
+            // chkIceSl
+            // 
+            this.chkIceSl.AutoSize = true;
+            this.chkIceSl.Location = new System.Drawing.Point(10, 19);
+            this.chkIceSl.Name = "chkIceSl";
+            this.chkIceSl.Size = new System.Drawing.Size(50, 17);
+            this.chkIceSl.TabIndex = 1;
+            this.chkIceSl.TabStop = false;
+            this.chkIceSl.Text = "IceSl";
+            this.chkIceSl.UseVisualStyleBackColor = true;
+            this.chkIceSl.CheckedChanged += new System.EventHandler(this.chkIce_CheckedChanged);
+            // 
+            // groupBox4
+            // 
+            this.groupBox4.Controls.Add(this.chkConsole);
+            this.groupBox4.Controls.Add(this.chkIcePrefix);
+            this.groupBox4.Location = new System.Drawing.Point(12, 88);
+            this.groupBox4.Name = "groupBox4";
+            this.groupBox4.Size = new System.Drawing.Size(487, 44);
+            this.groupBox4.TabIndex = 4;
+            this.groupBox4.TabStop = false;
+            this.groupBox4.Text = "Slice Compiler Options";
+            // 
+            // chkConsole
+            // 
+            this.chkConsole.AutoSize = true;
+            this.chkConsole.Location = new System.Drawing.Point(86, 19);
+            this.chkConsole.Name = "chkConsole";
+            this.chkConsole.Size = new System.Drawing.Size(99, 17);
+            this.chkConsole.TabIndex = 4;
+            this.chkConsole.Text = "Console Output";
+            this.chkConsole.UseVisualStyleBackColor = true;
+            this.chkConsole.CheckedChanged += new System.EventHandler(this.chkConsole_CheckedChanged);
+            // 
+            // chkIcePrefix
+            // 
+            this.chkIcePrefix.AutoSize = true;
+            this.chkIcePrefix.Location = new System.Drawing.Point(10, 19);
+            this.chkIcePrefix.Name = "chkIcePrefix";
+            this.chkIcePrefix.Size = new System.Drawing.Size(41, 17);
+            this.chkIcePrefix.TabIndex = 2;
+            this.chkIcePrefix.Text = "Ice";
+            this.chkIcePrefix.UseVisualStyleBackColor = true;
+            this.chkIcePrefix.CheckedChanged += new System.EventHandler(this.chkIcePrefix_CheckedChanged);
+            // 
+            // btnClose
+            // 
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnClose.Location = new System.Drawing.Point(423, 438);
+            this.btnClose.Name = "btnClose";
+            this.btnClose.Size = new System.Drawing.Size(75, 23);
+            this.btnClose.TabIndex = 5;
+            this.btnClose.Text = "Close";
+            this.btnClose.UseVisualStyleBackColor = true;
+            this.btnClose.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // groupBox5
+            // 
+            this.groupBox5.Controls.Add(this.btnSelectIceHome);
+            this.groupBox5.Controls.Add(this.txtIceHome);
+            this.groupBox5.Location = new System.Drawing.Point(12, 37);
+            this.groupBox5.Name = "groupBox5";
+            this.groupBox5.Size = new System.Drawing.Size(486, 45);
+            this.groupBox5.TabIndex = 6;
+            this.groupBox5.TabStop = false;
+            this.groupBox5.Text = "Ice Home";
+            // 
+            // btnSelectIceHome
+            // 
+            this.btnSelectIceHome.Location = new System.Drawing.Point(405, 16);
+            this.btnSelectIceHome.Name = "btnSelectIceHome";
+            this.btnSelectIceHome.Size = new System.Drawing.Size(75, 23);
+            this.btnSelectIceHome.TabIndex = 1;
+            this.btnSelectIceHome.Text = "....";
+            this.btnSelectIceHome.UseVisualStyleBackColor = true;
+            this.btnSelectIceHome.Click += new System.EventHandler(this.btnSelectIceHome_Click);
+            // 
+            // txtIceHome
+            // 
+            this.txtIceHome.Location = new System.Drawing.Point(10, 20);
+            this.txtIceHome.Name = "txtIceHome";
+            this.txtIceHome.Size = new System.Drawing.Size(386, 20);
+            this.txtIceHome.TabIndex = 0;
+            this.txtIceHome.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtIceHome_KeyPress);
+            this.txtIceHome.LostFocus += new System.EventHandler(this.txtIceHome_LostFocus);
+            this.txtIceHome.Enter += new System.EventHandler(this.txtIceHome_Focus);
+            // 
+            // IceSilverlightConfigurationDialog
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnClose;
+            this.ClientSize = new System.Drawing.Size(515, 472);
+            this.Controls.Add(this.groupBox5);
+            this.Controls.Add(this.btnClose);
+            this.Controls.Add(this.groupBox4);
+            this.Controls.Add(this.groupBox3);
+            this.Controls.Add(this.groupBox2);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.chkEnableBuilder);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.MaximizeBox = false;
+            this.Name = "IceSilverlightConfigurationDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Ice Configuration";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
+            this.groupBox4.ResumeLayout(false);
+            this.groupBox4.PerformLayout();
+            this.groupBox5.ResumeLayout(false);
+            this.groupBox5.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.CheckBox chkEnableBuilder;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.Button btnMoveIncludeDown;
+        private System.Windows.Forms.Button btnMoveIncludeUp;
+        private System.Windows.Forms.Button btnRemoveInclude;
+        private System.Windows.Forms.Button btnAddInclude;
+        private System.Windows.Forms.CheckedListBox includeDirList;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.TextBox txtExtraOptions;
+        private System.Windows.Forms.GroupBox groupBox3;
+        private System.Windows.Forms.CheckBox chkIceSl;
+        private System.Windows.Forms.GroupBox groupBox4;
+        private System.Windows.Forms.CheckBox chkIcePrefix;
+        private System.Windows.Forms.Button btnClose;
+        private System.Windows.Forms.GroupBox groupBox5;
+        private System.Windows.Forms.Button btnSelectIceHome;
+        private System.Windows.Forms.TextBox txtIceHome;
+        private System.Windows.Forms.ToolTip toolTip;
+        private System.Windows.Forms.CheckBox chkConsole;
+        private System.Windows.Forms.Label includeInfo;
+        private System.Windows.Forms.Button btnEditInclude;
+    }
+}
diff --git a/vsplugin/src/IceSilverlightConfigurationDialog.cs b/vsplugin/src/IceSilverlightConfigurationDialog.cs
index 54d938f66b1..8920c76cc73 100644
--- a/vsplugin/src/IceSilverlightConfigurationDialog.cs
+++ b/vsplugin/src/IceSilverlightConfigurationDialog.cs
@@ -1,621 +1,621 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.ComponentModel;

-using System.Data;

-using System.Drawing;

-using System.IO;

-using System.Text;

-using System.Windows.Forms;

-

-using EnvDTE;

-

-namespace Ice.VisualStudio

-{

-    public partial class IceSilverlightConfigurationDialog : Form

-    {

-        public IceSilverlightConfigurationDialog(Project project)

-        {

-            InitializeComponent();

-            _project = project;

-            

-            //

-            // Set the toolTip messages.

-            //

-            toolTip.SetToolTip(txtIceHome, "Ice Installation Directory.");

-            toolTip.SetToolTip(btnSelectIceHome, "Ice Installation Directory.");

-            toolTip.SetToolTip(chkIcePrefix, "Allow Ice prefix (--ice).");

-            toolTip.SetToolTip(chkConsole, "Enable console output.");

-

-

-            if(_project != null)

-            {

-                this.Text = "Ice Configuration - Project: " + _project.Name;

-                bool enabled = Util.isSliceBuilderEnabled(project);

-                setEnabled(enabled);

-                chkEnableBuilder.Checked = enabled;

-                load();

-                _initialized = true;

-            }

-        }

-        

-        private void load()

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_project != null)

-            {

-                includeDirList.Items.Clear();

-                txtIceHome.Text = Util.getIceHomeRaw(_project, false);

-                txtExtraOptions.Text = Util.getProjectProperty(_project, Util.PropertyIceExtraOptions);

-

-                chkIcePrefix.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIcePrefix);

-                chkConsole.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyConsoleOutput);

-                

-                IncludePathList list =

-                    new IncludePathList(Util.getProjectProperty(_project, Util.PropertyIceIncludePath));

-                foreach(String s in list)

-                {

-                    includeDirList.Items.Add(s.Trim());

-                    if(Path.IsPathRooted(s.Trim()))

-                    {

-                        includeDirList.SetItemCheckState(includeDirList.Items.Count - 1, CheckState.Checked);

-                    }

-                }

-

-                ComponentList selectedComponents = Util.getIceSilverlightComponents(_project);

-                foreach(String s in Util.getSilverlightNames())

-                {

-                    if(selectedComponents.Contains(s))

-                    {

-                        checkComponent(s, true);

-                    }

-                    else

-                    {

-                        checkComponent(s, false);

-                    }

-                }

-            }

-            Cursor = Cursors.Default;

-        }

-

-        private void checkComponent(String component, bool check)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            switch (component)

-            {

-                case "IceSL":

-                {

-                    chkIceSl.Checked = check;

-                    break;

-                }

-                default:

-                {

-                    break;

-                }

-            }

-        }

-        private void chkEnableBuilder_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            if(_initialized)

-            {

-                _initialized = false;

-                setEnabled(false);

-                chkEnableBuilder.Enabled = false;

-                Builder builder = Connect.getBuilder();

-                if(chkEnableBuilder.Checked)

-                {

-                    builder.addBuilderToProject(_project);

-                }

-                else

-                {

-                    builder.removeBuilderFromProject(_project);

-                }

-                load();

-                chkEnableBuilder.Enabled = true;

-                setEnabled(chkEnableBuilder.Checked);

-                _initialized = true;

-            }

-            Cursor = Cursors.Default;

-        }

-        

-        private void setEnabled(bool enabled)

-        {

-            txtIceHome.Enabled = enabled;

-            btnSelectIceHome.Enabled = enabled;

-

-            chkIcePrefix.Enabled = enabled;

-            chkConsole.Enabled = enabled;

-            

-            includeDirList.Enabled = enabled;

-            btnAddInclude.Enabled = enabled;

-            btnEditInclude.Enabled = enabled;

-            btnRemoveInclude.Enabled = enabled;

-            btnMoveIncludeUp.Enabled = enabled;

-            btnMoveIncludeDown.Enabled = enabled;

-

-            txtExtraOptions.Enabled = enabled;

-

-

-            chkIceSl.Enabled = enabled;

-        }

-

-        private void formClosing(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            if(!_changed)

-            {

-                if(txtExtraOptions.Modified)

-                {

-                    _changed = true;

-                }

-                else if(txtIceHome.Modified)

-                {

-                    _changed = true;

-                }

-            }

-

-            if(_changed && Util.isSliceBuilderEnabled(_project))

-            {

-                Builder builder = Connect.getBuilder();

-                builder.cleanProject(_project);

-                builder.buildProject(_project, true, vsBuildScope.vsBuildScopeProject);

-            }

-            Cursor = Cursors.Default;

-        }

-

-        private void btnCancel_Click(object sender, EventArgs e)

-        {

-            Close();

-        }

-

-        private void btnSelectIceHome_Click(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            FolderBrowserDialog dialog = new FolderBrowserDialog();

-            dialog.SelectedPath = Util.getAbsoluteIceHome(_project);

-            dialog.Description = "Select Ice Home Installation Directory";

-            DialogResult result = dialog.ShowDialog();

-            if(result == DialogResult.OK)

-            {

-                Util.updateIceHome(_project, dialog.SelectedPath, false);

-                load();

-                _changed = true;

-            }

-        }

-

-        private void txtIceHome_KeyPress(object sender, KeyPressEventArgs e)

-        {

-            if(e.KeyChar == (char)Keys.Return)

-            {

-                updateIceHome();

-                e.Handled = true;

-            }

-        }

-

-        private void txtIceHome_Focus(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-        }

-        

-        private void txtIceHome_LostFocus(object sender, EventArgs e)

-        {

-            updateIceHome();

-        }

-

-        private void updateIceHome()

-        {

-            if(!_iceHomeUpdating)

-            {

-                _iceHomeUpdating = true;

-                if(!txtIceHome.Text.Equals(Util.getProjectProperty(_project, Util.PropertyIceHome), 

-                                           StringComparison.CurrentCultureIgnoreCase))

-                {

-                    Util.updateIceHome(_project, txtIceHome.Text, false);

-                    load();

-                    _changed = true;

-                    txtIceHome.Modified = false;

-                }

-                _iceHomeUpdating = false;

-            }

-        }

-

-        private void chkIcePrefix_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            Util.setProjectProperty(_project, Util.PropertyIcePrefix, chkIcePrefix.Checked.ToString());

-            _changed = true;

-            Cursor = Cursors.Default;

-        }

-

-        private void saveSliceIncludes()

-        {

-            IncludePathList paths = new IncludePathList();

-            foreach(String s in includeDirList.Items)

-            {

-                paths.Add(s.Trim());

-            }

-            String p = paths.ToString();

-            Util.setProjectProperty(_project, Util.PropertyIceIncludePath, p);

-            _changed = true;

-        }

-

-        private void btnAddInclude_Click(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            includeDirList.Items.Add("");

-            includeDirList.SelectedIndex = includeDirList.Items.Count - 1;

-            _editingIndex = includeDirList.SelectedIndex;

-            beginEditIncludeDir();

-        }

-

-        private void btnRemoveInclude_Click(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            int index = includeDirList.SelectedIndex;

-            if(_editingIncludes)

-            {

-                index = _editingIndex;

-                endEditIncludeDir(false);

-            }

-            if(index > -1 && index < includeDirList.Items.Count)

-            {

-                int selected = index;

-                includeDirList.Items.RemoveAt(selected);

-                if (includeDirList.Items.Count > 0)

-                {

-                    if (selected > 0)

-                    {

-                        selected -= 1;

-                    }

-                    includeDirList.SelectedIndex = selected;

-                }

-                saveSliceIncludes();

-            }

-            Cursor = Cursors.Default;

-        }

-

-        private void btnMoveIncludeUp_Click(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            int index = includeDirList.SelectedIndex;

-            if(index > 0)

-            {

-                string current = includeDirList.SelectedItem.ToString();

-                includeDirList.Items.RemoveAt(index);

-                includeDirList.Items.Insert(index - 1, current);

-                includeDirList.SelectedIndex = index - 1;

-                saveSliceIncludes();

-            }

-            resetIncludeDirChecks();

-            Cursor = Cursors.Default;

-        }

-

-        private void btnMoveIncludeDown_Click(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            int index = includeDirList.SelectedIndex;

-            if(index < includeDirList.Items.Count - 1 && index > -1)

-            {

-                string current = includeDirList.SelectedItem.ToString();

-                includeDirList.Items.RemoveAt(index);

-                includeDirList.Items.Insert(index + 1, current);

-                includeDirList.SelectedIndex = index + 1;

-                saveSliceIncludes();

-                resetIncludeDirChecks();

-            }

-            Cursor = Cursors.Default;

-        }

-

-        private void includeDirList_ItemCheck(object sender, ItemCheckEventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                return;

-            }

-            string path = includeDirList.Items[e.Index].ToString();

-            if(!Util.containsEnvironmentVars(path))

-            {

-                if(e.NewValue == CheckState.Unchecked)

-                {

-                    path = Util.relativePath(Path.GetDirectoryName(_project.FileName), path);

-                }

-                else if(e.NewValue == CheckState.Checked)

-                {

-                    if(!Path.IsPathRooted(path))

-                    {

-                        path = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(_project.FileName), path));

-                    }

-                }

-            }

-            includeDirList.Items[e.Index] = path;

-            if(_initialized)

-            {

-                saveSliceIncludes();

-            }

-        }

-

-        private void txtExtraOptions_Focus(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-        }

-

-        private void txtExtraOptions_LostFocus(object sender, EventArgs e)

-        {

-            if(txtExtraOptions.Modified)

-            {

-                Util.setProjectProperty(_project, Util.PropertyIceExtraOptions, txtExtraOptions.Text);

-                _changed = true;

-            }

-        }

-

-

-        private void chkIce_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            if(_initialized)

-            {

-                if(chkIceSl.Checked)

-                {

-                    Util.addDotNetReference(_project, "IceSL");

-                }

-                else

-                {

-                    Util.removeDotNetReference(_project, "IceSL");

-                }

-                _changed = true;

-            }

-            Cursor = Cursors.Default;

-        }

-

-        private void chkConsole_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            Util.setProjectProperty(_project, Util.PropertyConsoleOutput, chkConsole.Checked.ToString());

-            Cursor = Cursors.Default;

-        }

-

-        private void btnEdit_Click(object sender, EventArgs e)

-        {

-            if(includeDirList.SelectedIndex != -1)

-            {

-                _editingIndex = includeDirList.SelectedIndex;

-                beginEditIncludeDir();

-            }

-        }

-

-        private void includeDirList_SelectedIndexChanged(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-        }

-

-        private void beginEditIncludeDir()

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(false);

-            }

-            _editingIncludes = true;

-            CancelButton = null;

-            if(_editingIndex != -1)

-            {

-                _txtIncludeDir = new TextBox();

-                _txtIncludeDir.Text = includeDirList.Items[includeDirList.SelectedIndex].ToString();

-

-                includeDirList.SelectionMode = SelectionMode.One;

-

-                Rectangle rect = includeDirList.GetItemRectangle(includeDirList.SelectedIndex);

-                _txtIncludeDir.Location = new Point(includeDirList.Location.X + 2,

-                                                    includeDirList.Location.Y + rect.Y);

-                _txtIncludeDir.Width = includeDirList.Width - 50;

-                _txtIncludeDir.Parent = includeDirList;

-                _txtIncludeDir.KeyDown += new KeyEventHandler(includeDirKeyDown);

-                groupBox1.Controls.Add(_txtIncludeDir);

-

-                _btnSelectInclude = new Button();

-                _btnSelectInclude.Text = "...";

-                _btnSelectInclude.Location = new Point(includeDirList.Location.X + _txtIncludeDir.Width,

-                                                       includeDirList.Location.Y + rect.Y);

-                _btnSelectInclude.Width = 49;

-                _btnSelectInclude.Height = _txtIncludeDir.Height;

-                _btnSelectInclude.Click += new EventHandler(selectIncludeClicked);

-                groupBox1.Controls.Add(_btnSelectInclude);

-

-

-                _txtIncludeDir.Show();

-                _txtIncludeDir.BringToFront();

-                _txtIncludeDir.Focus();

-

-                _btnSelectInclude.Show();

-                _btnSelectInclude.BringToFront();

-            }

-        }

-

-        private void endEditIncludeDir(bool saveChanges)

-        {

-            _initialized = false;

-            if(!_editingIncludes)

-            {

-                _initialized = true;

-                return;

-            }

-            _editingIncludes = false;

-            String path = null;

-            if(_editingIndex > -1 && _editingIndex < includeDirList.Items.Count)

-            {

-                path = includeDirList.Items[_editingIndex].ToString();

-            }

-

-            lock(this)

-            {

-                CancelButton = btnClose;

-                if(_txtIncludeDir == null || _btnSelectInclude == null)

-                {

-                    _initialized = true;

-                    return;

-                }

-                if(saveChanges)

-                {

-                    path = _txtIncludeDir.Text;

-                    if(path != null)

-                    {

-                        path = path.Trim();

-                    }

-                }

-

-                this.groupBox1.Controls.Remove(_txtIncludeDir);

-                _txtIncludeDir = null;

-

-                this.groupBox1.Controls.Remove(_btnSelectInclude);

-                _btnSelectInclude = null;

-            }

-

-            if(String.IsNullOrEmpty(path))

-            {

-                if(_editingIndex != -1)

-                {

-                    includeDirList.Items.RemoveAt(_editingIndex);

-                    includeDirList.SelectedIndex = includeDirList.Items.Count - 1;

-                    _editingIndex = -1;

-                    saveSliceIncludes();

-                }

-            }

-            else if(_editingIndex != -1 && saveChanges)

-            {

-                if(!path.Equals(includeDirList.Items[_editingIndex].ToString(),

-                                               StringComparison.CurrentCultureIgnoreCase))

-                {

-                    includeDirList.Items[_editingIndex] = path;

-                    if(Path.IsPathRooted(path))

-                    {

-                        includeDirList.SetItemCheckState(_editingIndex, CheckState.Checked);

-                    }

-                    else

-                    {

-                        includeDirList.SetItemCheckState(_editingIndex, CheckState.Unchecked);

-                    }

-                    saveSliceIncludes();

-                }

-            }

-            resetIncludeDirChecks();

-        }

-        

-        private void resetIncludeDirChecks()

-        {

-            _initialized = false;

-            for(int i = 0; i < includeDirList.Items.Count; i++)

-            {

-                String path = includeDirList.Items[i].ToString();

-                if(String.IsNullOrEmpty(path))

-                {

-                    continue;

-                }

-

-                if(Path.IsPathRooted(path))

-                {

-                    includeDirList.SetItemCheckState(i, CheckState.Checked);

-                }

-                else

-                {

-                    includeDirList.SetItemCheckState(i, CheckState.Unchecked);

-                }

-            }

-            _initialized = true;

-        }

-

-        private void includeDirKeyDown(object sender, KeyEventArgs e)

-        {

-            if(e.KeyCode.Equals(Keys.Escape))

-            {

-                endEditIncludeDir(false);

-            }

-            if(e.KeyCode.Equals(Keys.Enter))

-            {

-                endEditIncludeDir(true);

-            }

-        }

-

-        private void selectIncludeClicked(object sender, EventArgs e)

-        {

-            FolderBrowserDialog dialog = new FolderBrowserDialog();

-            string projectDir = Path.GetFullPath(Path.GetDirectoryName(_project.FileName));

-            dialog.SelectedPath = projectDir;

-            dialog.Description = "Slice Include Directory";

-            DialogResult result = dialog.ShowDialog();

-            if(result == DialogResult.OK)

-            {

-                string path = dialog.SelectedPath;

-                if(!Util.containsEnvironmentVars(path))

-                {

-                    path = Util.relativePath(projectDir, Path.GetFullPath(path));

-                }

-                _txtIncludeDir.Text = path;

-            }

-            endEditIncludeDir(true);

-        }

-

-        private int _editingIndex = -1;

-        private bool _editingIncludes;

-        private bool _initialized;

-        private bool _changed;

-        private Project _project;

-        private bool _iceHomeUpdating;

-        private TextBox _txtIncludeDir;

-        private Button _btnSelectInclude;

-

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Text;
+using System.Windows.Forms;
+
+using EnvDTE;
+
+namespace Ice.VisualStudio
+{
+    public partial class IceSilverlightConfigurationDialog : Form
+    {
+        public IceSilverlightConfigurationDialog(Project project)
+        {
+            InitializeComponent();
+            _project = project;
+            
+            //
+            // Set the toolTip messages.
+            //
+            toolTip.SetToolTip(txtIceHome, "Ice Installation Directory.");
+            toolTip.SetToolTip(btnSelectIceHome, "Ice Installation Directory.");
+            toolTip.SetToolTip(chkIcePrefix, "Allow Ice prefix (--ice).");
+            toolTip.SetToolTip(chkConsole, "Enable console output.");
+
+
+            if(_project != null)
+            {
+                this.Text = "Ice Configuration - Project: " + _project.Name;
+                bool enabled = Util.isSliceBuilderEnabled(project);
+                setEnabled(enabled);
+                chkEnableBuilder.Checked = enabled;
+                load();
+                _initialized = true;
+            }
+        }
+        
+        private void load()
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_project != null)
+            {
+                includeDirList.Items.Clear();
+                txtIceHome.Text = Util.getIceHomeRaw(_project, false);
+                txtExtraOptions.Text = Util.getProjectProperty(_project, Util.PropertyIceExtraOptions);
+
+                chkIcePrefix.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyIcePrefix);
+                chkConsole.Checked = Util.getProjectPropertyAsBool(_project, Util.PropertyConsoleOutput);
+                
+                IncludePathList list =
+                    new IncludePathList(Util.getProjectProperty(_project, Util.PropertyIceIncludePath));
+                foreach(String s in list)
+                {
+                    includeDirList.Items.Add(s.Trim());
+                    if(Path.IsPathRooted(s.Trim()))
+                    {
+                        includeDirList.SetItemCheckState(includeDirList.Items.Count - 1, CheckState.Checked);
+                    }
+                }
+
+                ComponentList selectedComponents = Util.getIceSilverlightComponents(_project);
+                foreach(String s in Util.getSilverlightNames())
+                {
+                    if(selectedComponents.Contains(s))
+                    {
+                        checkComponent(s, true);
+                    }
+                    else
+                    {
+                        checkComponent(s, false);
+                    }
+                }
+            }
+            Cursor = Cursors.Default;
+        }
+
+        private void checkComponent(String component, bool check)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            switch (component)
+            {
+                case "IceSL":
+                {
+                    chkIceSl.Checked = check;
+                    break;
+                }
+                default:
+                {
+                    break;
+                }
+            }
+        }
+        private void chkEnableBuilder_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            if(_initialized)
+            {
+                _initialized = false;
+                setEnabled(false);
+                chkEnableBuilder.Enabled = false;
+                Builder builder = Connect.getBuilder();
+                if(chkEnableBuilder.Checked)
+                {
+                    builder.addBuilderToProject(_project);
+                }
+                else
+                {
+                    builder.removeBuilderFromProject(_project);
+                }
+                load();
+                chkEnableBuilder.Enabled = true;
+                setEnabled(chkEnableBuilder.Checked);
+                _initialized = true;
+            }
+            Cursor = Cursors.Default;
+        }
+        
+        private void setEnabled(bool enabled)
+        {
+            txtIceHome.Enabled = enabled;
+            btnSelectIceHome.Enabled = enabled;
+
+            chkIcePrefix.Enabled = enabled;
+            chkConsole.Enabled = enabled;
+            
+            includeDirList.Enabled = enabled;
+            btnAddInclude.Enabled = enabled;
+            btnEditInclude.Enabled = enabled;
+            btnRemoveInclude.Enabled = enabled;
+            btnMoveIncludeUp.Enabled = enabled;
+            btnMoveIncludeDown.Enabled = enabled;
+
+            txtExtraOptions.Enabled = enabled;
+
+
+            chkIceSl.Enabled = enabled;
+        }
+
+        private void formClosing(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            if(!_changed)
+            {
+                if(txtExtraOptions.Modified)
+                {
+                    _changed = true;
+                }
+                else if(txtIceHome.Modified)
+                {
+                    _changed = true;
+                }
+            }
+
+            if(_changed && Util.isSliceBuilderEnabled(_project))
+            {
+                Builder builder = Connect.getBuilder();
+                builder.cleanProject(_project);
+                builder.buildProject(_project, true, vsBuildScope.vsBuildScopeProject);
+            }
+            Cursor = Cursors.Default;
+        }
+
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            Close();
+        }
+
+        private void btnSelectIceHome_Click(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            FolderBrowserDialog dialog = new FolderBrowserDialog();
+            dialog.SelectedPath = Util.getAbsoluteIceHome(_project);
+            dialog.Description = "Select Ice Home Installation Directory";
+            DialogResult result = dialog.ShowDialog();
+            if(result == DialogResult.OK)
+            {
+                Util.updateIceHome(_project, dialog.SelectedPath, false);
+                load();
+                _changed = true;
+            }
+        }
+
+        private void txtIceHome_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if(e.KeyChar == (char)Keys.Return)
+            {
+                updateIceHome();
+                e.Handled = true;
+            }
+        }
+
+        private void txtIceHome_Focus(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+        }
+        
+        private void txtIceHome_LostFocus(object sender, EventArgs e)
+        {
+            updateIceHome();
+        }
+
+        private void updateIceHome()
+        {
+            if(!_iceHomeUpdating)
+            {
+                _iceHomeUpdating = true;
+                if(!txtIceHome.Text.Equals(Util.getProjectProperty(_project, Util.PropertyIceHome), 
+                                           StringComparison.CurrentCultureIgnoreCase))
+                {
+                    Util.updateIceHome(_project, txtIceHome.Text, false);
+                    load();
+                    _changed = true;
+                    txtIceHome.Modified = false;
+                }
+                _iceHomeUpdating = false;
+            }
+        }
+
+        private void chkIcePrefix_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            Util.setProjectProperty(_project, Util.PropertyIcePrefix, chkIcePrefix.Checked.ToString());
+            _changed = true;
+            Cursor = Cursors.Default;
+        }
+
+        private void saveSliceIncludes()
+        {
+            IncludePathList paths = new IncludePathList();
+            foreach(String s in includeDirList.Items)
+            {
+                paths.Add(s.Trim());
+            }
+            String p = paths.ToString();
+            Util.setProjectProperty(_project, Util.PropertyIceIncludePath, p);
+            _changed = true;
+        }
+
+        private void btnAddInclude_Click(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            includeDirList.Items.Add("");
+            includeDirList.SelectedIndex = includeDirList.Items.Count - 1;
+            _editingIndex = includeDirList.SelectedIndex;
+            beginEditIncludeDir();
+        }
+
+        private void btnRemoveInclude_Click(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            int index = includeDirList.SelectedIndex;
+            if(_editingIncludes)
+            {
+                index = _editingIndex;
+                endEditIncludeDir(false);
+            }
+            if(index > -1 && index < includeDirList.Items.Count)
+            {
+                int selected = index;
+                includeDirList.Items.RemoveAt(selected);
+                if (includeDirList.Items.Count > 0)
+                {
+                    if (selected > 0)
+                    {
+                        selected -= 1;
+                    }
+                    includeDirList.SelectedIndex = selected;
+                }
+                saveSliceIncludes();
+            }
+            Cursor = Cursors.Default;
+        }
+
+        private void btnMoveIncludeUp_Click(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            int index = includeDirList.SelectedIndex;
+            if(index > 0)
+            {
+                string current = includeDirList.SelectedItem.ToString();
+                includeDirList.Items.RemoveAt(index);
+                includeDirList.Items.Insert(index - 1, current);
+                includeDirList.SelectedIndex = index - 1;
+                saveSliceIncludes();
+            }
+            resetIncludeDirChecks();
+            Cursor = Cursors.Default;
+        }
+
+        private void btnMoveIncludeDown_Click(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            int index = includeDirList.SelectedIndex;
+            if(index < includeDirList.Items.Count - 1 && index > -1)
+            {
+                string current = includeDirList.SelectedItem.ToString();
+                includeDirList.Items.RemoveAt(index);
+                includeDirList.Items.Insert(index + 1, current);
+                includeDirList.SelectedIndex = index + 1;
+                saveSliceIncludes();
+                resetIncludeDirChecks();
+            }
+            Cursor = Cursors.Default;
+        }
+
+        private void includeDirList_ItemCheck(object sender, ItemCheckEventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                return;
+            }
+            string path = includeDirList.Items[e.Index].ToString();
+            if(!Util.containsEnvironmentVars(path))
+            {
+                if(e.NewValue == CheckState.Unchecked)
+                {
+                    path = Util.relativePath(Path.GetDirectoryName(_project.FileName), path);
+                }
+                else if(e.NewValue == CheckState.Checked)
+                {
+                    if(!Path.IsPathRooted(path))
+                    {
+                        path = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(_project.FileName), path));
+                    }
+                }
+            }
+            includeDirList.Items[e.Index] = path;
+            if(_initialized)
+            {
+                saveSliceIncludes();
+            }
+        }
+
+        private void txtExtraOptions_Focus(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+        }
+
+        private void txtExtraOptions_LostFocus(object sender, EventArgs e)
+        {
+            if(txtExtraOptions.Modified)
+            {
+                Util.setProjectProperty(_project, Util.PropertyIceExtraOptions, txtExtraOptions.Text);
+                _changed = true;
+            }
+        }
+
+
+        private void chkIce_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            if(_initialized)
+            {
+                if(chkIceSl.Checked)
+                {
+                    Util.addDotNetReference(_project, "IceSL");
+                }
+                else
+                {
+                    Util.removeDotNetReference(_project, "IceSL");
+                }
+                _changed = true;
+            }
+            Cursor = Cursors.Default;
+        }
+
+        private void chkConsole_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            Util.setProjectProperty(_project, Util.PropertyConsoleOutput, chkConsole.Checked.ToString());
+            Cursor = Cursors.Default;
+        }
+
+        private void btnEdit_Click(object sender, EventArgs e)
+        {
+            if(includeDirList.SelectedIndex != -1)
+            {
+                _editingIndex = includeDirList.SelectedIndex;
+                beginEditIncludeDir();
+            }
+        }
+
+        private void includeDirList_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+        }
+
+        private void beginEditIncludeDir()
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(false);
+            }
+            _editingIncludes = true;
+            CancelButton = null;
+            if(_editingIndex != -1)
+            {
+                _txtIncludeDir = new TextBox();
+                _txtIncludeDir.Text = includeDirList.Items[includeDirList.SelectedIndex].ToString();
+
+                includeDirList.SelectionMode = SelectionMode.One;
+
+                Rectangle rect = includeDirList.GetItemRectangle(includeDirList.SelectedIndex);
+                _txtIncludeDir.Location = new Point(includeDirList.Location.X + 2,
+                                                    includeDirList.Location.Y + rect.Y);
+                _txtIncludeDir.Width = includeDirList.Width - 50;
+                _txtIncludeDir.Parent = includeDirList;
+                _txtIncludeDir.KeyDown += new KeyEventHandler(includeDirKeyDown);
+                groupBox1.Controls.Add(_txtIncludeDir);
+
+                _btnSelectInclude = new Button();
+                _btnSelectInclude.Text = "...";
+                _btnSelectInclude.Location = new Point(includeDirList.Location.X + _txtIncludeDir.Width,
+                                                       includeDirList.Location.Y + rect.Y);
+                _btnSelectInclude.Width = 49;
+                _btnSelectInclude.Height = _txtIncludeDir.Height;
+                _btnSelectInclude.Click += new EventHandler(selectIncludeClicked);
+                groupBox1.Controls.Add(_btnSelectInclude);
+
+
+                _txtIncludeDir.Show();
+                _txtIncludeDir.BringToFront();
+                _txtIncludeDir.Focus();
+
+                _btnSelectInclude.Show();
+                _btnSelectInclude.BringToFront();
+            }
+        }
+
+        private void endEditIncludeDir(bool saveChanges)
+        {
+            _initialized = false;
+            if(!_editingIncludes)
+            {
+                _initialized = true;
+                return;
+            }
+            _editingIncludes = false;
+            String path = null;
+            if(_editingIndex > -1 && _editingIndex < includeDirList.Items.Count)
+            {
+                path = includeDirList.Items[_editingIndex].ToString();
+            }
+
+            lock(this)
+            {
+                CancelButton = btnClose;
+                if(_txtIncludeDir == null || _btnSelectInclude == null)
+                {
+                    _initialized = true;
+                    return;
+                }
+                if(saveChanges)
+                {
+                    path = _txtIncludeDir.Text;
+                    if(path != null)
+                    {
+                        path = path.Trim();
+                    }
+                }
+
+                this.groupBox1.Controls.Remove(_txtIncludeDir);
+                _txtIncludeDir = null;
+
+                this.groupBox1.Controls.Remove(_btnSelectInclude);
+                _btnSelectInclude = null;
+            }
+
+            if(String.IsNullOrEmpty(path))
+            {
+                if(_editingIndex != -1)
+                {
+                    includeDirList.Items.RemoveAt(_editingIndex);
+                    includeDirList.SelectedIndex = includeDirList.Items.Count - 1;
+                    _editingIndex = -1;
+                    saveSliceIncludes();
+                }
+            }
+            else if(_editingIndex != -1 && saveChanges)
+            {
+                if(!path.Equals(includeDirList.Items[_editingIndex].ToString(),
+                                               StringComparison.CurrentCultureIgnoreCase))
+                {
+                    includeDirList.Items[_editingIndex] = path;
+                    if(Path.IsPathRooted(path))
+                    {
+                        includeDirList.SetItemCheckState(_editingIndex, CheckState.Checked);
+                    }
+                    else
+                    {
+                        includeDirList.SetItemCheckState(_editingIndex, CheckState.Unchecked);
+                    }
+                    saveSliceIncludes();
+                }
+            }
+            resetIncludeDirChecks();
+        }
+        
+        private void resetIncludeDirChecks()
+        {
+            _initialized = false;
+            for(int i = 0; i < includeDirList.Items.Count; i++)
+            {
+                String path = includeDirList.Items[i].ToString();
+                if(String.IsNullOrEmpty(path))
+                {
+                    continue;
+                }
+
+                if(Path.IsPathRooted(path))
+                {
+                    includeDirList.SetItemCheckState(i, CheckState.Checked);
+                }
+                else
+                {
+                    includeDirList.SetItemCheckState(i, CheckState.Unchecked);
+                }
+            }
+            _initialized = true;
+        }
+
+        private void includeDirKeyDown(object sender, KeyEventArgs e)
+        {
+            if(e.KeyCode.Equals(Keys.Escape))
+            {
+                endEditIncludeDir(false);
+            }
+            if(e.KeyCode.Equals(Keys.Enter))
+            {
+                endEditIncludeDir(true);
+            }
+        }
+
+        private void selectIncludeClicked(object sender, EventArgs e)
+        {
+            FolderBrowserDialog dialog = new FolderBrowserDialog();
+            string projectDir = Path.GetFullPath(Path.GetDirectoryName(_project.FileName));
+            dialog.SelectedPath = projectDir;
+            dialog.Description = "Slice Include Directory";
+            DialogResult result = dialog.ShowDialog();
+            if(result == DialogResult.OK)
+            {
+                string path = dialog.SelectedPath;
+                if(!Util.containsEnvironmentVars(path))
+                {
+                    path = Util.relativePath(projectDir, Path.GetFullPath(path));
+                }
+                _txtIncludeDir.Text = path;
+            }
+            endEditIncludeDir(true);
+        }
+
+        private int _editingIndex = -1;
+        private bool _editingIncludes;
+        private bool _initialized;
+        private bool _changed;
+        private Project _project;
+        private bool _iceHomeUpdating;
+        private TextBox _txtIncludeDir;
+        private Button _btnSelectInclude;
+
+    }
+}
diff --git a/vsplugin/src/IceSilverlightConfigurationDialog.resx b/vsplugin/src/IceSilverlightConfigurationDialog.resx
index a5979aadfff..a499e2cedc5 100644
--- a/vsplugin/src/IceSilverlightConfigurationDialog.resx
+++ b/vsplugin/src/IceSilverlightConfigurationDialog.resx
@@ -120,4 +120,4 @@
   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>17, 17</value>

   </metadata>

-</root>
\ No newline at end of file
+</root>

diff --git a/vsplugin/src/IceVBConfigurationDialog.Designer.cs b/vsplugin/src/IceVBConfigurationDialog.Designer.cs
index 2a9bc6696bf..2d1a87af1b4 100755
--- a/vsplugin/src/IceVBConfigurationDialog.Designer.cs
+++ b/vsplugin/src/IceVBConfigurationDialog.Designer.cs
@@ -1,252 +1,252 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-namespace Ice.VisualStudio

-{

-    partial class IceVBConfigurationDialog

-    {

-        /// <summary>

-        /// Required designer variable.

-        /// </summary>

-        private System.ComponentModel.IContainer components = null;

-

-        /// <summary>

-        /// Clean up any resources being used.

-        /// </summary>

-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>

-        protected override void Dispose(bool disposing)

-        {

-            if (disposing && (components != null))

-            {

-                components.Dispose();

-            }

-            base.Dispose(disposing);

-        }

-

-        #region Windows Form Designer generated code

-

-        /// <summary>

-        /// Required method for Designer support - do not modify

-        /// the contents of this method with the code editor.

-        /// </summary>

-        private void InitializeComponent()

-        {

-            this.components = new System.ComponentModel.Container();

-            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();

-            this.groupBox3 = new System.Windows.Forms.GroupBox();

-            this.chkIceStorm = new System.Windows.Forms.CheckBox();

-            this.chkIceSSL = new System.Windows.Forms.CheckBox();

-            this.chkIcePatch2 = new System.Windows.Forms.CheckBox();

-            this.chkIceGrid = new System.Windows.Forms.CheckBox();

-            this.chkIceBox = new System.Windows.Forms.CheckBox();

-            this.chkGlacier2 = new System.Windows.Forms.CheckBox();

-            this.chkIce = new System.Windows.Forms.CheckBox();

-            this.btnClose = new System.Windows.Forms.Button();

-            this.groupBox5 = new System.Windows.Forms.GroupBox();

-            this.btnSelectIceHome = new System.Windows.Forms.Button();

-            this.txtIceHome = new System.Windows.Forms.TextBox();

-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);

-            this.groupBox3.SuspendLayout();

-            this.groupBox5.SuspendLayout();

-            this.SuspendLayout();

-            // 

-            // chkEnableBuilder

-            // 

-            this.chkEnableBuilder.AutoSize = true;

-            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);

-            this.chkEnableBuilder.Name = "chkEnableBuilder";

-            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);

-            this.chkEnableBuilder.TabIndex = 0;

-            this.chkEnableBuilder.Text = "Enable Ice Builder";

-            this.chkEnableBuilder.UseVisualStyleBackColor = true;

-            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);

-            // 

-            // groupBox3

-            // 

-            this.groupBox3.Controls.Add(this.chkIceStorm);

-            this.groupBox3.Controls.Add(this.chkIceSSL);

-            this.groupBox3.Controls.Add(this.chkIcePatch2);

-            this.groupBox3.Controls.Add(this.chkIceGrid);

-            this.groupBox3.Controls.Add(this.chkIceBox);

-            this.groupBox3.Controls.Add(this.chkGlacier2);

-            this.groupBox3.Controls.Add(this.chkIce);

-            this.groupBox3.Location = new System.Drawing.Point(11, 88);

-            this.groupBox3.Name = "groupBox3";

-            this.groupBox3.Size = new System.Drawing.Size(487, 47);

-            this.groupBox3.TabIndex = 3;

-            this.groupBox3.TabStop = false;

-            this.groupBox3.Text = "Ice Components";

-            // 

-            // chkIceStorm

-            // 

-            this.chkIceStorm.AutoSize = true;

-            this.chkIceStorm.Location = new System.Drawing.Point(404, 19);

-            this.chkIceStorm.Name = "chkIceStorm";

-            this.chkIceStorm.Size = new System.Drawing.Size(68, 17);

-            this.chkIceStorm.TabIndex = 6;

-            this.chkIceStorm.TabStop = false;

-            this.chkIceStorm.Text = "IceStorm";

-            this.chkIceStorm.UseVisualStyleBackColor = true;

-            this.chkIceStorm.CheckedChanged += new System.EventHandler(this.chkIceStorm_CheckedChanged);

-            // 

-            // chkIceSSL

-            // 

-            this.chkIceSSL.AutoSize = true;

-            this.chkIceSSL.Location = new System.Drawing.Point(337, 19);

-            this.chkIceSSL.Name = "chkIceSSL";

-            this.chkIceSSL.Size = new System.Drawing.Size(61, 17);

-            this.chkIceSSL.TabIndex = 5;

-            this.chkIceSSL.TabStop = false;

-            this.chkIceSSL.Text = "IceSSL";

-            this.chkIceSSL.UseVisualStyleBackColor = true;

-            this.chkIceSSL.CheckedChanged += new System.EventHandler(this.chkIceSSL_CheckedChanged);

-            // 

-            // chkIcePatch2

-            // 

-            this.chkIcePatch2.AutoSize = true;

-            this.chkIcePatch2.Location = new System.Drawing.Point(256, 19);

-            this.chkIcePatch2.Name = "chkIcePatch2";

-            this.chkIcePatch2.Size = new System.Drawing.Size(75, 17);

-            this.chkIcePatch2.TabIndex = 4;

-            this.chkIcePatch2.TabStop = false;

-            this.chkIcePatch2.Text = "IcePatch2";

-            this.chkIcePatch2.UseVisualStyleBackColor = true;

-            this.chkIcePatch2.CheckedChanged += new System.EventHandler(this.chkIcePatch2_CheckedChanged);

-            // 

-            // chkIceGrid

-            // 

-            this.chkIceGrid.AutoSize = true;

-            this.chkIceGrid.Location = new System.Drawing.Point(190, 19);

-            this.chkIceGrid.Name = "chkIceGrid";

-            this.chkIceGrid.Size = new System.Drawing.Size(60, 17);

-            this.chkIceGrid.TabIndex = 3;

-            this.chkIceGrid.TabStop = false;

-            this.chkIceGrid.Text = "IceGrid";

-            this.chkIceGrid.UseVisualStyleBackColor = true;

-            this.chkIceGrid.CheckedChanged += new System.EventHandler(this.chkIceGrid_CheckedChanged);

-            // 

-            // chkIceBox

-            // 

-            this.chkIceBox.AutoSize = true;

-            this.chkIceBox.Location = new System.Drawing.Point(125, 19);

-            this.chkIceBox.Name = "chkIceBox";

-            this.chkIceBox.Size = new System.Drawing.Size(59, 17);

-            this.chkIceBox.TabIndex = 2;

-            this.chkIceBox.TabStop = false;

-            this.chkIceBox.Text = "IceBox";

-            this.chkIceBox.UseVisualStyleBackColor = true;

-            this.chkIceBox.CheckedChanged += new System.EventHandler(this.chkIceBox_CheckedChanged);

-            // 

-            // chkGlacier2

-            // 

-            this.chkGlacier2.AutoSize = true;

-            this.chkGlacier2.Location = new System.Drawing.Point(7, 19);

-            this.chkGlacier2.Name = "chkGlacier2";

-            this.chkGlacier2.Size = new System.Drawing.Size(65, 17);

-            this.chkGlacier2.TabIndex = 0;

-            this.chkGlacier2.TabStop = false;

-            this.chkGlacier2.Text = "Glacier2";

-            this.chkGlacier2.UseVisualStyleBackColor = true;

-            this.chkGlacier2.CheckedChanged += new System.EventHandler(this.chkGlacier2_CheckedChanged);

-            // 

-            // chkIce

-            // 

-            this.chkIce.AutoSize = true;

-            this.chkIce.Location = new System.Drawing.Point(78, 19);

-            this.chkIce.Name = "chkIce";

-            this.chkIce.Size = new System.Drawing.Size(41, 17);

-            this.chkIce.TabIndex = 1;

-            this.chkIce.TabStop = false;

-            this.chkIce.Text = "Ice";

-            this.chkIce.UseVisualStyleBackColor = true;

-            this.chkIce.CheckedChanged += new System.EventHandler(this.chkIce_CheckedChanged);

-            // 

-            // btnClose

-            // 

-            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;

-            this.btnClose.Location = new System.Drawing.Point(417, 141);

-            this.btnClose.Name = "btnClose";

-            this.btnClose.Size = new System.Drawing.Size(75, 23);

-            this.btnClose.TabIndex = 5;

-            this.btnClose.Text = "Close";

-            this.btnClose.UseVisualStyleBackColor = true;

-            this.btnClose.Click += new System.EventHandler(this.btnCancel_Click);

-            // 

-            // groupBox5

-            // 

-            this.groupBox5.Controls.Add(this.btnSelectIceHome);

-            this.groupBox5.Controls.Add(this.txtIceHome);

-            this.groupBox5.Location = new System.Drawing.Point(12, 37);

-            this.groupBox5.Name = "groupBox5";

-            this.groupBox5.Size = new System.Drawing.Size(486, 45);

-            this.groupBox5.TabIndex = 6;

-            this.groupBox5.TabStop = false;

-            this.groupBox5.Text = "Ice Home";

-            // 

-            // btnSelectIceHome

-            // 

-            this.btnSelectIceHome.Location = new System.Drawing.Point(405, 16);

-            this.btnSelectIceHome.Name = "btnSelectIceHome";

-            this.btnSelectIceHome.Size = new System.Drawing.Size(75, 23);

-            this.btnSelectIceHome.TabIndex = 1;

-            this.btnSelectIceHome.Text = "....";

-            this.btnSelectIceHome.UseVisualStyleBackColor = true;

-            this.btnSelectIceHome.Click += new System.EventHandler(this.btnSelectIceHome_Click);

-            // 

-            // txtIceHome

-            // 

-            this.txtIceHome.Location = new System.Drawing.Point(10, 20);

-            this.txtIceHome.Name = "txtIceHome";

-            this.txtIceHome.Size = new System.Drawing.Size(386, 20);

-            this.txtIceHome.TabIndex = 0;

-            this.txtIceHome.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtIceHome_KeyPress);

-            this.txtIceHome.LostFocus += new System.EventHandler(this.txtIceHome_LostFocus);

-            // 

-            // IceVBConfigurationDialog

-            // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.CancelButton = this.btnClose;

-            this.ClientSize = new System.Drawing.Size(512, 177);

-            this.Controls.Add(this.groupBox5);

-            this.Controls.Add(this.btnClose);

-            this.Controls.Add(this.groupBox3);

-            this.Controls.Add(this.chkEnableBuilder);

-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;

-            this.MaximizeBox = false;

-            this.Name = "IceVBConfigurationDialog";

-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

-            this.Text = "Ice Configuration";

-            this.groupBox3.ResumeLayout(false);

-            this.groupBox3.PerformLayout();

-            this.groupBox5.ResumeLayout(false);

-            this.groupBox5.PerformLayout();

-            this.ResumeLayout(false);

-            this.PerformLayout();

-

-        }

-

-        #endregion

-

-        private System.Windows.Forms.CheckBox chkEnableBuilder;

-        private System.Windows.Forms.GroupBox groupBox3;

-        private System.Windows.Forms.CheckBox chkIceStorm;

-        private System.Windows.Forms.CheckBox chkIceSSL;

-        private System.Windows.Forms.CheckBox chkIcePatch2;

-        private System.Windows.Forms.CheckBox chkIceGrid;

-        private System.Windows.Forms.CheckBox chkIceBox;

-        private System.Windows.Forms.CheckBox chkGlacier2;

-        private System.Windows.Forms.CheckBox chkIce;

-        private System.Windows.Forms.Button btnClose;

-        private System.Windows.Forms.GroupBox groupBox5;

-        private System.Windows.Forms.Button btnSelectIceHome;

-        private System.Windows.Forms.TextBox txtIceHome;

-        private System.Windows.Forms.ToolTip toolTip;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+namespace Ice.VisualStudio
+{
+    partial class IceVBConfigurationDialog
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.chkIceStorm = new System.Windows.Forms.CheckBox();
+            this.chkIceSSL = new System.Windows.Forms.CheckBox();
+            this.chkIcePatch2 = new System.Windows.Forms.CheckBox();
+            this.chkIceGrid = new System.Windows.Forms.CheckBox();
+            this.chkIceBox = new System.Windows.Forms.CheckBox();
+            this.chkGlacier2 = new System.Windows.Forms.CheckBox();
+            this.chkIce = new System.Windows.Forms.CheckBox();
+            this.btnClose = new System.Windows.Forms.Button();
+            this.groupBox5 = new System.Windows.Forms.GroupBox();
+            this.btnSelectIceHome = new System.Windows.Forms.Button();
+            this.txtIceHome = new System.Windows.Forms.TextBox();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.groupBox3.SuspendLayout();
+            this.groupBox5.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // chkEnableBuilder
+            // 
+            this.chkEnableBuilder.AutoSize = true;
+            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);
+            this.chkEnableBuilder.Name = "chkEnableBuilder";
+            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);
+            this.chkEnableBuilder.TabIndex = 0;
+            this.chkEnableBuilder.Text = "Enable Ice Builder";
+            this.chkEnableBuilder.UseVisualStyleBackColor = true;
+            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.chkIceStorm);
+            this.groupBox3.Controls.Add(this.chkIceSSL);
+            this.groupBox3.Controls.Add(this.chkIcePatch2);
+            this.groupBox3.Controls.Add(this.chkIceGrid);
+            this.groupBox3.Controls.Add(this.chkIceBox);
+            this.groupBox3.Controls.Add(this.chkGlacier2);
+            this.groupBox3.Controls.Add(this.chkIce);
+            this.groupBox3.Location = new System.Drawing.Point(11, 88);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(487, 47);
+            this.groupBox3.TabIndex = 3;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "Ice Components";
+            // 
+            // chkIceStorm
+            // 
+            this.chkIceStorm.AutoSize = true;
+            this.chkIceStorm.Location = new System.Drawing.Point(404, 19);
+            this.chkIceStorm.Name = "chkIceStorm";
+            this.chkIceStorm.Size = new System.Drawing.Size(68, 17);
+            this.chkIceStorm.TabIndex = 6;
+            this.chkIceStorm.TabStop = false;
+            this.chkIceStorm.Text = "IceStorm";
+            this.chkIceStorm.UseVisualStyleBackColor = true;
+            this.chkIceStorm.CheckedChanged += new System.EventHandler(this.chkIceStorm_CheckedChanged);
+            // 
+            // chkIceSSL
+            // 
+            this.chkIceSSL.AutoSize = true;
+            this.chkIceSSL.Location = new System.Drawing.Point(337, 19);
+            this.chkIceSSL.Name = "chkIceSSL";
+            this.chkIceSSL.Size = new System.Drawing.Size(61, 17);
+            this.chkIceSSL.TabIndex = 5;
+            this.chkIceSSL.TabStop = false;
+            this.chkIceSSL.Text = "IceSSL";
+            this.chkIceSSL.UseVisualStyleBackColor = true;
+            this.chkIceSSL.CheckedChanged += new System.EventHandler(this.chkIceSSL_CheckedChanged);
+            // 
+            // chkIcePatch2
+            // 
+            this.chkIcePatch2.AutoSize = true;
+            this.chkIcePatch2.Location = new System.Drawing.Point(256, 19);
+            this.chkIcePatch2.Name = "chkIcePatch2";
+            this.chkIcePatch2.Size = new System.Drawing.Size(75, 17);
+            this.chkIcePatch2.TabIndex = 4;
+            this.chkIcePatch2.TabStop = false;
+            this.chkIcePatch2.Text = "IcePatch2";
+            this.chkIcePatch2.UseVisualStyleBackColor = true;
+            this.chkIcePatch2.CheckedChanged += new System.EventHandler(this.chkIcePatch2_CheckedChanged);
+            // 
+            // chkIceGrid
+            // 
+            this.chkIceGrid.AutoSize = true;
+            this.chkIceGrid.Location = new System.Drawing.Point(190, 19);
+            this.chkIceGrid.Name = "chkIceGrid";
+            this.chkIceGrid.Size = new System.Drawing.Size(60, 17);
+            this.chkIceGrid.TabIndex = 3;
+            this.chkIceGrid.TabStop = false;
+            this.chkIceGrid.Text = "IceGrid";
+            this.chkIceGrid.UseVisualStyleBackColor = true;
+            this.chkIceGrid.CheckedChanged += new System.EventHandler(this.chkIceGrid_CheckedChanged);
+            // 
+            // chkIceBox
+            // 
+            this.chkIceBox.AutoSize = true;
+            this.chkIceBox.Location = new System.Drawing.Point(125, 19);
+            this.chkIceBox.Name = "chkIceBox";
+            this.chkIceBox.Size = new System.Drawing.Size(59, 17);
+            this.chkIceBox.TabIndex = 2;
+            this.chkIceBox.TabStop = false;
+            this.chkIceBox.Text = "IceBox";
+            this.chkIceBox.UseVisualStyleBackColor = true;
+            this.chkIceBox.CheckedChanged += new System.EventHandler(this.chkIceBox_CheckedChanged);
+            // 
+            // chkGlacier2
+            // 
+            this.chkGlacier2.AutoSize = true;
+            this.chkGlacier2.Location = new System.Drawing.Point(7, 19);
+            this.chkGlacier2.Name = "chkGlacier2";
+            this.chkGlacier2.Size = new System.Drawing.Size(65, 17);
+            this.chkGlacier2.TabIndex = 0;
+            this.chkGlacier2.TabStop = false;
+            this.chkGlacier2.Text = "Glacier2";
+            this.chkGlacier2.UseVisualStyleBackColor = true;
+            this.chkGlacier2.CheckedChanged += new System.EventHandler(this.chkGlacier2_CheckedChanged);
+            // 
+            // chkIce
+            // 
+            this.chkIce.AutoSize = true;
+            this.chkIce.Location = new System.Drawing.Point(78, 19);
+            this.chkIce.Name = "chkIce";
+            this.chkIce.Size = new System.Drawing.Size(41, 17);
+            this.chkIce.TabIndex = 1;
+            this.chkIce.TabStop = false;
+            this.chkIce.Text = "Ice";
+            this.chkIce.UseVisualStyleBackColor = true;
+            this.chkIce.CheckedChanged += new System.EventHandler(this.chkIce_CheckedChanged);
+            // 
+            // btnClose
+            // 
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnClose.Location = new System.Drawing.Point(417, 141);
+            this.btnClose.Name = "btnClose";
+            this.btnClose.Size = new System.Drawing.Size(75, 23);
+            this.btnClose.TabIndex = 5;
+            this.btnClose.Text = "Close";
+            this.btnClose.UseVisualStyleBackColor = true;
+            this.btnClose.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // groupBox5
+            // 
+            this.groupBox5.Controls.Add(this.btnSelectIceHome);
+            this.groupBox5.Controls.Add(this.txtIceHome);
+            this.groupBox5.Location = new System.Drawing.Point(12, 37);
+            this.groupBox5.Name = "groupBox5";
+            this.groupBox5.Size = new System.Drawing.Size(486, 45);
+            this.groupBox5.TabIndex = 6;
+            this.groupBox5.TabStop = false;
+            this.groupBox5.Text = "Ice Home";
+            // 
+            // btnSelectIceHome
+            // 
+            this.btnSelectIceHome.Location = new System.Drawing.Point(405, 16);
+            this.btnSelectIceHome.Name = "btnSelectIceHome";
+            this.btnSelectIceHome.Size = new System.Drawing.Size(75, 23);
+            this.btnSelectIceHome.TabIndex = 1;
+            this.btnSelectIceHome.Text = "....";
+            this.btnSelectIceHome.UseVisualStyleBackColor = true;
+            this.btnSelectIceHome.Click += new System.EventHandler(this.btnSelectIceHome_Click);
+            // 
+            // txtIceHome
+            // 
+            this.txtIceHome.Location = new System.Drawing.Point(10, 20);
+            this.txtIceHome.Name = "txtIceHome";
+            this.txtIceHome.Size = new System.Drawing.Size(386, 20);
+            this.txtIceHome.TabIndex = 0;
+            this.txtIceHome.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtIceHome_KeyPress);
+            this.txtIceHome.LostFocus += new System.EventHandler(this.txtIceHome_LostFocus);
+            // 
+            // IceVBConfigurationDialog
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnClose;
+            this.ClientSize = new System.Drawing.Size(512, 177);
+            this.Controls.Add(this.groupBox5);
+            this.Controls.Add(this.btnClose);
+            this.Controls.Add(this.groupBox3);
+            this.Controls.Add(this.chkEnableBuilder);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.MaximizeBox = false;
+            this.Name = "IceVBConfigurationDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Ice Configuration";
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
+            this.groupBox5.ResumeLayout(false);
+            this.groupBox5.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.CheckBox chkEnableBuilder;
+        private System.Windows.Forms.GroupBox groupBox3;
+        private System.Windows.Forms.CheckBox chkIceStorm;
+        private System.Windows.Forms.CheckBox chkIceSSL;
+        private System.Windows.Forms.CheckBox chkIcePatch2;
+        private System.Windows.Forms.CheckBox chkIceGrid;
+        private System.Windows.Forms.CheckBox chkIceBox;
+        private System.Windows.Forms.CheckBox chkGlacier2;
+        private System.Windows.Forms.CheckBox chkIce;
+        private System.Windows.Forms.Button btnClose;
+        private System.Windows.Forms.GroupBox groupBox5;
+        private System.Windows.Forms.Button btnSelectIceHome;
+        private System.Windows.Forms.TextBox txtIceHome;
+        private System.Windows.Forms.ToolTip toolTip;
+    }
+}
diff --git a/vsplugin/src/IceVBConfigurationDialog.cs b/vsplugin/src/IceVBConfigurationDialog.cs
index fde08a4a69a..fab84596575 100755
--- a/vsplugin/src/IceVBConfigurationDialog.cs
+++ b/vsplugin/src/IceVBConfigurationDialog.cs
@@ -1,258 +1,258 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.ComponentModel;

-using System.Data;

-using System.Drawing;

-using System.IO;

-using System.Text;

-using System.Windows.Forms;

-

-using EnvDTE;

-

-namespace Ice.VisualStudio

-{

-    public partial class IceVBConfigurationDialog : Form

-    {

-        public IceVBConfigurationDialog(Project project)

-        {

-            InitializeComponent();

-            _project = project;

-            

-            //

-            // Set the toolTip messages.

-            //

-            toolTip.SetToolTip(txtIceHome, "Ice installation directory.");

-            toolTip.SetToolTip(btnSelectIceHome, "Ice installation directory.");

-

-            if(_project != null)

-            {

-                this.Text = "Ice Configuration - Project: " + _project.Name;

-                bool enabled = Util.isSliceBuilderEnabled(project);

-                setEnabled(enabled);

-                chkEnableBuilder.Checked = enabled;

-                load();

-                _initialized = true;

-            }

-        }

-        

-        private void load()

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_project != null)

-            {

-                txtIceHome.Text = Util.getIceHomeRaw(_project, false);

-

-                ComponentList selectedComponents = Util.getIceDotNetComponents(_project);

-                foreach(String s in Util.getDotNetNames())

-                {

-                    if(selectedComponents.Contains(s))

-                    {

-                        checkComponent(s, true);

-                    }

-                    else

-                    {

-                        checkComponent(s, false);

-                    }

-                }

-            }

-            Cursor = Cursors.Default;  

-        }

-

-        private void checkComponent(String component, bool check)

-        {

-            switch (component)

-            {

-                case "Glacier2":

-                {

-                    chkGlacier2.Checked = check;

-                    break;

-                }

-                case "Ice":

-                {

-                    chkIce.Checked = check;

-                    break;

-                }

-                case "IceBox":

-                {

-                    chkIceBox.Checked = check;

-                    break;

-                }

-                case "IceGrid":

-                {

-                    chkIceGrid.Checked = check;

-                    break;

-                }

-                case "IcePatch2":

-                {

-                    chkIcePatch2.Checked = check;

-                    break;

-                }

-                case "IceSSL":

-                {

-                    chkIceSSL.Checked = check;

-                    break;

-                }

-                case "IceStorm":

-                {

-                    chkIceStorm.Checked = check;

-                    break;

-                }

-                default:

-                {

-                    break;

-                }

-            }

-        }

-        private void chkEnableBuilder_CheckedChanged(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_initialized)

-            {

-                _initialized = false;

-                setEnabled(false);

-                chkEnableBuilder.Enabled = false;

-                Builder builder = Connect.getBuilder();

-                if(chkEnableBuilder.Checked)

-                {

-                    builder.addBuilderToProject(_project);

-                }

-                else

-                {

-                    builder.removeBuilderFromProject(_project);

-                }

-                load();

-                setEnabled(chkEnableBuilder.Checked);

-                chkEnableBuilder.Enabled = true;

-                _initialized = true;

-            }

-            Cursor = Cursors.Default;

-        }

-        

-        private void setEnabled(bool enabled)

-        {

-            txtIceHome.Enabled = enabled;

-            btnSelectIceHome.Enabled = enabled;

-

-            chkGlacier2.Enabled = enabled;

-            chkIce.Enabled = enabled;

-            chkIceBox.Enabled = enabled;

-            chkIceGrid.Enabled = enabled;

-            chkIcePatch2.Enabled = enabled;

-            chkIceSSL.Enabled = enabled;

-            chkIceStorm.Enabled = enabled;

-        }

-

-        private void btnCancel_Click(object sender, EventArgs e)

-        {

-            Close();

-        }

-

-        private void btnSelectIceHome_Click(object sender, EventArgs e)

-        {

-            FolderBrowserDialog dialog = new FolderBrowserDialog();

-            dialog.SelectedPath = Util.getAbsoluteIceHome(_project);

-            dialog.Description = "Select Ice Home Installation Directory";

-            DialogResult result = dialog.ShowDialog();

-            if(result == DialogResult.OK)

-            {

-                Util.updateIceHome(_project, dialog.SelectedPath, false);

-                load();

-            }

-        }

-

-        private void txtIceHome_KeyPress(object sender, KeyPressEventArgs e)

-        {

-            if(e.KeyChar == (char)Keys.Return)

-            {

-                updateIceHome();

-                e.Handled = true;

-            }

-        }

-

-        private void txtIceHome_LostFocus(object sender, EventArgs e)

-        {

-            updateIceHome();

-        }

-

-        private void updateIceHome()

-        {

-            if(!_iceHomeUpdating)

-            {

-                _iceHomeUpdating = true;

-                if(!txtIceHome.Text.Equals(Util.getProjectProperty(_project, Util.PropertyIceHome),

-                                           StringComparison.CurrentCultureIgnoreCase))

-                {

-                    Util.updateIceHome(_project, txtIceHome.Text, false);

-                    load();

-                    txtIceHome.Modified = false;

-                }

-                _iceHomeUpdating = false;

-            }

-        }

-

-        private void componentChanged(string name, bool value)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_initialized)

-            {

-                if(value)

-                {

-                    Util.addDotNetReference(_project, name);

-                }

-                else

-                {

-                    Util.removeDotNetReference(_project, name);

-                }

-            }

-            Cursor = Cursors.Default;        

-        }

-

-        private void chkGlacier2_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("Glacier2", chkGlacier2.Checked);

-        }

-

-        private void chkIce_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("Ice", chkIce.Checked);

-        }

-

-        private void chkIceBox_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IceBox", chkIceBox.Checked);

-        }

-

-        private void chkIceGrid_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IceGrid", chkIceGrid.Checked);

-        }

-

-        private void chkIcePatch2_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IcePatch2", chkIcePatch2.Checked);

-        }

-

-        private void chkIceSSL_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IceSSL", chkIceSSL.Checked);

-        }

-

-        private void chkIceStorm_CheckedChanged(object sender, EventArgs e)

-        {

-            componentChanged("IceStorm", chkIceStorm.Checked);

-        }

-

-        private bool _initialized;

-        private Project _project;

-        private bool _iceHomeUpdating;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Text;
+using System.Windows.Forms;
+
+using EnvDTE;
+
+namespace Ice.VisualStudio
+{
+    public partial class IceVBConfigurationDialog : Form
+    {
+        public IceVBConfigurationDialog(Project project)
+        {
+            InitializeComponent();
+            _project = project;
+            
+            //
+            // Set the toolTip messages.
+            //
+            toolTip.SetToolTip(txtIceHome, "Ice installation directory.");
+            toolTip.SetToolTip(btnSelectIceHome, "Ice installation directory.");
+
+            if(_project != null)
+            {
+                this.Text = "Ice Configuration - Project: " + _project.Name;
+                bool enabled = Util.isSliceBuilderEnabled(project);
+                setEnabled(enabled);
+                chkEnableBuilder.Checked = enabled;
+                load();
+                _initialized = true;
+            }
+        }
+        
+        private void load()
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_project != null)
+            {
+                txtIceHome.Text = Util.getIceHomeRaw(_project, false);
+
+                ComponentList selectedComponents = Util.getIceDotNetComponents(_project);
+                foreach(String s in Util.getDotNetNames())
+                {
+                    if(selectedComponents.Contains(s))
+                    {
+                        checkComponent(s, true);
+                    }
+                    else
+                    {
+                        checkComponent(s, false);
+                    }
+                }
+            }
+            Cursor = Cursors.Default;  
+        }
+
+        private void checkComponent(String component, bool check)
+        {
+            switch (component)
+            {
+                case "Glacier2":
+                {
+                    chkGlacier2.Checked = check;
+                    break;
+                }
+                case "Ice":
+                {
+                    chkIce.Checked = check;
+                    break;
+                }
+                case "IceBox":
+                {
+                    chkIceBox.Checked = check;
+                    break;
+                }
+                case "IceGrid":
+                {
+                    chkIceGrid.Checked = check;
+                    break;
+                }
+                case "IcePatch2":
+                {
+                    chkIcePatch2.Checked = check;
+                    break;
+                }
+                case "IceSSL":
+                {
+                    chkIceSSL.Checked = check;
+                    break;
+                }
+                case "IceStorm":
+                {
+                    chkIceStorm.Checked = check;
+                    break;
+                }
+                default:
+                {
+                    break;
+                }
+            }
+        }
+        private void chkEnableBuilder_CheckedChanged(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_initialized)
+            {
+                _initialized = false;
+                setEnabled(false);
+                chkEnableBuilder.Enabled = false;
+                Builder builder = Connect.getBuilder();
+                if(chkEnableBuilder.Checked)
+                {
+                    builder.addBuilderToProject(_project);
+                }
+                else
+                {
+                    builder.removeBuilderFromProject(_project);
+                }
+                load();
+                setEnabled(chkEnableBuilder.Checked);
+                chkEnableBuilder.Enabled = true;
+                _initialized = true;
+            }
+            Cursor = Cursors.Default;
+        }
+        
+        private void setEnabled(bool enabled)
+        {
+            txtIceHome.Enabled = enabled;
+            btnSelectIceHome.Enabled = enabled;
+
+            chkGlacier2.Enabled = enabled;
+            chkIce.Enabled = enabled;
+            chkIceBox.Enabled = enabled;
+            chkIceGrid.Enabled = enabled;
+            chkIcePatch2.Enabled = enabled;
+            chkIceSSL.Enabled = enabled;
+            chkIceStorm.Enabled = enabled;
+        }
+
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            Close();
+        }
+
+        private void btnSelectIceHome_Click(object sender, EventArgs e)
+        {
+            FolderBrowserDialog dialog = new FolderBrowserDialog();
+            dialog.SelectedPath = Util.getAbsoluteIceHome(_project);
+            dialog.Description = "Select Ice Home Installation Directory";
+            DialogResult result = dialog.ShowDialog();
+            if(result == DialogResult.OK)
+            {
+                Util.updateIceHome(_project, dialog.SelectedPath, false);
+                load();
+            }
+        }
+
+        private void txtIceHome_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if(e.KeyChar == (char)Keys.Return)
+            {
+                updateIceHome();
+                e.Handled = true;
+            }
+        }
+
+        private void txtIceHome_LostFocus(object sender, EventArgs e)
+        {
+            updateIceHome();
+        }
+
+        private void updateIceHome()
+        {
+            if(!_iceHomeUpdating)
+            {
+                _iceHomeUpdating = true;
+                if(!txtIceHome.Text.Equals(Util.getProjectProperty(_project, Util.PropertyIceHome),
+                                           StringComparison.CurrentCultureIgnoreCase))
+                {
+                    Util.updateIceHome(_project, txtIceHome.Text, false);
+                    load();
+                    txtIceHome.Modified = false;
+                }
+                _iceHomeUpdating = false;
+            }
+        }
+
+        private void componentChanged(string name, bool value)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_initialized)
+            {
+                if(value)
+                {
+                    Util.addDotNetReference(_project, name);
+                }
+                else
+                {
+                    Util.removeDotNetReference(_project, name);
+                }
+            }
+            Cursor = Cursors.Default;        
+        }
+
+        private void chkGlacier2_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("Glacier2", chkGlacier2.Checked);
+        }
+
+        private void chkIce_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("Ice", chkIce.Checked);
+        }
+
+        private void chkIceBox_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IceBox", chkIceBox.Checked);
+        }
+
+        private void chkIceGrid_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IceGrid", chkIceGrid.Checked);
+        }
+
+        private void chkIcePatch2_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IcePatch2", chkIcePatch2.Checked);
+        }
+
+        private void chkIceSSL_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IceSSL", chkIceSSL.Checked);
+        }
+
+        private void chkIceStorm_CheckedChanged(object sender, EventArgs e)
+        {
+            componentChanged("IceStorm", chkIceStorm.Checked);
+        }
+
+        private bool _initialized;
+        private Project _project;
+        private bool _iceHomeUpdating;
+    }
+}
diff --git a/vsplugin/src/IceVBConfigurationDialog.resx b/vsplugin/src/IceVBConfigurationDialog.resx
index a5979aadfff..a499e2cedc5 100755
--- a/vsplugin/src/IceVBConfigurationDialog.resx
+++ b/vsplugin/src/IceVBConfigurationDialog.resx
@@ -120,4 +120,4 @@
   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>17, 17</value>

   </metadata>

-</root>
\ No newline at end of file
+</root>

diff --git a/vsplugin/src/Util.cs b/vsplugin/src/Util.cs
index 215e2994a71..393e310215b 100644
--- a/vsplugin/src/Util.cs
+++ b/vsplugin/src/Util.cs
@@ -1,1560 +1,1560 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Text;

-using System.Collections.Generic;

-using System.ComponentModel;

-using EnvDTE;

-using System.Windows.Forms;

-using System.Runtime.InteropServices;

-using System.IO;

-using System.Diagnostics;

-using Extensibility;

-using EnvDTE80;

-using Microsoft.VisualStudio.CommandBars;

-using Microsoft.VisualStudio.VCProjectEngine;

-using Microsoft.VisualStudio.VCProject;

-using Microsoft.VisualStudio.Shell;

-using System.Resources;

-using System.Reflection;

-using VSLangProj;

-using System.Globalization;

-

-using System.Collections;

-using System.Runtime.InteropServices.ComTypes;

-using Microsoft.CSharp;

-

-namespace Ice.VisualStudio

-{

-    public class ComponentList : List<string>

-    {

-        public ComponentList()

-        {

-        }

-

-        public ComponentList(string[] values)

-        {

-            foreach(string s in values)

-            {

-                Add(s);

-            }

-        }

-

-        public new void Add(string value)

-        {

-            value = value.Trim();

-            if(!base.Contains(value))

-            {

-                base.Add(value);

-            }

-        }

-

-        public new bool Contains(string value)

-        {

-            string found = base.Find(delegate(string s)

-                                    {

-                                        return s.Equals(value, StringComparison.CurrentCultureIgnoreCase);

-                                    });

-            return !String.IsNullOrEmpty(found);

-        }

-

-        public new void Remove(string value)

-        {

-            string found = base.Find(delegate(string s)

-            {

-                return s.Equals(value, StringComparison.CurrentCultureIgnoreCase);

-            });

-

-            if(!String.IsNullOrEmpty(found))

-            {

-                base.Remove(found);

-            }

-        }

-

-        public ComponentList(string value)

-        {

-            init(value, ';');

-        }

-

-        public ComponentList(string value, char separator)

-        {

-            init(value, separator);

-        }

-

-        private void init(string value, char separator)

-        {

-            Array items = value.Split(separator);

-            foreach(string s in items)

-            {

-                string trimmed = s.Trim();

-                if(trimmed.Length > 0)

-                {

-                    Add(trimmed);

-                }

-            }

-        }

-

-        public override string ToString()

-        {

-            return ToString(';');

-        }

-

-        public string ToString(char separator)

-        {

-            StringBuilder sb = new StringBuilder();

-            for(int cont = 0; cont < this.Count; cont++)

-            {

-                sb.Append(this[cont]);

-                if(cont < this.Count - 1)

-                {

-                    if(!separator.Equals(' '))

-                    {

-                        sb.Append(' ');

-                    }

-                    sb.Append(separator);

-                    if(!separator.Equals(' '))

-                    {

-                        sb.Append(' ');

-                    }

-                }

-            }

-            return sb.ToString();

-        }

-    }

-

-    public class IncludePathList : ComponentList

-    {

-        public IncludePathList()

-            : base()

-        {

-        }

-

-        public IncludePathList(string[] values)

-            : base(values)

-        {

-        }

-

-        public IncludePathList(string value)

-            : base(value, '|')

-        {

-        }

-

-        public override string ToString()

-        {

-            return base.ToString('|');

-        }

-    }

-

-    public static class Util

-    {

-        public const string slice2cs = "slice2cs.exe";

-        public const string slice2cpp = "slice2cpp.exe";

-        public const string slice2sl = "slice2sl.exe";

-

-        //

-        // Property names used to persist project configuration.

-        //

-        public const string PropertyIce = "ZerocIce_Enabled";

-        public const string PropertyIceHome = "ZerocIce_Home";

-        public const string PropertyIceHomeExpanded = "ZerocIce_HomeExpanded";

-        public const string PropertyIceComponents = "ZerocIce_Components";

-        public const string PropertyIceExtraOptions = "ZerocIce_ExtraOptions";

-        public const string PropertyIceIncludePath = "ZerocIce_IncludePath";

-        public const string PropertyIceStreaming = "ZerocIce_Streaming";

-        public const string PropertyIceChecksum = "ZerocIce_Checksum";

-        public const string PropertyIceTie = "ZerocIce_Tie";

-        public const string PropertyIcePrefix = "ZerocIce_Prefix";

-        public const string PropertyIceDllExport = "ZerocIce_DllExport";

-        public const string PropertyConsoleOutput = "ZerocIce_ConsoleOutput";

-

-        private static readonly string[] silverlightNames =

-        {

-            "IceSL"

-        };

-

-        public static string[] getSilverlightNames()

-        {

-            return (string[])silverlightNames.Clone();

-        }

-        

-        private static readonly string[] cppNames =

-        {

-            "Freeze", "Glacier2", "Ice", "IceBox", "IceGrid", "IcePatch2", 

-            "IceSSL", "IceStorm", "IceUtil" 

-        };

-

-        public static string[] getCppNames()

-        {

-            return (string[])cppNames.Clone();

-        }

-        

-        private static readonly string[] dotNetNames =

-        {

-            "Glacier2", "Ice", "IceBox", "IceGrid", "IcePatch2", 

-            "IceSSL", "IceStorm"

-        };

-

-        public static string[] getDotNetNames()

-        {

-            return (string[])dotNetNames.Clone();

-        }

-

-        const string iceSilverlightHome = "C:\\IceSL-0.3.3";

-        static string defaultIceHome;

-

-        private static void setIceHomeDefault()

-        {

-            defaultIceHome = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);

-            if(defaultIceHome.EndsWith("\\bin", StringComparison.Ordinal))

-            {

-                defaultIceHome = defaultIceHome.Substring(0, defaultIceHome.Length - 4);

-            }

-        }

-

-        public static string getIceHomeRaw(Project project, bool update)

-        {

-            if(defaultIceHome == null)

-            {

-                setIceHomeDefault();

-            }

-

-            if(Util.isSilverlightProject(project))

-            {

-                return Util.getProjectProperty(project, Util.PropertyIceHome, iceSilverlightHome, update);

-            }

-            string iceHome = Util.getProjectProperty(project, Util.PropertyIceHome, "", update);

-            if(iceHome.Length == 0)

-            {

-                iceHome = defaultIceHome;

-            }

-            return iceHome;

-        }

-

-        public static string getIceHome(Project project)

-        {

-            if(defaultIceHome == null)

-            {

-                setIceHomeDefault();

-            }

-

-            if(Util.isSilverlightProject(project))

-            {

-                return Util.getProjectProperty(project, Util.PropertyIceHomeExpanded, iceSilverlightHome);

-            }

-            string iceHome = Util.getProjectProperty(project, Util.PropertyIceHomeExpanded, defaultIceHome);

-            Environment.SetEnvironmentVariable("IceHome", iceHome);

-            return iceHome;

-        }

-

-        public static string getAbsoluteIceHome(Project project)

-        {

-            string iceHome = Util.getIceHome(project);

-            if(!Path.IsPathRooted(iceHome))

-            {

-                iceHome = Path.Combine(Path.GetDirectoryName(project.FileName), iceHome);

-                iceHome = Path.GetFullPath(iceHome);

-            }

-            return iceHome;

-        }

-        

-        public static string getPathRelativeToProject(ProjectItem item)

-        {

-            StringBuilder path = new StringBuilder();

-            if(item != null)

-            {

-                path.Append(Util.getPathRelativeToProject(item, item.ContainingProject.ProjectItems));

-            }

-            return Util.normalizePath(path.ToString());

-        }

-

-        public static string getPathRelativeToProject(ProjectItem item, ProjectItems items)

-        {

-            StringBuilder path = new StringBuilder();

-            foreach(ProjectItem i in items)

-            {

-                if(i == item)

-                {

-                    if(path.Length > 0)

-                    {

-                        path.Append("\\");

-                    }

-                    path.Append(i.Name);

-                    break;

-                }

-                else if(Util.isProjectItemFilter(i) || Util.isProjectItemFolder(i))

-                {

-                    string token = Util.getPathRelativeToProject(item, i.ProjectItems);

-                    if(!String.IsNullOrEmpty(token))

-                    {

-                        path.Append(i.Name);

-                        path.Append("\\");

-                        path.Append(token);

-                        break;

-                    }

-                }

-            }

-            return path.ToString();

-        }

-

-        public static void addCppIncludes(VCCLCompilerTool tool, Project project)

-        {

-            if(tool == null || project == null)

-            {

-                return;

-            }

-

-            string iceHome = Util.getAbsoluteIceHome(project);

-            string iceIncludeDir = "";

-            if(Directory.Exists(iceHome + "\\cpp\\include"))

-            {

-                iceIncludeDir = Util.getIceHome(project) + "\\cpp\\include";

-            }

-            else

-            {

-                iceIncludeDir = Util.getIceHome(project) + "\\include";

-            }

-

-            string additionalIncludeDirectories = tool.AdditionalIncludeDirectories;

-            if(String.IsNullOrEmpty(additionalIncludeDirectories))

-            {

-                tool.AdditionalIncludeDirectories = iceIncludeDir + ";.";

-                return;

-            }

-

-            ComponentList includes = new ComponentList(additionalIncludeDirectories);

-            bool changed = false;

-            if(!includes.Contains(iceIncludeDir))

-            {

-                changed = true;

-                includes.Add(iceIncludeDir);

-            }

-

-            if(!includes.Contains("."))

-            {

-                changed = true;

-                includes.Add(".");

-            }

-

-            if(changed)

-            {

-                tool.AdditionalIncludeDirectories = includes.ToString();

-            }

-        }

-

-        private static readonly string[] _cppIncludeDirs =

-        {

-            "\\include",

-            "\\cpp\\include",

-        };

-

-        public static void removeCppIncludes(VCCLCompilerTool tool, Project project)

-        {

-            if(tool == null || project == null)

-            {

-                return;

-            }

-

-            string additionalIncludeDirectories = tool.AdditionalIncludeDirectories;

-            if(String.IsNullOrEmpty(additionalIncludeDirectories))

-            {

-                return;

-            }

-            ComponentList includes = new ComponentList(additionalIncludeDirectories);

-

-            string iceHome = Util.getIceHome(project);

-            foreach(string dir in _cppIncludeDirs)

-            {

-                string includeDir = iceHome + dir;

-                if(includes.Contains(includeDir))

-                {

-                    includes.Remove(includeDir);

-                    tool.AdditionalIncludeDirectories = includes.ToString();

-                    break;

-                }

-            }

-        }

-

-        private static readonly string[] _csBinDirs =

-        {

-            "\\bin\\",

-            "\\cs\\bin\\",

-            "\\sl\\bin\\",

-        };

-

-        public static void addDotNetReference(Project project, string component)

-        {

-            if(project == null || String.IsNullOrEmpty(component))

-            {

-                return;

-            }

-

-            string iceHome = Util.getAbsoluteIceHome(project);

-            foreach(string dir in _csBinDirs)

-            {

-                if(Directory.Exists(iceHome + dir))

-                {

-                    string reference = iceHome + dir + component + ".dll";                

-                    if(File.Exists(reference))

-                    {

-                        VSLangProj.VSProject vsProject = (VSLangProj.VSProject)project.Object;

-                        try

-                        {

-                            vsProject.References.Add(reference);

-                            return;

-                        }

-                        catch(COMException ex)

-                        {

-                            Console.WriteLine(ex);

-                        }

-                    }

-                }

-            }

-

-            System.Windows.Forms.MessageBox.Show("Could not locate '" + component + 

-                                                 ".dll'. Review you 'Ice Home' setting.",

-                                                 "Ice Visual Studio Extension", MessageBoxButtons.OK,

-                                                 MessageBoxIcon.Error,

-                                                 System.Windows.Forms.MessageBoxDefaultButton.Button1,

-                                                 System.Windows.Forms.MessageBoxOptions.RightAlign);

-        }

-

-        public static bool removeDotNetReference(Project project, string component)

-        {

-            if(project == null || String.IsNullOrEmpty(component))

-            {

-                return false;

-            }

-

-            foreach(Reference r in ((VSProject)project.Object).References)

-            {

-                if(r.Identity.Equals(component, StringComparison.OrdinalIgnoreCase))

-                {

-                    r.Remove();

-                    return true;

-                }

-            }

-            return false;

-        }

-

-        public static void addCppLib(VCLinkerTool tool, string component, bool debug)

-        {

-            if(tool == null || String.IsNullOrEmpty(component))

-            {

-                return;

-            }

-

-            if(Array.BinarySearch(Util.getCppNames(), component) < 0)

-            {

-                return;

-            }

-

-            string libName = component;

-            if(debug)

-            {

-                libName += "d";

-            }

-            libName += ".lib";

-

-            string additionalDependencies = tool.AdditionalDependencies;

-            if(String.IsNullOrEmpty(additionalDependencies))

-            {

-                additionalDependencies = "";

-            }

-

-            ComponentList components = new ComponentList(additionalDependencies.Split(' '));

-            if(!components.Contains(libName))

-            {

-                components.Add(libName);

-                additionalDependencies = components.ToString(' ');

-                tool.AdditionalDependencies = additionalDependencies;

-            }

-        }

-

-        public static bool removeCppLib(VCLinkerTool tool, string component, bool debug)

-        {

-            if(tool == null)

-            {

-                return false;

-            }

-

-            if(String.IsNullOrEmpty(tool.AdditionalDependencies))

-            {

-                return false;

-            }

-

-            string libName = component;

-            if(debug)

-            {

-                libName += "d";

-            }

-            libName += ".lib";

-

-            ComponentList components = new ComponentList(tool.AdditionalDependencies.Split(' '));

-            if(components.Contains(libName))

-            {

-                components.Remove(libName);

-                tool.AdditionalDependencies = components.ToString(' ');

-                return true;

-            }

-            return false;

-        }

-

-        public static void addIceCppEnviroment(VCDebugSettings debugSettings, Project project, bool x64)

-        {

-            if(debugSettings == null || project == null)

-            {

-                return;

-            }

-            string iceHome = Util.getAbsoluteIceHome(project);

-            string iceBinDir = "";

-            if(Directory.Exists(iceHome + "\\cpp\\bin"))

-            {

-                iceBinDir = Util.getIceHome(project) + "\\cpp\\bin";

-            }

-            else

-            {

-                iceBinDir = Util.getIceHome(project) + "\\bin";

-                if(x64)

-                {

-                    iceBinDir += "\\x64";

-                }

-            }

-            string icePath = "PATH=" + iceBinDir;

-

-            string enviroment = debugSettings.Environment;

-            if(String.IsNullOrEmpty(enviroment))

-            {

-                debugSettings.Environment = "PATH=" + iceBinDir;

-                return;

-            }

-

-            ComponentList envs = new ComponentList(enviroment, '\n');

-            if(!envs.Contains(icePath))

-            {

-                envs.Add(icePath);

-                debugSettings.Environment = envs.ToString('\n');

-                return;

-            }

-        

-        }

-

-        private static readonly string[] _cppBinDirs =

-        {

-            "\\bin",

-            "\\bin\\x64",

-            "\\cpp\\bin",

-        };

-

-        public static void removeIceCppEnviroment(VCDebugSettings debugSettings,

-                                                  Project project)

-        {

-            if(debugSettings == null || project == null)

-            {

-                return;

-            }

-

-            string iceHome = Util.getIceHome(project);

-            foreach(string dir in _cppBinDirs)

-            {

-                string enviroment = debugSettings.Environment;

-                if(String.IsNullOrEmpty(enviroment))

-                {

-                    return;

-                }

-

-                ComponentList envs = new ComponentList(enviroment, '\n');

-                string binDir = "PATH=" + iceHome + dir;

-                if(envs.Contains(binDir))

-                {

-                    envs.Remove(binDir);

-                    debugSettings.Environment = envs.ToString('\n');

-                    return;

-                }

-            }

-        }

-

-        public static void addIceCppLibraryDir(VCLinkerTool tool, Project project, bool x64)

-        {

-            if(tool == null || project == null)

-            {

-                return;

-            }

-

-            string iceHome = Util.getAbsoluteIceHome(project);

-            string iceLibDir = "";

-            if(Directory.Exists(iceHome + "\\cpp\\lib"))

-            {

-                iceLibDir = Util.getIceHome(project) + "\\cpp\\lib";

-            }

-            else

-            {

-                iceLibDir = Util.getIceHome(project) + "\\lib";

-                if(x64)

-                {

-                    iceLibDir += "\\x64";

-                }

-            }

-

-            string additionalLibraryDirectories = tool.AdditionalLibraryDirectories;

-            if(String.IsNullOrEmpty(additionalLibraryDirectories))

-            {

-                tool.AdditionalLibraryDirectories = iceLibDir;

-                return;

-            }

-

-            ComponentList libs = new ComponentList(additionalLibraryDirectories);

-            if(!libs.Contains(iceLibDir))

-            {

-                libs.Add(iceLibDir);

-                tool.AdditionalLibraryDirectories = libs.ToString();

-                return;

-            }

-        }

-

-        private static readonly string[] _cppLibDirs =

-        {

-            "\\lib",

-            "\\lib\\x64",

-            "\\cpp\\lib",

-        };

-

-        public static void removeIceCppLibraryDir(VCLinkerTool tool, Project project)

-        {

-            if(tool == null || project == null)

-            {

-                return;

-            }

-

-            string iceHome = Util.getIceHome(project);

-            foreach(string dir in _cppLibDirs)

-            {

-                string additionalLibraryDirectories = tool.AdditionalLibraryDirectories;

-                if(String.IsNullOrEmpty(additionalLibraryDirectories))

-                {

-                    return;

-                }

-

-                ComponentList libs = new ComponentList(additionalLibraryDirectories);

-                string libDir = iceHome + dir;

-                if(libs.Contains(libDir))

-                {

-                    libs.Remove(libDir);

-                    tool.AdditionalLibraryDirectories = libs.ToString();

-                    return;

-                }

-            }

-        }

-

-        public static bool isSliceBuilderEnabled(Project project)

-        {

-            return Util.getProjectPropertyAsBool(project, Util.PropertyIce);

-        }

-

-        public static bool isCSharpProject(Project project)

-        {

-            if(project == null)

-            {

-                return false;

-            }

-

-            if(String.IsNullOrEmpty(project.Kind))

-            {

-                return false;

-            }

-

-            return project.Kind == VSLangProj.PrjKind.prjKindCSharpProject;

-        }

-

-        public static bool isVBProject(Project project)

-        {

-            if(project == null)

-            {

-                return false;

-            }

-

-            if(String.IsNullOrEmpty(project.Kind))

-            {

-                return false;

-            }

-

-            return project.Kind == VSLangProj.PrjKind.prjKindVBProject;

-        }

-

-        public static bool isSilverlightProject(Project project)

-        {

-            if(!Util.isCSharpProject(project))

-            {

-                return false;

-            }

-

-            Array extenders = (Array)project.ExtenderNames;

-            foreach(string s in extenders)

-            {

-                if(String.IsNullOrEmpty(s))

-                {

-                    continue;

-                }

-                if(s.Equals("SilverlightProject"))

-                {

-                    return true;

-                }

-            }

-            return false;

-        }

-

-        public static bool isCppProject(Project project)

-        {

-            if(project == null)

-            {

-                return false;

-            }

-

-            if(String.IsNullOrEmpty(project.Kind))

-            {

-                return false;

-            }

-            return project.Kind == vcContextGuids.vcContextGuidVCProject;

-        }

-

-        public static bool isProjectItemFolder(ProjectItem item)

-        {

-            if(item == null)

-            {

-                return false;

-            }

-

-            if(String.IsNullOrEmpty(item.Kind))

-            {

-                return false;

-            }

-            return item.Kind == "{6BB5F8EF-4483-11D3-8BCF-00C04F8EC28C}";

-        }

-

-        public static bool isProjectItemFilter(ProjectItem item)

-        {

-            if(item == null)

-            {

-                return false;

-            }

-

-            if(String.IsNullOrEmpty(item.Kind))

-            {

-                return false;

-            }

-            return item.Kind == "{6BB5F8F0-4483-11D3-8BCF-00C04F8EC28C}";

-        }

-

-        public static bool isProjectItemFile(ProjectItem item)

-        {

-            if(item == null)

-            {

-                return false;

-            }

-

-            if(String.IsNullOrEmpty(item.Kind))

-            {

-                return false;

-            }

-            return item.Kind == "{6BB5F8EE-4483-11D3-8BCF-00C04F8EC28C}";

-        }

-

-        public static bool hasItemNamed(ProjectItems items, string name)

-        {

-            bool found = false;

-            foreach(ProjectItem item in items)

-            {

-                if(item == null)

-                {

-                    continue;

-                }

-

-                if(item.Name == null)

-                {

-                    continue;

-                }

-

-                if(item.Name.Equals(name, StringComparison.OrdinalIgnoreCase))

-                {

-                    found = true;

-                    break;

-                }

-            }

-            return found;

-        }

-

-        public static ProjectItem findItem(string path, ProjectItems items)

-        {

-            if(String.IsNullOrEmpty(path))

-            {

-                return null;

-            }

-            ProjectItem item = null;

-            foreach(ProjectItem i in items)

-            {

-                if(i == null)

-                {

-                    continue;

-                }

-                else if(Util.isProjectItemFile(i))

-                {

-                    string fullPath = i.Properties.Item("FullPath").Value.ToString();

-                    if(Path.GetFullPath(fullPath).Equals(

-                           Path.GetFullPath(path), StringComparison.CurrentCultureIgnoreCase))

-                    {

-                        item = i;

-                        break;

-                    }

-                }

-                else if(Util.isProjectItemFolder(i))

-                {

-                    string p = Path.GetDirectoryName(i.Properties.Item("FullPath").Value.ToString());

-                    if(p.Equals(Path.GetFullPath(path), StringComparison.CurrentCultureIgnoreCase))

-                    {

-                        item = i;

-                        break;

-                    }

-

-                    item = findItem(path, i.ProjectItems);

-                    if(item != null)

-                    {

-                        break;

-                    }

-                }

-                else if(Util.isProjectItemFilter(i))

-                {

-                    string p = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(i.ContainingProject.FileName),

-                                            Util.normalizePath(Util.getPathRelativeToProject(i))));

-

-                    if(p.Equals(Path.GetFullPath(path), StringComparison.CurrentCultureIgnoreCase))

-                    {

-                        item = i;

-                        break;

-                    }

-

-                    item = findItem(path, i.ProjectItems);

-                    if(item != null)

-                    {

-                        break;

-                    }

-                }

-            }

-            return item;

-        }

-

-        public static VCFile findVCFile(IVCCollection files, string name, string fullPath)

-        {

-            VCFile vcFile = null;

-            foreach(VCFile file in files)

-            {

-                if(file.ItemName == name)

-                {

-                    if(file.FullPath != fullPath)

-                    {

-                        file.Remove();

-                        break;

-                    }

-                    vcFile = file;

-                    break;

-                }

-            }

-            return vcFile;

-        }

-

-        public static string normalizePath(string path)

-        {

-            path = path.Replace('/', '\\');

-            path = path.Replace(".\\", "");

-            if(path.IndexOf("\\", StringComparison.Ordinal) == 0)

-            {

-                path = path.Substring(1, path.Length - 1);

-            }

-            if(path.EndsWith("\\.", StringComparison.Ordinal))

-            {

-                path = path.Substring(0, path.Length - "\\.".Length);

-            }

-            return path;

-        }

-

-        public static string relativePath(string mainDirPath, string absoluteFilePath)

-        {

-            if(absoluteFilePath != null)

-            {

-                absoluteFilePath = absoluteFilePath.Trim();

-            }

-            if(mainDirPath != null)

-            {

-                mainDirPath = mainDirPath.Trim();

-            }

-            if(String.IsNullOrEmpty(absoluteFilePath) || String.IsNullOrEmpty(mainDirPath))

-            {

-                return "";

-            }

-            string[] firstPathParts = 

-                mainDirPath.Trim(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar);

-            string[] secondPathParts =

-                absoluteFilePath.Trim(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar);

-

-            int sameCounter = 0;

-            for(int i = 0; i < Math.Min(firstPathParts.Length, secondPathParts.Length); i++)

-            {

-                if(!firstPathParts[i].Equals(secondPathParts[i], StringComparison.CurrentCultureIgnoreCase))

-                {

-                    break;

-                }

-                sameCounter++;

-            }

-

-            if(sameCounter == 0)

-            {

-                return absoluteFilePath;

-            }

-

-            string newPath = String.Empty;

-            for(int i = sameCounter; i < firstPathParts.Length; i++)

-            {

-                if(i > sameCounter)

-                {

-                    newPath += Path.DirectorySeparatorChar;

-                }

-                newPath += "..";

-            }

-

-            if(newPath.Length == 0)

-            {

-                newPath = ".";

-            }

-

-            for(int i = sameCounter; i < secondPathParts.Length; i++)

-            {

-                newPath += Path.DirectorySeparatorChar;

-                newPath += secondPathParts[i];

-            }

-            return newPath;

-        }

-

-        public static ProjectItem getSelectedProjectItem(_DTE dte)

-        {

-            UIHierarchyItem uiItem = getSelectedUIHierearchyItem(dte);

-            if(uiItem == null)

-            {

-                return null;

-            }

-            return uiItem.Object as ProjectItem;

-        }

-

-        public static Project getSelectedProject()

-        {

-            return Util.getSelectedProject(Util.getCurrentDTE());

-        }

-

-        public static Project getSelectedProject(_DTE dte)

-        {

-            UIHierarchyItem uiItem = getSelectedUIHierearchyItem(dte);

-            if(uiItem == null)

-            {

-                return null;

-            }

-            return uiItem.Object as Project;

-        }

-

-        public static UIHierarchyItem getSelectedUIHierearchyItem(_DTE dte)

-        {

-            if(dte == null)

-            {

-                return null;

-            }

-

-            UIHierarchy uiHierarchy = 

-                (EnvDTE.UIHierarchy)dte.Windows.Item(EnvDTE.Constants.vsWindowKindSolutionExplorer).Object;

-            if(uiHierarchy == null)

-            {

-                return null;

-            }

-

-            if(uiHierarchy.SelectedItems == null)

-            {

-                return null;

-            }

-

-            if(((Array)uiHierarchy.SelectedItems).Length <= 0)

-            {

-                return null;

-            }

-            return (UIHierarchyItem)((Array)uiHierarchy.SelectedItems).GetValue(0);

-        }

-

-        public static void updateIceHome(Project project, string iceHome, bool force)

-        {

-            if(project == null || String.IsNullOrEmpty(iceHome))

-            {

-                return;

-            }

-

-            if(!force)

-            {

-                string oldIceHome = Util.getIceHomeRaw(project, true).ToUpper(CultureInfo.InvariantCulture);

-                if(oldIceHome.Equals(iceHome, StringComparison.CurrentCultureIgnoreCase))

-                {

-                    return;

-                }

-            }

-

-            if(Util.isCSharpProject(project) || Util.isVBProject(project))

-            {

-                updateIceHomeDotNetProject(project, iceHome);

-            }

-            else if(Util.isCppProject(project))

-            {

-                updateIceHomeCppProject(project, iceHome);

-            }

-        }

-

-        private static void updateIceHomeCppProject(Project project, string iceHome)

-        {

-            Util.removeIceCppConfigurations(project);

-            Util.setIceHome(project, iceHome);

-            Util.addIceCppConfigurations(project);

-        }

-

-        private static bool getCopyLocal(Project project, string name)

-        {

-            VSLangProj.VSProject vsProject = (VSLangProj.VSProject)project.Object;

-            foreach(Reference r in vsProject.References)

-            {

-                if(r.Name.Equals(name))

-                {

-                    return r.CopyLocal;

-                }

-            }

-            return true;

-        }

-

-        private static void setCopyLocal(Project project, string name, bool copyLocal)

-        {

-            VSLangProj.VSProject vsProject = (VSLangProj.VSProject)project.Object;

-            foreach(Reference r in vsProject.References)

-            {

-                if(r.Name.Equals(name))

-                {

-                    r.CopyLocal = copyLocal;

-                    break;

-                }

-            }

-        }

-

-        private static void updateIceHomeDotNetProject(Project project, string iceHome)

-        {

-            Util.setIceHome(project, iceHome);

-

-            ComponentList components = Util.getIceDotNetComponents(project);

-            foreach(string s in components)

-            {

-                if(String.IsNullOrEmpty(s))

-                {

-                    continue;

-                }

-

-                bool copyLocal = getCopyLocal(project, s);

-                Util.removeDotNetReference(project, s);

-

-                Util.addDotNetReference(project, s);

-                setCopyLocal(project, s, copyLocal);

-            }

-        }

-

-        public static void setIceHome(Project project, string value)

-        {

-            string expanded = subEnvironmentVars(value);

-

-            string fullPath = expanded;

-            if(!Path.IsPathRooted(fullPath))

-            {

-                fullPath = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(project.FileName), fullPath));

-            }

-

-            if(Util.isSilverlightProject(project))

-            {

-                if(!File.Exists(fullPath + "\\bin\\slice2sl.exe") || !Directory.Exists(fullPath + "\\slice\\Ice"))

-                {

-                    if(!File.Exists(fullPath + "\\cpp\\bin\\slice2sl.exe") ||

-                       !Directory.Exists(fullPath + "\\sl\\slice\\Ice"))

-                    {

-                        System.Windows.Forms.MessageBox.Show("Could not locate Ice for Silverlight installation in '"

-                                                             + expanded + "' directory.\n",

-                                                             "Ice Visual Studio Extension", MessageBoxButtons.OK,

-                                                             MessageBoxIcon.Error,

-                                                             System.Windows.Forms.MessageBoxDefaultButton.Button1,

-                                                             System.Windows.Forms.MessageBoxOptions.RightAlign);

-                        return;

-                    }

-                }

-            }

-            else if(Util.isCppProject(project))

-            {

-                if(!Directory.Exists(fullPath + "\\slice\\Ice") || 

-                   (!File.Exists(fullPath + "\\bin\\slice2cpp.exe") && 

-                    !File.Exists(fullPath + "\\bin\\x64\\slice2cpp.exe") &&  

-                    !File.Exists(fullPath + "\\cpp\\bin\\slice2cpp.exe")))

-                {

-                    System.Windows.Forms.MessageBox.Show("Could not locate Ice installation in '"

-                                                         + expanded + "' directory.\n",

-                                                         "Ice Visual Studio Extension", MessageBoxButtons.OK,

-                                                         MessageBoxIcon.Error,

-                                                         System.Windows.Forms.MessageBoxDefaultButton.Button1,

-                                                         System.Windows.Forms.MessageBoxOptions.RightAlign);

-

-                    return;

-                }

-            }

-            else if(Util.isCSharpProject(project))

-            {

-                if(!Directory.Exists(fullPath + "\\slice\\Ice") || 

-                   (!File.Exists(fullPath + "\\bin\\slice2cs.exe") && 

-                    !File.Exists(fullPath + "\\bin\\x64\\slice2cs.exe") &&  

-                    !File.Exists(fullPath + "\\cpp\\bin\\slice2cs.exe")))

-                {

-                    System.Windows.Forms.MessageBox.Show("Could not locate Ice installation in '"

-                                                         + expanded + "' directory.\n",

-                                                         "Ice Visual Studio Extension", MessageBoxButtons.OK,

-                                                         MessageBoxIcon.Error,

-                                                         System.Windows.Forms.MessageBoxDefaultButton.Button1,

-                                                         System.Windows.Forms.MessageBoxOptions.RightAlign);

-

-                    return;

-                }

-            }

-            else if(Util.isVBProject(project))

-            {

-                if(!File.Exists(fullPath + "\\bin\\Ice.dll") && !File.Exists(fullPath + "\\cs\\bin\\Ice.dll"))

-                {

-                    System.Windows.Forms.MessageBox.Show("Could not locate Ice installation in '"

-                                                         + expanded + "' directory.\n",

-                                                         "Ice Visual Studio Extension", MessageBoxButtons.OK,

-                                                         MessageBoxIcon.Error,

-                                                         System.Windows.Forms.MessageBoxDefaultButton.Button1,

-                                                         System.Windows.Forms.MessageBoxOptions.RightAlign);

-

-                    return;

-                }

-            }

-

-            if(value.Equals(defaultIceHome))

-            {

-                setProjectProperty(project, Util.PropertyIceHome, "");

-            }

-            else

-            {

-                setProjectProperty(project, Util.PropertyIceHome, value);

-            }

-            setProjectProperty(project, Util.PropertyIceHomeExpanded, expanded);

-        }

-

-        public static bool getProjectPropertyAsBool(Project project, string name)

-        {

-            return Util.getProjectProperty(project, name).Equals(

-                                        true.ToString(), StringComparison.CurrentCultureIgnoreCase);

-        }

-

-        public static string getProjectProperty(Project project, string name)

-        {

-            return Util.getProjectProperty(project, name, "", true);

-        }

-

-        public static string getProjectProperty(Project project, string name, string defaultValue)

-        {

-            return Util.getProjectProperty(project, name, defaultValue, true);

-        }

-

-        public static string getProjectProperty(Project project, string name, string defaultValue, bool update)

-        {

-            if(project == null || String.IsNullOrEmpty(name))

-            {

-                return defaultValue;

-            }

-

-            if(project.Globals == null)

-            {

-                return defaultValue;

-            }

-

-            if(project.Globals.get_VariableExists(name))

-            {

-                return project.Globals[name].ToString();

-            }

-

-            if(update && !String.IsNullOrEmpty(defaultValue))

-            {

-                project.Globals[name] = defaultValue;

-                project.Globals.set_VariablePersists(name, true);

-            }

-            return defaultValue;

-        }

-

-        public static void setProjectProperty(Project project, string name, string value)

-        {

-            if(project == null || String.IsNullOrEmpty(name))

-            {

-                return ;

-            }

-

-            if(project.Globals == null)

-            {

-                return;

-            }

-

-            project.Globals[name] = value;

-            project.Globals.set_VariablePersists(name, true);

-        }

-        

-        public static String getPrecompileHeader(Project project)

-        {

-            if(!Util.isCppProject(project))

-            {

-                return "";

-            }

-            ConfigurationManager configManager = project.ConfigurationManager;

-            Configuration activeConfig = (Configuration)configManager.ActiveConfiguration;

-

-            VCProject vcProject = (VCProject)project.Object;

-            IVCCollection configurations = (IVCCollection)vcProject.Configurations;

-            String preCompiledHeader = "";

-            foreach(VCConfiguration conf in configurations)

-            {

-                if(conf.Name != (activeConfig.ConfigurationName + "|" + activeConfig.PlatformName))

-                {

-                    continue;

-                }

-                VCCLCompilerTool compilerTool = 

-                    (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));

-                if(compilerTool == null)

-                {

-                    break;

-                }

-                if(compilerTool.UsePrecompiledHeader == pchOption.pchCreateUsingSpecific ||

-                   compilerTool.UsePrecompiledHeader == pchOption.pchUseUsingSpecific)

-                {

-                    preCompiledHeader = compilerTool.PrecompiledHeaderThrough;

-                }

-            }

-            return preCompiledHeader;

-        }

-

-        public static ComponentList getIceCppComponents(Project project)

-        {

-            ComponentList components = new ComponentList();

-            ConfigurationManager configManager = project.ConfigurationManager;

-            Configuration activeConfig = (Configuration)configManager.ActiveConfiguration;

-

-            VCProject vcProject = (VCProject)project.Object;

-            IVCCollection configurations = (IVCCollection)vcProject.Configurations;

-            foreach(VCConfiguration conf in configurations)

-            {

-                if(conf.Name != (activeConfig.ConfigurationName + "|" + activeConfig.PlatformName))

-                {

-                    continue;

-                }

-

-                VCCLCompilerTool compilerTool = 

-                    (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));

-                VCLinkerTool linkerTool = (VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool"));

-                if(linkerTool == null || compilerTool == null)

-                {

-                    break;

-                }

-

-                if(String.IsNullOrEmpty(linkerTool.AdditionalDependencies))

-                {

-                    break;

-                }

-

-                bool debug = false;

-                if(!String.IsNullOrEmpty(compilerTool.PreprocessorDefinitions))

-                {

-                    debug = (compilerTool.PreprocessorDefinitions.Contains("DEBUG") &&

-                             !compilerTool.PreprocessorDefinitions.Contains("NDEBUG"));

-                }

-

-                if(!debug)

-                {

-                    debug = conf.Name.Contains("Debug");

-                }

-

-                List<string> componentNames = new List<string>(linkerTool.AdditionalDependencies.Split(' '));

-                foreach(string s in componentNames)

-                {

-                    if(String.IsNullOrEmpty(s))

-                    {

-                        continue;

-                    }

-

-                    int index = s.LastIndexOf('.');

-                    if(index <= 0)

-                    {

-                        continue;

-                    }

-

-                    string libName = s.Substring(0, index);

-                    if(debug)

-                    {

-                        libName = libName.Substring(0, libName.Length - 1);

-                    }

-                    if(String.IsNullOrEmpty(libName))

-                    {

-                        continue;

-                    }

-

-                    if(Array.BinarySearch(Util.getCppNames(), libName) < 0)

-                    {

-                        continue;

-                    }

-                    components.Add(libName.Trim());

-                }

-            }

-            return components;

-        }

-

-        public static ComponentList getIceSilverlightComponents(Project project)

-        {

-            ComponentList components = new ComponentList();

-            if(project == null)

-            {

-                return components;

-            }

-

-            VSLangProj.VSProject vsProject = (VSLangProj.VSProject)project.Object;

-            foreach(Reference r in vsProject.References)

-            {

-                if(Array.BinarySearch(Util.getSilverlightNames(), r.Name) < 0)

-                {

-                    continue;

-                }

-

-                components.Add(r.Name);

-            }

-            return components;

-        }

-

-        public static ComponentList getIceDotNetComponents(Project project)

-        {

-            ComponentList components = new ComponentList();

-            if(project == null)

-            {

-                return components;

-            }

-

-            VSLangProj.VSProject vsProject = (VSLangProj.VSProject)project.Object;

-            foreach(Reference r in vsProject.References)

-            {

-                if(Array.BinarySearch(Util.getDotNetNames(), r.Name) < 0)

-                {

-                    continue;

-                }

-

-                components.Add(r.Name);

-            }

-            return components;

-        }

-

-        public static void addIceCppConfigurations(Project project)

-        {

-            if(!isCppProject(project))

-            {

-                return;

-            }

-

-            VCProject vcProject = (VCProject)project.Object;

-            IVCCollection configurations = (IVCCollection)vcProject.Configurations;

-            foreach(VCConfiguration conf in configurations)

-            {

-                if(conf != null)

-                {

-                    bool x64 = false;

-                    VCPlatform platform = (VCPlatform)conf.Platform;

-                    String platformName = platform.Name;

-                    if(platformName.Equals("x64", StringComparison.CurrentCultureIgnoreCase) ||

-                       platformName.Equals("Itanium", StringComparison.CurrentCultureIgnoreCase))

-                    {

-                        x64 = true;

-                    }

-                    VCCLCompilerTool compilerTool =

-                        (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));

-                    VCLinkerTool linkerTool = (VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool"));

-

-                    Util.addIceCppEnviroment((VCDebugSettings)conf.DebugSettings, project, x64);

-                    Util.addIceCppLibraryDir(linkerTool, project, x64);

-                    Util.addCppIncludes(compilerTool, project);

-                }

-            }

-        }

-

-        public static void removeIceCppConfigurations(Project project)

-        {

-            if(!isCppProject(project))

-            {

-                return;

-            }

-

-            VCProject vcProject = (VCProject)project.Object;

-            IVCCollection configurations = (IVCCollection)vcProject.Configurations;

-            foreach(VCConfiguration conf in configurations)

-            {

-                if(conf != null)

-                {

-                    VCCLCompilerTool compilerTool =

-                        (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));

-                    VCLinkerTool linkerTool = (VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool"));

-

-                    Util.removeIceCppEnviroment((VCDebugSettings)conf.DebugSettings, project);

-                    Util.removeIceCppLibraryDir(linkerTool, project);

-                    Util.removeCppIncludes(compilerTool, project);

-                }

-            }

-        }

-

-        public static void addIceCppLibs(Project project, ComponentList components)

-        {

-            if(!isCppProject(project))

-            {

-                return;

-            }

-

-            VCProject vcProject = (VCProject)project.Object;

-            IVCCollection configurations = (IVCCollection)vcProject.Configurations;

-            

-            foreach(VCConfiguration conf in configurations)

-            {

-                if(conf != null)

-                {

-                    VCCLCompilerTool compilerTool = 

-                        (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));

-                    VCLinkerTool linkerTool = (VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool"));

-

-                    if(compilerTool == null || linkerTool == null)

-                    {

-                        continue;

-                    }

-

-                    bool debug = false;

-                    if(!String.IsNullOrEmpty(compilerTool.PreprocessorDefinitions))

-                    {

-                        debug = (compilerTool.PreprocessorDefinitions.Contains("DEBUG") &&

-                                 !compilerTool.PreprocessorDefinitions.Contains("NDEBUG"));

-                    }

-                    if(!debug)

-                    {

-                        debug = conf.Name.Contains("Debug");

-                    }

-                    foreach(string component in components)

-                    {

-                        if(String.IsNullOrEmpty(component))

-                        {

-                            continue;

-                        }

-                        Util.addCppLib(linkerTool, component, debug);

-                    }

-                }

-            }

-        }

-

-        public static ComponentList removeIceCppLibs(Project project)

-        {

-            return Util.removeIceCppLibs(project, new ComponentList(Util.getCppNames()));

-        }

-

-        public static ComponentList removeIceCppLibs(Project project, ComponentList components)

-        {

-            ComponentList removed = new ComponentList();

-            if(!isCppProject(project))

-            {

-                return removed;

-            }

-

-            VCProject vcProject = (VCProject)project.Object;

-            IVCCollection configurations = (IVCCollection)vcProject.Configurations;

-

-            foreach(VCConfiguration conf in configurations)

-            {

-                if(conf != null)

-                {

-                    VCCLCompilerTool compilerTool = 

-                        (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));

-                    VCLinkerTool linkerTool = (VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool"));

-

-                    if(compilerTool == null || linkerTool == null)

-                    {

-                        continue;

-                    }

-

-                    bool debug = false;

-                    if(!String.IsNullOrEmpty(compilerTool.PreprocessorDefinitions))

-                    {

-                        debug = (compilerTool.PreprocessorDefinitions.Contains("DEBUG") &&

-                                 !compilerTool.PreprocessorDefinitions.Contains("NDEBUG"));

-                    }

-                    if(!debug)

-                    {

-                        debug = conf.Name.Contains("Debug");

-                    }

-

-                    foreach(string s in components)

-                    {

-                        if(s != null)

-                        {

-                            if(Util.removeCppLib(linkerTool, s, debug)  && !removed.Contains(s))

-                            {

-                                removed.Add(s);

-                            }

-                        }

-                    }

-                }

-            }

-            return removed;

-        }

-

-        public static DTE getCurrentDTE()

-        {

-           return Connect.getCurrentDTE();

-        }

-

-        public static string subEnvironmentVars(string s)

-        {

-            string result = s;

-            int beg = 0;

-            int end;

-            while((beg = result.IndexOf("$(", beg, StringComparison.Ordinal)) != -1 && beg < result.Length -1)

-            {

-                end = result.IndexOf(")", beg + 1, StringComparison.Ordinal);

-                if(end == -1)

-                {

-                    break;

-                }

-                string variable = result.Substring(beg + 2, end - beg - 2);

-                string value = System.Environment.GetEnvironmentVariable(variable);

-                if(value == null)

-                {

-                    value = "";

-                }

-                result = result.Replace("$(" + variable + ")", value);

-                beg += value.Length;

-            }

-            return result;

-        }

-

-        public static bool containsEnvironmentVars(string s)

-        {

-            int pos = s.IndexOf("$(", StringComparison.Ordinal);

-            if(pos != -1)

-            {

-                return s.IndexOf(')', pos) != -1;

-            }

-            return false;

-        }

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Text;
+using System.Collections.Generic;
+using System.ComponentModel;
+using EnvDTE;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+using System.IO;
+using System.Diagnostics;
+using Extensibility;
+using EnvDTE80;
+using Microsoft.VisualStudio.CommandBars;
+using Microsoft.VisualStudio.VCProjectEngine;
+using Microsoft.VisualStudio.VCProject;
+using Microsoft.VisualStudio.Shell;
+using System.Resources;
+using System.Reflection;
+using VSLangProj;
+using System.Globalization;
+
+using System.Collections;
+using System.Runtime.InteropServices.ComTypes;
+using Microsoft.CSharp;
+
+namespace Ice.VisualStudio
+{
+    public class ComponentList : List<string>
+    {
+        public ComponentList()
+        {
+        }
+
+        public ComponentList(string[] values)
+        {
+            foreach(string s in values)
+            {
+                Add(s);
+            }
+        }
+
+        public new void Add(string value)
+        {
+            value = value.Trim();
+            if(!base.Contains(value))
+            {
+                base.Add(value);
+            }
+        }
+
+        public new bool Contains(string value)
+        {
+            string found = base.Find(delegate(string s)
+                                    {
+                                        return s.Equals(value, StringComparison.CurrentCultureIgnoreCase);
+                                    });
+            return !String.IsNullOrEmpty(found);
+        }
+
+        public new void Remove(string value)
+        {
+            string found = base.Find(delegate(string s)
+            {
+                return s.Equals(value, StringComparison.CurrentCultureIgnoreCase);
+            });
+
+            if(!String.IsNullOrEmpty(found))
+            {
+                base.Remove(found);
+            }
+        }
+
+        public ComponentList(string value)
+        {
+            init(value, ';');
+        }
+
+        public ComponentList(string value, char separator)
+        {
+            init(value, separator);
+        }
+
+        private void init(string value, char separator)
+        {
+            Array items = value.Split(separator);
+            foreach(string s in items)
+            {
+                string trimmed = s.Trim();
+                if(trimmed.Length > 0)
+                {
+                    Add(trimmed);
+                }
+            }
+        }
+
+        public override string ToString()
+        {
+            return ToString(';');
+        }
+
+        public string ToString(char separator)
+        {
+            StringBuilder sb = new StringBuilder();
+            for(int cont = 0; cont < this.Count; cont++)
+            {
+                sb.Append(this[cont]);
+                if(cont < this.Count - 1)
+                {
+                    if(!separator.Equals(' '))
+                    {
+                        sb.Append(' ');
+                    }
+                    sb.Append(separator);
+                    if(!separator.Equals(' '))
+                    {
+                        sb.Append(' ');
+                    }
+                }
+            }
+            return sb.ToString();
+        }
+    }
+
+    public class IncludePathList : ComponentList
+    {
+        public IncludePathList()
+            : base()
+        {
+        }
+
+        public IncludePathList(string[] values)
+            : base(values)
+        {
+        }
+
+        public IncludePathList(string value)
+            : base(value, '|')
+        {
+        }
+
+        public override string ToString()
+        {
+            return base.ToString('|');
+        }
+    }
+
+    public static class Util
+    {
+        public const string slice2cs = "slice2cs.exe";
+        public const string slice2cpp = "slice2cpp.exe";
+        public const string slice2sl = "slice2sl.exe";
+
+        //
+        // Property names used to persist project configuration.
+        //
+        public const string PropertyIce = "ZerocIce_Enabled";
+        public const string PropertyIceHome = "ZerocIce_Home";
+        public const string PropertyIceHomeExpanded = "ZerocIce_HomeExpanded";
+        public const string PropertyIceComponents = "ZerocIce_Components";
+        public const string PropertyIceExtraOptions = "ZerocIce_ExtraOptions";
+        public const string PropertyIceIncludePath = "ZerocIce_IncludePath";
+        public const string PropertyIceStreaming = "ZerocIce_Streaming";
+        public const string PropertyIceChecksum = "ZerocIce_Checksum";
+        public const string PropertyIceTie = "ZerocIce_Tie";
+        public const string PropertyIcePrefix = "ZerocIce_Prefix";
+        public const string PropertyIceDllExport = "ZerocIce_DllExport";
+        public const string PropertyConsoleOutput = "ZerocIce_ConsoleOutput";
+
+        private static readonly string[] silverlightNames =
+        {
+            "IceSL"
+        };
+
+        public static string[] getSilverlightNames()
+        {
+            return (string[])silverlightNames.Clone();
+        }
+        
+        private static readonly string[] cppNames =
+        {
+            "Freeze", "Glacier2", "Ice", "IceBox", "IceGrid", "IcePatch2", 
+            "IceSSL", "IceStorm", "IceUtil" 
+        };
+
+        public static string[] getCppNames()
+        {
+            return (string[])cppNames.Clone();
+        }
+        
+        private static readonly string[] dotNetNames =
+        {
+            "Glacier2", "Ice", "IceBox", "IceGrid", "IcePatch2", 
+            "IceSSL", "IceStorm"
+        };
+
+        public static string[] getDotNetNames()
+        {
+            return (string[])dotNetNames.Clone();
+        }
+
+        const string iceSilverlightHome = "C:\\IceSL-0.3.3";
+        static string defaultIceHome;
+
+        private static void setIceHomeDefault()
+        {
+            defaultIceHome = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            if(defaultIceHome.EndsWith("\\bin", StringComparison.Ordinal))
+            {
+                defaultIceHome = defaultIceHome.Substring(0, defaultIceHome.Length - 4);
+            }
+        }
+
+        public static string getIceHomeRaw(Project project, bool update)
+        {
+            if(defaultIceHome == null)
+            {
+                setIceHomeDefault();
+            }
+
+            if(Util.isSilverlightProject(project))
+            {
+                return Util.getProjectProperty(project, Util.PropertyIceHome, iceSilverlightHome, update);
+            }
+            string iceHome = Util.getProjectProperty(project, Util.PropertyIceHome, "", update);
+            if(iceHome.Length == 0)
+            {
+                iceHome = defaultIceHome;
+            }
+            return iceHome;
+        }
+
+        public static string getIceHome(Project project)
+        {
+            if(defaultIceHome == null)
+            {
+                setIceHomeDefault();
+            }
+
+            if(Util.isSilverlightProject(project))
+            {
+                return Util.getProjectProperty(project, Util.PropertyIceHomeExpanded, iceSilverlightHome);
+            }
+            string iceHome = Util.getProjectProperty(project, Util.PropertyIceHomeExpanded, defaultIceHome);
+            Environment.SetEnvironmentVariable("IceHome", iceHome);
+            return iceHome;
+        }
+
+        public static string getAbsoluteIceHome(Project project)
+        {
+            string iceHome = Util.getIceHome(project);
+            if(!Path.IsPathRooted(iceHome))
+            {
+                iceHome = Path.Combine(Path.GetDirectoryName(project.FileName), iceHome);
+                iceHome = Path.GetFullPath(iceHome);
+            }
+            return iceHome;
+        }
+        
+        public static string getPathRelativeToProject(ProjectItem item)
+        {
+            StringBuilder path = new StringBuilder();
+            if(item != null)
+            {
+                path.Append(Util.getPathRelativeToProject(item, item.ContainingProject.ProjectItems));
+            }
+            return Util.normalizePath(path.ToString());
+        }
+
+        public static string getPathRelativeToProject(ProjectItem item, ProjectItems items)
+        {
+            StringBuilder path = new StringBuilder();
+            foreach(ProjectItem i in items)
+            {
+                if(i == item)
+                {
+                    if(path.Length > 0)
+                    {
+                        path.Append("\\");
+                    }
+                    path.Append(i.Name);
+                    break;
+                }
+                else if(Util.isProjectItemFilter(i) || Util.isProjectItemFolder(i))
+                {
+                    string token = Util.getPathRelativeToProject(item, i.ProjectItems);
+                    if(!String.IsNullOrEmpty(token))
+                    {
+                        path.Append(i.Name);
+                        path.Append("\\");
+                        path.Append(token);
+                        break;
+                    }
+                }
+            }
+            return path.ToString();
+        }
+
+        public static void addCppIncludes(VCCLCompilerTool tool, Project project)
+        {
+            if(tool == null || project == null)
+            {
+                return;
+            }
+
+            string iceHome = Util.getAbsoluteIceHome(project);
+            string iceIncludeDir = "";
+            if(Directory.Exists(iceHome + "\\cpp\\include"))
+            {
+                iceIncludeDir = Util.getIceHome(project) + "\\cpp\\include";
+            }
+            else
+            {
+                iceIncludeDir = Util.getIceHome(project) + "\\include";
+            }
+
+            string additionalIncludeDirectories = tool.AdditionalIncludeDirectories;
+            if(String.IsNullOrEmpty(additionalIncludeDirectories))
+            {
+                tool.AdditionalIncludeDirectories = iceIncludeDir + ";.";
+                return;
+            }
+
+            ComponentList includes = new ComponentList(additionalIncludeDirectories);
+            bool changed = false;
+            if(!includes.Contains(iceIncludeDir))
+            {
+                changed = true;
+                includes.Add(iceIncludeDir);
+            }
+
+            if(!includes.Contains("."))
+            {
+                changed = true;
+                includes.Add(".");
+            }
+
+            if(changed)
+            {
+                tool.AdditionalIncludeDirectories = includes.ToString();
+            }
+        }
+
+        private static readonly string[] _cppIncludeDirs =
+        {
+            "\\include",
+            "\\cpp\\include",
+        };
+
+        public static void removeCppIncludes(VCCLCompilerTool tool, Project project)
+        {
+            if(tool == null || project == null)
+            {
+                return;
+            }
+
+            string additionalIncludeDirectories = tool.AdditionalIncludeDirectories;
+            if(String.IsNullOrEmpty(additionalIncludeDirectories))
+            {
+                return;
+            }
+            ComponentList includes = new ComponentList(additionalIncludeDirectories);
+
+            string iceHome = Util.getIceHome(project);
+            foreach(string dir in _cppIncludeDirs)
+            {
+                string includeDir = iceHome + dir;
+                if(includes.Contains(includeDir))
+                {
+                    includes.Remove(includeDir);
+                    tool.AdditionalIncludeDirectories = includes.ToString();
+                    break;
+                }
+            }
+        }
+
+        private static readonly string[] _csBinDirs =
+        {
+            "\\bin\\",
+            "\\cs\\bin\\",
+            "\\sl\\bin\\",
+        };
+
+        public static void addDotNetReference(Project project, string component)
+        {
+            if(project == null || String.IsNullOrEmpty(component))
+            {
+                return;
+            }
+
+            string iceHome = Util.getAbsoluteIceHome(project);
+            foreach(string dir in _csBinDirs)
+            {
+                if(Directory.Exists(iceHome + dir))
+                {
+                    string reference = iceHome + dir + component + ".dll";                
+                    if(File.Exists(reference))
+                    {
+                        VSLangProj.VSProject vsProject = (VSLangProj.VSProject)project.Object;
+                        try
+                        {
+                            vsProject.References.Add(reference);
+                            return;
+                        }
+                        catch(COMException ex)
+                        {
+                            Console.WriteLine(ex);
+                        }
+                    }
+                }
+            }
+
+            System.Windows.Forms.MessageBox.Show("Could not locate '" + component + 
+                                                 ".dll'. Review you 'Ice Home' setting.",
+                                                 "Ice Visual Studio Extension", MessageBoxButtons.OK,
+                                                 MessageBoxIcon.Error,
+                                                 System.Windows.Forms.MessageBoxDefaultButton.Button1,
+                                                 System.Windows.Forms.MessageBoxOptions.RightAlign);
+        }
+
+        public static bool removeDotNetReference(Project project, string component)
+        {
+            if(project == null || String.IsNullOrEmpty(component))
+            {
+                return false;
+            }
+
+            foreach(Reference r in ((VSProject)project.Object).References)
+            {
+                if(r.Identity.Equals(component, StringComparison.OrdinalIgnoreCase))
+                {
+                    r.Remove();
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public static void addCppLib(VCLinkerTool tool, string component, bool debug)
+        {
+            if(tool == null || String.IsNullOrEmpty(component))
+            {
+                return;
+            }
+
+            if(Array.BinarySearch(Util.getCppNames(), component) < 0)
+            {
+                return;
+            }
+
+            string libName = component;
+            if(debug)
+            {
+                libName += "d";
+            }
+            libName += ".lib";
+
+            string additionalDependencies = tool.AdditionalDependencies;
+            if(String.IsNullOrEmpty(additionalDependencies))
+            {
+                additionalDependencies = "";
+            }
+
+            ComponentList components = new ComponentList(additionalDependencies.Split(' '));
+            if(!components.Contains(libName))
+            {
+                components.Add(libName);
+                additionalDependencies = components.ToString(' ');
+                tool.AdditionalDependencies = additionalDependencies;
+            }
+        }
+
+        public static bool removeCppLib(VCLinkerTool tool, string component, bool debug)
+        {
+            if(tool == null)
+            {
+                return false;
+            }
+
+            if(String.IsNullOrEmpty(tool.AdditionalDependencies))
+            {
+                return false;
+            }
+
+            string libName = component;
+            if(debug)
+            {
+                libName += "d";
+            }
+            libName += ".lib";
+
+            ComponentList components = new ComponentList(tool.AdditionalDependencies.Split(' '));
+            if(components.Contains(libName))
+            {
+                components.Remove(libName);
+                tool.AdditionalDependencies = components.ToString(' ');
+                return true;
+            }
+            return false;
+        }
+
+        public static void addIceCppEnviroment(VCDebugSettings debugSettings, Project project, bool x64)
+        {
+            if(debugSettings == null || project == null)
+            {
+                return;
+            }
+            string iceHome = Util.getAbsoluteIceHome(project);
+            string iceBinDir = "";
+            if(Directory.Exists(iceHome + "\\cpp\\bin"))
+            {
+                iceBinDir = Util.getIceHome(project) + "\\cpp\\bin";
+            }
+            else
+            {
+                iceBinDir = Util.getIceHome(project) + "\\bin";
+                if(x64)
+                {
+                    iceBinDir += "\\x64";
+                }
+            }
+            string icePath = "PATH=" + iceBinDir;
+
+            string enviroment = debugSettings.Environment;
+            if(String.IsNullOrEmpty(enviroment))
+            {
+                debugSettings.Environment = "PATH=" + iceBinDir;
+                return;
+            }
+
+            ComponentList envs = new ComponentList(enviroment, '\n');
+            if(!envs.Contains(icePath))
+            {
+                envs.Add(icePath);
+                debugSettings.Environment = envs.ToString('\n');
+                return;
+            }
+        
+        }
+
+        private static readonly string[] _cppBinDirs =
+        {
+            "\\bin",
+            "\\bin\\x64",
+            "\\cpp\\bin",
+        };
+
+        public static void removeIceCppEnviroment(VCDebugSettings debugSettings,
+                                                  Project project)
+        {
+            if(debugSettings == null || project == null)
+            {
+                return;
+            }
+
+            string iceHome = Util.getIceHome(project);
+            foreach(string dir in _cppBinDirs)
+            {
+                string enviroment = debugSettings.Environment;
+                if(String.IsNullOrEmpty(enviroment))
+                {
+                    return;
+                }
+
+                ComponentList envs = new ComponentList(enviroment, '\n');
+                string binDir = "PATH=" + iceHome + dir;
+                if(envs.Contains(binDir))
+                {
+                    envs.Remove(binDir);
+                    debugSettings.Environment = envs.ToString('\n');
+                    return;
+                }
+            }
+        }
+
+        public static void addIceCppLibraryDir(VCLinkerTool tool, Project project, bool x64)
+        {
+            if(tool == null || project == null)
+            {
+                return;
+            }
+
+            string iceHome = Util.getAbsoluteIceHome(project);
+            string iceLibDir = "";
+            if(Directory.Exists(iceHome + "\\cpp\\lib"))
+            {
+                iceLibDir = Util.getIceHome(project) + "\\cpp\\lib";
+            }
+            else
+            {
+                iceLibDir = Util.getIceHome(project) + "\\lib";
+                if(x64)
+                {
+                    iceLibDir += "\\x64";
+                }
+            }
+
+            string additionalLibraryDirectories = tool.AdditionalLibraryDirectories;
+            if(String.IsNullOrEmpty(additionalLibraryDirectories))
+            {
+                tool.AdditionalLibraryDirectories = iceLibDir;
+                return;
+            }
+
+            ComponentList libs = new ComponentList(additionalLibraryDirectories);
+            if(!libs.Contains(iceLibDir))
+            {
+                libs.Add(iceLibDir);
+                tool.AdditionalLibraryDirectories = libs.ToString();
+                return;
+            }
+        }
+
+        private static readonly string[] _cppLibDirs =
+        {
+            "\\lib",
+            "\\lib\\x64",
+            "\\cpp\\lib",
+        };
+
+        public static void removeIceCppLibraryDir(VCLinkerTool tool, Project project)
+        {
+            if(tool == null || project == null)
+            {
+                return;
+            }
+
+            string iceHome = Util.getIceHome(project);
+            foreach(string dir in _cppLibDirs)
+            {
+                string additionalLibraryDirectories = tool.AdditionalLibraryDirectories;
+                if(String.IsNullOrEmpty(additionalLibraryDirectories))
+                {
+                    return;
+                }
+
+                ComponentList libs = new ComponentList(additionalLibraryDirectories);
+                string libDir = iceHome + dir;
+                if(libs.Contains(libDir))
+                {
+                    libs.Remove(libDir);
+                    tool.AdditionalLibraryDirectories = libs.ToString();
+                    return;
+                }
+            }
+        }
+
+        public static bool isSliceBuilderEnabled(Project project)
+        {
+            return Util.getProjectPropertyAsBool(project, Util.PropertyIce);
+        }
+
+        public static bool isCSharpProject(Project project)
+        {
+            if(project == null)
+            {
+                return false;
+            }
+
+            if(String.IsNullOrEmpty(project.Kind))
+            {
+                return false;
+            }
+
+            return project.Kind == VSLangProj.PrjKind.prjKindCSharpProject;
+        }
+
+        public static bool isVBProject(Project project)
+        {
+            if(project == null)
+            {
+                return false;
+            }
+
+            if(String.IsNullOrEmpty(project.Kind))
+            {
+                return false;
+            }
+
+            return project.Kind == VSLangProj.PrjKind.prjKindVBProject;
+        }
+
+        public static bool isSilverlightProject(Project project)
+        {
+            if(!Util.isCSharpProject(project))
+            {
+                return false;
+            }
+
+            Array extenders = (Array)project.ExtenderNames;
+            foreach(string s in extenders)
+            {
+                if(String.IsNullOrEmpty(s))
+                {
+                    continue;
+                }
+                if(s.Equals("SilverlightProject"))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public static bool isCppProject(Project project)
+        {
+            if(project == null)
+            {
+                return false;
+            }
+
+            if(String.IsNullOrEmpty(project.Kind))
+            {
+                return false;
+            }
+            return project.Kind == vcContextGuids.vcContextGuidVCProject;
+        }
+
+        public static bool isProjectItemFolder(ProjectItem item)
+        {
+            if(item == null)
+            {
+                return false;
+            }
+
+            if(String.IsNullOrEmpty(item.Kind))
+            {
+                return false;
+            }
+            return item.Kind == "{6BB5F8EF-4483-11D3-8BCF-00C04F8EC28C}";
+        }
+
+        public static bool isProjectItemFilter(ProjectItem item)
+        {
+            if(item == null)
+            {
+                return false;
+            }
+
+            if(String.IsNullOrEmpty(item.Kind))
+            {
+                return false;
+            }
+            return item.Kind == "{6BB5F8F0-4483-11D3-8BCF-00C04F8EC28C}";
+        }
+
+        public static bool isProjectItemFile(ProjectItem item)
+        {
+            if(item == null)
+            {
+                return false;
+            }
+
+            if(String.IsNullOrEmpty(item.Kind))
+            {
+                return false;
+            }
+            return item.Kind == "{6BB5F8EE-4483-11D3-8BCF-00C04F8EC28C}";
+        }
+
+        public static bool hasItemNamed(ProjectItems items, string name)
+        {
+            bool found = false;
+            foreach(ProjectItem item in items)
+            {
+                if(item == null)
+                {
+                    continue;
+                }
+
+                if(item.Name == null)
+                {
+                    continue;
+                }
+
+                if(item.Name.Equals(name, StringComparison.OrdinalIgnoreCase))
+                {
+                    found = true;
+                    break;
+                }
+            }
+            return found;
+        }
+
+        public static ProjectItem findItem(string path, ProjectItems items)
+        {
+            if(String.IsNullOrEmpty(path))
+            {
+                return null;
+            }
+            ProjectItem item = null;
+            foreach(ProjectItem i in items)
+            {
+                if(i == null)
+                {
+                    continue;
+                }
+                else if(Util.isProjectItemFile(i))
+                {
+                    string fullPath = i.Properties.Item("FullPath").Value.ToString();
+                    if(Path.GetFullPath(fullPath).Equals(
+                           Path.GetFullPath(path), StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        item = i;
+                        break;
+                    }
+                }
+                else if(Util.isProjectItemFolder(i))
+                {
+                    string p = Path.GetDirectoryName(i.Properties.Item("FullPath").Value.ToString());
+                    if(p.Equals(Path.GetFullPath(path), StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        item = i;
+                        break;
+                    }
+
+                    item = findItem(path, i.ProjectItems);
+                    if(item != null)
+                    {
+                        break;
+                    }
+                }
+                else if(Util.isProjectItemFilter(i))
+                {
+                    string p = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(i.ContainingProject.FileName),
+                                            Util.normalizePath(Util.getPathRelativeToProject(i))));
+
+                    if(p.Equals(Path.GetFullPath(path), StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        item = i;
+                        break;
+                    }
+
+                    item = findItem(path, i.ProjectItems);
+                    if(item != null)
+                    {
+                        break;
+                    }
+                }
+            }
+            return item;
+        }
+
+        public static VCFile findVCFile(IVCCollection files, string name, string fullPath)
+        {
+            VCFile vcFile = null;
+            foreach(VCFile file in files)
+            {
+                if(file.ItemName == name)
+                {
+                    if(file.FullPath != fullPath)
+                    {
+                        file.Remove();
+                        break;
+                    }
+                    vcFile = file;
+                    break;
+                }
+            }
+            return vcFile;
+        }
+
+        public static string normalizePath(string path)
+        {
+            path = path.Replace('/', '\\');
+            path = path.Replace(".\\", "");
+            if(path.IndexOf("\\", StringComparison.Ordinal) == 0)
+            {
+                path = path.Substring(1, path.Length - 1);
+            }
+            if(path.EndsWith("\\.", StringComparison.Ordinal))
+            {
+                path = path.Substring(0, path.Length - "\\.".Length);
+            }
+            return path;
+        }
+
+        public static string relativePath(string mainDirPath, string absoluteFilePath)
+        {
+            if(absoluteFilePath != null)
+            {
+                absoluteFilePath = absoluteFilePath.Trim();
+            }
+            if(mainDirPath != null)
+            {
+                mainDirPath = mainDirPath.Trim();
+            }
+            if(String.IsNullOrEmpty(absoluteFilePath) || String.IsNullOrEmpty(mainDirPath))
+            {
+                return "";
+            }
+            string[] firstPathParts = 
+                mainDirPath.Trim(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar);
+            string[] secondPathParts =
+                absoluteFilePath.Trim(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar);
+
+            int sameCounter = 0;
+            for(int i = 0; i < Math.Min(firstPathParts.Length, secondPathParts.Length); i++)
+            {
+                if(!firstPathParts[i].Equals(secondPathParts[i], StringComparison.CurrentCultureIgnoreCase))
+                {
+                    break;
+                }
+                sameCounter++;
+            }
+
+            if(sameCounter == 0)
+            {
+                return absoluteFilePath;
+            }
+
+            string newPath = String.Empty;
+            for(int i = sameCounter; i < firstPathParts.Length; i++)
+            {
+                if(i > sameCounter)
+                {
+                    newPath += Path.DirectorySeparatorChar;
+                }
+                newPath += "..";
+            }
+
+            if(newPath.Length == 0)
+            {
+                newPath = ".";
+            }
+
+            for(int i = sameCounter; i < secondPathParts.Length; i++)
+            {
+                newPath += Path.DirectorySeparatorChar;
+                newPath += secondPathParts[i];
+            }
+            return newPath;
+        }
+
+        public static ProjectItem getSelectedProjectItem(_DTE dte)
+        {
+            UIHierarchyItem uiItem = getSelectedUIHierearchyItem(dte);
+            if(uiItem == null)
+            {
+                return null;
+            }
+            return uiItem.Object as ProjectItem;
+        }
+
+        public static Project getSelectedProject()
+        {
+            return Util.getSelectedProject(Util.getCurrentDTE());
+        }
+
+        public static Project getSelectedProject(_DTE dte)
+        {
+            UIHierarchyItem uiItem = getSelectedUIHierearchyItem(dte);
+            if(uiItem == null)
+            {
+                return null;
+            }
+            return uiItem.Object as Project;
+        }
+
+        public static UIHierarchyItem getSelectedUIHierearchyItem(_DTE dte)
+        {
+            if(dte == null)
+            {
+                return null;
+            }
+
+            UIHierarchy uiHierarchy = 
+                (EnvDTE.UIHierarchy)dte.Windows.Item(EnvDTE.Constants.vsWindowKindSolutionExplorer).Object;
+            if(uiHierarchy == null)
+            {
+                return null;
+            }
+
+            if(uiHierarchy.SelectedItems == null)
+            {
+                return null;
+            }
+
+            if(((Array)uiHierarchy.SelectedItems).Length <= 0)
+            {
+                return null;
+            }
+            return (UIHierarchyItem)((Array)uiHierarchy.SelectedItems).GetValue(0);
+        }
+
+        public static void updateIceHome(Project project, string iceHome, bool force)
+        {
+            if(project == null || String.IsNullOrEmpty(iceHome))
+            {
+                return;
+            }
+
+            if(!force)
+            {
+                string oldIceHome = Util.getIceHomeRaw(project, true).ToUpper(CultureInfo.InvariantCulture);
+                if(oldIceHome.Equals(iceHome, StringComparison.CurrentCultureIgnoreCase))
+                {
+                    return;
+                }
+            }
+
+            if(Util.isCSharpProject(project) || Util.isVBProject(project))
+            {
+                updateIceHomeDotNetProject(project, iceHome);
+            }
+            else if(Util.isCppProject(project))
+            {
+                updateIceHomeCppProject(project, iceHome);
+            }
+        }
+
+        private static void updateIceHomeCppProject(Project project, string iceHome)
+        {
+            Util.removeIceCppConfigurations(project);
+            Util.setIceHome(project, iceHome);
+            Util.addIceCppConfigurations(project);
+        }
+
+        private static bool getCopyLocal(Project project, string name)
+        {
+            VSLangProj.VSProject vsProject = (VSLangProj.VSProject)project.Object;
+            foreach(Reference r in vsProject.References)
+            {
+                if(r.Name.Equals(name))
+                {
+                    return r.CopyLocal;
+                }
+            }
+            return true;
+        }
+
+        private static void setCopyLocal(Project project, string name, bool copyLocal)
+        {
+            VSLangProj.VSProject vsProject = (VSLangProj.VSProject)project.Object;
+            foreach(Reference r in vsProject.References)
+            {
+                if(r.Name.Equals(name))
+                {
+                    r.CopyLocal = copyLocal;
+                    break;
+                }
+            }
+        }
+
+        private static void updateIceHomeDotNetProject(Project project, string iceHome)
+        {
+            Util.setIceHome(project, iceHome);
+
+            ComponentList components = Util.getIceDotNetComponents(project);
+            foreach(string s in components)
+            {
+                if(String.IsNullOrEmpty(s))
+                {
+                    continue;
+                }
+
+                bool copyLocal = getCopyLocal(project, s);
+                Util.removeDotNetReference(project, s);
+
+                Util.addDotNetReference(project, s);
+                setCopyLocal(project, s, copyLocal);
+            }
+        }
+
+        public static void setIceHome(Project project, string value)
+        {
+            string expanded = subEnvironmentVars(value);
+
+            string fullPath = expanded;
+            if(!Path.IsPathRooted(fullPath))
+            {
+                fullPath = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(project.FileName), fullPath));
+            }
+
+            if(Util.isSilverlightProject(project))
+            {
+                if(!File.Exists(fullPath + "\\bin\\slice2sl.exe") || !Directory.Exists(fullPath + "\\slice\\Ice"))
+                {
+                    if(!File.Exists(fullPath + "\\cpp\\bin\\slice2sl.exe") ||
+                       !Directory.Exists(fullPath + "\\sl\\slice\\Ice"))
+                    {
+                        System.Windows.Forms.MessageBox.Show("Could not locate Ice for Silverlight installation in '"
+                                                             + expanded + "' directory.\n",
+                                                             "Ice Visual Studio Extension", MessageBoxButtons.OK,
+                                                             MessageBoxIcon.Error,
+                                                             System.Windows.Forms.MessageBoxDefaultButton.Button1,
+                                                             System.Windows.Forms.MessageBoxOptions.RightAlign);
+                        return;
+                    }
+                }
+            }
+            else if(Util.isCppProject(project))
+            {
+                if(!Directory.Exists(fullPath + "\\slice\\Ice") || 
+                   (!File.Exists(fullPath + "\\bin\\slice2cpp.exe") && 
+                    !File.Exists(fullPath + "\\bin\\x64\\slice2cpp.exe") &&  
+                    !File.Exists(fullPath + "\\cpp\\bin\\slice2cpp.exe")))
+                {
+                    System.Windows.Forms.MessageBox.Show("Could not locate Ice installation in '"
+                                                         + expanded + "' directory.\n",
+                                                         "Ice Visual Studio Extension", MessageBoxButtons.OK,
+                                                         MessageBoxIcon.Error,
+                                                         System.Windows.Forms.MessageBoxDefaultButton.Button1,
+                                                         System.Windows.Forms.MessageBoxOptions.RightAlign);
+
+                    return;
+                }
+            }
+            else if(Util.isCSharpProject(project))
+            {
+                if(!Directory.Exists(fullPath + "\\slice\\Ice") || 
+                   (!File.Exists(fullPath + "\\bin\\slice2cs.exe") && 
+                    !File.Exists(fullPath + "\\bin\\x64\\slice2cs.exe") &&  
+                    !File.Exists(fullPath + "\\cpp\\bin\\slice2cs.exe")))
+                {
+                    System.Windows.Forms.MessageBox.Show("Could not locate Ice installation in '"
+                                                         + expanded + "' directory.\n",
+                                                         "Ice Visual Studio Extension", MessageBoxButtons.OK,
+                                                         MessageBoxIcon.Error,
+                                                         System.Windows.Forms.MessageBoxDefaultButton.Button1,
+                                                         System.Windows.Forms.MessageBoxOptions.RightAlign);
+
+                    return;
+                }
+            }
+            else if(Util.isVBProject(project))
+            {
+                if(!File.Exists(fullPath + "\\bin\\Ice.dll") && !File.Exists(fullPath + "\\cs\\bin\\Ice.dll"))
+                {
+                    System.Windows.Forms.MessageBox.Show("Could not locate Ice installation in '"
+                                                         + expanded + "' directory.\n",
+                                                         "Ice Visual Studio Extension", MessageBoxButtons.OK,
+                                                         MessageBoxIcon.Error,
+                                                         System.Windows.Forms.MessageBoxDefaultButton.Button1,
+                                                         System.Windows.Forms.MessageBoxOptions.RightAlign);
+
+                    return;
+                }
+            }
+
+            if(value.Equals(defaultIceHome))
+            {
+                setProjectProperty(project, Util.PropertyIceHome, "");
+            }
+            else
+            {
+                setProjectProperty(project, Util.PropertyIceHome, value);
+            }
+            setProjectProperty(project, Util.PropertyIceHomeExpanded, expanded);
+        }
+
+        public static bool getProjectPropertyAsBool(Project project, string name)
+        {
+            return Util.getProjectProperty(project, name).Equals(
+                                        true.ToString(), StringComparison.CurrentCultureIgnoreCase);
+        }
+
+        public static string getProjectProperty(Project project, string name)
+        {
+            return Util.getProjectProperty(project, name, "", true);
+        }
+
+        public static string getProjectProperty(Project project, string name, string defaultValue)
+        {
+            return Util.getProjectProperty(project, name, defaultValue, true);
+        }
+
+        public static string getProjectProperty(Project project, string name, string defaultValue, bool update)
+        {
+            if(project == null || String.IsNullOrEmpty(name))
+            {
+                return defaultValue;
+            }
+
+            if(project.Globals == null)
+            {
+                return defaultValue;
+            }
+
+            if(project.Globals.get_VariableExists(name))
+            {
+                return project.Globals[name].ToString();
+            }
+
+            if(update && !String.IsNullOrEmpty(defaultValue))
+            {
+                project.Globals[name] = defaultValue;
+                project.Globals.set_VariablePersists(name, true);
+            }
+            return defaultValue;
+        }
+
+        public static void setProjectProperty(Project project, string name, string value)
+        {
+            if(project == null || String.IsNullOrEmpty(name))
+            {
+                return ;
+            }
+
+            if(project.Globals == null)
+            {
+                return;
+            }
+
+            project.Globals[name] = value;
+            project.Globals.set_VariablePersists(name, true);
+        }
+        
+        public static String getPrecompileHeader(Project project)
+        {
+            if(!Util.isCppProject(project))
+            {
+                return "";
+            }
+            ConfigurationManager configManager = project.ConfigurationManager;
+            Configuration activeConfig = (Configuration)configManager.ActiveConfiguration;
+
+            VCProject vcProject = (VCProject)project.Object;
+            IVCCollection configurations = (IVCCollection)vcProject.Configurations;
+            String preCompiledHeader = "";
+            foreach(VCConfiguration conf in configurations)
+            {
+                if(conf.Name != (activeConfig.ConfigurationName + "|" + activeConfig.PlatformName))
+                {
+                    continue;
+                }
+                VCCLCompilerTool compilerTool = 
+                    (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
+                if(compilerTool == null)
+                {
+                    break;
+                }
+                if(compilerTool.UsePrecompiledHeader == pchOption.pchCreateUsingSpecific ||
+                   compilerTool.UsePrecompiledHeader == pchOption.pchUseUsingSpecific)
+                {
+                    preCompiledHeader = compilerTool.PrecompiledHeaderThrough;
+                }
+            }
+            return preCompiledHeader;
+        }
+
+        public static ComponentList getIceCppComponents(Project project)
+        {
+            ComponentList components = new ComponentList();
+            ConfigurationManager configManager = project.ConfigurationManager;
+            Configuration activeConfig = (Configuration)configManager.ActiveConfiguration;
+
+            VCProject vcProject = (VCProject)project.Object;
+            IVCCollection configurations = (IVCCollection)vcProject.Configurations;
+            foreach(VCConfiguration conf in configurations)
+            {
+                if(conf.Name != (activeConfig.ConfigurationName + "|" + activeConfig.PlatformName))
+                {
+                    continue;
+                }
+
+                VCCLCompilerTool compilerTool = 
+                    (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
+                VCLinkerTool linkerTool = (VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool"));
+                if(linkerTool == null || compilerTool == null)
+                {
+                    break;
+                }
+
+                if(String.IsNullOrEmpty(linkerTool.AdditionalDependencies))
+                {
+                    break;
+                }
+
+                bool debug = false;
+                if(!String.IsNullOrEmpty(compilerTool.PreprocessorDefinitions))
+                {
+                    debug = (compilerTool.PreprocessorDefinitions.Contains("DEBUG") &&
+                             !compilerTool.PreprocessorDefinitions.Contains("NDEBUG"));
+                }
+
+                if(!debug)
+                {
+                    debug = conf.Name.Contains("Debug");
+                }
+
+                List<string> componentNames = new List<string>(linkerTool.AdditionalDependencies.Split(' '));
+                foreach(string s in componentNames)
+                {
+                    if(String.IsNullOrEmpty(s))
+                    {
+                        continue;
+                    }
+
+                    int index = s.LastIndexOf('.');
+                    if(index <= 0)
+                    {
+                        continue;
+                    }
+
+                    string libName = s.Substring(0, index);
+                    if(debug)
+                    {
+                        libName = libName.Substring(0, libName.Length - 1);
+                    }
+                    if(String.IsNullOrEmpty(libName))
+                    {
+                        continue;
+                    }
+
+                    if(Array.BinarySearch(Util.getCppNames(), libName) < 0)
+                    {
+                        continue;
+                    }
+                    components.Add(libName.Trim());
+                }
+            }
+            return components;
+        }
+
+        public static ComponentList getIceSilverlightComponents(Project project)
+        {
+            ComponentList components = new ComponentList();
+            if(project == null)
+            {
+                return components;
+            }
+
+            VSLangProj.VSProject vsProject = (VSLangProj.VSProject)project.Object;
+            foreach(Reference r in vsProject.References)
+            {
+                if(Array.BinarySearch(Util.getSilverlightNames(), r.Name) < 0)
+                {
+                    continue;
+                }
+
+                components.Add(r.Name);
+            }
+            return components;
+        }
+
+        public static ComponentList getIceDotNetComponents(Project project)
+        {
+            ComponentList components = new ComponentList();
+            if(project == null)
+            {
+                return components;
+            }
+
+            VSLangProj.VSProject vsProject = (VSLangProj.VSProject)project.Object;
+            foreach(Reference r in vsProject.References)
+            {
+                if(Array.BinarySearch(Util.getDotNetNames(), r.Name) < 0)
+                {
+                    continue;
+                }
+
+                components.Add(r.Name);
+            }
+            return components;
+        }
+
+        public static void addIceCppConfigurations(Project project)
+        {
+            if(!isCppProject(project))
+            {
+                return;
+            }
+
+            VCProject vcProject = (VCProject)project.Object;
+            IVCCollection configurations = (IVCCollection)vcProject.Configurations;
+            foreach(VCConfiguration conf in configurations)
+            {
+                if(conf != null)
+                {
+                    bool x64 = false;
+                    VCPlatform platform = (VCPlatform)conf.Platform;
+                    String platformName = platform.Name;
+                    if(platformName.Equals("x64", StringComparison.CurrentCultureIgnoreCase) ||
+                       platformName.Equals("Itanium", StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        x64 = true;
+                    }
+                    VCCLCompilerTool compilerTool =
+                        (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
+                    VCLinkerTool linkerTool = (VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool"));
+
+                    Util.addIceCppEnviroment((VCDebugSettings)conf.DebugSettings, project, x64);
+                    Util.addIceCppLibraryDir(linkerTool, project, x64);
+                    Util.addCppIncludes(compilerTool, project);
+                }
+            }
+        }
+
+        public static void removeIceCppConfigurations(Project project)
+        {
+            if(!isCppProject(project))
+            {
+                return;
+            }
+
+            VCProject vcProject = (VCProject)project.Object;
+            IVCCollection configurations = (IVCCollection)vcProject.Configurations;
+            foreach(VCConfiguration conf in configurations)
+            {
+                if(conf != null)
+                {
+                    VCCLCompilerTool compilerTool =
+                        (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
+                    VCLinkerTool linkerTool = (VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool"));
+
+                    Util.removeIceCppEnviroment((VCDebugSettings)conf.DebugSettings, project);
+                    Util.removeIceCppLibraryDir(linkerTool, project);
+                    Util.removeCppIncludes(compilerTool, project);
+                }
+            }
+        }
+
+        public static void addIceCppLibs(Project project, ComponentList components)
+        {
+            if(!isCppProject(project))
+            {
+                return;
+            }
+
+            VCProject vcProject = (VCProject)project.Object;
+            IVCCollection configurations = (IVCCollection)vcProject.Configurations;
+            
+            foreach(VCConfiguration conf in configurations)
+            {
+                if(conf != null)
+                {
+                    VCCLCompilerTool compilerTool = 
+                        (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
+                    VCLinkerTool linkerTool = (VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool"));
+
+                    if(compilerTool == null || linkerTool == null)
+                    {
+                        continue;
+                    }
+
+                    bool debug = false;
+                    if(!String.IsNullOrEmpty(compilerTool.PreprocessorDefinitions))
+                    {
+                        debug = (compilerTool.PreprocessorDefinitions.Contains("DEBUG") &&
+                                 !compilerTool.PreprocessorDefinitions.Contains("NDEBUG"));
+                    }
+                    if(!debug)
+                    {
+                        debug = conf.Name.Contains("Debug");
+                    }
+                    foreach(string component in components)
+                    {
+                        if(String.IsNullOrEmpty(component))
+                        {
+                            continue;
+                        }
+                        Util.addCppLib(linkerTool, component, debug);
+                    }
+                }
+            }
+        }
+
+        public static ComponentList removeIceCppLibs(Project project)
+        {
+            return Util.removeIceCppLibs(project, new ComponentList(Util.getCppNames()));
+        }
+
+        public static ComponentList removeIceCppLibs(Project project, ComponentList components)
+        {
+            ComponentList removed = new ComponentList();
+            if(!isCppProject(project))
+            {
+                return removed;
+            }
+
+            VCProject vcProject = (VCProject)project.Object;
+            IVCCollection configurations = (IVCCollection)vcProject.Configurations;
+
+            foreach(VCConfiguration conf in configurations)
+            {
+                if(conf != null)
+                {
+                    VCCLCompilerTool compilerTool = 
+                        (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
+                    VCLinkerTool linkerTool = (VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool"));
+
+                    if(compilerTool == null || linkerTool == null)
+                    {
+                        continue;
+                    }
+
+                    bool debug = false;
+                    if(!String.IsNullOrEmpty(compilerTool.PreprocessorDefinitions))
+                    {
+                        debug = (compilerTool.PreprocessorDefinitions.Contains("DEBUG") &&
+                                 !compilerTool.PreprocessorDefinitions.Contains("NDEBUG"));
+                    }
+                    if(!debug)
+                    {
+                        debug = conf.Name.Contains("Debug");
+                    }
+
+                    foreach(string s in components)
+                    {
+                        if(s != null)
+                        {
+                            if(Util.removeCppLib(linkerTool, s, debug)  && !removed.Contains(s))
+                            {
+                                removed.Add(s);
+                            }
+                        }
+                    }
+                }
+            }
+            return removed;
+        }
+
+        public static DTE getCurrentDTE()
+        {
+           return Connect.getCurrentDTE();
+        }
+
+        public static string subEnvironmentVars(string s)
+        {
+            string result = s;
+            int beg = 0;
+            int end;
+            while((beg = result.IndexOf("$(", beg, StringComparison.Ordinal)) != -1 && beg < result.Length -1)
+            {
+                end = result.IndexOf(")", beg + 1, StringComparison.Ordinal);
+                if(end == -1)
+                {
+                    break;
+                }
+                string variable = result.Substring(beg + 2, end - beg - 2);
+                string value = System.Environment.GetEnvironmentVariable(variable);
+                if(value == null)
+                {
+                    value = "";
+                }
+                result = result.Replace("$(" + variable + ")", value);
+                beg += value.Length;
+            }
+            return result;
+        }
+
+        public static bool containsEnvironmentVars(string s)
+        {
+            int pos = s.IndexOf("$(", StringComparison.Ordinal);
+            if(pos != -1)
+            {
+                return s.IndexOf(')', pos) != -1;
+            }
+            return false;
+        }
+    }
+}
diff --git a/vsplugin/src/addin-vs2008.csproj b/vsplugin/src/addin-vs2008.csproj
index 1b768df32b6..22706dd4c94 100644
--- a/vsplugin/src/addin-vs2008.csproj
+++ b/vsplugin/src/addin-vs2008.csproj
@@ -155,4 +155,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/vsplugin/templates/vs/Slice/slice.vsdir b/vsplugin/templates/vs/Slice/slice.vsdir
index a9a222731a3..dee65e836b8 100644
--- a/vsplugin/templates/vs/Slice/slice.vsdir
+++ b/vsplugin/templates/vs/Slice/slice.vsdir
@@ -1 +1 @@
-../newslice.ice|0|Slice File (.ice)|1|Slice File (.ice)|0|slice.ico|0|New.ice
\ No newline at end of file
+../newslice.ice|0|Slice File (.ice)|1|Slice File (.ice)|0|slice.ico|0|New.ice

diff --git a/vsplugin/templates/vs/slice.vsdir b/vsplugin/templates/vs/slice.vsdir
index 79e170baf13..8c3bfdb59f2 100644
--- a/vsplugin/templates/vs/slice.vsdir
+++ b/vsplugin/templates/vs/slice.vsdir
@@ -1 +1 @@
-newslice.ice|0|Slice File (.ice)|1000|Slice File (.ice)|0|slice.ico|0|New.ice
\ No newline at end of file
+newslice.ice|0|Slice File (.ice)|1000|Slice File (.ice)|0|slice.ico|0|New.ice