Updating documentation for Docker components in XACML Custom Application Tutorial.

[policy/parent.git] / docs / xacml / xacml-tutorial.rst

diff --git a/docs/xacml/xacml-tutorial.rst b/docs/xacml/xacml-tutorial.rst
index e50728a..e275335 100644 (file)
--- a/docs/xacml/xacml-tutorial.rst
+++ b/docs/xacml/xacml-tutorial.rst
@@ -217,7 +217,7 @@ For the tutorial, we will build code that translates the TOSCA Policy into one X
 on the user and action. It will then have one or more rules for each entity and permission combination. The
 default combining algorithm for the XACML Rules are to "Deny Unless Permit".
 
-`See the tutorial example for details on how the translator is implemented <https://github.com/onap/policy-xacml-pdp/blob/master/tutorials/tutorial-xacml-application/src/main/java/org/onap/policy/tutorial/tutorial/TutorialTranslator.java>`_
+`See the tutorial example for details on how the translator is implemented <https://github.com/onap/policy-xacml-pdp/blob/master/tutorials/tutorial-xacml-application/src/main/java/org/onap/policy/tutorial/tutorial/TutorialTranslator.java>`_. Note that in the Tutorial Translator, it also shows how a developer could extend the translator to return or act upon obligations, advice and attributes.
 
 .. Note::
   There are many ways to build the policy based on the attributes. How to do so is a matter of experience and
@@ -282,8 +282,8 @@ The easiest way to do this is to use the annotations feature from XACML PDP libr
 request. Then create an instance and simply populate it from an incoming ONAP Decision Request.
 
 .. code-block:: java
-  :caption: Final TutorialApplication Class
-  :linenos:
+ :caption: Final TutorialApplication Class
+
     import com.att.research.xacml.std.annotations.XACMLAction;
     import com.att.research.xacml.std.annotations.XACMLRequest;
     import com.att.research.xacml.std.annotations.XACMLResource;
@@ -377,25 +377,6 @@ Build the code and run the JUnit test. Its easiest to run it via a terminal comm
 
    > mvn clean install
 
-Building Docker Image
-*********************
-To build a docker image that incorporates your application with the XACML PDP Engine. The XACML PDP Engine
-must be able to *find* your Java.Service in the classpath. This is easy to do, just create a jar file for your application
-and copy into the same directory used to startup the XACML PDP.
-
-Here is a Dockerfile as an example:
-
-.. code-block:: bash
-  :caption: Dockerfile
-  :linenos:
-
-    FROM onap/policy-xacml-pdp
-
-    ADD maven/${project.build.finalName}.jar /opt/app/policy/pdpx/lib/${project.build.finalName}.jar
-
-    RUN mkdir -p /opt/app/policy/pdpx/apps/tutorial
-
-    COPY --chown=policy:policy xacml.properties /opt/app/policy/pdpx/apps/tutorial
 
 Download Tutorial Application Example
 *************************************
@@ -404,9 +385,9 @@ If you clone the XACML-PDP repo, the tutorial is included for local testing with
 
 `Tutorial code located in xacml-pdp repo <https://github.com/onap/policy-xacml-pdp/tree/master/tutorials/tutorial-xacml-application>`_
 
-There is an example Docker compose script that you can use to run the Policy Framework components locally and test the tutorial out.
+There are instructions on the repo to run the Policy Framework components locally and test the tutorial out using Docker.
 
-`Docker compose script <https://github.com/onap/policy-xacml-pdp/blob/master/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml>`_
+`Docker Instructions <https://github.com/onap/policy-xacml-pdp/tree/master/tutorials/tutorial-xacml-application/src/main/docker>`_
 
 In addition, there is a POSTMAN collection available for setting up and running tests against a
 running instance of ONAP Policy Components (api, pap, dmaap-simulator, tutorial-xacml-pdp).