11 files changed, 60 insertions, 219 deletions
diff --git a/smoketestoo_native/check_setup.pl b/smoketestoo_native/check_setup.pl
index 8165b0c8a5b4..0d5753d1419d 100755
--- a/smoketestoo_native/check_setup.pl
+++ b/smoketestoo_native/check_setup.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: check_setup.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl
index b20a25f69148..83c370e11a18 100755
--- a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl
+++ b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TestExtension.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java
index ec87d2ee9803..c08c719116ae 100755
--- a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java
+++ b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TestExtension.java,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk b/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk
index d111eacbd349..3e90c68a13af 100755
--- a/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk
+++ b/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk
@@ -2,12 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/smoketestoo_native/config.pl b/smoketestoo_native/config.pl
index 642a256e33d4..988d1176ed42 100755
--- a/smoketestoo_native/config.pl
+++ b/smoketestoo_native/config.pl
@@ -1,18 +1,11 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: config.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,139 +26,58 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #*************************************************************************
 
 use File::Path;
-use File::Copy;
-
-### globals ###
-
-$is_debug = 0;
-
-$gui = $ENV{GUI};
-$cygwin = "cygwin";
-
-if ($^O =~ /cygwin/) {
-    $gui = $cygwin;
-}
-
-if (($gui eq "UNX") or ($gui eq $cygwin)) {
-    $pathslash = "/";
-}
-else
-{
-    $pathslash = "\\";
-}
-
-#### Hardly coded path for
-# \share\registry\data\org\openoffice\Office\Jobs.xcu
-
-$jobs_XML_Path = "share" . $pathslash  . "registry" . $pathslash . "data" . $pathslash . "org" . $pathslash . "openoffice" . $pathslash . "Office" .  $pathslash . "Jobs.xcu";
-
-# \user\registry\data\org\openoffice\
-
-$User_Path = "user" . $pathslash  . "registry" . $pathslash . "data" . $pathslash . "org" . $pathslash . "openoffice" . $pathslash;
-
-# \user\registry\data\org\openoffice\Office\
-
-$User_Office_Path = $User_Path . "Office" . $pathslash;
-
-# \user\registry\data\org\openoffice\Office\OOoImprovement
-
-$OOoImprovement_Path = $User_Office_Path . "OOoImprovement" . $pathslash;
-
-$common_XML = "Common.xcu";
-$setup_XML = "Setup.xcu";
-$oooimprovement_XML = "Settings.xcu";
 
-# $(INPATH)\misc\Common.xcu
-$inpath_Common_XCU = $ENV{INPATH} . $pathslash  . "misc" . $pathslash  .  $common_XML;
+$branddir = $ARGV[0];
+$userinstalldir = $ARGV[1];
+$buildid  = $ARGV[2];
 
