Author: agilliland
Date: Thu May 3 16:59:06 2007
New Revision: 535032
URL: http://svn.apache.org/viewvc?view=rev&rev=535032
Log:
adding licensing headers.
Modified:
roller/trunk/src/org/apache/roller/ui/core/util/UIUtils.java
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionInterceptor.java
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionPreparable.java
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionPrepareInterceptor.java
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UISecurityEnforced.java
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UISecurityInterceptor.java
Modified: roller/trunk/src/org/apache/roller/ui/core/util/UIUtils.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/core/util/UIUtils.java?view=diff&rev=535032&r1=535031&r2=535032
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/core/util/UIUtils.java (original)
+++ roller/trunk/src/org/apache/roller/ui/core/util/UIUtils.java Thu May 3
16:59:06 2007
@@ -29,6 +29,7 @@
import java.util.TreeMap;
import org.apache.roller.util.LocaleComparator;
+
/**
* A utilities class used by the Weblogger UI.
*/
Modified:
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionInterceptor.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionInterceptor.java?view=diff&rev=535032&r1=535031&r2=535032
==============================================================================
---
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionInterceptor.java
(original)
+++
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionInterceptor.java
Thu May 3 16:59:06 2007
@@ -1,10 +1,19 @@
/*
- * UIActionInterceptor.java
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Created on April 16, 2007, 5:30 PM
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
*/
package org.apache.roller.ui.core.util.struts2;
Modified:
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionPreparable.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionPreparable.java?view=diff&rev=535032&r1=535031&r2=535032
==============================================================================
---
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionPreparable.java
(original)
+++
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionPreparable.java
Thu May 3 16:59:06 2007
@@ -1,10 +1,19 @@
/*
- * UIActionPreparable.java
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Created on April 26, 2007, 3:10 PM
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
*/
package org.apache.roller.ui.core.util.struts2;
Modified:
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionPrepareInterceptor.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionPrepareInterceptor.java?view=diff&rev=535032&r1=535031&r2=535032
==============================================================================
---
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionPrepareInterceptor.java
(original)
+++
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionPrepareInterceptor.java
Thu May 3 16:59:06 2007
@@ -1,10 +1,19 @@
/*
- * UIActionInterceptor.java
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Created on April 16, 2007, 5:30 PM
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
*/
package org.apache.roller.ui.core.util.struts2;
Modified:
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UISecurityEnforced.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/core/util/struts2/UISecurityEnforced.java?view=diff&rev=535032&r1=535031&r2=535032
==============================================================================
---
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UISecurityEnforced.java
(original)
+++
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UISecurityEnforced.java
Thu May 3 16:59:06 2007
@@ -1,10 +1,19 @@
/*
- * UISecurityEnforced.java
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Created on April 17, 2007, 8:24 AM
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
*/
package org.apache.roller.ui.core.util.struts2;
Modified:
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UISecurityInterceptor.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/core/util/struts2/UISecurityInterceptor.java?view=diff&rev=535032&r1=535031&r2=535032
==============================================================================
---
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UISecurityInterceptor.java
(original)
+++
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UISecurityInterceptor.java
Thu May 3 16:59:06 2007
@@ -1,10 +1,19 @@
/*
- * UIActionInterceptor.java
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Created on April 16, 2007, 5:30 PM
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
*/
package org.apache.roller.ui.core.util.struts2;
@@ -21,6 +30,7 @@
import org.apache.roller.ui.core.RequestConstants;
import org.apache.roller.ui.core.RollerSession;
+
/**
* A struts2 interceptor for configuring specifics of the weblogger ui.
*/
@@ -54,8 +64,8 @@
// are we also enforcing a specific role?
if(theAction.requiredUserRole() != null) {
- log.debug("DENIED: user does not have role =
"+theAction.requiredUserRole());
if(!authenticatedUser.hasRole(theAction.requiredUserRole())) {
+ log.debug("DENIED: user does not have role =
"+theAction.requiredUserRole());
return "access-denied";
}
}