Fix build, remove unused code
This commit is contained in:
parent
9cd0d8fd72
commit
ffd3b7917c
5 changed files with 10 additions and 146 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -9,5 +9,7 @@ cache.properties
|
|||
/bin
|
||||
/target
|
||||
/.externalToolBuilders
|
||||
*.iml
|
||||
/.idea
|
||||
/.idea/
|
||||
/album.iml
|
||||
/lib
|
||||
/atlassian-ide-plugin.xml
|
||||
|
|
|
|||
6
pom.xml
6
pom.xml
|
|
@ -176,6 +176,12 @@
|
|||
<version>3.1.0</version>
|
||||
</dependency>
|
||||
-->
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
<version>1.2.17</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
|
|
|
|||
|
|
@ -1,123 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
|
||||
<xs:element name="ehcache" >
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element minOccurs="0" maxOccurs="1" ref="diskStore"/>
|
||||
<xs:element minOccurs="0" maxOccurs="1"
|
||||
ref="cacheManagerEventListenerFactory"/>
|
||||
<xs:element minOccurs="0" maxOccurs="1"
|
||||
ref="cacheManagerPeerProviderFactory"/>
|
||||
<xs:element minOccurs="0" maxOccurs="1"
|
||||
ref="cacheManagerPeerListenerFactory"/>
|
||||
<xs:element ref="defaultCache"/>
|
||||
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cache"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="diskStore">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="path" use="optional" />
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="cacheManagerEventListenerFactory">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="class" use="required"/>
|
||||
<xs:attribute name="properties" use="optional"/>
|
||||
<xs:attribute name="propertySeparator" use="optional"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="cacheManagerPeerProviderFactory">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="class" use="required"/>
|
||||
<xs:attribute name="properties" use="optional"/>
|
||||
<xs:attribute name="propertySeparator" use="optional"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="cacheManagerPeerListenerFactory">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="class" use="required"/>
|
||||
<xs:attribute name="properties" use="optional"/>
|
||||
<xs:attribute name="propertySeparator" use="optional"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<!-- add clone support for addition of cacheExceptionHandler. Important! -->
|
||||
<xs:element name="defaultCache">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cacheEventListenerFactory"/>
|
||||
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cacheExtensionFactory"/>
|
||||
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cacheLoaderFactory"/>
|
||||
<xs:element minOccurs="0" maxOccurs="1" ref="bootstrapCacheLoaderFactory"/>
|
||||
<xs:element minOccurs="0" maxOccurs="1" ref="cacheExceptionHandlerFactory"/>
|
||||
</xs:sequence>
|
||||
<xs:attribute name="diskExpiryThreadIntervalSeconds" use="optional" type="xs:integer"/>
|
||||
<xs:attribute name="diskSpoolBufferSizeMB" use="optional" type="xs:integer"/>
|
||||
<xs:attribute name="diskPersistent" use="optional" type="xs:boolean"/>
|
||||
<xs:attribute name="eternal" use="required" type="xs:boolean"/>
|
||||
<xs:attribute name="maxElementsInMemory" use="required" type="xs:integer"/>
|
||||
<xs:attribute name="memoryStoreEvictionPolicy" use="optional" type="xs:string"/>
|
||||
<xs:attribute name="overflowToDisk" use="required" type="xs:boolean"/>
|
||||
<xs:attribute name="timeToIdleSeconds" use="optional" type="xs:integer"/>
|
||||
<xs:attribute name="timeToLiveSeconds" use="optional" type="xs:integer"/>
|
||||
<xs:attribute name="maxElementsOnDisk" use="optional" type="xs:integer"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="cache">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cacheEventListenerFactory"/>
|
||||
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cacheExtensionFactory"/>
|
||||
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cacheLoaderFactory"/>
|
||||
<xs:element minOccurs="0" maxOccurs="1" ref="bootstrapCacheLoaderFactory"/>
|
||||
<xs:element minOccurs="0" maxOccurs="1" ref="cacheExceptionHandlerFactory"/>
|
||||
</xs:sequence>
|
||||
<xs:attribute name="diskExpiryThreadIntervalSeconds" use="optional" type="xs:integer"/>
|
||||
<xs:attribute name="diskSpoolBufferSizeMB" use="optional" type="xs:integer"/>
|
||||
<xs:attribute name="diskPersistent" use="optional" type="xs:boolean"/>
|
||||
<xs:attribute name="eternal" use="required" type="xs:boolean"/>
|
||||
<xs:attribute name="maxElementsInMemory" use="required" type="xs:integer"/>
|
||||
<xs:attribute name="memoryStoreEvictionPolicy" use="optional" type="xs:string"/>
|
||||
<xs:attribute name="name" use="required" type="xs:string"/>
|
||||
<xs:attribute name="overflowToDisk" use="required" type="xs:boolean"/>
|
||||
<xs:attribute name="timeToIdleSeconds" use="optional" type="xs:integer"/>
|
||||
<xs:attribute name="timeToLiveSeconds" use="optional" type="xs:integer"/>
|
||||
<xs:attribute name="maxElementsOnDisk" use="optional" type="xs:integer"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="cacheEventListenerFactory">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="class" use="required"/>
|
||||
<xs:attribute name="properties" use="optional"/>
|
||||
<xs:attribute name="propertySeparator" use="optional"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="bootstrapCacheLoaderFactory">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="class" use="required"/>
|
||||
<xs:attribute name="properties" use="optional"/>
|
||||
<xs:attribute name="propertySeparator" use="optional"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="cacheExtensionFactory">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="class" use="required"/>
|
||||
<xs:attribute name="properties" use="optional"/>
|
||||
<xs:attribute name="propertySeparator" use="optional"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="cacheExceptionHandlerFactory">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="class" use="required"/>
|
||||
<xs:attribute name="properties" use="optional"/>
|
||||
<xs:attribute name="propertySeparator" use="optional"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="cacheLoaderFactory">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="class" use="required"/>
|
||||
<xs:attribute name="properties" use="optional"/>
|
||||
<xs:attribute name="propertySeparator" use="optional"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:schema>
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="ehcache-1.5.0.xsd">
|
||||
|
||||
<diskStore path="java.io.tmpdir"/>
|
||||
|
||||
<defaultCache eternal="false" maxElementsInMemory="200" overflowToDisk="false" />
|
||||
|
||||
<cache
|
||||
name="imageCache"
|
||||
maxElementsInMemory="1"
|
||||
maxElementsOnDisk="5000"
|
||||
eternal="true"
|
||||
overflowToDisk="true"
|
||||
diskPersistent="true"
|
||||
diskSpoolBufferSizeMB="20"
|
||||
diskExpiryThreadIntervalSeconds="1"
|
||||
memoryStoreEvictionPolicy="LFU"/>
|
||||
|
||||
</ehcache>
|
||||
|
|
@ -113,7 +113,6 @@ public class LuceneTest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @param hitsPerPage
|
||||
* @param searcher
|
||||
* @param q
|
||||
* @throws IOException
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue