Attachment #105309 for bug #194351

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 194351
Collapse All | Expand All

Lines 40-46 Link Here

(-)a/csl.api/nbproject/project.properties (-1 / +1 lines)
40	# Version 2 license, then the option applies only if the new code is	40	# Version 2 license, then the option applies only if the new code is
41	# made subject to such option by the copyright holder.	41	# made subject to such option by the copyright holder.
42		42
43	spec.version.base=2.12.0	43	spec.version.base=2.13.0
44	is.autoload=true	44	is.autoload=true
45	javac.source=1.6	45	javac.source=1.6
46		46

Lines 37-44 Link Here

(-)a/csl.api/nbproject/project.xml (-2 / +2 lines)
37	<build-prerequisite/>	37	<build-prerequisite/>
38	<compile-dependency/>	38	<compile-dependency/>
39	<run-dependency>	39	<run-dependency>
40	<release-version>1</release-version>	40	<release-version>3</release-version>
41	<specification-version>2.1</specification-version>	41	<specification-version>3.0</specification-version>
42	</run-dependency>	42	</run-dependency>
43	</dependency>	43	</dependency>
44	<dependency>	44	<dependency>

Lines 40-46 Link Here

(-)a/java.hints/nbproject/project.properties (-1 / +1 lines)
40	# Version 2 license, then the option applies only if the new code is	40	# Version 2 license, then the option applies only if the new code is
41	# made subject to such option by the copyright holder.	41	# made subject to such option by the copyright holder.
42		42
43	spec.version.base=1.45.0	43	spec.version.base=1.46.0
44		44
45	javac.source=1.6	45	javac.source=1.6
46		46

Lines 107-114 Link Here

(-)a/java.hints/nbproject/project.xml (-2 / +2 lines)
107	<build-prerequisite/>	107	<build-prerequisite/>
108	<compile-dependency/>	108	<compile-dependency/>
109	<run-dependency>	109	<run-dependency>
110	<release-version>1</release-version>	110	<release-version>3</release-version>
111	<specification-version>2.9</specification-version>	111	<specification-version>3.0</specification-version>
112	</run-dependency>	112	</run-dependency>
113	</dependency>	113	</dependency>
114	<dependency>	114	<dependency>

Lines 46-52 Link Here

(-)a/java.source/nbproject/project.properties (-1 / +1 lines)
46	javadoc.title=Java Source	46	javadoc.title=Java Source
47	javadoc.arch=${basedir}/arch.xml	47	javadoc.arch=${basedir}/arch.xml
48	javadoc.apichanges=${basedir}/apichanges.xml	48	javadoc.apichanges=${basedir}/apichanges.xml
49	spec.version.base=0.74.0	49	spec.version.base=0.75.0
50	test.qa-functional.cp.extra=${refactoring.java.dir}/modules/ext/javac-api-nb-7.0-b07.jar	50	test.qa-functional.cp.extra=${refactoring.java.dir}/modules/ext/javac-api-nb-7.0-b07.jar
51	test.unit.run.cp.extra=${o.n.core.dir}/core/core.jar:\	51	test.unit.run.cp.extra=${o.n.core.dir}/core/core.jar:\
52	${o.n.core.dir}/lib/boot.jar:\	52	${o.n.core.dir}/lib/boot.jar:\

Lines 106-113 Link Here

(-)a/java.source/nbproject/project.xml (-2 / +2 lines)
106	<build-prerequisite/>	106	<build-prerequisite/>
107	<compile-dependency/>	107	<compile-dependency/>
108	<run-dependency>	108	<run-dependency>
109	<release-version>1</release-version>	109	<release-version>3</release-version>
110	<specification-version>2.12</specification-version>	110	<specification-version>3.0</specification-version>
111	</run-dependency>	111	</run-dependency>
112	</dependency>	112	</dependency>
113	<dependency>	113	<dependency>

Lines 2-5 Link Here

(-)a/java.sourceui/nbproject/project.properties (-1 / +1 lines)
2	javac.compilerargs=-Xlint -Xlint:-serial	2	javac.compilerargs=-Xlint -Xlint:-serial
3	javac.source=1.6	3	javac.source=1.6
4	javadoc.arch=${basedir}/arch.xml	4	javadoc.arch=${basedir}/arch.xml
5	spec.version.base=1.17.0	5	spec.version.base=1.18.0

Lines 45-52 Link Here

(-)a/java.sourceui/nbproject/project.xml (-2 / +2 lines)
45	<build-prerequisite/>	45	<build-prerequisite/>
46	<compile-dependency/>	46	<compile-dependency/>
47	<run-dependency>	47	<run-dependency>
48	<release-version>1</release-version>	48	<release-version>3</release-version>
49	<specification-version>2.12</specification-version>	49	<specification-version>3.0</specification-version>
50	</run-dependency>	50	</run-dependency>
51	</dependency>	51	</dependency>
52	<dependency>	52	<dependency>

Line 1 Link Here

(-)a/libs.lucene/external/binaries-list (-1 / +1 lines)
1	284963A064E39FA33ECBA8E57CC5581067CD81D1 lucene-core-2.9.3.jar	1	335F7EA0E28A4A1358AA745F4BD2037E8AFE44FC lucene-core-3.0.3.jar

Lines 1-9 Link Here

(-)a/libs.lucene/external/lucene-core-2.9.3-license.txt (-2 / +2 lines)
1	Name: Apache Lucene	1	Name: Apache Lucene
2	Version: 2.4.1	2	Version: 3.0.3
3	Description: Java-based indexing and search technology	3	Description: Java-based indexing and search technology
4	License: Apache-2.0	4	License: Apache-2.0
5	Origin: http://lucene.apache.org/	5	Origin: http://lucene.apache.org/
6	Files: lucene-core-2.9.3.jar	6	Files: lucene-core-3.0.3.jar
7	Source: http://svn.apache.org/repos/asf/lucene/java/trunk	7	Source: http://svn.apache.org/repos/asf/lucene/java/trunk
8	OSR: 6381	8	OSR: 6381
9		9

Lines 1-4 Link Here

