remove lucene

pandafw · Feb 19, 2024 · 9b1a864 · 9b1a864
1 parent 6870a10
commit 9b1a864
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 76 deletions.
diff --git a/panda-archtype-webapp/src/main/resources/archetype-resources/deploy.xml b/panda-archtype-webapp/src/main/resources/archetype-resources/deploy.xml
@@ -10,7 +10,6 @@
 	<property name="sqlite.dir" value="${app.dir}/sqlite"/>
 	<property name="filestore.dir" value="${app.dir}/files"/>
 	<property name="media.dir" value="${app.dir}/media"/>
-	<property name="lucene.dir" value="${app.dir}/lucene"/>
 	<property name="cls.dir" value="${web.dir}/WEB-INF/classes"/>
 
 	<!-- deploy -->
@@ -21,7 +20,6 @@
 		<mkdir dir="${sqlite.dir}"/>
 		<mkdir dir="${filestore.dir}"/>
 		<mkdir dir="${media.dir}"/>
-		<mkdir dir="${lucene.dir}"/>
 
 		<delete includeemptydirs="true">
 			<fileset dir="${web.dir}"/>
@@ -80,11 +78,6 @@
 			replace="media.location=${media.dir}"
 			byline="true"
 			encoding="ISO-8859-1"/>
-		<replaceregexp file="${cls.dir}/app.properties" 
-			match=".*lucene.location=.*"
-			replace="lucene.location=${lucene.dir}"
-			byline="true"
-			encoding="ISO-8859-1"/>
 		<replaceregexp file="${cls.dir}/app.properties" 
 			match=".*task.action.scheme=.*"
 			replace="task.action.scheme=http://${APPNAME}:8080"

diff --git a/panda-archtype-webapp/src/main/resources/archetype-resources/pom.xml b/panda-archtype-webapp/src/main/resources/archetype-resources/pom.xml
@@ -20,7 +20,6 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jdk.version>1.8</jdk.version>
 		<panda.version>1.8.1-SNAPSHOT</panda.version>
-		<lucene.version>7.7.2</lucene.version>
 		<poi.version>4.1.0</poi.version>
 		<hsqldb.version>2.5.0</hsqldb.version>
 		<mariadb.version>2.4.3</mariadb.version>
@@ -271,29 +270,6 @@
 			<version>${poi.version}</version>
 		</dependency>
 
-<!-- LUCENE 
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-core</artifactId>
-			<version>${lucene.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-queries</artifactId>
-			<version>${lucene.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-queryparser</artifactId>
-			<version>${lucene.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-analyzers-common</artifactId>
-			<version>${lucene.version}</version>
-		</dependency>
--->
-
 		<!-- JDBC -->
 		<dependency>
 			<groupId>org.hsqldb</groupId>

diff --git a/...-archtype-webapp/src/main/resources/archetype-resources/src/main/resources/app.properties b/...-archtype-webapp/src/main/resources/archetype-resources/src/main/resources/app.properties
@@ -81,11 +81,10 @@ mvc.link.usecdn=false
 
 
 #-----------------------------------------
-# location (default: ${web.dir}/WEB-INF/_files _lucene _media)
+# location (default: ${web.dir}/WEB-INF/_files _media)
 #
 #filestore.location=/app/${artifactId}/files
 #media.location=/app/${artifactId}/media
-#lucene.location=/app/${artifactId}/lucene
 
 #-----------------------------------------
 # scheduler & executor (override mvc.json)

diff --git a/panda-archtype-webapp/src/main/resources/archetype-resources/src/main/resources/mvc.json b/panda-archtype-webapp/src/main/resources/archetype-resources/src/main/resources/mvc.json
@@ -31,12 +31,6 @@
 	// media location (default: ${web.dir}/WEB-INF/_media)
 	//"panda.media.location": "/app/${artifactId}/media",
 
-	// lucene location (default: ${web.dir}/WEB-INF/_lucene)
-	//"panda.lucene.location": "/app/${artifactId}/lucene",
-
-	// lucene analyzer
-	//"panda.lucene.analyzer": "org.apache.lucene.analysis.cjk.CJKAnalyzer",
-
 	// local filestore storage local path (default: ${web.dir}/WEB-INF/_files)
 	//"panda.filestore.location": "/app/${artifactId}/files",
 

diff --git a/panda-gems/pom.xml b/panda-gems/pom.xml
@@ -101,32 +101,6 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- LUCENE -->
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-core</artifactId>
-			<version>${lucene.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-queries</artifactId>
-			<version>${lucene.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-queryparser</artifactId>
-			<version>${lucene.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-analyzers-common</artifactId>
-			<version>${lucene.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
 		<!-- EZCache -->
 		<dependency>
 			<groupId>net.sf.ehcache</groupId>

diff --git a/panda-gems/src/main/java/panda/app/constant/MVC.java b/panda-gems/src/main/java/panda/app/constant/MVC.java
@@ -89,13 +89,6 @@ public interface MVC {
 
 	public static final String AUTH_TOKEN_LIFE = "panda.auth.token.life";
 
-	//------------------------------------------------
-	// The lucene settings
-	//
-	public static final String LUCENE_LOCATION = "panda.lucene.location";
-
-	public static final String LUCENE_ANALYZER = "panda.lucene.analyzer";
-
 	//------------------------------------------------
 	// The gae search settings
 	//

diff --git a/panda-gems/src/main/java/panda/app/constant/SET.java b/panda-gems/src/main/java/panda/app/constant/SET.java
@@ -50,10 +50,6 @@ public interface SET extends SetConstants {
 	/** The task error limit */
 	public static final String TASK_ERROR_LIMIT = "task.error.limit";
 
-	//--------------------------------------------------------
-	/** lucene location */
-	public static final String LUCENE_LOCATION = "lucene.location";
-
 	/** File Store */
 	public static final String FILESTORE_LOCATION = "filestore.location";