From de63d48f9b8be0f5099f054e0978f3e0d3750864 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 10 Aug 2012 15:52:22 +0200
Subject: Related fdo#51252: No more prereg, no more unopkg sync

Now that 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
share/prereg/bundled to avoid startup crashes" removed the use of share/prereg,
there is no longer need to generate it in the first place (by calling "unopkg
sync" at build or installation time), and so no need for the "unopkg sync" sub-
command, either.  This also allows to simplify some of the jvmfwk code that was
only there so that "unopkg sync" (which can require a JVM) can work in "hostile"
environments (during build and installation).

Conflicts:

	setup_native/prj/d.lst

Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f
Signed-off-by: Andras Timar <atimar@suse.com>
---
 .../bundledextensions/ooo_bundled_extensions.xml   | 60 ----------------------
 1 file changed, 60 deletions(-)
 delete mode 100644 setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml

(limited to 'setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml')

diff --git a/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml b/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml
deleted file mode 100644
index 66acd508c281..000000000000
--- a/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-
-<service_bundle type="manifest" name="ooo_bundled_extensions">
-
-<service
-   name="application/ooo_bundled_extensions"
-   type="service"
-   version="1">
-
-  <create_default_instance enabled="true" />
-  <single_instance/>
-
-  <dependency name="service_available"
-          grouping="require_all"
-          restart_on="none"
-          type="service">
-    <service_fmri value="svc:/system/filesystem/local:default" />
-  </dependency>
-
-  <exec_method
-     type="method" name="start"
-     exec="/lib/svc/method/svc-ooo_bundled_extensions start"
-     timeout_seconds="160">
-    <method_context>
-      <method_credential user="root" group="root" />
-    </method_context>
-  </exec_method>
-
-
-  <exec_method
-     type="method" name="stop"
-     exec="/lib/svc/method/svc-ooo_bundled_extensions stop"
-     timeout_seconds="160" >
-    <method_context>
-      <method_credential user="root" group="root" />
-    </method_context>
-  </exec_method>
-
-  <property_group name="startd" type="framework">
-    <propval name="duration" type="astring"
-         value="transient" />
-    <propval name="ignore_error"
-         type="astring" value="core,signal" />
-
-  </property_group>
-
-  <stability value="Unstable" />
-
-  <template>
-    <common_name>
-      <loctext xml:lang="C">
-    Installation of OpenOffice.org's bundled extensions.
-      </loctext>
-    </common_name>
-  </template>
-</service>
-
-</service_bundle>
-- 
cgit