(-)a/libs.lucene/manifest.mf (-2 / +2 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.libs.lucene/1	2	OpenIDE-Module: org.netbeans.libs.lucene/3
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/lucene/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/lucene/Bundle.properties
4	OpenIDE-Module-Implementation-Version: 232	4	OpenIDE-Module-Specification-Version: 3.0

Lines 41-45 Link Here

(-)a/libs.lucene/nbproject/project.properties (-2 / +2 lines)
41	# made subject to such option by the copyright holder.	41	# made subject to such option by the copyright holder.
42		42
43	is.autoload=true	43	is.autoload=true
44	release.external/lucene-core-2.9.3.jar=modules/ext/lucene-core-2.9.3.jar	44	release.external/lucene-core-3.0.3.jar=modules/ext/lucene-core-3.0.3.jar
45	spec.version.base=2.13.0	45

Lines 53-60 Link Here

(-)a/libs.lucene/nbproject/project.xml (-2 / +2 lines)
53	<subpackages>org</subpackages>	53	<subpackages>org</subpackages>
54	</public-packages>	54	</public-packages>
55	<class-path-extension>	55	<class-path-extension>
56	<runtime-relative-path>ext/lucene-core-2.9.3.jar</runtime-relative-path>	56	<runtime-relative-path>ext/lucene-core-3.0.3.jar</runtime-relative-path>
57	<binary-origin>external/lucene-core-2.9.3.jar</binary-origin>	57	<binary-origin>external/lucene-core-3.0.3.jar</binary-origin>
58	</class-path-extension>	58	</class-path-extension>
59	</data>	59	</data>
60	</configuration>	60	</configuration>

Lines 2-5 Link Here

(-)a/maven.embedder/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.maven.embedder/2	2	OpenIDE-Module: org.netbeans.modules.maven.embedder/2
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/embedder/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/embedder/Bundle.properties
4	AutoUpdate-Show-In-Client: false	4	AutoUpdate-Show-In-Client: false
5	OpenIDE-Module-Specification-Version: 2.4	5	OpenIDE-Module-Specification-Version: 2.5

Lines 217-222 Link Here

(-)a/maven.embedder/nbproject/project.xml (+2 lines)
217	<package>org.sonatype.aether.transfer</package>	217	<package>org.sonatype.aether.transfer</package>
218	<package>org.sonatype.aether.util</package>	218	<package>org.sonatype.aether.util</package>
219	<package>org.sonatype.aether.util.repository</package>	219	<package>org.sonatype.aether.util.repository</package>
		220	<package>org.sonatype.aether.util.version</package>
		221	<package>org.sonatype.aether.version</package>
220	</friend-packages>	222	</friend-packages>
221	<class-path-extension>	223	<class-path-extension>
222	<runtime-relative-path>ext/maven/maven-dependency-tree-1.2.jar</runtime-relative-path>	224	<runtime-relative-path>ext/maven/maven-dependency-tree-1.2.jar</runtime-relative-path>

Lines 1-6 Link Here

(-)a/maven.hints/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.maven.hints/1	2	OpenIDE-Module: org.netbeans.modules.maven.hints/1
3	OpenIDE-Module-Specification-Version: 1.11	3	OpenIDE-Module-Specification-Version: 1.12
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/hints/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/hints/Bundle.properties
5	OpenIDE-Module-Layer: org/netbeans/modules/maven/hints/layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/maven/hints/layer.xml
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false

Lines 62-69 Link Here

(-)a/maven.hints/nbproject/project.xml (-2 / +2 lines)
62	<build-prerequisite/>	62	<build-prerequisite/>
63	<compile-dependency/>	63	<compile-dependency/>
64	<run-dependency>	64	<run-dependency>
65	<release-version>1</release-version>	65	<release-version>3</release-version>
66	<specification-version>2.13</specification-version>	66	<specification-version>3.0</specification-version>
67	</run-dependency>	67	</run-dependency>
68	</dependency>	68	</dependency>
69	<dependency>	69	<dependency>

Lines 1-2 Link Here

(-)a/maven.indexer/external/binaries-list (-2 / +2 lines)
1	7AB67E6B20E5332A7FB4FDF2F019AEC4275846C2 indexer-core-3.1.0.jar	1	3AF24D401F76D153B77641865737DE53E41E60D6 indexer-artifact-4.0.0.jar
2	30DCFB82558DC5452AC135F267401E214A0E9859 indexer-artifact-3.1.0.jar	2	39E868B62080080DC349253E6050DF4B6ABAAE60 indexer-core-4.0.0.jar

Lines 1-9 Link Here

(-)a/maven.indexer/external/maven-indexer-3.1.0-license.txt (-2 / +2 lines)
1	Name: Maven Indexer	1	Name: Maven Indexer
2	Version: 3.1.0	2	Version: 4.0.0
3	Description: Maven remote repository indexing engine.	3	Description: Maven remote repository indexing engine.
4	License: Apache-2.0	4	License: Apache-2.0
5	Origin: http://repo1.maven.org/maven2/org/apache/maven/indexer/	5	Origin: http://repo1.maven.org/maven2/org/apache/maven/indexer/
6	Files: indexer-core-3.1.0.jar indexer-artifact-3.1.0.jar	6	Files: indexer-core-4.0.0.jar indexer-artifact-4.0.0.jar
7	OSR: 9451	7	OSR: 9451
8		8
9	Apache License	9	Apache License

Lines 2-8 Link Here

(-)a/maven.indexer/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module-Install: org/netbeans/modules/maven/indexer/Installer.class	2	OpenIDE-Module-Install: org/netbeans/modules/maven/indexer/Installer.class
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/indexer/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/indexer/Bundle.properties
4	AutoUpdate-Show-In-Client: false	4	AutoUpdate-Show-In-Client: false
5	OpenIDE-Module-Specification-Version: 1.12	5	OpenIDE-Module-Specification-Version: 1.13
6	OpenIDE-Module: org.netbeans.modules.maven.indexer/1	6	OpenIDE-Module: org.netbeans.modules.maven.indexer/1
7	OpenIDE-Module-Layer: org/netbeans/modules/maven/indexer/layer.xml	7	OpenIDE-Module-Layer: org/netbeans/modules/maven/indexer/layer.xml
8		8

Lines 41-45 Link Here

(-)a/maven.indexer/nbproject/project.properties (-2 / +3 lines)
41	is.autoload=true	41	is.autoload=true
42	javac.source=1.6	42	javac.source=1.6
43	javac.compilerargs=-Xlint -Xlint:-serial	43	javac.compilerargs=-Xlint -Xlint:-serial
44	release.external/indexer-core-3.1.0.jar=modules/ext/maven/indexer-core-3.1.0.jar	44	release.external/indexer-core-4.0.0.jar=modules/ext/maven/indexer-core-4.0.0.jar
45	release.external/indexer-artifact-3.1.0.jar=modules/ext/maven/indexer-artifact-3.1.0.jar	45	release.external/indexer-artifact-4.0.0.jar=modules/ext/maven/indexer-artifact-4.0.0.jar
		46




                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>3</release-version>
                        <specification-version>3.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                <package>org.netbeans.modules.maven.indexer.spi.ui</package>
            </friend-packages>
            <class-path-extension>
                <runtime-relative-path>ext/maven/indexer-core-4.0.0.jar</runtime-relative-path>
                <binary-origin>external/indexer-core-4.0.0.jar</binary-origin>
            </class-path-extension>
            <class-path-extension>
                <runtime-relative-path>ext/maven/indexer-artifact-4.0.0.jar</runtime-relative-path>
                <binary-origin>external/indexer-artifact-4.0.0.jar</binary-origin>
            </class-path-extension>
        </data>
    </configuration>




package org.netbeans.modules.maven.indexer;

import java.io.FileNotFoundException;
import org.apache.maven.index.expr.StringSearchExpression;
import org.codehaus.plexus.util.FileUtils;
import java.util.Map;
import org.apache.lucene.document.Document;

import org.apache.maven.index.GroupedSearchRequest;
import org.apache.maven.index.GroupedSearchResponse;
import org.apache.maven.index.IndexerFieldVersion;
import org.apache.maven.index.MAVEN;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.creator.AbstractIndexCreator;

                    public @Override Void run() throws Exception {
                        loadIndexingContext(repo);
                        String clsname = className.replace(".", "/");
                        FlatSearchRequest fsr = new FlatSearchRequest(setBooleanRewrite(
                                indexer.constructQuery(MAVEN.CLASSNAMES, new StringSearchExpression(clsname.toLowerCase()))),
                                ArtifactInfo.VERSION_COMPARATOR);
                        fsr.setAiCount(MAX_RESULT_COUNT);
                        FlatSearchResponse response = repeatedFlatSearch(fsr, getContexts(new RepositoryInfo[]{repo}), false);

                    public @Override Void run() throws Exception {
                        loadIndexingContext(repo);
                        BooleanQuery bq = new BooleanQuery();
                        bq.add(new BooleanClause((setBooleanRewrite(indexer.constructQuery(MAVEN.SHA1, new StringSearchExpression(sha1)))), BooleanClause.Occur.SHOULD));
                        FlatSearchRequest fsr = new FlatSearchRequest(bq, ArtifactInfo.VERSION_COMPARATOR);
                        fsr.setAiCount(MAX_RESULT_COUNT);
                        FlatSearchResponse response = repeatedFlatSearch(fsr, getContexts(new RepositoryInfo[]{repo}), false);

                                Query q;
                                if (ArtifactInfo.NAMES.equals(fieldName)) {
                                    String clsname = field.getValue().replace(".", "/"); //NOI18N
                                    q = indexer.constructQuery(MAVEN.CLASSNAMES, new StringSearchExpression(clsname.toLowerCase()));
                                } else if (ArtifactInfo.ARTIFACT_ID.equals(fieldName)) {
                                    q = indexer.constructQuery(MAVEN.ARTIFACT_ID, new StringSearchExpression(field.getValue()));
                                } else {
                                    if (field.getMatch() == QueryField.MATCH_EXACT) {
                                        q = new TermQuery(new Term(fieldName, field.getValue()));

Lines 4-8 Link Here

(-)a/maven.repository/manifest.mf (-1 / +1 lines)
4	OpenIDE-Module-Layer: org/netbeans/modules/maven/repository/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/maven/repository/layer.xml
5	OpenIDE-Module-Public-Packages: -	5	OpenIDE-Module-Public-Packages: -
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false
7	OpenIDE-Module-Specification-Version: 1.9	7	OpenIDE-Module-Specification-Version: 1.11
8		8

Lines 72-79 Link Here

(-)a/maven.repository/nbproject/project.xml (-2 / +2 lines)
72	<build-prerequisite/>	72	<build-prerequisite/>
73	<compile-dependency/>	73	<compile-dependency/>
74	<run-dependency>	74	<run-dependency>
75	<release-version>1</release-version>	75	<release-version>3</release-version>
76	<specification-version>2.5</specification-version>	76	<specification-version>3.0</specification-version>
77	</run-dependency>	77	</run-dependency>
78	</dependency>	78	</dependency>
79	<dependency>	79	<dependency>

Lines 3-7 Link Here

(-)a/maven.search/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module: org.netbeans.modules.maven.search	3	OpenIDE-Module: org.netbeans.modules.maven.search
4	OpenIDE-Module-Layer: org/netbeans/modules/maven/search/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/maven/search/layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/search/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/search/Bundle.properties
6	OpenIDE-Module-Specification-Version: 1.10	6	OpenIDE-Module-Specification-Version: 1.11
7		7

Lines 54-61 Link Here

(-)a/maven.search/nbproject/project.xml (-2 / +2 lines)
54	<build-prerequisite/>	54	<build-prerequisite/>
55	<compile-dependency/>	55	<compile-dependency/>
56	<run-dependency>	56	<run-dependency>
57	<release-version>1</release-version>	57	<release-version>3</release-version>
58	<specification-version>2.5</specification-version>	58	<specification-version>3.0</specification-version>
59	</run-dependency>	59	</run-dependency>
60	</dependency>	60	</dependency>
61	<dependency>	61	<dependency>

Lines 1-6 Link Here

(-)a/maven/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.maven/2	2	OpenIDE-Module: org.netbeans.modules.maven/2
3	OpenIDE-Module-Specification-Version: 2.5	3	OpenIDE-Module-Specification-Version: 2.6
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/Bundle.properties
5	OpenIDE-Module-Layer: org/netbeans/modules/maven/layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/maven/layer.xml
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false

Lines 116-123 Link Here

(-)a/maven/nbproject/project.xml (-2 / +2 lines)
116	<build-prerequisite/>	116	<build-prerequisite/>
117	<compile-dependency/>	117	<compile-dependency/>
118	<run-dependency>	118	<run-dependency>
119	<release-version>1</release-version>	119	<release-version>3</release-version>
120	<specification-version>2.5</specification-version>	120	<specification-version>3.0</specification-version>
121	</run-dependency>	121	</run-dependency>
122	</dependency>	122	</dependency>
123	<dependency>	123	<dependency>

Lines 2-5 Link Here

(-)a/parsing.api/nbproject/project.properties (-1 / +1 lines)
2	javac.source=1.6	2	javac.source=1.6
3	javadoc.apichanges=${basedir}/apichanges.xml	3	javadoc.apichanges=${basedir}/apichanges.xml
4	javadoc.arch=${basedir}/arch.xml	4	javadoc.arch=${basedir}/arch.xml
5	spec.version.base=1.37.0	5	spec.version.base=1.38.0

Lines 37-44 Link Here

(-)a/parsing.api/nbproject/project.xml (-2 / +2 lines)
37	<build-prerequisite/>	37	<build-prerequisite/>
38	<compile-dependency/>	38	<compile-dependency/>
39	<run-dependency>	39	<run-dependency>
40	<release-version>1</release-version>	40	<release-version>3</release-version>
41	<specification-version>2.6</specification-version>	41	<specification-version>3.0</specification-version>
42	</run-dependency>	42	</run-dependency>
43	</dependency>	43	</dependency>
44	<dependency>	44	<dependency>

Lines 2-6 Link Here

(-)a/parsing.lucene/manifest.mf (-1 / +1 lines)
2	AutoUpdate-Show-In-Client: false	2	AutoUpdate-Show-In-Client: false
3	OpenIDE-Module: org.netbeans.modules.parsing.lucene	3	OpenIDE-Module: org.netbeans.modules.parsing.lucene
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/parsing/lucene/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/parsing/lucene/Bundle.properties
5	OpenIDE-Module-Specification-Version: 1.2	5	OpenIDE-Module-Specification-Version: 1.3
6		6

Lines 19-26 Link Here

(-)a/parsing.lucene/nbproject/project.xml (-2 / +2 lines)
19	<build-prerequisite/>	19	<build-prerequisite/>
20	<compile-dependency/>	20	<compile-dependency/>
21	<run-dependency>	21	<run-dependency>
22	<release-version>1</release-version>	22	<release-version>3</release-version>
23	<specification-version>2.13</specification-version>	23	<specification-version>3.0</specification-version>
24	</run-dependency>	24	</run-dependency>
25	</dependency>	25	</dependency>
26	<dependency>	26	<dependency>

Return to bug 194351

Lines 81-88 Link Here

(-)a/maven.indexer/nbproject/project.xml (-6 / +6 lines)
81	<build-prerequisite/>	81	<build-prerequisite/>
82	<compile-dependency/>	82	<compile-dependency/>
83	<run-dependency>	83	<run-dependency>
84	<release-version>1</release-version>	84	<release-version>3</release-version>
85	<specification-version>2.4</specification-version>	85	<specification-version>3.0</specification-version>
86	</run-dependency>	86	</run-dependency>
87	</dependency>	87	</dependency>
88	<dependency>	88	<dependency>
Lines 181-192 Link Here
181	<package>org.netbeans.modules.maven.indexer.spi.ui</package>	181	<package>org.netbeans.modules.maven.indexer.spi.ui</package>
182	</friend-packages>	182	</friend-packages>
183	<class-path-extension>	183	<class-path-extension>
184	<runtime-relative-path>ext/maven/indexer-core-3.1.0.jar</runtime-relative-path>	184	<runtime-relative-path>ext/maven/indexer-core-4.0.0.jar</runtime-relative-path>
185	<binary-origin>external/indexer-core-3.1.0.jar</binary-origin>	185	<binary-origin>external/indexer-core-4.0.0.jar</binary-origin>
186	</class-path-extension>	186	</class-path-extension>
187	<class-path-extension>	187	<class-path-extension>
188	<runtime-relative-path>ext/maven/indexer-artifact-3.1.0.jar</runtime-relative-path>	188	<runtime-relative-path>ext/maven/indexer-artifact-4.0.0.jar</runtime-relative-path>
189	<binary-origin>external/indexer-artifact-3.1.0.jar</binary-origin>	189	<binary-origin>external/indexer-artifact-4.0.0.jar</binary-origin>
190	</class-path-extension>	190	</class-path-extension>
191	</data>	191	</data>
192	</configuration>	192	</configuration>

Lines 42-47 Link Here

(-)a/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java (-4 / +7 lines)
42	package org.netbeans.modules.maven.indexer;	42	package org.netbeans.modules.maven.indexer;
43		43
44	import java.io.FileNotFoundException;	44	import java.io.FileNotFoundException;
		45	import org.apache.maven.index.expr.StringSearchExpression;
45	import org.codehaus.plexus.util.FileUtils;	46	import org.codehaus.plexus.util.FileUtils;
46	import java.util.Map;	47	import java.util.Map;
47	import org.apache.lucene.document.Document;	48	import org.apache.lucene.document.Document;
Lines 98-103 Link Here
98	import org.apache.maven.index.GroupedSearchRequest;	99	import org.apache.maven.index.GroupedSearchRequest;
99	import org.apache.maven.index.GroupedSearchResponse;	100	import org.apache.maven.index.GroupedSearchResponse;
100	import org.apache.maven.index.IndexerFieldVersion;	101	import org.apache.maven.index.IndexerFieldVersion;
		102	import org.apache.maven.index.MAVEN;
101	import org.apache.maven.index.NexusIndexer;	103	import org.apache.maven.index.NexusIndexer;
102	import org.apache.maven.index.context.IndexingContext;	104	import org.apache.maven.index.context.IndexingContext;
103	import org.apache.maven.index.creator.AbstractIndexCreator;	105	import org.apache.maven.index.creator.AbstractIndexCreator;
Lines 883-889 Link Here
883	public @Override Void run() throws Exception {	885	public @Override Void run() throws Exception {
884	loadIndexingContext(repo);	886	loadIndexingContext(repo);
885	String clsname = className.replace(".", "/");	887	String clsname = className.replace(".", "/");
886	FlatSearchRequest fsr = new FlatSearchRequest(setBooleanRewrite(indexer.constructQuery(ArtifactInfo.NAMES, clsname.toLowerCase())),	888	FlatSearchRequest fsr = new FlatSearchRequest(setBooleanRewrite(
		889	indexer.constructQuery(MAVEN.CLASSNAMES, new StringSearchExpression(clsname.toLowerCase()))),
887	ArtifactInfo.VERSION_COMPARATOR);	890	ArtifactInfo.VERSION_COMPARATOR);
888	fsr.setAiCount(MAX_RESULT_COUNT);	891	fsr.setAiCount(MAX_RESULT_COUNT);
889	FlatSearchResponse response = repeatedFlatSearch(fsr, getContexts(new RepositoryInfo[]{repo}), false);	892	FlatSearchResponse response = repeatedFlatSearch(fsr, getContexts(new RepositoryInfo[]{repo}), false);
Lines 941-947 Link Here
941	public @Override Void run() throws Exception {	944	public @Override Void run() throws Exception {
942	loadIndexingContext(repo);	945	loadIndexingContext(repo);
943	BooleanQuery bq = new BooleanQuery();	946	BooleanQuery bq = new BooleanQuery();
944	bq.add(new BooleanClause((setBooleanRewrite(indexer.constructQuery(ArtifactInfo.SHA1, sha1))), BooleanClause.Occur.SHOULD));	947	bq.add(new BooleanClause((setBooleanRewrite(indexer.constructQuery(MAVEN.SHA1, new StringSearchExpression(sha1)))), BooleanClause.Occur.SHOULD));
945	FlatSearchRequest fsr = new FlatSearchRequest(bq, ArtifactInfo.VERSION_COMPARATOR);	948	FlatSearchRequest fsr = new FlatSearchRequest(bq, ArtifactInfo.VERSION_COMPARATOR);
946	fsr.setAiCount(MAX_RESULT_COUNT);	949	fsr.setAiCount(MAX_RESULT_COUNT);
947	FlatSearchResponse response = repeatedFlatSearch(fsr, getContexts(new RepositoryInfo[]{repo}), false);	950	FlatSearchResponse response = repeatedFlatSearch(fsr, getContexts(new RepositoryInfo[]{repo}), false);
Lines 1101-1109 Link Here
1101	Query q;	1104	Query q;
1102	if (ArtifactInfo.NAMES.equals(fieldName)) {	1105	if (ArtifactInfo.NAMES.equals(fieldName)) {
1103	String clsname = field.getValue().replace(".", "/"); //NOI18N	1106	String clsname = field.getValue().replace(".", "/"); //NOI18N
1104	q = indexer.constructQuery(ArtifactInfo.NAMES, clsname.toLowerCase());	1107	q = indexer.constructQuery(MAVEN.CLASSNAMES, new StringSearchExpression(clsname.toLowerCase()));
1105	} else if (ArtifactInfo.ARTIFACT_ID.equals(fieldName)) {	1108	} else if (ArtifactInfo.ARTIFACT_ID.equals(fieldName)) {
1106	q = indexer.constructQuery(fieldName, field.getValue());	1109	q = indexer.constructQuery(MAVEN.ARTIFACT_ID, new StringSearchExpression(field.getValue()));
1107	} else {	1110	} else {
1108	if (field.getMatch() == QueryField.MATCH_EXACT) {	1111	if (field.getMatch() == QueryField.MATCH_EXACT) {
1109	q = new TermQuery(new Term(fieldName, field.getValue()));	1112	q = new TermQuery(new Term(fieldName, field.getValue()));