You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/01/21 07:42:45 UTC
svn commit: r1061650 [2/2] - in /lucene/dev/branches/bulkpostings: ./
dev-tools/maven/ dev-tools/maven/lucene/ dev-tools/maven/lucene/contrib/
dev-tools/maven/lucene/contrib/ant/ dev-tools/maven/lucene/contrib/db/
dev-tools/maven/lucene/contrib/db/bdb-...
Modified: lucene/dev/branches/bulkpostings/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/build.xml?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/build.xml (original)
+++ lucene/dev/branches/bulkpostings/solr/build.xml Fri Jan 21 06:42:40 2011
@@ -216,14 +216,14 @@
<packageset dir="${src}/java" />
<packageset dir="${src}/webapp/src" />
<packageset dir="contrib/dataimporthandler/src/main/java" />
- <!--<packageset dir="contrib/clustering/src/main/java" />-->
+ <packageset dir="contrib/clustering/src/main/java" />
<packageset dir="contrib/extraction/src/main/java" />
<packageset dir="contrib/analysis-extras/src/java" />
<group title="Core" packages="org.apache.*" />
<group title="Common" packages="org.apache.solr.common.*" />
<group title="SolrJ" packages="org.apache.solr.client.solrj*" />
<group title="contrib: DataImportHandler" packages="org.apache.solr.handler.dataimport*" />
- <!--<group title="contrib: Clustering" packages="org.apache.solr.handler.clustering*" />-->
+ <group title="contrib: Clustering" packages="org.apache.solr.handler.clustering*" />
<group title="contrib: Solr Cell" packages="org.apache.solr.handler.extraction*" />
</sources>
</invoke-javadoc>
@@ -613,8 +613,8 @@
<solr-jar destfile="${dist}/apache-solr-cell-src-${version}.jar"
basedir="contrib/extraction/src" />
- <!--<solr-jar destfile="${dist}/apache-solr-clustering-src-${version}.jar"
- basedir="contrib/clustering/src" />-->
+ <solr-jar destfile="${dist}/apache-solr-clustering-src-${version}.jar"
+ basedir="contrib/clustering/src" />
<solr-jar destfile="${dist}/apache-solr-analysis-extras-src-${version}.jar"
basedir="contrib/analysis-extras/src" />
</target>
@@ -629,8 +629,8 @@
basedir="${build.javadoc}/solrj" />
<solr-jar destfile="${dist}/apache-solr-dataimporthandler-docs-${version}.jar"
basedir="${build.javadoc}/contrib-solr-dataimporthandler" />
- <!--<solr-jar destfile="${dist}/apache-solr-clustering-docs-${version}.jar"
- basedir="${build.javadoc}/contrib-solr-clustering" />-->
+ <solr-jar destfile="${dist}/apache-solr-clustering-docs-${version}.jar"
+ basedir="${build.javadoc}/contrib-solr-clustering" />
<solr-jar destfile="${dist}/apache-solr-cell-docs-${version}.jar"
basedir="${build.javadoc}/contrib-solr-cell" />
<solr-jar destfile="${dist}/apache-solr-analysis-extras-docs-${version}.jar"
@@ -811,29 +811,20 @@
<!-- Maven artifacts -->
<sign-maven-dependency-artifacts artifact.id="solr-commons-csv" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-dependency-artifacts artifact.id="solr-noggit" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-war-artifacts artifact.id="solr" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-artifacts artifact.id="solr-analysis-extras" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-artifacts artifact.id="solr-cell" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-artifacts artifact.id="solr-clustering" gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-core" gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-dataimporthandler" gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-dataimporthandler-extras" gpg.passphrase="${gpg.passphrase}"/>
- <!--<sign-maven-artifacts artifact.id="solr-clustering" gpg.passphrase="${gpg.passphrase}"/>-->
-
- <sign-maven-artifacts artifact.id="solr-cell" gpg.passphrase="${gpg.passphrase}"/>
- <sign-maven-dependency-artifacts artifact.id="solr-lucene-analyzers" gpg.passphrase="${gpg.passphrase}"/>
- <sign-maven-dependency-artifacts artifact.id="solr-lucene-core" gpg.passphrase="${gpg.passphrase}"/>
- <sign-maven-dependency-artifacts artifact.id="solr-lucene-highlighter" gpg.passphrase="${gpg.passphrase}"/>
- <sign-maven-dependency-artifacts artifact.id="solr-lucene-queries" gpg.passphrase="${gpg.passphrase}"/>
- <sign-maven-dependency-artifacts artifact.id="solr-lucene-snowball" gpg.passphrase="${gpg.passphrase}"/>
- <sign-maven-dependency-artifacts artifact.id="solr-lucene-spellchecker" gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-solrj" gpg.passphrase="${gpg.passphrase}"/>
- <!-- Thes are special since there are no jars, just poms -->
+ <!-- These are special since there are no jars, just poms -->
<sign-artifact input.file="${maven.dist.prefix}/solr-parent/${version}/solr-parent-${version}.pom" gpg.passphrase="${gpg.passphrase}"/>
- <sign-artifact input.file="${maven.dist.prefix}/solr-lucene-contrib/${version}/solr-lucene-contrib-${version}.pom" gpg.passphrase="${gpg.passphrase}"/>
-
</target>
-
-
-
<target name="prepare-release" depends="clean, svn-up, build-site, package, sign-artifacts" description="Prototype helper for Committers. Assumes gpg is in the path">
<tar destfile="${dist}/solr-maven.tar" longfile="gnu">
@@ -846,6 +837,7 @@
<target name="generate-maven-artifacts" depends="maven.ant.tasks-check, create-package">
<sequential>
+ <ant target="get-maven-poms" inheritAll="false" dir=".."/>
<!--
@@ -860,18 +852,18 @@
<!-- ========== SOLR PARENT POM ========== -->
- <m2-deploy pom.xml="src/maven/solr-parent-pom.xml.template"/>
+ <m2-deploy pom.xml="pom.xml"/>
<!-- ========== SOLR SPECIFIC COMMONS CSV ========== -->
- <m2-deploy pom.xml="lib/solr-commons-csv-pom.xml.template"
- jar.file="lib/commons-csv-1.0-SNAPSHOT-r966014.jar" />
+ <m2-deploy-with-pom-template pom.xml="lib/solr-commons-csv-pom.xml.template"
+ jar.file="lib/commons-csv-1.0-SNAPSHOT-r966014.jar" />
<!-- ========== SOLR ARTIFACTS ========== -->
- <m2-deploy pom.xml="lib/apache-solr-noggit-pom.xml.template"
- jar.file="lib/apache-solr-noggit-r944541.jar" />
+ <m2-deploy-with-pom-template pom.xml="lib/apache-solr-noggit-pom.xml.template"
+ jar.file="lib/apache-solr-noggit-r944541.jar" />
- <m2-deploy pom.xml="contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template"
+ <m2-deploy pom.xml="contrib/dataimporthandler/src/pom.xml"
jar.file="${dist}/apache-solr-dataimporthandler-${version}.jar">
<artifact-attachments>
<attach file="${dist}/apache-solr-dataimporthandler-src-${version}.jar" classifier="sources"/>
@@ -879,55 +871,56 @@
</artifact-attachments>
</m2-deploy>
- <m2-deploy pom.xml="contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template"
+ <m2-deploy pom.xml="contrib/dataimporthandler/src/extras/pom.xml"
jar.file="${dist}/apache-solr-dataimporthandler-extras-${version}.jar">
-
<artifact-attachments>
<attach file="${dist}/apache-solr-dataimporthandler-extras-src-${version}.jar" classifier="sources"/>
<attach file="${dist}/apache-solr-dataimporthandler-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
- <m2-deploy pom.xml="contrib/extraction/solr-cell-pom.xml.template"
+ <m2-deploy pom.xml="contrib/extraction/pom.xml"
jar.file="${dist}/apache-solr-cell-${version}.jar">
<artifact-attachments>
<attach file="${dist}/apache-solr-cell-src-${version}.jar" classifier="sources"/>
<attach file="${dist}/apache-solr-cell-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
-
- <!--<m2-deploy pom.xml="contrib/clustering/solr-clustering-pom.xml.template"
- jar.file="${dist}/apache-solr-clustering-${version}.jar">
-
+
+ <m2-deploy pom.xml="contrib/clustering/pom.xml"
+ jar.file="${dist}/apache-solr-clustering-${version}.jar">
<artifact-attachments>
<attach file="${dist}/apache-solr-clustering-src-${version}.jar" classifier="sources"/>
<attach file="${dist}/apache-solr-clustering-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
- </m2-deploy>-->
- <!-- Clustring specific -->
- <!-- TODO: MORE NEEDED HERE ONCE WE FINALIZE THE LIBS FOR CARROT -->
- <!-- end clustering specific -->
+ </m2-deploy>
- <m2-deploy pom.xml="src/maven/solr-core-pom.xml.template"
- jar.file="${dist}/apache-solr-core-${version}.jar">
+ <m2-deploy pom.xml="contrib/analysis-extras/pom.xml"
+ jar.file="${dist}/apache-solr-analysis-extras-${version}.jar">
+ <artifact-attachments>
+ <attach file="${dist}/apache-solr-analysis-extras-src-${version}.jar" classifier="sources"/>
+ <attach file="${dist}/apache-solr-analysis-extras-docs-${version}.jar" classifier="javadoc"/>
+ </artifact-attachments>
+ </m2-deploy>
+ <m2-deploy pom.xml="src/pom.xml"
+ jar.file="${dist}/apache-solr-core-${version}.jar">
<artifact-attachments>
<attach file="${dist}/apache-solr-core-src-${version}.jar" classifier="sources"/>
<attach file="${dist}/apache-solr-core-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
-
</m2-deploy>
- <m2-deploy pom.xml="src/maven/solr-solrj-pom.xml.template"
+ <m2-deploy pom.xml="src/solrj/pom.xml"
jar.file="${dist}/apache-solr-solrj-${version}.jar">
-
<artifact-attachments>
<attach file="${dist}/apache-solr-solrj-src-${version}.jar" classifier="sources"/>
<attach file="${dist}/apache-solr-solrj-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
-
</m2-deploy>
+ <m2-deploy pom.xml="src/webapp/pom.xml"
+ jar.file="${dist}/apache-solr-${version}.war"/>
</sequential>
</target>
Modified: lucene/dev/branches/bulkpostings/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/common-build.xml?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/common-build.xml (original)
+++ lucene/dev/branches/bulkpostings/solr/common-build.xml Fri Jan 21 06:42:40 2011
@@ -378,19 +378,34 @@
<!-- NOTE, the pom.xml MUST be a relative path. An absolute path may break the build on windows -->
<macrodef name="m2-deploy" description="Builds a Maven artifact">
- <element name="artifact-attachments" optional="yes"/>
- <attribute name="pom.xml" default="${pom.xml}"/>
+ <element name="artifact-attachments" optional="yes"/>
+ <attribute name="pom.xml" default="pom.xml"/>
<attribute name="jar.file" default="${jar.file}"/>
<sequential>
+ <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
+ <artifact:pom id="maven.project" file="@{pom.xml}"/>
+ <artifact:deploy file="@{jar.file}">
+ <artifact-attachments/>
+ <remoteRepository url="${m2.repository.url}">
+ <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
+ </remoteRepository>
+ <pom refid="maven.project"/>
+ </artifact:deploy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="m2-deploy-with-pom-template" description="Builds a Maven artifact given a POM template">
+ <attribute name="pom.xml"/>
+ <attribute name="jar.file"/>
+ <sequential>
<copy file="@{pom.xml}" tofile="${maven.build.dir}/@{pom.xml}">
<filterset begintoken="@" endtoken="@">
<filter token="version" value="${version}"/>
</filterset>
</copy>
- <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>
+ <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
<artifact:pom id="maven.project" file="${maven.build.dir}/@{pom.xml}" />
- <artifact:deploy file="@{jar.file}" uniqueVersion="false">
- <artifact-attachments/>
+ <artifact:deploy file="@{jar.file}">
<remoteRepository url="${m2.repository.url}">
<authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
</remoteRepository>
@@ -438,6 +453,17 @@
</sequential>
</macrodef>
+ <macrodef name="sign-maven-war-artifacts" description="Signs maven artifacts">
+ <attribute name="artifact.id"/>
+ <attribute name="prefix.dir" default="${maven.dist.prefix}"/>
+ <attribute name="maven.version" default="${version}"/>
+ <attribute name="gpg.passphrase"/>
+ <sequential>
+ <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}.war" gpg.passphrase="@{gpg.passphrase}"/>
+ <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}.pom" gpg.passphrase="@{gpg.passphrase}"/>
+ </sequential>
+ </macrodef>
+
<macrodef name="sign-maven-dependency-artifacts" description="Signs maven artifacts">
<attribute name="artifact.id"/>
<attribute name="prefix.dir" default="${maven.dist.prefix}"/>
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/LatLonType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/LatLonType.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/LatLonType.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/LatLonType.java Fri Jan 21 06:42:40 2011
@@ -371,7 +371,7 @@ class SpatialDistanceQuery extends Query
@Override
public Scorer scorer(AtomicReaderContext context, ScorerContext scorerContext) throws IOException {
- return new SpatialScorer(searcher.getSimilarity(), context, this);
+ return new SpatialScorer(context, this);
}
@Override
@@ -404,8 +404,8 @@ class SpatialDistanceQuery extends Query
int lastDistDoc;
double lastDist;
- public SpatialScorer(Similarity similarity, AtomicReaderContext readerContext, SpatialWeight w) throws IOException {
- super(similarity);
+ public SpatialScorer(AtomicReaderContext readerContext, SpatialWeight w) throws IOException {
+ super(w);
this.weight = w;
this.qWeight = w.getValue();
this.reader = readerContext.reader;
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java Fri Jan 21 06:42:40 2011
@@ -91,13 +91,13 @@ public class SolrConstantScoreQuery exte
@Override
public Scorer scorer(AtomicReaderContext context, ScorerContext scorerContext) throws IOException {
- return new ConstantScorer(similarity, context, this);
+ return new ConstantScorer(context, this);
}
@Override
public Explanation explain(AtomicReaderContext context, int doc) throws IOException {
- ConstantScorer cs = new ConstantScorer(similarity, context, this);
+ ConstantScorer cs = new ConstantScorer(context, this);
boolean exists = cs.docIdSetIterator.advance(doc) == doc;
ComplexExplanation result = new ComplexExplanation();
@@ -124,8 +124,8 @@ public class SolrConstantScoreQuery exte
final float theScore;
int doc = -1;
- public ConstantScorer(Similarity similarity, AtomicReaderContext context, ConstantWeight w) throws IOException {
- super(similarity);
+ public ConstantScorer(AtomicReaderContext context, ConstantWeight w) throws IOException {
+ super(w);
theScore = w.getValue();
DocIdSet docIdSet = filter instanceof SolrFilter ? ((SolrFilter)filter).getDocIdSet(w.context, context) : filter.getDocIdSet(context);
if (docIdSet == null) {
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/BoostedQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/BoostedQuery.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/BoostedQuery.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/BoostedQuery.java Fri Jan 21 06:42:40 2011
@@ -96,7 +96,7 @@ public class BoostedQuery extends Query
if(subQueryScorer == null) {
return null;
}
- return new BoostedQuery.CustomScorer(searcher.getSimilarity(), context, this, subQueryScorer, boostVal);
+ return new BoostedQuery.CustomScorer(context, this, subQueryScorer, boostVal);
}
@Override
@@ -123,9 +123,9 @@ public class BoostedQuery extends Query
private final DocValues vals;
private final AtomicReaderContext readerContext;
- private CustomScorer(Similarity similarity, AtomicReaderContext readerContext, BoostedQuery.BoostedWeight w,
+ private CustomScorer(AtomicReaderContext readerContext, BoostedQuery.BoostedWeight w,
Scorer scorer, ValueSource vs) throws IOException {
- super(similarity);
+ super(w);
this.weight = w;
this.qWeight = w.getValue();
this.scorer = scorer;
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/FunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/FunctionQuery.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/FunctionQuery.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/FunctionQuery.java Fri Jan 21 06:42:40 2011
@@ -95,7 +95,7 @@ public class FunctionQuery extends Query
@Override
public Scorer scorer(AtomicReaderContext context, ScorerContext scorerContext) throws IOException {
- return new AllScorer(searcher.getSimilarity(), context, this);
+ return new AllScorer(context, this);
}
@Override
@@ -114,8 +114,8 @@ public class FunctionQuery extends Query
final boolean hasDeletions;
final Bits delDocs;
- public AllScorer(Similarity similarity, AtomicReaderContext context, FunctionWeight w) throws IOException {
- super(similarity);
+ public AllScorer(AtomicReaderContext context, FunctionWeight w) throws IOException {
+ super(w);
this.weight = w;
this.qWeight = w.getValue();
this.reader = context.reader;