Skip to content

Commit

Permalink
fixed typos
Browse files Browse the repository at this point in the history
Issue #652
  • Loading branch information
rsoika committed Mar 16, 2020
1 parent 471b3d0 commit 7b4ef5a
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions src/site/markdown/deployment/deployment_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ The persistence.xml describes the location of the database and the entity beans
<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence">
<persistence-unit name="org.imixs.workflow.jpa" transaction-type="JTA">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
<jta-data-source>jdbc/workflow-db</jta-data-source>
<jta-data-source>jdbc/workflow</jta-data-source>
<jar-file>lib/imixs-workflow-engine-${org.imixs.workflow.version}.jar</jar-file>
<properties>
<property name="eclipselink.target-database" value="Auto" />
Expand All @@ -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.


4 changes: 2 additions & 2 deletions src/site/markdown/deployment/glassfish.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/site/markdown/deployment/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ See the following example of a persistence.xml:
<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence">
<persistence-unit name="org.imixs.workflow.jpa" transaction-type="JTA">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
<jta-data-source>jdbc/workflow-db</jta-data-source>
<jta-data-source>jdbc/workflow</jta-data-source>
<jar-file>lib/imixs-workflow-engine-${org.imixs.workflow.version}.jar</jar-file>
<properties>
<!-- target-database Auto MySQL PostgreSQL -->
Expand All @@ -29,7 +29,7 @@ See the following example of a persistence.xml:
</persistence-unit>
</persistence>

* 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)

Expand Down
2 changes: 1 addition & 1 deletion src/site/markdown/deployment/tomee.md
Original file line number Diff line number Diff line change
Expand Up @@ -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, ...

Expand Down
8 changes: 4 additions & 4 deletions src/site/markdown/deployment/wildfly.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:

...
<datasource jta="true" jndi-name="java:/jdbc/workflow-db" pool-name="workflow-db" enabled="true" use-ccm="true">
<datasource jta="true" jndi-name="java:/jdbc/workflow" pool-name="workflow" enabled="true" use-ccm="true">
<connection-url>jdbc:mysql://localhost:3306/workflow_db</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
<driver>mysql-connector-java-5.1.7-bin.jar</driver>
Expand All @@ -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:

...
<datasource jta="true" jndi-name="java:/jdbc/workflow-db" pool-name="workflow-db" enabled="true" use-ccm="true">
<connection-url>jdbc:postgresql://localhost/workflow-db</connection-url>
<datasource jta="true" jndi-name="java:/jdbc/workflow" pool-name="workflow" enabled="true" use-ccm="true">
<connection-url>jdbc:postgresql://localhost/workflow</connection-url>
<driver-class>org.postgresql.Driver</driver-class>
<driver>postgresql-9.3-1102.jdbc41.jar</driver>
<security>
Expand Down
6 changes: 3 additions & 3 deletions src/site/markdown/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 7b4ef5a

Please sign in to comment.