You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2011/07/13 20:23:33 UTC
svn commit: r1146191 [5/5] - in /lucene/dev/branches/branch_3x:
dev-tools/eclipse/ dev-tools/idea/.idea/
dev-tools/idea/lucene/contrib/grouping/ dev-tools/idea/solr/
dev-tools/idea/solr/contrib/analysis-extras/
dev-tools/idea/solr/contrib/clustering/ d...
Modified: lucene/dev/branches/branch_3x/solr/contrib/uima/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/uima/build.xml?rev=1146191&r1=1146190&r2=1146191&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/uima/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/uima/build.xml Wed Jul 13 18:23:28 2011
@@ -17,175 +17,28 @@
limitations under the License.
-->
-<project name="solr-uima" default="build">
+<project name="solr-uima" default="default">
- <property name="solr-path" value="../.." />
-
- <import file="../../common-build.xml"/>
-
<description>
Solr Integration with UIMA for extracting metadata from arbitrary (text) fields and enrich document with features extracted from UIMA types (language, sentences, concepts, named entities, etc.)
</description>
- <path id="common.classpath">
- <pathelement location="${solr-path}/build/solr" />
- <pathelement location="${solr-path}/build/solrj" />
- <fileset dir="lib" includes="*.jar"/>
- <fileset dir="${solr-path}/lib" includes="*.jar"/>
- <path refid="lucene.classpath"/>
- <pathelement location="${basedir}/src/main/resources" />
- </path>
-
- <path id="test.classpath">
- <path refid="common.classpath" />
- <pathelement path="${dest}/classes" />
- <pathelement path="${dest}/test-classes" />
- <pathelement location="${solr-path}/build/test-framework"/> <!-- include solr test code -->
- <pathelement location="${solr-path}/../lucene/build/classes/test-framework" /> <!-- include some lucene test code -->
- <pathelement path="${java.class.path}"/>
- </path>
-
- <target name="clean">
- <delete failonerror="false" dir="${dest}"/>
- </target>
-
- <target name="init">
- <mkdir dir="${dest}/classes"/>
- <mkdir dir="${build.javadoc}" />
- <subant target="compileTestFramework">
- <fileset dir="${solr-path}" includes="build.xml"/>
- </subant>
- <subant target="make-manifest">
- <fileset dir="${solr-path}" includes="build.xml"/>
- </subant>
- </target>
-
- <target name="compile" depends="init">
- <solr-javac destdir="${dest}/classes"
- classpathref="common.classpath">
- <src path="src/main/java" />
- </solr-javac>
- </target>
-
- <target name="build" depends="compile">
- <solr-jar destfile="${dest}/${fullnamever}.jar" basedir="${dest}/classes"
- manifest="../../${dest}/META-INF/MANIFEST.MF">
- <fileset dir="src/main/resources" />
- </solr-jar>
- </target>
-
- <target name="compileTests" depends="compile">
- <solr-javac destdir="${dest}/test-classes"
- classpathref="test.classpath">
- <src path="src/test/java" />
- </solr-javac>
- <copy todir="${dest}/test-classes">
- <fileset dir="src/test/resources" excludes="**/*.java"/>
- </copy>
- </target>
+ <import file="../contrib-build.xml"/>
- <property name="tempDir" value="${junit.output.dir}/temp" />
+ <dirname file="${ant.file}" property="antfile.dir"/>
- <target name="test" depends="compileTests">
- <mkdir dir="${junit.output.dir}"/>
- <!-- <mkdir dir="@{tempDir}/@{pattern}"/>
- This is very loud and obnoxious. abuse touch instead for a "quiet" mkdir
- -->
- <touch file="${tempDir}/quiet.ant" verbose="false" mkdirs="true"/>
-
- <condition property="runall">
- <not>
- <or>
- <isset property="testcase"/>
- <isset property="testpackage"/>
- <isset property="testpackageroot"/>
- </or>
- </not>
- </condition>
-
- <junit printsummary="no"
- haltonfailure="no"
- maxmemory="512M"
- errorProperty="tests.failed"
- failureProperty="tests.failed"
- dir="${tempDir}"
- tempdir="${tempDir}"
- forkmode="perBatch"
- >
- <sysproperty key="java.util.logging.config.file" value="${common-solr.dir}/testlogging.properties"/>
- <sysproperty key="tests.luceneMatchVersion" value="${tests.luceneMatchVersion}"/>
- <sysproperty key="tests.codec" value="${tests.codec}"/>
- <sysproperty key="tests.locale" value="${tests.locale}"/>
- <sysproperty key="tests.timezone" value="${tests.timezone}"/>
- <sysproperty key="tests.multiplier" value="${tests.multiplier}"/>
- <sysproperty key="tests.iter" value="${tests.iter}"/>
- <sysproperty key="tests.seed" value="${tests.seed}"/>
- <sysproperty key="jetty.insecurerandom" value="1"/>
- <sysproperty key="tempDir" file="${tempDir}"/>
- <sysproperty key="testmethod" value="${testmethod}"/>
- <sysproperty key="tests.directory" value="${tests.directory}"/>
- <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
- <jvmarg line="${args}"/>
- <formatter classname="${junit.details.formatter}" usefile="false" if="junit.details"/>
- <classpath refid="test.classpath"/>
- <assertions>
- <enable package="org.apache.lucene"/>
- <enable package="org.apache.solr"/>
- </assertions>
- <formatter type="${junit.formatter}"/>
- <batchtest fork="yes" todir="${junit.output.dir}" if="runall">
- <fileset dir="src/test/java" includes="${junit.includes}"/>
- </batchtest>
- <batchtest fork="yes" todir="${junit.output.dir}" if="testcase">
- <fileset dir="src/test/java" includes="**/${testcase}.java"/>
- </batchtest>
- <batchtest fork="yes" todir="${junit.output.dir}" if="testpackage">
- <fileset dir="src/test/java" includes="**/${testpackage}/**/Test*.java,**/${testpackage}/**/*Test.java"/>
- </batchtest>
- <batchtest fork="yes" todir="${junit.output.dir}" if="testpackageroot">
- <fileset dir="src/test/java" includes="**/${testpackageroot}/Test*.java,**/${testpackageroot}/*Test.java"/>
- </batchtest>
- </junit>
+ <target name="dist-maven" depends="contrib-build.dist-maven">
+ <m2-deploy-with-pom-template pom.xml="${antfile.dir}/lib/solr-uima-an-alchemy-pom.xml.template"
+ jar.file="${antfile.dir}/lib/uima-an-alchemy-2.3.1-SNAPSHOT-r1062868.jar" />
- <fail if="tests.failed">Tests failed!</fail>
- </target>
+ <m2-deploy-with-pom-template pom.xml="${antfile.dir}/lib/solr-uima-an-calais-pom.xml.template"
+ jar.file="${antfile.dir}/lib/uima-an-calais-2.3.1-SNAPSHOT-r1062868.jar" />
- <target name="test-reports"
- description="Generates HTML test reports.">
- <mkdir dir="${junit.reports}"/>
- <junitreport todir="${junit.output.dir}">
- <fileset dir="${junit.output.dir}">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="frames" todir="${junit.reports}"/>
- </junitreport>
- </target>
+ <m2-deploy-with-pom-template pom.xml="${antfile.dir}/lib/solr-uima-an-tagger-pom.xml.template"
+ jar.file="${antfile.dir}/lib/uima-an-tagger-2.3.1-SNAPSHOT-r1062868.jar" />
- <target name="dist" depends="build">
- <copy file="build/${fullnamever}.jar" todir="${solr-path}/dist"/>
- </target>
+ <m2-deploy-with-pom-template pom.xml="${antfile.dir}/lib/solr-uima-an-wst-pom.xml.template"
+ jar.file="${antfile.dir}/lib/uima-an-wst-2.3.1-SNAPSHOT-r1076132.jar" />
- <target name="example" depends="build">
- <!-- :NOOP: this use to copy libs but now we can refer to them by path -->
</target>
-
- <target name="javadoc">
- <sequential>
- <mkdir dir="${build.javadoc}/contrib-${name}"/>
-
- <path id="javadoc.classpath">
- <path refid="common.classpath"/>
- </path>
-
- <invoke-javadoc
- destdir="${build.javadoc}/contrib-${name}"
- title="${Name} ${version} contrib-${fullnamever} API">
- <sources>
- <packageset dir="src/main/java"/>
- </sources>
- </invoke-javadoc>
- </sequential>
- </target>
-
-
</project>
Added: lucene/dev/branches/branch_3x/solr/contrib/uima/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/uima/src/java/overview.html?rev=1146191&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/uima/src/java/overview.html (added)
+++ lucene/dev/branches/branch_3x/solr/contrib/uima/src/java/overview.html Wed Jul 13 18:23:28 2011
@@ -0,0 +1,5 @@
+<html>
+<body>
+Apache Solr Search Server: Solr UIMA contrib
+</body>
+</html>
Added: lucene/dev/branches/branch_3x/solr/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/build.xml?rev=1146191&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/build.xml (added)
+++ lucene/dev/branches/branch_3x/solr/core/build.xml Wed Jul 13 18:23:28 2011
@@ -0,0 +1,39 @@
+<?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-core" default="default">
+ <description>Solr Core</description>
+
+ <import file="../common-build.xml"/>
+
+ <target name="compile-core" unless="solr.core.compiled"
+ depends="prep-lucene-jars, compile-solrj, common.compile-core">
+ <property name="solr.core.compiled" value="true"/>
+ </target>
+
+ <target name="compile-test" depends="compile-solr-test-framework,common.compile-test"/>
+
+ <target name="test" depends="compile-test,junit-mkdir,junit-sequential,junit-parallel"/>
+
+ <target name="dist-maven" depends="jar-core,javadocs,jar-src,contrib-build.dist-maven">
+ <m2-deploy-with-pom-template pom.xml="${common-solr.dir}/lib/solr-commons-csv-pom.xml.template"
+ jar.file="${common-solr.dir}/lib/commons-csv-1.0-SNAPSHOT-r966014.jar" />
+
+ <m2-deploy-with-pom-template pom.xml="${common-solr.dir}/lib/apache-solr-noggit-pom.xml.template"
+ jar.file="${common-solr.dir}/lib/apache-solr-noggit-r1099557.jar" />
+ </target>
+</project>
\ No newline at end of file
Added: lucene/dev/branches/branch_3x/solr/core/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/overview.html?rev=1146191&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/overview.html (added)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/overview.html Wed Jul 13 18:23:28 2011
@@ -0,0 +1,5 @@
+<html>
+<body>
+Apache Solr Search Server
+</body>
+</html>
Modified: lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java?rev=1146191&r1=1146128&r2=1146191&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java Wed Jul 13 18:23:28 2011
@@ -1,4 +1,6 @@
-/**
+package org.apache.solr.core;
+
+/*
* 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.
@@ -15,25 +17,19 @@
* limitations under the License.
*/
-package org.apache.solr.core;
-
import java.util.List;
import org.apache.solr.util.AbstractSolrTestCase;
-
-import org.apache.solr.common.util.DOMUtilTest;
+import org.apache.solr.util.DOMUtilTestBase;
import org.junit.Test;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.w3c.dom.Node;
/**
* TestCase for PluginInfo.
- * Extends DOMUtilTest because PluginInfo heavily depends on DOMUtil
+ * Extends DOMUtilTestBase because PluginInfo heavily depends on DOMUtil
* and the convinient {@link #getNode(String, String)} method.
*/
-public class PluginInfoTest extends DOMUtilTest {
+public class PluginInfoTest extends DOMUtilTestBase {
private final static String configWithNoChildren = "" +
"<plugin name=\"aplug\">" +
@@ -167,10 +163,4 @@ public class PluginInfoTest extends DOMU
PluginInfo pi = new PluginInfo(node, "from static", true, false);
assertTrue( pi.initArgs.size() == node.getChildNodes().getLength() );
}
- @Test
- @Override
- public void testAddToNamedListPrimitiveTypes() throws Exception {
- // do nothing here
- }
-
}
Added: lucene/dev/branches/branch_3x/solr/solrj/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/build.xml?rev=1146191&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/solrj/build.xml (added)
+++ lucene/dev/branches/branch_3x/solr/solrj/build.xml Wed Jul 13 18:23:28 2011
@@ -0,0 +1,41 @@
+<?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-solrj" default="default">
+ <description>Solrj - Solr Java Client</description>
+
+ <import file="../common-build.xml"/>
+
+ <target name="compile-test" depends="compile-solr-test-framework,common.compile-test"/>
+
+ <target name="test" depends="compile-test,junit-mkdir,junit-sequential,junit-parallel"/>
+
+ <target name="dist" depends="common-solr.dist">
+ <mkdir dir="${dist}/solrj-lib" />
+ <copy todir="${dist}/solrj-lib">
+ <fileset dir="${common-solr.dir}/lib">
+ <include name="commons-codec-*.jar"/>
+ <include name="commons-io-*.jar"/>
+ <include name="commons-httpclient-*.jar"/>
+ <include name="*stax-*.jar" />
+ <include name="wstx-*.jar" />
+ <include name="jcl-over-slf4j-*.jar" />
+ <include name="slf4j-api-*.jar" />
+ </fileset>
+ </copy>
+ </target>
+</project>
Added: lucene/dev/branches/branch_3x/solr/solrj/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/src/java/overview.html?rev=1146191&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/solrj/src/java/overview.html (added)
+++ lucene/dev/branches/branch_3x/solr/solrj/src/java/overview.html Wed Jul 13 18:23:28 2011
@@ -0,0 +1,5 @@
+<html>
+<body>
+Apache Solr Search Server: Solr-j
+</body>
+</html>
Modified: lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/common/util/DOMUtilTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/common/util/DOMUtilTest.java?rev=1146191&r1=1146128&r2=1146191&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/common/util/DOMUtilTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/common/util/DOMUtilTest.java Wed Jul 13 18:23:28 2011
@@ -17,30 +17,9 @@
package org.apache.solr.common.util;
-import java.io.StringReader;
+import org.apache.solr.util.DOMUtilTestBase;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-
-import org.apache.lucene.util.LuceneTestCase;
-
-public class DOMUtilTest extends LuceneTestCase {
-
- private DocumentBuilder builder;
- private static final XPathFactory xpathFactory = XPathFactory.newInstance();
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- }
+public class DOMUtilTest extends DOMUtilTestBase {
public void testAddToNamedListPrimitiveTypes() throws Exception {
NamedList<Object> namedList = new SimpleOrderedMap<Object>();
@@ -75,17 +54,4 @@ public class DOMUtilTest extends LuceneT
assertEquals( value, v );
namedList.remove( key );
}
-
- public Node getNode( String xml, String path ) throws Exception {
- return getNode( getDocument(xml), path );
- }
-
- public Node getNode( Document doc, String path ) throws Exception {
- XPath xpath = xpathFactory.newXPath();
- return (Node)xpath.evaluate(path, doc, XPathConstants.NODE);
- }
-
- public Document getDocument( String xml ) throws Exception {
- return builder.parse(new InputSource(new StringReader(xml)));
- }
}
Added: lucene/dev/branches/branch_3x/solr/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/test-framework/build.xml?rev=1146191&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/test-framework/build.xml (added)
+++ lucene/dev/branches/branch_3x/solr/test-framework/build.xml Wed Jul 13 18:23:28 2011
@@ -0,0 +1,42 @@
+<?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-test-framework" default="default">
+ <description>Solr Test Framework</description>
+
+ <import file="../common-build.xml"/>
+
+ <path id="javadoc.classpath">
+ <path refid="classpath"/>
+ <pathelement location="${common.dir}/build/classes/test-framework"/>
+ <pathelement location="${build.dir}/classes/java"/>
+ </path>
+
+ <!-- Redefine Lucene test-framework compilation here to avoid circular dependency on compile-core -->
+ <target name="compile-test-framework">
+ <ant dir="${common.dir}" target="compile-test-framework" inheritall="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ </target>
+
+ <target name="compile-core" depends="compile-solr-core, compile-test-framework">
+ <compile srcdir="${src.dir}" destdir="${build.dir}/classes/java">
+ <classpath refid="test.base.classpath"/>
+ </compile>
+ </target>
+</project>
+
Added: lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/util/DOMUtilTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/util/DOMUtilTestBase.java?rev=1146191&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/util/DOMUtilTestBase.java (added)
+++ lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/util/DOMUtilTestBase.java Wed Jul 13 18:23:28 2011
@@ -0,0 +1,56 @@
+/**
+ * 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.
+ */
+
+package org.apache.solr.util;
+
+
+import java.io.StringReader;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+
+import org.apache.lucene.util.LuceneTestCase;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+
+public abstract class DOMUtilTestBase extends LuceneTestCase {
+
+ private DocumentBuilder builder;
+ private static final XPathFactory xpathFactory = XPathFactory.newInstance();
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ }
+
+ public Node getNode( String xml, String path ) throws Exception {
+ return getNode( getDocument(xml), path );
+ }
+
+ public Node getNode( Document doc, String path ) throws Exception {
+ XPath xpath = xpathFactory.newXPath();
+ return (Node)xpath.evaluate(path, doc, XPathConstants.NODE);
+ }
+
+ public Document getDocument( String xml ) throws Exception {
+ return builder.parse(new InputSource(new StringReader(xml)));
+ }
+}
Copied: lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java (from r1146128, lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/ExternalPaths.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java?p2=lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java&p1=lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/ExternalPaths.java&r1=1146128&r2=1146191&rev=1146191&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/ExternalPaths.java (original)
+++ lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java Wed Jul 13 18:23:28 2011
@@ -28,7 +28,7 @@ import org.apache.solr.SolrTestCaseJ4;
*/
public class ExternalPaths {
private static final String SOURCE_HOME = determineSourceHome();
- public static String WEBAPP_HOME = new File(SOURCE_HOME, "src/webapp/web").getAbsolutePath();
+ public static String WEBAPP_HOME = new File(SOURCE_HOME, "webapp/web").getAbsolutePath();
public static String EXAMPLE_HOME = new File(SOURCE_HOME, "example/solr").getAbsolutePath();
public static String EXAMPLE_MULTICORE_HOME = new File(SOURCE_HOME, "example/multicore").getAbsolutePath();
public static String EXAMPLE_SCHEMA=EXAMPLE_HOME+"/conf/schema.xml";
Added: lucene/dev/branches/branch_3x/solr/test-framework/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/test-framework/src/java/overview.html?rev=1146191&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/test-framework/src/java/overview.html (added)
+++ lucene/dev/branches/branch_3x/solr/test-framework/src/java/overview.html Wed Jul 13 18:23:28 2011
@@ -0,0 +1,5 @@
+<html>
+<body>
+Apache Solr Search Server: Test Framework
+</body>
+</html>
Added: lucene/dev/branches/branch_3x/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/webapp/build.xml?rev=1146191&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/webapp/build.xml (added)
+++ lucene/dev/branches/branch_3x/solr/webapp/build.xml Wed Jul 13 18:23:28 2011
@@ -0,0 +1,74 @@
+<?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-webapp" default="default">
+ <description>Solr webapp</description>
+
+ <import file="../common-build.xml"/>
+
+ <!-- Checks that all JSP files in the webapp compile successfully using Jetty's Jasper -->
+ <target name="test" depends="compile-test-solr-core">
+ <property name="jsp.target" location="${dest}/jsp-temp" />
+ <taskdef classname="org.apache.jasper.JspC" name="jasper" >
+ <classpath>
+ <fileset dir="${common-solr.dir}/example/lib" includes="**/*.jar" />
+ </classpath>
+ </taskdef>
+ <delete dir="${jsp.target}" />
+ <mkdir dir="${jsp.target}" />
+ <jasper uriroot="${common-solr.dir}/webapp/web" outputDir="${jsp.target}" compile="false" verbose="1" package="j"/>
+ <javac srcdir="${jsp.target}" destdir="${jsp.target}" target="${javac.target}"
+ source="${javac.source}" debug="off" includeAntRuntime="${javac.includeAntRuntime}"
+ encoding="utf8" classpathref="test.classpath"/>
+ </target>
+
+ <target name="dist"
+ description="Creates the Solr WAR Distribution file."
+ depends="test, init-dist, dist-core, dist-solrj, lucene-jars-to-solr">
+ <exec dir="." executable="${svnversion.exe}"
+ outputproperty="svnversion" failifexecutionfails="false">
+ <arg line="."/>
+ </exec>
+ <build-manifest title="Apache Solr Search Server"
+ 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}.war"
+ webxml="web/WEB-INF/web.xml"
+ manifest="${dest}/META-INF/MANIFEST.MF">
+ <lib dir="${common-solr.dir}/lib">
+ <exclude name="servlet-api*.jar" />
+ <exclude name="easymock-*.jar" />
+ <exclude name="junit-*.jar" />
+ <exclude name="*.txt" />
+ <exclude name="*.template" />
+ </lib>
+ <lib dir="${lucene-libs}"/>
+ <lib dir="${dist}">
+ <include name="apache-solr-solrj-${version}.jar" />
+ <include name="apache-solr-core-${version}.jar" />
+ </lib>
+ <fileset dir="${dest}/web"/> <!-- contribs' additions -->
+ <fileset dir="web" />
+ <metainf dir="${common-solr.dir}" includes="LICENSE.txt,NOTICE.txt"/>
+ </war>
+ </target>
+
+ <target name="dist-maven" depends="dist" if="pom.xml.present">
+ <m2-deploy jar.file="${dist}/apache-solr-${version}.war"/>
+ </target>
+</project>