Skip to content

Commit

Permalink
[NGRINDER-679] Fix intellj inspector error and wrong maven war export.
Browse files Browse the repository at this point in the history
  • Loading branch information
junoyoon committed Oct 16, 2013
1 parent 787115c commit e3b7e62
Show file tree
Hide file tree
Showing 27 changed files with 40 additions and 778 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ target/
/deploy-core.bat
/complexity_result.html
/loc_result.html
/zoopiter_build.xml
/resources/perftest*
1 change: 1 addition & 0 deletions ngrinder-controller/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ src/main/webapp/WEB-INF/classes
src/main/webapp/WEB-INF/lib
/grinder_logs
/.freemarker-ide.xml
resources/perftest/
29 changes: 22 additions & 7 deletions ngrinder-controller/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
</parent>
<artifactId>ngrinder-controller</artifactId>
<name>ngrinder-controller</name>
<packaging>war</packaging>
<version>3.3-SNAPSHOT</version>
<packaging>war</packaging>
<properties>
<webappdir>${basedir}/src/main/webapp</webappdir>
<m2eclipse.wtp.contextRoot>/ngrinder-controller</m2eclipse.wtp.contextRoot>
Expand All @@ -33,6 +34,22 @@
</repository>
</repositories>

<profiles>
<profile>
<id>internal</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webappDirectory>${deploy.dir}</webappDirectory>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>rome</groupId>
Expand Down Expand Up @@ -87,8 +104,9 @@
<dependency>
<groupId>org.ngrinder</groupId>
<artifactId>ngrinder-core</artifactId>
<version>${project.version}</version>
</dependency>
<version>3.3-SNAPSHOT</version>

</dependency>

<dependency>
<groupId>org.mockito</groupId>
Expand Down Expand Up @@ -333,7 +351,6 @@
<groupId>grinder</groupId>
<artifactId>grinder-patch</artifactId>
<version>3.9.1</version>
<!-- this version is disappeared... little bit hack -->
<scope>system</scope>
<systemPath>${basedir}/patch/grinder-3.9.1-patch.jar</systemPath>
</dependency>
Expand Down Expand Up @@ -420,9 +437,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webappDirectory>${deploy.dir}</webappDirectory>
<webResources>

<webResources>
<resource>
<directory>patch</directory>
<targetPath>WEB-INF/lib</targetPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public boolean validateUser(String userId, String password, String encPass, Obje
return true;
}

@Deprecated
@Override
public void saveUser(User user) {
// Do nothing for default plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* Region Service Test class.
*
* @author mavlarn
* @Since 3.1
* @since 3.1
*/
public class RegionServiceTest extends AbstractNGrinderTransactionalTest {

Expand All @@ -49,7 +49,8 @@ public class RegionServiceTest extends AbstractNGrinderTransactionalTest {

@Before
public void before() {
FileUtils.deleteQuietly(config.getHome().getControllerShareDirectory());
//noinspection deprecation
FileUtils.deleteQuietly(config.getHome().getControllerShareDirectory());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public boolean validateUser(String userId, String password, String encPass, Obje
return false;
}

@Deprecated
@Override
public void saveUser(User user) {
// Do nothing
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit e3b7e62

Please sign in to comment.