summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--setup_native/registry/data/org/openoffice/Office/Jobs.xcu44
1 files changed, 31 insertions, 13 deletions
diff --git a/setup_native/registry/data/org/openoffice/Office/Jobs.xcu b/setup_native/registry/data/org/openoffice/Office/Jobs.xcu
index 6ec7264601f9..628e3dcdf70a 100644
--- a/setup_native/registry/data/org/openoffice/Office/Jobs.xcu
+++ b/setup_native/registry/data/org/openoffice/Office/Jobs.xcu
@@ -8,7 +8,8 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: Jobs.xcu,v $
- * $Revision: 1.4 $
+ *
+ * $Revision: 1.5 $
*
* This file is part of OpenOffice.org.
*
@@ -30,30 +31,47 @@
************************************************************************ -->
<oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<node oor:name="Jobs">
- <node oor:name="com.sun.star.jobs.STClient" oor:op="fuse">
+ <node oor:name="ProductRegistration" oor:op="replace">
<prop oor:name="Service">
- <value>com.sun.star.comp.framework.ShellJob</value>
+ <value>com.sun.star.comp.framework.DoRegistrationJob</value>
</prop>
<node oor:name="Arguments">
- <prop oor:name="Command" oor:op="replace" oor:type="xs:string">
- <value>$(progurl)/stclient_wrapper</value>
+ <prop oor:name="ProductName" oor:op="replace" oor:type="xs:string">
+ <value>${SERVICETAG_PRODUCTNAME}</value>
+ </prop>
+ <prop oor:name="ProductVersion" oor:op="replace" oor:type="xs:string">
+ <value>${SERVICETAG_PRODUCTVERSION}</value>
+ </prop>
+ <prop oor:name="ProductURN" oor:op="replace" oor:type="xs:string">
+ <value>${SERVICETAG_URN}</value>
+ </prop>
+ <prop oor:name="ProductSource" oor:op="replace" oor:type="xs:string">
+ <value>${SERVICETAG_SOURCE}</value>
</prop>
- <prop oor:name="Arguments" oor:op="replace" oor:type="oor:string-list">
- <value oor:separator=";">-p;${SERVICETAG_PRODUCTNAME};-e;${SERVICETAG_PRODUCTVERSION};-t;${SERVICETAG_URN};-S;${SERVICETAG_SOURCE};-P;${SERVICETAG_PARENTNAME};-i;${INSTANCE_URN}</value>
+ <prop oor:name="ProductParent" oor:op="replace" oor:type="xs:string">
+ <value>${SERVICETAG_PARENTNAME}</value>
</prop>
- <prop oor:name="DeactivateJobIfDone" oor:op="replace" oor:type="xs:boolean">
- <value>true</value>
+ <prop oor:name="Vendor" oor:op="replace" oor:type="xs:string">
+ <value>Sun Microsystems, Inc.</value>
</prop>
- <prop oor:name="CheckExitCode" oor:op="replace" oor:type="xs:boolean">
- <value>true</value>
+ <prop oor:name="RegistrationData" oor:op="replace" oor:type="xs:string">
+ <value>$(user)/registration.xml</value>
+ </prop>
+ <prop oor:name="RegistrationURL" oor:op="replace" oor:type="xs:string">
+ <value>${REGISTRATION_HOST}/register/${registry_urn}?product=${REGISTRATION_PRODUCT}&amp;locale=${locale}&amp;cid=${REGISTRATION_CID}</value>
</prop>
</node>
</node>
</node>
<node oor:name="Events">
- <node oor:name="OnStartApp" oor:op="fuse">
+ <node oor:name="onRegisterNow" oor:op="fuse">
+ <node oor:name="JobList">
+ <node oor:name="ProductRegistration" oor:op="replace"/>
+ </node>
+ </node>
+ <node oor:name="onRegisterLater" oor:op="fuse">
<node oor:name="JobList">
- <node oor:name="com.sun.star.jobs.STClient" oor:op="fuse" />
+ <node oor:name="ProductRegistration" oor:op="replace"/>
</node>
</node>
</node>