Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-4287: Removed "apache-" prefix from Solr distribution and artifact filenames. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1432483 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2013-01-12 17:51:57 +00:00
parent f30dd532ec
commit 56b62c1ddb
15 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dev-tools/scripts/smokeTestRelease.py
View File

@ -308,7 +308,7 @@ def checkSigs(project, urlString, version, tmpDir, isSigned):
artifact = text artifact = text
artifactURL = subURL artifactURL = subURL
if project == 'solr': if project == 'solr':
expected = 'apache-solr-%s' % version expected = 'solr-%s' % version
else: else:
expected = 'lucene-%s' % version expected = 'lucene-%s' % version
if not artifact.startswith(expected): if not artifact.startswith(expected):
@ -334,9 +334,9 @@ def checkSigs(project, urlString, version, tmpDir, isSigned):
'lucene-%s.tgz' % version, 'lucene-%s.tgz' % version,
'lucene-%s.zip' % version] 'lucene-%s.zip' % version]
else: else:
expected = ['apache-solr-%s-src.tgz' % version, expected = ['solr-%s-src.tgz' % version,
'apache-solr-%s.tgz' % version, 'solr-%s.tgz' % version,
'apache-solr-%s.zip' % version] 'solr-%s.zip' % version]
actual = [x[0] for x in artifacts] actual = [x[0] for x in artifacts]
if expected != actual: if expected != actual:
@ -556,10 +556,7 @@ def unpackAndVerify(project, tmpDir, artifact, version):
# make sure it unpacks to proper subdir # make sure it unpacks to proper subdir
l = os.listdir(destDir) l = os.listdir(destDir)
if project == 'solr': expected = '%s-%s' % (project, version)
expected = 'apache-%s-%s' % (project, version)
else:
expected = '%s-%s' % (project, version)
if l != [expected]: if l != [expected]:
raise RuntimeError('unpack produced entries %s; expected only %s' % (l, expected)) raise RuntimeError('unpack produced entries %s; expected only %s' % (l, expected))
@ -956,7 +953,6 @@ def getDistributionsForMavenChecks(tmpDir, version, baseURL):
distributionFiles = defaultdict() distributionFiles = defaultdict()
for project in ('lucene', 'solr'): for project in ('lucene', 'solr'):
distribution = '%s-%s.tgz' % (project, version) distribution = '%s-%s.tgz' % (project, version)
if project == 'solr': distribution = 'apache-' + distribution
if not os.path.exists('%s/%s' % (tmpDir, distribution)): if not os.path.exists('%s/%s' % (tmpDir, distribution)):
distURL = '%s/%s/%s' % (baseURL, project, distribution) distURL = '%s/%s/%s' % (baseURL, project, distribution)
print(' download %s...' % distribution, end=' ') print(' download %s...' % distribution, end=' ')
@ -1010,8 +1006,6 @@ def checkIdenticalMavenArtifacts(distributionFiles, nonMavenizedDeps, artifacts,
distFilenames = dict() distFilenames = dict()
for file in distributionFiles[project]: for file in distributionFiles[project]:
baseName = os.path.basename(file) baseName = os.path.basename(file)
if project == 'solr': # Remove 'apache-' prefix to allow comparison to Maven artifacts
baseName = baseName.replace('apache-', '')
distFilenames[baseName] = file distFilenames[baseName] = file
for artifact in artifacts[project]: for artifact in artifacts[project]:
if reJarWar.search(artifact): if reJarWar.search(artifact):
@ -1348,9 +1342,9 @@ def smokeTest(baseURL, version, tmpDir, isSigned):
print() print()
print('Test Solr...') print('Test Solr...')
checkSigs('solr', solrPath, version, tmpDir, isSigned) checkSigs('solr', solrPath, version, tmpDir, isSigned)
for artifact in ('apache-solr-%s.tgz' % version, 'apache-solr-%s.zip' % version): for artifact in ('solr-%s.tgz' % version, 'solr-%s.zip' % version):
unpackAndVerify('solr', tmpDir, artifact, version) unpackAndVerify('solr', tmpDir, artifact, version)
unpackAndVerify('solr', tmpDir, 'apache-solr-%s-src.tgz' % version, version) unpackAndVerify('solr', tmpDir, 'solr-%s-src.tgz' % version, version)
print() print()
print('Test Maven artifacts for Lucene and Solr...') print('Test Maven artifacts for Lucene and Solr...')

2
solr/CHANGES.txt
View File

@ -590,6 +590,8 @@ Other Changes
* SOLR-3735: Relocate the example mime-to-extension mapping, and * SOLR-3735: Relocate the example mime-to-extension mapping, and
upgrade Velocity Engine to 1.7 (ehatcher) upgrade Velocity Engine to 1.7 (ehatcher)
* SOLR-4287: Removed "apache-" prefix from Solr distribution and artifact
filenames. (Ryan Ernst, Robert Muir, Steve Rowe)
================== 4.0.0 ================== ================== 4.0.0 ==================

4
solr/README.txt
View File

@ -45,11 +45,11 @@ example/
Please see example/README.txt for information about running this Please see example/README.txt for information about running this
example. example.
dist/apache-solr-XX.war dist/solr-XX.war
The Apache Solr Application. Deploy this WAR file to any servlet The Apache Solr Application. Deploy this WAR file to any servlet
container to run Apache Solr. container to run Apache Solr.
dist/apache-solr-<component>-XX.jar dist/solr-<component>-XX.jar
The Apache Solr libraries. To compile Apache Solr Plugins, The Apache Solr libraries. To compile Apache Solr Plugins,
one or more of these will be required. The core library is one or more of these will be required. The core library is
required at a minimum. (see http://wiki.apache.org/solr/SolrPlugins required at a minimum. (see http://wiki.apache.org/solr/SolrPlugins

8
solr/common-build.xml
View File

@ -25,7 +25,7 @@
<property name="Name" value="Solr" /> <property name="Name" value="Solr" />
<property name="version" value="5.0-SNAPSHOT"/> <property name="version" value="5.0-SNAPSHOT"/>
<property name="fullname" value="apache-${ant.project.name}"/> <property name="fullname" value="${ant.project.name}"/>
<property name="fullnamever" value="${fullname}-${version}"/> <property name="fullnamever" value="${fullname}-${version}"/>
<property name="final.name" value="${fullnamever}"/> <property name="final.name" value="${fullnamever}"/>
@ -114,7 +114,7 @@
<attribute name="property" default="@{name}.uptodate"/> <attribute name="property" default="@{name}.uptodate"/>
<attribute name="classpath.property" default="@{name}.jar"/> <attribute name="classpath.property" default="@{name}.jar"/>
<!-- set jarfile only, if the target jar file has no generic name --> <!-- set jarfile only, if the target jar file has no generic name -->
<attribute name="jarfile" default="${common-solr.dir}/build/contrib/solr-@{name}/apache-solr-@{name}-${version}.jar"/> <attribute name="jarfile" default="${common-solr.dir}/build/contrib/solr-@{name}/solr-@{name}-${version}.jar"/>
<sequential> <sequential>
<!--<echo message="Checking '@{jarfile}' against source folder '${common.dir}/contrib/@{name}/src/java'"/>--> <!--<echo message="Checking '@{jarfile}' against source folder '${common.dir}/contrib/@{name}/src/java'"/>-->
<property name="@{classpath.property}" location="@{jarfile}"/> <property name="@{classpath.property}" location="@{jarfile}"/>
@ -214,13 +214,13 @@
</target> </target>
<target name="check-solr-core-javadocs-uptodate" unless="solr-core-javadocs.uptodate"> <target name="check-solr-core-javadocs-uptodate" unless="solr-core-javadocs.uptodate">
<uptodate property="solr-core-javadocs.uptodate" targetfile="${build.dir}/solr-core/apache-solr-core-${version}-javadoc.jar"> <uptodate property="solr-core-javadocs.uptodate" targetfile="${build.dir}/solr-core/solr-core-${version}-javadoc.jar">
<srcfiles dir="${common-solr.dir}/core/src/java" includes="**/*.java"/> <srcfiles dir="${common-solr.dir}/core/src/java" includes="**/*.java"/>
</uptodate> </uptodate>
</target> </target>
<target name="check-solrj-javadocs-uptodate" unless="solrj-javadocs.uptodate"> <target name="check-solrj-javadocs-uptodate" unless="solrj-javadocs.uptodate">
<uptodate property="solrj-javadocs.uptodate" targetfile="${build.dir}/solr-solrj/apache-solr-solrj-${version}-javadoc.jar"> <uptodate property="solrj-javadocs.uptodate" targetfile="${build.dir}/solr-solrj/solr-solrj-${version}-javadoc.jar">
<srcfiles dir="${common-solr.dir}/solrj/src/java" includes="**/*.java"/> <srcfiles dir="${common-solr.dir}/solrj/src/java" includes="**/*.java"/>
</uptodate> </uptodate>
</target> </target>

2
solr/contrib/uima/README.txt
View File

@ -19,7 +19,7 @@ To start using Solr UIMA Metadata Extraction Library you should go through the f
<lib dir="../../contrib/uima/lib" /> <lib dir="../../contrib/uima/lib" />
<lib dir="../../contrib/uima/lucene-libs" /> <lib dir="../../contrib/uima/lucene-libs" />
<lib dir="../../dist/" regex="apache-solr-uima-\d.*\.jar" /> <lib dir="../../dist/" regex="solr-uima-\d.*\.jar" />
2. modify your schema.xml adding the fields you want to be hold metadata specifying proper values for type, indexed, stored and multiValued options: 2. modify your schema.xml adding the fields you want to be hold metadata specifying proper values for type, indexed, stored and multiValued options:

4
solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
View File

@ -44,8 +44,8 @@
in that directory which completely match the regex (anchored on both in that directory which completely match the regex (anchored on both
ends) will be included. ends) will be included.
--> -->
<lib dir="../../dist/" regex="apache-solr-cell-\d.*\.jar" /> <lib dir="../../dist/" regex="solr-cell-\d.*\.jar" />
<lib dir="../../dist/" regex="apache-solr-clustering-\d.*\.jar" /> <lib dir="../../dist/" regex="solr-clustering-\d.*\.jar" />
<!-- <!--
If a dir option (with or without a regex) is used and nothing is If a dir option (with or without a regex) is used and nothing is
found that matches, it will be ignored found that matches, it will be ignored

4
solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
View File

@ -44,8 +44,8 @@
in that directory which completely match the regex (anchored on both in that directory which completely match the regex (anchored on both
ends) will be included. ends) will be included.
--> -->
<lib dir="../../dist/" regex="apache-solr-cell-\d.*\.jar" /> <lib dir="../../dist/" regex="solr-cell-\d.*\.jar" />
<lib dir="../../dist/" regex="apache-solr-clustering-\d.*\.jar" /> <lib dir="../../dist/" regex="solr-clustering-\d.*\.jar" />
<!-- <!--
If a dir option (with or without a regex) is used and nothing is If a dir option (with or without a regex) is used and nothing is
found that matches, it will be ignored found that matches, it will be ignored

2
solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/solrconfig.xml
View File

@ -24,7 +24,7 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<lib dir="../../contrib/velocity/lib" /> <lib dir="../../contrib/velocity/lib" />
<lib dir="../../dist/" regex="apache-solr-velocity-\d.*\.jar" /> <lib dir="../../dist/" regex="solr-velocity-\d.*\.jar" />
<dataDir>${solr.data.dir:}</dataDir> <dataDir>${solr.data.dir:}</dataDir>

2
solr/example/example-DIH/solr/db/conf/solrconfig.xml
View File

@ -28,7 +28,7 @@
<jmx /> <jmx />
<lib dir="../../../../dist/" regex="apache-solr-dataimporthandler-.*\.jar" /> <lib dir="../../../../dist/" regex="solr-dataimporthandler-.*\.jar" />
<!-- <indexConfig> section could go here, but we want the defaults --> <!-- <indexConfig> section could go here, but we want the defaults -->

2
solr/example/example-DIH/solr/mail/conf/solrconfig.xml
View File

@ -34,7 +34,7 @@
<lib dir="../../../../contrib/extraction/lib" /> <lib dir="../../../../contrib/extraction/lib" />
<lib dir="../../../../contrib/dataimporthandler/lib/" regex=".*jar$" /> <lib dir="../../../../contrib/dataimporthandler/lib/" regex=".*jar$" />
<lib dir="../../../../dist/" regex="apache-solr-dataimporthandler-.*\.jar" /> <lib dir="../../../../dist/" regex="solr-dataimporthandler-.*\.jar" />
<!-- <indexConfig> section could go here, but we want the defaults --> <!-- <indexConfig> section could go here, but we want the defaults -->

2
solr/example/example-DIH/solr/rss/conf/solrconfig.xml
View File

@ -28,7 +28,7 @@
<jmx /> <jmx />
<lib dir="../../../../dist/" regex="apache-solr-dataimporthandler-.*\.jar" /> <lib dir="../../../../dist/" regex="solr-dataimporthandler-.*\.jar" />
<!-- <indexConfig> section could go here, but we want the defaults --> <!-- <indexConfig> section could go here, but we want the defaults -->

2
solr/example/example-DIH/solr/solr/conf/solrconfig.xml
View File

@ -28,7 +28,7 @@
<jmx /> <jmx />
<lib dir="../../../../dist/" regex="apache-solr-dataimporthandler-.*\.jar" /> <lib dir="../../../../dist/" regex="solr-dataimporthandler-.*\.jar" />
<!-- <indexConfig> section could go here, but we want the defaults --> <!-- <indexConfig> section could go here, but we want the defaults -->

2
solr/example/example-DIH/solr/tika/conf/solrconfig.xml
View File

@ -34,7 +34,7 @@
<lib dir="../../../../contrib/extraction/lib" /> <lib dir="../../../../contrib/extraction/lib" />
<lib dir="../../../../contrib/dataimporthandler/lib/" regex=".*jar$" /> <lib dir="../../../../contrib/dataimporthandler/lib/" regex=".*jar$" />
<lib dir="../../../../dist/" regex="apache-solr-dataimporthandler-.*\.jar" /> <lib dir="../../../../dist/" regex="solr-dataimporthandler-.*\.jar" />
<!-- <indexConfig> section could go here, but we want the defaults --> <!-- <indexConfig> section could go here, but we want the defaults -->

8
solr/example/solr/collection1/conf/solrconfig.xml
View File

@ -70,16 +70,16 @@
with their external dependencies. with their external dependencies.
--> -->
<lib dir="../../../contrib/extraction/lib" regex=".*\.jar" /> <lib dir="../../../contrib/extraction/lib" regex=".*\.jar" />
<lib dir="../../../dist/" regex="apache-solr-cell-\d.*\.jar" /> <lib dir="../../../dist/" regex="solr-cell-\d.*\.jar" />
<lib dir="../../../contrib/clustering/lib/" regex=".*\.jar" /> <lib dir="../../../contrib/clustering/lib/" regex=".*\.jar" />
<lib dir="../../../dist/" regex="apache-solr-clustering-\d.*\.jar" /> <lib dir="../../../dist/" regex="solr-clustering-\d.*\.jar" />
<lib dir="../../../contrib/langid/lib/" regex=".*\.jar" /> <lib dir="../../../contrib/langid/lib/" regex=".*\.jar" />
<lib dir="../../../dist/" regex="apache-solr-langid-\d.*\.jar" /> <lib dir="../../../dist/" regex="solr-langid-\d.*\.jar" />
<lib dir="../../../contrib/velocity/lib" regex=".*\.jar" /> <lib dir="../../../contrib/velocity/lib" regex=".*\.jar" />
<lib dir="../../../dist/" regex="apache-solr-velocity-\d.*\.jar" /> <lib dir="../../../dist/" regex="solr-velocity-\d.*\.jar" />
<!-- If a 'dir' option (with or without a regex) is used and nothing <!-- If a 'dir' option (with or without a regex) is used and nothing
is found that matches, it will be ignored is found that matches, it will be ignored

8
solr/webapp/build.xml
View File

@ -44,7 +44,7 @@
implementation.title="org.apache.solr" implementation.title="org.apache.solr"
spec.version="${solr.spec.version}"/> spec.version="${solr.spec.version}"/>
<ant dir="${common-solr.dir}" inheritall="false" target="contribs-add-to-war"/> <ant dir="${common-solr.dir}" inheritall="false" target="contribs-add-to-war"/>
<war destfile="${dist}/apache-solr-${version}${solr.war.suffix}.war" <war destfile="${dist}/solr-${version}${solr.war.suffix}.war"
webxml="web/WEB-INF/web.xml" webxml="web/WEB-INF/web.xml"
manifest="${manifest.file}"> manifest="${manifest.file}">
<lib dir="${common-solr.dir}/core/lib" excludes="${exclude.from.war},${common.classpath.excludes}"> <lib dir="${common-solr.dir}/core/lib" excludes="${exclude.from.war},${common.classpath.excludes}">
@ -54,8 +54,8 @@
<lib dir="${common-solr.dir}/solrj/lib" excludes="${exclude.from.war},${common.classpath.excludes}"/> <lib dir="${common-solr.dir}/solrj/lib" excludes="${exclude.from.war},${common.classpath.excludes}"/>
<lib dir="${lucene-libs}" excludes="${exclude.from.war},${common.classpath.excludes}" /> <lib dir="${lucene-libs}" excludes="${exclude.from.war},${common.classpath.excludes}" />
<lib dir="${dist}" excludes="${exclude.from.war},${common.classpath.excludes}"> <lib dir="${dist}" excludes="${exclude.from.war},${common.classpath.excludes}">
<include name="apache-solr-solrj-${version}.jar" /> <include name="solr-solrj-${version}.jar" />
<include name="apache-solr-core-${version}.jar" /> <include name="solr-core-${version}.jar" />
</lib> </lib>
<fileset dir="${dest}/web" excludes="${exclude.from.war}"/> <!-- contribs' additions --> <fileset dir="${dest}/web" excludes="${exclude.from.war}"/> <!-- contribs' additions -->
<fileset dir="web" excludes="${exclude.from.war}"/> <fileset dir="web" excludes="${exclude.from.war}"/>
@ -64,7 +64,7 @@
</target> </target>
<target name="dist-maven" depends="dist, filter-pom-templates, install-maven-tasks, m2-deploy-solr-parent-pom"> <target name="dist-maven" depends="dist, filter-pom-templates, install-maven-tasks, m2-deploy-solr-parent-pom">
<m2-deploy jar.file="${dist}/apache-solr-${version}.war" <m2-deploy jar.file="${dist}/solr-${version}.war"
pom.xml="${filtered.pom.templates.dir}/solr/webapp/pom.xml"/> pom.xml="${filtered.pom.templates.dir}/solr/webapp/pom.xml"/>
</target> </target>
</project> </project>