fix #249
This commit is contained in:
Shinsuke Sugaya
parent
e58726741b
commit
a98296ad50
3 changed files with 8 additions and 61 deletions
66
pom.xml
66
pom.xml
|
|
@ -44,11 +44,6 @@
|
|||
<databaseGroupId>com.h2database</databaseGroupId>
|
||||
<databaseArtifactId>h2</databaseArtifactId>
|
||||
<databaseVersion>1.4.181</databaseVersion>
|
||||
<databaseDriver>org.h2.Driver</databaseDriver>
|
||||
<databaseUrl>jdbc:h2:file:${basedir}/src/main/webapp/WEB-INF/db/fess</databaseUrl>
|
||||
<databaseTestUrl>jdbc:h2:file:${basedir}/target/test-classes/db/fess</databaseTestUrl>
|
||||
<databaseUsername>sa</databaseUsername>
|
||||
<databasePassword />
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
|
|
@ -58,11 +53,6 @@
|
|||
<databaseGroupId>mysql</databaseGroupId>
|
||||
<databaseArtifactId>mysql-connector-java</databaseArtifactId>
|
||||
<databaseVersion>5.1.32</databaseVersion>
|
||||
<databaseDriver>com.mysql.jdbc.Driver</databaseDriver>
|
||||
<databaseUrl>jdbc:mysql://localhost:3306/fess_db?noDatetimeStringSync=true&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true</databaseUrl>
|
||||
<databaseTestUrl>jdbc:mysql://localhost:3306/fess_testdb?noDatetimeStringSync=true&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true</databaseTestUrl>
|
||||
<databaseUsername>fess_user</databaseUsername>
|
||||
<databasePassword>fess_pass</databasePassword>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
|
@ -90,6 +80,7 @@
|
|||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.2</version>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
|
|
@ -98,6 +89,7 @@
|
|||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<version>2.4</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>source-jar</id>
|
||||
|
|
@ -109,8 +101,8 @@
|
|||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-war-plugin</artifactId>
|
||||
<version>2.6</version>
|
||||
<configuration>
|
||||
<webResources>
|
||||
<resource>
|
||||
|
|
@ -126,7 +118,7 @@
|
|||
<plugin>
|
||||
<groupId>com.mycila.maven-license-plugin</groupId>
|
||||
<artifactId>maven-license-plugin</artifactId>
|
||||
<version>1.5.0</version>
|
||||
<version>1.10.b1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
|
|
@ -157,16 +149,9 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-site-plugin</artifactId>
|
||||
<configuration>
|
||||
<locales>en,ja</locales>
|
||||
<inputEncoding>UTF-8</inputEncoding>
|
||||
<outputEncoding>UTF-8</outputEncoding>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>2.10.1</version>
|
||||
<configuration>
|
||||
<encoding>UTF-8</encoding>
|
||||
<docencoding>UTF-8</docencoding>
|
||||
|
|
@ -182,50 +167,11 @@
|
|||
<link>http://s2robot.sandbox.seasar.org/apidocs/</link>
|
||||
</links>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>site</phase>
|
||||
<goals>
|
||||
<goal>javadoc</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>sql-maven-plugin</artifactId>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>${databaseGroupId}</groupId>
|
||||
<artifactId>${databaseArtifactId}</artifactId>
|
||||
<version>${databaseVersion}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<configuration>
|
||||
<driver>${databaseDriver}</driver>
|
||||
<url>${databaseTestUrl}</url>
|
||||
<username>${databaseUsername}</username>
|
||||
<password>${databasePassword}</password>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>test-compile</phase>
|
||||
<goals>
|
||||
<goal>execute</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<srcFiles>
|
||||
<srcFile>${basedir}/src/main/config/${database}/fess.ddl</srcFile>
|
||||
</srcFiles>
|
||||
<autocommit>true</autocommit>
|
||||
<onError>continue</onError>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>net.alchim31.maven</groupId>
|
||||
<artifactId>yuicompressor-maven-plugin</artifactId>
|
||||
<version>1.5.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>compile</phase>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
<property name="URL">
|
||||
"jdbc:h2:file:"
|
||||
+ @org.seasar.framework.util.ResourceUtil@getBuildDir(@org.codelibs.fess.FessClass@class).getCanonicalPath()
|
||||
+ "/db/fess;DB_CLOSE_ON_EXIT=FALSE;LOG=2;MVCC=true"
|
||||
+ "../../../src/main/h2/webapp/WEB-INF/db/fess;DB_CLOSE_ON_EXIT=FALSE;LOG=2;MVCC=true"
|
||||
</property>
|
||||
<property name="user">"sa"</property>
|
||||
<property name="password"></property>
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
"http://www.seasar.org/dtd/components24.dtd">
|
||||
<components>
|
||||
<include path="aop.dicon"/>
|
||||
<include path="saflute.dicon"/>
|
||||
<include path="dbflute.dicon"/>
|
||||
<component name="overlappingHostHelper" class="org.codelibs.fess.helper.OverlappingHostHelper">
|
||||
<initMethod name="add">
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue