From a4764fa7d50cdf1a321e461794282c66659c7dd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Feb 2026 12:48:30 +0000 Subject: [PATCH 1/3] Bump org.apache.maven.plugins:maven-checkstyle-plugin Bumps [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.2.2 to 3.6.0. - [Release notes](https://github.com/apache/maven-checkstyle-plugin/releases) - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.2.2...maven-checkstyle-plugin-3.6.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-version: 3.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index afe6c045db2..02dfc9024df 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -388,7 +388,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.2.2 + 3.6.0 org.apache.cxf.build-utils From 74694126401ca757b07ed1fed6bdd514b784011c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Feb 2026 13:13:23 +0000 Subject: [PATCH 2/3] Bump org.apache.maven.plugins:maven-checkstyle-plugin Bumps [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.2.2 to 3.6.0. - [Release notes](https://github.com/apache/maven-checkstyle-plugin/releases) - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.2.2...maven-checkstyle-plugin-3.6.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-version: 3.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index afe6c045db2..02dfc9024df 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -388,7 +388,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.2.2 + 3.6.0 org.apache.cxf.build-utils From c56b45fb6d3d9e28fdd71fb5469c07aadfba7233 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Fri, 13 Feb 2026 08:20:37 -0500 Subject: [PATCH 3/3] Fix checkstyle violations --- .../cxf/configuration/spring/bean.properties | 36 ++++++++++--------- .../jca/src/test/resources/logging.properties | 4 +-- .../projects/basic/archetype.properties | 20 +++++++++++ .../aegis/src/test/java/log4j.properties | 30 ++++++++-------- .../src/test/resources/log4j.properties | 20 +++++++++++ .../test/resources/jws/signature.properties | 20 +++++++++++ .../saml/src/test/resources/alice.properties | 4 +++ .../xml/src/test/resources/alice.properties | 4 +++ .../http_jetty/spring/bean.properties | 32 +++++++++-------- .../http/netty/server/spring/bean.properties | 32 +++++++++-------- .../http_undertow/spring/bean.properties | 32 +++++++++-------- .../jms/src/test/resources/logging.properties | 2 ++ .../src/test/resources/alice.properties | 4 +++ .../src/test/resources/cxfca.properties | 4 +++ .../src/test/resources/logging.properties | 4 +-- .../src/test/resources/saml_hok.properties | 20 +++++++++++ .../src/test/resources/saml_sv.properties | 20 +++++++++++ .../src/test/resources/wss-ecdh.properties | 20 +++++++++++ rt/wsdl/src/test/resources/logging.properties | 4 +-- .../src/test/resources/logging.properties | 33 ++++++++--------- .../test/resources/clientKeystore.properties | 29 +++++++-------- .../src/test/resources/eveKeystore.properties | 29 +++++++-------- .../src/test/resources/logging.properties | 33 ++++++++--------- .../cxf/systest/sts/deployment/sts.properties | 29 +++++++-------- .../sts/realms/stsKeystoreRealms.properties | 29 +++++++-------- .../test/resources/serviceKeystore.properties | 29 +++++++-------- .../src/test/resources/stsKeystore.properties | 29 +++++++-------- .../test/resources/clientKeystore.properties | 29 +++++++-------- .../src/test/resources/eveKeystore.properties | 29 +++++++-------- .../src/test/resources/logging.properties | 33 ++++++++--------- .../systest/sts/deployment/sts/sts.properties | 29 +++++++-------- .../test/resources/serviceKeystore.properties | 29 +++++++-------- .../resources/serviceKeystore2.properties | 29 +++++++-------- .../src/test/resources/stsKeystore.properties | 29 +++++++-------- .../src/test/resources/logging.properties | 20 +++++++++++ .../resources/logging_atompush.properties | 20 +++++++++++ .../logging_atompush_atompub.properties | 20 +++++++++++ .../logging_atompush_batch.properties | 21 ++++++++++- .../logging_atompush_disabled.properties | 20 +++++++++++ .../jaxrs/security/jetty-realm.properties | 20 +++++++++++ .../test/resources/files/swagger.properties | 20 +++++++++++ .../src/test/resources/logging.properties | 4 +-- .../src/test/resources/alice.properties | 4 +++ .../src/test/resources/bob.properties | 4 +++ .../test/resources/clientKeystore.properties | 30 ++++++++-------- .../src/test/resources/logging.properties | 4 +-- .../test/resources/serviceKeystore.properties | 30 ++++++++-------- .../src/test/resources/stsKeystore.properties | 30 ++++++++-------- .../ldap/src/test/resources/ldap.properties | 30 ++++++++-------- .../src/test/resources/logging.properties | 4 +-- .../src/test/resources/logging.properties | 4 +-- .../jaxrs/security/alice-jwejws.rs.properties | 4 +++ .../jaxrs/security/alice.jwk.properties | 4 +++ .../systest/jaxrs/security/alice.properties | 4 +++ .../jaxrs/security/alice.rs.properties | 4 +++ .../security/alice.rs.storeonly.properties | 4 +++ .../systest/jaxrs/security/bethal.properties | 30 ++++++++-------- .../jaxrs/security/bob-jwejws.rs.properties | 2 ++ .../systest/jaxrs/security/bob.jwk.properties | 2 ++ .../cxf/systest/jaxrs/security/bob.properties | 2 ++ .../systest/jaxrs/security/bob.rs.properties | 2 ++ .../security/bob.rs.storeonly.properties | 2 ++ .../httpsignature/alice.httpsig.properties | 4 +++ .../httpsignature/bob.httpsig.properties | 4 +++ .../jaxrs/security/jwe.direct.properties | 4 +++ .../jaxrs/security/jwejson1.properties | 4 +++ .../jaxrs/security/jwejson2.properties | 4 +++ .../jaxrs/security/jws.ec.private.properties | 4 +++ .../jaxrs/security/jws.ec.public.properties | 4 +++ .../systest/jaxrs/security/morpit.properties | 4 +++ .../jaxrs/security/morpittrust.properties | 4 +++ .../secret.aescbchmac.inlinejwk.properties | 4 +++ .../secret.aescbchmac.inlineset.properties | 4 +++ .../security/secret.aescbchmac.properties | 4 +++ .../jaxrs/security/secret.jwk.bad.properties | 4 +++ .../jaxrs/security/secret.jwk.hmac.properties | 4 +++ .../jaxrs/security/secret.jwk.properties | 4 +++ .../jaxrs/security/smallkey.properties | 4 +++ .../hc5/http/auth/jetty-realm.properties | 20 +++++++++++ .../src/test/resources/logging.properties | 4 +-- .../src/test/resources/alice.properties | 4 +++ .../src/test/resources/bob.properties | 4 +++ .../src/test/resources/logging.properties | 4 +-- .../systest/http/auth/jetty-realm.properties | 21 +++++++++++ .../src/test/resources/logging.properties | 4 +-- .../systest/http_jetty/jetty-realm.properties | 36 ++++++++++--------- .../src/test/resources/logging.properties | 4 +-- .../ws-rm/src/test/resources/alice.properties | 4 +++ .../ws-rm/src/test/resources/bob.properties | 4 +++ .../src/test/resources/alice.properties | 4 +++ .../src/test/resources/bob.properties | 4 +++ .../src/test/resources/cxfca.properties | 4 +++ .../src/test/resources/logging.properties | 4 +-- .../src/test/resources/sts.properties | 4 +++ .../resources/alice-customAlgSuite.properties | 4 +++ .../src/test/resources/alice-enc.properties | 4 +++ .../src/test/resources/alice.properties | 4 +++ .../src/test/resources/bethal.properties | 30 ++++++++-------- .../resources/bob-customAlgSuite.properties | 4 +++ .../src/test/resources/bob-enc.properties | 4 +++ .../src/test/resources/bob.properties | 4 +++ .../src/test/resources/cxfca.properties | 4 +++ .../src/test/resources/logging.properties | 4 +-- .../src/test/resources/morpit.properties | 4 +++ .../systest/ws/action/bob-modified.properties | 4 +++ .../systest/ws/security/revocation.properties | 2 ++ .../resources/restricted/alice.properties | 4 +++ .../test/resources/restricted/bob.properties | 4 +++ .../src/test/resources/truststore.properties | 30 ++++++++-------- .../src/test/resources/logging.properties | 4 +-- 110 files changed, 980 insertions(+), 431 deletions(-) diff --git a/core/src/test/java/org/apache/cxf/configuration/spring/bean.properties b/core/src/test/java/org/apache/cxf/configuration/spring/bean.properties index 91999051b46..6a134a599c6 100644 --- a/core/src/test/java/org/apache/cxf/configuration/spring/bean.properties +++ b/core/src/test/java/org/apache/cxf/configuration/spring/bean.properties @@ -1,17 +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. +# +# +# 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. +# +# simple.name=simpleValueBean diff --git a/integration/jca/src/test/resources/logging.properties b/integration/jca/src/test/resources/logging.properties index 2c55af86a11..29daaab4856 100644 --- a/integration/jca/src/test/resources/logging.properties +++ b/integration/jca/src/test/resources/logging.properties @@ -19,7 +19,7 @@ # # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -27,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/src/test/resources/projects/basic/archetype.properties b/maven-plugins/archetypes/cxf-jaxrs-service/src/test/resources/projects/basic/archetype.properties index b2befc905f6..c97ac734cbd 100644 --- a/maven-plugins/archetypes/cxf-jaxrs-service/src/test/resources/projects/basic/archetype.properties +++ b/maven-plugins/archetypes/cxf-jaxrs-service/src/test/resources/projects/basic/archetype.properties @@ -1,3 +1,23 @@ +# +# +# 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. +# +# #Mon Nov 14 13:42:57 EST 2011 package=it.pkg version=0.1-SNAPSHOT diff --git a/rt/databinding/aegis/src/test/java/log4j.properties b/rt/databinding/aegis/src/test/java/log4j.properties index ac5078f9ed6..ccc2b25ce81 100644 --- a/rt/databinding/aegis/src/test/java/log4j.properties +++ b/rt/databinding/aegis/src/test/java/log4j.properties @@ -1,19 +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. +# 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. # Set root logger level to DEBUG and its only appender to A1. log4j.rootLogger=INFO, A1 diff --git a/rt/features/logging/src/test/resources/log4j.properties b/rt/features/logging/src/test/resources/log4j.properties index 5b083bab174..730d72281c9 100644 --- a/rt/features/logging/src/test/resources/log4j.properties +++ b/rt/features/logging/src/test/resources/log4j.properties @@ -1,3 +1,23 @@ +# +# +# 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. +# +# log4j.rootLogger=INFO,stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender diff --git a/rt/rs/security/jose-parent/jose/src/test/resources/jws/signature.properties b/rt/rs/security/jose-parent/jose/src/test/resources/jws/signature.properties index e27a3296e9f..bac7454b5b8 100644 --- a/rt/rs/security/jose-parent/jose/src/test/resources/jws/signature.properties +++ b/rt/rs/security/jose-parent/jose/src/test/resources/jws/signature.properties @@ -1 +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. +# +# rs.security.signature.algorithm=none diff --git a/rt/rs/security/sso/saml/src/test/resources/alice.properties b/rt/rs/security/sso/saml/src/test/resources/alice.properties index 7a1f467648f..2bf4697675c 100644 --- a/rt/rs/security/sso/saml/src/test/resources/alice.properties +++ b/rt/rs/security/sso/saml/src/test/resources/alice.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/rt/rs/security/xml/src/test/resources/alice.properties b/rt/rs/security/xml/src/test/resources/alice.properties index 7a1f467648f..2bf4697675c 100644 --- a/rt/rs/security/xml/src/test/resources/alice.properties +++ b/rt/rs/security/xml/src/test/resources/alice.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/bean.properties b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/bean.properties index 54f20007e7e..9c5118a32ec 100644 --- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/bean.properties +++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/bean.properties @@ -1,19 +1,23 @@ -# 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 +# +# +# 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 +# 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. +# 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. +# +# bar.connection.timeout=79 foo.connection.timeout=97 engine.port.zero=0 diff --git a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/bean.properties b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/bean.properties index a08cfdda824..85aa5600429 100644 --- a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/bean.properties +++ b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/bean.properties @@ -1,19 +1,23 @@ -# 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 +# +# +# 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 +# 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. +# 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. +# +# bar.connection.timeout=79 foo.connection.timeout=97 engine.port.zero=0 diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/bean.properties b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/bean.properties index f92e1fcf8ab..0c146cebc10 100644 --- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/bean.properties +++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/bean.properties @@ -1,19 +1,23 @@ -# 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 +# +# +# 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 +# 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. +# 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. +# +# bar.connection.timeout=79 foo.connection.timeout=97 engine.port.zero=0 diff --git a/rt/transports/jms/src/test/resources/logging.properties b/rt/transports/jms/src/test/resources/logging.properties index 98412a86411..d0772d7b7b8 100644 --- a/rt/transports/jms/src/test/resources/logging.properties +++ b/rt/transports/jms/src/test/resources/logging.properties @@ -1,3 +1,5 @@ +# +# # 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 diff --git a/rt/ws/security/src/test/resources/alice.properties b/rt/ws/security/src/test/resources/alice.properties index 7a1f467648f..2bf4697675c 100644 --- a/rt/ws/security/src/test/resources/alice.properties +++ b/rt/ws/security/src/test/resources/alice.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/rt/ws/security/src/test/resources/cxfca.properties b/rt/ws/security/src/test/resources/cxfca.properties index 18cc0bafae1..2a645157dd1 100644 --- a/rt/ws/security/src/test/resources/cxfca.properties +++ b/rt/ws/security/src/test/resources/cxfca.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.truststore.type=jks org.apache.ws.security.crypto.merlin.truststore.password=password diff --git a/rt/ws/security/src/test/resources/logging.properties b/rt/ws/security/src/test/resources/logging.properties index b2e5a799c83..4889366a3ab 100644 --- a/rt/ws/security/src/test/resources/logging.properties +++ b/rt/ws/security/src/test/resources/logging.properties @@ -19,7 +19,7 @@ # # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -27,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/rt/ws/security/src/test/resources/saml_hok.properties b/rt/ws/security/src/test/resources/saml_hok.properties index 059339596ec..8a42715c4f9 100644 --- a/rt/ws/security/src/test/resources/saml_hok.properties +++ b/rt/ws/security/src/test/resources/saml_hok.properties @@ -1,3 +1,23 @@ +# +# +# 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. +# +# org.apache.ws.security.saml.issuerClass=org.apache.ws.security.saml.SAMLIssuerImpl org.apache.ws.security.saml.issuer.cryptoProp.file=outsecurity.properties org.apache.ws.security.saml.issuer.key.name=myalias diff --git a/rt/ws/security/src/test/resources/saml_sv.properties b/rt/ws/security/src/test/resources/saml_sv.properties index 4027e904e3f..406fec97cbf 100644 --- a/rt/ws/security/src/test/resources/saml_sv.properties +++ b/rt/ws/security/src/test/resources/saml_sv.properties @@ -1,3 +1,23 @@ +# +# +# 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. +# +# org.apache.ws.security.saml.issuerClass=org.apache.ws.security.saml.SAMLIssuerImpl org.apache.ws.security.saml.issuer=www.example.com org.apache.ws.security.saml.issuer.cryptoProp.file=outsecurity.properties diff --git a/rt/ws/security/src/test/resources/wss-ecdh.properties b/rt/ws/security/src/test/resources/wss-ecdh.properties index ee89c3a5f91..e92ec1a547f 100644 --- a/rt/ws/security/src/test/resources/wss-ecdh.properties +++ b/rt/ws/security/src/test/resources/wss-ecdh.properties @@ -1,3 +1,23 @@ +# +# +# 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. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=PKCS12 org.apache.ws.security.crypto.merlin.keystore.password=security diff --git a/rt/wsdl/src/test/resources/logging.properties b/rt/wsdl/src/test/resources/logging.properties index 22c30bd8850..35c34dab401 100644 --- a/rt/wsdl/src/test/resources/logging.properties +++ b/rt/wsdl/src/test/resources/logging.properties @@ -19,7 +19,7 @@ # # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -27,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/services/sts/sts-core/src/test/resources/logging.properties b/services/sts/sts-core/src/test/resources/logging.properties index f70123b3122..a6f1cf6f5c8 100644 --- a/services/sts/sts-core/src/test/resources/logging.properties +++ b/services/sts/sts-core/src/test/resources/logging.properties @@ -1,24 +1,25 @@ # -# 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 +# 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 # -# 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. +# 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. # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -26,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/services/sts/systests/advanced/src/test/resources/clientKeystore.properties b/services/sts/systests/advanced/src/test/resources/clientKeystore.properties index b76fb47bbc0..9cc7608bb21 100644 --- a/services/sts/systests/advanced/src/test/resources/clientKeystore.properties +++ b/services/sts/systests/advanced/src/test/resources/clientKeystore.properties @@ -1,20 +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 +# 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 # -# 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. +# 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. # org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks diff --git a/services/sts/systests/advanced/src/test/resources/eveKeystore.properties b/services/sts/systests/advanced/src/test/resources/eveKeystore.properties index dd492b29996..4a854732fde 100644 --- a/services/sts/systests/advanced/src/test/resources/eveKeystore.properties +++ b/services/sts/systests/advanced/src/test/resources/eveKeystore.properties @@ -1,20 +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 +# 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 # -# 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. +# 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. # org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks diff --git a/services/sts/systests/advanced/src/test/resources/logging.properties b/services/sts/systests/advanced/src/test/resources/logging.properties index 4d286d18e62..78fbfe497bd 100644 --- a/services/sts/systests/advanced/src/test/resources/logging.properties +++ b/services/sts/systests/advanced/src/test/resources/logging.properties @@ -1,23 +1,24 @@ # -# 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 +# 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 # -# 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. +# 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. # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -25,7 +26,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/sts.properties b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/sts.properties index e89bf34f4f8..d0a7d021f6d 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/sts.properties +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/sts.properties @@ -1,20 +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 +# 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 # -# 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. +# 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. # signature.properties=stsKeystore.properties signature.username=mystskey diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsKeystoreRealms.properties b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsKeystoreRealms.properties index 2ea8d17de6d..7bc35b09007 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsKeystoreRealms.properties +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsKeystoreRealms.properties @@ -1,20 +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 +# 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 # -# 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. +# 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. # org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks diff --git a/services/sts/systests/advanced/src/test/resources/serviceKeystore.properties b/services/sts/systests/advanced/src/test/resources/serviceKeystore.properties index f837778e7a2..f31e6b0bb6d 100644 --- a/services/sts/systests/advanced/src/test/resources/serviceKeystore.properties +++ b/services/sts/systests/advanced/src/test/resources/serviceKeystore.properties @@ -1,20 +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 +# 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 # -# 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. +# 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. # org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks diff --git a/services/sts/systests/advanced/src/test/resources/stsKeystore.properties b/services/sts/systests/advanced/src/test/resources/stsKeystore.properties index a11eefa9d97..708d85421c1 100644 --- a/services/sts/systests/advanced/src/test/resources/stsKeystore.properties +++ b/services/sts/systests/advanced/src/test/resources/stsKeystore.properties @@ -1,20 +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 +# 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 # -# 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. +# 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. # org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks diff --git a/services/sts/systests/basic/src/test/resources/clientKeystore.properties b/services/sts/systests/basic/src/test/resources/clientKeystore.properties index b76fb47bbc0..9cc7608bb21 100644 --- a/services/sts/systests/basic/src/test/resources/clientKeystore.properties +++ b/services/sts/systests/basic/src/test/resources/clientKeystore.properties @@ -1,20 +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 +# 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 # -# 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. +# 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. # org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks diff --git a/services/sts/systests/basic/src/test/resources/eveKeystore.properties b/services/sts/systests/basic/src/test/resources/eveKeystore.properties index dd492b29996..4a854732fde 100644 --- a/services/sts/systests/basic/src/test/resources/eveKeystore.properties +++ b/services/sts/systests/basic/src/test/resources/eveKeystore.properties @@ -1,20 +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 +# 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 # -# 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. +# 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. # org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks diff --git a/services/sts/systests/basic/src/test/resources/logging.properties b/services/sts/systests/basic/src/test/resources/logging.properties index f70123b3122..a6f1cf6f5c8 100644 --- a/services/sts/systests/basic/src/test/resources/logging.properties +++ b/services/sts/systests/basic/src/test/resources/logging.properties @@ -1,24 +1,25 @@ # -# 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 +# 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 # -# 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. +# 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. # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -26,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/sts.properties b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/sts.properties index e89bf34f4f8..d0a7d021f6d 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/sts.properties +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/sts.properties @@ -1,20 +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 +# 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 # -# 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. +# 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. # signature.properties=stsKeystore.properties signature.username=mystskey diff --git a/services/sts/systests/basic/src/test/resources/serviceKeystore.properties b/services/sts/systests/basic/src/test/resources/serviceKeystore.properties index f837778e7a2..f31e6b0bb6d 100644 --- a/services/sts/systests/basic/src/test/resources/serviceKeystore.properties +++ b/services/sts/systests/basic/src/test/resources/serviceKeystore.properties @@ -1,20 +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 +# 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 # -# 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. +# 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. # org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks diff --git a/services/sts/systests/basic/src/test/resources/serviceKeystore2.properties b/services/sts/systests/basic/src/test/resources/serviceKeystore2.properties index f85af2d8ca3..34e39fcf270 100644 --- a/services/sts/systests/basic/src/test/resources/serviceKeystore2.properties +++ b/services/sts/systests/basic/src/test/resources/serviceKeystore2.properties @@ -1,20 +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 +# 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 # -# 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. +# 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. # org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks diff --git a/services/sts/systests/basic/src/test/resources/stsKeystore.properties b/services/sts/systests/basic/src/test/resources/stsKeystore.properties index a11eefa9d97..708d85421c1 100644 --- a/services/sts/systests/basic/src/test/resources/stsKeystore.properties +++ b/services/sts/systests/basic/src/test/resources/stsKeystore.properties @@ -1,20 +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 +# 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 # -# 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. +# 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. # org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks diff --git a/services/wsn/wsn-core/src/test/resources/logging.properties b/services/wsn/wsn-core/src/test/resources/logging.properties index 779a872c089..2d345d41131 100644 --- a/services/wsn/wsn-core/src/test/resources/logging.properties +++ b/services/wsn/wsn-core/src/test/resources/logging.properties @@ -1,3 +1,23 @@ +# +# +# 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. +# + # Specify the handlers to create in the root logger # (all loggers are children of the root logger) # The following creates two handlers diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties index 3ccbe0fe8d8..c0c11e8c724 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties @@ -1,3 +1,23 @@ +# +# +# 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. +# +# # Set logging levels for the package-named loggers org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushTest.level = ALL org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushTest.handlers = org.apache.cxf.management.web.logging.atom.AtomPushHandler diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties index b09132b9963..956f679e6d0 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties @@ -1,3 +1,23 @@ +# +# +# 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. +# +# # Set logging levels for the package-named loggers org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushTest.level = ALL org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushTest.handlers = org.apache.cxf.management.web.logging.atom.AtomPushHandler diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_batch.properties b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_batch.properties index c01c0bfa6aa..b875e2f3c34 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_batch.properties +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_batch.properties @@ -1,4 +1,23 @@ - +# +# +# 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. +# +# # Set logging levels for the package-named loggers org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushTest.level = ALL org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushTest.handlers = org.apache.cxf.management.web.logging.atom.AtomPushHandler diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties index ea03c16947d..8ca8ff48167 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties @@ -1,3 +1,23 @@ +# +# +# 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. +# +# handlers = java.util.logging.ConsoleHandler .level = OFF org.apache.cxf.jaxrs.level = OFF diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jetty-realm.properties b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jetty-realm.properties index 4013e65931d..314f2c68744 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jetty-realm.properties +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jetty-realm.properties @@ -1,3 +1,23 @@ +# +# +# 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. +# +# foo: bar,ROLE_USER bob: bobspassword,ROLE_BOOK_OWNER diff --git a/systests/jaxrs/src/test/resources/files/swagger.properties b/systests/jaxrs/src/test/resources/files/swagger.properties index 417045b7535..b0021407dca 100644 --- a/systests/jaxrs/src/test/resources/files/swagger.properties +++ b/systests/jaxrs/src/test/resources/files/swagger.properties @@ -1,3 +1,23 @@ +# +# +# 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. +# +# contact=cxf@apache.org title=CXF unittest description=API Description diff --git a/systests/jaxrs/src/test/resources/logging.properties b/systests/jaxrs/src/test/resources/logging.properties index cdda57b0d5f..f5f2c9a981d 100644 --- a/systests/jaxrs/src/test/resources/logging.properties +++ b/systests/jaxrs/src/test/resources/logging.properties @@ -19,7 +19,7 @@ # # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -27,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/systests/kerberos/src/test/resources/alice.properties b/systests/kerberos/src/test/resources/alice.properties index fb18b116e15..8c1e461cd45 100644 --- a/systests/kerberos/src/test/resources/alice.properties +++ b/systests/kerberos/src/test/resources/alice.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/systests/kerberos/src/test/resources/bob.properties b/systests/kerberos/src/test/resources/bob.properties index 61bb2ecae51..4547d47ee1a 100644 --- a/systests/kerberos/src/test/resources/bob.properties +++ b/systests/kerberos/src/test/resources/bob.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/systests/kerberos/src/test/resources/clientKeystore.properties b/systests/kerberos/src/test/resources/clientKeystore.properties index b76fb47bbc0..1a4dc9cd27c 100644 --- a/systests/kerberos/src/test/resources/clientKeystore.properties +++ b/systests/kerberos/src/test/resources/clientKeystore.properties @@ -1,20 +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 +# 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. # -# 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. # org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks diff --git a/systests/kerberos/src/test/resources/logging.properties b/systests/kerberos/src/test/resources/logging.properties index 0cf4a858968..a61c88a38ce 100644 --- a/systests/kerberos/src/test/resources/logging.properties +++ b/systests/kerberos/src/test/resources/logging.properties @@ -19,7 +19,7 @@ # # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -27,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/systests/kerberos/src/test/resources/serviceKeystore.properties b/systests/kerberos/src/test/resources/serviceKeystore.properties index f837778e7a2..fe90bd1e7a0 100644 --- a/systests/kerberos/src/test/resources/serviceKeystore.properties +++ b/systests/kerberos/src/test/resources/serviceKeystore.properties @@ -1,20 +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 +# 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. # -# 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. # org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks diff --git a/systests/kerberos/src/test/resources/stsKeystore.properties b/systests/kerberos/src/test/resources/stsKeystore.properties index a11eefa9d97..453c88b9d63 100644 --- a/systests/kerberos/src/test/resources/stsKeystore.properties +++ b/systests/kerberos/src/test/resources/stsKeystore.properties @@ -1,20 +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 +# 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. # -# 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. # org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks diff --git a/systests/ldap/src/test/resources/ldap.properties b/systests/ldap/src/test/resources/ldap.properties index 36b29a4e838..a344844a535 100644 --- a/systests/ldap/src/test/resources/ldap.properties +++ b/systests/ldap/src/test/resources/ldap.properties @@ -1,20 +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 +# 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. # -# 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. # claimUser=alice diff --git a/systests/ldap/src/test/resources/logging.properties b/systests/ldap/src/test/resources/logging.properties index b2e5a799c83..4889366a3ab 100644 --- a/systests/ldap/src/test/resources/logging.properties +++ b/systests/ldap/src/test/resources/logging.properties @@ -19,7 +19,7 @@ # # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -27,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/systests/rs-security/src/test/resources/logging.properties b/systests/rs-security/src/test/resources/logging.properties index b2e5a799c83..4889366a3ab 100644 --- a/systests/rs-security/src/test/resources/logging.properties +++ b/systests/rs-security/src/test/resources/logging.properties @@ -19,7 +19,7 @@ # # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -27,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice-jwejws.rs.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice-jwejws.rs.properties index 58bbf085f27..036a5354aae 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice-jwejws.rs.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice-jwejws.rs.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jks rs.security.keystore.password=password rs.security.keystore.alias=alice diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.jwk.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.jwk.properties index d8a002f8131..9090e2bfcdf 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.jwk.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.jwk.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jwk rs.security.keystore.alias=2011-04-29 rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPrivateSet.txt diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.properties index fb18b116e15..8c1e461cd45 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.properties index 800578257b8..4f89c330275 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jks rs.security.keystore.password=password rs.security.keystore.alias=alice diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.storeonly.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.storeonly.properties index 6aee063dfd9..4ccaa3405dd 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.storeonly.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.storeonly.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jks rs.security.keystore.password=password rs.security.keystore.file=keys/alice.jks diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bethal.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bethal.properties index 7356fc56944..bd3b781d63a 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bethal.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bethal.properties @@ -1,20 +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 +# 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. # -# 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. # org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob-jwejws.rs.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob-jwejws.rs.properties index c1ffc533109..ba44614bab1 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob-jwejws.rs.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob-jwejws.rs.properties @@ -1,4 +1,5 @@ # +# # 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 @@ -16,6 +17,7 @@ # specific language governing permissions and limitations # under the License. # +# rs.security.keystore.type=jks rs.security.keystore.password=password rs.security.keystore.alias=bob diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.jwk.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.jwk.properties index 808772a52d7..3f301024abb 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.jwk.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.jwk.properties @@ -1,4 +1,5 @@ # +# # 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 @@ -16,6 +17,7 @@ # specific language governing permissions and limitations # under the License. # +# rs.security.keystore.type=jwk rs.security.keystore.alias=2011-04-29 rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.properties index 8dbdb7e9fbd..4547d47ee1a 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.properties @@ -1,4 +1,5 @@ # +# # 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 @@ -16,6 +17,7 @@ # specific language governing permissions and limitations # under the License. # +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.properties index dea95cd1ba4..a80b6c0b3c9 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.properties @@ -1,4 +1,5 @@ # +# # 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 @@ -16,6 +17,7 @@ # specific language governing permissions and limitations # under the License. # +# rs.security.keystore.type=jks rs.security.keystore.password=password rs.security.keystore.alias=bob diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.storeonly.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.storeonly.properties index 88f46257b39..da5ae509a13 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.storeonly.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.storeonly.properties @@ -1,4 +1,5 @@ # +# # 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 @@ -16,6 +17,7 @@ # specific language governing permissions and limitations # under the License. # +# rs.security.keystore.type=jks rs.security.keystore.password=password rs.security.keystore.file=keys/bob.jks diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/alice.httpsig.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/alice.httpsig.properties index eba8397b76a..2cdfa5339cd 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/alice.httpsig.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/alice.httpsig.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jks rs.security.keystore.password=password rs.security.keystore.alias=alice diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/bob.httpsig.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/bob.httpsig.properties index 435fd30af0a..7b21f95811b 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/bob.httpsig.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/bob.httpsig.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jks rs.security.keystore.password=password rs.security.keystore.alias=bob diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwe.direct.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwe.direct.properties index 6fa30bea6c4..949dcbff99c 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwe.direct.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwe.direct.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jwk rs.security.keystore.alias.jwe=AesGcmKey rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPrivateSet.txt diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson1.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson1.properties index 7fd433d96ab..614ddb4d693 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson1.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson1.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jwk rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPrivateSet.txt rs.security.encryption.include.key.id=true diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson2.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson2.properties index 3cc027a097e..310b4050cad 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson2.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson2.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jwk rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPrivateSet.txt rs.security.encryption.include.key.id=true diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.private.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.private.properties index b5b7dd2a970..703d89074a5 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.private.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.private.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jwk rs.security.keystore.alias=ECKey rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPrivateSet.txt diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.public.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.public.properties index 32f0a5accac..f164c198d5a 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.public.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.public.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jwk rs.security.keystore.alias=ECKey rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpit.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpit.properties index 7cf81d6a3b3..955fd5eb9c0 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpit.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpit.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks org.apache.wss4j.crypto.merlin.keystore.password=password diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpittrust.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpittrust.properties index 0056c7da889..11168864814 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpittrust.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpittrust.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks org.apache.wss4j.crypto.merlin.keystore.password=password diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlinejwk.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlinejwk.properties index 06d481d9420..e2dacd6bf67 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlinejwk.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlinejwk.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jwk rs.security.keystore.jwkkey=eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwicDJzIjoiaXVHOExqSkNrN3FtcnVGRUdyMHVuUSIsInAyYyI6NDA5Nn0.TuUE2NnCsl3ZWJY7sl0uqEWxFV2ZHw5tw-0ri8Qyst5Gn6YzuPGKJw.aaesJ4e-rLFYIdxA6gMdMw.lnncuqaZ2o3lPRX9bfFh4huW5llDWXC0Gg5987pNSte0SyY7gJcg4EFPHrPdO1YSAZJmPC3hEEmcwqh42w8g2rWiyUqcJ8Z4PqEj7HkNUdE.NccysFtj5AoMMSEk2Sa6oQ rs.security.keystore.alias.jwe=AesWrapKey diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlineset.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlineset.properties index dcbd14b6c5c..b75b656f93f 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlineset.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlineset.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jwk rs.security.keystore.jwkset=eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwicDJzIjoiTWJlR0VTekk2MURJaHFncnc4ZG9TZyIsInAyYyI6NDA5Nn0.MVJlK1vV0lWLt2ySU2WB_nphsWZqf6jhVfb2mGuf05mXnxqistGBng.x6itAzrmrAn9KetfUl1ZPg.2if8qkLqADwsF0li0BzhPX8Q9LLYrUE_uHfv-qo23BwOryGm_cOSj01_TVZnO58N30wYBMJZ_mgYIQTYGL_6VUJJv8_qzP_wmBUkV99VPWOrEYLf75VWvJSMwyFjGljzpYoWONvrp6QwfrKjdum8_xEOs1dgurq8Spct-y1Ueqk9YCO_6fvklAzLPxgyyPXw5HwSIw1f4wtDN9XVHfmphvuNLNXrzxI-b1Xi4t1FIZBgX6LephgwL3LpJeP0MrKQlPpe4RI3fXfoe6yo432gH72kGCui6WgoIAZUrX2ShaS_ephxIrB3s24-QcG4pcfRcaHuIc1VhnsFSgC1IvNh1QnDnlxQ7PCVhBifXaf_7Vy9LZQYhRJ8Wj_NClPJT8NNYQOZTcXEjzLYRMxCUI8C-KZBUaZd14oZhWgTVi9xre6EyUq5lQbMl55x_f_5FXzO-dJB9EG3MtRLm1CSmPaH4slUKhk45fKTzowqYgD0ueVcqvT8JtnlxRSj2NPC0vPy4r_3H3HzKvvtICQeaR6ZP5g_UMyvLju08tZMYSqeFzYxDKuExzC8l00tc8GlFM_K15A-J7TGQXGGDZtcn8raNOMgCzq4ijr5z6hyniNzu1j8sjKZH9FX3okfINRy6kW6W168r4GSvRAFf01sCNBvcSi3gsC0djTZdeyzbcEq_oqYHdBS3Ur4bXFw_5fLVKi4oaYG4AdWgAYiPp7uATO1k3VPoxIjJyRaUt4ZG-RX3eMULUF31OAV2owfthhyFzdOhg2RBPHhpiH5lbldTHRuP3PtQKtM6J0wbOoKwHdNSQUuRFJ3Ypqol2kxFl7e6NCTlvJrPX93b4JLYMpGeK43IXqnGzdUKCUEwsqz5m_x-eawlp34VHugxrAyW23hWXivbM_2p0nBYURd-DhdEErpzv6abGo89HQ_cOocI9JNIrfJejdMvVF1SxWPfwV9xvGqYcOvECUAJ_DRs3BxHEE83gLVEvs16JvLb-UVbNul7M-2R6McfH1tLc3GXOxtIIimpz0pu0PIEf_ptwSpsXPuhUo-GzJSqN_XOqS1FAn7ELOAuxTzw4P8fQpMB3IChwEJQDo4fApstbg9hsQrW8oOO1puFFYscuNYKgFGu_fVroZtgxPveoEYsB8JvPXgAGeiblaCYcUZiuOfj14B6GAsoqzCETxmNDe5ouHWjJ10QxdPWRjQUmlS0Pe_sjXWfYuian-WodiNDpVtDhBdWI7klifiJpRUL2xyOvMODJRSLVQck5ifHXAjb05Us6JTdDJU4MjNhPsNnnuy92I0JWW6MIV-DFfkSgt8J1kxaltyhyPdNBDSgTTSEZQjRmvbt93opbejkRT8yTL96Q59Cw32SK3cKwiaDJsVctcgpsHcHK7ImcoqvzcPFwwb3v32o14oqC4KS0WZw7wW-FlYhUjkh-orlka90_rw1687nKx0D5EV8wtMpQ69n8vTSme3hjoDIBxIxUrI0k3sv6UvjfH7qQLey0eIckPtRGDzR0ydFBVfKcj2BJQPCeTj08aOzU1f26dovhO9XKbOAYvtkOYO5Q2Sp4TvcC8fezQGYqRNX-k.BIKOj0XbCIfOv_qePGSEcg rs.security.keystore.alias.jwe=AesWrapKey diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.properties index efa2db24e0a..e8001561e8e 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jwk rs.security.keystore.alias.jwe=AesWrapKey rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/encryptedJwkPrivateSet.txt diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.bad.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.bad.properties index 0569c450fa9..e44ff09f6fb 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.bad.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.bad.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jwk rs.security.keystore.alias.jwe=AesWrapKey rs.security.keystore.alias.jws=HMACKey diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac.properties index 6a3e428a79f..c2f733d6bf7 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jwk rs.security.keystore.alias.jws=HMAC512Key rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPrivateSet.txt diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.properties index 7787faf497c..d8d7b15ac23 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# rs.security.keystore.type=jwk rs.security.keystore.alias.jwe=AesWrapKey rs.security.keystore.alias.jws=HMACKey diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/smallkey.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/smallkey.properties index f34925ea151..610aa176d98 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/smallkey.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/smallkey.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=security diff --git a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http/auth/jetty-realm.properties b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http/auth/jetty-realm.properties index 0d950fbd8ff..f2e09accb6e 100644 --- a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http/auth/jetty-realm.properties +++ b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http/auth/jetty-realm.properties @@ -1,2 +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. +# +# foo: bar,ROLE_USER diff --git a/systests/transport-hc5/src/test/resources/logging.properties b/systests/transport-hc5/src/test/resources/logging.properties index c89316aba91..cb7eb864919 100644 --- a/systests/transport-hc5/src/test/resources/logging.properties +++ b/systests/transport-hc5/src/test/resources/logging.properties @@ -19,7 +19,7 @@ # # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -27,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/systests/transport-jms/src/test/resources/alice.properties b/systests/transport-jms/src/test/resources/alice.properties index f2dbb4b60bd..b51b75bc6b7 100644 --- a/systests/transport-jms/src/test/resources/alice.properties +++ b/systests/transport-jms/src/test/resources/alice.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks org.apache.wss4j.crypto.merlin.keystore.password=password diff --git a/systests/transport-jms/src/test/resources/bob.properties b/systests/transport-jms/src/test/resources/bob.properties index 48e3be76cde..bb34a4e10cb 100644 --- a/systests/transport-jms/src/test/resources/bob.properties +++ b/systests/transport-jms/src/test/resources/bob.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks org.apache.wss4j.crypto.merlin.keystore.password=password diff --git a/systests/transport-jms/src/test/resources/logging.properties b/systests/transport-jms/src/test/resources/logging.properties index bab36b896a6..b768459e329 100644 --- a/systests/transport-jms/src/test/resources/logging.properties +++ b/systests/transport-jms/src/test/resources/logging.properties @@ -19,7 +19,7 @@ # # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -27,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/jetty-realm.properties b/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/jetty-realm.properties index 0d950fbd8ff..778ae47ec09 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/jetty-realm.properties +++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/jetty-realm.properties @@ -1,2 +1,23 @@ +# +# +# 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. +# +# + foo: bar,ROLE_USER diff --git a/systests/transports/src/test/resources/logging.properties b/systests/transports/src/test/resources/logging.properties index b2e5a799c83..4889366a3ab 100644 --- a/systests/transports/src/test/resources/logging.properties +++ b/systests/transports/src/test/resources/logging.properties @@ -19,7 +19,7 @@ # # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -27,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jetty-realm.properties b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jetty-realm.properties index 974aae2597d..b008eb3757d 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jetty-realm.properties +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jetty-realm.properties @@ -1,19 +1,23 @@ -## --------------------------------------------------------------------------- -## 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. -## --------------------------------------------------------------------------- +# +# +# 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. +# +# # Defines users that can access the web (console, demo, etc.) # username: password [,rolename ...] diff --git a/systests/uncategorized/src/test/resources/logging.properties b/systests/uncategorized/src/test/resources/logging.properties index 2c55af86a11..29daaab4856 100644 --- a/systests/uncategorized/src/test/resources/logging.properties +++ b/systests/uncategorized/src/test/resources/logging.properties @@ -19,7 +19,7 @@ # # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -27,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/systests/ws-rm/src/test/resources/alice.properties b/systests/ws-rm/src/test/resources/alice.properties index fb18b116e15..8c1e461cd45 100644 --- a/systests/ws-rm/src/test/resources/alice.properties +++ b/systests/ws-rm/src/test/resources/alice.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/systests/ws-rm/src/test/resources/bob.properties b/systests/ws-rm/src/test/resources/bob.properties index 61bb2ecae51..4547d47ee1a 100644 --- a/systests/ws-rm/src/test/resources/bob.properties +++ b/systests/ws-rm/src/test/resources/bob.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/systests/ws-security-examples/src/test/resources/alice.properties b/systests/ws-security-examples/src/test/resources/alice.properties index fb18b116e15..8c1e461cd45 100644 --- a/systests/ws-security-examples/src/test/resources/alice.properties +++ b/systests/ws-security-examples/src/test/resources/alice.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/systests/ws-security-examples/src/test/resources/bob.properties b/systests/ws-security-examples/src/test/resources/bob.properties index 5b9fb6e3ae9..5196627caf3 100644 --- a/systests/ws-security-examples/src/test/resources/bob.properties +++ b/systests/ws-security-examples/src/test/resources/bob.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/systests/ws-security-examples/src/test/resources/cxfca.properties b/systests/ws-security-examples/src/test/resources/cxfca.properties index f7d9e80f5cc..25782e60eb4 100644 --- a/systests/ws-security-examples/src/test/resources/cxfca.properties +++ b/systests/ws-security-examples/src/test/resources/cxfca.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/systests/ws-security-examples/src/test/resources/logging.properties b/systests/ws-security-examples/src/test/resources/logging.properties index 0cc4821c746..451dc3191f8 100644 --- a/systests/ws-security-examples/src/test/resources/logging.properties +++ b/systests/ws-security-examples/src/test/resources/logging.properties @@ -19,7 +19,7 @@ # # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -27,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/systests/ws-security-examples/src/test/resources/sts.properties b/systests/ws-security-examples/src/test/resources/sts.properties index d2420df1926..c07f73f8bb0 100644 --- a/systests/ws-security-examples/src/test/resources/sts.properties +++ b/systests/ws-security-examples/src/test/resources/sts.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/systests/ws-security/src/test/resources/alice-customAlgSuite.properties b/systests/ws-security/src/test/resources/alice-customAlgSuite.properties index 2f707bc035a..787bf5da5ae 100644 --- a/systests/ws-security/src/test/resources/alice-customAlgSuite.properties +++ b/systests/ws-security/src/test/resources/alice-customAlgSuite.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=pkcs12 org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/systests/ws-security/src/test/resources/alice-enc.properties b/systests/ws-security/src/test/resources/alice-enc.properties index ac71f2b53b0..bd502e275b3 100644 --- a/systests/ws-security/src/test/resources/alice-enc.properties +++ b/systests/ws-security/src/test/resources/alice-enc.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks org.apache.wss4j.crypto.merlin.keystore.password=ENC(mC9pTqoZ9n1dW2wETrJEpHHDmgXn1e7T) diff --git a/systests/ws-security/src/test/resources/alice.properties b/systests/ws-security/src/test/resources/alice.properties index f2dbb4b60bd..b51b75bc6b7 100644 --- a/systests/ws-security/src/test/resources/alice.properties +++ b/systests/ws-security/src/test/resources/alice.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks org.apache.wss4j.crypto.merlin.keystore.password=password diff --git a/systests/ws-security/src/test/resources/bethal.properties b/systests/ws-security/src/test/resources/bethal.properties index 7356fc56944..bd3b781d63a 100644 --- a/systests/ws-security/src/test/resources/bethal.properties +++ b/systests/ws-security/src/test/resources/bethal.properties @@ -1,20 +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 +# 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. # -# 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. # org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks diff --git a/systests/ws-security/src/test/resources/bob-customAlgSuite.properties b/systests/ws-security/src/test/resources/bob-customAlgSuite.properties index 25827edee2b..6280591ca23 100644 --- a/systests/ws-security/src/test/resources/bob-customAlgSuite.properties +++ b/systests/ws-security/src/test/resources/bob-customAlgSuite.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=pkcs12 org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/systests/ws-security/src/test/resources/bob-enc.properties b/systests/ws-security/src/test/resources/bob-enc.properties index 1752ac96bb0..89a0a321031 100644 --- a/systests/ws-security/src/test/resources/bob-enc.properties +++ b/systests/ws-security/src/test/resources/bob-enc.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks org.apache.wss4j.crypto.merlin.keystore.password=ENC(eAsmYazOvgvygJmuMzWG5uvRBmkvXf5G) diff --git a/systests/ws-security/src/test/resources/bob.properties b/systests/ws-security/src/test/resources/bob.properties index 48e3be76cde..bb34a4e10cb 100644 --- a/systests/ws-security/src/test/resources/bob.properties +++ b/systests/ws-security/src/test/resources/bob.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks org.apache.wss4j.crypto.merlin.keystore.password=password diff --git a/systests/ws-security/src/test/resources/cxfca.properties b/systests/ws-security/src/test/resources/cxfca.properties index a5ab1c98723..5592a1b749e 100644 --- a/systests/ws-security/src/test/resources/cxfca.properties +++ b/systests/ws-security/src/test/resources/cxfca.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks org.apache.wss4j.crypto.merlin.keystore.password=password diff --git a/systests/ws-security/src/test/resources/logging.properties b/systests/ws-security/src/test/resources/logging.properties index b2e5a799c83..4889366a3ab 100644 --- a/systests/ws-security/src/test/resources/logging.properties +++ b/systests/ws-security/src/test/resources/logging.properties @@ -19,7 +19,7 @@ # # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -27,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler diff --git a/systests/ws-security/src/test/resources/morpit.properties b/systests/ws-security/src/test/resources/morpit.properties index 7cf81d6a3b3..955fd5eb9c0 100644 --- a/systests/ws-security/src/test/resources/morpit.properties +++ b/systests/ws-security/src/test/resources/morpit.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks org.apache.wss4j.crypto.merlin.keystore.password=password diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.properties b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.properties index 35923760063..0e3663b4dd0 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.properties +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks org.apache.wss4j.crypto.merlin.keystore.password=password diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties index dd76fe4c72d..06085bf4fa4 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties @@ -1,4 +1,5 @@ # +# # 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 @@ -16,6 +17,7 @@ # specific language governing permissions and limitations # under the License. # +# org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks org.apache.wss4j.crypto.merlin.keystore.password=security diff --git a/systests/ws-security/src/test/resources/restricted/alice.properties b/systests/ws-security/src/test/resources/restricted/alice.properties index 66784fe4b94..0c27a461f48 100644 --- a/systests/ws-security/src/test/resources/restricted/alice.properties +++ b/systests/ws-security/src/test/resources/restricted/alice.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/systests/ws-security/src/test/resources/restricted/bob.properties b/systests/ws-security/src/test/resources/restricted/bob.properties index 095719527f6..df746a84eae 100644 --- a/systests/ws-security/src/test/resources/restricted/bob.properties +++ b/systests/ws-security/src/test/resources/restricted/bob.properties @@ -1,3 +1,5 @@ +# +# # 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 @@ -14,6 +16,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password diff --git a/systests/ws-security/src/test/resources/truststore.properties b/systests/ws-security/src/test/resources/truststore.properties index 170389a6b1a..7210f9350db 100644 --- a/systests/ws-security/src/test/resources/truststore.properties +++ b/systests/ws-security/src/test/resources/truststore.properties @@ -1,20 +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 +# 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. # -# 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. # org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin org.apache.wss4j.crypto.merlin.keystore.type=jks diff --git a/systests/ws-specs/src/test/resources/logging.properties b/systests/ws-specs/src/test/resources/logging.properties index 2c55af86a11..29daaab4856 100644 --- a/systests/ws-specs/src/test/resources/logging.properties +++ b/systests/ws-specs/src/test/resources/logging.properties @@ -19,7 +19,7 @@ # # ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -27,7 +27,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler