[Libreoffice-commits] core.git: 2 commits - scp2/InstallModule_ooo.mk scp2/source setup_native/source sfx2/classification sfx2/Module_sfx2.mk sfx2/Package_classification.mk
Miklos Vajna
vmiklos at collabora.co.uk
Mon Feb 22 13:32:10 UTC 2016
scp2/InstallModule_ooo.mk | 1
scp2/source/ooo/module_classification.scp | 35 +++++++++++++++++++++++
setup_native/source/packinfo/packinfo_office.txt | 15 +++++++++
sfx2/Module_sfx2.mk | 1
sfx2/Package_classification.mk | 16 ++++++++++
sfx2/classification/README | 4 ++
sfx2/classification/baf.xsd | 4 ++
sfx2/classification/example.xml | 2 +
8 files changed, 78 insertions(+)
New commits:
commit 960411badb0dc83e0e04526fe33081c7d6fdf348
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Feb 22 14:08:35 2016 +0100
sfx2 classification: mention policy name in the example
BAILS says the document metadata must mention this, BAF says that the
BusinessAuthorization has a policy name, but the published XSD doesn't
give a way to express this in the XML instance. Use this markup till we
figure out if there is a better way.
Change-Id: I8e3550c0445b2d143a1f7e0c69b39b6c759f468e
diff --git a/sfx2/classification/README b/sfx2/classification/README
new file mode 100644
index 0000000..ff1367a
--- /dev/null
+++ b/sfx2/classification/README
@@ -0,0 +1,4 @@
+Involved standards:
+
+- BAF is <https://www.tscp.org/wp-content/uploads/2013/08/TSCP_BAFv1.pdf>
+- BAILS is <http://www.tscp.org/wp-content/uploads/2013/08/TSCP_BAILSv1.pdf>
diff --git a/sfx2/classification/baf.xsd b/sfx2/classification/baf.xsd
index dc3e961..778cfbe 100644
--- a/sfx2/classification/baf.xsd
+++ b/sfx2/classification/baf.xsd
@@ -7,6 +7,8 @@ Business Authorization
-->
<xs:complexType name="BusinessAuthorization">
<xs:sequence>
+ <xs:element ref="PolicyAuthorityName"/>
+ <xs:element ref="PolicyName"/>
<xs:element ref="AdministrativeData"/>
<xs:element ref="Scope" minOccurs="0" maxOccurs="1"/>
<xs:element ref="Included"/>
@@ -184,6 +186,8 @@ Others
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="PolicyAuthorityName" type="xs:string"/>
+ <xs:element name="PolicyName" type="xs:string"/>
<xs:element name="ProgramID" type="xs:string"/>
<xs:element name="OrganizationsScope">
<xs:complexType>
diff --git a/sfx2/classification/example.xml b/sfx2/classification/example.xml
index a409684..40acd8a 100644
--- a/sfx2/classification/example.xml
+++ b/sfx2/classification/example.xml
@@ -1,5 +1,7 @@
<?xml version="1.0"?>
<baf:BusinessAuthorization xmlns:baf="urn:tscp:names:baf:1.1">
+ <baf:PolicyAuthorityName>TSCP Example Policy Authority</baf:PolicyAuthorityName>
+ <baf:PolicyName>TSCP Example Policy</baf:PolicyName>
<baf:AdministrativeData>
<baf:ProgramID>urn:example:tscp:1</baf:ProgramID>
</baf:AdministrativeData>
commit e5202379e3ffa65e916e1d3dc14959d53d65acd7
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Feb 22 12:26:11 2016 +0100
sfx2 classification: include example XML in the instset
Change-Id: I23c0227ee304a6b756ff3d474866609d95e6a071
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index d54ca2e..33ca0b0 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -93,6 +93,7 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
scp2/source/ooo/mingw_dlls \
) \
scp2/source/ooo/module_filter \
+ scp2/source/ooo/module_classification \
$(if $(filter-out MACOSX WNT,$(OS)), \
scp2/source/ooo/module_libreofficekit \
) \
diff --git a/scp2/source/ooo/module_classification.scp b/scp2/source/ooo/module_classification.scp
new file mode 100644
index 0000000..4f04d26
--- /dev/null
+++ b/scp2/source/ooo/module_classification.scp
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Classification
+ Name = "Classification Data";
+ Description = "Classification Data";
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Root_Brand;
+ Styles = (HIDDEN_ROOT);
+ Dirs = (gid_Dir_Share_Classification);
+ Files = (
+ gid_File_Dat_Sfx2ClassificationExample);
+End
+
+Directory gid_Dir_Share_Classification
+ ParentID = gid_Brand_Dir_Share;
+ DosName = "classification";
+End
+
+File gid_File_Dat_Sfx2ClassificationExample
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Share_Classification;
+ Name = "example.xml";
+ Styles = (PACKED);
+End
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index a097481..870d5a8 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -1163,6 +1163,21 @@ packageversion = "%PACKAGEVERSION"
End
Start
+module = "gid_Module_Classification"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-classification-data"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-classification-data"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2016 The Document Foundation"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Classification data for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
module = "gid_Module_Reportbuilder"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-report-builder"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index 96adc7a..30846a2 100644
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Module_Module,sfx2))
$(eval $(call gb_Module_add_targets,sfx2,\
CustomTarget_classification \
Library_sfx \
+ Package_classification \
))
$(eval $(call gb_Module_add_l10n_targets,sfx2,\
diff --git a/sfx2/Package_classification.mk b/sfx2/Package_classification.mk
new file mode 100644
index 0000000..a2dbb3e
--- /dev/null
+++ b/sfx2/Package_classification.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,sfx2_classification,$(SRCDIR)/sfx2))
+
+$(eval $(call gb_Package_add_files,sfx2_classification,$(LIBO_SHARE_FOLDER)/classification,\
+ classification/example.xml \
+))
+
+# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list