You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by tk...@apache.org on 2015/12/02 04:51:18 UTC
[12/24] nifi git commit: NIFI-1054: Fixed DOS line endings in xml,
java and js source files
http://git-wip-us.apache.org/repos/asf/nifi/blob/3a7ddc6a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap-notification-services.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap-notification-services.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap-notification-services.xml
index 56c70ad..260eaf7 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap-notification-services.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap-notification-services.xml
@@ -1,46 +1,46 @@
-<?xml version="1.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.
--->
-<services>
- <!-- This file is used to define how interested parties are notified when events in NiFi's lifecycle occur. -->
- <!-- The format of this file is:
- <services>
- <service>
- <id>service-identifier</id>
- <class>org.apache.nifi.notifications.DesiredNotificationService</class>
- <property name="property name">property value</property>
- <property name="another property">another property value</property>
- </service>
- </services>
-
- This file can contain 0 to many different service definitions.
- The id can then be referenced from the bootstrap.conf file in order to configure the notification service
- to be used when particular lifecycle events occur.
- -->
-
-<!--
- <service>
- <id>email-notification</id>
- <class>org.apache.nifi.bootstrap.notification.email.EmailNotificationService</class>
- <property name="SMTP Hostname"></property>
- <property name="SMTP Port"></property>
- <property name="SMTP Username"></property>
- <property name="SMTP Password"></property>
- <property name="SMTP TLS"></property>
- <property name="From"></property>
- <property name="To"></property>
- </service>
--->
+<?xml version="1.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.
+-->
+<services>
+ <!-- This file is used to define how interested parties are notified when events in NiFi's lifecycle occur. -->
+ <!-- The format of this file is:
+ <services>
+ <service>
+ <id>service-identifier</id>
+ <class>org.apache.nifi.notifications.DesiredNotificationService</class>
+ <property name="property name">property value</property>
+ <property name="another property">another property value</property>
+ </service>
+ </services>
+
+ This file can contain 0 to many different service definitions.
+ The id can then be referenced from the bootstrap.conf file in order to configure the notification service
+ to be used when particular lifecycle events occur.
+ -->
+
+<!--
+ <service>
+ <id>email-notification</id>
+ <class>org.apache.nifi.bootstrap.notification.email.EmailNotificationService</class>
+ <property name="SMTP Hostname"></property>
+ <property name="SMTP Port"></property>
+ <property name="SMTP Username"></property>
+ <property name="SMTP Password"></property>
+ <property name="SMTP TLS"></property>
+ <property name="From"></property>
+ <property name="To"></property>
+ </service>
+-->
</services>
\ No newline at end of file