diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-11-23 16:50:13 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-11-24 11:30:59 +0000 |
| commit | 1025924f709d927db0785ff8099c68c23fdb9df7 (patch) | |
| tree | 230f007965e601860476be1a293d77cc2717d803 /swext | |
| parent | 22468d4d7a03c0b002f76111950166e2a6bbee97 (diff) | |
switch mediawiki extension to passive registration
Diffstat (limited to 'swext')
| -rw-r--r-- | swext/Extension_wiki-publisher.mk | 1 | ||||
| -rw-r--r-- | swext/Zip_mediawiki_develop.mk | 1 | ||||
| -rw-r--r-- | swext/mediawiki/src/components.rdb | 11 | ||||
| -rw-r--r-- | swext/mediawiki/src/manifest.xml | 4 |
4 files changed, 15 insertions, 2 deletions
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index 05d5fd81d37a..61b39cd1a32d 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Extension_add_file,wiki-publisher,Types.xcu,$(WIKISRC)/src/regi $(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcs,$(WIKISRC)/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs)) $(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu)) $(eval $(call gb_Extension_add_file,wiki-publisher,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar)) +$(eval $(call gb_Extension_add_file,wiki-publisher,components.rdb,$(WIKISRC)/src/components.rdb)) $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/EditSetting.xdl,$(WIKISRC)/dialogs/EditSetting.xdl)) $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Settings.xdl,$(WIKISRC)/dialogs/Settings.xdl)) $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Module1.xba,$(WIKISRC)/dialogs/Module1.xba)) diff --git a/swext/Zip_mediawiki_develop.mk b/swext/Zip_mediawiki_develop.mk index f682b074e82d..fd7bddef4a3d 100644 --- a/swext/Zip_mediawiki_develop.mk +++ b/swext/Zip_mediawiki_develop.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Zip_add_file,mediawiki_develop,WikiExtension.xcu,$(WIKISRC)/src $(eval $(call gb_Zip_add_file,mediawiki_develop,description.xml,$(WIKISRC)/src/description.xml)) $(eval $(call gb_Zip_add_file,mediawiki_develop,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar)) $(eval $(call gb_Zip_add_file,mediawiki_develop,META-INF/manifest.xml,$(WIKISRC)/src/manifest.xml)) +$(eval $(call gb_Zip_add_file,mediawiki_develop,components.rdb,$(WIKISRC)/src/components.rdb)) $(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/EditSetting.xdl,$(WIKISRC)/dialogs/EditSetting.xdl)) $(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/Settings.xdl,$(WIKISRC)/dialogs/Settings.xdl)) $(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/Module1.xba,$(WIKISRC)/dialogs/Module1.xba)) diff --git a/swext/mediawiki/src/components.rdb b/swext/mediawiki/src/components.rdb new file mode 100644 index 000000000000..816cfe673122 --- /dev/null +++ b/swext/mediawiki/src/components.rdb @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<components xmlns="http://openoffice.org/2010/uno-components"> + <component loader="com.sun.star.loader.Java2" uri="./mediawiki.jar"> + <implementation name="com.sun.star.wiki.WikiOptionsEventHandlerImpl"> + <service name="com.sun.star.wiki.WikiOptionsEventHandler"/> + </implementation> + <implementation name="com.sun.star.wiki.WikiEditorImpl"> + <service name="com.sun.star.wiki.WikiEditor"/> + </implementation> + </component> +</components> diff --git a/swext/mediawiki/src/manifest.xml b/swext/mediawiki/src/manifest.xml index 1f9b839e86c5..2eec40697ff9 100644 --- a/swext/mediawiki/src/manifest.xml +++ b/swext/mediawiki/src/manifest.xml @@ -26,8 +26,8 @@ ************************************************************************ --> <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest"> - <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java" - manifest:full-path="mediawiki.jar"/> + <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components" + manifest:full-path="components.rdb"/> <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" manifest:full-path="Addons.xcu"/> <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" |