Author: olamy
Date: Tue Mar 25 11:18:10 2014
New Revision: 1581292
URL: http://svn.apache.org/r1581292
Log:
add some toString for debugging purpose and avoid hard coded values to prevent
test failures
Modified:
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MailingList.java
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
Modified:
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java?rev=1581292&r1=1581291&r2=1581292&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java
Tue Mar 25 11:18:10 2014
@@ -72,4 +72,13 @@ public class CiManagement
{
this.system = system;
}
+
+ @Override
+ public String toString()
+ {
+ return "CiManagement{" +
+ "system='" + system + '\'' +
+ ", url='" + url + '\'' +
+ '}';
+ }
}
Modified:
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java?rev=1581292&r1=1581291&r2=1581292&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java
Tue Mar 25 11:18:10 2014
@@ -72,4 +72,12 @@ public class IssueManagement
this.system = system;
}
+ @Override
+ public String toString()
+ {
+ return "IssueManagement{" +
+ "system='" + system + '\'' +
+ ", url='" + url + '\'' +
+ '}';
+ }
}
Modified:
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MailingList.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MailingList.java?rev=1581292&r1=1581291&r2=1581292&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MailingList.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MailingList.java
Tue Mar 25 11:18:10 2014
@@ -121,4 +121,17 @@ public class MailingList
{
return name;
}
+
+ @Override
+ public String toString()
+ {
+ return "MailingList{" +
+ "mainArchiveUrl='" + mainArchiveUrl + '\'' +
+ ", otherArchives=" + otherArchives +
+ ", name='" + name + '\'' +
+ ", postAddress='" + postAddress + '\'' +
+ ", subscribeAddress='" + subscribeAddress + '\'' +
+ ", unsubscribeAddress='" + unsubscribeAddress + '\'' +
+ '}';
+ }
}
Modified:
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java?rev=1581292&r1=1581291&r2=1581292&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java
Tue Mar 25 11:18:10 2014
@@ -60,4 +60,13 @@ public class Organization
{
this.name = name;
}
+
+ @Override
+ public String toString()
+ {
+ return "Organization{" +
+ "name='" + name + '\'' +
+ ", url='" + url + '\'' +
+ '}';
+ }
}
Modified:
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java?rev=1581292&r1=1581291&r2=1581292&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java
Tue Mar 25 11:18:10 2014
@@ -193,4 +193,23 @@ public class ProjectVersionMetadata
{
this.incomplete = incomplete;
}
+
+ @Override
+ public String toString()
+ {
+ return "ProjectVersionMetadata{" +
+ "id='" + id + '\'' +
+ ", url='" + url + '\'' +
+ ", name='" + name + '\'' +
+ ", description='" + description + '\'' +
+ ", organization=" + organization +
+ ", issueManagement=" + issueManagement +
+ ", scm=" + scm +
+ ", ciManagement=" + ciManagement +
+ ", licenses=" + licenses +
+ ", mailingLists=" + mailingLists +
+ ", dependencies=" + dependencies +
+ ", incomplete=" + incomplete +
+ '}';
+ }
}
Modified:
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java?rev=1581292&r1=1581291&r2=1581292&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java
Tue Mar 25 11:18:10 2014
@@ -73,4 +73,14 @@ public class Scm
{
this.connection = connection;
}
+
+ @Override
+ public String toString()
+ {
+ return "Scm{" +
+ "connection='" + connection + '\'' +
+ ", developerConnection='" + developerConnection + '\'' +
+ ", url='" + url + '\'' +
+ '}';
+ }
}
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java?rev=1581292&r1=1581291&r2=1581292&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
Tue Mar 25 11:18:10 2014
@@ -77,9 +77,9 @@ public class DefaultCassandraArchivaMana
private String projectVersionMetadataFamilyName = "projectversionmetadata";
- private String artifactMetadataFamilyName = "artifactmetadatamodel";
+ private String artifactMetadataFamilyName = "artifactmetadata";
- private String metadataFacetFamilyName = "metadatafacetmodel";
+ private String metadataFacetFamilyName = "metadatafacet";
private String mailingListFamilyName = "mailinglist";
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java?rev=1581292&r1=1581291&r2=1581292&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
Tue Mar 25 11:18:10 2014
@@ -30,9 +30,6 @@ import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
import java.util.Map;
/**
@@ -82,26 +79,23 @@ public class CassandraMetadataRepository
throws Exception
{
cassandraArchivaManager.getCluster().truncate(
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
- "project" );
+
cassandraArchivaManager.getProjectFamilyName() );
cassandraArchivaManager.getCluster().truncate(
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
- "namespace" );
+
cassandraArchivaManager.getNamespaceFamilyName() );
cassandraArchivaManager.getCluster().truncate(
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
- "repository" );
+
cassandraArchivaManager.getRepositoryFamilyName() );
cassandraArchivaManager.getCluster().truncate(
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
-
"projectversionmetadatamodel" );
+
cassandraArchivaManager.getProjectVersionMetadataFamilyName() );
cassandraArchivaManager.getCluster().truncate(
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
- "artifactmetadatamodel"
);
+
cassandraArchivaManager.getArtifactMetadataFamilyName() );
cassandraArchivaManager.getCluster().truncate(
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
- "metadatafacetmodel" );
+
cassandraArchivaManager.getMetadataFacetFamilyName() );
cassandraArchivaManager.getCluster().truncate(
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
- "metadatafacetmodel" );
-
- cassandraArchivaManager.getCluster().truncate(
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
- "mailinglist" );
+
cassandraArchivaManager.getMailingListFamilyName() );
}