-### main ###
-
-$idStr = ' $Revision: 1.5 $ ';
-$idStr =~ /Revision:\s+(\S+)\s+\$/
-  ? ($cpflat2minor_rev = $1) : ($cpflat2minor_rev = "-");
-
-if ( ($#ARGV >= 3) ) {
-    $ARGV[0] =~ s/\"//g;
-    $ARGV[1] =~ s/\"//g;
-    $ARGV[2] =~ s/\"//g;
-    $ARGV[3] =~ s/\"//g;
-    chop($ARGV[0]);
-    chop($ARGV[1]);
-    chop($ARGV[2]);
-    chop($ARGV[3]);
-}
-
-if ( ! ( ($#ARGV >= 4) && $ARGV[0] && $ARGV[1] && $ARGV[2] && $ARGV[3] && (-d $ARGV[3]) && $ARGV[4] ) ) {
-    print "Usage: config <basispath> <brandpath> <userinstallpath> <datapath> <buildid>\n" ;
-    exit(1);
-}
-
-$basisdir = $ARGV[0];
-$branddir = $ARGV[1];
-$userinstalldir = $ARGV[2];
-$datapath = $ARGV[3];
-$buildid  = $ARGV[4];
-
-$fullquickstart_path = $branddir . "program" . $pathslash . "quickstart.exe";
-
-print "patching config ... \n";
-if (!-d "$userinstalldir$User_Office_Path") {
-    mkpath("$userinstalldir$User_Office_Path", 0, 0777);
+if ($ENV{GUI} ne "UNX") {
+    $quickstart = $branddir . "program/quickstart.exe";
+    print "kill $quickstart\n";
+    unlink $quickstart or die "cannot unlink $fullquickstart_path";
 }
-if (!-d "$userinstalldir$OOoImprovement_Path") {
-    mkpath("$userinstalldir$OOoImprovement_Path", 0, 0777);
-}
-
-# copy Common.xcu
-print "Patching Common.xcu\n" if $is_debug;
-PatchCommonXcu($buildid);
-print "cp $inpath_Common_XCU $userinstalldir$User_Office_Path$common_XML\n" if $is_debug;
-copy ("$inpath_Common_XCU", "$userinstalldir$User_Office_Path$common_XML");
-
-# copy OOoImprovement/Settings.xcu
-
-print "cp $datapath$oooimprovement_XML $userinstalldir$OOoImprovement_Path$oooimprovement_XML\n" if $is_debug;
-copy ("$datapath$oooimprovement_XML", "$userinstalldir$OOoImprovement_Path$oooimprovement_XML");
-
-# copy Setup.xcu
-
-print "cp $datapath$setup_XML $userinstalldir$User_Path$setup_XML\n" if $is_debug;
-copy ("$datapath$setup_XML", "$userinstalldir$User_Path$setup_XML");
-
-
-# quickstarter loeschen
-if ($gui ne "UNX") {
-    print "kill $fullquickstart_path \n";
-    unlink( $fullquickstart_path ) or die "cannot unlink $fullquickstart_path";
-}
-
-#delete joblist
-$fullsource_path = $basisdir . $jobs_XML_Path;
-unlink ($fullsource_path);
-
-exit(0);
 
-############################################################################
-sub PatchCommonXcu      #17.04.2009 10:37
-############################################################################
- {
-    my $buildid = shift;
-    open(INFILE, "< $datapath$common_XML") || die "Can't open $datapath$common_XML (read)\n";
-    open(OUTFILE, "> $inpath_Common_XCU") || die "Can't open $inpath_Common_XCU (write)\n";
-    my $patch_next_line = 0;
-    my $value = "<value>Patch" . $buildid . "</value>\n";
-    while ( $line = <INFILE> ) {
-        if ( $patch_next_line ) {
-            print OUTFILE "      $value";
-            $patch_next_line = 0;
-        } else
-        {
-            print OUTFILE $line;
-        }
-        if ( $line =~ /ReminderDate/ ) {
-            $patch_next_line = 1;
-        }
-    }
-    close(INFILE);
-    close(OUTFILE);
-}   ##PatchCommonXcu
+$regpath = $userinstalldir . "user";
+$regfile = $regpath . "/registrymodifications.xcu";
+print "create $regfile\n";
+mkpath($regpath, 0, 0777);
+open (OUT, "> $regfile") or die "cannot open $regfile for writing";
+print OUT << "EOF";
+<oor:items xmlns:oor='http://openoffice.org/2001/registry'>
+ <item oor:path='/org.openoffice.Office.Common/Help/Registration'>
+  <prop oor:name='ReminderDate'>
+   <value>Patch$buildid</value>
+  </prop>
+ </item>
+ <item oor:path='/org.openoffice.Office.Common/Misc'>
+  <prop oor:name='FirstRun'>
+   <value>false</value>
+  </prop>
+ </item>
+ <item oor:path='/org.openoffice.Office.Common/Security/Scripting'>
+  <prop oor:name='MacroSecurityLevel'>
+   <value>0</value>
+  </prop>
+  <prop oor:name='OfficeBasic'>
+   <value>2</value>
+  </prop>
+ </item>
+ <item oor:path='/org.openoffice.Office.OOoImprovement.Settings/Participation'>
+  <prop oor:name='InvitationAccepted'>
+   <value>false</value>
+  </prop>
+  <prop oor:name='ShowedInvitation'>
+   <value>true</value>
+  </prop>
+ </item>
+ <item oor:path='/org.openoffice.Setup/Office'>
+  <prop oor:name='FirstStartWizardCompleted'>
+   <value>true</value>
+  </prop>
+  <prop oor:name='LicenseAcceptDate'>
+   <value>2100-01-01T00:00:00</value>
+  </prop>
+ </item>
+</oor:items>
+EOF
+close OUT;
diff --git a/smoketestoo_native/data/Common.xcu b/smoketestoo_native/data/Common.xcu
deleted file mode 100644
index 8cb90a69b7b6..000000000000
--- a/smoketestoo_native/data/Common.xcu
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:package="org.openoffice.Office" oor:name="Common">
- <node oor:name="Misc">
-  <prop oor:name="FirstRun" oor:type="xs:boolean">
-   <value>false</value>
-  </prop>
- </node>
- <node oor:name="Security">
-  <node oor:name="Scripting">
-   <prop oor:name="OfficeBasic" oor:type="xs:int">
-    <value>2</value>
-   </prop>
-   <prop oor:name="MacroSecurityLevel" oor:type="xs:int">
-    <value>0</value>
-   </prop>
-   </node>
- </node>
- <node oor:name="Help">
-   <node oor:name="Registration">
-     <prop oor:name="ReminderDate">
-       <value/>
-     </prop>
-   </node>
- </node>
-</oor:component-data>
diff --git a/smoketestoo_native/data/Settings.xcu b/smoketestoo_native/data/Settings.xcu
deleted file mode 100644
index 425e789dabc1..000000000000
--- a/smoketestoo_native/data/Settings.xcu
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Settings" oor:package="org.openoffice.Office.OOoImprovement">
- <node oor:name="Participation">
-  <prop oor:name="ShowedInvitation" oor:type="xs:boolean">
-   <value>true</value>
-  </prop>
-  <prop oor:name="InvitationAccepted" oor:type="xs:boolean">
-   <value>false</value>
-  </prop>
- </node>
-</oor:component-data>
diff --git a/smoketestoo_native/data/Setup.xcu b/smoketestoo_native/data/Setup.xcu
deleted file mode 100644
index cbcd2ef8f1ca..000000000000
--- a/smoketestoo_native/data/Setup.xcu
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Setup" oor:package="org.openoffice">
- <node oor:name="Office">
-  <prop oor:name="LicenseAcceptDate" oor:type="xs:string">
-   <value>2100-01-01T00:00:00</value>
-  </prop>
-  <prop oor:name="FirstStartWizardCompleted" oor:type="xs:boolean">
-   <value>true</value>
-  </prop>
- </node>
-</oor:component-data>
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index f21ae594bf33..ae7fbb01d502 100644
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/smoketestoo_native/smoketest.pl b/smoketestoo_native/smoketest.pl
index 91f6ed681fc1..f5ef32f31bcb 100755
--- a/smoketestoo_native/smoketest.pl
+++ b/smoketestoo_native/smoketest.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: smoketest.pl,v $
-#
-# $Revision: 1.35 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -490,7 +486,7 @@ sub doTest {
 
     # patch config (error 3)
 
-    $Command = "$PERL config.pl \"$basisdir \" \"$branddir \" \"$userinstallpath \" \"$DATA \" \"$buildid\"";
+    $Command = "$PERL config.pl \"$branddir\" \"$userinstallpath\" \"$buildid\"";
     execute_Command ($Command, $error_patchConfig, $show_Message, $command_normal );
 
     # copy basicscripts (error 9)
diff --git a/smoketestoo_native/testlog.pl b/smoketestoo_native/testlog.pl
index 99364cb9d1c0..6b44c75728fb 100755
--- a/smoketestoo_native/testlog.pl
+++ b/smoketestoo_native/testlog.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: testlog.pl,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify