You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2014/09/16 17:29:54 UTC
svn commit: r1625331 - in /lucene/dev/trunk: dev-tools/idea/.idea/ dev-tools/idea/solr/contrib/analytics/ solr/contrib/analytics/ solr/contrib/analytics/src/ solr/contrib/analytics/src/java/ solr/contrib/analytics/src/java/org/ solr/contrib/analytics/s...

Author: yonik
Date: Tue Sep 16 15:29:54 2014
New Revision: 1625331

URL: http://svn.apache.org/r1625331
Log:
SOLR-5302: move analytics component to contrib

Added:
    lucene/dev/trunk/dev-tools/idea/solr/contrib/analytics/
    lucene/dev/trunk/dev-tools/idea/solr/contrib/analytics/analytics.iml
    lucene/dev/trunk/solr/contrib/analytics/
    lucene/dev/trunk/solr/contrib/analytics/build.xml   (with props)
    lucene/dev/trunk/solr/contrib/analytics/ivy.xml   (with props)
    lucene/dev/trunk/solr/contrib/analytics/src/
    lucene/dev/trunk/solr/contrib/analytics/src/java/
    lucene/dev/trunk/solr/contrib/analytics/src/java/org/
    lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/
    lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/
    lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/analytics/
      - copied from r1624900, lucene/dev/trunk/solr/core/src/java/org/apache/solr/analytics/
    lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/handler/
    lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/handler/component/
    lucene/dev/trunk/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java
      - copied unchanged from r1624900, lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/AnalyticsComponent.java
    lucene/dev/trunk/solr/contrib/analytics/src/test/
    lucene/dev/trunk/solr/contrib/analytics/src/test-files/
    lucene/dev/trunk/solr/contrib/analytics/src/test-files/analytics/
      - copied from r1624900, lucene/dev/trunk/solr/core/src/test-files/analytics/
    lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/
    lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/
    lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/
    lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml
      - copied unchanged from r1624900, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-analytics.xml
    lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-basic.xml
      - copied, changed from r1624900, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
    lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
      - copied unchanged from r1624900, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
    lucene/dev/trunk/solr/contrib/analytics/src/test/org/
    lucene/dev/trunk/solr/contrib/analytics/src/test/org/apache/
    lucene/dev/trunk/solr/contrib/analytics/src/test/org/apache/solr/
    lucene/dev/trunk/solr/contrib/analytics/src/test/org/apache/solr/analytics/
      - copied from r1624900, lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/
Removed:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/analytics/
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/AnalyticsComponent.java
    lucene/dev/trunk/solr/core/src/test-files/analytics/
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-analytics.xml
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/analytics/
Modified:
    lucene/dev/trunk/dev-tools/idea/.idea/modules.xml
    lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java

Modified: lucene/dev/trunk/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/modules.xml?rev=1625331&r1=1625330&r2=1625331&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/modules.xml Tue Sep 16 15:29:54 2014
@@ -56,6 +56,7 @@
       <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/morphlines-core/morphlines-core.iml" />
       <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/uima/uima.iml" />
       <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/velocity/velocity.iml" />
+      <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/analytics/analytics.iml" />
     </modules>
   </component>
 </project>

Modified: lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml?rev=1625331&r1=1625330&r2=1625331&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml Tue Sep 16 15:29:54 2014
@@ -316,6 +316,15 @@
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
       <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
     </configuration>
+    <configuration default="false" name="Solr analytics contrib" type="JUnit" factoryName="JUnit">
+      <module name="analytics" />
+      <option name="TEST_OBJECT" value="pattern" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-analytics" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+      <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
+    </configuration>
+ 
     <list size="39">
       <item index="0" class="java.lang.String" itemvalue="JUnit.Lucene core" />
       <item index="1" class="java.lang.String" itemvalue="JUnit.Module analyzers-common" />

Added: lucene/dev/trunk/dev-tools/idea/solr/contrib/analytics/analytics.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/analytics/analytics.iml?rev=1625331&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/analytics/analytics.iml (added)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/analytics/analytics.iml Tue Sep 16 15:29:54 2014
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-analytics/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-analytics/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test-files" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+    <orderEntry type="library" name="Solr core library" level="project" />
+    <orderEntry type="library" name="Solrj library" level="project" />
+    <orderEntry type="library" name="Solr analytics library" level="project" />
+    <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
+    <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/test-lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/test-lib" recursive="false" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module" module-name="lucene-core" />
+    <orderEntry type="module" module-name="queries" />
+    <orderEntry type="module" module-name="solr-core" />
+    <orderEntry type="module" module-name="solrj" />
+  </component>
+</module>
+

