@@ -16,25 +16,15 @@ | |||
~ KIND, either express or implied. See the License for the | |||
~ specific language governing permissions and limitations | |||
~ under the License. | |||
--> | |||
--> | |||
<configuration status="debug"> | |||
<appenders> | |||
<Console name="console" target="SYSTEM_OUT"> | |||
<!--PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/--> | |||
<PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n}" /> | |||
</Console> | |||
</appenders> | |||
<loggers> | |||
<logger name="org.apache.archiva.common.filelock" level="debug"/> | |||
<logger name="org.apache.archiva.common.filelock" level="info"/> | |||
<root level="info" includeLocation="true"> | |||
<appender-ref ref="console"/> | |||
</root> |
@@ -35,15 +35,14 @@ import org.apache.maven.index.NexusIndexer; | |||
import org.apache.maven.index.OSGI; | |||
import org.apache.maven.index.QueryCreator; | |||
import org.apache.maven.index.SearchType; | |||
import org.apache.maven.index.context.IndexCreator; | |||
import org.apache.maven.index.context.IndexingContext; | |||
import org.apache.maven.index.expr.SearchExpression; | |||
import org.apache.maven.index.expr.SearchTyped; | |||
import org.apache.maven.index.expr.SourcedSearchExpression; | |||
import org.apache.maven.index.expr.UserInputSearchExpression; | |||
import org.apache.maven.index.shaded.lucene.search.BooleanClause; | |||
import org.apache.maven.index.shaded.lucene.search.BooleanClause.Occur; | |||
import org.apache.maven.index.shaded.lucene.search.BooleanQuery; | |||
import org.apache.maven.index_shaded.lucene.search.BooleanClause; | |||
import org.apache.maven.index_shaded.lucene.search.BooleanClause.Occur; | |||
import org.apache.maven.index_shaded.lucene.search.BooleanQuery; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.stereotype.Service; |
@@ -22,7 +22,7 @@ package org.apache.archiva.indexer.search; | |||
import org.apache.archiva.common.utils.FileUtil; | |||
import org.apache.archiva.indexer.util.SearchUtil; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.apache.maven.index.shaded.lucene.index.IndexUpgrader; | |||
import org.apache.maven.index_shaded.lucene.index.IndexUpgrader; | |||
import org.codehaus.plexus.util.FileUtils; | |||
import org.easymock.EasyMock; | |||
import org.junit.Test; |
@@ -36,8 +36,8 @@ import org.apache.maven.index.context.IndexingContext; | |||
import org.apache.maven.index.expr.SourcedSearchExpression; | |||
import org.apache.maven.index.packer.IndexPacker; | |||
import org.apache.maven.index.packer.IndexPackingRequest; | |||
import org.apache.maven.index.shaded.lucene.search.BooleanClause; | |||
import org.apache.maven.index.shaded.lucene.search.BooleanQuery; | |||
import org.apache.maven.index_shaded.lucene.search.BooleanClause; | |||
import org.apache.maven.index_shaded.lucene.search.BooleanQuery; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.stereotype.Service; |
@@ -20,7 +20,7 @@ package org.apache.archiva.scheduler.indexing; | |||
*/ | |||
import org.apache.maven.index.context.IndexingContext; | |||
import org.apache.maven.index.shaded.lucene.store.Directory; | |||
import org.apache.maven.index_shaded.lucene.store.Directory; | |||
import org.apache.maven.index.updater.IndexUpdateSideEffect; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; |
@@ -32,10 +32,10 @@ import org.apache.maven.index.context.IndexCreator; | |||
import org.apache.maven.index.context.IndexingContext; | |||
import org.apache.maven.index.expr.SourcedSearchExpression; | |||
import org.apache.maven.index.expr.StringSearchExpression; | |||
import org.apache.maven.index.shaded.lucene.search.BooleanClause; | |||
import org.apache.maven.index.shaded.lucene.search.BooleanQuery; | |||
import org.apache.maven.index.shaded.lucene.search.IndexSearcher; | |||
import org.apache.maven.index.shaded.lucene.search.TopDocs; | |||
import org.apache.maven.index_shaded.lucene.search.BooleanClause; | |||
import org.apache.maven.index_shaded.lucene.search.BooleanQuery; | |||
import org.apache.maven.index_shaded.lucene.search.IndexSearcher; | |||
import org.apache.maven.index_shaded.lucene.search.TopDocs; | |||
import org.apache.maven.index.updater.DefaultIndexUpdater; | |||
import org.apache.maven.index.updater.IndexUpdateRequest; | |||
import org.apache.maven.index.updater.IndexUpdater; |
@@ -20,7 +20,6 @@ package org.apache.archiva.scheduler.indexing; | |||
import org.apache.archiva.admin.model.beans.RemoteRepository; | |||
import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin; | |||
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; | |||
import org.apache.archiva.common.utils.FileUtil; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.apache.maven.index.FlatSearchRequest; | |||
@@ -28,8 +27,8 @@ import org.apache.maven.index.FlatSearchResponse; | |||
import org.apache.maven.index.MAVEN; | |||
import org.apache.maven.index.NexusIndexer; | |||
import org.apache.maven.index.expr.StringSearchExpression; | |||
import org.apache.maven.index.shaded.lucene.search.BooleanClause; | |||
import org.apache.maven.index.shaded.lucene.search.BooleanQuery; | |||
import org.apache.maven.index_shaded.lucene.search.BooleanClause; | |||
import org.apache.maven.index_shaded.lucene.search.BooleanQuery; | |||
import org.eclipse.jetty.server.HttpConnectionFactory; | |||
import org.eclipse.jetty.server.Server; | |||
import org.eclipse.jetty.server.ServerConnector; |