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

Jump to bottom

Upgrade to JNA 4.0 #64

Closed
wants to merge 5 commits into from
Closed

Upgrade to JNA 4.0 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b833a8
fetch upstream
ryantxu Aug 26, 2013
40344e9
Revert "fetch upstream"
ryantxu Aug 26, 2013
a699cbe
Merge remote-tracking branch 'upstream/master'
ryantxu Aug 26, 2013
9b2bc3e
upgrade dependent libraries
ryantxu Aug 26, 2013
ceaa161
update maven build for JNA 4.0
ryantxu Aug 26, 2013
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ bin
obj
Debug
Release
target
TestResult.xml
Source/JNA/lib-test
Source/JNA/lib
Expand Down
11 changes: 7 additions & 4 deletions Source/JNA/build/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</tstamp>
<!-- compile -->
<path id="jna.classpath">
<fileset dir="${thirdparty.dir}/_lib/jar/net.java.dev.jna/3.5.0">
<include name="*.jar" />
<fileset dir="${thirdparty.dir}/_lib/jar/net.java.dev.jna/">
<include name="**/*.jar" />
</fileset>
</path>
<path id="slf4j.classpath">
Expand All @@ -33,7 +33,7 @@
</fileset>
</path>
<path id="guava.classpath">
<fileset dir="${thirdparty.dir}/_lib/jar/com.google.guava/13.0.1">
<fileset dir="${thirdparty.dir}/_lib/bundle/com.google.guava">
<include name="**/*.jar" />
</fileset>
</path>
Expand Down Expand Up @@ -74,12 +74,15 @@
</fileset>
</path>
<path id="waffle.test.classpath">
<fileset dir="${thirdparty.dir}/_lib/jar/org.hamcrest/1.3">
<include name="*.jar" />
</fileset>
<pathelement location="${waffle.lib}" />
<path refid="thirdparty.classpath" />
<path refid="project.classpath" />
<path refid="project.test.classpath" />
<path refid="mockito.classpath" />
<fileset dir="${thirdparty.dir}/_lib/jar/junit/4.10">
<fileset dir="${thirdparty.dir}/_lib/jar/junit/4.11">
<include name="*.jar" />
</fileset>
<pathelement location="${waffle.test.src}" />
Expand Down
25 changes: 19 additions & 6 deletions Source/JNA/build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,28 @@

<dependencies>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5-rc1</version>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<!-- prevent warning: SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder". -->
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions Source/JNA/waffle-jetty/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.7/logback-classic-1.0.7.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.7/logback-core-1.0.7.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.10/junit-4.10.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.11/junit-4.11.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/waffle-jna"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/javax.servlet/2.5/servlet-api-2.5.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.eclipse.jetty.aggregate/7.6.7.v20120910/jetty-all-7.6.7.v20120910.jar"/>
Expand All @@ -16,8 +16,8 @@
<classpathentry kind="lib" path="/thirdparty/_lib/orbit/org.eclipse.jetty.orbit/2.2.0.v201112011158/javax.servlet.jsp-2.2.0.v201112011158.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/orbit/org.eclipse.jetty.orbit/2.2.2.v201112011158/org.apache.jasper.glassfish-2.2.2.v201112011158.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/orbit/org.eclipse.jetty.orbit/3.7.1/org.eclipse.jdt.core-3.7.1.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/3.5.0/jna-3.5.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/3.5.0/platform-3.5.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/4.0.0/jna-4.0.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/4.0.0/jna-platform-4.0.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.7.2/slf4j-api-1.7.2.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/waffle-tests"/>
<classpathentry kind="output" path="bin"/>
Expand Down
8 changes: 4 additions & 4 deletions Source/JNA/waffle-jna/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<classpathentry excluding="**/.svn|**/.svn/*" kind="src" path="src-test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/javax.servlet/2.5/servlet-api-2.5.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/com.google.guava/13.0.1/guava-13.0.1.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.10/junit-4.10.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/bundle/com.google.guava/14.0.1/guava-14.0.1.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.11/junit-4.11.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.mockito/1.9.5-rc1/mockito-all-1.9.5-rc1.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.7/logback-classic-1.0.7.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.7/logback-core-1.0.7.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/3.5.0/jna-3.5.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/3.5.0/platform-3.5.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/4.0.0/jna-4.0.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/4.0.0/jna-platform-4.0.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.7.2/jcl-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.7.2/slf4j-api-1.7.2.jar"/>
<classpathentry kind="output" path="bin"/>
Expand Down
8 changes: 4 additions & 4 deletions Source/JNA/waffle-jna/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>3.5.0</version>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>platform</artifactId>
<version>3.5.0</version>
<artifactId>jna-platform</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand All @@ -40,7 +40,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>13.0.1</version>
<version>14.0.1</version>
</dependency>
</dependencies>
</project>
11 changes: 6 additions & 5 deletions Source/JNA/waffle-shiro/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@
<classpath>
<classpathentry excluding="**/.svn|**/.svn/*" kind="src" path="src"/>
<classpathentry excluding="**/.svn|**/.svn/*" kind="src" path="src-test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.hamcrest/1.3/hamcrest-core-1.3.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/waffle-jna"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.7/logback-classic-1.0.7.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.7/logback-core-1.0.7.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/javax.servlet/2.5/servlet-api-2.5.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.10/junit-4.10.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.11/junit-4.11.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.7.2/jcl-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.7.2/slf4j-api-1.7.2.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/waffle-tests"/>
<classpathentry kind="lib" path="/thirdparty/_lib/bundle/org.apache.shiro/1.2.1/shiro-core-1.2.1.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/bundle/org.apache.shiro/1.2.1/shiro-web-1.2.1.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/3.5.0/jna-3.5.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/3.5.0/platform-3.5.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/4.0.0/jna-4.0.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/4.0.0/jna-platform-4.0.0.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/waffle-tests"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
19 changes: 12 additions & 7 deletions Source/JNA/waffle-shiro/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@
<description>Shiro integration for WAFFLE</description>

<dependencies>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>waffle-jna</artifactId>
Expand All @@ -27,13 +39,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<!-- prevent warning: SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder". -->
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
Expand Down
11 changes: 6 additions & 5 deletions Source/JNA/waffle-shiro/src-test/waffle/shiro/GroupMappingWaffleRealmTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.matchers.JUnitMatchers.hasItems;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import java.util.Collections;

Expand All @@ -23,6 +23,7 @@
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.PrincipalCollection;
import org.hamcrest.CoreMatchers;
import org.junit.Before;
import org.junit.Test;

Expand Down Expand Up @@ -50,16 +51,16 @@ public void testValidUsernamePassword() {
getCurrentUserName(), "somePassword");
AuthenticationInfo authcInfo = realm.getAuthenticationInfo(token);
PrincipalCollection principals = authcInfo.getPrincipals();
assertThat(principals.isEmpty(), is(false));
assertFalse(principals.isEmpty());
Object primaryPrincipal = principals.getPrimaryPrincipal();
assertThat(primaryPrincipal, instanceOf(WaffleFqnPrincipal.class));
WaffleFqnPrincipal fqnPrincipal = (WaffleFqnPrincipal) primaryPrincipal;
assertThat(fqnPrincipal.getFqn(), equalTo(getCurrentUserName()));
assertThat(fqnPrincipal.getGroupFqns(), hasItems("Users", "Everyone"));
assertThat(fqnPrincipal.getGroupFqns(), CoreMatchers.hasItems("Users", "Everyone"));
Object credentials = authcInfo.getCredentials();
assertThat(credentials, instanceOf(char[].class));
assertThat((char[]) credentials, equalTo("somePassword".toCharArray()));
assertThat(realm.hasRole(principals, ROLE_NAME), is(true));
assertTrue(realm.hasRole(principals, ROLE_NAME));
}

@Test(expected = AuthenticationException.class)
Expand Down
2 changes: 1 addition & 1 deletion Source/JNA/waffle-spring-security2/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.7/logback-classic-1.0.7.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.7/logback-core-1.0.7.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.springframework/2.5.6.SEC03/spring-2.5.6.SEC03.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.10/junit-4.10.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.11/junit-4.11.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.7.2/jcl-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.7.2/slf4j-api-1.7.2.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/waffle-tests"/>
Expand Down
2 changes: 1 addition & 1 deletion Source/JNA/waffle-spring-security3/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.springframework/3.1.2.RELEASE/spring-beans-3.1.2.RELEASE.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.springframework/3.1.2.RELEASE/spring-context-3.1.2.RELEASE.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.springframework/3.1.2.RELEASE/spring-core-3.1.2.RELEASE.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.10/junit-4.10.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.11/junit-4.11.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.springframework/3.1.2.RELEASE/spring-asm-3.1.2.RELEASE.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.springframework/3.1.2.RELEASE/spring-expression-3.1.2.RELEASE.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.7.2/jcl-over-slf4j-1.7.2.jar"/>
Expand Down
8 changes: 4 additions & 4 deletions Source/JNA/waffle-tests/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<classpathentry excluding="**/.svn|**/.svn/*" kind="src" path="src-test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/javax.servlet/2.5/servlet-api-2.5.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/com.google.guava/13.0.1/guava-13.0.1.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.10/junit-4.10.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/bundle/com.google.guava/14.0.1/guava-14.0.1.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.11/junit-4.11.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.mockito/1.9.5-rc1/mockito-all-1.9.5-rc1.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.7/logback-classic-1.0.7.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.7/logback-core-1.0.7.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/3.5.0/jna-3.5.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/3.5.0/platform-3.5.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/4.0.0/jna-4.0.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/4.0.0/jna-platform-4.0.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.7.2/jcl-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.7.2/slf4j-api-1.7.2.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/waffle-jna"/>
Expand Down
4 changes: 3 additions & 1 deletion Source/JNA/waffle-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@
<version>2.5</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<scope>compile</scope>
</dependency>

