moving api, core, mock, servlet, and jass into single package

Waffle · dblock · Aug 22, 2012 · Aug 22, 2012 · Aug 22, 2012 · Aug 22, 2012
commit 7af264aeb19b3daa578af233dcf3110482484fbc
diff --git a/Source/JNA/build.xml b/Source/JNA/build.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <project name="waffle-jna" basedir="." default="build">
  <target name="recurse">
- <ant dir="waffle-api" target="${ant.target}" />
- <ant dir="waffle-mock" target="${ant.target}" />
- <ant dir="waffle-core" target="${ant.target}" />
- <ant dir="waffle-jaas" target="${ant.target}" />
- <ant dir="waffle-servlet" target="${ant.target}" />
+ <ant dir="waffle-jna" target="${ant.target}" />
  <ant dir="waffle-tomcat5" target="${ant.target}" />
  <ant dir="waffle-tomcat6" target="${ant.target}" />
  <ant dir="waffle-tomcat7" target="${ant.target}" />

diff --git a/Source/JNA/build/build.xml b/Source/JNA/build/build.xml
@@ -46,6 +46,7 @@
  <path refid="jna.classpath" />
  <path refid="slf4j.classpath" />
  <path refid="guava.classpath" />
+ <path refid="mockito.classpath" />
  </path>
  <macrodef name="compile">
  <attribute name="optimize" />

diff --git a/Source/JNA/waffle-api/.classpath b/Source/JNA/waffle-api/.classpath
diff --git a/Source/JNA/waffle-api/build.xml b/Source/JNA/waffle-api/build.xml
diff --git a/Source/JNA/waffle-api/src-test/.gitkeep b/Source/JNA/waffle-api/src-test/.gitkeep
diff --git a/Source/JNA/waffle-core/.classpath b/Source/JNA/waffle-core/.classpath
diff --git a/Source/JNA/waffle-core/.project b/Source/JNA/waffle-core/.project
diff --git a/Source/JNA/waffle-core/build.xml b/Source/JNA/waffle-core/build.xml
diff --git a/Source/JNA/waffle-jaas/.classpath b/Source/JNA/waffle-jaas/.classpath
diff --git a/Source/JNA/waffle-jaas/.project b/Source/JNA/waffle-jaas/.project
diff --git a/Source/JNA/waffle-jaas/build.xml b/Source/JNA/waffle-jaas/build.xml
diff --git a/Source/JNA/waffle-servlet/.classpath → Source/JNA/waffle-jna/.classpath b/Source/JNA/waffle-servlet/.classpath → Source/JNA/waffle-jna/.classpath
@@ -3,17 +3,16 @@
  <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 combineaccessrules="false" kind="src" path="/waffle-core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/waffle-api"/>
- <classpathentry combineaccessrules="false" kind="src" path="/waffle-mock"/>
- <classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.6.6/slf4j-api-1.6.6.jar"/>
- <classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.6/logback-classic-1.0.6.jar"/>
- <classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.6/logback-core-1.0.6.jar"/>
+ <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/guava-13.0.jar"/>
  <classpathentry kind="lib" path="/thirdparty/_lib/jar/junit/4.10/junit-4.10.jar"/>
  <classpathentry kind="lib" path="/thirdparty/_lib/jar/net.sourceforge.groboutils/5/groboutils-core-5.jar"/>
  <classpathentry kind="lib" path="/thirdparty/net.java.dev.jna/3.4.2/jna.jar"/>
  <classpathentry kind="lib" path="/thirdparty/net.java.dev.jna/3.4.2/platform.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/javax.servlet/2.5/servlet-api-2.5.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.6.6/jcl-over-slf4j-1.6.6.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/_lib/jar/org.slf4j/1.6.6/slf4j-api-1.6.6.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.6/logback-classic-1.0.6.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.6/logback-core-1.0.6.jar"/>
  <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Source/JNA/waffle-api/.project → Source/JNA/waffle-jna/.project b/Source/JNA/waffle-api/.project → Source/JNA/waffle-jna/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
- <name>waffle-api</name>
+ <name>waffle-jna</name>
  <comment></comment>
  <projects>
  </projects>

diff --git a/Source/JNA/waffle-mock/build.xml → Source/JNA/waffle-jna/build.xml b/Source/JNA/waffle-mock/build.xml → Source/JNA/waffle-jna/build.xml
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="waffle-mock" default="build" basedir=".">
+<project name="waffle-core" default="build" basedir=".">
  <import file="${basedir}/../build/common.xml" />
