21020157 html help files in apache for RBAC profiles and authorizations must go
authorPetr Sumbera <petr.sumbera@oracle.com>
Thu, 28 May 2015 05:37:42 -0700
changeset 4379 3c069007ce28
parent 4378 787a47626d76
child 4381 028ddffc4038
21020157 html help files in apache for RBAC profiles and authorizations must go
components/apache2/Solaris/RtApacheSrvcMngmnt.html
components/apache2/Solaris/SmfApacheStates.html
components/apache2/Solaris/SmfValueApache.html
components/apache2/Solaris/auth_attr
components/apache2/Solaris/prof_attr
components/apache2/apache-22-message-files.p5m
components/apache2/apache-22.p5m
components/apache24/Solaris/RtApacheSrvcMngmnt.html
components/apache24/Solaris/SmfApacheStates.html
components/apache24/Solaris/SmfValueApache.html
components/apache24/Solaris/auth_attr
components/apache24/Solaris/prof_attr
components/apache24/apache-24-message-files.p5m
components/apache24/apache-24.p5m
--- a/components/apache2/Solaris/RtApacheSrvcMngmnt.html	Thu May 28 05:27:07 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<HTML>
-<!--
-Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
--->
-<!--
-    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
--->
-<BODY>
-When Apache Service Management is in the Rights Included column, it grants the
-right to manage the Apache HTTP Server SMF service.
-<p>
-If Apache Service Management is grayed, then you are not entitled to Add
-or Remove this right.
-<BR>&nbsp;
-</BODY>
-</HTML>
--- a/components/apache2/Solaris/SmfApacheStates.html	Thu May 28 05:27:07 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<HTML>
-<!--
-Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
--->
-<!--
-    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
--->
-<BODY>
-When <em>Manage Apache HTTP Server Service States</em> is in the Authorizations
-Included column, it grants the authorization to enable, disable, or restart
-Apache HTTP Server SMF service (both permanently and temporarily).
-<p>
-If <em>Manage Apache HTTP Server Service States</em> is grayed, then you are not
-entitled to Add or Remove this authorization.
-<BR>&nbsp;
-</BODY>
-</HTML>
--- a/components/apache2/Solaris/SmfValueApache.html	Thu May 28 05:27:07 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<HTML>
-<!--
-Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
--->
-<!--
-    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
--->
-<BODY>
-When <em>Change Values of Apache HTTP Server Service Properties</em> is in the
-Authorizations Included column, it grants the authorization to change
-Apache HTTP Server service property values.
-<p>
-If <em>Change Values of Apache HTTP Server Service Properties</em> is grayed,
-then you are not entitled to Add or Remove this authorization.
-<BR>&nbsp;
-</BODY>
-</HTML>
--- a/components/apache2/Solaris/auth_attr	Thu May 28 05:27:07 2015 -0700
+++ b/components/apache2/Solaris/auth_attr	Thu May 28 05:37:42 2015 -0700
@@ -18,13 +18,8 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-solaris.smf.manage.apache:RO::\
-Manage Apache HTTP Server Service States::\
-help=SmfApacheStates.html
-
-solaris.smf.value.apache:RO::\
-Change Values of Apache HTTP Server Service Properties::\
-help=SmfValueApache.html
+solaris.smf.manage.apache:RO::Manage Apache HTTP Server Service States::
+solaris.smf.value.apache:RO::Change Values of Apache HTTP Server Service Properties::
--- a/components/apache2/Solaris/prof_attr	Thu May 28 05:27:07 2015 -0700
+++ b/components/apache2/Solaris/prof_attr	Thu May 28 05:37:42 2015 -0700
@@ -18,12 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 Apache Service Management:RO::\
 Manage Apache HTTP Server SMF service:\
 profiles=Service Configuration;\
 auths=solaris.smf.manage.apache,\
-solaris.smf.value.apache;\
-help=RtApacheSrvcMngmnt.html
+solaris.smf.value.apache;
--- a/components/apache2/apache-22-message-files.p5m	Thu May 28 05:27:07 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri \
-    value=pkg://$(PUBLISHER_LOCALIZABLE)/web/server/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Translatable content for Apache Web Server V2.2"
-set name=pkg.linted.opensolaris.manifest001.1 value=true
-# since this package is internal, we do not need some metadata
-set name=pkg.linted.pkglint.manifest010.2 value=true
-set name=pkg.linted.userland.manifest001.0 value=true
-set name=com.oracle.info.description \
-    value="the translatable content for Apache Web Server V2.2"
-set name=org.opensolaris.arc-caseid value=LSARC/2009/565
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file Solaris/SmfApacheStates.html \
-    path=usr/lib/help/auths/locale/__LOCALE__/SmfApacheStates.html
-file Solaris/SmfValueApache.html \
-    path=usr/lib/help/auths/locale/__LOCALE__/SmfValueApache.html
-file Solaris/RtApacheSrvcMngmnt.html \
-    path=usr/lib/help/profiles/locale/__LOCALE__/RtApacheSrvcMngmnt.html
-license apache.license license="Apache v2.0"
--- a/components/apache2/apache-22.p5m	Thu May 28 05:27:07 2015 -0700
+++ b/components/apache2/apache-22.p5m	Thu May 28 05:37:42 2015 -0700
@@ -387,12 +387,6 @@
     mediator=apache mediator-version=2.2
 link path=usr/bin/rotatelogs target=../apache2/2.2/bin/rotatelogs \
     mediator=apache mediator-version=2.2
