Author: brett
Date: Fri Aug 3 00:36:53 2007
New Revision: 562369
URL: http://svn.apache.org/viewvc?view=rev&rev=562369
Log:
[MRM-347] prevent creating /${appserver.home} directory which is not populated
under the appserver for some reason. The base directory is the appropriate
location for data anyway - so these are the values that should have been used.
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml?view=diff&rev=562369&r1=562368&r2=562369
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
(original)
+++
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
Fri Aug 3 00:36:53 2007
@@ -5,7 +5,7 @@
<repository>
<id>internal</id>
<name>Archiva Managed Internal Repository</name>
- <url>file://${appserver.home}/repositories/internal</url>
+ <url>file://${appserver.base}/repositories/internal</url>
<layout>default</layout>
<releases>true</releases>
<snapshots>false</snapshots>
@@ -15,7 +15,7 @@
<repository>
<id>snapshots</id>
<name>Archiva Managed Snapshot Repository</name>
- <url>file://${appserver.home}/repositories/snapshots</url>
+ <url>file://${appserver.base}/repositories/snapshots</url>
<layout>default</layout>
<releases>false</releases>
<snapshots>true</snapshots>
@@ -46,7 +46,7 @@
<proxyConnector>
<sourceRepoId>internal</sourceRepoId>
<targetRepoId>central</targetRepoId>
- <proxyId />
+ <proxyId/>
<policies>
<snapshots>disabled</snapshots>
<releases>once</releases>
@@ -60,7 +60,7 @@
<proxyConnector>
<sourceRepoId>internal</sourceRepoId>
<targetRepoId>maven2-repository.dev.java.net</targetRepoId>
- <proxyId />
+ <proxyId/>
<policies>
<snapshots>disabled</snapshots>
<releases>once</releases>
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml?view=diff&rev=562369&r1=562368&r2=562369
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
(original)
+++
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
Fri Aug 3 00:36:53 2007
@@ -23,7 +23,7 @@
<repository>
<id>internal</id>
<name>Archiva Managed Internal Repository</name>
- <url>file://${appserver.home}/repositories/internal</url>
+ <url>file://${appserver.base}/repositories/internal</url>
<layout>default</layout>
<releases>true</releases>
<snapshots>false</snapshots>
@@ -33,7 +33,7 @@
<repository>
<id>snapshots</id>
<name>Archiva Managed Snapshot Repository</name>
- <url>file://${appserver.home}/repositories/internal</url>
+ <url>file://${appserver.base}/repositories/internal</url>
<layout>default</layout>
<releases>false</releases>
<snapshots>true</snapshots>
@@ -64,7 +64,7 @@
<proxyConnector>
<sourceRepoId>internal</sourceRepoId>
<targetRepoId>central</targetRepoId>
- <proxyId />
+ <proxyId/>
<snapshotsPolicy>disabled</snapshotsPolicy>
<releasePolicy>never</releasePolicy>
<failurePolicy>not-found</failurePolicy>
@@ -72,7 +72,7 @@
<proxyConnector>
<sourceRepoId>internal</sourceRepoId>
<targetRepoId>maven2-repository.dev.java.net</targetRepoId>
- <proxyId />
+ <proxyId/>
<snapshotsPolicy>disabled</snapshotsPolicy>
<releasePolicy>never</releasePolicy>
<failurePolicy>not-found</failurePolicy>
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java?view=diff&rev=562369&r1=562368&r2=562369
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
Fri Aug 3 00:36:53 2007
@@ -30,13 +30,15 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
*/
-public class ArchivaConfigurationTest extends PlexusTestCase
+public class ArchivaConfigurationTest
+ extends PlexusTestCase
{
- public void testDefaults() throws Exception
+ public void testDefaults()
+ throws Exception
{
ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup( ArchivaConfiguration.class,
"test-defaults" );
-
+
Configuration configuration = archivaConfiguration.getConfiguration();
// check default configuration
@@ -44,7 +46,8 @@
assertTrue( "check configuration has default elements",
configuration.getRepositories().isEmpty() );
}
- public void testGetConfiguration() throws Exception
+ public void testGetConfiguration()
+ throws Exception
{
ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup(
ArchivaConfiguration.class.getName(), "test-configuration" );
@@ -75,23 +78,24 @@
RepositoryConfiguration repository =
(RepositoryConfiguration)
configuration.getRepositories().iterator().next();
- assertEquals( "check managed repositories",
"file://${appserver.home}/repositories/internal",
+ assertEquals( "check managed repositories",
"file://${appserver.base}/repositories/internal",
repository.getUrl() );
assertEquals( "check managed repositories", "Archiva Managed Internal
Repository", repository.getName() );
assertEquals( "check managed repositories", "internal",
repository.getId() );
assertEquals( "check managed repositories", "default",
repository.getLayout() );
assertTrue( "check managed repositories", repository.isIndexed() );
-
+
WebappConfiguration webapp = (WebappConfiguration)
configuration.getWebapp();
assertNotNull( "check webapp", webapp );
-
+
UserInterfaceOptions ui = (UserInterfaceOptions) webapp.getUi();
- assertNotNull( "check webapp ui", ui );
+ assertNotNull( "check webapp ui", ui );
assertTrue( "check showFindArtifacts", ui.isShowFindArtifacts() );
assertTrue( "check appletFindEnabled", ui.isAppletFindEnabled() );
}
- public void testGetConfigurationSystemOverride() throws Exception
+ public void testGetConfigurationSystemOverride()
+ throws Exception
{
ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup(
ArchivaConfiguration.class.getName(), "test-configuration" );
@@ -104,7 +108,8 @@
// assertEquals( "check indexPath", ".index",
configuration.getIndexPath() );
}
- public void testStoreConfiguration() throws Exception
+ public void testStoreConfiguration()
+ throws Exception
{
File file = getTestFile( "target/test/test-file.xml" );
file.delete();
@@ -134,7 +139,8 @@
// assertEquals( "check value", "index-path",
configuration.getIndexPath() );
}
- public void testStoreConfigurationUser() throws Exception
+ public void testStoreConfigurationUser()
+ throws Exception
{
File baseFile = getTestFile( "target/test/test-file.xml" );
baseFile.delete();
@@ -164,7 +170,8 @@
// assertEquals( "check value", "index-path",
configuration.getIndexPath() );
}
- public void testStoreConfigurationFallback() throws Exception
+ public void testStoreConfigurationFallback()
+ throws Exception
{
File baseFile = getTestFile( "target/test/test-file.xml" );
baseFile.delete();
@@ -194,7 +201,8 @@
// assertEquals( "check value", "index-path",
configuration.getIndexPath() );
}
- public void testRemoveProxiedRepositoryAndStoreConfiguration() throws
Exception
+ public void testRemoveProxiedRepositoryAndStoreConfiguration()
+ throws Exception
{
// MRM-300
