From 62475d91ea699c5a9188976e240abb590d040a81 Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Fri, 25 Sep 2026 11:31:54 -0600 Subject: [PATCH 1/2] Add the ASF license header to source files that were missing it 88 Roller-owned files had no license header: Java sources and tests (including most package-info.java files), JSPs, Velocity templates, Struts validation and menu definitions, ORM mappings, properties files, deployment descriptors, a release script, CodeQL configuration, and NetBeans action files. Each now carries the header in the comment style its neighbors use. Velocity templates put the closing *# directly in front of their first output so rendered pages and feeds are unchanged; templates that begin with a directive or comment get a line break after the header instead, which only adds a blank line to the generated SQL scripts. Third-party files keep their own licenses and are left alone: docker/wait-for-it.sh and the jQuery Mobile theme CSS, as are the bundled blog themes, whose templates are copied into users' editable weblog templates. The it-selenium module is left as is because the Playwright PR removes it. --- .github/codeql/codeql-config.yml | 16 ++++++++++++++++ .github/workflows/codeql-analysis.yml | 16 ++++++++++++++++ app/nbactions.xml | 17 +++++++++++++++++ .../apache/roller/planet/pojos/Template.java | 18 ++++++++++++++++++ .../ui/core/RollerLoginSessionManager.java | 18 ++++++++++++++++++ .../core/filters/BootstrapSecurityFilter.java | 18 ++++++++++++++++++ .../security/RollerUserDetailsService.java | 18 ++++++++++++++++++ .../ui/core/tags/calendar/package-info.java | 18 ++++++++++++++++++ .../ui/core/util/menu/package-info.java | 18 ++++++++++++++++++ .../weblogger/ui/rendering/RequestMapper.java | 17 +++++++++++++++++ .../ui/rendering/model/package-info.java | 18 ++++++++++++++++++ .../ui/rendering/pagers/package-info.java | 18 ++++++++++++++++++ .../plugins/comments/package-info.java | 18 ++++++++++++++++++ .../ui/rendering/servlets/package-info.java | 18 ++++++++++++++++++ .../ui/rendering/util/cache/package-info.java | 18 ++++++++++++++++++ .../ui/rendering/util/package-info.java | 18 ++++++++++++++++++ .../ui/rendering/velocity/package-info.java | 18 ++++++++++++++++++ .../ui/struts2/admin/package-info.java | 18 ++++++++++++++++++ .../ui/struts2/ajax/package-info.java | 18 ++++++++++++++++++ .../ui/struts2/core/package-info.java | 18 ++++++++++++++++++ .../ui/struts2/editor/package-info.java | 18 ++++++++++++++++++ .../ui/struts2/pagers/package-info.java | 18 ++++++++++++++++++ .../ui/struts2/util/package-info.java | 18 ++++++++++++++++++ .../roller/weblogger/util/Utilities.java | 18 ++++++++++++++++++ .../weblogger/util/cache/CachedContent.java | 17 +++++++++++++++++ .../roller-version.properties | 16 ++++++++++++++++ .../apache/roller/planet/pojos/Planet.orm.xml | 17 +++++++++++++++++ .../roller/planet/pojos/PlanetGroup.orm.xml | 17 +++++++++++++++++ .../planet/pojos/RuntimeConfigProperty.orm.xml | 17 +++++++++++++++++ .../roller/planet/pojos/Subscription.orm.xml | 17 +++++++++++++++++ .../planet/pojos/SubscriptionEntry.orm.xml | 17 +++++++++++++++++ .../ui/struts2/admin/UserEdit-validation.xml | 17 +++++++++++++++++ .../weblogger/ui/struts2/admin/admin-menu.xml | 17 +++++++++++++++++ .../struts2/core/CreateWeblog-validation.xml | 17 +++++++++++++++++ .../ui/struts2/core/Profile-validation.xml | 17 +++++++++++++++++ .../ui/struts2/core/Register-validation.xml | 17 +++++++++++++++++ .../struts2/editor/BookmarkEdit-validation.xml | 17 +++++++++++++++++ .../struts2/editor/CategoryEdit-validation.xml | 17 +++++++++++++++++ .../ui/struts2/editor/EntryEdit-validation.xml | 17 +++++++++++++++++ .../struts2/editor/FolderEdit-validation.xml | 17 +++++++++++++++++ .../editor/MediaFileEdit-validation.xml | 17 +++++++++++++++++ .../struts2/editor/TemplateEdit-validation.xml | 17 +++++++++++++++++ .../struts2/editor/WeblogConfig-validation.xml | 17 +++++++++++++++++ .../ui/struts2/editor/editor-menu.xml | 17 +++++++++++++++++ .../xmlrpc/webserver/XmlRpcServlet.properties | 16 ++++++++++++++++ app/src/main/resources/propono.properties | 16 ++++++++++++++++ .../main/resources/sql/310-to-400-migration.vm | 17 +++++++++++++++++ .../main/resources/sql/400-to-500-migration.vm | 17 +++++++++++++++++ .../main/resources/sql/500-to-510-migration.vm | 17 +++++++++++++++++ .../main/resources/sql/510-to-520-migration.vm | 17 +++++++++++++++++ .../main/resources/sql/520-to-610-migration.vm | 17 +++++++++++++++++ app/src/main/resources/sql/control.vm | 18 +++++++++++++++++- app/src/main/resources/sql/createdb.vm | 17 +++++++++++++++++ .../main/resources/sql/dbscripts.properties | 16 ++++++++++++++++ app/src/main/resources/sql/macros.vm | 18 +++++++++++++++++- app/src/main/resources/struts.properties | 16 ++++++++++++++++ .../resources/template/roller/theme.properties | 16 ++++++++++++++++ .../WEB-INF/jboss-deployment-structure.xml | 17 +++++++++++++++++ app/src/main/webapp/WEB-INF/jboss-web.xml | 17 +++++++++++++++++ .../WEB-INF/jsps/core/BootstrapToken.jsp | 17 +++++++++++++++++ .../main/webapp/WEB-INF/jsps/tiles/head.jsp | 17 +++++++++++++++++ app/src/main/webapp/WEB-INF/sun-web.xml | 17 +++++++++++++++++ .../webapp/WEB-INF/velocity/roller-custom.vm | 16 ++++++++++++++++ .../velocity/templates/menu/menu-list.vm | 18 +++++++++++++++++- .../velocity/templates/menu/menu-tabbed.vm | 16 ++++++++++++++++ .../velocity/templates/navbar/navbar-css.vm | 17 +++++++++++++++++ .../templates/navbar/navbar-horizontal.vm | 17 +++++++++++++++++ .../templates/navbar/navbar-vertical.vm | 17 +++++++++++++++++ .../templates/weblog/noop_decorator.vm | 18 +++++++++++++++++- .../velocity/templates/weblog/popupcomments.vm | 18 +++++++++++++++++- .../WEB-INF/velocity/templates/weblog/rsd.vm | 18 +++++++++++++++++- app/src/main/webapp/WEB-INF/web.xml | 17 +++++++++++++++++ app/src/main/webapp/roller-ui/index.jsp | 17 +++++++++++++++++ .../weblogger/business/package-info.java | 18 ++++++++++++++++++ .../weblogger/ui/core/RollerSessionTest.java | 18 ++++++++++++++++++ .../ui/core/filters/LoadSaltFilterTest.java | 18 ++++++++++++++++++ .../core/filters/ValidateSaltFilterTest.java | 18 ++++++++++++++++++ .../core/security/BootstrapSecurityTest.java | 18 ++++++++++++++++++ .../resources/confinement-probe.properties | 16 ++++++++++++++++ .../test/resources/roller-custom.properties | 16 ++++++++++++++++ .../test/resources/roller-jettyrun.properties | 16 ++++++++++++++++ .../java--comp/env/jdbc/default.properties | 16 ++++++++++++++++ app/src/test/resources/webdefault.xml | 17 +++++++++++++++++ assembly-release/sign-release.sh | 17 +++++++++++++++++ db-utils/pom.xml | 17 +++++++++++++++++ nbactions.xml | 17 +++++++++++++++++ testing/roller-junit.properties | 16 ++++++++++++++++ version-rules.xml | 17 +++++++++++++++++ 88 files changed, 1506 insertions(+), 6 deletions(-) diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml index 7fa5e23b81..d743d131de 100644 --- a/.github/codeql/codeql-config.yml +++ b/.github/codeql/codeql-config.yml @@ -1,3 +1,19 @@ +# 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# 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. + name: "Roller CodeQL config" # paths-ignore only influences interpreted languages according to the doc diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d06a70d935..366e9783b4 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,3 +1,19 @@ +# 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# 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. + # For most projects, this workflow file will not need changing; you simply need # to commit it to your repository. # diff --git a/app/nbactions.xml b/app/nbactions.xml index ba2c841654..04a7f66b76 100644 --- a/app/nbactions.xml +++ b/app/nbactions.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/java/org/apache/roller/planet/pojos/Template.java b/app/src/main/java/org/apache/roller/planet/pojos/Template.java index 2be2f5cb4e..bd77bdb9cf 100644 --- a/app/src/main/java/org/apache/roller/planet/pojos/Template.java +++ b/app/src/main/java/org/apache/roller/planet/pojos/Template.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /* * Template.java * diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerLoginSessionManager.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerLoginSessionManager.java index 50472e2326..3435992070 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerLoginSessionManager.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerLoginSessionManager.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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.weblogger.ui.core; import org.apache.commons.logging.Log; diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/BootstrapSecurityFilter.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/BootstrapSecurityFilter.java index 32b63922c1..14f4172ae9 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/BootstrapSecurityFilter.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/BootstrapSecurityFilter.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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.weblogger.ui.core.filters; import java.io.IOException; diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java index db41c19b1e..43907b5f4b 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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.weblogger.ui.core.security; import java.util.ArrayList; diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/package-info.java index c5759875d7..093e48c1a0 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** * JSP tag for displaying weblog calendar */ diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/package-info.java index 2ac149340a..22c199faf4 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** * XML driven menu system */ diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RequestMapper.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RequestMapper.java index 4bac5118f8..e875b3dc98 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RequestMapper.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RequestMapper.java @@ -1,3 +1,20 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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.weblogger.ui.rendering; diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/package-info.java index 8c12daac60..36a2fb480c 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** * Model objects for use in Roller page/feed templates. */ diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/package-info.java index a3ff087f14..a1b6557c8e 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** * Pager objects for use in Roller page/feed templates. */ diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/package-info.java index 84fe1865a8..3aaeb973d8 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** * Comment validators and authenticators. */ diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/package-info.java index f934845f07..c1254cbcf2 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** Roller rendering system servlets. diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/package-info.java index 6284fc582d..4814d467e8 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** * Page, feed, site and feed caches. */ diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/package-info.java index cb391b2ca3..44d8b005d2 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** * Comment validators, request wrappers and other rendering utilities. */ diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/package-info.java index 4ed38722e7..9e78232ac3 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** * Velocity renderer and supporting classes. */ diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/package-info.java index 28689e0232..f7b20e8e04 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** * Struts 2 actions for admin UI */ diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/package-info.java index f553e6654f..ac9a6b454a 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** * Returns data in simple formats for use in AJAX */ diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/package-info.java index 3da71409f7..5be77e5f16 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** * Struts 2 action classes for core UI: main menu, login, etc. */ diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/package-info.java index f5dc3fc1c7..bd519e343e 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** * Struts 2 action classes for editor UI. */ diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/package-info.java index ccda7b8804..c68a58764e 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** * Comment and entry pagers used in Admin/editor UI */ diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/package-info.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/package-info.java index 1dd06b5d9b..e3ceaf24d8 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/package-info.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/package-info.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + /** * Struts 2 utility and base classes used in editor/admin UI. */ diff --git a/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java b/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java index 7caf9a6826..bf92bc2278 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java @@ -1,3 +1,21 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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.weblogger.util; import java.io.BufferedInputStream; diff --git a/app/src/main/java/org/apache/roller/weblogger/util/cache/CachedContent.java b/app/src/main/java/org/apache/roller/weblogger/util/cache/CachedContent.java index f888fbcd1f..7d19c8fb00 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/cache/CachedContent.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/cache/CachedContent.java @@ -1,3 +1,20 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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.weblogger.util.cache; diff --git a/app/src/main/resources-filtered/roller-version.properties b/app/src/main/resources-filtered/roller-version.properties index 77ef148348..8f0e929099 100644 --- a/app/src/main/resources-filtered/roller-version.properties +++ b/app/src/main/resources-filtered/roller-version.properties @@ -1,3 +1,19 @@ +# 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# 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. + ro.version=${project.version} ro.revision=r${buildNumber} ro.buildTime=${timestamp} diff --git a/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml b/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml index a0ba98926d..910913c9df 100644 --- a/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml +++ b/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml b/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml index 8bf025e08d..8a2661d2b1 100644 --- a/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml +++ b/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml b/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml index a1c908e020..0c6f583a89 100644 --- a/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml +++ b/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml b/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml index 5e8ba1f15f..ece65a71cb 100644 --- a/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml +++ b/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml b/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml index 1345e1a9b4..0c1b6351ff 100644 --- a/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml +++ b/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/UserEdit-validation.xml b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/UserEdit-validation.xml index a82a50b1af..00fa7e1bc3 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/UserEdit-validation.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/UserEdit-validation.xml @@ -1,3 +1,20 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml index 2e18a81894..cdf9cca237 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml @@ -1,3 +1,20 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/core/Profile-validation.xml b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/core/Profile-validation.xml index a82a50b1af..00fa7e1bc3 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/core/Profile-validation.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/core/Profile-validation.xml @@ -1,3 +1,20 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/core/Register-validation.xml b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/core/Register-validation.xml index a83628ad5a..a255662d8a 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/core/Register-validation.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/core/Register-validation.xml @@ -1,3 +1,20 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml index 16a0881208..33f0c78d5b 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml @@ -1,3 +1,20 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit-validation.xml b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit-validation.xml index 8aaa2fccbc..198c397a74 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit-validation.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit-validation.xml @@ -1,3 +1,20 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit-validation.xml b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit-validation.xml index f01979f7cb..e56b2d7b06 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit-validation.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit-validation.xml @@ -1,3 +1,20 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit-validation.xml b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit-validation.xml index 8351b93b68..b7f7c20c15 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit-validation.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit-validation.xml @@ -1,3 +1,20 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit-validation.xml b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit-validation.xml index 1a1e8fdedc..088489f291 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit-validation.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit-validation.xml @@ -1,3 +1,20 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit-validation.xml b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit-validation.xml index a23619b28d..2aa123c9bb 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit-validation.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit-validation.xml @@ -1,3 +1,20 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig-validation.xml b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig-validation.xml index 080afa7880..ad26883537 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig-validation.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig-validation.xml @@ -1,3 +1,20 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml index 0d3dbf6513..24eb81c047 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml @@ -1,3 +1,20 @@ + diff --git a/app/src/main/webapp/WEB-INF/jboss-web.xml b/app/src/main/webapp/WEB-INF/jboss-web.xml index 3dde2afc39..fd76c8b5a5 100644 --- a/app/src/main/webapp/WEB-INF/jboss-web.xml +++ b/app/src/main/webapp/WEB-INF/jboss-web.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/webapp/WEB-INF/jsps/core/BootstrapToken.jsp b/app/src/main/webapp/WEB-INF/jsps/core/BootstrapToken.jsp index 191499a26c..40fb9734f5 100644 --- a/app/src/main/webapp/WEB-INF/jsps/core/BootstrapToken.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/core/BootstrapToken.jsp @@ -1,3 +1,20 @@ +<%-- + 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 + + http://www.apache.org/licenses/LICENSE-2.0 + + 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. +--%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp index 42ad1d1d8b..2a449f82a7 100644 --- a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp @@ -1,3 +1,20 @@ +<%-- + 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 + + http://www.apache.org/licenses/LICENSE-2.0 + + 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. +--%> <%-- This default stuff goes in the HTML head element of each page You can override it with your own file via WEB-INF/tiles-def.xml diff --git a/app/src/main/webapp/WEB-INF/sun-web.xml b/app/src/main/webapp/WEB-INF/sun-web.xml index de5d5f6fe7..46563dadbd 100644 --- a/app/src/main/webapp/WEB-INF/sun-web.xml +++ b/app/src/main/webapp/WEB-INF/sun-web.xml @@ -1,4 +1,21 @@ + / diff --git a/app/src/main/webapp/WEB-INF/velocity/roller-custom.vm b/app/src/main/webapp/WEB-INF/velocity/roller-custom.vm index f33bfc5ee5..a2d2875290 100644 --- a/app/src/main/webapp/WEB-INF/velocity/roller-custom.vm +++ b/app/src/main/webapp/WEB-INF/velocity/roller-custom.vm @@ -1,2 +1,18 @@ +#** + 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 + http://www.apache.org/licenses/LICENSE-2.0 + + 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. +*# #** put your custom Velocimacros in this file *# diff --git a/app/src/main/webapp/WEB-INF/velocity/templates/menu/menu-list.vm b/app/src/main/webapp/WEB-INF/velocity/templates/menu/menu-list.vm index 4eab17ce8f..03fa1bfcbb 100644 --- a/app/src/main/webapp/WEB-INF/velocity/templates/menu/menu-list.vm +++ b/app/src/main/webapp/WEB-INF/velocity/templates/menu/menu-list.vm @@ -1,4 +1,20 @@ -