[java-idp-jetty-base] 01/03: GEN-269 - Replace code header
Rod Widdowson
rdw at steadingsoftware.com
Mon Aug 7 13:25:43 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch 10-windows
in repository java-idp-jetty-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=41af7e711d4c1e406469820cd8c4843aa9fbc675
commit 41af7e711d4c1e406469820cd8c4843aa9fbc675
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Aug 1 16:19:10 2023 +0100
GEN-269 - Replace code header
https://shibboleth.atlassian.net/browse/GEN-269
---
src/main/wix/Jetty-Delete.wxs | 13 +++++--------
src/main/wix/Jetty-Gui.wxs | 26 +++++++++++---------------
src/main/wix/Jetty-InstallDlg.wxs | 12 ++++--------
src/main/wix/Jetty-Main.wxs | 27 ++++++++++++---------------
src/main/wix/Jetty-Procrun.wxs | 16 +++++++---------
src/main/wix/Jetty-User.wxs | 14 ++++++--------
6 files changed, 45 insertions(+), 63 deletions(-)
diff --git a/src/main/wix/Jetty-Delete.wxs b/src/main/wix/Jetty-Delete.wxs
index 51eedae..999d704 100644
--- a/src/main/wix/Jetty-Delete.wxs
+++ b/src/main/wix/Jetty-Delete.wxs
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- 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 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
diff --git a/src/main/wix/Jetty-Gui.wxs b/src/main/wix/Jetty-Gui.wxs
index 8b21bdd..6b879cb 100644
--- a/src/main/wix/Jetty-Gui.wxs
+++ b/src/main/wix/Jetty-Gui.wxs
@@ -1,20 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
-Development, Inc. (UCAID) under one or more contributor license
-agreements. See the NOTICE file distributed with this work for
-additional information regarding copyright ownership. The UCAID
-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 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. -->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" >
<!-- This file controls the dispaying of the GUI dialogs (both WiX and custom) -->
diff --git a/src/main/wix/Jetty-InstallDlg.wxs b/src/main/wix/Jetty-InstallDlg.wxs
index 2563a7f..afda9fa 100644
--- a/src/main/wix/Jetty-InstallDlg.wxs
+++ b/src/main/wix/Jetty-InstallDlg.wxs
@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- 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 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
diff --git a/src/main/wix/Jetty-Main.wxs b/src/main/wix/Jetty-Main.wxs
index ca8962b..e0c15d4 100644
--- a/src/main/wix/Jetty-Main.wxs
+++ b/src/main/wix/Jetty-Main.wxs
@@ -1,19 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- 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 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. -->
<?define UpgradeUUID="FB2B7404-37B2-4CE5-8E2E-EEB53F9FF472"?>
diff --git a/src/main/wix/Jetty-Procrun.wxs b/src/main/wix/Jetty-Procrun.wxs
index 4653a27..5c43b9c 100644
--- a/src/main/wix/Jetty-Procrun.wxs
+++ b/src/main/wix/Jetty-Procrun.wxs
@@ -1,19 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- 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 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. -->
+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:fw="http://schemas.microsoft.com/wix/FirewallExtension"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<?define ServiceStart="auto"?>
diff --git a/src/main/wix/Jetty-User.wxs b/src/main/wix/Jetty-User.wxs
index b36704a..1851347 100644
--- a/src/main/wix/Jetty-User.wxs
+++ b/src/main/wix/Jetty-User.wxs
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- 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 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
@@ -14,6 +11,7 @@
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. -->
+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:fw="http://schemas.microsoft.com/wix/FirewallExtension"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
@@ -106,7 +104,7 @@
/grant:r SYSTEM:F *add* Full access for SYSTEM (replacing any existing)
[ACE_USER]:(GR,RD,X) *add* GENERIC_READ,READ_DATA,TRAVERSE access
(Remember, when user not supplied ACE_USER is Administrators
-icacls "C:\Program Files (x86)\Shibboleth\IdP\conf" /setowner administrators /t /inheritance:r /grant SYSTEM:F Administrators:F Administrators:(GW,RD,X)
+icacls "C:\Program Files (x86)\Shibboleth\IdP\conf" /setowner administrators /t /inheritance:r /grant SYSTEM:F Administrators:F Administrators:(GR,RD,X)
-->
<CustomAction Id="SetIcaclsVerb" Property="IcaclsVerb" Value=""c:\Windows\System32\icacls.exe""/>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list