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 2013/12/10 16:50:38 UTC
svn commit: r1549872 - in /lucene/dev/trunk: ./ .gitignore build.xml
dev-tools/netbeans/ dev-tools/netbeans/nb-project.xsl lucene/CHANGES.txt
Author: sarowe
Date: Tue Dec 10 15:50:38 2013
New Revision: 1549872
URL: http://svn.apache.org/r1549872
Log:
LUCENE-5360: Add support for developing in Netbeans IDE.
Added:
lucene/dev/trunk/dev-tools/netbeans/
lucene/dev/trunk/dev-tools/netbeans/nb-project.xsl (with props)
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/.gitignore
lucene/dev/trunk/build.xml
lucene/dev/trunk/lucene/CHANGES.txt
Modified: lucene/dev/trunk/.gitignore
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/.gitignore?rev=1549872&r1=1549871&r2=1549872&view=diff
==============================================================================
--- lucene/dev/trunk/.gitignore (original)
+++ lucene/dev/trunk/.gitignore Tue Dec 10 15:50:38 2013
@@ -23,6 +23,8 @@
/bin
/bin.*
/pom.xml
+/nbproject
+/nb-build
# ./lucene
Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1549872&r1=1549871&r2=1549872&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Tue Dec 10 15:50:38 2013
@@ -191,6 +191,42 @@
</delete>
</target>
+ <target name="netbeans" depends="resolve" description="Setup Netbeans configuration">
+ <pathconvert property="netbeans.fileset.sourcefolders" pathsep="|" dirsep="/">
+ <dirset dir="${basedir}/lucene" includes="**/src/java, **/src/examples" excludes="tools/**, build/**, backwards/**" />
+ <dirset dir="${basedir}/solr" includes="**/src/java, **/src/examples" excludes="build/**" />
+ <map from="${basedir}/" to=""/>
+ </pathconvert>
+ <pathconvert property="netbeans.fileset.testfolders" pathsep="|" dirsep="/">
+ <dirset dir="${basedir}/lucene" includes="**/src/test" excludes="tools/**, build/**, backwards/**" />
+ <dirset dir="${basedir}/solr" includes="**/src/test" excludes="build/**" />
+ <map from="${basedir}/" to=""/>
+ </pathconvert>
+ <pathconvert property="netbeans.fileset.resourcefolders" pathsep="|" dirsep="/">
+ <dirset dir="${basedir}/lucene" includes="**/src/resources" excludes="tools/**, build/**, backwards/**" />
+ <dirset dir="${basedir}/solr" includes="**/src/resources" excludes="build/**" />
+ <map from="${basedir}/" to=""/>
+ </pathconvert>
+ <pathconvert property="netbeans.fileset.libs" pathsep="|" dirsep="/">
+ <fileset dir="${basedir}/lucene" includes="**/lib/*.jar" excludes="**/*servlet-api*.jar, analysis/uima/**, tools/**, build/**"/>
+ <fileset dir="${basedir}/solr" includes="**/test-lib/*.jar,**/lib/*.jar" excludes="core/test-lib/*servlet-api*.jar, contrib/analysis-extras/**, test-framework/lib/junit*, test-framework/lib/ant*, test-framework/lib/randomizedtesting*, build/**, dist/**, package/**" />
+ <map from="${basedir}/" to=""/>
+ </pathconvert>
+ <mkdir dir="nbproject"/>
+ <xslt in="${ant.file}" out="nbproject/project.xml" style="dev-tools/netbeans/nb-project.xsl" force="true">
+ <outputproperty name="indent" value="yes"/>
+ <param name="netbeans.fileset.sourcefolders" expression="${netbeans.fileset.sourcefolders}"/>
+ <param name="netbeans.fileset.testfolders" expression="${netbeans.fileset.testfolders}"/>
+ <param name="netbeans.fileset.resourcefolders" expression="${netbeans.fileset.resourcefolders}"/>
+ <param name="netbeans.fileset.libs" expression="${netbeans.fileset.libs}"/>
+ </xslt>
+ </target>
+
+ <target name="clean-netbeans" description="Removes all Netbeans configuration files">
+ <delete dir="nbproject" failonerror="true"/>
+ <delete dir="nb-build" failonerror="true"/>
+ </target>
+
<target name="eclipse" depends="resolve" description="Setup Eclipse configuration">
<basename file="${basedir}" property="eclipseprojectname"/>
<copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false" encoding="UTF-8">
Added: lucene/dev/trunk/dev-tools/netbeans/nb-project.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/netbeans/nb-project.xsl?rev=1549872&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/netbeans/nb-project.xsl (added)
+++ lucene/dev/trunk/dev-tools/netbeans/nb-project.xsl Tue Dec 10 15:50:38 2013
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:str="http://exslt.org/strings"
+ extension-element-prefixes="str">
+ <xsl:param name="netbeans.fileset.sourcefolders"/>
+ <xsl:param name="netbeans.fileset.testfolders"/>
+ <xsl:param name="netbeans.fileset.resourcefolders"/>
+ <xsl:param name="netbeans.fileset.libs"/>
+
+
+ <!--
+ NOTE: This template matches the root element of any given input XML document!
+ The XSL input file is ignored completely.
+ -->
+ <xsl:template match="/">
+ <project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>org.netbeans.modules.ant.freeform</type>
+ <configuration>
+ <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
+ <name>lucene</name>
+ <properties/>
+ <folders>
+ <xsl:for-each select="str:split($netbeans.fileset.sourcefolders,'|')">
+ <!-- hack to sort the list, starts-with() returns "true" which sorts before "false" if descending: -->
+ <xsl:sort select="string(starts-with(text(), 'lucene/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/solrj/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/'))" order="descending" lang="en"/>
+ <!-- all others in one group above are sorted by path name: -->
+ <xsl:sort select="text()" order="ascending" lang="en"/>
+ <source-folder>
+ <label>
+ <xsl:value-of select="."/>
+ </label>
+ <type>java</type>
+ <location>
+ <xsl:value-of select="."/>
+ </location>
+ </source-folder>
+ </xsl:for-each>
+ <xsl:for-each select="str:split($netbeans.fileset.testfolders,'|')">
+ <!-- hack to sort the list, starts-with() returns "true" which sorts before "false" if descending: -->
+ <xsl:sort select="string(starts-with(text(), 'lucene/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/solrj/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/'))" order="descending" lang="en"/>
+ <!-- all others in one group above are sorted by path name: -->
+ <xsl:sort select="text()" order="ascending" lang="en"/>
+ <source-folder>
+ <label>
+ <xsl:value-of select="."/>
+ </label>
+ <type>java</type>
+ <location>
+ <xsl:value-of select="."/>
+ </location>
+ </source-folder>
+ </xsl:for-each>
+ <xsl:for-each select="str:split($netbeans.fileset.resourcefolders,'|')">
+ <!-- hack to sort the list, starts-with() returns "true" which sorts before "false" if descending: -->
+ <xsl:sort select="string(starts-with(text(), 'lucene/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/solrj/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/'))" order="descending" lang="en"/>
+ <!-- all others in one group above are sorted by path name: -->
+ <xsl:sort select="text()" order="ascending" lang="en"/>
+ <source-folder>
+ <label>
+ <xsl:value-of select="."/>
+ </label>
+ <location>
+ <xsl:value-of select="."/>
+ </location>
+ </source-folder>
+ </xsl:for-each>
+ </folders>
+ <ide-actions>
+ <action name="build">
+ <target>compile</target>
+ </action>
+ <action name="clean">
+ <target>clean</target>
+ </action>
+ <action name="javadoc">
+ <target>documentation</target>
+ </action>
+ <action name="test">
+ <target>test</target>
+ </action>
+ <action name="rebuild">
+ <target>clean</target>
+ <target>compile</target>
+ </action>
+ </ide-actions>
+ <view>
+ <items>
+ <xsl:for-each select="str:split($netbeans.fileset.sourcefolders,'|')">
+ <!-- hack to sort the list, starts-with() returns "true" which sorts before "false" if descending: -->
+ <xsl:sort select="string(starts-with(text(), 'lucene/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/solrj/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/'))" order="descending" lang="en"/>
+ <!-- all others in one group above are sorted by path name: -->
+ <xsl:sort select="text()" order="ascending" lang="en"/>
+ <source-folder style="packages">
+ <label>
+ <xsl:value-of select="."/>
+ </label>
+ <location>
+ <xsl:value-of select="."/>
+ </location>
+ </source-folder>
+ </xsl:for-each>
+ <xsl:for-each select="str:split($netbeans.fileset.testfolders,'|')">
+ <!-- hack to sort the list, starts-with() returns "true" which sorts before "false" if descending: -->
+ <xsl:sort select="string(starts-with(text(), 'lucene/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/solrj/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/'))" order="descending" lang="en"/>
+ <!-- all others in one group above are sorted by path name: -->
+ <xsl:sort select="text()" order="ascending" lang="en"/>
+ <source-folder style="packages">
+ <label>
+ <xsl:value-of select="."/>
+ </label>
+ <location>
+ <xsl:value-of select="."/>
+ </location>
+ </source-folder>
+ </xsl:for-each>
+ <xsl:for-each select="str:split($netbeans.fileset.resourcefolders,'|')">
+ <!-- hack to sort the list, starts-with() returns "true" which sorts before "false" if descending: -->
+ <xsl:sort select="string(starts-with(text(), 'lucene/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/solrj/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/'))" order="descending" lang="en"/>
+ <!-- all others in one group above are sorted by path name: -->
+ <xsl:sort select="text()" order="ascending" lang="en"/>
+ <source-folder style="tree">
+ <label>
+ <xsl:value-of select="."/>
+ </label>
+ <location>
+ <xsl:value-of select="."/>
+ </location>
+ </source-folder>
+ </xsl:for-each>
+ <source-file>
+ <label>Project Build Script</label>
+ <location>build.xml</location>
+ </source-file>
+ </items>
+ <context-menu>
+ <ide-action name="build"/>
+ <ide-action name="rebuild"/>
+ <ide-action name="clean"/>
+ <ide-action name="javadoc"/>
+ <ide-action name="test"/>
+ </context-menu>
+ </view>
+ <subprojects/>
+ </general-data>
+ <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
+ <compilation-unit>
+ <xsl:for-each select="str:split($netbeans.fileset.sourcefolders,'|')">
+ <!-- hack to sort the list, starts-with() returns "true" which sorts before "false" if descending: -->
+ <xsl:sort select="string(starts-with(text(), 'lucene/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/solrj/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/'))" order="descending" lang="en"/>
+ <!-- all others in one group above are sorted by path name: -->
+ <xsl:sort select="text()" order="ascending" lang="en"/>
+ <package-root>
+ <xsl:value-of select="."/>
+ </package-root>
+ </xsl:for-each>
+ <classpath mode="compile">
+ <xsl:for-each select="str:split($netbeans.fileset.libs,'|')">
+ <!-- sort the jars by path name: -->
+ <xsl:sort select="text()" order="ascending" lang="en"/>
+ <xsl:value-of select="."/>
+ <xsl:if test="not(position() = last())">
+ <xsl:text>:</xsl:text>
+ </xsl:if>
+ </xsl:for-each>
+ <xsl:text>:</xsl:text>
+ <xsl:for-each select="str:split($netbeans.fileset.sourcefolders,'|')">
+ <!-- sort the jars by path name: -->
+ <xsl:sort select="text()" order="ascending" lang="en"/>
+ <xsl:value-of select="."/>
+ <xsl:if test="not(position() = last())">
+ <xsl:text>:</xsl:text>
+ </xsl:if>
+ </xsl:for-each>
+ </classpath>
+ <built-to>nb-build/classes</built-to>
+ <source-level>1.7</source-level>
+ </compilation-unit>
+ <compilation-unit>
+ <xsl:for-each select="str:split($netbeans.fileset.testfolders,'|')">
+ <!-- hack to sort the list, starts-with() returns "true" which sorts before "false" if descending: -->
+ <xsl:sort select="string(starts-with(text(), 'lucene/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'lucene/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/core/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/solrj/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/test-framework/'))" order="descending" lang="en"/>
+ <xsl:sort select="string(starts-with(text(), 'solr/'))" order="descending" lang="en"/>
+ <!-- all others in one group above are sorted by path name: -->
+ <xsl:sort select="text()" order="ascending" lang="en"/>
+ <package-root>
+ <xsl:value-of select="."/>
+ </package-root>
+ </xsl:for-each>
+ <unit-tests/>
+ <classpath mode="compile">
+ <xsl:for-each select="str:split($netbeans.fileset.libs,'|')">
+ <!-- sort the jars by path name: -->
+ <xsl:sort select="text()" order="ascending" lang="en"/>
+ <xsl:value-of select="."/>
+ <xsl:if test="not(position() = last())">
+ <xsl:text>:</xsl:text>
+ </xsl:if>
+ </xsl:for-each>
+ <xsl:text>:</xsl:text>
+ <xsl:for-each select="str:split($netbeans.fileset.sourcefolders,'|')">
+ <!-- sort the jars by path name: -->
+ <xsl:sort select="text()" order="ascending" lang="en"/>
+ <xsl:value-of select="."/>
+ <xsl:if test="not(position() = last())">
+ <xsl:text>:</xsl:text>
+ </xsl:if>
+ </xsl:for-each>
+ </classpath>
+ <built-to>nb-build/test-classes</built-to>
+ <source-level>1.7</source-level>
+ </compilation-unit>
+ </java-data>
+ </configuration>
+ </project>
+ </xsl:template>
+</xsl:stylesheet>
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1549872&r1=1549871&r2=1549872&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Tue Dec 10 15:50:38 2013
@@ -95,6 +95,9 @@ Build
Unicode 6.3; update UAX29URLEmailTokenizer's recognized top level
domains in URLs and Emails from the IANA Root Zone Database.
(Steve Rowe)
+
+* LUCENE-5360: Add support for developing in Netbeans IDE.
+ (Michal Hlavac via Steve Rowe)
Bug fixes