Repository: archiva Updated Branches: refs/heads/master cb38dbbbc -> 17f2989fe
Adding data path to configuration Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/acbcb487 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/acbcb487 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/acbcb487 Branch: refs/heads/master Commit: acbcb48747ed6bd94249c2494b4953eea27f9d93 Parents: cb38dbb Author: Martin Stockhammer <[email protected]> Authored: Sun Oct 22 17:01:27 2017 +0200 Committer: Martin Stockhammer <[email protected]> Committed: Sun Oct 22 17:01:27 2017 +0200 ---------------------------------------------------------------------- .../DefaultArchivaConfiguration.java | 15 ++++++-- .../src/main/mdo/configuration.mdo | 38 ++++++++------------ .../configuration/test-default-archiva.xml | 2 +- .../src/test/resources/scanner-archiva.xml | 2 +- .../src/test/resources/archiva-test.xml | 1 + .../src/test/resources/scanner-archiva.xml | 2 +- 6 files changed, 31 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/acbcb487/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java index d31287d..1dd0bae 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java @@ -202,16 +202,25 @@ public class DefaultArchivaConfiguration Registry subset = registry.getSubset( KEY ); if ( subset.getString( "version" ) == null ) { - // a little autodetection of v1, even if version is omitted (this was previously allowed) if ( subset.getSubset( "repositoryScanning" ).isEmpty() ) { - // only for empty, or v < 1 + // only for empty subset = readDefaultConfiguration(); + } else + { + throw new RuntimeException( "No version tag found in configuration. Archiva configuration version 1.x is not longer supported." ); } } Configuration config = new ConfigurationRegistryReader().read( subset ); - + if (StringUtils.isEmpty( config.getArchivaRuntimeConfiguration().getDataDirectory() )) { + Path appserverBaseDir = Paths.get(registry.getString("appserver.base", "")); + config.getArchivaRuntimeConfiguration().setDataDirectory( appserverBaseDir.normalize().toString() ); + } + if (StringUtils.isEmpty( config.getArchivaRuntimeConfiguration().getRepositoryBaseDirectory())) { + Path baseDir = Paths.get(config.getArchivaRuntimeConfiguration().getDataDirectory()); + config.getArchivaRuntimeConfiguration().setRepositoryBaseDirectory( baseDir.resolve("repositories").toString() ); + } config.getRepositoryGroups(); config.getRepositoryGroupsAsMap(); http://git-wip-us.apache.org/repos/asf/archiva/blob/acbcb487/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo index 971a830..d5d96cd 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo @@ -742,28 +742,6 @@ </field> </fields> </class> - <class> - <name>V1RepositoryConfiguration</name> - <version>1.0.0+</version> - <superClass>ManagedRepositoryConfiguration</superClass> - <fields> - <field> - <name>url</name> - <version>1.0.0+</version> - <type>String</type> - <required>true</required> - <description> - The URL for this repository. - </description> - </field> - <field> - <name>indexed</name> - <version>1.0.0+</version> - <type>boolean</type> - <required>true</required> - </field> - </fields> - </class> <class> <name>LegacyArtifactPath</name> @@ -1552,6 +1530,20 @@ <type>FileLockConfiguration</type> </association> </field> + <field> + <name>dataDirectory</name> + <version>3.0.0+</version> + <description>The base directory where the archiva data is stored. If not set, the appserver.base is used.</description> + <type>String</type> + <required>false</required> + </field> + <field> + <name>repositoryBaseDirectory</name> + <version>3.0.0+</version> + <description>The base directory for local storage of repository data. If not set, it's ${dataDirectory}/repositories.</description> + <type>String</type> + <required>false</required> + </field> </fields> </class> @@ -1559,7 +1551,7 @@ <name>RedbackRuntimeConfiguration</name> <version>1.4.0+</version> <description> - The runtime configuration. + The redback runtime configuration. </description> <fields> <field> http://git-wip-us.apache.org/repos/asf/archiva/blob/acbcb487/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml index ab0f50d..bb3d803 100755 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml @@ -1,5 +1,5 @@ <configuration> - <version>2</version> + <version>3.0.0</version> <managedRepositories> <managedRepository> <id>internal</id> http://git-wip-us.apache.org/repos/asf/archiva/blob/acbcb487/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/scanner-archiva.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/scanner-archiva.xml b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/scanner-archiva.xml index 13a884e..de6b2b6 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/scanner-archiva.xml +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/scanner-archiva.xml @@ -19,7 +19,7 @@ --> <configuration> - + <version>3.0.0</version> <repositoryScanning> <fileTypes> <fileType> http://git-wip-us.apache.org/repos/asf/archiva/blob/acbcb487/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml index 0c1f93c..277e287 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml @@ -19,6 +19,7 @@ --> <configuration> + <version>3.0.0</version> <managedRepositories> <managedRepository> <id>testRepo</id> http://git-wip-us.apache.org/repos/asf/archiva/blob/acbcb487/archiva-modules/plugins/maven2-repository/src/test/resources/scanner-archiva.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/resources/scanner-archiva.xml b/archiva-modules/plugins/maven2-repository/src/test/resources/scanner-archiva.xml index 13a884e..de6b2b6 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/resources/scanner-archiva.xml +++ b/archiva-modules/plugins/maven2-repository/src/test/resources/scanner-archiva.xml @@ -19,7 +19,7 @@ --> <configuration> - + <version>3.0.0</version> <repositoryScanning> <fileTypes> <fileType>
