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

Fix line endings #16

Closed
wants to merge 5 commits into from
Closed

Fix line endings #16

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
eac19a2
adding files to make the build work
ryantxu Aug 7, 2012
eb6a524
adding source java spec to <javac
ryantxu Aug 7, 2012
2a287b1
Adding Implementaion-Version to manifest
ryantxu Aug 7, 2012
e4fa495
Adding WaffleInfo utility
ryantxu Aug 7, 2012
20659be
Normalize line endings
ryantxu Aug 8, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 22 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
13 changes: 10 additions & 3 deletions Source/JNA/build/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,13 @@
<sequential>
<delete dir="${waffle.lib}" />
<mkdir dir="${waffle.lib}" />
<javac target="${waffle.java.version}" srcdir="${waffle.src}"
destdir="${waffle.lib}" optimize="@{optimize}" debug="@{debug}"
<javac
source="${waffle.java.version}"
target="${waffle.java.version}"
srcdir="${waffle.src}"
destdir="${waffle.lib}"
optimize="@{optimize}"
debug="@{debug}"
includeantruntime="false">
<classpath refid="thirdparty.classpath" />
<classpath refid="project.classpath" />
Expand Down Expand Up @@ -152,7 +157,9 @@
<include name="waffle/**/*.class" />
</fileset>
<manifest>
<attribute name="Version" value="${waffle.version}" />
<attribute name="Implementation-Title" value="WAFFLE - ${project.jar}" />
<attribute name="Implementation-Version" value="${waffle.version}" />
<attribute name="Implementation-Vendor" value="${company.name}" />
<attribute name="Created-By" value="${waffle.copyright}" />
</manifest>
</jar>
Expand Down
4 changes: 2 additions & 2 deletions Source/JNA/demo/waffle-filter/META-INF/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version='1.0' encoding='utf-8'?>
<Context>
<?xml version='1.0' encoding='utf-8'?>
<Context>
</Context>
11 changes: 11 additions & 0 deletions Source/JNA/demo/waffle-filter/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,15 @@
<url-pattern>/*</url-pattern>
</filter-mapping>

<!-- System Information Helpful for debugging -->
<servlet>
<servlet-name>WaffleInfo</servlet-name>
<servlet-class>waffle.servlet.WaffleInfoServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>WaffleInfo</servlet-name>
<url-pattern>/waffle</url-pattern>
</servlet-mapping>

</web-app>
16 changes: 8 additions & 8 deletions Source/JNA/demo/waffle-form/META-INF/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='utf-8'?>
<Context>
<Realm className="org.apache.catalina.realm.JAASRealm"
appName="Jaas"
userClassNames="waffle.jaas.UserPrincipal"
roleClassNames="waffle.jaas.RolePrincipal"
useContextClassLoader="false"
debug="true" />
<?xml version='1.0' encoding='utf-8'?>
<Context>
<Realm className="org.apache.catalina.realm.JAASRealm"
appName="Jaas"
userClassNames="waffle.jaas.UserPrincipal"
roleClassNames="waffle.jaas.RolePrincipal"
useContextClassLoader="false"
debug="true" />
</Context>
16 changes: 8 additions & 8 deletions Source/JNA/demo/waffle-form/error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<html>
<head>
<title>Error</title>
</head>
</html>
<body>
An error has occurred.
</body>
<html>
<head>
<title>Error</title>
</head>
</html>
<body>
An error has occurred.
</body>
14 changes: 7 additions & 7 deletions Source/JNA/demo/waffle-form/jaas.policy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// -Djava.security.auth.policy=<path-to-file>/jaas.policy
//
grant Principal * * {
permission java.security.AllPermission "/*";
};
//
// -Djava.security.auth.policy=<path-to-file>/jaas.policy
//

grant Principal * * {
permission java.security.AllPermission "/*";
};
14 changes: 7 additions & 7 deletions Source/JNA/demo/waffle-form/login.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// -Djava.security.auth.login.config=<path-to-file>/login.conf
//
Jaas {
waffle.jaas.WindowsLoginModule sufficient debug=true principalFormat=both roleFormat=fqn;
};
//
// -Djava.security.auth.login.config=<path-to-file>/login.conf
//

Jaas {
waffle.jaas.WindowsLoginModule sufficient debug=true principalFormat=both roleFormat=fqn;
};
44 changes: 22 additions & 22 deletions Source/JNA/demo/waffle-form/login.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<html>
<head>
<title>Login</title>
</head>
</html>
<body>
<form method="POST" name="loginform" action="j_security_check">
<table style="vertical-align: middle;">
<tr>
<td>Username:</td>
<td><input type="text" name="j_username" /></td>
</tr>
<tr>
<td>Password:</td>
<td><input type="password" name="j_password" /></td>
</tr>
<tr>
<td><input type="submit" value="Login" /></td>
</tr>
</table>
</form>
</body>
<html>
<head>
<title>Login</title>
</head>
</html>
<body>
<form method="POST" name="loginform" action="j_security_check">
<table style="vertical-align: middle;">
<tr>
<td>Username:</td>
<td><input type="text" name="j_username" /></td>
</tr>
<tr>
<td>Password:</td>
<td><input type="password" name="j_password" /></td>
</tr>
<tr>
<td><input type="submit" value="Login" /></td>
</tr>
</table>
</form>
</body>
16 changes: 8 additions & 8 deletions Source/JNA/demo/waffle-jaas/META-INF/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='utf-8'?>
<Context>
<Realm className="org.apache.catalina.realm.JAASRealm"
appName="Jaas"
userClassNames="waffle.jaas.UserPrincipal"
roleClassNames="waffle.jaas.RolePrincipal"
useContextClassLoader="false"
debug="true" />
<?xml version='1.0' encoding='utf-8'?>
<Context>
<Realm className="org.apache.catalina.realm.JAASRealm"
appName="Jaas"
userClassNames="waffle.jaas.UserPrincipal"
roleClassNames="waffle.jaas.RolePrincipal"
useContextClassLoader="false"
debug="true" />
</Context>
14 changes: 7 additions & 7 deletions Source/JNA/demo/waffle-jaas/jaas.policy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// -Djava.security.auth.policy=<path-to-file>/jaas.policy
//
grant Principal * * {
permission java.security.AllPermission "/*";
};
//
// -Djava.security.auth.policy=<path-to-file>/jaas.policy
//

grant Principal * * {
permission java.security.AllPermission "/*";
};
14 changes: 7 additions & 7 deletions Source/JNA/demo/waffle-jaas/login.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// -Djava.security.auth.login.config=<path-to-file>/login.conf
//
Jaas {
waffle.jaas.WindowsLoginModule sufficient debug=true principalFormat=both roleFormat=fqn;
};
//
// -Djava.security.auth.login.config=<path-to-file>/login.conf
//

Jaas {
waffle.jaas.WindowsLoginModule sufficient debug=true principalFormat=both roleFormat=fqn;
};
16 changes: 8 additions & 8 deletions Source/JNA/demo/waffle-mixed-post/401.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<html>
<head>
<title>Access Denied (Waffle)</title>
</head>
<body>
Access Denied
</body>
</html>
<html>
<head>
<title>Access Denied (Waffle)</title>
</head>
<body>
Access Denied
</body>
</html>
8 changes: 4 additions & 4 deletions Source/JNA/demo/waffle-mixed-post/META-INF/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<Context>
<Valve className="waffle.apache.MixedAuthenticator" principalFormat="fqn" roleFormat="both" allowGuestLogin="false" />
<Realm className="waffle.apache.WindowsRealm" />
<?xml version='1.0' encoding='utf-8'?>
<Context>
<Valve className="waffle.apache.MixedAuthenticator" principalFormat="fqn" roleFormat="both" allowGuestLogin="false" />
<Realm className="waffle.apache.WindowsRealm" />
</Context>
16 changes: 8 additions & 8 deletions Source/JNA/demo/waffle-mixed-post/error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<html>
<head>
<title>Error</title>
</head>
</html>
<body>
An error has occurred.
</body>
<html>
<head>
<title>Error</title>
</head>
</html>
<body>
An error has occurred.
</body>
56 changes: 28 additions & 28 deletions Source/JNA/demo/waffle-mixed-post/login.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<html>
<head>
<title>Login</title>
</head>
</html>
<body>
<form method="POST" name="loginform" action="index.jsp">
<table style="vertical-align: middle;">
<tr>
<td>Username:</td>
<td><input type="text" name="j_username" /></td>
</tr>
<tr>
<td>Password:</td>
<td><input type="password" name="j_password" /></td>
</tr>
<tr>
<td><input type="submit" value="Login" /></td>
</tr>
</table>
<input type="hidden" name="j_security_check"/>
</form>
<hr>
<form method="POST" name="loginform" action="index.jsp">
<input type="hidden" name="j_negotiate_check"/>
<input type="submit" value="Login w/ Current Windows Credentials" />
</form>
</body>
<html>
<head>
<title>Login</title>
</head>
</html>
<body>
<form method="POST" name="loginform" action="index.jsp">
<table style="vertical-align: middle;">
<tr>
<td>Username:</td>
<td><input type="text" name="j_username" /></td>
</tr>
<tr>
<td>Password:</td>
<td><input type="password" name="j_password" /></td>
</tr>
<tr>
<td><input type="submit" value="Login" /></td>
</tr>
</table>
<input type="hidden" name="j_security_check"/>
</form>
<hr>
<form method="POST" name="loginform" action="index.jsp">
<input type="hidden" name="j_negotiate_check"/>
<input type="submit" value="Login w/ Current Windows Credentials" />
</form>
</body>
16 changes: 8 additions & 8 deletions Source/JNA/demo/waffle-mixed/401.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<html>
<head>
<title>Access Denied (Waffle)</title>
</head>
<body>
Access Denied
</body>
</html>
<html>
<head>
<title>Access Denied (Waffle)</title>
</head>
<body>
Access Denied
</body>
</html>
8 changes: 4 additions & 4 deletions Source/JNA/demo/waffle-mixed/META-INF/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<Context>
<Valve className="waffle.apache.MixedAuthenticator" principalFormat="fqn" roleFormat="both" allowGuestLogin="false" />
<Realm className="waffle.apache.WindowsRealm" />
<?xml version='1.0' encoding='utf-8'?>
<Context>
<Valve className="waffle.apache.MixedAuthenticator" principalFormat="fqn" roleFormat="both" allowGuestLogin="false" />
<Realm className="waffle.apache.WindowsRealm" />
</Context>
16 changes: 8 additions & 8 deletions Source/JNA/demo/waffle-mixed/error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<html>
<head>
<title>Error</title>
</head>
</html>
<body>
An error has occurred.
</body>
<html>
<head>
<title>Error</title>
</head>
</html>
<body>
An error has occurred.
</body>
Loading