modify test cases

This commit is contained in:
Shinsuke Sugaya 2015-07-12 06:02:45 +09:00
parent 38d2eaf3f0
commit cf02fa3c74
2 changed files with 2 additions and 35 deletions

36
pom.xml
View file

@ -33,29 +33,6 @@
<artifactId>oss-parent</artifactId>
<version>9</version>
</parent>
<profiles>
<profile>
<id>h2</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<database>h2</database>
<databaseGroupId>com.h2database</databaseGroupId>
<databaseArtifactId>h2</databaseArtifactId>
<databaseVersion>1.4.181</databaseVersion>
</properties>
</profile>
<profile>
<id>mysql</id>
<properties>
<database>mysql</database>
<databaseGroupId>mysql</databaseGroupId>
<databaseArtifactId>mysql-connector-java</databaseArtifactId>
<databaseVersion>5.1.32</databaseVersion>
</properties>
</profile>
</profiles>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dbflute.version>1.1.0-sp1</dbflute.version>
@ -76,9 +53,6 @@
<build>
<finalName>fess</finalName>
<resources>
<resource>
<directory>src/main/${database}/resources</directory>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
@ -114,9 +88,6 @@
<resource>
<directory>${project.build.directory}/${project.build.finalName}-compress</directory>
</resource>
<resource>
<directory>${basedir}/src/main/${database}/webapp</directory>
</resource>
</webResources>
<warSourceExcludes>WEB-INF/classes/**/*.*,WEB-INF/lib/*.jar</warSourceExcludes>
</configuration>
@ -272,11 +243,6 @@
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>${databaseGroupId}</groupId>
<artifactId>${databaseArtifactId}</artifactId>
<version>${databaseVersion}</version>
</dependency>
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
@ -457,7 +423,7 @@
</dependency>
<dependency>
<groupId>org.codelibs.robot</groupId>
<artifactId>s2-robot-db-${database}</artifactId>
<artifactId>s2-robot-db-h2</artifactId>
<version>${s2robot.version}</version>
<exclusions>
<exclusion>

View file

@ -5,6 +5,7 @@
<include path="aop.dicon"/>
<include path="saflute.dicon"/>
<include path="dbflute.dicon"/>
<include path="fess_es.dicon"/>
<component name="overlappingHostHelper" class="org.codelibs.fess.helper.OverlappingHostHelper">
<initMethod name="add">
<arg>