From 56b62c1ddbb888087faf757f529f1811e305242e Mon Sep 17 00:00:00 2001
From: Steven Rowe <sarowe@apache.org>
Date: Sat, 12 Jan 2013 17:51:57 +0000
Subject: [PATCH] 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
---
 dev-tools/scripts/smokeTestRelease.py         | 20 +++++++------------
 solr/CHANGES.txt                              |  2 ++
 solr/README.txt                               |  4 ++--
 solr/common-build.xml                         |  8 ++++----
 solr/contrib/uima/README.txt                  |  2 +-
 .../uima/solr/collection1/conf/solrconfig.xml |  4 ++--
 .../uima/uima-tokenizers-solrconfig.xml       |  4 ++--
 .../solr/collection1/conf/solrconfig.xml      |  2 +-
 .../example-DIH/solr/db/conf/solrconfig.xml   |  2 +-
 .../example-DIH/solr/mail/conf/solrconfig.xml |  2 +-
 .../example-DIH/solr/rss/conf/solrconfig.xml  |  2 +-
 .../example-DIH/solr/solr/conf/solrconfig.xml |  2 +-
 .../example-DIH/solr/tika/conf/solrconfig.xml |  2 +-
 .../solr/collection1/conf/solrconfig.xml      |  8 ++++----
 solr/webapp/build.xml                         |  8 ++++----
 15 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py
index b83de5891c3..9b6aa9a7825 100644
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -308,7 +308,7 @@ def checkSigs(project, urlString, version, tmpDir, isSigned):
       artifact = text
       artifactURL = subURL
       if project == 'solr':
-        expected = 'apache-solr-%s' % version
+        expected = 'solr-%s' % version
       else:
         expected = 'lucene-%s' % version
       if not artifact.startswith(expected):
@@ -334,9 +334,9 @@ def checkSigs(project, urlString, version, tmpDir, isSigned):
                 'lucene-%s.tgz' % version,
                 'lucene-%s.zip' % version]
   else:
-    expected = ['apache-solr-%s-src.tgz' % version,
-                'apache-solr-%s.tgz' % version,
-                'apache-solr-%s.zip' % version]
+    expected = ['solr-%s-src.tgz' % version,
+                'solr-%s.tgz' % version,
+                'solr-%s.zip' % version]
 
   actual = [x[0] for x in artifacts]
   if expected != actual:
@@ -556,10 +556,7 @@ def unpackAndVerify(project, tmpDir, artifact, version):
 
   # make sure it unpacks to proper subdir
   l = os.listdir(destDir)
-  if project == 'solr':
-    expected = 'apache-%s-%s' % (project, version)
-  else:
-    expected = '%s-%s' % (project, version)
+  expected = '%s-%s' % (project, version)
   if l != [expected]:
     raise RuntimeError('unpack produced entries %s; expected only %s' % (l, expected))
 
@@ -956,7 +953,6 @@ def getDistributionsForMavenChecks(tmpDir, version, baseURL):
   distributionFiles = defaultdict()
   for project in ('lucene', 'solr'):
     distribution = '%s-%s.tgz' % (project, version)
-    if project == 'solr': distribution = 'apache-' + distribution
     if not os.path.exists('%s/%s' % (tmpDir, distribution)):
       distURL = '%s/%s/%s' % (baseURL, project, distribution)
       print('    download %s...' % distribution, end=' ')
@@ -1010,8 +1006,6 @@ def checkIdenticalMavenArtifacts(distributionFiles, nonMavenizedDeps, artifacts,
     distFilenames = dict()
     for file in distributionFiles[project]:
       baseName = os.path.basename(file)
-      if project == 'solr': # Remove 'apache-' prefix to allow comparison to Maven artifacts
-        baseName = baseName.replace('apache-', '')
       distFilenames[baseName] = file
     for artifact in artifacts[project]:
       if reJarWar.search(artifact):
@@ -1348,9 +1342,9 @@ def smokeTest(baseURL, version, tmpDir, isSigned):
   print()
   print('Test Solr...')
   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, 'apache-solr-%s-src.tgz' % version, version)
+  unpackAndVerify('solr', tmpDir, 'solr-%s-src.tgz' % version, version)
 
   print()
   print('Test Maven artifacts for Lucene and Solr...')
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index aada4729082..77f54548b6d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -590,6 +590,8 @@ Other Changes
 * SOLR-3735: Relocate the example mime-to-extension mapping, and
   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 ==================
 
diff --git a/solr/README.txt b/solr/README.txt
index 6d23cea0166..7b5ec4790c8 100644
--- a/solr/README.txt
+++ b/solr/README.txt
@@ -45,11 +45,11 @@ example/
   Please see example/README.txt for information about running this
   example.
 
