Skip to content

Commit

Permalink
Updated copyright year and company, authzforce server version to 8.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
cdanger committed Feb 23, 2019
1 parent b2d1207 commit 5e6b6a9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions doc/UserAndProgrammersGuide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1170,14 +1170,14 @@ The steps to integrate the extension into the AuthzForce Server go as follows:

#. Make the JAR - and any extra dependency - visible from the AuthzForce webapp in Tomcat. One way to do it consists to copy the JAR (e.g. ``authzforce-ce-core-pdp-testutils-10.1.0.jar`` in our example) into ``/opt/authzforce-ce-server/webapp/WEB-INF/lib``. For other ways, please refer to `Tomcat HowTo <http://wiki.apache.org/tomcat/HowTo#How_do_I_add_JARs_or_classes_to_the_common_classloader_without_adding_them_to_.24CATALINA_HOME.2Flib.3F>`_.

#. Import your attribute provider XML schema in the XML schema file ``/opt/authzforce-ce-server/conf/authzforce-ext.xsd``, using ``namespace`` **only** (no ``schemaLocation``), like in the `example from Authzforce code <hhttps://github.com/authzforce/server/blob/release-8.0.1/webapp/src/test/resources/authzforce-ce-server/conf/authzforce-ext.xsd>`_ with this schema import for AuthzForce ``TestAttributeProvider``:
#. Import your attribute provider XML schema in the XML schema file ``/opt/authzforce-ce-server/conf/authzforce-ext.xsd``, using ``namespace`` **only** (no ``schemaLocation``), like in the `example from Authzforce code <hhttps://github.com/authzforce/server/blob/release-8.1.0/webapp/src/test/resources/authzforce-ce-server/conf/authzforce-ext.xsd>`_ with this schema import for AuthzForce ``TestAttributeProvider``:

.. code-block:: xml
:linenos:
<xs:import namespace="http://authzforce.github.io/core/xmlns/test/3" />
#. Add a ``uri`` element to XML catalog file ``/opt/authzforce-ce-server/conf/catalog.xml``, with your attribute Provider XML namespace as ``name`` attribute value, and, the location of your XML schema file within the JAR, as ``uri`` attribute value, prefixed by ``classpath:``. For example, in the `sample XML catalog from Authzforce source code <https://github.com/authzforce/server/blob/release-8.0.1/webapp/src/test/resources/authzforce-ce-server/conf/catalog.xml>`_, we add the following line for AuthzForce ``TestAttributeProvider``:
#. Add a ``uri`` element to XML catalog file ``/opt/authzforce-ce-server/conf/catalog.xml``, with your attribute Provider XML namespace as ``name`` attribute value, and, the location of your XML schema file within the JAR, as ``uri`` attribute value, prefixed by ``classpath:``. For example, in the `sample XML catalog from Authzforce source code <https://github.com/authzforce/server/blob/release-8.1.0/webapp/src/test/resources/authzforce-ce-server/conf/catalog.xml>`_, we add the following line for AuthzForce ``TestAttributeProvider``:

.. code-block:: xml
:linenos:
Expand Down
10 changes: 5 additions & 5 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,17 @@ def __init__(self, **options):

# General information about the project.
project = u'AuthzForce CE'
copyright = u'2015-2017, Thales Services'
author = u'Cyril Dangerville, Thales Services'
copyright = u'2015-2019, THALES'
author = u'Cyril Dangerville, THALES'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '8.0.0'
version = '8.1.0'
# The full version, including alpha/beta/rc tags.
release = '8.0.0'
release = '8.1.0'

rst_epilog = """
.. |product.version| replace:: {0}
Expand Down Expand Up @@ -267,7 +267,7 @@ def __init__(self, **options):
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'AuthzForce.tex', u'AuthzForce CE',
u'Cyril Dangerville, Thales Services', 'manual'),
u'Cyril Dangerville, THALES', 'manual'),
]

# The name of an image file (relative to this directory) to place at the top of
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2012-2018 Thales Services SAS.
# Copyright (C) 2012-2019 THALES.
#
# This file is part of AuthZForce CE.
#
Expand Down Expand Up @@ -39,7 +39,7 @@ ENV DEBIAN_FRONTEND noninteractive

ENV JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom -Djava.awt.headless=true -Djavax.xml.accessExternalSchema=all -Xms1024m -Xmx2048m -XX:+UseConcMarkSweepGC -server"

ENV AUTHZFORCE_SERVER_VERSION="8.0.1"
ENV AUTHZFORCE_SERVER_VERSION="8.1.0"
ENV AUTHZFORCE_SERVER_DOWNLOAD_URL="http://repo1.maven.org/maven2/org/ow2/authzforce/authzforce-ce-server-dist/$AUTHZFORCE_SERVER_VERSION/authzforce-ce-server-dist-$AUTHZFORCE_SERVER_VERSION.deb"

# Download and install Authzforce Server (service starts automatically)
Expand Down

0 comments on commit 5e6b6a9

Please sign in to comment.