sb111: merged in DEV300_m68

49 files changed, 2059 insertions, 1282 deletions

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 995c7e65e999..353a3e045719 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -186,6 +186,7 @@ class Desktop : public Application
         static sal_Bool         _bTasksSaved;
 
         static void             retrieveCrashReporterState();
+        static sal_Bool         isUIOnSessionShutdownAllowed();
 
         // on-demand acceptors
         static void                         createAcceptor(const OUString& aDescription);
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 5f19e775420c..9253b4e82bc7 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,4 +1,4 @@
-dt      desktop :       l10n sfx2 stoc uui BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg configmgr NULL
+dt      desktop :    l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg configmgr NULL
 dt	desktop									usr1	-	all	dt_mkout NULL
 dt	desktop\inc								nmake	-	all	dt_inc NULL
 dt	desktop\prj								get		-	all	dt_prj NULL
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk
index 39e80ddb1c76..f673f27e49cb 100644
--- a/desktop/qa/deployment_misc/makefile.mk
+++ b/desktop/qa/deployment_misc/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ DLLPRE = # no leading "lib" on .so files
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_dp_version.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB) $(TESTSHL2LIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
@@ -54,4 +54,4 @@ SLOFILES = $(SHL1OBJS)
 ALLTAR: test
 
 test .PHONY: $(SHL1TARGETN)
-    testshl2 $(SHL1TARGETN)
+    $(TESTSHL2) $(SHL1TARGETN)
diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx
index b1de394e0cd6..728ed52c37b1 100644
--- a/desktop/qa/deployment_misc/test_dp_version.cxx
+++ b/desktop/qa/deployment_misc/test_dp_version.cxx
@@ -35,7 +35,7 @@
 
 #include <cstddef>
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index ede5fdf7511a..14422298b2aa 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -114,18 +114,19 @@
 #include <unotools/ucbhelper.hxx>
 #include <tools/tempfile.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <osl/module.h>
 #include <osl/file.hxx>
 #include <osl/signal.h>
 #include <rtl/uuid.h>
-#include <svtools/pathoptions.hxx>
-#include <svtools/languageoptions.hxx>
-#include <svtools/internaloptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/languageoptions.hxx>
+#include <unotools/internaloptions.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/menuoptions.hxx>
-#include <svtools/syslocaleoptions.hxx>
-#include <svtools/folderrestriction.hxx>
+#include <unotools/syslocaleoptions.hxx>
+#include <unotools/syslocale.hxx>
+#include <svl/folderrestriction.hxx>
 #include <unotools/tempfile.hxx>
 #include <rtl/logfile.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -147,9 +148,9 @@
 #include <svtools/fontsubstconfig.hxx>
 #include <svtools/accessibilityoptions.hxx>
 #include <svtools/apearcfg.hxx>
-#include <svtools/misccfg.hxx>
+#include <unotools/misccfg.hxx>
 #include <svtools/filter.hxx>
-#include <svtools/regoptions.hxx>
+#include <unotools/regoptions.hxx>
 
 #include "langselect.hxx"
 
@@ -937,6 +938,29 @@ void Desktop::retrieveCrashReporterState()
     _bCrashReporterEnabled = bEnabled;
 }
 
+sal_Bool Desktop::isUIOnSessionShutdownAllowed()
+{
+    static const ::rtl::OUString CFG_PACKAGE_RECOVERY = ::rtl::OUString::createFromAscii("org.openoffice.Office.Recovery/");
+    static const ::rtl::OUString CFG_PATH_SESSION     = ::rtl::OUString::createFromAscii("SessionShutdown"                );
+    static const ::rtl::OUString CFG_ENTRY_UIENABLED  = ::rtl::OUString::createFromAscii("DocumentStoreUIEnabled"         );
+
+    css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
+
+    sal_Bool bResult = sal_False;
+    if ( xSMGR.is() )
+    {
+        css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
+                                    xSMGR,
+                                    CFG_PACKAGE_RECOVERY,
+                                    CFG_PATH_SESSION,
+                                    CFG_ENTRY_UIENABLED,
+                                    ::comphelper::ConfigurationHelper::E_READONLY);
+        aVal >>= bResult;
+    }
+
+    return bResult;
+}
+
 //-----------------------------------------------
 /** @short  check if crash reporter feature is enabled or
             disabled.
@@ -1323,13 +1347,15 @@ void Desktop::Main()
         }
         String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, *pLabelResMgr ) ) : String();
         delete pLabelResMgr;
-
+/*
+        // locale and UI locale in AppSettings are now retrieved from configuration or system directly via SvtSysLocale
+        // no reason to set while starting
         // set UI language and locale
         RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ set locale settings" );
         //LanguageSelection langselect;
         OUString aUILocaleString = LanguageSelection::getLanguageString();
         Locale aUILocale = LanguageSelection::IsoStringToLocale(aUILocaleString);
-        LanguageType eLanguage = SvtSysLocaleOptions().GetLocaleLanguageType();
+        LanguageType eLanguage = SvtSysLocale().GetLanguage();
 
         // #i39040#, do not call anything between GetSettings and SetSettings that might have
         // a side effect on the settings (like, eg, SvtSysLocaleOptions().GetLocaleLanguageType(),
@@ -1339,7 +1365,7 @@ void Desktop::Main()
         aSettings.SetLanguage( eLanguage );
         Application::SetSettings( aSettings );
         RTL_LOGFILE_CONTEXT_TRACE( aLog, "} set locale settings" );
-
+*/
 
         // Check for StarOffice/Suite specific extensions runs also with OpenOffice installation sets
         OUString aTitleString( aTitle );
@@ -1349,7 +1375,7 @@ void Desktop::Main()
         else
             aTitle = aTitleString;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         //include version ID in non product builds
         ::rtl::OUString aDefault;
         aTitle += DEFINE_CONST_UNICODE(" [");
@@ -1400,7 +1426,7 @@ void Desktop::Main()
 
             if (IsFirstStartWizardNeeded())
             {
-                ::svt::RegOptions().removeReminder(); // remove patch registration reminder
+                ::utl::RegOptions().removeReminder(); // remove patch registration reminder
                 Reference< XJob > xFirstStartJob( xSMgr->createInstance(
                     DEFINE_CONST_UNICODE( "com.sun.star.comp.desktop.FirstStart" ) ), UNO_QUERY );
                 if (xFirstStartJob.is())
@@ -1834,10 +1860,6 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* )
 
     hStyleSettings.SetDragFullOptions( nDragFullOptions );
     rSettings.SetStyleSettings ( hStyleSettings );
-
-    MiscSettings aMiscSettings( rSettings.GetMiscSettings() );
-    aMiscSettings.SetTwoDigitYearStart( (USHORT) SfxMiscCfg().GetYear2000() );
-    rSettings.SetMiscSettings( aMiscSettings );
 }
 
 // ========================================================================
@@ -2458,7 +2480,15 @@ void Desktop::OpenClients()
         {
             xSessionListener = Reference< XInitialization >(::comphelper::getProcessServiceFactory()->createInstance(
                         OUString::createFromAscii("com.sun.star.frame.SessionListener")), UNO_QUERY_THROW);
-            xSessionListener->initialize(Sequence< Any >(0));
+
+            // specifies whether the UI-interaction on Session shutdown is allowed
+            sal_Bool bAllowUI = isUIOnSessionShutdownAllowed();
+            css::beans::NamedValue aProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AllowUserInteractionOnQuit" ) ),
+                                              css::uno::makeAny( bAllowUI ) );
+            css::uno::Sequence< css::uno::Any > aArgs( 1 );
+            aArgs[0] <<= aProperty;
+
+            xSessionListener->initialize( aArgs );
         }
         catch(const com::sun::star::uno::Exception& e)
         {
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index e87701b4addf..b81923a48d9c 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -75,9 +75,9 @@
 #include <unotools/tempfile.hxx>
 #include <ucbhelper/contentbroker.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/startoptions.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/internaloptions.hxx>
+#include <unotools/startoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/internaloptions.hxx>
 
 
 #define DEFINE_CONST_OUSTRING(CONSTASCII)       OUString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 0f1b62d707f2..5220d60bc02c 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include "tools/getprocessworkingdir.hxx"
 
-#include <svtools/documentlockfile.hxx>
+#include <svl/documentlockfile.hxx>
 
 using namespace rtl;
 using namespace com::sun::star::lang;
diff --git a/desktop/source/app/copyright_ascii_ooo.c b/desktop/source/app/copyright_ascii_ooo.c
index 6c49ba9d9f86..7b58f1a60f7e 100644
--- a/desktop/source/app/copyright_ascii_ooo.c
+++ b/desktop/source/app/copyright_ascii_ooo.c
@@ -9,8 +9,8 @@ extern const char copyright_text_2[];
 extern const char copyright_text_21[];
 extern const char copyright_text_22[];
 
-const char copyright_text_1[] = "Copyright � 2008 Sun Microsystems, Inc., All rights reserved.";
+const char copyright_text_1[] = "Copyright � 2010 Sun Microsystems, Inc., All rights reserved.";
 const char copyright_text_2[] = "Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual property rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent applications in the U.S. and in other countries.";
-const char copyright_text_21[] = "Copyright � 2008 Sun Microsystems, Tous droits r�serv�s.";
+const char copyright_text_21[] = "Copyright � 2010 Sun Microsystems, Tous droits r�serv�s.";
 const char copyright_text_22[] = "Sun Microsystems, Inc. a les droits de propri�t� intellectuels relatants � la technologie incorpor�e dans ce produit. En particulier, et sans la limitation, ces droits de propri�t� intellectuels peuvent inclure un ou plus des brevets am�ricains �num�r�s � http://www.sun.com/patents et un ou les brevets plus suppl�mentaires ou les applications de brevet en attente dans les �tats - Unis et les autres pays.";
 
diff --git a/desktop/source/app/copyright_ascii_sun.c b/desktop/source/app/copyright_ascii_sun.c
index 70d7d53f4b9c..6284744db94f 100644
--- a/desktop/source/app/copyright_ascii_sun.c
+++ b/desktop/source/app/copyright_ascii_sun.c
@@ -4,12 +4,12 @@
   *
   */
 
-const char copyright_text_1[] = "Copyright � 2008 Sun Microsystems, Inc., All rights reserved.";
+const char copyright_text_1[] = "Copyright � 2010 Sun Microsystems, Inc., All rights reserved.";
 const char copyright_text_2[] = "Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual property rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent applications in the U.S. and in other countries.";
 const char copyright_text_3[] = "U.S. Government Rights - Commercial software. Government users are subject to the Sun Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its supplements.  Use is subject to license terms.";
 const char copyright_text_4[] = "This distribution may include materials developed by third parties.Sun, Sun Microsystems, the Sun logo, Java, Solaris and StarOffice are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks are used under license and are trademarks or registered trademarks of SPARC International, Inc. in the U.S. and other countries.";
 const char copyright_text_5[] = "UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd.";
-const char copyright_text_21[] = "Copyright � 2008 Sun Microsystems, Tous droits r�serv�s.";
+const char copyright_text_21[] = "Copyright � 2010 Sun Microsystems, Tous droits r�serv�s.";
 const char copyright_text_22[] = "Sun Microsystems, Inc. a les droits de propri�t� intellectuels relatants � la technologie incorpor�e dans ce produit. En particulier, et sans la limitation, ces droits de propri�t� intellectuels peuvent inclure un ou plus des brevets am�ricains �num�r�s � http://www.sun.com/patents et un ou les brevets plus suppl�mentaires ou les applications de brevet en attente dans les �tats - Unis et les autres pays.";
 const char copyright_text_23[] = "Ce produit ou document est prot�g� par un copyright et distribu� avec des licences qui en restreignent l'utilisation, la copie, la distribution, et la d�compilation. Aucune partie de ce produit ou document ne peut �tre reproduite sous aucune forme, par quelque moyen que ce soit, sans l'autorisation pr�alable et �crite de Sun et de ses bailleurs de licence, s'il y ena.";
 const char copyright_text_24[] = "L'utilisation est soumise aux termes du contrat de licence.";
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index 1edb20e58dd2..81110d665868 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -32,7 +32,7 @@
 #define _DESKTOP_HRC_
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define RID_DESKTOP_DIALOG_START            2000
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index e9a39207cb50..e8b50cdd295e 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -39,7 +39,7 @@
 #include <rtl/string.hxx>
 #endif
 #ifndef _SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
 #include <tools/resid.hxx>
 #include <i18npool/mslangid.hxx>
@@ -143,6 +143,18 @@ bool LanguageSelection::prepareLanguage()
             xProp->setPropertyValue(OUString::createFromAscii("ooLocale"), makeAny(aLocaleString));
             Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
 
+            MsLangId::setConfiguredSystemUILanguage( MsLangId::convertLocaleToLanguage(loc) );
+
+            OUString sLocale;
+            xProp->getPropertyValue(OUString::createFromAscii("ooSetupSystemLocale")) >>= sLocale;
+            if ( sLocale.getLength() )
+            {
+                loc = LanguageSelection::IsoStringToLocale(aLocaleString);
+                MsLangId::setConfiguredSystemLanguage( MsLangId::convertLocaleToLanguage(loc) );
+            }
+            else
+                MsLangId::setConfiguredSystemLanguage( MsLangId::getSystemLanguage() );
+
             bSuccess = sal_True;
         }
         catch ( PropertyVetoException& )
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index d0867529ab1b..e9753ae4ab73 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -33,14 +33,10 @@
 #include <tools/string.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/resid.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 
 namespace desktop
 {
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk
index 238685649cf9..ffaf68c0fbad 100644
--- a/desktop/source/app/makefile.mk
+++ b/desktop/source/app/makefile.mk
@@ -50,7 +50,6 @@ SHL1OBJS = \
     $(SLO)$/appfirststart.obj \
     $(SLO)$/appinit.obj \
     $(SLO)$/appsys.obj \
-    $(SLO)$/cfgfilter.obj \
     $(SLO)$/checkinstall.obj \
     $(SLO)$/check_ext_deps.obj \
     $(SLO)$/cmdlineargs.obj \
@@ -62,12 +61,12 @@ SHL1OBJS = \
     $(SLO)$/langselect.obj \
     $(SLO)$/lockfile.obj \
     $(SLO)$/lockfile2.obj \
-    $(SLO)$/migration.obj \
     $(SLO)$/officeipcthread.obj \
-    $(SLO)$/pages.obj \
     $(SLO)$/sofficemain.obj \
-    $(SLO)$/userinstall.obj \
-    $(SLO)$/wizard.obj
+    $(SLO)$/userinstall.obj
+
+SHL1LIBS = $(SLB)$/mig.lib
+
 SHL1STDLIBS = \
     $(COMPHELPERLIB) \
     $(CPPUHELPERLIB) \
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index cb2856fb897d..6777bbd52fe6 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -47,7 +47,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
 #include <osl/conditn.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/strbuf.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 2fd4c180a361..f45e995e937d 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -50,9 +50,9 @@
 #include <tools/resmgr.hxx>
 #endif
 #include <unotools/bootstrap.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #ifndef _SVTOOLS_SYSLOCALEOPTIONSOPTIONS_HXX
-#include <svtools/syslocaleoptions.hxx>
+#include <unotools/syslocaleoptions.hxx>
 #endif
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 39ea6f016dbf..75005b728465 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -104,7 +104,7 @@ PersistentMap::PersistentMap( OUString const & url_, bool readOnly )
             OSL_ASSERT( false );
         }
         OString cstr_sysPath(
-            OUStringToOString( m_sysPath, osl_getThreadTextEncoding() ) );
+            OUStringToOString( m_sysPath, RTL_TEXTENCODING_UTF8 ) );
         char const * pcstr_sysPath = cstr_sysPath.getStr();
 
         u_int32_t flags = DB_CREATE;
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
index 7338a377de5d..9a0b76773f27 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
@@ -33,7 +33,7 @@
 
 
 #include "svtools/svmedit2.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
 #include "svtools/xtextedt.hxx"
 #include "vcl/scrbar.hxx"
 
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
index 98fa0050584a..3353bd42f04d 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
@@ -31,7 +31,7 @@
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_AUTOSCROLLEDIT_HXX
 
 #include "svtools/svmedit2.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
 
 namespace dp_gui {
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index f09d906a840e..b2620703a44a 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -34,7 +34,7 @@
 
 #include "dp_gui.hrc"
 #include "svtools/controldims.hrc"
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
 
 #include "dp_gui.h"
 #include "dp_gui_dialog2.hxx"
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 555b7578b327..5a503b57c89d 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -43,7 +43,7 @@
 #include "com/sun/star/lang/XServiceInfo.hpp"
 #include "com/sun/star/task/XJobExecutor.hpp"
 #include "svtools/svmedit.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
 #include "svtools/xtextedt.hxx"
 #include <vcl/scrbar.hxx>
 #include "vcl/threadex.hxx"
diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk
index c664ff409b6d..1dea0a6912d1 100644
--- a/desktop/source/deployment/makefile.mk
+++ b/desktop/source/deployment/makefile.mk
@@ -82,6 +82,7 @@ SHL1STDLIBS = \
         $(TOOLSLIB) \
         $(XMLSCRIPTLIB) \
         $(SVLLIB) \
+        $(UNOTOOLSLIB) \
         $(DEPLOYMENTMISCLIB) \
     $(HELPLINKERLIB) \
     $(CONFIGMGRLIB)
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index d7177f90dc77..f0635eec3d72 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -49,7 +49,7 @@
 #include "comphelper/servicedecl.hxx"
 #include "comphelper/sequence.hxx"
 #include "xmlscript/xml_helper.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "com/sun/star/lang/DisposedException.hpp"
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
 #include "com/sun/star/beans/UnknownPropertyException.hpp"
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index e9f8a07a96ae..361004b353a3 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -45,7 +45,7 @@
 #include "comphelper/servicedecl.hxx"
 #include "comphelper/sequence.hxx"
 #include "xmlscript/xml_helper.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
 #include "com/sun/star/container/XNameContainer.hpp"
 #include "com/sun/star/container/XHierarchicalNameAccess.hpp"
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index f905609b1a00..3a1c8c2f5d16 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -50,7 +50,7 @@
 #include "comphelper/servicedecl.hxx"
 #include "configmgr/update.hxx"
 #include "xmlscript/xml_helper.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "com/sun/star/ucb/NameClash.hpp"
 #include "com/sun/star/io/XActiveDataSink.hpp"
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 3afcb8d35636..690549db0119 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -38,7 +38,7 @@
 #include "osl/file.hxx"
 #include "ucbhelper/content.hxx"
 #include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "cppuhelper/implbase1.hxx"
 
 using namespace ::com::sun::star;
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index dd9e009e90cc..7daa9adb277e 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -38,7 +38,8 @@
 #include "osl/file.hxx"
 #include "ucbhelper/content.hxx"
 #include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
+#include "unotools/pathoptions.hxx"
 
 #include <transex3/compilehelp.hxx>
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
@@ -350,8 +351,12 @@ void BackendImpl::implProcessHelp
                     pXhpFiles[iXhp] = aXhpRelFile;
                 }
 