</dependencies>
</project>
6 changes: 3 additions & 3 deletions Source/JNA/waffle-tomcat5/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<classpathentry combineaccessrules="false" kind="src" path="/waffle-jna"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.7/logback-classic-1.0.7.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.7/logback-core-1.0.7.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.10/junit-4.10.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/3.5.0/jna-3.5.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/3.5.0/platform-3.5.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.11/junit-4.11.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/4.0.0/jna-4.0.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/4.0.0/jna-platform-4.0.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.7.2/jcl-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.7.2/slf4j-api-1.7.2.jar"/>
<classpathentry kind="lib" path="/thirdparty/tomcat/5.5.36/catalina-5.5.36.jar"/>
Expand Down
6 changes: 3 additions & 3 deletions Source/JNA/waffle-tomcat6/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.apache.tomcat/6.0.35/servlet-api-6.0.35.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.apache.tomcat/6.0.35/coyote-6.0.35.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.apache.tomcat/6.0.35/juli-6.0.35.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.10/junit-4.10.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/3.5.0/jna-3.5.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/3.5.0/platform-3.5.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.11/junit-4.11.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/4.0.0/jna-4.0.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/4.0.0/jna-platform-4.0.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.7.2/slf4j-api-1.7.2.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/waffle-tests"/>
<classpathentry kind="output" path="bin"/>
Expand Down
6 changes: 3 additions & 3 deletions Source/JNA/waffle-tomcat7/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<classpathentry combineaccessrules="false" kind="src" path="/waffle-jna"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.7/logback-classic-1.0.7.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.7/logback-core-1.0.7.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.10/junit-4.10.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/3.5.0/jna-3.5.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/3.5.0/platform-3.5.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.11/junit-4.11.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/4.0.0/jna-4.0.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/net.java.dev.jna/4.0.0/jna-platform-4.0.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.apache.tomcat/7.0.32/tomcat-api-7.0.32.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.apache.tomcat/7.0.32/tomcat-catalina-7.0.32.jar"/>
<classpathentry kind="lib" path="/thirdparty/_lib/jar/org.apache.tomcat/7.0.32/tomcat-coyote-7.0.32.jar"/>
Expand Down
10 changes: 5 additions & 5 deletions Source/ThirdParty/ivy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@

<dependency org="org.databene" name="contiperf" rev="2.2.0" transitive="false"/>

<dependency org="junit" name="junit" rev="4.10" transitive="false"/>
<dependency org="junit" name="junit" rev="4.11" transitive="false"/>
<dependency org="org.hamcrest" name="hamcrest-core" rev="1.3" transitive="false"/>
<dependency org="org.mockito" name="mockito-all" rev="1.9.5-rc1" transitive="false"/>

<!-- common -->
<dependency org="com.google.guava" name="guava" rev="13.0.1" transitive="false"/>
<dependency org="com.google.guava" name="guava" rev="14.0.1" transitive="false"/>

<!-- jna -->
<dependency org="net.java.dev.jna" name="jna" rev="3.5.0" transitive="false"/>
<dependency org="net.java.dev.jna" name="platform" rev="3.5.0" transitive="false"/>
<dependency org="net.java.dev.jna" name="jna" rev="4.0.0" transitive="false"/>
<dependency org="net.java.dev.jna" name="jna-platform" rev="4.0.0" transitive="false"/>

<!-- servlet -->
<dependency org="javax.servlet" name="servlet-api" rev="2.5" transitive="false"/>
Expand All @@ -45,7 +46,6 @@
<dependency org="org.springframework" name="spring-web" rev="3.1.2.RELEASE" transitive="false"/>

<dependency org="org.springframework.security" name="spring-security-core" rev="2.0.7.RELEASE" transitive="false"/>

<dependency org="org.springframework.security" name="spring-security-core" rev="3.1.2.RELEASE" transitive="false"/>
<dependency org="org.springframework.security" name="spring-security-web" rev="3.1.2.RELEASE" transitive="false"/>

Expand Down