Skip to content

Commit

Permalink
Fix test servlet
Browse files Browse the repository at this point in the history
  • Loading branch information
petarov committed Feb 4, 2016
1 parent e04137a commit de21312
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 22 deletions.
30 changes: 29 additions & 1 deletion README.md
@@ -1,2 +1,30 @@
# currencybg.server
CurrencyBG RESTful web service

CurrencyBG RESTful web service

# Requirements

* JDK 1.7+
* MySQL 5.5+

# Development

To generate Eclipse project files run:

gradle eclipse

To build the project run:

gradle clean build

To start a local test version run:

gradle tomcatRun

To check what other tasks are available run:

gradle tasks

# License

[GNU AGPL](LICENSE)
30 changes: 24 additions & 6 deletions build.gradle
Expand Up @@ -7,18 +7,24 @@ buildscript {
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.bmuschko:gradle-tomcat-plugin:2.2.4'
}
}

apply plugin: 'eclipse'
apply plugin: 'eclipse-wtp'
apply plugin: 'java'
apply plugin: 'war'
apply plugin: 'com.bmuschko.tomcat'

def tomcatVersion = '7.0.59'

repositories {
jcenter()
mavenCentral()
}

apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'eclipse-wtp'
apply plugin: 'war'

eclipse {
project {
natures 'org.eclipse.jdt.core.javanature',
Expand All @@ -44,9 +50,14 @@ dependencies {
'commons-lang:commons-lang:2.6',
'com.google.guava:guava:19.+'

providedCompile 'javax.servlet:javax.servlet-api:3.0.+'
providedCompile 'javax.servlet:javax.servlet-api:3.0.+',
'javax.servlet.jsp:jsp-api:2.2'

testCompile 'junit:junit:4.+'

tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
"org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}",
"org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}"
}

war {
Expand All @@ -59,4 +70,11 @@ war {
"Implementation-Version": '1.0'
)
}
}

tomcat {
httpPort = 8090
httpsPort = 8091
enableSSL = false
contextPath = 'currencybg'
}
30 changes: 15 additions & 15 deletions src/main/webapp/WEB-INF/web.xml
Expand Up @@ -6,18 +6,18 @@
version="3.0"
metadata-complete="true">

<display-name>net.vexelon.mkp.server</display-name>
<servlet>
<servlet-name>net.vexelon.currencybg.srv.servlets.TestServlet</servlet-name>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>net.vexelon.currencybg.srv.servlets.TestServlet</servlet-name>
<url-pattern>/test</url-pattern>
</servlet-mapping>
<listener>
<listener-class>net.vexelon.currencybg.srv.servlets.MyServletContextListener</listener-class>
</listener>
</web-app>
<display-name>CurrencyBG Server</display-name>
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>net.vexelon.currencybg.srv.servlets.TestServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/test/*</url-pattern>
</servlet-mapping>
<listener>
<listener-class>net.vexelon.currencybg.srv.servlets.MyServletContextListener</listener-class>
</listener>
</web-app>

0 comments on commit de21312

Please sign in to comment.