Author: olamy
Date: Mon May 27 13:16:10 2013
New Revision: 1486612
URL: http://svn.apache.org/r1486612
Log:
fix update of artifacts
Added:
archiva/sandbox/trunk/metadata-store-cassandra/src/test/resources/
archiva/sandbox/trunk/metadata-store-cassandra/src/test/resources/log4j2-test.xml
(contents, props changed)
- copied, changed from r1486611,
archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/log4j2-test.xml
Removed:
archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/log4j2-test.xml
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1486612&r1=1486611&r2=1486612&view=diff
==============================================================================
---
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
(original)
+++
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Mon May 27 13:16:10 2013
@@ -558,10 +558,18 @@ public class CassandraMetadataRepository
artifactMeta.getFileLastModified(),
artifactMeta.getSize(), artifactMeta.getMd5(),
artifactMeta.getSha1(), artifactMeta.getWhenGathered() );
- artifactMetadataModelEntityManager.put( artifactMetadataModel );
+ } else {
+ artifactMetadataModel.setFileLastModified(
artifactMeta.getFileLastModified().getTime() );
+ artifactMetadataModel.setWhenGathered(
artifactMeta.getWhenGathered().getTime() );
+ artifactMetadataModel.setSize( artifactMeta.getSize() );
+ artifactMetadataModel.setMd5( artifactMeta.getMd5() );
+ artifactMetadataModel.setSha1( artifactMeta.getSha1() );
+ artifactMetadataModel.setVersion( artifactMeta.getVersion() );
}
+ artifactMetadataModelEntityManager.put( artifactMetadataModel );
+
// now facets
updateFacets( artifactMeta, artifactMetadataModel );
@@ -863,6 +871,7 @@ public class CassandraMetadataRepository
if ( ( startTime != null ? when.getTime() >=
startTime.getTime() : true ) && ( endTime != null ?
when.getTime() <= endTime.getTime() : true ) )
{
+ logger.debug( "getArtifactsByDateRange visitAll
found: {}", artifactMetadataModel );
artifactMetadataModels.add( artifactMetadataModel
);
}
}
@@ -945,6 +954,11 @@ public class CassandraMetadataRepository
{
final List<ArtifactMetadataModel> artifactMetadataModels = new
ArrayList<ArtifactMetadataModel>();
+ if ( logger.isDebugEnabled() )
+ {
+ logger.debug( "all ArtifactMetadataModel: {}",
artifactMetadataModelEntityManager.getAll() );
+ }
+
// FIXME cql query
artifactMetadataModelEntityManager.visitAll( new
Function<ArtifactMetadataModel, Boolean>()
{
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java?rev=1486612&r1=1486611&r2=1486612&view=diff
==============================================================================
---
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
(original)
+++
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
Mon May 27 13:16:10 2013
@@ -78,7 +78,7 @@ public class CassandraMetadataRepository
public void shutdown()
throws Exception
{
- clearReposAndNamespace();
+ //clearReposAndNamespace();
}
protected void clearReposAndNamespace()
Copied:
archiva/sandbox/trunk/metadata-store-cassandra/src/test/resources/log4j2-test.xml
(from r1486611,
archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/log4j2-test.xml)
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/test/resources/log4j2-test.xml?p2=archiva/sandbox/trunk/metadata-store-cassandra/src/test/resources/log4j2-test.xml&p1=archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/log4j2-test.xml&r1=1486611&r2=1486612&rev=1486612&view=diff
==============================================================================
---
archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/log4j2-test.xml
(original)
+++
archiva/sandbox/trunk/metadata-store-cassandra/src/test/resources/log4j2-test.xml
Mon May 27 13:16:10 2013
@@ -33,11 +33,11 @@
<loggers>
- <asyncLogger name="org.apache.archiva" level="debug"/>
+ <logger
name="org.apache.archiva.metadata.repository.cassandra.CassandraMetadataRepository"
level="debug"/>
- <asyncRoot level="info" includeLocation="true">
+ <root level="info" includeLocation="true">
<appender-ref ref="console"/>
- </asyncRoot>
+ </root>
</loggers>
</configuration>
Propchange:
archiva/sandbox/trunk/metadata-store-cassandra/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/sandbox/trunk/metadata-store-cassandra/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
