diff --git a/.gitignore b/.gitignore index b82b2caa7..bcc52fede 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ *~ target/ -nb-configuration.xml -guacamole/customs.json diff --git a/doc/guacamole-example/.gitignore b/doc/guacamole-example/.gitignore index 42f4a1a64..c352b3795 100644 --- a/doc/guacamole-example/.gitignore +++ b/doc/guacamole-example/.gitignore @@ -1,2 +1,3 @@ +src/main/webapp/META-INF/ target/ *~ diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml index cdfb894c3..b18e66fb4 100644 --- a/doc/guacamole-example/pom.xml +++ b/doc/guacamole-example/pom.xml @@ -1,5 +1,26 @@ - + + + 4.0.0 org.apache.guacamole @@ -48,6 +69,25 @@ + + + org.apache.rat + apache-rat-plugin + 0.12 + + + + + validate + validate + + check + + + + + + diff --git a/doc/guacamole-example/src/main/webapp/META-INF/context.xml b/doc/guacamole-example/src/main/webapp/META-INF/context.xml deleted file mode 100644 index 5bee3dc30..000000000 --- a/doc/guacamole-example/src/main/webapp/META-INF/context.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/doc/guacamole-example/src/main/webapp/index.html b/doc/guacamole-example/src/main/webapp/index.html index 6b318133e..5a513a6bd 100644 --- a/doc/guacamole-example/src/main/webapp/index.html +++ b/doc/guacamole-example/src/main/webapp/index.html @@ -1,5 +1,22 @@ + diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml index 81083d93a..aa2c45f3b 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml @@ -1,5 +1,26 @@ - + + + 4.0.0 org.apache.guacamole @@ -38,6 +59,32 @@ + + + org.apache.rat + apache-rat-plugin + 0.12 + + + + **/*.json + src/main/resources/html/*.html + + + + + + + validate + validate + + check + + + + + + diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml index d63252e5b..1a8b3d8b6 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml @@ -1,5 +1,26 @@ - + + + 4.0.0 org.apache.guacamole @@ -44,6 +65,25 @@ + + + org.apache.rat + apache-rat-plugin + 0.12 + + + + + validate + validate + + check + + + + + + diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml index f69df7f59..cf578a3c7 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml @@ -1,3 +1,22 @@ + + + + + 4.0.0 org.apache.guacamole @@ -58,6 +79,31 @@ + + + org.apache.rat + apache-rat-plugin + 0.12 + + + + **/*.json + + + + + + + validate + validate + + check + + + + + + diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml index af474d40b..69e201474 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml @@ -1,5 +1,26 @@ - + + + 4.0.0 org.apache.guacamole @@ -58,6 +79,31 @@ + + + org.apache.rat + apache-rat-plugin + 0.12 + + + + **/*.json + + + + + + + validate + validate + + check + + + + + + diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml index 6c46a4882..d81f1313e 100644 --- a/extensions/guacamole-auth-jdbc/pom.xml +++ b/extensions/guacamole-auth-jdbc/pom.xml @@ -1,3 +1,22 @@ + + + + + 4.0.0 org.apache.guacamole @@ -74,6 +95,31 @@ + + + org.apache.rat + apache-rat-plugin + 0.12 + + + + **/*.json + + + + + + + validate + validate + + check + + + + + + diff --git a/extensions/guacamole-auth-ldap/schema/guacConfigGroup.ldif b/extensions/guacamole-auth-ldap/schema/guacConfigGroup.ldif index 4cac36cd2..6e3f60b25 100644 --- a/extensions/guacamole-auth-ldap/schema/guacConfigGroup.ldif +++ b/extensions/guacamole-auth-ldap/schema/guacConfigGroup.ldif @@ -1,3 +1,22 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. 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. +# + dn: cn=guacConfigGroup,cn=schema,cn=config objectClass: olcSchemaConfig cn: guacConfigGroup diff --git a/extensions/guacamole-auth-ldap/schema/guacConfigGroup.schema b/extensions/guacamole-auth-ldap/schema/guacConfigGroup.schema index 33542f9ca..eff1766ca 100644 --- a/extensions/guacamole-auth-ldap/schema/guacConfigGroup.schema +++ b/extensions/guacamole-auth-ldap/schema/guacConfigGroup.schema @@ -1,3 +1,21 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. 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. +# attributetype ( 1.3.6.1.4.1.38971.1.1.1 NAME 'guacConfigProtocol' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) diff --git a/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml b/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml index 59a416b70..174e021cf 100644 --- a/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml +++ b/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml @@ -1,3 +1,22 @@ + + + diff --git a/extensions/guacamole-auth-noauth/pom.xml b/extensions/guacamole-auth-noauth/pom.xml index 63aca3ff4..50f41aa24 100644 --- a/extensions/guacamole-auth-noauth/pom.xml +++ b/extensions/guacamole-auth-noauth/pom.xml @@ -1,5 +1,26 @@ - + + + 4.0.0 org.apache.guacamole @@ -74,6 +95,31 @@ + + + org.apache.rat + apache-rat-plugin + 0.12 + + + + **/*.json + + + + + + + validate + validate + + check + + + + + + diff --git a/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml b/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml index 834d5beff..94fed477b 100644 --- a/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml +++ b/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml @@ -1,3 +1,22 @@ + + + + + 4.0.0 org.apache.guacamole @@ -106,6 +127,31 @@ + + + org.apache.rat + apache-rat-plugin + 0.12 + + + + **/*.json + + + + + + + validate + validate + + check + + + + + + diff --git a/guacamole-common-js/static.xml b/guacamole-common-js/static.xml index e88abdce0..ec8c17754 100644 --- a/guacamole-common-js/static.xml +++ b/guacamole-common-js/static.xml @@ -1,3 +1,22 @@ + + guacamole-common-js guacamole-common-js diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml index 15b253734..4cc68107a 100644 --- a/guacamole-common/pom.xml +++ b/guacamole-common/pom.xml @@ -1,5 +1,26 @@ - + + + 4.0.0 org.apache.guacamole @@ -99,6 +120,25 @@ + + + org.apache.rat + apache-rat-plugin + 0.12 + + + + + validate + validate + + check + + + + + + diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml index e4d0664dc..b689a557b 100644 --- a/guacamole-ext/pom.xml +++ b/guacamole-ext/pom.xml @@ -1,5 +1,26 @@ - + + + 4.0.0 org.apache.guacamole @@ -99,6 +120,31 @@ + + + org.apache.rat + apache-rat-plugin + 0.12 + + + + **/*.json + + + + + + + validate + validate + + check + + + + + + diff --git a/guacamole/.gitignore b/guacamole/.gitignore index 1b2666e16..104d9234b 100644 --- a/guacamole/.gitignore +++ b/guacamole/.gitignore @@ -1,4 +1,6 @@ src/main/webapp/META-INF/ src/main/webapp/generated/ +nb-configuration.xml +customs.json target/ *~ diff --git a/guacamole/doc/example/user-mapping.xml b/guacamole/doc/example/user-mapping.xml index 1234de515..69ae6a1a1 100644 --- a/guacamole/doc/example/user-mapping.xml +++ b/guacamole/doc/example/user-mapping.xml @@ -1,3 +1,22 @@ + + diff --git a/guacamole/pom.xml b/guacamole/pom.xml index dbcae27e8..88900ef4e 100644 --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@ -1,5 +1,26 @@ - + + + 4.0.0 org.apache.guacamole @@ -190,6 +211,33 @@ + + + org.apache.rat + apache-rat-plugin + 0.12 + + + + src/main/webapp/app/*/templates/*.html + src/main/webapp/lib/**/*.js + **/*.json + + + + + + + validate + validate + + check + + + + + + diff --git a/pom.xml b/pom.xml index ccde2f08d..99aed8b08 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,26 @@ - + + + 4.0.0 org.apache.guacamole @@ -32,6 +53,9 @@ extensions/guacamole-auth-ldap extensions/guacamole-auth-noauth + + doc/guacamole-example + @@ -65,6 +89,33 @@ + + + org.apache.rat + apache-rat-plugin + 0.12 + + + + .dockerignore + CONTRIBUTING + **/README.md + + + + + + + validate + validate + + check + + + + + + diff --git a/project-assembly.xml b/project-assembly.xml index 7745bb935..d7fbebb67 100644 --- a/project-assembly.xml +++ b/project-assembly.xml @@ -1,3 +1,22 @@ + +