-file Solaris/SmfApacheStates.html \
-    path=usr/lib/help/auths/locale/C/SmfApacheStates.html
-file Solaris/SmfValueApache.html \
-    path=usr/lib/help/auths/locale/C/SmfValueApache.html
-file Solaris/RtApacheSrvcMngmnt.html \
-    path=usr/lib/help/profiles/locale/C/RtApacheSrvcMngmnt.html
 link path=usr/share/man/man1/dbmmanage.1 \
     target=../../../apache2/2.2/man/man1/dbmmanage.1 mediator=apache \
     mediator-version=2.2
--- a/components/apache24/Solaris/RtApacheSrvcMngmnt.html	Thu May 28 05:27:07 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<HTML>
-<!--
-Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
--->
-<!--
-    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
--->
-<BODY>
-When Apache Service Management is in the Rights Included column, it grants the
-right to manage the Apache HTTP Server SMF service.
-<p>
-If Apache Service Management is grayed, then you are not entitled to Add
-or Remove this right.
-<BR>&nbsp;
-</BODY>
-</HTML>
--- a/components/apache24/Solaris/SmfApacheStates.html	Thu May 28 05:27:07 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<HTML>
-<!--
-Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
--->
-<!--
-    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
--->
-<BODY>
-When <em>Manage Apache HTTP Server Service States</em> is in the Authorizations
-Included column, it grants the authorization to enable, disable, or restart
-Apache HTTP Server SMF service (both permanently and temporarily).
-<p>
-If <em>Manage Apache HTTP Server Service States</em> is grayed, then you are not
-entitled to Add or Remove this authorization.
-<BR>&nbsp;
-</BODY>
-</HTML>
--- a/components/apache24/Solaris/SmfValueApache.html	Thu May 28 05:27:07 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<HTML>
-<!--
-Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
--->
-<!--
-    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
--->
-<BODY>
-When <em>Change Values of Apache HTTP Server Service Properties</em> is in the
-Authorizations Included column, it grants the authorization to change
-Apache HTTP Server service property values.
-<p>
-If <em>Change Values of Apache HTTP Server Service Properties</em> is grayed,
-then you are not entitled to Add or Remove this authorization.
-<BR>&nbsp;
-</BODY>
-</HTML>
--- a/components/apache24/Solaris/auth_attr	Thu May 28 05:27:07 2015 -0700
+++ b/components/apache24/Solaris/auth_attr	Thu May 28 05:37:42 2015 -0700
@@ -18,13 +18,8 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-solaris.smf.manage.apache:RO::\
-Manage Apache HTTP Server Service States::\
-help=SmfApacheStates.html
-
-solaris.smf.value.apache:RO::\
-Change Values of Apache HTTP Server Service Properties::\
-help=SmfValueApache24.html
+solaris.smf.manage.apache:RO::Manage Apache HTTP Server Service States::
+solaris.smf.value.apache:RO::Change Values of Apache HTTP Server Service Properties::
--- a/components/apache24/Solaris/prof_attr	Thu May 28 05:27:07 2015 -0700
+++ b/components/apache24/Solaris/prof_attr	Thu May 28 05:37:42 2015 -0700
@@ -18,12 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 Apache Service Management:RO::\
 Manage Apache HTTP Server SMF service:\
 profiles=Service Configuration;\
 auths=solaris.smf.manage.apache,\
-solaris.smf.value.apache;\
-help=RtApache24SrvcMngmnt.html
+solaris.smf.value.apache;
--- a/components/apache24/apache-24-message-files.p5m	Thu May 28 05:27:07 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri \
-    value=pkg://$(PUBLISHER_LOCALIZABLE)/web/server/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Translatable content for Apache Web Server V2.4"
-# since this package is internal, we do not need some metadata
-set name=pkg.linted.opensolaris.manifest001.1 value=true
-set name=pkg.linted.pkglint.manifest010.2 value=true
-set name=pkg.linted.userland.manifest001.0 value=true
-set name=com.oracle.info.description \
-    value="the translatable content for Apache Web Server V2.4"
-set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
-    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=org.opensolaris.arc-caseid value=PSARC/2014/253
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file Solaris/SmfApacheStates.html \
-    path=usr/lib/help/auths/locale/__LOCALE__/SmfApache24States.html
-file Solaris/SmfValueApache.html \
-    path=usr/lib/help/auths/locale/__LOCALE__/SmfValueApache24.html
-file Solaris/RtApacheSrvcMngmnt.html \
-    path=usr/lib/help/profiles/locale/__LOCALE__/RtApache24SrvcMngmnt.html
-license apache.license license="Apache v2.0"
--- a/components/apache24/apache-24.p5m	Thu May 28 05:27:07 2015 -0700
+++ b/components/apache24/apache-24.p5m	Thu May 28 05:37:42 2015 -0700
@@ -1418,12 +1418,6 @@
     mediator=apache mediator-version=2.4
 link path=usr/bin/rotatelogs target=../apache2/2.4/bin/rotatelogs \
     mediator=apache mediator-version=2.4
-file Solaris/SmfApacheStates.html \
-    path=usr/lib/help/auths/locale/C/SmfApache24States.html
-file Solaris/SmfValueApache.html \
-    path=usr/lib/help/auths/locale/C/SmfValueApache24.html
-file Solaris/RtApacheSrvcMngmnt.html \
-    path=usr/lib/help/profiles/locale/C/RtApache24SrvcMngmnt.html
 link path=usr/share/man/man1/ab.1 target=../../../apache2/2.4/man/man1/ab.1 \
     mediator=apache mediator-version=2.4
 link path=usr/share/man/man1/apxs.1 \