+                rtl::OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() );
+                rtl::OUString aOfficeHelpPathFileURL;
+                ::osl::File::getFileURLFromSystemPath( aOfficeHelpPath, aOfficeHelpPathFileURL );
+
                 HelpProcessingErrorInfo aErrorInfo;
-                bool bSuccess = compileExtensionHelp( aHelpStr, aLangURL,
+                bool bSuccess = compileExtensionHelp( aOfficeHelpPathFileURL, aHelpStr, aLangURL,
                     nXhpFileCount, pXhpFiles, aErrorInfo );
 
                 if( bSuccess && xInvocation.is() )
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 14075d0fca38..1771cc93ec07 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -44,7 +44,7 @@
 #include "cppuhelper/exc_hlp.hxx"
 #include "cppuhelper/implbase1.hxx"
 #include "ucbhelper/content.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "comphelper/anytostring.hxx"
 #include "comphelper/makesequence.hxx"
 #include "comphelper/sequence.hxx"
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index ba8a972d0624..dbc644e60f44 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -40,7 +40,7 @@
 #include "cppuhelper/exc_hlp.hxx"
 #include "cppuhelper/implbase1.hxx"
 #include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include "com/sun/star/util/XUpdatable.hpp"
 #include "com/sun/star/script/XLibraryContainer.hpp"
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index ff17da268dff..de515dd78372 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -38,7 +38,7 @@
 #include "ucbhelper/content.hxx"
 #include "cppuhelper/exc_hlp.hxx"
 #include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/script/provider/XScriptProviderFactory.hpp>
 #include <memory>
diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc
index f2d096460bed..c6c18e4bfc01 100644
--- a/desktop/source/inc/helpid.hrc
+++ b/desktop/source/inc/helpid.hrc
@@ -31,7 +31,7 @@
 #if ! defined INCLUDED_DESKTOP_HELPID_HRC
 #define INCLUDED_DESKTOP_HELPID_HRC
 
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
 
 #define HID_GLOBAL_FALLBACK                         0xFFFFFFFF
 
diff --git a/desktop/source/migration/makefile.mk b/desktop/source/migration/makefile.mk
index d5aaf884ac5e..31af71f83fee 100644
--- a/desktop/source/migration/makefile.mk
+++ b/desktop/source/migration/makefile.mk
@@ -33,7 +33,6 @@ PRJ=..$/..
 
 PRJNAME=desktop
 TARGET=mig
-LIBTARGET=NO
 AUTOSEG=true
 ENABLE_EXCEPTIONS=TRUE
 
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index 2c85828f540f..c21767a0f83d 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -43,8 +43,8 @@
 #include <osl/file.hxx>
 #include <unotools/bootstrap.hxx>
 #include <unotools/configmgr.hxx>
-#include <svtools/regoptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/regoptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -548,7 +548,7 @@ sal_Bool RegistrationPage::commitPage( CommitPageReason _eReason )
 {
     if ( _eReason == eFinish )
     {
-        ::svt::RegOptions aOptions;
+        ::utl::RegOptions aOptions;
         rtl::OUString aEvent;
 
         if ( m_rbNow.IsChecked())
@@ -605,7 +605,7 @@ void RegistrationPage::prepareSingleMode()
 
 bool RegistrationPage::hasReminderDateCome()
 {
-    return ::svt::RegOptions().hasReminderDateCome();
+    return ::utl::RegOptions().hasReminderDateCome();
 }
 
 void RegistrationPage::executeSingleMode()
@@ -622,7 +622,7 @@ void RegistrationPage::executeSingleMode()
     if ( eMode == RegistrationPage::rmNow || eMode == RegistrationPage::rmLater )
         pPage->commitPage( IWizardPage::eFinish );
     if ( eMode != RegistrationPage::rmLater )
-        ::svt::RegOptions().removeReminder();
+        ::utl::RegOptions().removeReminder();
 }
 
 // -----------------------------------------------------------------------
diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx
index 97d4282d1d76..b5e89860792c 100644
--- a/desktop/source/migration/pages.hxx
+++ b/desktop/source/migration/pages.hxx
@@ -38,7 +38,7 @@
 #include <vcl/scrbar.hxx>
 #include <svtools/wizardmachine.hxx>
 #include <svtools/svmedit.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/xtextedt.hxx>
 
 namespace desktop
diff --git a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
index c97d5f2cd4f0..060ef6cb7f6d 100644
--- a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
+++ b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BrowserSupport.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/servicetag/Installer.java b/desktop/source/registration/com/sun/star/servicetag/Installer.java
index 02825dfec69d..e4daf959c19d 100644
--- a/desktop/source/registration/com/sun/star/servicetag/Installer.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Installer.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Installer.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -794,7 +793,7 @@ public class Installer {
             reader.close();
         }
 
-        String resourceFilename = "/com/sun/star/servicetag/resources/register";
+        String resourceFilename = "/com/sun/servicetag/resources/register";
         for (Locale locale : supportedLocales) {
             String name = REGISTRATION_HTML_NAME;
             String resource = resourceFilename;
diff --git a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
index 90e38021c103..4129e440099f 100644
--- a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LinuxSystemEnvironment.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,6 +28,7 @@
  *
  ************************************************************************/
 
+
 package com.sun.star.servicetag;
 
 // The Service Tags team maintains the latest version of the implementation
@@ -40,6 +40,7 @@ package com.sun.star.servicetag;
 // (e.g. NetBeans and SunStudio) will use the version in JDK.
 
 import java.io.*;
+import java.util.*;
 
 /**
  * Linux implementation of the SystemEnvironment class.
@@ -47,16 +48,25 @@ import java.io.*;
 class LinuxSystemEnvironment extends SystemEnvironment {
     LinuxSystemEnvironment() {
         setHostId(getLinuxHostId());
-        setSystemModel(getCommandOutput("/bin/uname", "-i"));
+
+        setSystemModel(getLinuxModel());
         setSystemManufacturer(getLinuxSystemManufacturer());
         setCpuManufacturer(getLinuxCpuManufacturer());
         setSerialNumber(getLinuxSN());
+        setPhysMem(getLinuxPhysMem());
+        setSockets(getLinuxSockets());
+        setCores(getLinuxCores());
+        setVirtCpus(getLinuxVirtCpus());
+        setCpuName(getLinuxCpuName());
+        setClockRate(getLinuxClockRate());
     }
     private String dmiInfo = null;
+    private String kstatCpuInfo = null;
 
     private static final int SN  = 1;
     private static final int SYS = 2;
     private static final int CPU = 3;
+    private static final int MODEL = 4;
 
     private String getLinuxHostId() {
         String output = getCommandOutput("/usr/bin/hostid");
@@ -91,6 +101,21 @@ class LinuxSystemEnvironment extends SystemEnvironment {
         return getLinuxDMIInfo("dmi type 4", "manufacturer");
     }
 
+    private String getLinuxModel() {
+        String tmp = getLinuxPSNInfo(MODEL);
+        if (tmp.length() > 0) {
+            return tmp + "::" + getCommandOutput("/bin/uname","-v");
+        }
+
+        tmp = getLinuxDMIInfo("dmi type 1", "product name");
+        if (tmp.length() > 0) {
+            return tmp + "::" + getCommandOutput("/bin/uname","-v");
+        }
+
+        return getCommandOutput("/bin/uname","-i")
+            + "::" + getCommandOutput("/bin/uname","-v");
+    }
+
 
     /**
      * Tries to obtain and return the system manufacturer.
@@ -158,7 +183,7 @@ class LinuxSystemEnvironment extends SystemEnvironment {
             dmidecodeThread.start();
 
             try {
-                dmidecodeThread.join(2000);
+                dmidecodeThread.join(3000);
                 if (dmidecodeThread.isAlive()) {
                     dmidecodeThread.interrupt();
                     dmiInfo = "";
@@ -191,4 +216,111 @@ class LinuxSystemEnvironment extends SystemEnvironment {
         return "";
     }
 
+    private String getLinuxClockRate() {
+        String contents = getFileContent("/proc/cpuinfo");
+        String token = "cpu MHz";
+        for (String line : contents.split("\n")) {
+            if (line.contains(token)) {
+                String[] key = line.split(":", 2);
+                if (key.length > 1) {
+                    return key[1].trim();
+                }
+            }
+        }
+        return "";
+    }
+
+    private String getLinuxCpuName() {
+        String contents = getFileContent("/proc/cpuinfo");
+        String token = "model name";
+        for (String line : contents.split("\n")) {
+            if (line.contains(token)) {
+                String[] key = line.split(":", 2);
+                if (key.length > 1) {
+                    return key[1].trim();
+                }
+            }
+        }
+        return "";
+    }
+
+    private String getLinuxVirtCpus() {
+        Set<String> set = new HashSet<String>();
+        String contents = getFileContent("/proc/cpuinfo");
+        String token = "processor";
+        for (String line : contents.split("\n")) {
+            if (line.contains(token)) {
+                String[] key = line.split(":", 2);
+                if (key.length > 1) {
+                    set.add(key[1].trim());
+                }
+            }
+        }
+        return "" + set.size();
+    }
+
+    private String getLinuxCores() {
+        Set<String> set = new HashSet<String>();
+        String contents = getFileContent("/proc/cpuinfo");
+        String token = "core id";
+        for (String line : contents.split("\n")) {
+            if (line.contains(token)) {
+                String[] key = line.split(":", 2);
+                if (key.length > 1) {
+                    set.add(key[1].trim());
+                }
+            }
+        }
+        if (set.size() == 0) {
+            return "1";
+        }
+        return "" + set.size();
+    }
+
+    private String getLinuxPhysMem() {
+        String contents = getFileContent("/proc/meminfo");
+        for (String line : contents.split("\n")) {
+            if (line.contains("MemTotal")) {
+                String[] total = line.split(":", 2);
+                if (total.length > 1) {
+                    String[] mem = total[1].trim().split(" ");
+                    if (mem.length >= 1) {
+                        return mem[0].trim();
+                    } else {
+                        return total[1].trim();
+                    }
+                }
+            }
+        }
+
+        return "";
+    }
+
+    private String getLinuxSockets() {
+        Set<String> physIdSet = new HashSet<String>();
+        Set<String> procSet = new HashSet<String>();
+        String contents = getFileContent("/proc/cpuinfo");
+        String physIdToken = "physical id";
+        String procToken = "processor";
+
+        for (String line : contents.split("\n")) {
+            if (line.contains(physIdToken)) {
+                String[] key = line.split(":", 2);
+                if (key.length > 1) {
+                    physIdSet.add(key[1].trim());
+                }
+            }
+
+            if (line.contains(procToken)) {
+                String[] key = line.split(":", 2);
+                if (key.length > 1) {
+                    procSet.add(key[1].trim());
+                }
+            }
+        }
+        if (physIdSet.size() != 0) {
+            return "" + physIdSet.size();
+        }
+        return "" + procSet.size();
+    }
 }
diff --git a/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
index 57be724a78a3..c58d83a33dd8 100644
--- a/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
+++ b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
@@ -1,473 +1,531 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: RegistrationData.java,v $
- *
- * $Revision: 1.2 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.servicetag;
-
-import java.io.*;
-import java.net.UnknownHostException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-import static com.sun.star.servicetag.RegistrationDocument.*;
-
-/**
- * A {@code RegistrationData} object is a container of one or more
- * {@link #getServiceTags service tags} that identify the
- * components for product registration.
- * Each {@code RegistrationData} object has a {@link #getRegistrationURN
- * uniform resource name} (URN) as its identifier.
- * <a name="EnvMap"></a>
- * It also has an <i>environment map</i> with
- * the following elements:
- * <blockquote>
- *       <table border=0>
- *       <tr>
- *          <td><tt>hostname</tt></td>
- *          <td>Hostname of the system</td>
- *          <td>e.g. woody</td>
- *       </tr>
- *       <tr>
- *          <td><tt>hostId</tt></td>
- *          <td>Host ID of the system</td>
- *          <td>e.g. 83abc1ab</td>
- *       </tr>
- *       <tr>
- *          <td><tt>osName</tt></td>
- *          <td>Operating system name</td>
- *          <td> e.g. SunOS</td>
- *       </tr>
- *       <tr>
- *          <td><tt>osVersion</tt></td>
- *          <td>Operating system version</td>
- *          <td> e.g. 5.10</td>
- *       </tr>
- *       <tr>
- *          <td><tt>osArchitecture</tt></td>
- *          <td>Operating system architecture</td>
- *          <td> e.g. sparc</td>
- *       </tr>
- *       <tr>
- *          <td><tt>systemModel</tt></td>
- *          <td>System model</td>
- *          <td> e.g. SUNW,Sun-Fire-V440</td>
- *       </tr>
- *       <tr>
- *          <td><tt>systemManufacturer</tt></td>
- *          <td>System manufacturer</td>
- *          <td> e.g. Sun Microsystems</td>
- *       </tr>
- *       <tr>
- *          <td><tt>cpuManufacturer</tt></td>
- *          <td>CPU manufacturer</td>
- *          <td> e.g. Sun Microsystems</td>
- *       </tr>
- *       <tr>
- *          <td><tt>serialNumber</tt></td>
- *          <td>System serial number</td>
- *          <td> e.g. BEL078932</td>
- *       </tr>
- *       </table>
- *  </blockquote>
- * The <tt>hostname</tt> and <tt>osName</tt> element must have a non-empty value.
- * If an element is not available on a system and their value will be
- * empty.
- * <p>
- * <a name="XMLSchema">
- * <b>Registration XML Schema</b></a>
- * <p>
- * A {@code RegistrationData} object can be {@link #loadFromXML loaded} from
- * and {@link #storeToXML stored} into an XML file in the format described
- * by the
- * <a href="https://sn-tools.central.sun.com/twiki/pub/ServiceTags/RegistrationRelayService/product_registration.xsd">
- * registration data schema</a>.  The registration data schema is defined by the
- * Service Tags Technology.
- * <p>
- * Typically the registration data is constructed at installation time
- * and stored in an XML file for later service tag lookup or registration.
- *
- * <p>
- * <b>Example Usage</b>
- * <p>
- * The examples below show how the {@code RegistrationData} can be
- * used for product registration.
- * Exception handling is not shown in these examples for clarity.
- * <ol>
- * <li>This example shows how the JDK creates a JDK service tag, installs it
- * in the system service tag registry and adds it to the registration data.
- * <br>
- * <blockquote><pre>
- *   // create a service tag object with an instance_urn
- *   ServiceTag st = ServiceTag.newInstance(ServiceTag.generateInstanceURN(),
- *                                          ....);
- *   // Adds to the system service tag registry if supported
- *   if (Registry.isSupported()) {
- *       Registry.getSystemRegistry().addServiceTag(st);
- *   }
- *
- *   // add to the registration data
- *   RegistrationData registration  = new RegistrationData();
- *   registration.addServiceTag(st);
- * </pre></blockquote>
- * </li>
- * <li>At this point, the registration data is ready to
- * send to Sun Connection for registration. This example shows how to register
- * the JDK via the <i>Registration Relay Service</i>.
- * <p>
- * There are several registration services for Sun Connection. For example,
- * the <a href="https://sn-tools.central.sun.com/twiki/bin/view/ServiceTags/RegistrationRelayService">
- * Registration Relay Service</a> is a web application interface that
- * processes the registration data payload sent via HTTP post
- * and hosts the registration user interface for a specified
- * registration URL.  Refer to the
- * Registration Relay Service Specification for details.
- * <p>
- * <blockquote><pre>
- *   // Open the connection to the URL of the registration service
- *   HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
- *   con.setDoInput(true);
- *   con.setDoOutput(true);
- *   con.setUseCaches(false);
- *   con.setAllowUserInteraction(false);
- *   con.setRequestMethod("POST");
- *   con.setRequestProperty("Content-Type", "text/xml;charset=\"utf-8\"");
- *   con.connect();
- *
- *   // send the registration data to the registration service
- *   OutputStream out = con.getOutputStream();
- *   registration.storeToXML(out);
- *   out.close();
- * </pre></blockquote>
- * </li>
- * <li>This example shows how to store the registration data in an XML file.
- *     for later service tag lookup or registration.
- * <br>
- * <blockquote><pre>
- *   BufferedOutputStream out = new BufferedOutputStream(
- *       new FileOutputStream(""&lt;JAVA_HOME&gt;/lib/servicetag/registration.xml"));
- *   registration.storeToXML(out);
- *   out.close();
- * </pre></blockquote>
- * </li>
- * <li>This example shows how to install service tags that are in the
- * registration data in the system service tag registry when determined
- * to be available.  The system service tag registry might not have existed
- * when the registration data was constructed.
- * <br>
- * <blockquote><pre>
- *   if (Registry.isSupported()) {
- *       Set&lt;ServiceTag&gt; svctags = registration.getServiceTags();
- *       for (ServiceTag st : svctags) {
- *           Registry.getSystemRegistry().addServiceTag(st);
- *       }
- *   }
- * </pre></blockquote>
- * </li>
- * </ol>
- *
- * @see <a href="https://sunconnection.sun.com/inventory">Sun Connection Inventory Channel</a>
- */
-public class RegistrationData {
-    private final Map<String, String> environment;
-    private final Map<String, ServiceTag> svcTagMap;
-    private final String urn;
-
-    /**
-     * Creates a {@code RegistrationData} object with a generated
-     * {@link #getRegistrationURN registration URN}.
-     * The following keys in the {@link #getEnvironmentMap environment map}
-     * will be initialized for the configuration of the
-     * running system:
-     * <blockquote>
-     * <tt>hostname</tt>, <tt>osName</tt>,  <tt>osVersion</tt> and
-     * <tt>osArchitecture</tt>
-     * </blockquote>
-     * and the value of other keys may be empty.
-     */
-    public RegistrationData() {
-        this(Util.generateURN());
-    }
-
-    // package private
-    RegistrationData(String urn) {
-        this.urn = urn;
-        this.environment = initEnvironment();
-        this.svcTagMap = new LinkedHashMap<String, ServiceTag>();
-    }
-
-    private Map<String, String> initEnvironment() {
-        Map<String, String> map = new LinkedHashMap<String, String>();
-        SystemEnvironment sysEnv = SystemEnvironment.getSystemEnvironment();
-        map.put(ST_NODE_HOSTNAME, sysEnv.getHostname());
-        map.put(ST_NODE_HOST_ID, sysEnv.getHostId());
-        map.put(ST_NODE_OS_NAME, sysEnv.getOsName());
-        map.put(ST_NODE_OS_VERSION, sysEnv.getOsVersion());
-        map.put(ST_NODE_OS_ARCH, sysEnv.getOsArchitecture());
-        map.put(ST_NODE_SYSTEM_MODEL, sysEnv.getSystemModel());
-        map.put(ST_NODE_SYSTEM_MANUFACTURER, sysEnv.getSystemManufacturer());
-        map.put(ST_NODE_CPU_MANUFACTURER, sysEnv.getCpuManufacturer());
-        map.put(ST_NODE_SERIAL_NUMBER, sysEnv.getSerialNumber());
-        return map;
-    }
-
-    /**
-     * Returns the uniform resource name of this registration data
-     * in this format:
-     * <tt>urn:st:&lt;32-char {@link java.util.UUID uuid}&gt;</tt>
-     *
-     * @return the URN of this registration data.
-     */
-    public String getRegistrationURN() {
-        return urn;
-    }
-
-    /**
-     * Returns a map containing the environment information for this
-     * registration data.  See the set of <a href="#EnvMap">keys</a>
-     * in the environment map. Subsequent update to the environment
-     * map via the {@link #setEnvironment setEnvironment} method will not be reflected
-     * in the returned map.
-     *
-     * @return an environment map for this registration data.
-     */
-    public Map<String, String> getEnvironmentMap() {
-        return new LinkedHashMap<String,String>(environment);
-    }
-
-    /**
-     * Sets an element of the specified {@code name} in the environment map
-     * with the given {@code value}.
-     *
-     * @throws IllegalArgumentException if {@code name} is not a valid key
-     * in the environment map, or {@code value} is not valid.
-     */
-    public void setEnvironment(String name, String value) {
-        if (name == null) {
-            throw new NullPointerException("name is null");
-        }
-        if (value == null) {
-            throw new NullPointerException("value is null");
-        }
-        if (environment.containsKey(name)) {
-            if (name.equals(ST_NODE_HOSTNAME) || name.equals(ST_NODE_OS_NAME)) {
-                if (value.length() == 0) {
-                    throw new IllegalArgumentException("\"" +
-                        name + "\" requires non-empty value.");
-                }
-            }
-            environment.put(name, value);
-        } else {
-            throw new IllegalArgumentException("\"" +
-                 name + "\" is not an environment element.");
-        }
-    }
-
-    /**
-     * Returns all service tags in this registration data.
-     *
-     * @return  a {@link Set Set} of the service tags
-     * in this registration data.
-     */
-    public Set<ServiceTag> getServiceTags() {
-        return new HashSet<ServiceTag>(svcTagMap.values());
-    }
-
-    /**
-     * Adds a service tag to this registration data.
-     * If the given service tag has an empty <tt>instance_urn</tt>,
-     * this method will generate a URN and place it in the copy
-     * of the service tag in this registration data.
-     * This method will return the {@code ServiceTag} object
-     * added to this registration data.
-     *
-     * @param st {@code ServiceTag} object to be added.
-     * @return a {@code ServiceTag} object added to this registration data.
-     *
-     * @throws IllegalArgumentException if
-     *   a service tag of the same {@link ServiceTag#getInstanceURN
-     *   <tt>instance_urn</tt>} already exists in the registry.
-     */
-    public synchronized ServiceTag addServiceTag(ServiceTag st) {
-        ServiceTag svcTag = ServiceTag.newInstanceWithUrnTimestamp(st);
-
-        String instanceURN = svcTag.getInstanceURN();
-        if (svcTagMap.containsKey(instanceURN)) {
-            throw new IllegalArgumentException("Instance_urn = " + instanceURN +
-                    " already exists in the registration data.");
-        } else {
-            svcTagMap.put(instanceURN, svcTag);
-        }
-        return svcTag;
-    }
-
-    /**
-     * Returns a service tag of the given <tt>instance_urn</tt> in this registration
-     * data.
-     *
-     * @param instanceURN the <tt>instance_urn</tt> of the service tag
-     * @return the {@code ServiceTag} object of the given  <tt>instance_urn</tt>
-     *         if exists; otherwise return {@code null}.
-     */
-    public synchronized ServiceTag getServiceTag(String instanceURN) {
-        if (instanceURN == null) {
-            throw new NullPointerException("instanceURN is null");
-        }
-        return svcTagMap.get(instanceURN);
-    }
-
-    /**
-     * Removes a service tag of the given <tt>instance_urn</tt> from this
-     * registration data.
-     *
-     * @param instanceURN the <tt>instance_urn</tt> of
-     * the service tag to be removed.
-     *
-     * @return the removed {@code ServiceTag} object;
-     * or {@code null} if the service tag does not exist in this
-     * registration data.
-     */
-    public synchronized ServiceTag removeServiceTag(String instanceURN) {
-        if (instanceURN == null) {
-            throw new NullPointerException("instanceURN is null");
-        }
-
-        ServiceTag svcTag = null;
-        if (svcTagMap.containsKey(instanceURN)) {
-            svcTag = svcTagMap.remove(instanceURN);
-        }
-        return svcTag;
-    }
-
-     /**
-     * Updates the <tt>product_defined_instance_id</tt> in the service tag
-     * of the given <tt>instance_urn</tt> in this registration data.
-     *
-     * @param instanceURN the <tt>instance_urn</tt> of the service tag to be updated.
-     * @param productDefinedInstanceID the value of the
-     * <tt>product_defined_instance_id</tt> to be set.
-     *
-     * @return the updated {@code ServiceTag} object;
-     * or {@code null} if the service tag does not exist in this
-     * registration data.
-     */
-    public synchronized ServiceTag updateServiceTag(String instanceURN,
-                                                    String productDefinedInstanceID) {
-        ServiceTag svcTag = getServiceTag(instanceURN);
-        if (svcTag == null) {
-            return null;
-        }
-
-        svcTag = ServiceTag.newInstanceWithUrnTimestamp(svcTag);
-        // update the product defined instance ID field
-        svcTag.setProductDefinedInstanceID(productDefinedInstanceID);
-        svcTagMap.put(instanceURN, svcTag);
-        return svcTag;
-    }
-
-    /**
-     * Reads the registration data from the XML document on the
-     * specified input stream.  The XML document must be
-     * in the format described by the <a href="#XMLSchema">
-     * registration data schema</a>.
-     * The specified stream is closed after this method returns.
-     *
-     * @param in the input stream from which to read the XML document.
-     * @return a {@code RegistrationData} object read from the input
-     * stream.
-     *
-     * @throws IllegalArgumentException if the input stream
-     * contains an invalid registration data.
-     *
-     * @throws IOException if an error occurred when reading from the input stream.
-     */
-    public static RegistrationData loadFromXML(InputStream in) throws IOException {
-        try {
-            return RegistrationDocument.load(in);
-        } finally {
-            in.close();
-        }
-    }
-
-    /**
-     * Writes the registration data to the specified output stream
-     * in the format described by the <a href="#XMLSchema">
-     * registration data schema</a> with "UTF-8" encoding.
-     * The specified stream remains open after this method returns.
-     *
-     * @param os the output stream on which to write the XML document.
-     *
-     * @throws IOException if an error occurred when writing to the output stream.
-     */
-    public void storeToXML(OutputStream os) throws IOException {
-        RegistrationDocument.store(os, this);
-        os.flush();
-    }
-
-    /**
-     * Returns a newly allocated byte array containing the registration
-     * data in XML format.
-     *
-     * @return a newly allocated byte array containing the registration
-     * data in XML format.
-     */
-    public byte[] toXML() {
-        try {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            storeToXML(out);
-            return out.toByteArray();
-        } catch (IOException e) {
-            // should not reach here
-            return new byte[0];
-        }
-    }
-
-    /**
-     * Returns a string representation of this registration data in XML
-     * format.
-     *
-     * @return a string representation of this registration data in XML
-     *         format.
-     */
-    @Override
-    public String toString() {
-        try {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            storeToXML(out);
-            return out.toString("UTF-8");
-        } catch (IOException e) {
-            // should not reach here
-            return "Error creating the return string.";
-        }
-    }
-}
+

+/*

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

+ *

+ * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+ *

+ * The contents of this file are subject to the terms of either the GNU

+ * General Public License Version 2 only ("GPL") or the Common Development

+ * and Distribution License("CDDL") (collectively, the "License").  You

+ * may not use this file except in compliance with the License. You can obtain

+ * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html

+ * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific

+ * language governing permissions and limitations under the License.

+ *

+ * When distributing the software, include this License Header Notice in each

+ * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.

+ * Sun designates this particular file as subject to the "Classpath" exception

+ * as provided by Sun in the GPL Version 2 section of the License file that

+ * accompanied this code.  If applicable, add the following below the License

+ * Header, with the fields enclosed by brackets [] replaced by your own

+ * identifying information: "Portions Copyrighted [year]

+ * [name of copyright owner]"

+ *

+ * Contributor(s):

+ *

+ * If you wish your version of this file to be governed by only the CDDL or

+ * only the GPL Version 2, indicate your decision by adding "[Contributor]

+ * elects to include this software in this distribution under the [CDDL or GPL

+ * Version 2] license."  If you don't indicate a single choice of license, a

+ * recipient has the option to distribute your version of this file under

+ * either the CDDL, the GPL Version 2 or to extend the choice of license to

+ * its licensees as provided above.  However, if you add GPL Version 2 code

+ * and therefore, elected the GPL Version 2 license, then the option applies

+ * only if the new code is made subject to such option by the copyright

+ * holder.

+ */

+

+package com.sun.star.servicetag;

+

+import java.io.*;

+import java.net.UnknownHostException;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.HashSet;

+import java.util.LinkedHashMap;

+import java.util.Map;

+import java.util.Set;

+

+import static com.sun.star.servicetag.RegistrationDocument.*;

+

+/**

+ * A {@code RegistrationData} object is a container of one or more 

+ * {@link #getServiceTags service tags} that identify the 

+ * components for product registration.

+ * Each {@code RegistrationData} object has a {@link #getRegistrationURN

+ * uniform resource name} (URN) as its identifier.

+ * <a name="EnvMap"></a>

+ * It also has an <i>environment map</i> with

+ * the following elements:

+ * <blockquote>

+ *       <table border=0>

+ *       <tr>

+ *          <td><tt>hostname</tt></td>

+ *          <td>Hostname of the system</td>

+ *          <td>e.g. woody</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>hostId</tt></td>

+ *          <td>Host ID of the system</td>

+ *          <td>e.g. 83abc1ab</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>osName</tt></td>

+ *          <td>Operating system name</td>

+ *          <td> e.g. SunOS</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>osVersion</tt></td>

+ *          <td>Operating system version</td>

+ *          <td> e.g. 5.10</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>osArchitecture</tt></td>

+ *          <td>Operating system architecture</td>

+ *          <td> e.g. sparc</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>systemModel</tt></td>

+ *          <td>System model</td>

+ *          <td> e.g. SUNW,Sun-Fire-V440</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>systemManufacturer</tt></td>

+ *          <td>System manufacturer</td>

+ *          <td> e.g. Sun Microsystems</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>cpuManufacturer</tt></td>

+ *          <td>CPU manufacturer</td>

+ *          <td> e.g. Sun Microsystems</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>serialNumber</tt></td>

+ *          <td>System serial number</td>

+ *          <td> e.g. BEL078932</td>

+ *       </tr>

+ *       <tr>

+ *          <td><tt>physmem</tt></td>

+ *          <td>Physical memory for the system (in MB)</td>

+ *          <td> e.g. 4096</td>

+ *       </tr>

+ *       </table>

+ *  </blockquote>

+ * The <tt>hostname</tt> and <tt>osName</tt> element must have a non-empty value.

+ * If an element is not available on a system and their value will be

+ * empty.

+ * <p>

+ * <a name="XMLSchema">

+ * <b>Registration XML Schema</b></a>

+ * <p>

+ * A {@code RegistrationData} object can be {@link #loadFromXML loaded} from 

+ * and {@link #storeToXML stored} into an XML file in the format described 

+ * by the

+ * <a href="https://sn-tools.central.sun.com/twiki/pub/ServiceTags/RegistrationRelayService/product_registration.xsd">

+ * registration data schema</a>.  The registration data schema is defined by the 

+ * Service Tags Technology.

+ * <p>

+ * Typically the registration data is constructed at installation time

+ * and stored in an XML file for later service tag lookup or registration.

+ * 

+ * <p>

+ * <b>Example Usage</b>

+ * <p>

+ * The examples below show how the {@code RegistrationData} can be 

+ * used for product registration.

+ * Exception handling is not shown in these examples for clarity.

+ * <ol>

+ * <li>This example shows how the JDK creates a JDK service tag, installs it

+ * in the system service tag registry and adds it to the registration data.

+ * <br>

+ * <blockquote><pre>

+ *   // create a service tag object with an instance_urn

+ *   ServiceTag st = ServiceTag.newInstance(ServiceTag.generateInstanceURN(),

+ *                                          ....);

+ *   // Adds to the system service tag registry if supported

+ *   if (Registry.isSupported()) {

+ *       Registry.getSystemRegistry().addServiceTag(st);

+ *   }

+ * 

+ *   // add to the registration data

+ *   RegistrationData registration  = new RegistrationData();

+ *   registration.addServiceTag(st); 

+ * </pre></blockquote>

+ * </li>

+ * <li>At this point, the registration data is ready to 

+ * send to Sun Connection for registration. This example shows how to register 

+ * the JDK via the <i>Registration Relay Service</i>.

+ * <p>

+ * There are several registration services for Sun Connection. For example,

+ * the <a href="https://sn-tools.central.sun.com/twiki/bin/view/ServiceTags/RegistrationRelayService">

+ * Registration Relay Service</a> is a web application interface that

+ * processes the registration data payload sent via HTTP post

+ * and hosts the registration user interface for a specified 

+ * registration URL.  Refer to the 

+ * Registration Relay Service Specification for details.

+ * <p>

+ * <blockquote><pre>

+ *   // Open the connection to the URL of the registration service

+ *   HttpsURLConnection con = (HttpsURLConnection) url.openConnection();

+ *   con.setDoInput(true);

+ *   con.setDoOutput(true);

+ *   con.setUseCaches(false);

+ *   con.setAllowUserInteraction(false);

+ *   con.setRequestMethod("POST");

+ *   con.setRequestProperty("Content-Type", "text/xml;charset=\"utf-8\"");

+ *   con.connect();

+ *

+ *   // send the registration data to the registration service

+ *   OutputStream out = con.getOutputStream();

+ *   registration.storeToXML(out);

+ *   out.close();

+ * </pre></blockquote>

+ * </li>

+ * <li>This example shows how to store the registration data in an XML file.

+ *     for later service tag lookup or registration.

+ * <br>

+ * <blockquote><pre>

+ *   BufferedOutputStream out = new BufferedOutputStream(

+ *       new FileOutputStream(""&lt;JAVA_HOME&gt;/lib/servicetag/registration.xml"));

+ *   registration.storeToXML(out);

+ *   out.close();

+ * </pre></blockquote>

+ * </li> 

+ * <li>This example shows how to install service tags that are in the 

+ * registration data in the system service tag registry when determined

+ * to be available.  The system service tag registry might not have existed 

+ * when the registration data was constructed.

+ * <br>

+ * <blockquote><pre>

+ *   if (Registry.isSupported()) {

+ *       Set&lt;ServiceTag&gt; svctags = registration.getServiceTags();

+ *       for (ServiceTag st : svctags) {

+ *           Registry.getSystemRegistry().addServiceTag(st);

+ *       }

+ *   }

+ * </pre></blockquote>

+ * </li>

+ * </ol>

+ * 

+ * @see <a href="https://sunconnection.sun.com/inventory">Sun Connection Inventory Channel</a>

+ */

+public class RegistrationData {

+    private final Map<String, String> environment;

+    private final Map<String, String> cpuInfo;

+    private final Map<String, ServiceTag> svcTagMap;

+    private final String urn;

+

+    /**

+     * Creates a {@code RegistrationData} object with a generated

+     * {@link #getRegistrationURN registration URN}.

+     * The following keys in the {@link #getEnvironmentMap environment map}

+     * will be initialized for the configuration of the 

+     * running system:

+     * <blockquote>

+     * <tt>hostname</tt>, <tt>osName</tt>,  <tt>osVersion</tt> and

+     * <tt>osArchitecture</tt>

+     * </blockquote>

+     * and the value of other keys may be empty.

+     */

+    public RegistrationData() {

+        this(Util.generateURN());

+    }

+    

+    // package private

+    RegistrationData(String urn) {

+        this.urn = urn;

+        SystemEnvironment sysEnv = SystemEnvironment.getSystemEnvironment();

+        this.environment = initEnvironment(sysEnv);

+        this.cpuInfo = initCpuInfo(sysEnv);

+        this.svcTagMap = new LinkedHashMap<String, ServiceTag>();

+    }

+    

+    private Map<String, String> initEnvironment(SystemEnvironment sysEnv) {

+        Map<String, String> map = new LinkedHashMap<String, String>();

+        map.put(ST_NODE_HOSTNAME, sysEnv.getHostname());

+        map.put(ST_NODE_HOST_ID, sysEnv.getHostId());

+        map.put(ST_NODE_OS_NAME, sysEnv.getOsName());

+        map.put(ST_NODE_OS_VERSION, sysEnv.getOsVersion());

+        map.put(ST_NODE_OS_ARCH, sysEnv.getOsArchitecture());

+        map.put(ST_NODE_SYSTEM_MODEL, sysEnv.getSystemModel());

+        map.put(ST_NODE_SYSTEM_MANUFACTURER, sysEnv.getSystemManufacturer());

+        map.put(ST_NODE_CPU_MANUFACTURER, sysEnv.getCpuManufacturer());

+        map.put(ST_NODE_SERIAL_NUMBER, sysEnv.getSerialNumber());

+        map.put(ST_NODE_PHYS_MEM, sysEnv.getPhysMem());

+        return map;

+    }  

+

+    private Map<String, String> initCpuInfo(SystemEnvironment sysEnv) {

+        Map<String, String> map = new LinkedHashMap<String, String>();

+        map.put(ST_NODE_SOCKETS, sysEnv.getSockets());

+        map.put(ST_NODE_CORES, sysEnv.getCores());

+        map.put(ST_NODE_VIRT_CPUS, sysEnv.getVirtCpus());

+        map.put(ST_NODE_CPU_NAME, sysEnv.getCpuName());

+        map.put(ST_NODE_CLOCK_RATE, sysEnv.getClockRate());

+        return map;

+    }  

+    

+    /**

+     * Returns the uniform resource name of this registration data

+     * in this format:

+     * <tt>urn:st:&lt;32-char {@link java.util.UUID uuid}&gt;</tt>

+     * 

+     * @return the URN of this registration data.

+     */

+    public String getRegistrationURN() {

+        return urn;

+    }

+

+    /**

+     * Returns a map containing the environment information for this

+     * registration data.  See the set of <a href="#EnvMap">keys</a>

+     * in the environment map. Subsequent update to the environment

+     * map via the {@link #setEnvironment setEnvironment} method will not be reflected

+     * in the returned map.

+     * 

+     * @return an environment map for this registration data. 

+     */

+    public Map<String, String> getEnvironmentMap() {

+        return new LinkedHashMap<String,String>(environment);

+    }

+

+    /**

+     * Returns a map containing the cpu information for this

+     * registration data.  Subsequent update to the cpu info

+     * map via the {@link #setCpuInfo setCpuInfo} method will not be reflected

+     * in the returned map.

+     *

+     * @return a cpu info map for this registration data.

+     */

+    public Map<String, String> getCpuInfoMap() {

+        return new LinkedHashMap<String,String>(cpuInfo);

+    }

+

+    /**

+     * Sets an element of the specified {@code name} in the environment map 

+     * with the given {@code value}.

+     * 

+     * @throws IllegalArgumentException if {@code name} is not a valid key

+     * in the environment map, or {@code value} is not valid.

+     */

+    public void setEnvironment(String name, String value) {    

+        if (name == null) {

+            throw new NullPointerException("name is null");

+        }

+        if (value == null) {

+            throw new NullPointerException("value is null");

+        }

+        if (environment.containsKey(name)) {

+            if (name.equals(ST_NODE_HOSTNAME) || name.equals(ST_NODE_OS_NAME)) {

+                if (value.length() == 0) {

+                    throw new IllegalArgumentException("\"" +

+                        name + "\" requires non-empty value.");

+                }

+            }

+            environment.put(name, value);

+        } else {

+            throw new IllegalArgumentException("\"" +

+                 name + "\" is not an environment element.");

+        }   

+    }

+

+    /**

+     * Sets an element of the specified {@code name} in the cpu info map

+     * with the given {@code value}.

+     *

+     * @throws IllegalArgumentException if {@code name} is not a valid key

+     * in the cpu info map, or {@code value} is not valid.

+     */

+    public void setCpuInfo(String name, String value) {    

+        if (name == null) {

+            throw new NullPointerException("name is null");

+        }

+        if (value == null) {

+            throw new NullPointerException("value is null");

+        }

+        if (cpuInfo.containsKey(name)) {

+            cpuInfo.put(name, value);

+        } else {

+            throw new IllegalArgumentException("\"" +

+                 name + "\" is not an cpuinfo element.");

+        }   

+    }

+

+    /**

+     * Returns all service tags in this registration data.

+     * 

+     * @return  a {@link Set Set} of the service tags

+     * in this registration data.

+     */

+    public Set<ServiceTag> getServiceTags() {

+        return new HashSet<ServiceTag>(svcTagMap.values());

+    }

+

+    /**

+     * Adds a service tag to this registration data. 

+     * If the given service tag has an empty <tt>instance_urn</tt>,

+     * this method will generate a URN and place it in the copy 

+     * of the service tag in this registration data. 

+     * This method will return the {@code ServiceTag} object

+     * added to this registration data.

+     * 

+     * @param st {@code ServiceTag} object to be added.

+     * @return a {@code ServiceTag} object added to this registration data.

+     * 

+     * @throws IllegalArgumentException if 

+     *   a service tag of the same {@link ServiceTag#getInstanceURN 

+     *   <tt>instance_urn</tt>} already exists in the registry.

+     */

+    public synchronized ServiceTag addServiceTag(ServiceTag st) {

+        ServiceTag svcTag = ServiceTag.newInstanceWithUrnTimestamp(st);

+        

+        String instanceURN = svcTag.getInstanceURN();

+        if (svcTagMap.containsKey(instanceURN)) {

+            throw new IllegalArgumentException("Instance_urn = " + instanceURN +

+                    " already exists in the registration data.");

+        } else {

+            svcTagMap.put(instanceURN, svcTag);

+        }

+        return svcTag;

+    }

+

+    /**

+     * Returns a service tag of the given <tt>instance_urn</tt> in this registration

+     * data.

+     *

+     * @param instanceURN the <tt>instance_urn</tt> of the service tag

+     * @return the {@code ServiceTag} object of the given  <tt>instance_urn</tt>

+     *         if exists; otherwise return {@code null}.

+     */

+    public synchronized ServiceTag getServiceTag(String instanceURN) {

+        if (instanceURN == null) {

+            throw new NullPointerException("instanceURN is null");

+        }

+        return svcTagMap.get(instanceURN);

+    }

+

+    /**

+     * Removes a service tag of the given <tt>instance_urn</tt> from this 

+     * registration data.

+     *

+     * @param instanceURN the <tt>instance_urn</tt> of 

+     * the service tag to be removed.

+     *

+     * @return the removed {@code ServiceTag} object;

+     * or {@code null} if the service tag does not exist in this 

+     * registration data.

+     */

+    public synchronized ServiceTag removeServiceTag(String instanceURN) {

+        if (instanceURN == null) {

+            throw new NullPointerException("instanceURN is null");

+        }

+

+        ServiceTag svcTag = null;

+        if (svcTagMap.containsKey(instanceURN)) {

+            svcTag = svcTagMap.remove(instanceURN);

+        }

+        return svcTag;

+    }

+

+     /**

+     * Updates the <tt>product_defined_instance_id</tt> in the service tag 

+     * of the given <tt>instance_urn</tt> in this registration data.

+     * 

+     * @param instanceURN the <tt>instance_urn</tt> of the service tag to be updated.

+     * @param productDefinedInstanceID the value of the

+     * <tt>product_defined_instance_id</tt> to be set.

+     * 

+     * @return the updated {@code ServiceTag} object;

+     * or {@code null} if the service tag does not exist in this 

+     * registration data.

+     */

+    public synchronized ServiceTag updateServiceTag(String instanceURN,

+                                                    String productDefinedInstanceID) {

+        ServiceTag svcTag = getServiceTag(instanceURN);

+        if (svcTag == null) {

+            return null;

+        }

+

+        svcTag = ServiceTag.newInstanceWithUrnTimestamp(svcTag);

+        // update the product defined instance ID field

+        svcTag.setProductDefinedInstanceID(productDefinedInstanceID);

+        svcTagMap.put(instanceURN, svcTag);

+        return svcTag;

+    }

+    

+    /**

+     * Reads the registration data from the XML document on the 

+     * specified input stream.  The XML document must be 

+     * in the format described by the <a href="#XMLSchema">

+     * registration data schema</a>.

+     * The specified stream is closed after this method returns.

+     * 

+     * @param in the input stream from which to read the XML document.

+     * @return a {@code RegistrationData} object read from the input

+     * stream.

+     * 

+     * @throws IllegalArgumentException if the input stream 

+     * contains an invalid registration data.

+     * 

+     * @throws IOException if an error occurred when reading from the input stream.

+     */

+    public static RegistrationData loadFromXML(InputStream in) throws IOException {

+        try {

+            return RegistrationDocument.load(in);

+        } finally {

+            in.close();

+        }

+    }

+    

+    /**

+     * Writes the registration data to the specified output stream 

+     * in the format described by the <a href="#XMLSchema">

+     * registration data schema</a> with "UTF-8" encoding.

+     * The specified stream remains open after this method returns.

+     * 

+     * @param os the output stream on which to write the XML document.

+     * 

+     * @throws IOException if an error occurred when writing to the output stream.

+     */

+    public void storeToXML(OutputStream os) throws IOException {

+        RegistrationDocument.store(os, this);

+        os.flush();

+    }

+

+    /** 

+     * Returns a newly allocated byte array containing the registration

+     * data in XML format.

+     *

+     * @return a newly allocated byte array containing the registration

+     * data in XML format.

+     */

+    public byte[] toXML() {

+        try {

+            ByteArrayOutputStream out = new ByteArrayOutputStream();

+            storeToXML(out);

+            return out.toByteArray();

+        } catch (IOException e) {

+            // should not reach here

+            return new byte[0];

+        }

+    }

+

+    /**

+     * Returns a string representation of this registration data in XML

+     * format.

+     * 

+     * @return a string representation of this registration data in XML

+     *         format.

+     */

+    @Override

+    public String toString() {

+        try {

+            ByteArrayOutputStream out = new ByteArrayOutputStream();

+            storeToXML(out);

+            return out.toString("UTF-8");

+        } catch (IOException e) {

+            // should not reach here

+            return "Error creating the return string.";

+        }

+    }

+}

diff --git a/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java b/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
index 4eb26fe3cfd3..93a1f25a6c2f 100644
--- a/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
+++ b/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
@@ -1,392 +1,440 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: RegistrationDocument.java,v $
- *
- * $Revision: 1.2 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.servicetag;
-
-import java.io.*;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-
-// For write operation
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-/**
- * XML Support Class for Product Registration.
- */
-class RegistrationDocument {
-
-    private static final String REGISTRATION_DATA_SCHEMA =
-            "/com/sun/star/servicetag/resources/product_registration.xsd";
-    private static final String REGISTRATION_DATA_VERSION = "1.0";
-    private static final String SERVICE_TAG_VERSION = "1.0";
-    final static String ST_NODE_REGISTRATION_DATA = "registration_data";
-    final static String ST_ATTR_REGISTRATION_VERSION = "version";
-    final static String ST_NODE_ENVIRONMENT = "environment";
-    final static String ST_NODE_HOSTNAME = "hostname";
-    final static String ST_NODE_HOST_ID = "hostId";
-    final static String ST_NODE_OS_NAME = "osName";
-    final static String ST_NODE_OS_VERSION = "osVersion";
-    final static String ST_NODE_OS_ARCH = "osArchitecture";
-    final static String ST_NODE_SYSTEM_MODEL = "systemModel";
-    final static String ST_NODE_SYSTEM_MANUFACTURER = "systemManufacturer";
-    final static String ST_NODE_CPU_MANUFACTURER = "cpuManufacturer";
-    final static String ST_NODE_SERIAL_NUMBER = "serialNumber";
-    final static String ST_NODE_REGISTRY = "registry";
-    final static String ST_ATTR_REGISTRY_URN = "urn";
-    final static String ST_ATTR_REGISTRY_VERSION = "version";
-    final static String ST_NODE_SERVICE_TAG = "service_tag";
-    final static String ST_NODE_INSTANCE_URN = "instance_urn";
-    final static String ST_NODE_PRODUCT_NAME = "product_name";
-    final static String ST_NODE_PRODUCT_VERSION = "product_version";
-    final static String ST_NODE_PRODUCT_URN = "product_urn";
-    final static String ST_NODE_PRODUCT_PARENT_URN = "product_parent_urn";
-    final static String ST_NODE_PRODUCT_PARENT = "product_parent";
-    final static String ST_NODE_PRODUCT_DEFINED_INST_ID = "product_defined_inst_id";
-    final static String ST_NODE_PRODUCT_VENDOR = "product_vendor";
-    final static String ST_NODE_PLATFORM_ARCH = "platform_arch";
-    final static String ST_NODE_TIMESTAMP = "timestamp";
-    final static String ST_NODE_CONTAINER = "container";
-    final static String ST_NODE_SOURCE = "source";
-    final static String ST_NODE_INSTALLER_UID = "installer_uid";
-
-    static RegistrationData load(InputStream in) throws IOException {
-        Document document = initializeDocument(in);
-
-        // Gets the registration URN
-        Element root = getRegistrationDataRoot(document);
-        Element registryRoot =
-                getSingletonElementFromRoot(root, ST_NODE_REGISTRY);
-        String urn = registryRoot.getAttribute(ST_ATTR_REGISTRY_URN);
-
-        // Construct a new RegistrationData object from the DOM tree
-        // Initialize the environment map and service tags
-        RegistrationData regData = new RegistrationData(urn);
-        addServiceTags(registryRoot, regData);
-
-        Element envRoot = getSingletonElementFromRoot(root, ST_NODE_ENVIRONMENT);
-        buildEnvironmentMap(envRoot, regData);
-        return regData;
-    }
-
-    static void store(OutputStream os, RegistrationData registration)
-            throws IOException {
-        // create a new document with the root node
-        Document document = initializeDocument();
-
-        // create the nodes for the environment map and the service tags
-        // in the registration data
-        addEnvironmentNodes(document,
-                            registration.getEnvironmentMap());
-        addServiceTagRegistry(document,
-                              registration.getRegistrationURN(),
-                              registration.getServiceTags());
-        transform(document, os);
-    }
-
-    // initialize a document from an input stream
-    private static Document initializeDocument(InputStream in) throws IOException {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        try {
-            // XML schema for validation
-
-            // Some Java versions (e.g., 1.5.0_06-b05) fail with a
-            // NullPointerException if SchemaFactory.newInstance is called with
-            // a null context class loader, so work around that here (and the
-            // class loader of this class hopefully is not the null bootstrap
-            // class loader):
-            SchemaFactory sf;
-            ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            if (cl == null) {
-                Thread.currentThread().setContextClassLoader(
-                    RegistrationDocument.class.getClassLoader());
-            }
-            try {
-                sf = SchemaFactory.newInstance(
-                    XMLConstants.W3C_XML_SCHEMA_NS_URI);
-            } finally {
-                Thread.currentThread().setContextClassLoader(cl);
-            }
-
-            URL xsdUrl = RegistrationDocument.class.getResource(REGISTRATION_DATA_SCHEMA);
-            Schema schema = sf.newSchema(xsdUrl);
-            Validator validator = schema.newValidator();
-
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            Document doc = builder.parse(new InputSource(in));
-            validator.validate(new DOMSource(doc));
-            return doc;
-        } catch (SAXException sxe) {
-            IllegalArgumentException e = new IllegalArgumentException("Error generated in parsing");
-            e.initCause(sxe);
-            throw e;
-        } catch (ParserConfigurationException pce) {
-            // Parser with specific options can't be built
-            // should not reach here
-            InternalError x = new InternalError("Error in creating the new document");
-            x.initCause(pce);
-            throw x;
-        }
-    }
-
-    // initialize a new document for the registration data
-    private static Document initializeDocument() throws IOException {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        try {
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            Document doc = builder.newDocument();
-
-            // initialize the document with the registration_data root
-            Element root = doc.createElement(ST_NODE_REGISTRATION_DATA);
-            doc.appendChild(root);
-            root.setAttribute(ST_ATTR_REGISTRATION_VERSION, REGISTRATION_DATA_VERSION);
-
-            return doc;
-        } catch (ParserConfigurationException pce) {
-            // Parser with specified options can't be built
-            // should not reach here
-            InternalError x = new InternalError("Error in creating the new document");
-            x.initCause(pce);
-            throw x;
-        }
-    }
-
-    // Transform the current DOM tree with the given output stream.
-    private static void transform(Document document, OutputStream os) {
-        try {
-            // Use a Transformer for output
-            TransformerFactory tFactory = TransformerFactory.newInstance();
-            tFactory.setAttribute("indent-number", new Integer(3));
-
-            Transformer transformer = tFactory.newTransformer();
-
-            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-            transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-            transformer.setOutputProperty(OutputKeys.STANDALONE, "yes");
-            transformer.transform(new DOMSource(document),
-                new StreamResult(new BufferedWriter(new OutputStreamWriter(os, "UTF-8"))));
-        } catch (UnsupportedEncodingException ue) {
-            // Should not reach here
-            InternalError x = new InternalError("Error generated during transformation");
-            x.initCause(ue);
-            throw x;
-        } catch (TransformerConfigurationException tce) {
-            // Error generated by the parser
-            // Should not reach here
-            InternalError x = new InternalError("Error in creating the new document");
-            x.initCause(tce);
-            throw x;
-        } catch (TransformerException te) {
-            // Error generated by the transformer
-            InternalError x = new InternalError("Error generated during transformation");
-            x.initCause(te);
-            throw x;
-        }
-    }
-
-    private static void addServiceTagRegistry(Document document,
-                                              String registryURN,
-                                              Set<ServiceTag> svcTags) {
-        // add service tag registry node and its attributes
-        Element reg = document.createElement(ST_NODE_REGISTRY);
-        reg.setAttribute(ST_ATTR_REGISTRY_URN, registryURN);
-        reg.setAttribute(ST_ATTR_REGISTRY_VERSION, SERVICE_TAG_VERSION);
-
-        Element root = getRegistrationDataRoot(document);
-        root.appendChild(reg);
-
-        // adds the elements for the service tags
-        for (ServiceTag st : svcTags) {
-            addServiceTagElement(document, reg, st);
-        }
-    }
-
-    private static void addServiceTagElement(Document document,
-                                             Element registryRoot,
-                                             ServiceTag st) {
-        Element svcTag = document.createElement(ST_NODE_SERVICE_TAG);
-        registryRoot.appendChild(svcTag);
-        addChildElement(document, svcTag,
-                        ST_NODE_INSTANCE_URN, st.getInstanceURN());
-        addChildElement(document, svcTag,
-                        ST_NODE_PRODUCT_NAME, st.getProductName());
-        addChildElement(document, svcTag,
-                        ST_NODE_PRODUCT_VERSION, st.getProductVersion());
-        addChildElement(document, svcTag,
-                        ST_NODE_PRODUCT_URN, st.getProductURN());
-        addChildElement(document, svcTag,
-                        ST_NODE_PRODUCT_PARENT_URN, st.getProductParentURN());
-        addChildElement(document, svcTag,
-                        ST_NODE_PRODUCT_PARENT, st.getProductParent());
-        addChildElement(document, svcTag,
-                        ST_NODE_PRODUCT_DEFINED_INST_ID,
-                        st.getProductDefinedInstanceID());
-        addChildElement(document, svcTag,
-                        ST_NODE_PRODUCT_VENDOR, st.getProductVendor());
-        addChildElement(document, svcTag,
-                        ST_NODE_PLATFORM_ARCH, st.getPlatformArch());
-        addChildElement(document, svcTag,
-                        ST_NODE_TIMESTAMP, Util.formatTimestamp(st.getTimestamp()));
-        addChildElement(document, svcTag,
-                        ST_NODE_CONTAINER, st.getContainer());
-        addChildElement(document, svcTag,
-                        ST_NODE_SOURCE, st.getSource());
-        addChildElement(document, svcTag,
-                        ST_NODE_INSTALLER_UID,
-                        String.valueOf(st.getInstallerUID()));
-    }
-
-    private static void addChildElement(Document document, Element root,
-                                        String element, String text) {
-        Element node = document.createElement(element);
-        node.appendChild(document.createTextNode(text));
-        root.appendChild(node);
-    }
-
-    // Constructs service tags from the document
-    private static void addServiceTags(Element registryRoot,
-                                       RegistrationData registration) {
-        NodeList children = registryRoot.getElementsByTagName(ST_NODE_SERVICE_TAG);
-        int length = (children == null ? 0 : children.getLength());
-        for (int i = 0; i < length; i++) {
-            Element svcTagElement = (Element) children.item(i);
-            ServiceTag st = getServiceTag(svcTagElement);
-            registration.addServiceTag(st);
-        }
-    }
-
-    // build environment map from the document
-    private static void buildEnvironmentMap(Element envRoot,
-                                         RegistrationData registration) {
-        registration.setEnvironment(ST_NODE_HOSTNAME, getTextValue(envRoot, ST_NODE_HOSTNAME));
-        registration.setEnvironment(ST_NODE_HOST_ID, getTextValue(envRoot, ST_NODE_HOST_ID));
-        registration.setEnvironment(ST_NODE_OS_NAME, getTextValue(envRoot, ST_NODE_OS_NAME));
-        registration.setEnvironment(ST_NODE_OS_VERSION, getTextValue(envRoot, ST_NODE_OS_VERSION));
-        registration.setEnvironment(ST_NODE_OS_ARCH, getTextValue(envRoot, ST_NODE_OS_ARCH));
-        registration.setEnvironment(ST_NODE_SYSTEM_MODEL, getTextValue(envRoot, ST_NODE_SYSTEM_MODEL));
-        registration.setEnvironment(ST_NODE_SYSTEM_MANUFACTURER, getTextValue(envRoot, ST_NODE_SYSTEM_MANUFACTURER));
-        registration.setEnvironment(ST_NODE_CPU_MANUFACTURER, getTextValue(envRoot, ST_NODE_CPU_MANUFACTURER));
-        registration.setEnvironment(ST_NODE_SERIAL_NUMBER, getTextValue(envRoot, ST_NODE_SERIAL_NUMBER));
-    }
-
-    // add the nodes representing the environment map in the document
-    private static void addEnvironmentNodes(Document document,
-                                            Map<String, String> envMap) {
-        Element root = getRegistrationDataRoot(document);
-        Element env = document.createElement(ST_NODE_ENVIRONMENT);
-        root.appendChild(env);
-        Set<Map.Entry<String, String>> keys = envMap.entrySet();
-        for (Map.Entry<String, String> entry : keys) {
-            addChildElement(document, env, entry.getKey(), entry.getValue());
-        }
-    }
-
-    private static Element getRegistrationDataRoot(Document doc) {
-        Element root = doc.getDocumentElement();
-        if (!root.getNodeName().equals(ST_NODE_REGISTRATION_DATA)) {
-            throw new IllegalArgumentException("Not a " +
-                    ST_NODE_REGISTRATION_DATA +
-                    " node \"" + root.getNodeName() + "\"");
-        }
-        return root;
-    }
-
-    private static Element getSingletonElementFromRoot(Element root, String name) {
-        NodeList children = root.getElementsByTagName(name);
-        int length = (children == null ? 0 : children.getLength());
-        if (length != 1) {
-            throw new IllegalArgumentException("Invalid number of " + name +
-                    " nodes = " + length);
-        }
-        Element e = (Element) children.item(0);
-        if (!e.getNodeName().equals(name)) {
-            throw new IllegalArgumentException("Not a  " + name +
-                    " node \"" + e.getNodeName() + "\"");
-        }
-        return e;
-    }
-
-    // Constructs one ServiceTag instance from a service tag element root
-    private static ServiceTag getServiceTag(Element svcTagElement) {
-        return new ServiceTag(
-            getTextValue(svcTagElement, ST_NODE_INSTANCE_URN),
-            getTextValue(svcTagElement, ST_NODE_PRODUCT_NAME),
-            getTextValue(svcTagElement, ST_NODE_PRODUCT_VERSION),
-            getTextValue(svcTagElement, ST_NODE_PRODUCT_URN),
-            getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT),
-            getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT_URN),
-            getTextValue(svcTagElement, ST_NODE_PRODUCT_DEFINED_INST_ID),
-            getTextValue(svcTagElement, ST_NODE_PRODUCT_VENDOR),
-            getTextValue(svcTagElement, ST_NODE_PLATFORM_ARCH),
-            getTextValue(svcTagElement, ST_NODE_CONTAINER),
-            getTextValue(svcTagElement, ST_NODE_SOURCE),
-            Util.getIntValue(getTextValue(svcTagElement, ST_NODE_INSTALLER_UID)),
-            Util.parseTimestamp(getTextValue(svcTagElement, ST_NODE_TIMESTAMP))
-        );
-    }
-
-    private static String getTextValue(Element e, String tagName) {
-        String value = "";
-        NodeList nl = e.getElementsByTagName(tagName);
-        if (nl != null && nl.getLength() > 0) {
-            Element el = (Element) nl.item(0);
-            Node node = el.getFirstChild();
-            if (node != null) {
-                value = node.getNodeValue();
-            }
-        }
-        return value;
-    }
-}
+

+/*

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

+ *

+ * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+ *

+ * The contents of this file are subject to the terms of either the GNU

+ * General Public License Version 2 only ("GPL") or the Common Development

+ * and Distribution License("CDDL") (collectively, the "License").  You

+ * may not use this file except in compliance with the License. You can obtain

+ * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html

+ * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific

+ * language governing permissions and limitations under the License.

+ *

+ * When distributing the software, include this License Header Notice in each

+ * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.

+ * Sun designates this particular file as subject to the "Classpath" exception

+ * as provided by Sun in the GPL Version 2 section of the License file that

+ * accompanied this code.  If applicable, add the following below the License

+ * Header, with the fields enclosed by brackets [] replaced by your own

+ * identifying information: "Portions Copyrighted [year]

+ * [name of copyright owner]"

+ *

+ * Contributor(s):

+ *

+ * If you wish your version of this file to be governed by only the CDDL or

+ * only the GPL Version 2, indicate your decision by adding "[Contributor]

+ * elects to include this software in this distribution under the [CDDL or GPL

+ * Version 2] license."  If you don't indicate a single choice of license, a

+ * recipient has the option to distribute your version of this file under

+ * either the CDDL, the GPL Version 2 or to extend the choice of license to

+ * its licensees as provided above.  However, if you add GPL Version 2 code

+ * and therefore, elected the GPL Version 2 license, then the option applies

+ * only if the new code is made subject to such option by the copyright

+ * holder.

+ */

+

+package com.sun.star.servicetag;

+

+import java.io.*;

+import java.net.URL;

+import java.util.Collection;

+import java.util.Map;

+import java.util.Set;

+

+import org.w3c.dom.Document;

+import org.w3c.dom.Element;

+import org.w3c.dom.Node;

+import org.w3c.dom.NodeList;

+import org.xml.sax.SAXException;

+import org.xml.sax.InputSource;

+

+import javax.xml.XMLConstants;

+import javax.xml.parsers.DocumentBuilder;

+import javax.xml.parsers.DocumentBuilderFactory;

+

+import javax.xml.parsers.ParserConfigurationException;

+import javax.xml.validation.Schema;

+import javax.xml.validation.SchemaFactory;

+import javax.xml.validation.Validator;

+

+// For write operation

+import javax.xml.transform.OutputKeys;

+import javax.xml.transform.Transformer;

+import javax.xml.transform.TransformerException;

+import javax.xml.transform.TransformerFactory;

+import javax.xml.transform.TransformerConfigurationException;

+import javax.xml.transform.dom.DOMSource;

+import javax.xml.transform.stream.StreamResult;

+

+/**

+ * XML Support Class for Product Registration.

+ */

+class RegistrationDocument {

+

+    private static final String REGISTRATION_DATA_SCHEMA =

+            "/com/sun/star/servicetag/resources/product_registration.xsd";

+    private static final String REGISTRATION_DATA_VERSION = "1.0";

+    private static final String SERVICE_TAG_VERSION = "1.0";

+    final static String ST_NODE_REGISTRATION_DATA = "registration_data";

+    final static String ST_ATTR_REGISTRATION_VERSION = "version";

+    final static String ST_NODE_ENVIRONMENT = "environment";

+    final static String ST_NODE_HOSTNAME = "hostname";

+    final static String ST_NODE_HOST_ID = "hostId";

+    final static String ST_NODE_OS_NAME = "osName";

+    final static String ST_NODE_OS_VERSION = "osVersion";

+    final static String ST_NODE_OS_ARCH = "osArchitecture";

+    final static String ST_NODE_SYSTEM_MODEL = "systemModel";

+    final static String ST_NODE_SYSTEM_MANUFACTURER = "systemManufacturer";

+    final static String ST_NODE_CPU_MANUFACTURER = "cpuManufacturer";

+    final static String ST_NODE_SERIAL_NUMBER = "serialNumber";

+    final static String ST_NODE_PHYS_MEM = "physmem";

+    final static String ST_NODE_CPU_INFO = "cpuinfo";

+    final static String ST_NODE_SOCKETS = "sockets";

+    final static String ST_NODE_CORES = "cores";

+    final static String ST_NODE_VIRT_CPUS = "virtcpus";

+    final static String ST_NODE_CPU_NAME = "name";

+    final static String ST_NODE_CLOCK_RATE = "clockrate";

+    final static String ST_NODE_REGISTRY = "registry";

+    final static String ST_ATTR_REGISTRY_URN = "urn";

+    final static String ST_ATTR_REGISTRY_VERSION = "version";

+    final static String ST_NODE_SERVICE_TAG = "service_tag";

+    final static String ST_NODE_INSTANCE_URN = "instance_urn";

+    final static String ST_NODE_PRODUCT_NAME = "product_name";

+    final static String ST_NODE_PRODUCT_VERSION = "product_version";

+    final static String ST_NODE_PRODUCT_URN = "product_urn";

+    final static String ST_NODE_PRODUCT_PARENT_URN = "product_parent_urn";

+    final static String ST_NODE_PRODUCT_PARENT = "product_parent";

+    final static String ST_NODE_PRODUCT_DEFINED_INST_ID = "product_defined_inst_id";

+    final static String ST_NODE_PRODUCT_VENDOR = "product_vendor";

+    final static String ST_NODE_PLATFORM_ARCH = "platform_arch";

+    final static String ST_NODE_TIMESTAMP = "timestamp";

+    final static String ST_NODE_CONTAINER = "container";

+    final static String ST_NODE_SOURCE = "source";

+    final static String ST_NODE_INSTALLER_UID = "installer_uid";

+

+    static RegistrationData load(InputStream in) throws IOException {

+        Document document = initializeDocument(in);

+        

+        // Gets the registration URN

+        Element root = getRegistrationDataRoot(document);

+        Element registryRoot =

+                getSingletonElementFromRoot(root, ST_NODE_REGISTRY);

+        String urn = registryRoot.getAttribute(ST_ATTR_REGISTRY_URN);

+        

+        // Construct a new RegistrationData object from the DOM tree

+        // Initialize the environment map and service tags

+        RegistrationData regData = new RegistrationData(urn);

+        addServiceTags(registryRoot, regData);

+

+        Element envRoot = getSingletonElementFromRoot(root, ST_NODE_ENVIRONMENT);

+        buildEnvironmentMap(envRoot, regData);

+

+        Element cpuInfo = getSingletonElementFromRoot(envRoot, ST_NODE_CPU_INFO);

+        buildCpuInfoMap(cpuInfo, regData);

+        return regData;

+    }

+

+    static void store(OutputStream os, RegistrationData registration) 

+            throws IOException {

+        // create a new document with the root node

+        Document document = initializeDocument();

+

+        // create the nodes for the environment map and the service tags

+        // in the registration data

+        addEnvironmentNodes(document,

+                            registration.getEnvironmentMap(),

+                            registration.getCpuInfoMap());

+        addServiceTagRegistry(document, 

+                              registration.getRegistrationURN(),

+                              registration.getServiceTags());

+        transform(document, os);

+    }

+

+    // initialize a document from an input stream 

+    private static Document initializeDocument(InputStream in) throws IOException {

+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

+        SchemaFactory sf = null;

+        try {

+            // Some Java versions (e.g., 1.5.0_06-b05) fail with a

+            // NullPointerException if SchemaFactory.newInstance is called with

+            // a null context class loader, so work around that here (and the

+            // class loader of this class hopefully is not the null bootstrap

+            // class loader):

+            ClassLoader cl = Thread.currentThread().getContextClassLoader();

+            if (cl == null) {

+                Thread.currentThread().setContextClassLoader(

+                    RegistrationDocument.class.getClassLoader());

+            }

+            try {

+               sf = SchemaFactory.newInstance(

+                   XMLConstants.W3C_XML_SCHEMA_NS_URI);

+            } finally {

+               Thread.currentThread().setContextClassLoader(cl);

+            }

+

+            Schema schema = null;

+            try {

+                // Even using the workaround above is not enough on some

+                // Java versions. Therefore try to workaround the validation

+                // completely!

+                URL xsdUrl = RegistrationDocument.class.getResource(REGISTRATION_DATA_SCHEMA);

+                schema = sf.newSchema(xsdUrl);

+            }

+        catch (NullPointerException nex) {

+        }

+            

+            Validator validator = null;

+            if (schema != null)

+                validator = schema.newValidator();

+

+            DocumentBuilder builder = factory.newDocumentBuilder();

+            Document doc = builder.parse(new InputSource(in));

+            

+            if (validator != null)

+                validator.validate(new DOMSource(doc));

+            

+            return doc;

+        } catch (SAXException sxe) {

+            IllegalArgumentException e = new IllegalArgumentException("Error generated in parsing");

+            e.initCause(sxe);

+            throw e;

+        } catch (ParserConfigurationException pce) {

+            // Parser with specific options can't be built

+            // should not reach here

+            InternalError x = new InternalError("Error in creating the new document");

+            x.initCause(pce);

+            throw x;

+        }

+    }

+

+    // initialize a new document for the registration data

+    private static Document initializeDocument() throws IOException {

+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

+        try {

+            DocumentBuilder builder = factory.newDocumentBuilder();

+            Document doc = builder.newDocument();

+

+            // initialize the document with the registration_data root

+            Element root = doc.createElement(ST_NODE_REGISTRATION_DATA);

+            doc.appendChild(root);

+            root.setAttribute(ST_ATTR_REGISTRATION_VERSION, REGISTRATION_DATA_VERSION);

+

+            return doc;

+        } catch (ParserConfigurationException pce) {

+            // Parser with specified options can't be built

+            // should not reach here

+            InternalError x = new InternalError("Error in creating the new document");

+            x.initCause(pce);

+            throw x;

+        }

+    }

+

+    // Transform the current DOM tree with the given output stream.

+    private static void transform(Document document, OutputStream os) {

+        try {

+            // Use a Transformer for output

+            TransformerFactory tFactory = TransformerFactory.newInstance();

+            tFactory.setAttribute("indent-number", new Integer(3));

+

+            Transformer transformer = tFactory.newTransformer();

+

+            transformer.setOutputProperty(OutputKeys.INDENT, "yes");

+            transformer.setOutputProperty(OutputKeys.METHOD, "xml");

+            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");

+            transformer.setOutputProperty(OutputKeys.STANDALONE, "yes");

+            transformer.transform(new DOMSource(document),

+                new StreamResult(new BufferedWriter(new OutputStreamWriter(os, "UTF-8"))));

+        } catch (UnsupportedEncodingException ue) {

+            // Should not reach here

+            InternalError x = new InternalError("Error generated during transformation");

+            x.initCause(ue);

+            throw x;

+        } catch (TransformerConfigurationException tce) {

+            // Error generated by the parser

+            // Should not reach here

+            InternalError x = new InternalError("Error in creating the new document");

+            x.initCause(tce);

+            throw x;

+        } catch (TransformerException te) {

+            // Error generated by the transformer

+            InternalError x = new InternalError("Error generated during transformation");

+            x.initCause(te);

+            throw x;

+        }

+    }

+

+    private static void addServiceTagRegistry(Document document, 

+                                              String registryURN,

+                                              Set<ServiceTag> svcTags) {

+        // add service tag registry node and its attributes

+        Element reg = document.createElement(ST_NODE_REGISTRY);

+        reg.setAttribute(ST_ATTR_REGISTRY_URN, registryURN);

+        reg.setAttribute(ST_ATTR_REGISTRY_VERSION, SERVICE_TAG_VERSION);

+        

+        Element root = getRegistrationDataRoot(document);

+        root.appendChild(reg);

+        

+        // adds the elements for the service tags

+        for (ServiceTag st : svcTags) {

+            addServiceTagElement(document, reg, st);

+        }

+    }

+

+    private static void addServiceTagElement(Document document, 

+                                             Element registryRoot,

+                                             ServiceTag st) {

+        Element svcTag = document.createElement(ST_NODE_SERVICE_TAG);

+        registryRoot.appendChild(svcTag);

+        addChildElement(document, svcTag,

+                        ST_NODE_INSTANCE_URN, st.getInstanceURN());

+        addChildElement(document, svcTag,

+                        ST_NODE_PRODUCT_NAME, st.getProductName());

+        addChildElement(document, svcTag,

+                        ST_NODE_PRODUCT_VERSION, st.getProductVersion());

+        addChildElement(document, svcTag,

+                        ST_NODE_PRODUCT_URN, st.getProductURN());

+        addChildElement(document, svcTag,

+                        ST_NODE_PRODUCT_PARENT_URN, st.getProductParentURN());

+        addChildElement(document, svcTag,

+                        ST_NODE_PRODUCT_PARENT, st.getProductParent());

+        addChildElement(document, svcTag,

+                        ST_NODE_PRODUCT_DEFINED_INST_ID,

+                        st.getProductDefinedInstanceID());

+        addChildElement(document, svcTag,

+                        ST_NODE_PRODUCT_VENDOR, st.getProductVendor());

+        addChildElement(document, svcTag,

+                        ST_NODE_PLATFORM_ARCH, st.getPlatformArch());

+        addChildElement(document, svcTag,

+                        ST_NODE_TIMESTAMP, Util.formatTimestamp(st.getTimestamp()));

+        addChildElement(document, svcTag,

+                        ST_NODE_CONTAINER, st.getContainer());

+        addChildElement(document, svcTag,

+                        ST_NODE_SOURCE, st.getSource());

+        addChildElement(document, svcTag,

+                        ST_NODE_INSTALLER_UID,

+                        String.valueOf(st.getInstallerUID()));

+    }

+

+    private static void addChildElement(Document document, Element root,

+                                        String element, String text) {

+        Element node = document.createElement(element);

+        node.appendChild(document.createTextNode(text));

+        root.appendChild(node);

+    }

+

+    // Constructs service tags from the document

+    private static void addServiceTags(Element registryRoot,

+                                       RegistrationData registration) {

+        NodeList children = registryRoot.getElementsByTagName(ST_NODE_SERVICE_TAG);

+        int length = (children == null ? 0 : children.getLength());

+        for (int i = 0; i < length; i++) {

+            Element svcTagElement = (Element) children.item(i);

+            ServiceTag st = getServiceTag(svcTagElement);

+            registration.addServiceTag(st);

+        }

+    }

+

+    // build environment map from the document

+    private static void buildEnvironmentMap(Element envRoot, 

+                                         RegistrationData registration) {

+        registration.setEnvironment(ST_NODE_HOSTNAME, getTextValue(envRoot, ST_NODE_HOSTNAME));

+        registration.setEnvironment(ST_NODE_HOST_ID, getTextValue(envRoot, ST_NODE_HOST_ID));

+        registration.setEnvironment(ST_NODE_OS_NAME, getTextValue(envRoot, ST_NODE_OS_NAME));

+        registration.setEnvironment(ST_NODE_OS_VERSION, getTextValue(envRoot, ST_NODE_OS_VERSION));

+        registration.setEnvironment(ST_NODE_OS_ARCH, getTextValue(envRoot, ST_NODE_OS_ARCH));

+        registration.setEnvironment(ST_NODE_SYSTEM_MODEL, getTextValue(envRoot, ST_NODE_SYSTEM_MODEL));

+        registration.setEnvironment(ST_NODE_SYSTEM_MANUFACTURER, getTextValue(envRoot, ST_NODE_SYSTEM_MANUFACTURER));

+        registration.setEnvironment(ST_NODE_CPU_MANUFACTURER, getTextValue(envRoot, ST_NODE_CPU_MANUFACTURER));

+        registration.setEnvironment(ST_NODE_SERIAL_NUMBER, getTextValue(envRoot, ST_NODE_SERIAL_NUMBER));

+        registration.setEnvironment(ST_NODE_PHYS_MEM, getTextValue(envRoot, ST_NODE_PHYS_MEM));

+    }

+

+    private static void buildCpuInfoMap(Element cpuInfoRoot, 

+                                         RegistrationData registration) {

+        registration.setCpuInfo(ST_NODE_SOCKETS, getTextValue(cpuInfoRoot, ST_NODE_SOCKETS));

+        registration.setCpuInfo(ST_NODE_CORES, getTextValue(cpuInfoRoot, ST_NODE_CORES));

+        registration.setCpuInfo(ST_NODE_VIRT_CPUS, getTextValue(cpuInfoRoot, ST_NODE_VIRT_CPUS));

+        registration.setCpuInfo(ST_NODE_CPU_NAME, getTextValue(cpuInfoRoot, ST_NODE_CPU_NAME));

+        registration.setCpuInfo(ST_NODE_CLOCK_RATE, getTextValue(cpuInfoRoot, ST_NODE_CLOCK_RATE));

+    }

+

+    // add the nodes representing the environment map in the document

+    private static void addEnvironmentNodes(Document document,

+                                            Map<String, String> envMap,

+                                            Map<String, String> cpuInfoMap) {

+        Element root = getRegistrationDataRoot(document);

+

+        Element env = document.createElement(ST_NODE_ENVIRONMENT);

+        root.appendChild(env);

+        Set<Map.Entry<String, String>> keys = envMap.entrySet();

+        for (Map.Entry<String, String> entry : keys) {

+            addChildElement(document, env, entry.getKey(), entry.getValue());

+        }

+

+        Element cpuInfo = document.createElement(ST_NODE_CPU_INFO);

+        env.appendChild(cpuInfo);

+        keys = cpuInfoMap.entrySet();

+        for (Map.Entry<String, String> entry : keys) {

+            addChildElement(document, cpuInfo, entry.getKey(), entry.getValue());

+        }

+    }

+

+    private static Element getRegistrationDataRoot(Document doc) {

+        Element root = doc.getDocumentElement();

+        if (!root.getNodeName().equals(ST_NODE_REGISTRATION_DATA)) {

+            throw new IllegalArgumentException("Not a " + 

+                    ST_NODE_REGISTRATION_DATA +

+                    " node \"" + root.getNodeName() + "\"");

+        }

+        return root;

+    }

+

+    private static Element getSingletonElementFromRoot(Element root, String name) {

+        NodeList children = root.getElementsByTagName(name);

+        int length = (children == null ? 0 : children.getLength());

+        if (length != 1) {

+            throw new IllegalArgumentException("Invalid number of " + name +

+                    " nodes = " + length);

+        }

+        Element e = (Element) children.item(0);

+        if (!e.getNodeName().equals(name)) {

+            throw new IllegalArgumentException("Not a  " + name +

+                    " node \"" + e.getNodeName() + "\"");

+        }

+        return e;

+    }

+

+    // Constructs one ServiceTag instance from a service tag element root

+    private static ServiceTag getServiceTag(Element svcTagElement) {

+        return new ServiceTag(

+            getTextValue(svcTagElement, ST_NODE_INSTANCE_URN),

+            getTextValue(svcTagElement, ST_NODE_PRODUCT_NAME),

+            getTextValue(svcTagElement, ST_NODE_PRODUCT_VERSION),

+            getTextValue(svcTagElement, ST_NODE_PRODUCT_URN),

+            getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT),

+            getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT_URN),

+            getTextValue(svcTagElement, ST_NODE_PRODUCT_DEFINED_INST_ID),

+            getTextValue(svcTagElement, ST_NODE_PRODUCT_VENDOR),

+            getTextValue(svcTagElement, ST_NODE_PLATFORM_ARCH),

+            getTextValue(svcTagElement, ST_NODE_CONTAINER),

+            getTextValue(svcTagElement, ST_NODE_SOURCE),   

+            Util.getIntValue(getTextValue(svcTagElement, ST_NODE_INSTALLER_UID)),

+            Util.parseTimestamp(getTextValue(svcTagElement, ST_NODE_TIMESTAMP))

+        );

+    }