Added: lucene/dev/trunk/solr/contrib/analytics/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/build.xml?rev=1625331&view=auto
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/build.xml (added)
+++ lucene/dev/trunk/solr/contrib/analytics/build.xml Tue Sep 16 15:29:54 2014
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ -->
+
+<project name="solr-analytics" default="default">
+
+  <description>
+    Analytics Package
+  </description>
+
+  <import file="../contrib-build.xml"/>
+
+  <path id="test.classpath">
+    <path refid="solr.test.base.classpath"/>
+    <fileset dir="${test.lib.dir}" includes="*.jar"/>
+  </path>
+
+</project>

Added: lucene/dev/trunk/solr/contrib/analytics/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/ivy.xml?rev=1625331&view=auto
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/ivy.xml (added)
+++ lucene/dev/trunk/solr/contrib/analytics/ivy.xml Tue Sep 16 15:29:54 2014
@@ -0,0 +1,30 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="2.0">
+    <info organisation="org.apache.solr" module="analytics"/>
+      <configurations>
+        <conf name="compile" transitive="false"/>
+        <conf name="test" transitive="false"/>
+      </configurations>
+
+     <dependencies>
+       <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="test->*"/>
+     </dependencies>
+
+</ivy-module>

Copied: lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-basic.xml (from r1624900, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-basic.xml?p2=lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-basic.xml&p1=lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml&r1=1624900&r2=1625331&rev=1625331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-basic.xml Tue Sep 16 15:29:54 2014
@@ -17,13 +17,25 @@
  limitations under the License.
 -->
 
-<!-- a basic solrconfig that tests can use when they want simple minimal solrconfig/schema
-     DO NOT ADD THINGS TO THIS CONFIG! -->
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
-  <requestHandler name="standard" class="solr.StandardRequestHandler" />
+
+  <requestHandler name="standard" class="solr.StandardRequestHandler">
+    <arr name="components">
+      <str>query</str>
+      <str>facet</str>
+      <str>analytics</str>
+      <str>highlight</str>
+      <str>debug</str>
+      <str>expand</str>
+    </arr>
+  </requestHandler>
+
   <requestHandler name="/update" class="solr.UpdateRequestHandler" />
+
+  <searchComponent name="analytics" class="org.apache.solr.handler.component.AnalyticsComponent" />
+
 </config>

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1625331&r1=1625330&r2=1625331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java Tue Sep 16 15:29:54 2014
@@ -41,7 +41,6 @@ import org.apache.solr.core.DirectoryFac
 import org.apache.solr.handler.SnapPuller;
 import org.apache.solr.handler.UpdateRequestHandler;
 import org.apache.solr.handler.admin.ShowFileRequestHandler;
-import org.apache.solr.handler.component.AnalyticsComponent;
 import org.apache.solr.handler.component.DebugComponent;
 import org.apache.solr.handler.component.ExpandComponent;
 import org.apache.solr.handler.component.FacetComponent;
@@ -1282,7 +1281,6 @@ public final class SolrCore implements S
     addIfNotPresent(components,StatsComponent.COMPONENT_NAME,StatsComponent.class);
     addIfNotPresent(components,DebugComponent.COMPONENT_NAME,DebugComponent.class);
     addIfNotPresent(components,RealTimeGetComponent.COMPONENT_NAME,RealTimeGetComponent.class);
-    addIfNotPresent(components,AnalyticsComponent.COMPONENT_NAME,AnalyticsComponent.class);
     addIfNotPresent(components,ExpandComponent.COMPONENT_NAME,ExpandComponent.class);
 
     return components;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java?rev=1625331&r1=1625330&r2=1625331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java Tue Sep 16 15:29:54 2014
@@ -76,7 +76,6 @@ public class SearchHandler extends Reque
     names.add( HighlightComponent.COMPONENT_NAME );
     names.add( StatsComponent.COMPONENT_NAME );
     names.add( DebugComponent.COMPONENT_NAME );
-    names.add( AnalyticsComponent.COMPONENT_NAME );
     names.add( ExpandComponent.COMPONENT_NAME);
     return names;
   }