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/.github/workflows/main.yml b/.github/workflows/main.yml index 16ac36cf3a..f1cc45019e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -86,3 +86,27 @@ jobs: path: ./app/target/roller.war retention-days: 90 if-no-files-found: error + + # Apache RAT is not bound to the build because it slows it down, so CI runs + # it on its own + license-headers: + name: License headers + runs-on: ubuntu-latest + timeout-minutes: 10 + + steps: + - name: Set up JDK 17 + uses: actions/setup-java@v6 + with: + java-version: '17' + distribution: 'zulu' + + - name: Checkout Project + uses: actions/checkout@v7 + with: + persist-credentials: false + submodules: false + show-progress: false + + - name: Check license headers with Apache RAT + run: mvn -V -ntp apache-rat:check 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/META-INF/persistence.xml b/app/src/main/resources/META-INF/persistence.xml index 199c87280b..be1f7d663a 100644 --- a/app/src/main/resources/META-INF/persistence.xml +++ b/app/src/main/resources/META-INF/persistence.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/pojos/AutoPing.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/AutoPing.orm.xml index e493709224..6f33eb1be2 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/AutoPing.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/AutoPing.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/CustomTemplateRendition.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/CustomTemplateRendition.orm.xml index cc4760a763..dd4ae59d17 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/CustomTemplateRendition.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/CustomTemplateRendition.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml index f7b0113c71..08c4b1d4ee 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml index baea5b10f9..1aea1c6c7e 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml index 605ce6430a..7685ce1bfc 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml index 59ba4a1cc6..a14d3e8508 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml index 2cf7a7724e..58c1a7c9e4 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml index e633d1f09c..8f4f081d67 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml index 992f73562e..0fc651b10f 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml index 43ae3589e1..e2340fd35e 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml index 487c855b69..64e52d3364 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml index db243e077c..97750c5837 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml index e64ae4a539..c339e72de0 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml index 502f963fba..8b123f0ebe 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml index 7930b20cea..74dd9a9d28 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml index dd9ccdc67a..78933dd6a9 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml index ddee76952c..808e5d5069 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml index a5a0e76cbf..8c00966b06 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml index 6f3c9178e4..a9e6cd68d1 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml index 0c620a71d9..02441a37b0 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml index f1576b2ecb..fae9683efe 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml index 6c82966fef..a5c4e13a5b 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml index 323eae09cf..85c6f696b6 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml index 926205948c..340084a097 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml index 4b33d553eb..0a89d5252d 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml @@ -1,4 +1,21 @@ + diff --git a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml index e493537e5e..e4160b31d0 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml +++ b/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.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/taglib.tld b/app/src/main/webapp/WEB-INF/taglib.tld index ab2249fe54..e2677ffb87 100644 --- a/app/src/main/webapp/WEB-INF/taglib.tld +++ b/app/src/main/webapp/WEB-INF/taglib.tld @@ -1,4 +1,21 @@ + 1.1.0 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 @@ -