+

+    private static String getTextValue(Element e, String tagName) {

+        String value = "";

+        NodeList nl = e.getElementsByTagName(tagName);

+        if (nl != null && nl.getLength() > 0) {

+            Element el = (Element) nl.item(0);

+            Node node = el.getFirstChild();

+            if (node != null) {

+                value = node.getNodeValue();

+            }

+        }

+        return value;

+    }

+}

diff --git a/desktop/source/registration/com/sun/star/servicetag/Registry.java b/desktop/source/registration/com/sun/star/servicetag/Registry.java
index c118dc2e2575..81e4ed41142d 100644
--- a/desktop/source/registration/com/sun/star/servicetag/Registry.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Registry.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Registry.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java b/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java
index 4b2be9ff8cc2..73e83b172008 100644
--- a/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java
+++ b/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ServiceTag.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java b/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java
index 245b993b086e..8d38e70f8b7e 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SolarisServiceTag.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
index 1ce5f5697bcb..684b8224d2af 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SolarisSystemEnvironment.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -40,17 +39,180 @@ package com.sun.star.servicetag;
 // (e.g. NetBeans and SunStudio) will use the version in JDK.
 
 import java.io.*;
+import java.util.Set;
+import java.util.HashSet;
 
 /**
  * Solaris implementation of the SystemEnvironment class.
  */
 class SolarisSystemEnvironment extends SystemEnvironment {
+    private static final int SN  = 1;
+    private static final int SYS = 2;
+    private static final int CPU = 3;
+    private static final int MODEL = 4;
+    private String kstatCpuInfo = null;
+
     SolarisSystemEnvironment() {
         setHostId(getCommandOutput("/usr/bin/hostid"));
-        setSystemModel(getCommandOutput("/usr/bin/uname", "-i"));
+        setSystemModel(getSolarisModel());
         setSystemManufacturer(getSolarisSystemManufacturer());
         setCpuManufacturer(getSolarisCpuManufacturer());
         setSerialNumber(getSolarisSN());
+        setPhysMem(getSolarisPhysMem());
+        setSockets(getSolarisSockets());
+        setCores(getSolarisCores());
+        setVirtCpus(getSolarisVirtCpus());
+        setCpuName(getSolarisCpuName());
+        setClockRate(getSolarisClockRate());
+    }
+
+    private String getSolarisClockRate() {
+        String data = getSolarisKstatCpuInfo();
+
+        String lines[] = data.split("\n");
+        String token = "clock_MHz";
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i].trim();
+            if (line.startsWith(token)) {
+                return line.substring(line.indexOf(token) + token.length()).trim();
+            }
+        }
+        return "";
+    }
+
+    private String getSolarisCpuName() {
+        String data = getSolarisKstatCpuInfo();
+
+        String lines[] = data.split("\n");
+        String token = "brand";
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i].trim();
+            if (line.startsWith(token)) {
+                return line.substring(line.indexOf(token) + token.length()).trim();
+            }
+        }
+        return "";
+    }
+
+    private String getSolarisVirtCpus() {
+        String data = getSolarisKstatCpuInfo();
+
+        int cnt = 0;
+        String lines[] = data.split("\n");
+        String token = " cpu_info ";
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i].trim();
+            if (line.indexOf(token) != -1) {
+                cnt++;
+            }
+        }
+        return "" + cnt;
+    }
+
+    private String getSolarisCores() {
+        String data = getSolarisKstatCpuInfo();
+
+        Set<String> set = new HashSet<String>();
+        String lines[] = data.split("\n");
+        String coreIdToken = "core_id";
+        String coreId = "";
+        String chipIdToken = "chip_id";
+        String chipId = "";
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i].trim();
+            if (line.startsWith(chipIdToken)) {
+                chipId = line.substring(line.indexOf(chipIdToken) + chipIdToken.length()).trim();
+            }
+            if (line.startsWith(coreIdToken)) {
+                coreId = line.substring(line.indexOf(coreIdToken) + coreIdToken.length()).trim();
+                set.add(chipId + "," + coreId);
+            }
+        }
+        return "" + set.size();
+    }
+
+    private String getSolarisPhysMem() {
+        String data = getCommandOutput("/usr/sbin/prtconf");
+
+        int cnt = 0;
+        String lines[] = data.split("\n");
+        String token = "Memory size:";
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i].trim();
+            if (line.startsWith(token)) {
+                line = line.substring(line.indexOf(token) + token.length()).trim();
+                if (line.indexOf(" ") != -1) {
+                    return line.substring(0, line.indexOf(" ")).trim();
+                }
+            }
+        }
+        return "";
+    }
+
+    private String getSolarisSockets() {
+        String data = getSolarisKstatCpuInfo();
+
+        Set<String> set = new HashSet<String>();
+        String lines[] = data.split("\n");
+        String token = "chip_id";
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i].trim();
+            if (line.startsWith(token)) {
+                String id = line.substring(line.indexOf(token) + token.length()).trim();
+                set.add(id);
+            }
+        }
+        return "" + set.size();
+    }
+
+    private synchronized String getSolarisKstatCpuInfo() {
+        // only try to get kstat cpu_info information once, after that, we can
+        // reuse the output
+        if (kstatCpuInfo == null) {
+            Thread thread = new Thread() {
+                public void run() {
+                    kstatCpuInfo = getCommandOutput("/usr/bin/kstat", "cpu_info");
+                }
+            };
+            thread.start();
+
+            try {
+                thread.join(2000);
+                if (thread.isAlive()) {
+                    thread.interrupt();
+                    kstatCpuInfo = "";
+                }
+            } catch (InterruptedException ie) {
+                thread.interrupt();
+            }
+        }
+        return kstatCpuInfo;
+    }
+
+    private String getSolarisModel() {
+        String tmp = getFileContent("/var/run/psn");
+        if (tmp.length() > 0) {
+            String[] lines = tmp.split("\n");
+            if (MODEL <= lines.length) {
+                return lines[MODEL-1] + "::"
+                    + getCommandOutput("/usr/bin/uname", "-v");
+            }
+        }
+
+        if ("sparc".equalsIgnoreCase(System.getProperty("os.arch"))) {
+            return getCommandOutput("/usr/bin/uname", "-i") + "::"
+                + getCommandOutput("/usr/bin/uname", "-v");
+        } else {
+            String model = getSmbiosData("1", "Product: ");
+            if (model == null || model.trim().equals("")) {
+                model = getCommandOutput("/usr/bin/uname", "-i");
+            }
+            if (model == null) {
+                model = "";
+            }
+            return model.trim() + "::"
+                + getCommandOutput("/usr/bin/uname", "-v");
+        }
     }
 
     /**
@@ -58,13 +220,21 @@ class SolarisSystemEnvironment extends SystemEnvironment {
      * @return The cpu manufacturer (an empty string if not found or an error occurred)
      */
     private String getSolarisCpuManufacturer() {
+        String tmp = getFileContent("/var/run/psn");
+        if (tmp.length() > 0) {
+            String[] lines = tmp.split("\n");
+            if (CPU <= lines.length) {
+                return lines[CPU-1];
+            }
+        }
+
         // not fully accurate, this could be another manufacturer (fujitsu for example)
         if ("sparc".equalsIgnoreCase(System.getProperty("os.arch"))) {
             return "Sun Microsystems, Inc";
         }
 
-        // if we're here, then we'll try smbios (type 3)
-        return getSmbiosData("3", "Manufacturer: ");
+        // if we're here, then we'll try smbios (type 4)
+        return getSmbiosData("4", "Manufacturer: ");
     }
 
     /**
@@ -72,8 +242,19 @@ class SolarisSystemEnvironment extends SystemEnvironment {
      * @return The system manufacturer (an empty string if not found or an error occurred)
      */
     private String getSolarisSystemManufacturer() {
+        String tmp = getFileContent("/var/run/psn");
+        if (tmp.length() > 0) {
+            String[] lines = tmp.split("\n");
+            if (SYS <= lines.length) {
+                return lines[SYS-1];
+            }
+        }
+
         // not fully accurate, this could be another manufacturer (fujitsu for example)
         if ("sparc".equalsIgnoreCase(System.getProperty("os.arch"))) {
+            if (getCommandOutput("/usr/bin/uname", "-m").equals("sun4us")) {
+                return "Fujitsu";
+            }
             return "Sun Microsystems, Inc";
         }
 
@@ -89,7 +270,10 @@ class SolarisSystemEnvironment extends SystemEnvironment {
         // try to read from the psn file if it exists
         String tmp = getFileContent("/var/run/psn");
         if (tmp.length() > 0) {
-            return tmp.trim();
+            String[] lines = tmp.split("\n");
+            if (SN <= lines.length) {
+                return lines[SN-1];
+            }
         }
 
         // if we're here, then we'll try sneep
@@ -110,6 +294,17 @@ class SolarisSystemEnvironment extends SystemEnvironment {
             return tmpSN;
         }
 
+        if ("sparc".equalsIgnoreCase(System.getProperty("os.arch"))) {
+            tmpSN = getSNViaPrtfruX();
+            if (tmpSN.length() > 0) {
+                return tmpSN;
+            }
+            tmpSN = getSNViaPrtfru();
+            if (tmpSN.length() > 0) {
+                return tmpSN;
+            }
+        }
+
         // give up and return
         return "";
     }
@@ -156,4 +351,74 @@ class SolarisSystemEnvironment extends SystemEnvironment {
         }
     }
 
