You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/03/15 14:41:46 UTC
[1/2] syncope git commit: Simplifying cluster deployment and
instructions
Repository: syncope
Updated Branches:
refs/heads/2_0_X b216aa4ad -> 7132d3d78
refs/heads/master 3077c6d3b -> 094f528b6
Simplifying cluster deployment and instructions
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7132d3d7
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7132d3d7
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7132d3d7
Branch: refs/heads/2_0_X
Commit: 7132d3d785c4be8c229db1388d7da092b367604f
Parents: b216aa4
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Mar 15 15:36:26 2018 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Mar 15 15:36:26 2018 +0100
----------------------------------------------------------------------
.../src/main/resources/domains.xml | 2 +-
.../src/main/resources/persistence.properties | 1 +
.../src/main/resources/persistence.properties | 1 +
.../elasticsearch/persistence.properties | 1 +
.../src/main/resources/jboss/domains.xml | 2 +-
.../systemadministration/highavailability.adoc | 54 +++-----------------
6 files changed, 11 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/7132d3d7/core/persistence-jpa/src/main/resources/domains.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/resources/domains.xml b/core/persistence-jpa/src/main/resources/domains.xml
index c793d83..69ba98e 100644
--- a/core/persistence-jpa/src/main/resources/domains.xml
+++ b/core/persistence-jpa/src/main/resources/domains.xml
@@ -50,7 +50,7 @@ under the License.
<entry key="openjpa.DataCache" value="true"/>
<entry key="openjpa.QueryCache" value="true"/>
- <entry key="openjpa.RemoteCommitProvider" value="sjvm"/>
+ <entry key="openjpa.RemoteCommitProvider" value="${openjpa.RemoteCommitProvider:sjvm}"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/syncope/blob/7132d3d7/core/persistence-jpa/src/main/resources/persistence.properties
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/resources/persistence.properties b/core/persistence-jpa/src/main/resources/persistence.properties
index 7f2f6f6..946e588 100644
--- a/core/persistence-jpa/src/main/resources/persistence.properties
+++ b/core/persistence-jpa/src/main/resources/persistence.properties
@@ -16,3 +16,4 @@
# under the License.
content.directory=${conf.directory}
any.search.dao=org.apache.syncope.core.persistence.jpa.dao.JPAAnySearchDAO
+openjpa.RemoteCommitProvider=sjvm
http://git-wip-us.apache.org/repos/asf/syncope/blob/7132d3d7/ext/elasticsearch/persistence-jpa/src/main/resources/persistence.properties
----------------------------------------------------------------------
diff --git a/ext/elasticsearch/persistence-jpa/src/main/resources/persistence.properties b/ext/elasticsearch/persistence-jpa/src/main/resources/persistence.properties
index 6b8f4aa..a3048a1 100644
--- a/ext/elasticsearch/persistence-jpa/src/main/resources/persistence.properties
+++ b/ext/elasticsearch/persistence-jpa/src/main/resources/persistence.properties
@@ -16,3 +16,4 @@
# under the License.
content.directory=${conf.directory}
any.search.dao=org.apache.syncope.core.persistence.jpa.dao.ElasticsearchAnySearchDAO
+openjpa.RemoteCommitProvider=sjvm
http://git-wip-us.apache.org/repos/asf/syncope/blob/7132d3d7/fit/core-reference/src/main/resources/elasticsearch/persistence.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/elasticsearch/persistence.properties b/fit/core-reference/src/main/resources/elasticsearch/persistence.properties
index 6b8f4aa..a3048a1 100644
--- a/fit/core-reference/src/main/resources/elasticsearch/persistence.properties
+++ b/fit/core-reference/src/main/resources/elasticsearch/persistence.properties
@@ -16,3 +16,4 @@
# under the License.
content.directory=${conf.directory}
any.search.dao=org.apache.syncope.core.persistence.jpa.dao.ElasticsearchAnySearchDAO
+openjpa.RemoteCommitProvider=sjvm
http://git-wip-us.apache.org/repos/asf/syncope/blob/7132d3d7/fit/core-reference/src/main/resources/jboss/domains.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/jboss/domains.xml b/fit/core-reference/src/main/resources/jboss/domains.xml
index d39ed70..4745d28 100644
--- a/fit/core-reference/src/main/resources/jboss/domains.xml
+++ b/fit/core-reference/src/main/resources/jboss/domains.xml
@@ -50,7 +50,7 @@ under the License.
<entry key="openjpa.DataCache" value="true"/>
<entry key="openjpa.QueryCache" value="true"/>
- <entry key="openjpa.RemoteCommitProvider" value="sjvm"/>
+ <entry key="openjpa.RemoteCommitProvider" value="${openjpa.RemoteCommitProvider:sjvm}"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/syncope/blob/7132d3d7/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc
index 811c255..967d237 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc
@@ -27,53 +27,11 @@ http://openjpa.apache.org/builds/2.4.2/apache-openjpa/docs/ref_guide_event.html[
Such configuration, in fact, allows the OpenJPA data cache to remain synchronized when deployed in multiple JVMs, thus
enforcing data consistency across all Syncope Core instances.
-Replace
+The default configuration in `persistence.properties` is
+[source]
....
-classpath*:/coreContext.xml
-classpath*:/securityContext.xml
-classpath*:/logicContext.xml
-classpath*:/restCXFContext.xml
-classpath*:/persistenceContext.xml
-classpath*:/provisioning*Context.xml
-classpath*:/workflow*Context.xml
-....
-
-with
-
-....
-classpath*:/coreContext.xml
-classpath*:/securityContext.xml
-classpath*:/logicContext.xml
-classpath*:/restCXFContext.xml
-classpath:/persistenceContext.xml
-classpath*:/provisioning*Context.xml
-classpath*:/workflow*Context.xml
-....
-
-in `core/src/main/webapp/WEB-INF/web.xml`.
-
-Download
-ifeval::["{snapshotOrRelease}" == "release"]
-https://github.com/apache/syncope/blob/syncope-{docVersion}/core/persistence-jpa/src/main/resources/persistenceContext.xml[persistenceContext.xml^]
-endif::[]
-ifeval::["{snapshotOrRelease}" == "snapshot"]
-https://github.com/apache/syncope/tree/2_0_X/core/persistence-jpa/src/main/resources/persistenceContext.xml[persistenceContext.xml^]
-endif::[]
-and
-ifeval::["{snapshotOrRelease}" == "release"]
-https://github.com/apache/syncope/blob/syncope-{docVersion}/core/persistence-jpa/src/main/resources/domains.xml[domains.xml^]
-endif::[]
-ifeval::["{snapshotOrRelease}" == "snapshot"]
-https://github.com/apache/syncope/tree/2_0_X/core/persistence-jpa/src/main/resources/domains.xml[domains.xml^]
-endif::[]
-then save both under `core/src/main/resources/`.
-
-The default configuration in `domains.xml` is
-
-[source,xml]
-....
-<entry key="openjpa.RemoteCommitProvider" value="sjvm"/>
+openjpa.RemoteCommitProvider=sjvm
....
which is suited for single JVM installations; with multiple instances, more options like as TCP or JMS are available;
@@ -82,7 +40,7 @@ see the OpenJPA documentation for reference.
[WARNING]
====
The http://openjpa.apache.org/builds/2.4.2/apache-openjpa/docs/ref_guide_event.html[OpenJPA documentation^]'s XML
-snippets refer to a different configuration style; for example, when used in `domains.xml`, this:
+snippets refer to a different configuration style; for example, when used in persistence.properties`, this:
[source,xml]
....
@@ -91,9 +49,9 @@ snippets refer to a different configuration style; for example, when used in `do
becomes:
-[source,xml]
+[source]
....
-<entry key="openjpa.RemoteCommitProvider" value="tcp(Addresses=10.0.1.10;10.0.1.11)"/>
+openjpa.RemoteCommitProvider=tcp(Addresses=10.0.1.10;10.0.1.11)
....
====
[2/2] syncope git commit: Simplifying cluster deployment and
instructions
Posted by il...@apache.org.
Simplifying cluster deployment and instructions
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/094f528b
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/094f528b
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/094f528b
Branch: refs/heads/master
Commit: 094f528b6e3aa883db869468c04f1abc5de5c75c
Parents: 3077c6d
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Mar 15 15:36:26 2018 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Mar 15 15:41:34 2018 +0100
----------------------------------------------------------------------
.../src/main/resources/domains.xml | 2 +-
.../src/main/resources/persistence.properties | 1 +
.../src/main/resources/persistence.properties | 1 +
.../elasticsearch/persistence.properties | 1 +
.../src/main/resources/jboss/domains.xml | 2 +-
.../systemadministration/highavailability.adoc | 58 +++-----------------
6 files changed, 13 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/094f528b/core/persistence-jpa/src/main/resources/domains.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/resources/domains.xml b/core/persistence-jpa/src/main/resources/domains.xml
index c793d83..69ba98e 100644
--- a/core/persistence-jpa/src/main/resources/domains.xml
+++ b/core/persistence-jpa/src/main/resources/domains.xml
@@ -50,7 +50,7 @@ under the License.
<entry key="openjpa.DataCache" value="true"/>
<entry key="openjpa.QueryCache" value="true"/>
- <entry key="openjpa.RemoteCommitProvider" value="sjvm"/>
+ <entry key="openjpa.RemoteCommitProvider" value="${openjpa.RemoteCommitProvider:sjvm}"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/syncope/blob/094f528b/core/persistence-jpa/src/main/resources/persistence.properties
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/resources/persistence.properties b/core/persistence-jpa/src/main/resources/persistence.properties
index 7f2f6f6..946e588 100644
--- a/core/persistence-jpa/src/main/resources/persistence.properties
+++ b/core/persistence-jpa/src/main/resources/persistence.properties
@@ -16,3 +16,4 @@
# under the License.
content.directory=${conf.directory}
any.search.dao=org.apache.syncope.core.persistence.jpa.dao.JPAAnySearchDAO
+openjpa.RemoteCommitProvider=sjvm
http://git-wip-us.apache.org/repos/asf/syncope/blob/094f528b/ext/elasticsearch/persistence-jpa/src/main/resources/persistence.properties
----------------------------------------------------------------------
diff --git a/ext/elasticsearch/persistence-jpa/src/main/resources/persistence.properties b/ext/elasticsearch/persistence-jpa/src/main/resources/persistence.properties
index 6b8f4aa..a3048a1 100644
--- a/ext/elasticsearch/persistence-jpa/src/main/resources/persistence.properties
+++ b/ext/elasticsearch/persistence-jpa/src/main/resources/persistence.properties
@@ -16,3 +16,4 @@
# under the License.
content.directory=${conf.directory}
any.search.dao=org.apache.syncope.core.persistence.jpa.dao.ElasticsearchAnySearchDAO
+openjpa.RemoteCommitProvider=sjvm
http://git-wip-us.apache.org/repos/asf/syncope/blob/094f528b/fit/core-reference/src/main/resources/elasticsearch/persistence.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/elasticsearch/persistence.properties b/fit/core-reference/src/main/resources/elasticsearch/persistence.properties
index 6b8f4aa..a3048a1 100644
--- a/fit/core-reference/src/main/resources/elasticsearch/persistence.properties
+++ b/fit/core-reference/src/main/resources/elasticsearch/persistence.properties
@@ -16,3 +16,4 @@
# under the License.
content.directory=${conf.directory}
any.search.dao=org.apache.syncope.core.persistence.jpa.dao.ElasticsearchAnySearchDAO
+openjpa.RemoteCommitProvider=sjvm
http://git-wip-us.apache.org/repos/asf/syncope/blob/094f528b/fit/core-reference/src/main/resources/jboss/domains.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/jboss/domains.xml b/fit/core-reference/src/main/resources/jboss/domains.xml
index d39ed70..4745d28 100644
--- a/fit/core-reference/src/main/resources/jboss/domains.xml
+++ b/fit/core-reference/src/main/resources/jboss/domains.xml
@@ -50,7 +50,7 @@ under the License.
<entry key="openjpa.DataCache" value="true"/>
<entry key="openjpa.QueryCache" value="true"/>
- <entry key="openjpa.RemoteCommitProvider" value="sjvm"/>
+ <entry key="openjpa.RemoteCommitProvider" value="${openjpa.RemoteCommitProvider:sjvm}"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/syncope/blob/094f528b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc
index 0faff0e..0126ac6 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/highavailability.adoc
@@ -23,57 +23,15 @@
When deploying multiple Syncope <<core>> instances with a single database or database cluster, it is of
fundamental importance that the contained OpenJPA instances are correctly configured for
-http://openjpa.apache.org/builds/2.4.2/apache-openjpa/docs/ref_guide_event.html[remote event notification^]. +
+http://ci.apache.org/projects/openjpa/trunk/docbook/ref_guide_event.html[remote event notification^]. +
Such configuration, in fact, allows the OpenJPA data cache to remain synchronized when deployed in multiple JVMs, thus
enforcing data consistency across all Syncope Core instances.
-Replace
+The default configuration in `persistence.properties` is
+[source]
....
-classpath*:/coreContext.xml
-classpath*:/securityContext.xml
-classpath*:/logicContext.xml
-classpath*:/restCXFContext.xml
-classpath*:/persistenceContext.xml
-classpath*:/provisioning*Context.xml
-classpath*:/workflow*Context.xml
-....
-
-with
-
-....
-classpath*:/coreContext.xml
-classpath*:/securityContext.xml
-classpath*:/logicContext.xml
-classpath*:/restCXFContext.xml
-classpath:/persistenceContext.xml
-classpath*:/provisioning*Context.xml
-classpath*:/workflow*Context.xml
-....
-
-in `core/src/main/webapp/WEB-INF/web.xml`.
-
-Download
-ifeval::["{snapshotOrRelease}" == "release"]
-https://github.com/apache/syncope/blob/syncope-{docVersion}/core/persistence-jpa/src/main/resources/persistenceContext.xml[persistenceContext.xml^]
-endif::[]
-ifeval::["{snapshotOrRelease}" == "snapshot"]
-https://github.com/apache/syncope/tree/master/core/persistence-jpa/src/main/resources/persistenceContext.xml[persistenceContext.xml^]
-endif::[]
-and
-ifeval::["{snapshotOrRelease}" == "release"]
-https://github.com/apache/syncope/blob/syncope-{docVersion}/core/persistence-jpa/src/main/resources/domains.xml[domains.xml^]
-endif::[]
-ifeval::["{snapshotOrRelease}" == "snapshot"]
-https://github.com/apache/syncope/tree/master/core/persistence-jpa/src/main/resources/domains.xml[domains.xml^]
-endif::[]
-then save both under `core/src/main/resources/`.
-
-The default configuration in `domains.xml` is
-
-[source,xml]
-....
-<entry key="openjpa.RemoteCommitProvider" value="sjvm"/>
+openjpa.RemoteCommitProvider=sjvm
....
which is suited for single JVM installations; with multiple instances, more options like as TCP or JMS are available;
@@ -81,8 +39,8 @@ see the OpenJPA documentation for reference.
[WARNING]
====
-The http://openjpa.apache.org/builds/2.4.2/apache-openjpa/docs/ref_guide_event.html[OpenJPA documentation^]'s XML
-snippets refer to a different configuration style; for example, when used in `domains.xml`, this:
+http://ci.apache.org/projects/openjpa/trunk/docbook/ref_guide_event.html[OpenJPA documentation^]'s XML
+snippets refer to a different configuration style; for example, when used in persistence.properties`, this:
[source,xml]
....
@@ -91,9 +49,9 @@ snippets refer to a different configuration style; for example, when used in `do
becomes:
-[source,xml]
+[source]
....
-<entry key="openjpa.RemoteCommitProvider" value="tcp(Addresses=10.0.1.10;10.0.1.11)"/>
+openjpa.RemoteCommitProvider=tcp(Addresses=10.0.1.10;10.0.1.11)
....
====