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

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml
index c8ef58eb780d804c976b8c82f5304bda22bc8bc2..62940dcf1917ab8476a964273900cbc18b795e6e 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml
@@ -5,8 +5,8 @@
     <managedRepository>
       <id>internal</id>
       <name>Archiva Managed Internal Repository</name>
-      <location>${appserver.base}/data/repositories/internal</location>
-      <indexDir>${appserver.base}/data/repositories/internal/.indexer</indexDir>
+      <location>${appserver.base}/repositories/internal</location>
+      <indexDir>${appserver.base}/repositories/internal/.indexer</indexDir>
       <layout>default</layout>
       <releases>true</releases>
       <snapshots>false</snapshots>
@@ -18,8 +18,8 @@
     <managedRepository>
       <id>snapshots</id>
       <name>Archiva Managed Snapshot Repository</name>
-      <location>${appserver.base}/data/repositories/snapshots</location>
-      <indexDir>${appserver.base}/data/repositories/snapshots/.indexer</indexDir>
+      <location>${appserver.base}/repositories/snapshots</location>
+      <indexDir>${appserver.base}/repositories/snapshots/.indexer</indexDir>
       <layout>default</layout>
       <releases>false</releases>
       <snapshots>true</snapshots>

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
index 2fc8f7235147ef4ef3dfa93020940be65fd405e5..83f41b8f352911bd8012805cf119657d93f3954a 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
@@ -561,9 +561,8 @@ public class DefaultManagedRepositoryAdmin
         if ( !file.isAbsolute() )
         {
             // add appserver.base/repositories
-            file = new File(
-                getRegistry().getString( "appserver.base" ) + File.separatorChar + "data" + File.separatorChar
-                    + "repositories", repository.getLocation() );
+            file = new File( getRegistry().getString( "appserver.base" ) + File.separatorChar + "repositories",
+                             repository.getLocation() );
         }
         repository.setLocation( file.getCanonicalPath() );
         if ( !file.exists() )
@@ -597,9 +596,9 @@ public class DefaultManagedRepositoryAdmin
 
         if ( !repositoryDirectory.isAbsolute() )
         {
-            repositoryDirectory = new File(
-                getRegistry().getString( "appserver.base" ) + File.separatorChar + "data" + File.separatorChar
-                    + "repositories", repository.getLocation() );
+            repositoryDirectory =
+                new File( getRegistry().getString( "appserver.base" ) + File.separatorChar + "repositories",
+                          repository.getLocation() );
         }
 
         if ( !repositoryDirectory.exists() )