You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2012/08/13 14:10:16 UTC
svn commit: r1372384 - in /maven/indexer/trunk:
indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
pom.xml
Author: cstamas
Date: Mon Aug 13 12:10:15 2012
New Revision: 1372384
URL: http://svn.apache.org/viewvc?rev=1372384&view=rev
Log:
Undoing the bump to Java6, MI remains Java5.
Modified:
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
maven/indexer/trunk/pom.xml
Modified: maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java?rev=1372384&r1=1372383&r2=1372384&view=diff
==============================================================================
--- maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java (original)
+++ maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java Mon Aug 13 12:10:15 2012
@@ -171,13 +171,11 @@ public class DefaultIndexingContext
}
}
- @Override
public Directory getIndexDirectory()
{
return indexDirectory;
}
- @Override
public File getIndexDirectoryFile()
{
return indexDirectoryFile;
@@ -362,40 +360,36 @@ public class DefaultIndexingContext
IndexUtils.deleteTimestamp( indexDirectory );
}
}
+
+ // ==
- @Override
public boolean isSearchable()
{
return searchable;
}
- @Override
public void setSearchable( boolean searchable )
{
this.searchable = searchable;
}
- @Override
public String getId()
{
return id;
}
- @Override
public void updateTimestamp()
throws IOException
{
updateTimestamp( false );
}
- @Override
public void updateTimestamp( boolean save )
throws IOException
{
updateTimestamp( save, new Date() );
}
- @Override
public void updateTimestamp( boolean save, Date timestamp )
throws IOException
{
@@ -407,13 +401,11 @@ public class DefaultIndexingContext
}
}
- @Override
public Date getTimestamp()
{
return timestamp;
}
- @Override
public int getSize()
throws IOException
{
@@ -428,25 +420,21 @@ public class DefaultIndexingContext
}
}
- @Override
public String getRepositoryId()
{
return repositoryId;
}
- @Override
public File getRepository()
{
return repository;
}
- @Override
public String getRepositoryUrl()
{
return repositoryUrl;
}
- @Override
public String getIndexUpdateUrl()
{
if ( repositoryUrl != null )
@@ -459,7 +447,6 @@ public class DefaultIndexingContext
return indexUpdateUrl;
}
- @Override
public Analyzer getAnalyzer()
{
return new NexusAnalyzer();
@@ -488,14 +475,12 @@ public class DefaultIndexingContext
this.searcherManager = new SearcherManager( indexWriter, false, new NexusIndexSearcherFactory( this ) );
}
- @Override
public IndexWriter getIndexWriter()
throws IOException
{
return indexWriter;
}
- @Override
public IndexSearcher acquireIndexSearcher()
throws IOException
{
@@ -504,7 +489,6 @@ public class DefaultIndexingContext
return searcherManager.acquire();
}
- @Override
public void releaseIndexSearcher( final IndexSearcher is )
throws IOException
{
@@ -515,7 +499,6 @@ public class DefaultIndexingContext
searcherManager.release( is );
}
- @Override
public void commit()
throws IOException
{
@@ -535,7 +518,6 @@ public class DefaultIndexingContext
}
}
- @Override
public void rollback()
throws IOException
{
@@ -555,7 +537,6 @@ public class DefaultIndexingContext
}
}
- @Override
public synchronized void optimize()
throws CorruptIndexException, IOException
{
@@ -576,7 +557,6 @@ public class DefaultIndexingContext
}
}
- @Override
public synchronized void close( boolean deleteFiles )
throws IOException
{
@@ -593,7 +573,6 @@ public class DefaultIndexingContext
indexDirectory = null;
}
- @Override
public synchronized void purge()
throws IOException
{
@@ -612,7 +591,6 @@ public class DefaultIndexingContext
updateTimestamp( true, null );
}
- @Override
public synchronized void replace( Directory directory )
throws IOException
{
@@ -627,14 +605,12 @@ public class DefaultIndexingContext
optimize();
}
- @Override
public synchronized void merge( Directory directory )
throws IOException
{
merge( directory, null );
}
- @Override
public synchronized void merge( Directory directory, DocumentFilter filter )
throws IOException
{
@@ -727,13 +703,11 @@ public class DefaultIndexingContext
}
}
- @Override
public GavCalculator getGavCalculator()
{
return gavCalculator;
}
- @Override
public List<IndexCreator> getIndexCreators()
{
return Collections.unmodifiableList( indexCreators );
@@ -741,7 +715,6 @@ public class DefaultIndexingContext
// groups
- @Override
public synchronized void rebuildGroups()
throws IOException
{
@@ -785,14 +758,12 @@ public class DefaultIndexingContext
}
}
- @Override
public Set<String> getAllGroups()
throws IOException
{
return getGroups( ArtifactInfo.ALL_GROUPS, ArtifactInfo.ALL_GROUPS_VALUE, ArtifactInfo.ALL_GROUPS_LIST );
}
- @Override
public synchronized void setAllGroups( Collection<String> groups )
throws IOException
{
@@ -800,14 +771,12 @@ public class DefaultIndexingContext
commit();
}
- @Override
public Set<String> getRootGroups()
throws IOException
{
return getGroups( ArtifactInfo.ROOT_GROUPS, ArtifactInfo.ROOT_GROUPS_VALUE, ArtifactInfo.ROOT_GROUPS_LIST );
}
- @Override
public synchronized void setRootGroups( Collection<String> groups )
throws IOException
{
Modified: maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java?rev=1372384&r1=1372383&r2=1372384&view=diff
==============================================================================
--- maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java (original)
+++ maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java Mon Aug 13 12:10:15 2012
@@ -100,49 +100,41 @@ public class MergedIndexingContext
return membersProvider.getMembers();
}
- @Override
public String getId()
{
return id;
}
- @Override
public String getRepositoryId()
{
return repositoryId;
}
- @Override
public File getRepository()
{
return repository;
}
- @Override
public String getRepositoryUrl()
{
return null;
}
- @Override
public String getIndexUpdateUrl()
{
return null;
}
- @Override
public boolean isSearchable()
{
return searchable;
}
- @Override
public void setSearchable( boolean searchable )
{
this.searchable = searchable;
}
- @Override
public Date getTimestamp()
{
Date ts = null;
@@ -163,28 +155,24 @@ public class MergedIndexingContext
return ts;
}
- @Override
public void updateTimestamp()
throws IOException
{
// noop
}
- @Override
public void updateTimestamp( boolean save )
throws IOException
{
// noop
}
- @Override
public void updateTimestamp( boolean save, Date date )
throws IOException
{
// noop
}
- @Override
public int getSize()
throws IOException
{
@@ -198,7 +186,6 @@ public class MergedIndexingContext
return size;
}
- @Override
public IndexSearcher acquireIndexSearcher()
throws IOException
{
@@ -206,7 +193,6 @@ public class MergedIndexingContext
return new NexusIndexMultiSearcher( mr );
}
- @Override
public void releaseIndexSearcher( IndexSearcher indexSearcher )
throws IOException
{
@@ -223,14 +209,12 @@ public class MergedIndexingContext
}
- @Override
public IndexWriter getIndexWriter()
throws IOException
{
throw new UnsupportedOperationException( getClass().getName() + " indexing context is read-only!" );
}
- @Override
public List<IndexCreator> getIndexCreators()
{
HashSet<IndexCreator> creators = new HashSet<IndexCreator>();
@@ -243,94 +227,80 @@ public class MergedIndexingContext
return new ArrayList<IndexCreator>( creators );
}
- @Override
public Analyzer getAnalyzer()
{
return new NexusAnalyzer();
}
- @Override
public void commit()
throws IOException
{
// noop
}
- @Override
public void rollback()
throws IOException
{
// noop
}
- @Override
public void optimize()
throws IOException
{
// noop
}
- @Override
public void close( boolean deleteFiles )
throws IOException
{
// noop
}
- @Override
public void purge()
throws IOException
{
// noop
}
- @Override
public void merge( Directory directory )
throws IOException
{
// noop
}
- @Override
public void merge( Directory directory, DocumentFilter filter )
throws IOException
{
// noop
}
- @Override
public void replace( Directory directory )
throws IOException
{
// noop
}
- @Override
public Directory getIndexDirectory()
{
return directory;
}
- @Override
public File getIndexDirectoryFile()
{
return directoryFile;
}
- @Override
public GavCalculator getGavCalculator()
{
return gavCalculator;
}
- @Override
public void setAllGroups( Collection<String> groups )
throws IOException
{
// noop
}
- @Override
public Set<String> getAllGroups()
throws IOException
{
@@ -344,14 +314,12 @@ public class MergedIndexingContext
return result;
}
- @Override
public void setRootGroups( Collection<String> groups )
throws IOException
{
// noop
}
- @Override
public Set<String> getRootGroups()
throws IOException
{
@@ -365,7 +333,6 @@ public class MergedIndexingContext
return result;
}
- @Override
public void rebuildGroups()
throws IOException
{
Modified: maven/indexer/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/indexer/trunk/pom.xml?rev=1372384&r1=1372383&r2=1372384&view=diff
==============================================================================
--- maven/indexer/trunk/pom.xml (original)
+++ maven/indexer/trunk/pom.xml Mon Aug 13 12:10:15 2012
@@ -141,13 +141,13 @@ under the License.
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java16</artifactId>
+ <artifactId>java15</artifactId>
<version>1.0</version>
</signature>
</configuration>
<executions>
<execution>
- <id>check-java-1.6-compat</id>
+ <id>check-java-1.5-compat</id>
<phase>process-classes</phase>
<goals>
<goal>check</goal>
@@ -197,8 +197,8 @@ under the License.
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
<plugin>