ooo-build r13518 - trunk/patches/dev300

[michael svn gnome org]

Author: michael
Date: Mon Aug 11 20:19:21 2008
New Revision: 13518
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13518&view=rev

Log:
cleanup


Added:
   trunk/patches/dev300/piece-xmerge.diff

Added: trunk/patches/dev300/piece-xmerge.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-xmerge.diff	Mon Aug 11 20:19:21 2008
@@ -0,0 +1,340 @@
+diff -u -r xmerge/java/build.xml xmerge/java/build.xml
+--- xmerge/java/build.xml	2008-04-10 18:13:36.000000000 +0100
++++ xmerge/java/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -60,11 +60,11 @@
+ 		<pathelement location="${solar.jar}/xalan.jar"/>
+ 		<pathelement location="${solar.jar}/xml-apis.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+-        <pathelement location="${solar.jar}/jurt.jar"/>
+-        <pathelement location="${solar.jar}/unoil.jar"/>
+-        <pathelement location="${solar.jar}/ridl.jar"/>
+-        <pathelement location="${solar.jar}/sandbox.jar"/>
+-        <pathelement location="${solar.jar}/juh.jar"/>
++        <pathelement location="${split.ure}/share/java/jurt.jar"/>
++        <pathelement location="${split.install}/classes/unoil.jar"/>
++        <pathelement location="${split.ure}/share/java/ridl.jar"/>
++        <pathelement location="${split.install}/classes/sandbox.jar"/>
++        <pathelement location="${split.ure}/share/java/juh.jar"/>
+ 		<pathelement location="${solar.jar}/jmc.jar"/>
+     </path>
+ 
+diff -u -r xmerge/java/org/openoffice/xmerge/build.xml xmerge/java/org/openoffice/xmerge/build.xml
+--- xmerge/java/org/openoffice/xmerge/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -56,8 +56,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+     </path>
+ 
+diff -u -r xmerge/java/org/openoffice/xmerge/converter/dom/build.xml xmerge/java/org/openoffice/xmerge/converter/dom/build.xml
+--- xmerge/java/org/openoffice/xmerge/converter/dom/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/converter/dom/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -57,8 +57,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-	<pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++	<pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+     </path>
+ 
+diff -u -r xmerge/java/org/openoffice/xmerge/converter/xml/build.xml xmerge/java/org/openoffice/xmerge/converter/xml/build.xml
+--- xmerge/java/org/openoffice/xmerge/converter/xml/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/converter/xml/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -57,8 +57,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+     </path>
+ 
+diff -u -r xmerge/java/org/openoffice/xmerge/converter/xml/sxc/build.xml xmerge/java/org/openoffice/xmerge/converter/xml/sxc/build.xml
+--- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -57,8 +57,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+     </path>
+ 
+diff -u -r xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/build.xml xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/build.xml
+--- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -57,8 +57,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+         <pathelement location="${solar.jar}/jmc.jar"/>
+     </path>
+diff -u -r xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/build.xml xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/build.xml
+--- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -57,8 +57,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+     </path>
+ 
+     <!-- set wether we want to compile with or without deprecation -->
+diff -u -r xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/build.xml xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/build.xml
+--- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -57,8 +57,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+     </path>
+ 
+     <!-- set wether we want to compile with or without deprecation -->
+diff -u -r xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/build.xml xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/build.xml
+--- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -57,8 +57,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+     </path>
+ 
+     <!-- set wether we want to compile with or without deprecation -->
+diff -u -r xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/build.xml xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/build.xml
+--- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -57,8 +57,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+     </path>
+ 
+diff -u -r xmerge/java/org/openoffice/xmerge/converter/xml/sxw/build.xml xmerge/java/org/openoffice/xmerge/converter/xml/sxw/build.xml
+--- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -57,8 +57,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+     </path>
+ 
+diff -u -r xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/build.xml xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/build.xml
+--- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -57,8 +57,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+     </path>
+ 
+diff -u -r xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/build.xml xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/build.xml
+--- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -57,8 +57,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+     </path>
+ 
+     <!-- set wether we want to compile with or without deprecation -->
+diff -u -r xmerge/java/org/openoffice/xmerge/converter/xml/xslt/build.xml xmerge/java/org/openoffice/xmerge/converter/xml/xslt/build.xml
+--- xmerge/java/org/openoffice/xmerge/converter/xml/xslt/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/converter/xml/xslt/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -58,8 +58,8 @@
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+ 	<pathelement location="${solar.jar}/xalan.jar"/>
+-	<pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++	<pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+     </path>
+ 
+diff -u -r xmerge/java/org/openoffice/xmerge/merger/build.xml xmerge/java/org/openoffice/xmerge/merger/build.xml
+--- xmerge/java/org/openoffice/xmerge/merger/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/merger/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -57,8 +57,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+     </path>
+ 
+diff -u -r xmerge/java/org/openoffice/xmerge/merger/diff/build.xml xmerge/java/org/openoffice/xmerge/merger/diff/build.xml
+--- xmerge/java/org/openoffice/xmerge/merger/diff/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/merger/diff/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -57,8 +57,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+     </path>
+ 
+diff -u -r xmerge/java/org/openoffice/xmerge/merger/merge/build.xml xmerge/java/org/openoffice/xmerge/merger/merge/build.xml
+--- xmerge/java/org/openoffice/xmerge/merger/merge/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/merger/merge/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -57,8 +57,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+     </path>
+ 
+diff -u -r xmerge/java/org/openoffice/xmerge/test/build.xml xmerge/java/org/openoffice/xmerge/test/build.xml
+--- xmerge/java/org/openoffice/xmerge/test/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/test/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -56,8 +56,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+     </path>
+ 
+diff -u -r xmerge/java/org/openoffice/xmerge/util/build.xml xmerge/java/org/openoffice/xmerge/util/build.xml
+--- xmerge/java/org/openoffice/xmerge/util/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/util/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -56,8 +56,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+     </path>
+ 
+diff -u -r xmerge/java/org/openoffice/xmerge/util/registry/build.xml xmerge/java/org/openoffice/xmerge/util/registry/build.xml
+--- xmerge/java/org/openoffice/xmerge/util/registry/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/java/org/openoffice/xmerge/util/registry/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -56,8 +56,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
++        <pathelement location="${split.dev}/bin/parser.jar"/>
++        <pathelement location="${split.dev}/bin/jaxp.jar"/>
+         <pathelement location="${solar.jar}/xerces.jar"/>
+     </path>
+ 
+diff -u -r xmerge/source/bridge/build.xml xmerge/source/bridge/build.xml
+--- xmerge/source/bridge/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/source/bridge/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -38,10 +38,10 @@
+ 
+     <path id="classpath">
+         <pathelement location="${build.dir}/xmerge.jar"/>
+-        <pathelement location="${solar.jar}/unoil.jar"/>
+-        <pathelement location="${solar.jar}/ridl.jar"/>
+-        <pathelement location="${solar.jar}/jurt.jar"/>
+-        <pathelement location="${solar.jar}/juh.jar"/>
++        <pathelement location="${split.install}/classes/unoil.jar"/>
++        <pathelement location="${split.ure}/share/java/ridl.jar"/>
++        <pathelement location="${split.ure}/share/java/jurt.jar"/>
++        <pathelement location="${split.ure}/share/java/juh.jar"/>
+     </path>
+ 
+ 
+diff -u -r xmerge/source/xmerge/build.xml xmerge/source/xmerge/build.xml
+--- xmerge/source/xmerge/build.xml	2008-08-11 15:12:58.000000000 +0100
++++ xmerge/source/xmerge/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -43,10 +43,10 @@
+     <path id="classpath">
+         <pathelement location="${env.XML_APIS_JAR}"/>
+         <pathelement location="${env.XERCES_JAR}"/>
+-        <pathelement location="${solar.jar}/unoil.jar"/>
+-        <pathelement location="${solar.jar}/ridl.jar"/>
+-        <pathelement location="${solar.jar}/jurt.jar"/>
+-        <pathelement location="${solar.jar}/juh.jar"/>
++        <pathelement location="${split.install}/classes/unoil.jar"/>
++        <pathelement location="${split.ure}/share/java/ridl.jar"/>
++        <pathelement location="${split.ure}/share/java/jurt.jar"/>
++        <pathelement location="${split.ure}/share/java/juh.jar"/>
+     </path>
+ 
+ 
+diff -u -r xmerge/util/build.xml xmerge/util/build.xml
+--- xmerge/util/build.xml	2008-04-10 21:22:43.000000000 +0100
++++ xmerge/util/build.xml	2008-08-11 20:49:44.000000000 +0100
+@@ -41,10 +41,10 @@
+     <path id="classpath">
+         <pathelement location="${env.XML_APIS_JAR}"/>
+         <pathelement location="${env.XERCES_JAR}"/>
+-        <pathelement location="${solar.jar}/unoil.jar"/>
+-        <pathelement location="${solar.jar}/ridl.jar"/>
+-        <pathelement location="${solar.jar}/jurt.jar"/>
+-        <pathelement location="${solar.jar}/juh.jar"/>    
++        <pathelement location="${split.install}/classes/unoil.jar"/>
++        <pathelement location="${split.ure}/share/java/ridl.jar"/>
++        <pathelement location="${split.ure}/share/java/jurt.jar"/>
++        <pathelement location="${split.ure}/share/java/juh.jar"/>    
+         <pathelement location="${build.dir}/xmerge.jar"/>
+     </path>
+