- <property name="project.jar" value="waffle-mock" />
+ <property name="project.jar" value="waffle-jna" />
  <import file="${basedir}/../build/build.xml" />
- <path id="javax.classpath">
- <!-- Either implementaion will work! -->
- <!--
+ <path id="project.classpath">
+ <!-- Either 2.5 or 3.x should work -->
  <fileset dir="${thirdparty.dir}/_lib/jar/javax.servlet/2.5">
  <include name="*.jar" />
  </fileset>
- -->
+ <!--
  <fileset dir="${thirdparty.dir}/_lib/jar/javax.servlet/3.0.1">
  <include name="*.jar" />
  </fileset>
- </path>
- <path id="waffle-api.classpath" location="${common.build}/waffle-api.jar" />
- <path id="project.classpath">
- <path refid="waffle-api.classpath" />
- <path refid="javax.classpath" />
- <path refid="mockito.classpath" />
+ -->
  </path>
  <path id="project.test.classpath" />
 </project>
diff --git a/...e-core/src-test/waffle/AllTestSuites.java → ...le-jna/src-test/waffle/AllTestSuites.java b/...e-core/src-test/waffle/AllTestSuites.java → ...le-jna/src-test/waffle/AllTestSuites.java
diff --git a/...as/src-test/waffle/jaas/AllJaasTests.java → ...na/src-test/waffle/jaas/AllJaasTests.java b/...as/src-test/waffle/jaas/AllJaasTests.java → ...na/src-test/waffle/jaas/AllJaasTests.java
diff --git a/...-test/waffle/jaas/RolePrincipalTests.java → ...-test/waffle/jaas/RolePrincipalTests.java b/...-test/waffle/jaas/RolePrincipalTests.java → ...-test/waffle/jaas/RolePrincipalTests.java
diff --git a/...-test/waffle/jaas/UserPrincipalTests.java → ...-test/waffle/jaas/UserPrincipalTests.java b/...-test/waffle/jaas/UserPrincipalTests.java → ...-test/waffle/jaas/UserPrincipalTests.java
diff --git a/...jaas/UsernamePasswordCallbackHandler.java → ...jaas/UsernamePasswordCallbackHandler.java b/...jaas/UsernamePasswordCallbackHandler.java → ...jaas/UsernamePasswordCallbackHandler.java
diff --git a/.../waffle/jaas/WindowsLoginModuleTests.java → .../waffle/jaas/WindowsLoginModuleTests.java b/.../waffle/jaas/WindowsLoginModuleTests.java → .../waffle/jaas/WindowsLoginModuleTests.java
diff --git a/...-test/waffle/servlet/AllServletTests.java → ...-test/waffle/servlet/AllServletTests.java b/...-test/waffle/servlet/AllServletTests.java → ...-test/waffle/servlet/AllServletTests.java
diff --git a/...fle/servlet/BasicSecurityFilterTests.java → ...fle/servlet/BasicSecurityFilterTests.java b/...fle/servlet/BasicSecurityFilterTests.java → ...fle/servlet/BasicSecurityFilterTests.java
diff --git a/...test/waffle/servlet/ImpersonateTests.java → ...test/waffle/servlet/ImpersonateTests.java b/...test/waffle/servlet/ImpersonateTests.java → ...test/waffle/servlet/ImpersonateTests.java
diff --git a/...let/NegotiateSecurityFilterLoadTests.java → ...let/NegotiateSecurityFilterLoadTests.java b/...let/NegotiateSecurityFilterLoadTests.java → ...let/NegotiateSecurityFilterLoadTests.java
diff --git a/...servlet/NegotiateSecurityFilterTests.java → ...servlet/NegotiateSecurityFilterTests.java b/...servlet/NegotiateSecurityFilterTests.java → ...servlet/NegotiateSecurityFilterTests.java
diff --git a/...st/waffle/servlet/SimpleFilterConfig.java → ...st/waffle/servlet/SimpleFilterConfig.java b/...st/waffle/servlet/SimpleFilterConfig.java → ...st/waffle/servlet/SimpleFilterConfig.java
diff --git a/...waffle/servlet/WindowsPrincipalTests.java → ...waffle/servlet/WindowsPrincipalTests.java b/...waffle/servlet/WindowsPrincipalTests.java → ...waffle/servlet/WindowsPrincipalTests.java
diff --git a/...ecurityFilterProviderCollectionTests.java → ...ecurityFilterProviderCollectionTests.java b/...ecurityFilterProviderCollectionTests.java → ...ecurityFilterProviderCollectionTests.java
diff --git a/...re/src-test/waffle/util/AllUtilTests.java → ...na/src-test/waffle/util/AllUtilTests.java b/...re/src-test/waffle/util/AllUtilTests.java → ...na/src-test/waffle/util/AllUtilTests.java
diff --git a/...waffle/util/AuthorizationHeaderTests.java → ...waffle/util/AuthorizationHeaderTests.java b/...waffle/util/AuthorizationHeaderTests.java → ...waffle/util/AuthorizationHeaderTests.java
diff --git a/...ore/src-test/waffle/util/Base64Tests.java → ...jna/src-test/waffle/util/Base64Tests.java b/...ore/src-test/waffle/util/Base64Tests.java → ...jna/src-test/waffle/util/Base64Tests.java
diff --git a/...rc-test/waffle/util/NtlmMessageTests.java → ...rc-test/waffle/util/NtlmMessageTests.java b/...rc-test/waffle/util/NtlmMessageTests.java → ...rc-test/waffle/util/NtlmMessageTests.java
diff --git a/.../waffle/util/NtlmServletRequestTests.java → .../waffle/util/NtlmServletRequestTests.java b/.../waffle/util/NtlmServletRequestTests.java → .../waffle/util/NtlmServletRequestTests.java
diff --git a/...fle/windows/auth/AllWindowsAuthTests.java → ...fle/windows/auth/AllWindowsAuthTests.java b/...fle/windows/auth/AllWindowsAuthTests.java → ...fle/windows/auth/AllWindowsAuthTests.java
diff --git a/...le/windows/auth/PrincipalFormatTests.java → ...le/windows/auth/PrincipalFormatTests.java b/...le/windows/auth/PrincipalFormatTests.java → ...le/windows/auth/PrincipalFormatTests.java
diff --git a/...fle/windows/auth/WindowsAccountTests.java → ...fle/windows/auth/WindowsAccountTests.java b/...fle/windows/auth/WindowsAccountTests.java → ...fle/windows/auth/WindowsAccountTests.java
diff --git a/...ws/auth/WindowsAuthProviderLoadTests.java → ...ws/auth/WindowsAuthProviderLoadTests.java b/...ws/auth/WindowsAuthProviderLoadTests.java → ...ws/auth/WindowsAuthProviderLoadTests.java
diff --git a/...indows/auth/WindowsAuthProviderTests.java → ...indows/auth/WindowsAuthProviderTests.java b/...indows/auth/WindowsAuthProviderTests.java → ...indows/auth/WindowsAuthProviderTests.java
diff --git a/...s/auth/WindowsCredentialsHandleTests.java → ...s/auth/WindowsCredentialsHandleTests.java b/...s/auth/WindowsCredentialsHandleTests.java → ...s/auth/WindowsCredentialsHandleTests.java
diff --git a/...ows/auth/WindowsSecurityContextTests.java → ...ows/auth/WindowsSecurityContextTests.java b/...ows/auth/WindowsSecurityContextTests.java → ...ows/auth/WindowsSecurityContextTests.java
diff --git a/...e-jaas/src/waffle/jaas/RolePrincipal.java → ...le-jna/src/waffle/jaas/RolePrincipal.java b/...e-jaas/src/waffle/jaas/RolePrincipal.java → ...le-jna/src/waffle/jaas/RolePrincipal.java
diff --git a/...e-jaas/src/waffle/jaas/UserPrincipal.java → ...le-jna/src/waffle/jaas/UserPrincipal.java b/...e-jaas/src/waffle/jaas/UserPrincipal.java → ...le-jna/src/waffle/jaas/UserPrincipal.java
diff --git a/...s/src/waffle/jaas/WindowsLoginModule.java → ...a/src/waffle/jaas/WindowsLoginModule.java b/...s/src/waffle/jaas/WindowsLoginModule.java → ...a/src/waffle/jaas/WindowsLoginModule.java
diff --git a/...k/src/waffle/mock/MockWindowsAccount.java → ...a/src/waffle/mock/MockWindowsAccount.java b/...k/src/waffle/mock/MockWindowsAccount.java → ...a/src/waffle/mock/MockWindowsAccount.java
diff --git a/.../waffle/mock/MockWindowsAuthProvider.java → .../waffle/mock/MockWindowsAuthProvider.java b/.../waffle/mock/MockWindowsAuthProvider.java → .../waffle/mock/MockWindowsAuthProvider.java
diff --git a/.../src/waffle/mock/MockWindowsIdentity.java → .../src/waffle/mock/MockWindowsIdentity.java b/.../src/waffle/mock/MockWindowsIdentity.java → .../src/waffle/mock/MockWindowsIdentity.java
diff --git a/...mock/MockWindowsImpersonationContext.java → ...mock/MockWindowsImpersonationContext.java b/...mock/MockWindowsImpersonationContext.java → ...mock/MockWindowsImpersonationContext.java
diff --git a/...ffle/mock/MockWindowsSecurityContext.java → ...ffle/mock/MockWindowsSecurityContext.java b/...ffle/mock/MockWindowsSecurityContext.java → ...ffle/mock/MockWindowsSecurityContext.java
diff --git a/...c/waffle/mock/http/SimpleFilterChain.java → ...c/waffle/mock/http/SimpleFilterChain.java b/...c/waffle/mock/http/SimpleFilterChain.java → ...c/waffle/mock/http/SimpleFilterChain.java
diff --git a/...c/waffle/mock/http/SimpleHttpRequest.java → ...c/waffle/mock/http/SimpleHttpRequest.java b/...c/waffle/mock/http/SimpleHttpRequest.java → ...c/waffle/mock/http/SimpleHttpRequest.java
diff --git a/.../waffle/mock/http/SimpleHttpResponse.java → .../waffle/mock/http/SimpleHttpResponse.java b/.../waffle/mock/http/SimpleHttpResponse.java → .../waffle/mock/http/SimpleHttpResponse.java
@@ -32,18 +32,8 @@ public class SimpleHttpResponse extends HttpServletResponseWrapper {
 
  public SimpleHttpResponse() {
  super(Mockito.mock(HttpServletResponse.class));
-
- try {
- Mockito.when(this.getHeaderNames())
- .thenThrow(new UnsupportedOperationException(
- "Get Header Names changed between 2.5 and 3.0 so lets not use it"));
- }
- catch(NoSuchMethodError err) {
- // This is OK. Running on 2.5 not 3.0
- }
  }
 
- @Override
  public int getStatus() {
  return _status;
  }
@@ -105,7 +95,6 @@ public String[] getHeaderValues(String headerName) {
  .toArray(new String[0]);
  }
 
- @Override
  public String getHeader(String headerName) {
  List<String> headerValues = _headers.get(headerName);
  if (headerValues == null) {

diff --git a/...c/waffle/mock/http/SimpleHttpSession.java → ...c/waffle/mock/http/SimpleHttpSession.java b/...c/waffle/mock/http/SimpleHttpSession.java → ...c/waffle/mock/http/SimpleHttpSession.java
diff --git a/...le/mock/http/SimpleRequestDispatcher.java → ...le/mock/http/SimpleRequestDispatcher.java b/...le/mock/http/SimpleRequestDispatcher.java → ...le/mock/http/SimpleRequestDispatcher.java
diff --git a/...rvlet/AutoDisposableWindowsPrincipal.java → ...rvlet/AutoDisposableWindowsPrincipal.java b/...rvlet/AutoDisposableWindowsPrincipal.java → ...rvlet/AutoDisposableWindowsPrincipal.java
diff --git a/...ffle/servlet/NegotiateRequestWrapper.java → ...ffle/servlet/NegotiateRequestWrapper.java b/...ffle/servlet/NegotiateRequestWrapper.java → ...ffle/servlet/NegotiateRequestWrapper.java
diff --git a/...ffle/servlet/NegotiateSecurityFilter.java → ...ffle/servlet/NegotiateSecurityFilter.java b/...ffle/servlet/NegotiateSecurityFilter.java → ...ffle/servlet/NegotiateSecurityFilter.java
diff --git a/.../src/waffle/servlet/WindowsPrincipal.java → .../src/waffle/servlet/WindowsPrincipal.java b/.../src/waffle/servlet/WindowsPrincipal.java → .../src/waffle/servlet/WindowsPrincipal.java
diff --git a/...vlet/spi/BasicSecurityFilterProvider.java → ...vlet/spi/BasicSecurityFilterProvider.java b/...vlet/spi/BasicSecurityFilterProvider.java → ...vlet/spi/BasicSecurityFilterProvider.java
diff --git a/.../spi/NegotiateSecurityFilterProvider.java → .../spi/NegotiateSecurityFilterProvider.java b/.../spi/NegotiateSecurityFilterProvider.java → .../spi/NegotiateSecurityFilterProvider.java
diff --git a/...e/servlet/spi/SecurityFilterProvider.java → ...e/servlet/spi/SecurityFilterProvider.java b/...e/servlet/spi/SecurityFilterProvider.java → ...e/servlet/spi/SecurityFilterProvider.java
diff --git a/...spi/SecurityFilterProviderCollection.java → ...spi/SecurityFilterProviderCollection.java b/...spi/SecurityFilterProviderCollection.java → ...spi/SecurityFilterProviderCollection.java
diff --git a/.../src/waffle/util/AuthorizationHeader.java → .../src/waffle/util/AuthorizationHeader.java b/.../src/waffle/util/AuthorizationHeader.java → .../src/waffle/util/AuthorizationHeader.java
diff --git a/...A/waffle-core/src/waffle/util/Base64.java → ...NA/waffle-jna/src/waffle/util/Base64.java b/...A/waffle-core/src/waffle/util/Base64.java → ...NA/waffle-jna/src/waffle/util/Base64.java
diff --git a/...fle-core/src/waffle/util/NtlmMessage.java → ...ffle-jna/src/waffle/util/NtlmMessage.java b/...fle-core/src/waffle/util/NtlmMessage.java → ...ffle-jna/src/waffle/util/NtlmMessage.java
diff --git a/...t/src/waffle/util/NtlmServletRequest.java → ...a/src/waffle/util/NtlmServletRequest.java b/...t/src/waffle/util/NtlmServletRequest.java → ...a/src/waffle/util/NtlmServletRequest.java
diff --git a/.../waffle/windows/auth/IWindowsAccount.java → .../waffle/windows/auth/IWindowsAccount.java b/.../waffle/windows/auth/IWindowsAccount.java → .../waffle/windows/auth/IWindowsAccount.java
diff --git a/...le/windows/auth/IWindowsAuthProvider.java → ...le/windows/auth/IWindowsAuthProvider.java b/...le/windows/auth/IWindowsAuthProvider.java → ...le/windows/auth/IWindowsAuthProvider.java
diff --git a/...waffle/windows/auth/IWindowsComputer.java → ...waffle/windows/auth/IWindowsComputer.java b/...waffle/windows/auth/IWindowsComputer.java → ...waffle/windows/auth/IWindowsComputer.java
diff --git a/...ndows/auth/IWindowsCredentialsHandle.java → ...ndows/auth/IWindowsCredentialsHandle.java b/...ndows/auth/IWindowsCredentialsHandle.java → ...ndows/auth/IWindowsCredentialsHandle.java
diff --git a/...c/waffle/windows/auth/IWindowsDomain.java → ...c/waffle/windows/auth/IWindowsDomain.java b/...c/waffle/windows/auth/IWindowsDomain.java → ...c/waffle/windows/auth/IWindowsDomain.java
diff --git a/...waffle/windows/auth/IWindowsIdentity.java → ...waffle/windows/auth/IWindowsIdentity.java b/...waffle/windows/auth/IWindowsIdentity.java → ...waffle/windows/auth/IWindowsIdentity.java
diff --git a/...ws/auth/IWindowsImpersonationContext.java → ...ws/auth/IWindowsImpersonationContext.java b/...ws/auth/IWindowsImpersonationContext.java → ...ws/auth/IWindowsImpersonationContext.java
diff --git a/...windows/auth/IWindowsSecurityContext.java → ...windows/auth/IWindowsSecurityContext.java b/...windows/auth/IWindowsSecurityContext.java → ...windows/auth/IWindowsSecurityContext.java
diff --git a/.../waffle/windows/auth/PrincipalFormat.java → .../waffle/windows/auth/PrincipalFormat.java b/.../waffle/windows/auth/PrincipalFormat.java → .../waffle/windows/auth/PrincipalFormat.java
diff --git a/...c/waffle/windows/auth/WindowsAccount.java → ...c/waffle/windows/auth/WindowsAccount.java b/...c/waffle/windows/auth/WindowsAccount.java → ...c/waffle/windows/auth/WindowsAccount.java
diff --git a/...windows/auth/impl/WindowsAccountImpl.java → ...windows/auth/impl/WindowsAccountImpl.java b/...windows/auth/impl/WindowsAccountImpl.java → ...windows/auth/impl/WindowsAccountImpl.java
diff --git a/...ws/auth/impl/WindowsAuthProviderImpl.java → ...ws/auth/impl/WindowsAuthProviderImpl.java b/...ws/auth/impl/WindowsAuthProviderImpl.java → ...ws/auth/impl/WindowsAuthProviderImpl.java
diff --git a/...indows/auth/impl/WindowsComputerImpl.java → ...indows/auth/impl/WindowsComputerImpl.java b/...indows/auth/impl/WindowsComputerImpl.java → ...indows/auth/impl/WindowsComputerImpl.java
diff --git a/...th/impl/WindowsCredentialsHandleImpl.java → ...th/impl/WindowsCredentialsHandleImpl.java b/...th/impl/WindowsCredentialsHandleImpl.java → ...th/impl/WindowsCredentialsHandleImpl.java
diff --git a/.../windows/auth/impl/WindowsDomainImpl.java → .../windows/auth/impl/WindowsDomainImpl.java b/.../windows/auth/impl/WindowsDomainImpl.java → .../windows/auth/impl/WindowsDomainImpl.java
diff --git a/...dowsIdentityImpersonationContextImpl.java → ...dowsIdentityImpersonationContextImpl.java b/...dowsIdentityImpersonationContextImpl.java → ...dowsIdentityImpersonationContextImpl.java
diff --git a/...indows/auth/impl/WindowsIdentityImpl.java → ...indows/auth/impl/WindowsIdentityImpl.java b/...indows/auth/impl/WindowsIdentityImpl.java → ...indows/auth/impl/WindowsIdentityImpl.java
diff --git a/...urityContextImpersonationContextImpl.java → ...urityContextImpersonationContextImpl.java b/...urityContextImpersonationContextImpl.java → ...urityContextImpersonationContextImpl.java
diff --git a/...auth/impl/WindowsSecurityContextImpl.java → ...auth/impl/WindowsSecurityContextImpl.java b/...auth/impl/WindowsSecurityContextImpl.java → ...auth/impl/WindowsSecurityContextImpl.java
diff --git a/Source/JNA/waffle-mock/.classpath b/Source/JNA/waffle-mock/.classpath
diff --git a/Source/JNA/waffle-mock/.project b/Source/JNA/waffle-mock/.project
diff --git a/Source/JNA/waffle-mock/src-test/.gitkeep b/Source/JNA/waffle-mock/src-test/.gitkeep
diff --git a/Source/JNA/waffle-servlet/.project b/Source/JNA/waffle-servlet/.project
diff --git a/Source/JNA/waffle-servlet/build.xml b/Source/JNA/waffle-servlet/build.xml
diff --git a/Source/JNA/waffle-servlet/src-test/waffle/AllTestSuites.java b/Source/JNA/waffle-servlet/src-test/waffle/AllTestSuites.java
diff --git a/Source/JNA/waffle-servlet/src-test/waffle/util/AllUtilTests.java b/Source/JNA/waffle-servlet/src-test/waffle/util/AllUtilTests.java
diff --git a/Source/JNA/waffle-spring-security2/.classpath b/Source/JNA/waffle-spring-security2/.classpath
@@ -3,10 +3,7 @@
  <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 combineaccessrules="false" kind="src" path="/waffle-core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/waffle-api"/>
- <classpathentry combineaccessrules="false" kind="src" path="/waffle-mock"/>
- <classpathentry combineaccessrules="false" kind="src" path="/waffle-servlet"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/waffle-jna"/>
  <classpathentry kind="lib" path="/thirdparty/_lib/jar/org.springframework.security/2.0.7.RELEASE/spring-security-core-2.0.7.RELEASE.jar"/>
  <classpathentry kind="lib" path="/thirdparty/_lib/jar/javax.servlet/2.5/servlet-api-2.5.jar"/>
  <classpathentry kind="lib" path="/thirdparty/_lib/jar/ch.qos.logback/1.0.6/logback-classic-1.0.6.jar"/>