+    private String getSNViaPrtfruX() {
+        String data = getCommandOutput("/usr/sbin/prtfru", "-x");
+
+        boolean FRUTREE_FLAG = false;
+        boolean FRUNAME_FLAG = false;
+        boolean MB_LABEL_FLAG = false;
+        boolean SYSTEM_BOARD_FLAG = false;
+
+        String lines[] = data.split("\n");
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i];
+            if (SYSTEM_BOARD_FLAG) {
+                String tok = "<Sun_Serial_No value=\"";
+                int index = line.indexOf(tok);
+                if (index != -1) {
+                    String val = line.substring(index+tok.length());
+                    String vals[] = val.split("\"");
+                    if (vals.length > 0) {
+                        return vals[0].trim();
+                    }
+                    break;
+                }
+            }
+
+            if (line.indexOf("</ContainerData>") != -1) {
+                FRUTREE_FLAG = false;
+                FRUNAME_FLAG = false;
+                SYSTEM_BOARD_FLAG = false;
+            }
+
+            if (FRUNAME_FLAG && line.indexOf("<Container name=\"system-board\">") != -1 ) {
+                SYSTEM_BOARD_FLAG = true;
+            }
+
+            if (FRUTREE_FLAG && line.indexOf("<Fru name=\"chassis\">") != -1 ) {
+                FRUNAME_FLAG = true;
+            }
+
+            if (line.indexOf("<Location name=\"frutree\">") != -1) {
+                FRUTREE_FLAG = true;
+            }
+        }
+
+        return "";
+    }
+
+    private String getSNViaPrtfru() {
+        String data = getCommandOutput("/usr/sbin/prtfru");
+        boolean CHASSIS_FLAG = false;
+
+        String lines[] = data.split("\n");
+        for (int i=0; i<lines.length; i++) {
+            String line = lines[i];
+            if (CHASSIS_FLAG) {
+                String tok = "/ManR/Sun_Serial_No:";
+                int index = line.indexOf(tok);
+                if (index != -1) {
+                    String val = line.substring(index+tok.length());
+                    return val.trim();
+                }
+            }
+
+            if (line.indexOf("/frutree/chassis/system-board (container)") != -1) {
+                CHASSIS_FLAG = true;
+            } else if (line.indexOf("/frutree/chassis/MB?Label=MB/system-board (container)") != -1) {
+                CHASSIS_FLAG = true;
+            }
+        }
+        return "";
+    }
 }
