diff options
author | Jesse McConnell | 2012-07-11 19:04:49 +0000 |
---|---|---|
committer | Jesse McConnell | 2012-07-11 19:04:49 +0000 |
commit | 81d72052c8690a6bd3998352833947e372c3aa97 (patch) | |
tree | b3e1e91c08dce3b6dcca573f946cc71f47b681cc /jetty-policy | |
parent | 0fa17c13b1c004951493e2d3199f75b557c5e480 (diff) | |
parent | aa941f57118efb04d251e340677df79a98605661 (diff) | |
download | org.eclipse.jetty.project-81d72052c8690a6bd3998352833947e372c3aa97.tar.gz org.eclipse.jetty.project-81d72052c8690a6bd3998352833947e372c3aa97.tar.xz org.eclipse.jetty.project-81d72052c8690a6bd3998352833947e372c3aa97.zip |
merged master to jetty-8
Diffstat (limited to 'jetty-policy')
-rw-r--r-- | jetty-policy/src/main/java/org/eclipse/jetty/policy/PolicyMonitor.java | 12 | ||||
-rw-r--r-- | jetty-policy/src/test/java/org/eclipse/jetty/policy/PolicyMonitorTest.java | 12 |
2 files changed, 24 insertions, 0 deletions
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 64a1755fec..092ce5e045 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,4 +1,16 @@ package org.eclipse.jetty.policy; +//======================================================================== +//Copyright 2011-2012 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 +//and Apache License v2.0 which accompanies this distribution. +//The Eclipse Public License is available at +//http://www.eclipse.org/legal/epl-v10.html +//The Apache License v2.0 is available at +//http://www.opensource.org/licenses/apache2.0.php +//You may elect to redistribute this code under either of these licenses. +//======================================================================== import java.io.File; import java.io.FileInputStream; 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 0600853428..4831513048 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,4 +1,16 @@ package org.eclipse.jetty.policy; +//======================================================================== +//Copyright 2011-2012 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 +//and Apache License v2.0 which accompanies this distribution. +//The Eclipse Public License is available at +//http://www.eclipse.org/legal/epl-v10.html +//The Apache License v2.0 is available at +//http://www.opensource.org/licenses/apache2.0.php +//You may elect to redistribute this code under either of these licenses. +//======================================================================== import java.io.File; import java.util.HashMap; |