Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
GENERAL - moved sample app to performance test directory and renamed …
…it to test-server-jetty
  • Loading branch information
wojniemiec committed Sep 6, 2013
1 parent 02d582c commit c1d9afd
Show file tree
Hide file tree
Showing 33 changed files with 82 additions and 1,396 deletions.
1 change: 1 addition & 0 deletions performance-test/pom.xml
Expand Up @@ -11,6 +11,7 @@
<module>test-client</module>
<module>test-server-common</module>
<module>test-server-tomcat</module>
<module>test-server-jetty</module>
</modules>

<properties>
Expand Down
6 changes: 6 additions & 0 deletions performance-test/test-server-common/pom.xml
Expand Up @@ -41,6 +41,12 @@
<version>${bristleback-version}</version>
</dependency>

<dependency>
<groupId>pl.bristleback</groupId>
<artifactId>action-validation</artifactId>
<version>${bristleback-version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
Expand Down
@@ -1,4 +1,4 @@
package sample;
package pl.bristleback.test;

public enum Card {

Expand Down
@@ -1,4 +1,4 @@
package sample.action;
package pl.bristleback.test.action;

import org.springframework.stereotype.Component;
import pl.bristleback.common.serialization.message.BristleMessage;
Expand All @@ -10,11 +10,10 @@
import pl.bristleback.server.bristle.api.users.UserContext;
import pl.bristleback.server.bristle.engine.user.BaseUserContext;
import pl.bristleback.server.bristle.message.ConditionObjectSender;
import sample.Card;
import sample.User;
import sample.action.interceptor.SampleInterceptor;
import sample.outgoing.SampleClientActionClass;
import sample.service.HelloServiceBean;
import pl.bristleback.test.Card;
import pl.bristleback.test.User;
import pl.bristleback.test.interceptor.SampleInterceptor;
import pl.bristleback.test.outgoing.SampleClientActionClass;

import javax.inject.Inject;
import javax.validation.Valid;
Expand All @@ -35,9 +34,6 @@ public class SampleAction implements DefaultAction<BaseUserContext, Map<String,
@ObjectSender
private ConditionObjectSender sender;

@Inject
private HelloServiceBean helloServiceBean;

@Inject
private SampleClientActionClass clientActionClass;

Expand Down Expand Up @@ -65,7 +61,7 @@ public void sayHello(@Size(min = 10) String name, @Min(10) int age, BaseUserCont

@Action
public String executeDefault(BaseUserContext userContext, Map<String, BigDecimal> message) {
String helloWorld = helloServiceBean.sayHello(message.get("mapField"));
String helloWorld = "Hello, magic number is " + message.get("mapField");
clientActionClass.sendCardsToUser(Card.values(), userContext);
clientActionClass.notification(true, 1, "df");
return helloWorld;
Expand Down
@@ -1,11 +1,11 @@
package sample.action.secure;
package pl.bristleback.test.action;

import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import pl.bristleback.server.bristle.api.annotations.Action;
import pl.bristleback.server.bristle.api.annotations.ActionClass;
import pl.bristleback.server.bristle.api.annotations.Authorized;
import sample.security.SampleUserDetails;
import pl.bristleback.test.security.SampleUserDetails;

@ActionClass
@Component
Expand Down
@@ -1,4 +1,4 @@
package sample.handlers;
package pl.bristleback.test.handlers;

import org.springframework.stereotype.Component;
import pl.bristleback.server.bristle.action.ActionExecutionContext;
Expand Down
@@ -1,4 +1,4 @@
package sample.handlers;
package pl.bristleback.test.handlers;

import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
Expand Down
@@ -1,4 +1,4 @@
package sample.action.interceptor;
package pl.bristleback.test.interceptor;

public class ActionInterceptorContextObject {

Expand Down
@@ -1,4 +1,4 @@
package sample.action.interceptor;
package pl.bristleback.test.interceptor;

import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
Expand Down
@@ -1,4 +1,4 @@
package sample.action.interceptor;
package pl.bristleback.test.interceptor;

import org.springframework.stereotype.Component;
import pl.bristleback.server.bristle.action.ActionInformation;
Expand Down
@@ -1,4 +1,4 @@
package sample.outgoing;
package pl.bristleback.test.outgoing;

import org.springframework.stereotype.Component;
import pl.bristleback.server.bristle.api.action.SendCondition;
Expand All @@ -7,7 +7,7 @@
import pl.bristleback.server.bristle.api.annotations.Ignore;
import pl.bristleback.server.bristle.api.users.UserContext;
import pl.bristleback.server.bristle.security.authorisation.conditions.AllUsersCondition;
import sample.Card;
import pl.bristleback.test.Card;

@ClientActionClass
@Component
Expand Down
@@ -1,4 +1,4 @@
package sample.security;
package pl.bristleback.test.security;

import pl.bristleback.server.bristle.api.users.UserDetails;

Expand Down
@@ -1,4 +1,4 @@
package sample.security;
package pl.bristleback.test.security;

import org.springframework.stereotype.Component;
import pl.bristleback.server.bristle.api.users.UserDetails;
Expand Down
56 changes: 56 additions & 0 deletions performance-test/test-server-jetty/pom.xml
@@ -0,0 +1,56 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>pl.bristleback</groupId>
<artifactId>test-server-jetty</artifactId>
<version>0.3.5</version>
<packaging>jar</packaging>

<properties>
<jetty-version>8.1.10.v20130312</jetty-version>
<bristleback-version>0.3.5</bristleback-version>
<org.springframework.version>3.1.1.RELEASE</org.springframework.version>
</properties>

<name>Bristleback performance test Jetty server</name>
<url>http://bristleback.pl</url>

<dependencies>

<dependency>
<groupId>pl.bristleback</groupId>
<artifactId>test-server-common</artifactId>
<version>${bristleback-version}</version>
</dependency>

<dependency>
<groupId>pl.bristleback</groupId>
<artifactId>bristleback-core</artifactId>
<version>${bristleback-version}</version>
</dependency>

<dependency>
<groupId>pl.bristleback</groupId>
<artifactId>websocket-engine-jetty</artifactId>
<version>${bristleback-version}</version>
</dependency>

<dependency>
<groupId>pl.bristleback</groupId>
<artifactId>serialization-engine-jackson</artifactId>
<version>${bristleback-version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${org.springframework.version}</version>
</dependency>
</dependencies>
</project>
File renamed without changes.
Expand Up @@ -10,7 +10,7 @@
http://www.bristleback.pl/schema/bristleback
http://www.bristleback.pl/schema/bristleback/bristleback.xsd">

<context:component-scan base-package="sample"/>
<context:component-scan base-package="pl.bristleback.test"/>

<!--BRISTLEBACK BEANS-->

Expand All @@ -32,6 +32,4 @@

<!-- APPLICATION BEANS -->

<bean id="helloService" class="sample.service.HelloServiceBean"/>

</beans>
1 change: 0 additions & 1 deletion pom.xml
Expand Up @@ -15,7 +15,6 @@
<module>websocket-engine-netty</module>
<module>serialization-engine-jackson</module>
<module>action-validation</module>
<module>sample-app</module>
<module>performance-test</module>
<module>client-java-jetty</module>
</modules>
Expand Down
109 changes: 0 additions & 109 deletions sample-app/pom.xml

This file was deleted.

47 changes: 0 additions & 47 deletions sample-app/src/main/java/sample/User.java

This file was deleted.

0 comments on commit c1d9afd

Please sign in to comment.