Normalize all the line endings
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/be71be89 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/be71be89 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/be71be89 Branch: refs/heads/tomee-1.7.x Commit: be71be896a92a855800fccd25fcc887e2cd23415 Parents: e9dbbab Author: [email protected] <[email protected]> Authored: Tue Nov 24 19:09:39 2015 +0100 Committer: [email protected] <[email protected]> Committed: Tue Nov 24 19:09:39 2015 +0100 ---------------------------------------------------------------------- .../keys/generateKeyPair.bat | 62 +++--- .../keys/generateServerKey.bat | 48 ++--- .../CalculatorImplSign-server.properties | 14 +- ...eTokenPlainPasswordEncrypt-server.properties | 14 +- .../src/main/resources/META-INF/ejb-jar.xml | 198 +++++++++---------- .../src/main/resources/META-INF/webservices.xml | 132 ++++++------- .../CalculatorImplSign-client.properties | 14 +- ...eTokenPlainPasswordEncrypt-client.properties | 14 +- .../maven/plugin/AbstractSynchronizable.java | 142 ++++++------- 9 files changed, 319 insertions(+), 319 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/be71be89/examples/webservice-ws-security/keys/generateKeyPair.bat ---------------------------------------------------------------------- diff --git a/examples/webservice-ws-security/keys/generateKeyPair.bat b/examples/webservice-ws-security/keys/generateKeyPair.bat index ac58c92..48670b2 100644 --- a/examples/webservice-ws-security/keys/generateKeyPair.bat +++ b/examples/webservice-ws-security/keys/generateKeyPair.bat @@ -1,31 +1,31 @@ -@echo off -REM================================================ -REM Licensed to the Apache Software Foundation (ASF) under one or more -REM contributor license agreements. See the NOTICE file distributed with -REM this work for additional information regarding copyright ownership. -REM The ASF licenses this file to You under the Apache License, Version 2.0 -REM (the "License"); you may not use this file except in compliance with -REM the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. -REM _______________________________________________ -REM $Rev: 636963 $ $Date: 2008-03-13 19:40:08 -0700 (Thu, 13 Mar 2008) $ -REM================================================ - -rem @echo off -echo alias %1 -echo keypass %2 -echo keystoreName %3 -echo KeyStorePass %4 -echo keyName %5 - -echo keyName %5 -keytool -genkey -alias %1 -keypass %2 -keystore "%3" -storepass %4 -dname "cn=%1" -keyalg RSA -keytool -selfcert -alias %1 -keystore "%3" -storepass %4 -keypass %2 -keytool -export -alias %1 -file %5 -keystore "%3" -storepass %4 +@echo off +REM================================================ +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. +REM _______________________________________________ +REM $Rev: 636963 $ $Date: 2008-03-13 19:40:08 -0700 (Thu, 13 Mar 2008) $ +REM================================================ + +rem @echo off +echo alias %1 +echo keypass %2 +echo keystoreName %3 +echo KeyStorePass %4 +echo keyName %5 + +echo keyName %5 +keytool -genkey -alias %1 -keypass %2 -keystore "%3" -storepass %4 -dname "cn=%1" -keyalg RSA +keytool -selfcert -alias %1 -keystore "%3" -storepass %4 -keypass %2 +keytool -export -alias %1 -file %5 -keystore "%3" -storepass %4 http://git-wip-us.apache.org/repos/asf/tomee/blob/be71be89/examples/webservice-ws-security/keys/generateServerKey.bat ---------------------------------------------------------------------- diff --git a/examples/webservice-ws-security/keys/generateServerKey.bat b/examples/webservice-ws-security/keys/generateServerKey.bat index 8ce997b..8be96bb 100644 --- a/examples/webservice-ws-security/keys/generateServerKey.bat +++ b/examples/webservice-ws-security/keys/generateServerKey.bat @@ -1,24 +1,24 @@ -@echo off -REM================================================ -REM Licensed to the Apache Software Foundation (ASF) under one or more -REM contributor license agreements. See the NOTICE file distributed with -REM this work for additional information regarding copyright ownership. -REM The ASF licenses this file to You under the Apache License, Version 2.0 -REM (the "License"); you may not use this file except in compliance with -REM the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. -REM _______________________________________________ -REM $Rev: 636963 $ $Date: 2008-03-13 19:40:08 -0700 (Thu, 13 Mar 2008) $ -REM================================================ - -call generateKeyPair.bat serveralias serverPassword serverStore.jks keystorePass serverKey.rsa -call generateKeyPair.bat clientalias clientPassword clientStore.jks keystorePass clientKey.rsa -keytool -import -alias serveralias -file serverKey.rsa -keystore clientStore.jks -storepass keystorePass -noprompt -keytool -import -alias clientalias -file clientKey.rsa -keystore serverStore.jks -storepass keystorePass -noprompt +@echo off +REM================================================ +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. +REM _______________________________________________ +REM $Rev: 636963 $ $Date: 2008-03-13 19:40:08 -0700 (Thu, 13 Mar 2008) $ +REM================================================ + +call generateKeyPair.bat serveralias serverPassword serverStore.jks keystorePass serverKey.rsa +call generateKeyPair.bat clientalias clientPassword clientStore.jks keystorePass clientKey.rsa +keytool -import -alias serveralias -file serverKey.rsa -keystore clientStore.jks -storepass keystorePass -noprompt +keytool -import -alias clientalias -file clientKey.rsa -keystore serverStore.jks -storepass keystorePass -noprompt http://git-wip-us.apache.org/repos/asf/tomee/blob/be71be89/examples/webservice-ws-security/src/main/resources/META-INF/CalculatorImplSign-server.properties ---------------------------------------------------------------------- diff --git a/examples/webservice-ws-security/src/main/resources/META-INF/CalculatorImplSign-server.properties b/examples/webservice-ws-security/src/main/resources/META-INF/CalculatorImplSign-server.properties index 5b36649..4df5b2e 100644 --- a/examples/webservice-ws-security/src/main/resources/META-INF/CalculatorImplSign-server.properties +++ b/examples/webservice-ws-security/src/main/resources/META-INF/CalculatorImplSign-server.properties @@ -1,7 +1,7 @@ -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=keystorePass -org.apache.ws.security.crypto.merlin.keystore.alias=serveralias -org.apache.ws.security.crypto.merlin.file=META-INF/serverStore.jks -# OPENEJB-1061 OpenJDK doesn't come with cacerts -org.apache.ws.security.crypto.merlin.load.cacerts=false +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=keystorePass +org.apache.ws.security.crypto.merlin.keystore.alias=serveralias +org.apache.ws.security.crypto.merlin.file=META-INF/serverStore.jks +# OPENEJB-1061 OpenJDK doesn't come with cacerts +org.apache.ws.security.crypto.merlin.load.cacerts=false http://git-wip-us.apache.org/repos/asf/tomee/blob/be71be89/examples/webservice-ws-security/src/main/resources/META-INF/CalculatorImplUsernameTokenPlainPasswordEncrypt-server.properties ---------------------------------------------------------------------- diff --git a/examples/webservice-ws-security/src/main/resources/META-INF/CalculatorImplUsernameTokenPlainPasswordEncrypt-server.properties b/examples/webservice-ws-security/src/main/resources/META-INF/CalculatorImplUsernameTokenPlainPasswordEncrypt-server.properties index 5b36649..4df5b2e 100644 --- a/examples/webservice-ws-security/src/main/resources/META-INF/CalculatorImplUsernameTokenPlainPasswordEncrypt-server.properties +++ b/examples/webservice-ws-security/src/main/resources/META-INF/CalculatorImplUsernameTokenPlainPasswordEncrypt-server.properties @@ -1,7 +1,7 @@ -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=keystorePass -org.apache.ws.security.crypto.merlin.keystore.alias=serveralias -org.apache.ws.security.crypto.merlin.file=META-INF/serverStore.jks -# OPENEJB-1061 OpenJDK doesn't come with cacerts -org.apache.ws.security.crypto.merlin.load.cacerts=false +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=keystorePass +org.apache.ws.security.crypto.merlin.keystore.alias=serveralias +org.apache.ws.security.crypto.merlin.file=META-INF/serverStore.jks +# OPENEJB-1061 OpenJDK doesn't come with cacerts +org.apache.ws.security.crypto.merlin.load.cacerts=false http://git-wip-us.apache.org/repos/asf/tomee/blob/be71be89/examples/webservice-ws-security/src/main/resources/META-INF/ejb-jar.xml ---------------------------------------------------------------------- diff --git a/examples/webservice-ws-security/src/main/resources/META-INF/ejb-jar.xml b/examples/webservice-ws-security/src/main/resources/META-INF/ejb-jar.xml index 19cd263..ca04771 100644 --- a/examples/webservice-ws-security/src/main/resources/META-INF/ejb-jar.xml +++ b/examples/webservice-ws-security/src/main/resources/META-INF/ejb-jar.xml @@ -1,99 +1,99 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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. ---> -<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; - version="3.0" id="webservice-ws-security" metadata-complete="false"> - - <enterprise-beans> - - <session> - <ejb-name>CalculatorImplTimestamp1way</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplTimestamp2ways</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplUsernameTokenPlainPassword</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplUsernameTokenHashedPassword</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplUsernameTokenPlainPasswordEncrypt</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplSign</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplEncrypt2ways</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplSign2ways</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplEncryptAndSign2ways</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - </enterprise-beans> - -</ejb-jar> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. +--> +<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; + version="3.0" id="webservice-ws-security" metadata-complete="false"> + + <enterprise-beans> + + <session> + <ejb-name>CalculatorImplTimestamp1way</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplTimestamp2ways</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplUsernameTokenPlainPassword</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplUsernameTokenHashedPassword</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplUsernameTokenPlainPasswordEncrypt</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplSign</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplEncrypt2ways</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplSign2ways</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplEncryptAndSign2ways</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + </enterprise-beans> + +</ejb-jar> http://git-wip-us.apache.org/repos/asf/tomee/blob/be71be89/examples/webservice-ws-security/src/main/resources/META-INF/webservices.xml ---------------------------------------------------------------------- diff --git a/examples/webservice-ws-security/src/main/resources/META-INF/webservices.xml b/examples/webservice-ws-security/src/main/resources/META-INF/webservices.xml index db709b6..64c9744 100644 --- a/examples/webservice-ws-security/src/main/resources/META-INF/webservices.xml +++ b/examples/webservice-ws-security/src/main/resources/META-INF/webservices.xml @@ -1,66 +1,66 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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. ---> -<webservices xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee -http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"; - version="1.1"> - - <webservice-description> - <webservice-description-name>CalculatorWsService</webservice-description-name> - <port-component> - <port-component-name>CalculatorImplTimestamp1way</port-component-name> - <wsdl-port>CalculatorImplTimestamp1way</wsdl-port> - <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> - <service-impl-bean> - <ejb-link>CalculatorImplTimestamp1way</ejb-link> - </service-impl-bean> - </port-component> - <port-component> - <port-component-name>CalculatorImplTimestamp2ways</port-component-name> - <wsdl-port>CalculatorImplTimestamp2ways</wsdl-port> - <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> - <service-impl-bean> - <ejb-link>CalculatorImplTimestamp2ways</ejb-link> - </service-impl-bean> - </port-component> - <port-component> - <port-component-name>CalculatorImplUsernameTokenPlainPassword</port-component-name> - <wsdl-port>CalculatorImplUsernameTokenPlainPassword</wsdl-port> - <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> - <service-impl-bean> - <ejb-link>CalculatorImplUsernameTokenPlainPassword</ejb-link> - </service-impl-bean> - </port-component> - <port-component> - <port-component-name>CalculatorImplUsernameTokenHashedPassword</port-component-name> - <wsdl-port>CalculatorImplUsernameTokenHashedPassword</wsdl-port> - <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> - <service-impl-bean> - <ejb-link>CalculatorImplUsernameTokenHashedPassword</ejb-link> - </service-impl-bean> - </port-component> - <port-component> - <port-component-name>CalculatorImplUsernameTokenPlainPasswordEncrypt</port-component-name> - <wsdl-port>CalculatorImplUsernameTokenPlainPasswordEncrypt</wsdl-port> - <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> - <service-impl-bean> - <ejb-link>CalculatorImplUsernameTokenPlainPasswordEncrypt</ejb-link> - </service-impl-bean> - </port-component> - </webservice-description> - -</webservices> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. +--> +<webservices xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee +http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"; + version="1.1"> + + <webservice-description> + <webservice-description-name>CalculatorWsService</webservice-description-name> + <port-component> + <port-component-name>CalculatorImplTimestamp1way</port-component-name> + <wsdl-port>CalculatorImplTimestamp1way</wsdl-port> + <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> + <service-impl-bean> + <ejb-link>CalculatorImplTimestamp1way</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>CalculatorImplTimestamp2ways</port-component-name> + <wsdl-port>CalculatorImplTimestamp2ways</wsdl-port> + <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> + <service-impl-bean> + <ejb-link>CalculatorImplTimestamp2ways</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>CalculatorImplUsernameTokenPlainPassword</port-component-name> + <wsdl-port>CalculatorImplUsernameTokenPlainPassword</wsdl-port> + <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> + <service-impl-bean> + <ejb-link>CalculatorImplUsernameTokenPlainPassword</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>CalculatorImplUsernameTokenHashedPassword</port-component-name> + <wsdl-port>CalculatorImplUsernameTokenHashedPassword</wsdl-port> + <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> + <service-impl-bean> + <ejb-link>CalculatorImplUsernameTokenHashedPassword</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>CalculatorImplUsernameTokenPlainPasswordEncrypt</port-component-name> + <wsdl-port>CalculatorImplUsernameTokenPlainPasswordEncrypt</wsdl-port> + <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> + <service-impl-bean> + <ejb-link>CalculatorImplUsernameTokenPlainPasswordEncrypt</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> http://git-wip-us.apache.org/repos/asf/tomee/blob/be71be89/examples/webservice-ws-security/src/test/resources/META-INF/CalculatorImplSign-client.properties ---------------------------------------------------------------------- diff --git a/examples/webservice-ws-security/src/test/resources/META-INF/CalculatorImplSign-client.properties b/examples/webservice-ws-security/src/test/resources/META-INF/CalculatorImplSign-client.properties index 350eaf9..8495746 100644 --- a/examples/webservice-ws-security/src/test/resources/META-INF/CalculatorImplSign-client.properties +++ b/examples/webservice-ws-security/src/test/resources/META-INF/CalculatorImplSign-client.properties @@ -1,7 +1,7 @@ -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=keystorePass -org.apache.ws.security.crypto.merlin.keystore.alias=clientalias -org.apache.ws.security.crypto.merlin.file=META-INF/clientStore.jks -# OPENEJB-1061 OpenJDK doesn't come with cacerts -org.apache.ws.security.crypto.merlin.load.cacerts=false +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=keystorePass +org.apache.ws.security.crypto.merlin.keystore.alias=clientalias +org.apache.ws.security.crypto.merlin.file=META-INF/clientStore.jks +# OPENEJB-1061 OpenJDK doesn't come with cacerts +org.apache.ws.security.crypto.merlin.load.cacerts=false http://git-wip-us.apache.org/repos/asf/tomee/blob/be71be89/examples/webservice-ws-security/src/test/resources/META-INF/CalculatorImplUsernameTokenPlainPasswordEncrypt-client.properties ---------------------------------------------------------------------- diff --git a/examples/webservice-ws-security/src/test/resources/META-INF/CalculatorImplUsernameTokenPlainPasswordEncrypt-client.properties b/examples/webservice-ws-security/src/test/resources/META-INF/CalculatorImplUsernameTokenPlainPasswordEncrypt-client.properties index 350eaf9..8495746 100644 --- a/examples/webservice-ws-security/src/test/resources/META-INF/CalculatorImplUsernameTokenPlainPasswordEncrypt-client.properties +++ b/examples/webservice-ws-security/src/test/resources/META-INF/CalculatorImplUsernameTokenPlainPasswordEncrypt-client.properties @@ -1,7 +1,7 @@ -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=keystorePass -org.apache.ws.security.crypto.merlin.keystore.alias=clientalias -org.apache.ws.security.crypto.merlin.file=META-INF/clientStore.jks -# OPENEJB-1061 OpenJDK doesn't come with cacerts -org.apache.ws.security.crypto.merlin.load.cacerts=false +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=keystorePass +org.apache.ws.security.crypto.merlin.keystore.alias=clientalias +org.apache.ws.security.crypto.merlin.file=META-INF/clientStore.jks +# OPENEJB-1061 OpenJDK doesn't come with cacerts +org.apache.ws.security.crypto.merlin.load.cacerts=false http://git-wip-us.apache.org/repos/asf/tomee/blob/be71be89/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractSynchronizable.java ---------------------------------------------------------------------- diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractSynchronizable.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractSynchronizable.java index 488e372..1244882 100644 --- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractSynchronizable.java +++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractSynchronizable.java @@ -1,71 +1,71 @@ -/** - * - * 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. - */ -package org.apache.openejb.maven.plugin; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public abstract class AbstractSynchronizable { - protected int updateInterval; - protected List<String> extensions; - protected List<String> updateOnlyExtensions; - protected String regex; - protected Map<File, File> updates; - - public abstract Map<File, File> updates(); - - public int getUpdateInterval() { - return updateInterval; - } - - public void setUpdateInterval(final int updateInterval) { - this.updateInterval = updateInterval; - } - - public List<String> getExtensions() { - if (extensions == null) { - extensions = new ArrayList<String>(); - } - return extensions; - } - - public void setExtensions(final List<String> extensions) { - this.extensions = extensions; - } - - public String getRegex() { - return regex; - } - - public void setRegex(final String regex) { - this.regex = regex; - } - - public List<String> getUpdateOnlyExtenions() { - if (updateOnlyExtensions == null) { - updateOnlyExtensions = new ArrayList<String>(); - } - return updateOnlyExtensions; - } - - public void setUpdateOnlyExtensions(final List<String> updateOnlyExtensions) { - this.updateOnlyExtensions = updateOnlyExtensions; - } -} +/** + * + * 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. + */ +package org.apache.openejb.maven.plugin; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public abstract class AbstractSynchronizable { + protected int updateInterval; + protected List<String> extensions; + protected List<String> updateOnlyExtensions; + protected String regex; + protected Map<File, File> updates; + + public abstract Map<File, File> updates(); + + public int getUpdateInterval() { + return updateInterval; + } + + public void setUpdateInterval(final int updateInterval) { + this.updateInterval = updateInterval; + } + + public List<String> getExtensions() { + if (extensions == null) { + extensions = new ArrayList<String>(); + } + return extensions; + } + + public void setExtensions(final List<String> extensions) { + this.extensions = extensions; + } + + public String getRegex() { + return regex; + } + + public void setRegex(final String regex) { + this.regex = regex; + } + + public List<String> getUpdateOnlyExtenions() { + if (updateOnlyExtensions == null) { + updateOnlyExtensions = new ArrayList<String>(); + } + return updateOnlyExtensions; + } + + public void setUpdateOnlyExtensions(final List<String> updateOnlyExtensions) { + this.updateOnlyExtensions = updateOnlyExtensions; + } +}
