Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dont use a default directory inside data for repositories content 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1443265 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-02-06 22:54:56 +00:00
parent ac1cea3827
commit 4fe1215675
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml
View File

@ -5,8 +5,8 @@
<managedRepository> <managedRepository>
<id>internal</id> <id>internal</id>
<name>Archiva Managed Internal Repository</name> <name>Archiva Managed Internal Repository</name>
<location>${appserver.base}/data/repositories/internal</location> <location>${appserver.base}/repositories/internal</location>
<indexDir>${appserver.base}/data/repositories/internal/.indexer</indexDir> <indexDir>${appserver.base}/repositories/internal/.indexer</indexDir>
<layout>default</layout> <layout>default</layout>
<releases>true</releases> <releases>true</releases>
<snapshots>false</snapshots> <snapshots>false</snapshots>
@ -18,8 +18,8 @@
<managedRepository> <managedRepository>
<id>snapshots</id> <id>snapshots</id>
<name>Archiva Managed Snapshot Repository</name> <name>Archiva Managed Snapshot Repository</name>
<location>${appserver.base}/data/repositories/snapshots</location> <location>${appserver.base}/repositories/snapshots</location>
<indexDir>${appserver.base}/data/repositories/snapshots/.indexer</indexDir> <indexDir>${appserver.base}/repositories/snapshots/.indexer</indexDir>
<layout>default</layout> <layout>default</layout>
<releases>false</releases> <releases>false</releases>
<snapshots>true</snapshots> <snapshots>true</snapshots>

11
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
View File

@ -561,9 +561,8 @@ public class DefaultManagedRepositoryAdmin
if ( !file.isAbsolute() ) if ( !file.isAbsolute() )
{ {
// add appserver.base/repositories // add appserver.base/repositories
file = new File( file = new File( getRegistry().getString( "appserver.base" ) + File.separatorChar + "repositories",
getRegistry().getString( "appserver.base" ) + File.separatorChar + "data" + File.separatorChar repository.getLocation() );
+ "repositories", repository.getLocation() );
} }
repository.setLocation( file.getCanonicalPath() ); repository.setLocation( file.getCanonicalPath() );
if ( !file.exists() ) if ( !file.exists() )
@ -597,9 +596,9 @@ public class DefaultManagedRepositoryAdmin
if ( !repositoryDirectory.isAbsolute() ) if ( !repositoryDirectory.isAbsolute() )
{ {
repositoryDirectory = new File( repositoryDirectory =
getRegistry().getString( "appserver.base" ) + File.separatorChar + "data" + File.separatorChar new File( getRegistry().getString( "appserver.base" ) + File.separatorChar + "repositories",
+ "repositories", repository.getLocation() ); repository.getLocation() );
} }
if ( !repositoryDirectory.exists() ) if ( !repositoryDirectory.exists() )