Skip to content

first stab on fixing #1170 #1346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 27, 2017
Merged

first stab on fixing #1170 #1346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff70ede
first stab on fixing #1170
tarzanek Jan 26, 2017
ba14bbd
fix more analysers per internal scanner, don't touch xrefs
tarzanek Jan 26, 2017
b40c46f
copyright fixes
tarzanek Jan 27, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
327 changes: 189 additions & 138 deletions build.xml
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 27 additions & 1 deletion opengrok-indexer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]

CDDL HEADER END

Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.

-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand Down Expand Up @@ -131,6 +131,32 @@ Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
</execution>
</executions>
</plugin>
<!-- TODO add the same fix as is in build.xml to patch jflex generated files to stop increasing buffer beyond token size that lucene accepts
Copy link
Contributor

@tulinkry tulinkry Jan 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe copyright?
https://github.com/OpenGrok/OpenGrok/issues/1170 make parsers stop producing tokens > 32766 chars
at least for PlainFullTokenizer, PlainSymbolTokenizer, JavaScriptSymbolTokenizer, JavaSymbolTokenizer
use below ?
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>(version)</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<file>target/someapp/jsp/helloWorld.jsp</file>
<token>ToKeN</token>
<value>value</value>
<regexFlags>
<regexFlag>CASE_INSENSITIVE</regexFlag>
<regexFlag>MULTILINE</regexFlag>
</regexFlags>
</configuration>
</plugin> -->

<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
3 changes: 2 additions & 1 deletion src/org/opensolaris/opengrok/analysis/java/JavaSymbolTokenizer.lex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

/*
* Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
*/

/*
Expand All @@ -36,6 +36,7 @@ import org.opensolaris.opengrok.analysis.JFlexTokenizer;
super(in);
Copy link
Contributor

@tulinkry tulinkry Jan 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copyright
%init}
%unicode
%buffer 1048576
%type boolean
%eofval{
this.finalOffset = zzEndRead;
Expand Down
3 changes: 2 additions & 1 deletion src/org/opensolaris/opengrok/analysis/javascript/JavaScriptSymbolTokenizer.lex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

/*
* Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
*/

/*
Expand All @@ -35,6 +35,7 @@ import org.opensolaris.opengrok.analysis.JFlexTokenizer;
%class JavaScriptSymbolTokenizer
Copy link
Contributor

@tulinkry tulinkry Jan 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copyright
%extends JFlexTokenizer
%unicode
%buffer 1048576
%init{
super(in);
%init}
Expand Down
3 changes: 2 additions & 1 deletion src/org/opensolaris/opengrok/analysis/plain/PlainFullTokenizer.lex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

/*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
*/

package org.opensolaris.opengrok.analysis.plain;
Expand All @@ -30,6 +30,7 @@ import org.opensolaris.opengrok.analysis.JFlexTokenizer;
%class PlainFullTokenizer
Copy link
Contributor

@tulinkry tulinkry Jan 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copyright
%extends JFlexTokenizer
%unicode
%buffer 1048576
%{
public PlainFullTokenizer() {
super();
Expand Down
3 changes: 2 additions & 1 deletion src/org/opensolaris/opengrok/analysis/plain/PlainSymbolTokenizer.lex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

/*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
*/

package org.opensolaris.opengrok.analysis.plain;
Expand All @@ -28,6 +28,7 @@ import org.opensolaris.opengrok.analysis.JFlexTokenizer;
%class PlainSymbolTokenizer
Copy link
Contributor

@tulinkry tulinkry Jan 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copyright
%extends JFlexTokenizer
%unicode
%buffer 1048576
%{
public PlainSymbolTokenizer() {
super();
Expand Down