diff --git a/desktop/source/registration/com/sun/star/servicetag/SunConnection.java b/desktop/source/registration/com/sun/star/servicetag/SunConnection.java
index 4a3d2ee9722f..417489410148 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SunConnection.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SunConnection.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SunConnection.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java b/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
index d50104e827ed..0af25ec35d58 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SysnetRegistryHelper.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
index e5b9e0e3b4fe..4628034723e1 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SystemEnvironment.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -57,6 +56,12 @@ public class SystemEnvironment {
     private String systemManufacturer;
     private String cpuManufacturer;
     private String serialNumber;
+    private String physmem;
+    private String sockets;
+    private String cores;
+    private String virtcpus;
+    private String cpuname;
+    private String clockrate;
     private static SystemEnvironment sysEnv = null;
 
     public static synchronized SystemEnvironment getSystemEnvironment() {
@@ -90,6 +95,12 @@ public class SystemEnvironment {
         this.systemManufacturer = "";
         this.cpuManufacturer = "";
         this.serialNumber = "";
+        this.physmem = "";
+        this.sockets = "";
+        this.cores = "";
+        this.virtcpus = "";
+        this.cpuname = "";
+        this.clockrate = "";
     }
 
 
@@ -158,6 +169,56 @@ public class SystemEnvironment {
     }
 
     /**
+     * Sets the physmem
+     * @param physmem The physmem to set.
+     */
+    public void setPhysMem(String physmem) {
+        this.physmem = physmem;
+    }
+
+    /**
+     * Sets the sockets
+     * @param sockets The sockets to set.
+     */
+    public void setSockets(String sockets) {
+        this.sockets = sockets;
+    }
+
+    /**
+     * Sets the cores
+     * @param cores The cores to set.
+     */
+    public void setCores(String cores) {
+        this.cores = cores;
+    }
+
+    /**
+     * Sets the virtcpus
+     * @param virtcpus The virtcpus to set.
+     */
+    public void setVirtCpus(String virtcpus) {
+        this.virtcpus = virtcpus;
+    }
+
+    /**
+     * Sets the cpuname
+     * @param cpuname The cpuname to set.
+     */
+    public void setCpuName(String cpuname) {
+        this.cpuname = cpuname;
+    }
+
+    /**
+     * Sets the clockrate
+     * @param clockrate The clockrate to set.
+     */
+    public void setClockRate(String clockrate) {
+        Float f = Float.parseFloat(clockrate);
+        Integer nClockrate = f.intValue();
+        this.clockrate = nClockrate.toString();
+    }
+
+    /**
      * Sets the hostid.  Truncates to a max length of 16 chars.
      * @param hostId The hostid to set.
      */
@@ -227,6 +288,30 @@ public class SystemEnvironment {
         return serialNumber;
     }
 
+    public String getPhysMem() {
+        return physmem;
+    }
+
+    public String getSockets() {
+        return sockets;
+    }
+
+    public String getCores() {
+        return cores;
+    }
+
+    public String getVirtCpus() {
+        return virtcpus;
+    }
+
+    public String getCpuName() {
+        return cpuname;
+    }
+
+    public String getClockRate() {
+        return clockrate;
+    }
+
     /**
      * Returns the hostId.
      * @return The hostId.
diff --git a/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java b/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java
index 785cb35777ae..fe2762fc560b 100644
--- a/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java
+++ b/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UnauthorizedAccessException.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/servicetag/Util.java b/desktop/source/registration/com/sun/star/servicetag/Util.java
index 55fa097297e6..3e9ad224ba97 100644
--- a/desktop/source/registration/com/sun/star/servicetag/Util.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Util.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Util.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -40,7 +39,7 @@ import java.util.UUID;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-// Utility class for com.sun.star.servicetag package
+// Utility class for com.sun.servicetag package
 class Util {
     private static boolean verbose = (System.getProperty("servicetag.verbose") != null);
     private static String jrepath = null;
diff --git a/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
index cdc374f4a993..6d78357074fb 100644
--- a/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
@@ -6,9 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WindowsSystemEnvironment.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,7 +32,7 @@ package com.sun.star.servicetag;
 
 // The Service Tags team maintains the latest version of the implementation
 // for system environment data collection.  JDK will include a copy of
-// the most recent released version for a JDK release.  We rename
+// the most recent released version for a JDK release.        We rename
 // the package to com.sun.servicetag so that the Sun Connection
 // product always uses the latest version from the com.sun.scn.servicetags
 // package. JDK and users of the com.sun.servicetag API
@@ -42,6 +41,8 @@ package com.sun.star.servicetag;
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Windows implementation of the SystemEnvironment class.
@@ -71,6 +72,13 @@ class WindowsSystemEnvironment extends SystemEnvironment {
         }
         setCpuManufacturer(cpuMfr);
 
+        setSockets(getWindowsSockets());
+        setCores(getWindowsCores());
+        setVirtCpus(getWindowsVirtCpus());
+        setPhysMem(getWindowsPhysMem());
+        setCpuName(getWmicResult("cpu", "get", "Name"));
+        setClockRate(getWmicResult("cpu", "get", "MaxClockSpeed"));
+
         // try to remove the temp file that gets created from running wmic cmds
         try {
             // look in the current working directory
@@ -83,6 +91,44 @@ class WindowsSystemEnvironment extends SystemEnvironment {
         }
     }
 
+    private String getWindowsVirtCpus() {
+        String res = getWmicResult("cpu", "get", "NumberOfLogicalProcessors");
+        if (res == null || res.equals("")) {
+            res = "1";
+        }
+        return res;
+    }
+
+    private String getWindowsCores() {
+        String res = getWmicResult("cpu", "get", "NumberOfCores");
+        if (res == null || res.equals("")) {
+            res = "1";
+        }
+        return res;
+    }
+
+    private String getWindowsSockets() {
+        String res = getFullWmicResult("cpu", "get", "DeviceID");
+        Set<String> set = new HashSet<String>();
+        for (String line : res.split("\n")) {
+            line = line.trim();
+            if (line.equals("")) {
+                continue;
+            }
+            set.add(line);
+        }
+        if (set.size() == 0) {
+            return "1";
+        }
+        return "" + set.size();
+    }
+
+    private String getWindowsPhysMem() {
+        String mem = getWmicResult("computersystem", "get", "TotalPhysicalMemory");
+        long l = Long.parseLong(mem);
+        return "" + ((long) (l / (1024*1024)));
+    }
+
 
     /**
      * This method invokes wmic outside of the normal environment
@@ -142,4 +188,48 @@ class WindowsSystemEnvironment extends SystemEnvironment {
         }
         return res.trim();
     }
+
+    private String getFullWmicResult(String alias, String verb, String property) {
+        String res = "";
+        BufferedReader in = null;
+        try {
+            ProcessBuilder pb = new ProcessBuilder("cmd", "/C", "WMIC", alias, verb, property);
+            Process p = pb.start();
+            // need this for executing windows commands (at least
+            // needed for executing wmic command)
+            BufferedWriter bw = new BufferedWriter(
+                new OutputStreamWriter(p.getOutputStream()));
+            bw.write(13);
+            bw.flush();
+            bw.close();
+
+            p.waitFor();
+            if (p.exitValue() == 0) {
+                in = new BufferedReader(new InputStreamReader(p.getInputStream()));
+                String line = null;
+                while ((line = in.readLine()) != null) {
+                    line = line.trim();
+                    if (line.length() == 0) {
+                        continue;
+                    }
+                    if (line.toLowerCase().indexOf(property.toLowerCase()) != -1) {
+                        continue;
+                    }
+                    res += line + "\n";
+                }
+            }
+
+        } catch (Exception e) {
+            // ignore the exception
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    // ignore
+                }
+            }
+        }
+        return res;
+    }
 }
diff --git a/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd b/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd
index e9b34417d9ae..bb48ba90844d 100644
--- a/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd
+++ b/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd
@@ -1,301 +1,366 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-<xs:element name="registration_data">
-  <xs:complexType>
-    <xs:sequence>
-      <xs:element name="environment"
-                  minOccurs="1"
-                  maxOccurs="1">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element ref="hostname"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="hostId"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="osName"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="osVersion"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="osArchitecture"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="systemModel"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="systemManufacturer"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="cpuManufacturer"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-            <xs:element ref="serialNumber"
-                        minOccurs='1'
-                        maxOccurs='1'/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="registry"
-                  minOccurs="1"
-                  maxOccurs="1">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="service_tag"
-                        minOccurs="0"
-                        maxOccurs="1024">
-              <xs:complexType>
-                <xs:sequence>
-                  <xs:element ref="instance_urn"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="product_name"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="product_version"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="product_urn"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="product_parent_urn"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="product_parent"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="product_defined_inst_id"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="product_vendor"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="platform_arch"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="timestamp"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="container"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="source"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                  <xs:element ref="installer_uid"
-                              minOccurs='1'
-                              maxOccurs='1'/>
-                </xs:sequence>
-              </xs:complexType>
-            </xs:element>
-          </xs:sequence>
-          <xs:attribute name="urn"
-                        type="xs:string"
-                        use="required"/>
-          <xs:attribute name="version"
-                        type="xs:string"
-                        use="required"/>
-        </xs:complexType>
-      </xs:element>
-    </xs:sequence>
-    <xs:attribute name="version"
-                  type="xs:string"
-                  use="required"/>
-  </xs:complexType>
-</xs:element>
-
-  <!-- definition of simple elements -->
-  <xs:element name="hostname">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="1"/>
-        <xs:maxLength value="255"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="hostId">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="16"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="osName">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="1"/>
-        <xs:maxLength value="256"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="osVersion">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="50"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="osArchitecture">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="256"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="systemModel">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="50"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="systemManufacturer">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="50"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="cpuManufacturer">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="50"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="serialNumber">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="256"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="instance_urn">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="1"/>
-        <xs:maxLength value="255"/>
-      </xs:restriction>
-    </xs:simpleType>
-   </xs:element>
-
-  <xs:element name="product_name">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:maxLength value="255"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="product_version">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:maxLength value="63"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="product_urn">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="1"/>
-        <xs:maxLength value="255"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="product_parent_urn">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="0"/>
-        <xs:maxLength value="255"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="product_parent">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="1"/>
-        <xs:maxLength value="255"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="product_defined_inst_id">
-      <xs:simpleType>
-          <xs:restriction base="xs:string">
-              <xs:minLength value="0"/>
-              <xs:maxLength value="255"/>
-          </xs:restriction>
-      </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="product_vendor">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="1"/>
-        <xs:maxLength value="63"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="platform_arch">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="1"/>
-        <xs:maxLength value="63"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="timestamp">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:maxLength value="24"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-  <xs:element name="container">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:maxLength value="63"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element> 
-
-  <xs:element name="source">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:maxLength value="63"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element> 
-
-  <xs:element name="installer_uid">
-    <xs:simpleType>
-      <xs:restriction base="xs:integer">
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>

+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">

+

+<xs:element name="registration_data">

+  <xs:complexType>

+    <xs:sequence>

+      <xs:element name="environment"

+                  minOccurs="1"

+                  maxOccurs="1">

+        <xs:complexType>

+          <xs:sequence>

+            <xs:element ref="hostname"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="hostId"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="osName"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="osVersion"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="osArchitecture"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="systemModel"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="systemManufacturer"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="cpuManufacturer"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="serialNumber"

+                        minOccurs='1'

+                        maxOccurs='1'/>

+            <xs:element ref="physmem"

+                        minOccurs='0'

+                        maxOccurs='1'/>

+            <xs:element name="cpuinfo"

+                        minOccurs='0'

+                        maxOccurs='1'>

+              <xs:complexType>

+                <xs:sequence>

+                  <xs:element ref="sockets"

+                              minOccurs='0'

+                              maxOccurs='1'/>

+                  <xs:element ref="cores"

+                              minOccurs='0'

+                              maxOccurs='1'/>

+                  <xs:element ref="virtcpus"

+                              minOccurs='0'

+                              maxOccurs='1'/>

+                  <xs:element ref="name"

+                              minOccurs='0'

+                              maxOccurs='1'/>

+                  <xs:element ref="clockrate"

+                              minOccurs='0'

+                              maxOccurs='1'/>

+                </xs:sequence>

+              </xs:complexType>

+            </xs:element>

+          </xs:sequence>

+        </xs:complexType>

+      </xs:element>

+      <xs:element name="registry"

+                  minOccurs="1"

+                  maxOccurs="1">

+        <xs:complexType>

+          <xs:sequence>

+            <xs:element name="service_tag"

+                        minOccurs="0"

+                        maxOccurs="1024">

+              <xs:complexType>

+                <xs:sequence>

+                  <xs:element ref="instance_urn"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="product_name"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="product_version"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="product_urn"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="product_parent_urn"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="product_parent"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="product_defined_inst_id"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="product_vendor"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="platform_arch"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="timestamp"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="container"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="source"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                  <xs:element ref="installer_uid"

+                              minOccurs='1'

+                              maxOccurs='1'/>

+                </xs:sequence>

+              </xs:complexType>

+            </xs:element>

+          </xs:sequence>

+          <xs:attribute name="urn"

+                        type="xs:string"

+                        use="required"/>

+          <xs:attribute name="version"

+                        type="xs:string"

+                        use="required"/>

+        </xs:complexType>

+      </xs:element>

+    </xs:sequence>

+    <xs:attribute name="version"

+                  type="xs:string"

+                  use="required"/>

+  </xs:complexType>

+</xs:element>

+

+  <!-- definition of simple elements -->

+  <xs:element name="hostname">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="1"/>

+        <xs:maxLength value="255"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="hostId">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="16"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="osName">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="1"/>

+        <xs:maxLength value="256"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="osVersion">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="50"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="osArchitecture">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="256"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="systemModel">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="50"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="systemManufacturer">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="50"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="cpuManufacturer">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="50"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="serialNumber">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="256"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="instance_urn">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="1"/>

+        <xs:maxLength value="255"/>

+      </xs:restriction>

+    </xs:simpleType>

+   </xs:element>

+

+  <xs:element name="product_name">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:maxLength value="255"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="product_version">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:maxLength value="63"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="product_urn">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="1"/>

+        <xs:maxLength value="255"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="product_parent_urn">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="255"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="product_parent">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="255"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="product_defined_inst_id">

+      <xs:simpleType>

+          <xs:restriction base="xs:string">

+              <xs:minLength value="0"/>

+              <xs:maxLength value="255"/>

+          </xs:restriction>

+      </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="product_vendor">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="63"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="platform_arch">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:minLength value="0"/>

+        <xs:maxLength value="63"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="timestamp">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:maxLength value="24"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="container">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:maxLength value="63"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element> 

+

+  <xs:element name="source">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:maxLength value="63"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element> 

+

+  <xs:element name="installer_uid">

+    <xs:simpleType>

+      <xs:restriction base="xs:integer">

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="physmem">

+    <xs:simpleType>

+      <xs:restriction base="xs:integer"/>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="sockets">

+    <xs:simpleType>

+      <xs:restriction base="xs:integer"/>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="cores">

+    <xs:simpleType>

+      <xs:restriction base="xs:integer"/>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="virtcpus">

+    <xs:simpleType>

+      <xs:restriction base="xs:integer"/>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="name">

+    <xs:simpleType>

+      <xs:restriction base="xs:string">

+        <xs:maxLength value="128"/>

+      </xs:restriction>

+    </xs:simpleType>

+  </xs:element>

+

+  <xs:element name="clockrate">

+    <xs:simpleType>

+      <xs:restriction base="xs:integer"/>

+    </xs:simpleType>

+  </xs:element>

+

+</xs:schema>