diff options
author | Jesse McConnell | 2013-01-11 21:01:16 +0000 |
---|---|---|
committer | Jesse McConnell | 2013-01-11 21:01:16 +0000 |
commit | 863944873d762518be216c018261b7f3c2935e35 (patch) | |
tree | 4203e2a33330ccafce090fb9b42ca97e70c2a239 /jetty-policy | |
parent | e4d51d5c1647932473eddbbb2f6effabf35d22e4 (diff) | |
parent | a4dbb5823ce0786d009832a713476a91e823350a (diff) | |
download | org.eclipse.jetty.project-863944873d762518be216c018261b7f3c2935e35.tar.gz org.eclipse.jetty.project-863944873d762518be216c018261b7f3c2935e35.tar.xz org.eclipse.jetty.project-863944873d762518be216c018261b7f3c2935e35.zip |
merge from 7 and update license blocks for 2013
Diffstat (limited to 'jetty-policy')
15 files changed, 15 insertions, 15 deletions
diff --git a/jetty-policy/src/main/java/org/eclipse/jetty/policy/JettyPolicy.java b/jetty-policy/src/main/java/org/eclipse/jetty/policy/JettyPolicy.java index 1b5817a000..286f519657 100644 --- a/jetty-policy/src/main/java/org/eclipse/jetty/policy/JettyPolicy.java +++ b/jetty-policy/src/main/java/org/eclipse/jetty/policy/JettyPolicy.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-policy/src/main/java/org/eclipse/jetty/policy/JettyPolicyConfigurator.java b/jetty-policy/src/main/java/org/eclipse/jetty/policy/JettyPolicyConfigurator.java index 099f7e7de2..97cd28cd8f 100644 --- a/jetty-policy/src/main/java/org/eclipse/jetty/policy/JettyPolicyConfigurator.java +++ b/jetty-policy/src/main/java/org/eclipse/jetty/policy/JettyPolicyConfigurator.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyBlock.java b/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyBlock.java index 717f18929b..f10c393f05 100644 --- a/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyBlock.java +++ b/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyBlock.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyContext.java b/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyContext.java index 18c2e87015..b6a47c8e6e 100644 --- a/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyContext.java +++ b/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyContext.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyException.java b/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyException.java index e023e484f8..9e3c2601ea 100644 --- a/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyException.java +++ b/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyException.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyMonitor.java b/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyMonitor.java index 982940b201..96eb4735dd 100644 --- a/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyMonitor.java +++ b/jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyMonitor.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/AbstractEntry.java b/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/AbstractEntry.java index 9b958d195f..0ee65b212b 100644 --- a/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/AbstractEntry.java +++ b/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/AbstractEntry.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/GrantEntry.java b/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/GrantEntry.java index 1fa0bcbc1e..7e21de84f0 100644 --- a/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/GrantEntry.java +++ b/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/GrantEntry.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/KeystoreEntry.java b/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/KeystoreEntry.java index 88c94781a4..2444041e73 100644 --- a/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/KeystoreEntry.java +++ b/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/KeystoreEntry.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/PermissionEntry.java b/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/PermissionEntry.java index e4929e45a1..04eaea0dd2 100644 --- a/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/PermissionEntry.java +++ b/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/PermissionEntry.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/PrincipalEntry.java b/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/PrincipalEntry.java index c9981b848e..a094419df5 100644 --- a/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/PrincipalEntry.java +++ b/jetty-policy/src/main/java/org/eclipse/jetty/policy/entry/PrincipalEntry.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-policy/src/test/java/org/eclipse/jetty/policy/JettyPolicyRuntimeTest.java b/jetty-policy/src/test/java/org/eclipse/jetty/policy/JettyPolicyRuntimeTest.java index 67cc0f803f..f00d7ce5aa 100644 --- a/jetty-policy/src/test/java/org/eclipse/jetty/policy/JettyPolicyRuntimeTest.java +++ b/jetty-policy/src/test/java/org/eclipse/jetty/policy/JettyPolicyRuntimeTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-policy/src/test/java/org/eclipse/jetty/policy/JettyPolicyTest.java b/jetty-policy/src/test/java/org/eclipse/jetty/policy/JettyPolicyTest.java index afda044282..93fbb95266 100644 --- a/jetty-policy/src/test/java/org/eclipse/jetty/policy/JettyPolicyTest.java +++ b/jetty-policy/src/test/java/org/eclipse/jetty/policy/JettyPolicyTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-policy/src/test/java/org/eclipse/jetty/policy/PolicyContextTest.java b/jetty-policy/src/test/java/org/eclipse/jetty/policy/PolicyContextTest.java index 77b4571598..c24c6d3d6d 100644 --- a/jetty-policy/src/test/java/org/eclipse/jetty/policy/PolicyContextTest.java +++ b/jetty-policy/src/test/java/org/eclipse/jetty/policy/PolicyContextTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 diff --git a/jetty-policy/src/test/java/org/eclipse/jetty/policy/PolicyMonitorTest.java b/jetty-policy/src/test/java/org/eclipse/jetty/policy/PolicyMonitorTest.java index 3997f5cf20..bb0538052b 100644 --- a/jetty-policy/src/test/java/org/eclipse/jetty/policy/PolicyMonitorTest.java +++ b/jetty-policy/src/test/java/org/eclipse/jetty/policy/PolicyMonitorTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 |