-dist/apache-solr-XX.war
+dist/solr-XX.war
   The Apache Solr Application.  Deploy this WAR file to any servlet
   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,
   one or more of these will be required.  The core library is
   required at a minimum. (see http://wiki.apache.org/solr/SolrPlugins
diff --git a/solr/common-build.xml b/solr/common-build.xml
index 77925bec746..f56e96bb1b7 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -25,7 +25,7 @@
   
   <property name="Name" value="Solr" />
   <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="final.name" value="${fullnamever}"/>
   
@@ -114,7 +114,7 @@
     <attribute name="property" default="@{name}.uptodate"/>
     <attribute name="classpath.property" default="@{name}.jar"/>
     <!-- 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>
       <!--<echo message="Checking '@{jarfile}' against source folder '${common.dir}/contrib/@{name}/src/java'"/>-->
       <property name="@{classpath.property}" location="@{jarfile}"/>
@@ -214,13 +214,13 @@
   </target>
 
   <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"/>
     </uptodate>
   </target>
 
   <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"/>
     </uptodate>
   </target>
diff --git a/solr/contrib/uima/README.txt b/solr/contrib/uima/README.txt
index 9a862b7e7d1..d32063bc08d 100644
--- a/solr/contrib/uima/README.txt
+++ b/solr/contrib/uima/README.txt
@@ -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/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:
 
diff --git a/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml b/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
index 1a7109d7519..ebd7903b9d3 100644
--- a/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
+++ b/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
@@ -44,8 +44,8 @@
     in that directory which completely match the regex (anchored on both
     ends) will be included.
   -->
-  <lib dir="../../dist/" regex="apache-solr-cell-\d.*\.jar" />
-  <lib dir="../../dist/" regex="apache-solr-clustering-\d.*\.jar" />
+  <lib dir="../../dist/" regex="solr-cell-\d.*\.jar" />
+  <lib dir="../../dist/" regex="solr-clustering-\d.*\.jar" />
   <!--
     If a dir option (with or without a regex) is used and nothing is
     found that matches, it will be ignored
diff --git a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
index 40cacc3b70f..76de1431156 100644
--- a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
+++ b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
@@ -44,8 +44,8 @@
     in that directory which completely match the regex (anchored on both
     ends) will be included.
   -->
-  <lib dir="../../dist/" regex="apache-solr-cell-\d.*\.jar" />
-  <lib dir="../../dist/" regex="apache-solr-clustering-\d.*\.jar" />
+  <lib dir="../../dist/" regex="solr-cell-\d.*\.jar" />
+  <lib dir="../../dist/" regex="solr-clustering-\d.*\.jar" />
   <!--
     If a dir option (with or without a regex) is used and nothing is
     found that matches, it will be ignored
diff --git a/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/solrconfig.xml b/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/solrconfig.xml
index c770a3fb4af..a5befb22a48 100644
--- a/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/solrconfig.xml
+++ b/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/solrconfig.xml
@@ -24,7 +24,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
 
   <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>
 
 
diff --git a/solr/example/example-DIH/solr/db/conf/solrconfig.xml b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
index 4a569144856..d1463b95992 100644
--- a/solr/example/example-DIH/solr/db/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
@@ -28,7 +28,7 @@
 
   <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 -->
 
diff --git a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
index 23194a39845..36d23c0466a 100644
--- a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
@@ -34,7 +34,7 @@
   <lib dir="../../../../contrib/extraction/lib" />
 
   <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 -->
 
diff --git a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml b/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
index 8a83e19c97b..01e1967feb1 100644
--- a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
@@ -28,7 +28,7 @@
 
   <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 -->
 
diff --git a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
index be0d4ede42b..b90d13f60c5 100644
--- a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
@@ -28,7 +28,7 @@
 
   <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 -->
 
diff --git a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
index 91a97104a90..2ad4c09f5c5 100644
--- a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
@@ -34,7 +34,7 @@
   <lib dir="../../../../contrib/extraction/lib" />
 
   <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 -->
 
diff --git a/solr/example/solr/collection1/conf/solrconfig.xml b/solr/example/solr/collection1/conf/solrconfig.xml
index cee2e1609c3..41c8304d348 100755
--- a/solr/example/solr/collection1/conf/solrconfig.xml
+++ b/solr/example/solr/collection1/conf/solrconfig.xml
@@ -70,16 +70,16 @@
        with their external dependencies.
     -->
   <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="../../../dist/" regex="apache-solr-clustering-\d.*\.jar" />
+  <lib dir="../../../dist/" regex="solr-clustering-\d.*\.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="../../../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
        is found that matches, it will be ignored
diff --git a/solr/webapp/build.xml b/solr/webapp/build.xml
index 8d21267e4d9..db3bfce5511 100644
--- a/solr/webapp/build.xml
+++ b/solr/webapp/build.xml
@@ -44,7 +44,7 @@
                     implementation.title="org.apache.solr"
                     spec.version="${solr.spec.version}"/>
     <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"
          manifest="${manifest.file}">
       <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="${lucene-libs}" 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="apache-solr-core-${version}.jar" />
+        <include name="solr-solrj-${version}.jar" />
+        <include name="solr-core-${version}.jar" />
       </lib>
       <fileset dir="${dest}/web" excludes="${exclude.from.war}"/> <!-- contribs' additions -->
       <fileset dir="web" excludes="${exclude.from.war}"/>
@@ -64,7 +64,7 @@
   </target>
 
   <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"/>
   </target>
 </project>