Changed OpenOffice.org into LibreOffice in several places

13 files changed, 36 insertions, 35 deletions

diff --git a/build/site_header.xml b/build/site_header.xml
index 4862fc6..bab3301 100644
--- a/build/site_header.xml
+++ b/build/site_header.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <category-def name="OpenOffice.org" label="OpenOffice.org"/>
+   <category-def name="LibreOffice" label="LibreOffice"/>
    
diff --git a/core/META-INF/MANIFEST.MF b/core/META-INF/MANIFEST.MF
index 077181a..852debb 100755
--- a/core/META-INF/MANIFEST.MF
+++ b/core/META-INF/MANIFEST.MF
@@ -53,5 +53,5 @@ Export-Package: org.openoffice.ide.eclipse.core,
  org.openoffice.ide.eclipse.core.wizards,
  org.openoffice.ide.eclipse.core.wizards.pages,
  org.openoffice.ide.eclipse.core.wizards.utils
-Bundle-Vendor: OpenOffice.org
+Bundle-Vendor: LibreOffice
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/core/build/MANIFEST.MF.in b/core/build/MANIFEST.MF.in
index ce80bd2..5916611 100755
--- a/core/build/MANIFEST.MF.in
+++ b/core/build/MANIFEST.MF.in
@@ -18,8 +18,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.junit,
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
- org.eclipse.ui,
- javax.xml
+ org.eclipse.ui;bundle-version="3.4.1",
+ javax.xml;bundle-version="1.3.4",
+ org.openoffice.ide.packager.core;bundle-version="0.1.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.openoffice.ide.eclipse.core,
  org.openoffice.ide.eclipse.core.actions,
@@ -52,5 +53,5 @@ Export-Package: org.openoffice.ide.eclipse.core,
  org.openoffice.ide.eclipse.core.wizards,
  org.openoffice.ide.eclipse.core.wizards.pages,
  org.openoffice.ide.eclipse.core.wizards.utils
-Bundle-Vendor: OpenOffice.org
+Bundle-Vendor: Cédric Bosdonnat
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/core/build/build.xml b/core/build/build.xml
index 9e5e320..6dd3777 100644
--- a/core/build/build.xml
+++ b/core/build/build.xml
@@ -42,7 +42,7 @@
 
 <project name="core" default="core.error">
 	
-    <import file="../packager/build/build.xml"/>
+    <import file="../../packager/build/build.xml"/>
 
 	<target name="core.error">
 		<fail>Wrong target!
@@ -67,6 +67,10 @@
 			<fileset dir="${eclipse.home}/plugins/">
 				<include name="org.eclipse*.jar"/>
 			</fileset>
+			
+			<fileset dir="${core.basedir}/../packager">
+				<include name="*.jar"/>
+			</fileset>
 		</path>
 		
 		<mkdir dir="${core.out.path}/features" />
diff --git a/core/build/feature.xml.in b/core/build/feature.xml.in
index c677e92..9f4ee9e 100644
--- a/core/build/feature.xml.in
+++ b/core/build/feature.xml.in
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.openoffice.ide.eclipse.core"
-      label="OpenOffice.org development plugin core"
+      label="LibreOffice development plugin core"
       version="@VERSION@"
       provider-name="Cédric Bosdonnat">
 
    <description>
-      Tool to support OpenOffice.org development using Eclipse. It
+      Tool to support LibreOffice development using Eclipse. It
 provides two editors for UNO-IDL file edition and registry files
 viewing. The plugin helps the user to write it&apos;s UNO-IDL file
 with syntax highlighting and some wizards, it although generates
@@ -23,15 +23,12 @@ This plugin is user oriented and integrate some cheat sheets
 to guide the new user throught different steps.
 Even if this is a important piece of work, there are still other
 features to add and bugs to correct, please do not hesitate to
-express your remarks and requests on the dev@api openoffice mailing
-list.
+express your remarks and requests on the LibreOffice development 
+mailing list.
    </description>
 
    <copyright>
-      The Initial Developer of the Original Code is: Sun Microsystems,Inc..
-Copyright: 2002 by Sun Microsystems, Inc.
-All Rights Reserved.
-Contributor(s): Cedric Bosdonnat
+Copyright: (c) 2010 Cedric Bosdonnat
    </copyright>
 
    <license url="http://www.openoffice.org/license.html">
@@ -54,7 +51,7 @@ MA 02111-1307 USA
    </license>
 
    <url>
-      <update label="OpenOffice.org Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
+      <update label="LibreOffice Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
    </url>
 
    <plugin
diff --git a/core/build/site_fragment.xml.in b/core/build/site_fragment.xml.in
index 6575594..c71e136 100644
--- a/core/build/site_fragment.xml.in
+++ b/core/build/site_fragment.xml.in
@@ -1,7 +1,7 @@
    <feature 
    		url="features/org.openoffice.ide.eclipse.core_@VERSION@.jar" 
    		id="org.openoffice.ide.eclipse.core" version="@VERSION@">
-      <category name="OpenOffice.org"/>
+      <category name="LibreOffice"/>
    </feature>
    
    
\ No newline at end of file
diff --git a/cpp/build/MANIFEST.MF.in b/cpp/build/MANIFEST.MF.in
index f30c0b3..03a0cd1 100644
--- a/cpp/build/MANIFEST.MF.in
+++ b/cpp/build/MANIFEST.MF.in
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: C++ extensions support for OOo
+Bundle-Name: C++ extensions support for LibreOffice
 Bundle-SymbolicName: org.openoffice.ide.eclipse.cpp;singleton:=true
 Bundle-Version: @VERSION@
 Bundle-Activator: org.openoffice.ide.eclipse.cpp.Activator
