[BUG 283172] fix build on windows
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@542 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
parent
d5e524bca9
commit
b8d470dedb
|
@ -34,13 +34,14 @@ public class TestPolicyContext
|
||||||
{
|
{
|
||||||
public static final String __PRINCIPAL = "javax.security.auth.x500.X500Principal \"CN=Jetty Policy,OU=Artifact,O=Jetty Project,L=Earth,ST=Internet,C=US\"";
|
public static final String __PRINCIPAL = "javax.security.auth.x500.X500Principal \"CN=Jetty Policy,OU=Artifact,O=Jetty Project,L=Earth,ST=Internet,C=US\"";
|
||||||
|
|
||||||
|
private boolean _runningOnWindows;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void setUp()
|
protected void setUp()
|
||||||
throws Exception
|
throws Exception
|
||||||
{
|
{
|
||||||
|
_runningOnWindows = System.getProperty( "os.name" ).startsWith( "Windows" );
|
||||||
|
|
||||||
System.setProperty( "basedir", getWorkingDirectory() );
|
System.setProperty( "basedir", getWorkingDirectory() );
|
||||||
|
|
||||||
|
@ -59,6 +60,9 @@ public class TestPolicyContext
|
||||||
|
|
||||||
loader.scanStream( new InputStreamReader( new FileInputStream( policyFile ) ), grantEntries, keystoreEntries );
|
loader.scanStream( new InputStreamReader( new FileInputStream( policyFile ) ), grantEntries, keystoreEntries );
|
||||||
|
|
||||||
|
if ( !_runningOnWindows ) //temporary, create alternate file to load for windows
|
||||||
|
{
|
||||||
|
|
||||||
for ( Iterator<KeystoreEntry> i = keystoreEntries.iterator(); i.hasNext();)
|
for ( Iterator<KeystoreEntry> i = keystoreEntries.iterator(); i.hasNext();)
|
||||||
{
|
{
|
||||||
KeystoreEntry node = i.next();
|
KeystoreEntry node = i.next();
|
||||||
|
@ -72,8 +76,10 @@ public class TestPolicyContext
|
||||||
|
|
||||||
Permission perm = grant.getPermissions().elements().nextElement();
|
Permission perm = grant.getPermissions().elements().nextElement();
|
||||||
|
|
||||||
|
|
||||||
assertEquals( __PRINCIPAL, perm.getName() );
|
assertEquals( __PRINCIPAL, perm.getName() );
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void testAliasPropertyExpansion() throws Exception
|
public void testAliasPropertyExpansion() throws Exception
|
||||||
{
|
{
|
||||||
|
@ -87,6 +93,9 @@ public class TestPolicyContext
|
||||||
|
|
||||||
loader.scanStream( new InputStreamReader( new FileInputStream( policyFile ) ), grantEntries, keystoreEntries );
|
loader.scanStream( new InputStreamReader( new FileInputStream( policyFile ) ), grantEntries, keystoreEntries );
|
||||||
|
|
||||||
|
if ( !_runningOnWindows ) //temporary, create alternate file to load for windows
|
||||||
|
{
|
||||||
|
|
||||||
for ( Iterator<KeystoreEntry> i = keystoreEntries.iterator(); i.hasNext();)
|
for ( Iterator<KeystoreEntry> i = keystoreEntries.iterator(); i.hasNext();)
|
||||||
{
|
{
|
||||||
KeystoreEntry node = i.next();
|
KeystoreEntry node = i.next();
|
||||||
|
@ -102,6 +111,7 @@ public class TestPolicyContext
|
||||||
|
|
||||||
assertEquals( __PRINCIPAL, perm.getName() );
|
assertEquals( __PRINCIPAL, perm.getName() );
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void testFileSeparatorExpansion() throws Exception
|
public void testFileSeparatorExpansion() throws Exception
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue