From 7b4ef5a50bb2871c8a15a4aaf21329745256fe3e Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Mon, 16 Mar 2020 19:13:30 +0100 Subject: [PATCH] fixed typos Issue #652 --- src/site/markdown/deployment/deployment_guide.md | 4 ++-- src/site/markdown/deployment/glassfish.md | 4 ++-- src/site/markdown/deployment/index.md | 4 ++-- src/site/markdown/deployment/tomee.md | 2 +- src/site/markdown/deployment/wildfly.md | 8 ++++---- src/site/markdown/docker.md | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/site/markdown/deployment/deployment_guide.md b/src/site/markdown/deployment/deployment_guide.md index 37bdc76fa..ca1c778a2 100644 --- a/src/site/markdown/deployment/deployment_guide.md +++ b/src/site/markdown/deployment/deployment_guide.md @@ -118,7 +118,7 @@ The persistence.xml describes the location of the database and the entity beans org.eclipse.persistence.jpa.PersistenceProvider - jdbc/workflow-db + jdbc/workflow lib/imixs-workflow-engine-${org.imixs.workflow.version}.jar @@ -141,6 +141,6 @@ The jta-data-source points to a JNDI Database resource located on the applicatio The jar-file defines the java library containing the Entity Beans to be persisted into the Database. This tag should always point to the imixs-workflow-engine Jar File. The version number must match the deployed component version. -In the example the jta-data-source point to a JDBC Resource with the JNDI Name 'jdbc/workflow-db'. The jar-file points to the imixs-workflow-engine.jar part of your application. +In the example the jta-data-source point to a JDBC Resource with the JNDI Name 'jdbc/workflow'. The jar-file points to the imixs-workflow-engine.jar part of your application. \ No newline at end of file diff --git a/src/site/markdown/deployment/glassfish.md b/src/site/markdown/deployment/glassfish.md index 6fa1ff8fd..c06778b0d 100644 --- a/src/site/markdown/deployment/glassfish.md +++ b/src/site/markdown/deployment/glassfish.md @@ -11,7 +11,7 @@ After the server is started you can access the GlassFish web console from your w http://localhost:4848/ ## Setting up a Imixs-Workflow database pool -The [Imixs-Sample Application](../sampleapplication.html) expects a database resource with the name "jdbc/workflow-db". Thus you need first to set up a Database Pool and a JDBC resource before you can deploy the application successful. In this example we create a database pool for the build in derby database from GlassFish. You can also configure any other database like MySQL, Oracle, Informix, Microsoft SQL Server,.... +The [Imixs-Sample Application](../sampleapplication.html) expects a database resource with the name "jdbc/workflow". Thus you need first to set up a Database Pool and a JDBC resource before you can deploy the application successful. In this example we create a database pool for the build in derby database from GlassFish. You can also configure any other database like MySQL, Oracle, Informix, Microsoft SQL Server,.... To create a new database pool in GlassFish follow these steps: @@ -34,7 +34,7 @@ To create a new database pool in GlassFish follow these steps: * portnumber: 1527 6. Now create a JDBC Resource - Navigate to "Application Server >> Resources >> JDBC >> JDBC Resources" 7. click "new" to create a new resource - - jndiName: jdbc/workflow-db + - jndiName: jdbc/workflow - PoolName: imixs_db_pool ## Setup a Security Realm diff --git a/src/site/markdown/deployment/index.md b/src/site/markdown/deployment/index.md index f5d7c1f75..c655ba7ae 100644 --- a/src/site/markdown/deployment/index.md +++ b/src/site/markdown/deployment/index.md @@ -17,7 +17,7 @@ See the following example of a persistence.xml: org.eclipse.persistence.jpa.PersistenceProvider - jdbc/workflow-db + jdbc/workflow lib/imixs-workflow-engine-${org.imixs.workflow.version}.jar @@ -29,7 +29,7 @@ See the following example of a persistence.xml: - * The **jta-data-source** (in this example 'jdbc/workflow-db') must match the database pool in your application server. + * The **jta-data-source** (in this example 'jdbc/workflow') must match the database pool in your application server. * The **persistence-unit** name refers to the Imixs-Workflow engine and must always be set to _org.imixs.workflow.jpa_. * The **jar-file** must match the deployed version of the Imixs-Workflow engine jar within your application (be careful with the right version number) diff --git a/src/site/markdown/deployment/tomee.md b/src/site/markdown/deployment/tomee.md index 0d5757d67..99eb0fef5 100644 --- a/src/site/markdown/deployment/tomee.md +++ b/src/site/markdown/deployment/tomee.md @@ -11,7 +11,7 @@ After the server is started you can access the TomEE web console from your web b ## Setting up a Imixs-Workflow database pool -The [Imixs-Sample Application](../sampleapplication.html) expects a database resource with the name "jdbc/workflow-db". +The [Imixs-Sample Application](../sampleapplication.html) expects a database resource with the name "jdbc/workflow". Thus you need first to set up a Database Pool and a JDBC resource before you can deploy the application successful. You can run any SQL database like MySQL, Oracle, Informix, Microsoft SQL Server, ... diff --git a/src/site/markdown/deployment/wildfly.md b/src/site/markdown/deployment/wildfly.md index be2f85fed..760531170 100644 --- a/src/site/markdown/deployment/wildfly.md +++ b/src/site/markdown/deployment/wildfly.md @@ -10,7 +10,7 @@ After the server is started it can be opened from a web browser with the followi http://localhost:8080/ ## Setting up a Imixs-Workflow database pool -The [Imixs-Sample Application](../sampleapplication.html) expects a database resource with the name "jdbc/workflow-db". The corresponding datasource configuration can be added into the file _wildfly/standalone/configuration/standalone.xml_ in the subsystem section 'datasources' +The [Imixs-Sample Application](../sampleapplication.html) expects a database resource with the name "jdbc/workflow". The corresponding datasource configuration can be added into the file _wildfly/standalone/configuration/standalone.xml_ in the subsystem section 'datasources' ### MySQL @@ -19,7 +19,7 @@ For MySQL the corresponding JDBC driver need to be deployed into Wildfly first. Next a datasource can be configured in the standlone.xml: ... - + jdbc:mysql://localhost:3306/workflow_db com.mysql.jdbc.Driver mysql-connector-java-5.1.7-bin.jar @@ -41,8 +41,8 @@ For PostgreSQL the corresponding JDBC driver need to be deployed into Wildfly fi Next a datasource can be configured in the standlone.xml: ... - - jdbc:postgresql://localhost/workflow-db + + jdbc:postgresql://localhost/workflow org.postgresql.Driver postgresql-9.3-1102.jdbc41.jar diff --git a/src/site/markdown/docker.md b/src/site/markdown/docker.md index bd0ddad02..c25be32a6 100644 --- a/src/site/markdown/docker.md +++ b/src/site/markdown/docker.md @@ -15,10 +15,10 @@ To run Imixs-Workflow in a container start the Docker Image imixs/workflow: docker run --name="imixs-workflow" -d -p 8080:8080 -p 9990:9990 \ -e WILDFLY_PASS="adminadmin" \ - --link imixs-workflow-db:postgres \ + --link imixs-workflow:postgres \ imixs/imixs-workflow -The container need to be linked to the postgres container providing a database name 'workflow-db'. See the [docker project home](https://hub.docker.com/r/imixs/imixs-microservice/) for more information. +The container need to be linked to the postgres container providing a database name 'workflow'. See the [docker project home](https://hub.docker.com/r/imixs/imixs-microservice/) for more information. ### ...via docker-compose @@ -29,7 +29,7 @@ The following example shows a docker-compose.yml file to run imixs-workflow: image: postgres environment: POSTGRES_PASSWORD: adminadmin - POSTGRES_DB: workflow-db + POSTGRES_DB: workflow imixsworkflow: image: imixs/workflow