svn commit: r1443265 - in /archiva/trunk/archiva-modules/archiva-base: archiva-configuration/src/main/resources/org/apache/archiva/configuration/ archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repositor...

[ol...@apache.org]

Author: olamy
Date: Wed Feb  6 22:54:56 2013
New Revision: 1443265

URL: http://svn.apache.org/viewvc?rev=1443265&view=rev
Log:
dont use a default directory inside data for repositories content

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml
    archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml?rev=1443265&r1=1443264&r2=1443265&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml Wed Feb  6 22:54:56 2013
@@ -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>

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java?rev=1443265&r1=1443264&r2=1443265&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java Wed Feb  6 22:54:56 2013
@@ -561,9 +561,8 @@ public class DefaultManagedRepositoryAdm
         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 DefaultManagedRepositoryAdm
 
         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() )