Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tomcat 8 #98

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

tomcat 8 #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02563ce
Update .gitignore
baayso Oct 6, 2015
ad32370
support Tomcat8
baayso Oct 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 32 additions & 6 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,34 @@
.gradle/*
build/*
example-app/build/*
example-app/.gradle/*
.DS_Store
.svn

bin
build
target
.rspec
.gradle

*.log

*.class

# Package Files #
*.jar
*.war
*.ear

# Eclipse #
.project
.classpath
.settings

# IntelliJ IDEA #
*.ipr
*.iws
*.iml
.idea/*
.idea
out

# Windows #
Thumbs.db

# Mac #
.DS_Store
15 changes: 10 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ compileJava {
}

dependencies {
compile group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '7.0.27'
compile group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '8.0.26'
compile group: 'redis.clients', name: 'jedis', version: '2.5.2'
compile group: 'org.apache.commons', name: 'commons-pool2', version: '2.2'
//compile group: 'commons-codec', name: 'commons-codec', version: '1.9'
Expand All @@ -24,7 +24,7 @@ dependencies {
testCompile 'org.hamcrest:hamcrest-core:1.3'
testCompile 'org.hamcrest:hamcrest-library:1.3'
testCompile 'org.mockito:mockito-all:1.9.5'
testCompile group: 'org.apache.tomcat', name: 'tomcat-coyote', version: '7.0.27'
testCompile group: 'org.apache.tomcat', name: 'tomcat-coyote', version: '8.0.26'
}

task javadocJar(type: Jar, dependsOn: javadoc) {
Expand All @@ -37,6 +37,11 @@ task sourcesJar(type: Jar) {
classifier = 'sources'
}

task releaseJar(type: Jar) {
from 'bin'
destinationDir = file('build/libs')
}

artifacts {
archives jar

Expand All @@ -53,9 +58,9 @@ uploadArchives {
mavenDeployer {
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }

repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
authentication(userName: sonatypeUsername, password: sonatypePassword)
}
//repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
// authentication(userName: sonatypeUsername, password: sonatypePassword)
//}
//repository(url: "https://oss.sonatype.org/content/repositories/snapshots") {
// authentication(userName: sonatypeUsername, password: sonatypePassword)
//}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/orangefunction/tomcat/redissessions/RedisSessionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ protected synchronized void startInternal() throws LifecycleException {
setState(LifecycleState.STARTING);

Boolean attachedToValve = false;
for (Valve valve : getContainer().getPipeline().getValves()) {
for (Valve valve : getContext().getPipeline().getValves()) {
if (valve instanceof RedisSessionHandlerValve) {
this.handlerValve = (RedisSessionHandlerValve) valve;
this.handlerValve.setRedisSessionManager(this);
Expand Down Expand Up @@ -714,8 +714,8 @@ private void initializeSerializer() throws ClassNotFoundException, IllegalAccess

Loader loader = null;

if (getContainer() != null) {
loader = getContainer().getLoader();
if (getContext() != null) {
loader = getContext().getLoader();
}

ClassLoader classLoader = null;
Expand Down