You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/06/13 22:04:47 UTC
[2/2] archiva git commit: [MRM-1954] Adding validatehierarchy
property for JCR
[MRM-1954] Adding validatehierarchy property for JCR
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/dc259c03
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/dc259c03
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/dc259c03
Branch: refs/heads/master
Commit: dc259c035bf3c7408367c1cc7fc27aadfca8fefb
Parents: 3a18da1
Author: Martin Stockhammer <ma...@apache.org>
Authored: Wed Jun 14 00:04:07 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Wed Jun 14 00:04:07 2017 +0200
----------------------------------------------------------------------
archiva-jetty/pom.xml | 1 +
.../archiva-web/archiva-rest/archiva-rest-services/pom.xml | 1 +
archiva-modules/archiva-web/archiva-webapp-test/pom.xml | 4 ++++
archiva-modules/archiva-web/archiva-webdav/pom.xml | 1 +
.../metadata/repository/jcr/ArchivaJcrRepositoryConfig.java | 9 +++++++++
5 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/dc259c03/archiva-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index f5cbd3e..33b0048 100644
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -180,6 +180,7 @@
<systemProperty>AsyncLoggerConfig.WaitStrategy=Block</systemProperty>
<systemProperty>archiva.repositorySessionFactory.id=jcr</systemProperty>
<systemProperty>archiva.cassandra.configuration.file=%ARCHIVA_BASE%/conf/archiva-cassandra.properties</systemProperty>
+ <systemProperty>org.apache.jackrabbit.core.state.validatehierarchy=true</systemProperty>
</systemProperties>
<extraArguments>
<extraArgument>-XX:MaxPermSize=128m</extraArgument>
http://git-wip-us.apache.org/repos/asf/archiva/blob/dc259c03/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 2c471a5..882cd6f 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -471,6 +471,7 @@
<!--org.apache.jackrabbit.minMemoryPerCache>1</org.apache.jackrabbit.minMemoryPerCache-->
<archiva.repositorySessionFactory.id>jcr</archiva.repositorySessionFactory.id>
<openjpa.Log>${openjpa.Log}</openjpa.Log>
+ <org.apache.jackrabbit.core.state.validatehierarchy>true</org.apache.jackrabbit.core.state.validatehierarchy>
</systemPropertyVariables>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/archiva/blob/dc259c03/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index b68c2ad..30fd890 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -600,6 +600,10 @@
<name>openjpa.Log</name>
<value>${openjpa.Log}</value>
</systemProperty>
+ <systemProperty>
+ <name>org.apache.jackrabbit.core.state.validatehierarchy</name>
+ <value>true</value>
+ </systemProperty>
</systemProperties>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/archiva/blob/dc259c03/archiva-modules/archiva-web/archiva-webdav/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 5d59664..2b08b3f 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -331,6 +331,7 @@
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
<archiva.repositorySessionFactory.id>mock</archiva.repositorySessionFactory.id>
<openjpa.Log>${openjpa.Log}</openjpa.Log>
+ <org.apache.jackrabbit.core.state.validatehierarchy>true</org.apache.jackrabbit.core.state.validatehierarchy>
</systemPropertyVariables>
<forkMode>${webdav.forkMode}</forkMode>
</configuration>
http://git-wip-us.apache.org/repos/asf/archiva/blob/dc259c03/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
index 11d7cae..8271e2b 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
@@ -30,6 +30,15 @@ import java.io.File;
*/
public class ArchivaJcrRepositoryConfig
{
+ // Recommended to avoid inconsistencies caused by race conditions.
+ static
+ {
+ if ( !System.getProperties( ).containsKey( "org.apache.jackrabbit.core.state.validatehierarchy" ) )
+ {
+ System.setProperty( "org.apache.jackrabbit.core.state.validatehierarchy", "true" );
+ }
+ }
+
public static RepositoryConfig create( String file, String home )
throws ConfigurationException
{