Skip to content

Commit

Permalink
Updated java versions in docs
Browse files Browse the repository at this point in the history
  • Loading branch information
hazendaz committed Oct 17, 2015
1 parent 39a9454 commit 15964d4
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Docs/GettingStartedWithWaffleAPI.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ set windowsAuthProviderImpl = CreateObject("Waffle.Windows.AuthProvider")
Getting Started in Java
-----------------------

Add `waffle-jna.jar`, `jna-4.1.0.jar`, `jna-platform-4.1.0.jar`, `guava-18.0.jar`, and `slf4j-api-1.7.7.jar` to your `CLASSPATH` or, if you use Maven, add the following to your `pom.xml`.
Add `waffle-jna.jar`, `jna-4.2.0.jar`, `jna-platform-4.2.0.jar`, `guava-18.0.jar`, and `slf4j-api-1.7.12.jar` to your `CLASSPATH` or, if you use Maven, add the following to your `pom.xml`.

``` xml
<properties>
<waffle.version>1.7.3</waffle.version>
<waffle.version>1.8.0</waffle.version>
</properties>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions Docs/ServletSingleSignOnSecurityFilter.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Configuring Web Servers

The following steps are required to configure a web server with the Waffle Servlet Security Filter. These instructions work for Tomcat, Jetty, WebSphere and possibly others.

Package Waffle JARs, including `waffle-jna.jar`, `guava-18.0.jar`, `jna-4.1.0.jar`, `jna-platform-4.1.0.jar` and `slf4j*.jar` in the application's `lib` directory or copy them to your web server's lib.
Package Waffle JARs, including `waffle-jna.jar`, `guava-18.0.jar`, `jna-4.2.0.jar`, `jna-platform-4.2.0.jar` and `slf4j*.jar` in the application's `lib` directory or copy them to your web server's lib.

Add a security filter to `WEB-INF\web.xml` of your application.

Expand Down Expand Up @@ -112,7 +112,7 @@ You can use maven to build and deploy this demo application by following the ste
* Start your tomcat server. You can launch a locally installed tomcat with remote debugging enabled on port 8000 using:

```
apache-tomcat-6.0.39$ bin/catalina.sh jpda start
apache-tomcat-6.0.44$ bin/catalina.sh jpda start
```

* Build and Deploy the demo application to the local tomcat 6 instance. In the waffle source tree, move to the directory: waffle/Source/JNA/waffle-demo-parent/waffle-filter, and execute the following:
Expand Down
2 changes: 1 addition & 1 deletion Docs/spring/SpringSecurityAuthenticationProvider.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ We'll assume that Spring-Security is configured via `web.xml` with a filter chai
</listener>
```

Copy Waffle JARs, including `waffle-jna.jar`, `guava-18.0.jar`, `jna-4.1.0.jar`, `jna-platform-4.1.0.jar`, `slf4j*.jar` and `waffle-spring-security-3.jar` in the application's `lib` directory along with Spring and Spring-Security JARs. Or, if you use Maven, add the following to your `pom.xml`:
Copy Waffle JARs, including `waffle-jna.jar`, `guava-18.0.jar`, `jna-4.2.0.jar`, `jna-platform-4.2.0.jar`, `slf4j*.jar` and `waffle-spring-security-3.jar` in the application's `lib` directory along with Spring and Spring-Security JARs. Or, if you use Maven, add the following to your `pom.xml`:

``` xml
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion Docs/spring/SpringSecuritySingleSignOnFilter.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ We'll assume that Spring-Security is configured via `web.xml` with a filter chai
</listener>
```

Copy Waffle JARs, including `waffle-jna.jar`, `guava-18.0.jar`, `jna-4.1.0.jar`, `jna-platform-4.1.0.jar`, `slf4j*.jar` and `waffle-spring-security-3.jar` in the application's `lib` directory along with Spring and Spring-Security JARs. Or, if you use Maven, add the following to your `pom.xml`:
Copy Waffle JARs, including `waffle-jna.jar`, `guava-18.0.jar`, `jna-4.2.0.jar`, `jna-platform-4.2.0.jar`, `slf4j*.jar` and `waffle-spring-security-3.jar` in the application's `lib` directory along with Spring and Spring-Security JARs. Or, if you use Maven, add the following to your `pom.xml`:

``` xml
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Configuring Tomcat

The following steps are required to configure Tomcat with Waffle Mixed Authenticator.

Package Waffle JARs, including `waffle-jna.jar`, `guava-18.0.jar`, `jna-4.1.0.jar`, `jna-platform-4.1.0.jar`, `slf4j*.jar` and `waffle-tomcat[tomcat version].jar` in the application's `lib` directory or copy them to your web server's lib. If you are using Eclipse, you can see which files tomcat is importing by going to Java Recources: `src / Libraries / Apache Tomcat vx.x`. If you've placed it in the tomcat directory and still don't see it, restart Eclipse.
Package Waffle JARs, including `waffle-jna.jar`, `guava-18.0.jar`, `jna-4.2.0.jar`, `jna-platform-4.2.0.jar`, `slf4j*.jar` and `waffle-tomcat[tomcat version].jar` in the application's `lib` directory or copy them to your web server's lib. If you are using Eclipse, you can see which files tomcat is importing by going to Java Recources: `src / Libraries / Apache Tomcat vx.x`. If you've placed it in the tomcat directory and still don't see it, restart Eclipse.

Add a valve and a realm to the application context. For an application, modify `META-INF\context.xml`.

Expand Down
2 changes: 1 addition & 1 deletion Docs/tomcat/TomcatSingleSignOnValve.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Configuring Tomcat

The following steps are required to configure Tomcat with Waffle authenticator.

Package Waffle JARs, including `waffle-jna.jar`, `guava-18.0.jar`, `jna-4.1.0.jar`, `jna-platform-4.1.0.jar`, `slf4j*.jar` and `waffle-tomcat-6.jar` in the application's lib directory or copy them to Tomcat's lib.
Package Waffle JARs, including `waffle-jna.jar`, `guava-18.0.jar`, `jna-4.2.0.jar`, `jna-platform-4.2.0.jar`, `slf4j*.jar` and `waffle-tomcat-6.jar` in the application's lib directory or copy them to Tomcat's lib.

Add a valve and a realm to the application context. For an application, modify `META-INF\context.xml`.

Expand Down
2 changes: 1 addition & 1 deletion Docs/tomcat/TomcatWindowsLoginJAASAuthenticator.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Configuring Tomcat

The following steps are required to configure Tomcat with Waffle authenticator.

Package Waffle JARs, including `waffle-jna.jar`, `guava-18.0.jar`, `jna-4.1.0.jar`, `jna-platform-4.1.0.jar`, `slf4j*.jar` and `waffle-jaas.jar` in the application's lib directory or copy them to Tomcat's lib.
Package Waffle JARs, including `waffle-jna.jar`, `guava-18.0.jar`, `jna-4.2.0.jar`, `jna-platform-4.2.0.jar`, `slf4j*.jar` and `waffle-jaas.jar` in the application's lib directory or copy them to Tomcat's lib.

Add a JAAS realm to the application context. Modify `META-INF\context.xml`.

Expand Down

0 comments on commit 15964d4

Please sign in to comment.