diff --git a/cpp/build/build.xml b/cpp/build/build.xml
index 8a1b5be..e5b7635 100644
--- a/cpp/build/build.xml
+++ b/cpp/build/build.xml
@@ -61,6 +61,7 @@
 		<property name="cpp.sources" value="${cpp.basedir}/source"/>
 		
 		<path id="cpp.dependencies.path">
+			<pathelement location="${packager.out.classes}"/>
 			<pathelement location="${core.out.classes}"/>
 			
 			<fileset dir="${eclipse.home}/plugins/">
diff --git a/cpp/build/feature.xml.in b/cpp/build/feature.xml.in
index ace5a83..a49e0a7 100644
--- a/cpp/build/feature.xml.in
+++ b/cpp/build/feature.xml.in
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.openoffice.ide.eclipse.cpp"
-      label="OpenOffice.org development plugin support for C++ implementation"
+      label="LibreOffice development plugin support for C++ implementation"
       version="@VERSION@"
       provider-name="Cédric Bosdonnat">
 
    <description>
-This plugin provides the support of C++ implementation for OpenOffice.org
-component development. This plugin depends on the OpenOffice.org development
+This plugin provides the support of C++ implementation for LibreOffice
+component development. This plugin depends on the LibreOffice development
 core plugin.
 
 Even if this is a important piece of work, there are still other
 features to add and bugs to correct, please do not hesitate to
-express your remarks and requests on the ooo-build@lists.freedesktop.org 
+express your remarks and requests on the LibreOffice development 
 mailing list.
    </description>
 
@@ -40,7 +40,7 @@ MA 02111-1307 USA
    </license>
 
    <url>
-      <discovery label="OpenOffice.org Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
+      <discovery label="LibreOffice Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
    </url>
 
    <requires>
diff --git a/java/build/MANIFEST.MF.in b/java/build/MANIFEST.MF.in
index 4de34bf..d6bfd41 100644
--- a/java/build/MANIFEST.MF.in
+++ b/java/build/MANIFEST.MF.in
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Java Plug-in for OOo eclipse integration
+Bundle-Name: Java Plug-in for OOEclipse
 Bundle-SymbolicName: org.openoffice.ide.eclipse.java; singleton:=true
 Bundle-Version: @VERSION@
 Bundle-Activator: org.openoffice.ide.eclipse.java.OOoJavaPlugin
-Bundle-Vendor: OpenOffice.org
+Bundle-Vendor: Cédric Bosdonnat
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.openoffice.ide.eclipse.core,
diff --git a/java/build/build.xml b/java/build/build.xml
index bb68587..b18ff7f 100644
--- a/java/build/build.xml
+++ b/java/build/build.xml
@@ -62,6 +62,7 @@
 		<property name="java.sources" value="${java.basedir}/source"/>
 		
 		<path id="java.dependencies.path">
+			<pathelement location="${packager.out.classes}"/>
 			<pathelement location="${core.out.classes}"/>
 			
 			<fileset dir="${eclipse.home}/plugins/">
diff --git a/java/build/feature.xml.in b/java/build/feature.xml.in
index 644c33e..99ea346 100644
--- a/java/build/feature.xml.in
+++ b/java/build/feature.xml.in
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.openoffice.ide.eclipse.java"
-      label="OpenOffice.org development plugin support for Java implementation"
+      label="LibreOffice development plugin support for Java implementation"
       version="@VERSION@"
       provider-name="Cédric Bosdonnat">
 
    <description>
-This plugin provides the support of Java implementation for OpenOffice.org
-component development. This plugin depends on the OpenOffice.org development
+This plugin provides the support of Java implementation for LibreOffice
+component development. This plugin depends on the LibreOffice development
 core plugin.
 
 Even if this is a important piece of work, there are still other
 features to add and bugs to correct, please do not hesitate to
-express your remarks and requests on the dev@api openoffice mailing
-list.
+express your remarks and requests on the LibreOffice development
+mailing list.
    </description>
 
    <copyright>
-      The Initial Developer of the Original Code is: Sun Microsystems,Inc..
-Copyright: 2002 by Sun Microsystems, Inc.
-All Rights Reserved.
-Contributor(s): Cedric Bosdonnat
+Copyright: 2010 by Cedric Bosdonnat
    </copyright>
 
    <license url="http://www.openoffice.org/license.html">
@@ -43,7 +40,7 @@ MA 02111-1307 USA
    </license>
 
    <url>
-      <discovery label="OpenOffice.org Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
+      <discovery label="LibreOffice Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
    </url>
 
    <requires>
diff --git a/java/build/site_fragment.xml.in b/java/build/site_fragment.xml.in
index 7e62ded..cde5cac 100644
--- a/java/build/site_fragment.xml.in
+++ b/java/build/site_fragment.xml.in
@@ -1,7 +1,7 @@
    <feature 
    		url="features/org.openoffice.ide.eclipse.java_@VERSION@.jar" 
    		id="org.openoffice.ide.eclipse.java" version="@VERSION@">
-      <category name="OpenOffice.org"/>
+      <category name="LibreOffice"/>
    </feature>
    
    
\ No newline at end of file