diff options
-rw-r--r-- | OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | 5 | ||||
-rw-r--r-- | OpenSim/Framework/IRegionCreator.cs | 29 | ||||
-rw-r--r-- | OpenSim/Framework/IRegistryCore.cs | 29 | ||||
-rw-r--r-- | OpenSim/Framework/RegistryCore.cs | 31 | ||||
-rw-r--r-- | OpenSim/Grid/Framework/IGridServiceModule.cs | 29 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs | 32 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/PhysicsBot.cs | 2 | ||||
-rw-r--r-- | ThirdPartyLicenses/Protobuf-net.txt | 436 |
9 files changed, 361 insertions, 234 deletions
diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs index 1eceef6..2f26ae3 100644 --- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs +++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | |||
@@ -260,7 +260,7 @@ namespace OpenSim.Client.MXP.PacketHandler | |||
260 | } | 260 | } |
261 | 261 | ||
262 | string[] nameParts=participantName.Split(' '); | 262 | string[] nameParts=participantName.Split(' '); |
263 | if(nameParts.Length!=2) | 263 | if (nameParts.Length != 2) |
264 | { | 264 | { |
265 | m_log.Info("Login failed as user name is not formed of first and last name separated by space: " + participantName); | 265 | m_log.Info("Login failed as user name is not formed of first and last name separated by space: " + participantName); |
266 | return false; | 266 | return false; |
@@ -370,7 +370,6 @@ namespace OpenSim.Client.MXP.PacketHandler | |||
370 | 370 | ||
371 | foreach (MXPClientView clientView in Clients) | 371 | foreach (MXPClientView clientView in Clients) |
372 | { | 372 | { |
373 | |||
374 | int messagesProcessedCount = 0; | 373 | int messagesProcessedCount = 0; |
375 | Session session = clientView.Session; | 374 | Session session = clientView.Session; |
376 | 375 | ||
@@ -380,7 +379,6 @@ namespace OpenSim.Client.MXP.PacketHandler | |||
380 | 379 | ||
381 | if (message.GetType() == typeof(LeaveRequestMessage)) | 380 | if (message.GetType() == typeof(LeaveRequestMessage)) |
382 | { | 381 | { |
383 | |||
384 | LeaveResponseMessage leaveResponseMessage = (LeaveResponseMessage)MessageFactory.Current.ReserveMessage( | 382 | LeaveResponseMessage leaveResponseMessage = (LeaveResponseMessage)MessageFactory.Current.ReserveMessage( |
385 | typeof(LeaveResponseMessage)); | 383 | typeof(LeaveResponseMessage)); |
386 | 384 | ||
@@ -400,7 +398,6 @@ namespace OpenSim.Client.MXP.PacketHandler | |||
400 | } | 398 | } |
401 | if (message.GetType() == typeof(LeaveResponseMessage)) | 399 | if (message.GetType() == typeof(LeaveResponseMessage)) |
402 | { | 400 | { |
403 | |||
404 | LeaveResponseMessage leaveResponseMessage = (LeaveResponseMessage)message; | 401 | LeaveResponseMessage leaveResponseMessage = (LeaveResponseMessage)message; |
405 | 402 | ||
406 | m_log.Info("[MXP ClientStack] Session leave response: " + session.SessionId + " (" + (session.IsIncoming ? "from" : "to") + " " + session.RemoteEndPoint.Address + ":" + session.RemoteEndPoint.Port + ")"); | 403 | m_log.Info("[MXP ClientStack] Session leave response: " + session.SessionId + " (" + (session.IsIncoming ? "from" : "to") + " " + session.RemoteEndPoint.Address + ":" + session.RemoteEndPoint.Port + ")"); |
diff --git a/OpenSim/Framework/IRegionCreator.cs b/OpenSim/Framework/IRegionCreator.cs index 0da5c0f..350120d 100644 --- a/OpenSim/Framework/IRegionCreator.cs +++ b/OpenSim/Framework/IRegionCreator.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Text; | 30 | using System.Text; |
4 | 31 | ||
diff --git a/OpenSim/Framework/IRegistryCore.cs b/OpenSim/Framework/IRegistryCore.cs index be7e1e6..a94b65d 100644 --- a/OpenSim/Framework/IRegistryCore.cs +++ b/OpenSim/Framework/IRegistryCore.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Text; | 30 | using System.Text; |
4 | 31 | ||
diff --git a/OpenSim/Framework/RegistryCore.cs b/OpenSim/Framework/RegistryCore.cs index 08d343a..98d595a 100644 --- a/OpenSim/Framework/RegistryCore.cs +++ b/OpenSim/Framework/RegistryCore.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Text; | 30 | using System.Text; |
4 | 31 | ||
@@ -42,13 +69,11 @@ namespace OpenSim.Framework | |||
42 | 69 | ||
43 | public void StackModuleInterface<M>(M mod) | 70 | public void StackModuleInterface<M>(M mod) |
44 | { | 71 | { |
45 | |||
46 | } | 72 | } |
47 | 73 | ||
48 | public T[] RequestModuleInterfaces<T>() | 74 | public T[] RequestModuleInterfaces<T>() |
49 | { | 75 | { |
50 | return new T[] { default(T) }; | 76 | return new T[] { default(T) }; |
51 | } | 77 | } |
52 | |||
53 | } | 78 | } |
54 | } | 79 | } |
diff --git a/OpenSim/Grid/Framework/IGridServiceModule.cs b/OpenSim/Grid/Framework/IGridServiceModule.cs index 97706d3..2d13e2a 100644 --- a/OpenSim/Grid/Framework/IGridServiceModule.cs +++ b/OpenSim/Grid/Framework/IGridServiceModule.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using OpenSim.Framework.Servers; | 29 | using OpenSim.Framework.Servers; |
3 | 30 | ||
4 | namespace OpenSim.Grid.Framework | 31 | namespace OpenSim.Grid.Framework |
diff --git a/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs b/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs index fd7f4c1..1a4fe72 100644 --- a/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs +++ b/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Reflection; | 30 | using System.Reflection; |
4 | using System.Text; | 31 | using System.Text; |
@@ -58,7 +85,6 @@ namespace OpenSim.Grid.GridServer.Modules | |||
58 | 85 | ||
59 | public void Initialise() | 86 | public void Initialise() |
60 | { | 87 | { |
61 | |||
62 | } | 88 | } |
63 | 89 | ||
64 | #endregion | 90 | #endregion |
@@ -134,8 +160,6 @@ namespace OpenSim.Grid.GridServer.Modules | |||
134 | 160 | ||
135 | #endregion | 161 | #endregion |
136 | 162 | ||
137 | |||
138 | |||
139 | #region IDisposable Members | 163 | #region IDisposable Members |
140 | 164 | ||
141 | public void Dispose() | 165 | public void Dispose() |
diff --git a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs index 0650a1f..ed5252e 100644 --- a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs +++ b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs | |||
@@ -400,7 +400,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
400 | // IGridMessagingModule messagingModule; | 400 | // IGridMessagingModule messagingModule; |
401 | // if (m_gridCore.TryGet<IGridMessagingModule>(out messagingModule)) | 401 | // if (m_gridCore.TryGet<IGridMessagingModule>(out messagingModule)) |
402 | //{ | 402 | //{ |
403 | if(m_messagingServerMapper != null) | 403 | if (m_messagingServerMapper != null) |
404 | { | 404 | { |
405 | List<MessageServerInfo> messageServers = m_messagingServerMapper.GetMessageServersList(); | 405 | List<MessageServerInfo> messageServers = m_messagingServerMapper.GetMessageServersList(); |
406 | responseData["messageserver_count"] = messageServers.Count; | 406 | responseData["messageserver_count"] = messageServers.Count; |
diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs index 0ded0c0..004cd30 100644 --- a/OpenSim/Tools/pCampBot/PhysicsBot.cs +++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs | |||
@@ -77,7 +77,7 @@ namespace pCampBot | |||
77 | 77 | ||
78 | void m_action_Elapsed(object sender, ElapsedEventArgs e) | 78 | void m_action_Elapsed(object sender, ElapsedEventArgs e) |
79 | { | 79 | { |
80 | while(true) | 80 | while (true) |
81 | { | 81 | { |
82 | //client.Appearance.ForceRebakeAvatarTextures(); | 82 | //client.Appearance.ForceRebakeAvatarTextures(); |
83 | //client.Appearance.SetPreviousAppearance(); | 83 | //client.Appearance.SetPreviousAppearance(); |
diff --git a/ThirdPartyLicenses/Protobuf-net.txt b/ThirdPartyLicenses/Protobuf-net.txt index c195c0e..84148e0 100644 --- a/ThirdPartyLicenses/Protobuf-net.txt +++ b/ThirdPartyLicenses/Protobuf-net.txt | |||
@@ -1,218 +1,218 @@ | |||
1 | Google protocol buffers home page: | 1 | Google protocol buffers home page: |
2 | 2 | ||
3 | http://code.google.com/apis/protocolbuffers/docs/overview.html [^] | 3 | http://code.google.com/apis/protocolbuffers/docs/overview.html [^] |
4 | 4 | ||
5 | The .NET implementation which is licensed under Apache 2.0 License: | 5 | The .NET implementation which is licensed under Apache 2.0 License: |
6 | 6 | ||
7 | http://code.google.com/p/protobuf-net/ [^] | 7 | http://code.google.com/p/protobuf-net/ [^] |
8 | 8 | ||
9 | Download link: | 9 | Download link: |
10 | 10 | ||
11 | http://protobuf-net.googlecode.com/files/protobuf-net%20r237.zip [^] | 11 | http://protobuf-net.googlecode.com/files/protobuf-net%20r237.zip [^] |
12 | 12 | ||
13 | I chose to NET2.0 version from the zip. | 13 | I chose to NET2.0 version from the zip. |
14 | 14 | ||
15 | --- | 15 | --- |
16 | 16 | ||
17 | Apache License | 17 | Apache License |
18 | Version 2.0, January 2004 | 18 | Version 2.0, January 2004 |
19 | http://www.apache.org/licenses/ | 19 | http://www.apache.org/licenses/ |
20 | 20 | ||
21 | TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION | 21 | TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION |
22 | 22 | ||
23 | 1. Definitions. | 23 | 1. Definitions. |
24 | 24 | ||
25 | "License" shall mean the terms and conditions for use, reproduction, | 25 | "License" shall mean the terms and conditions for use, reproduction, |
26 | and distribution as defined by Sections 1 through 9 of this document. | 26 | and distribution as defined by Sections 1 through 9 of this document. |
27 | 27 | ||
28 | "Licensor" shall mean the copyright owner or entity authorized by | 28 | "Licensor" shall mean the copyright owner or entity authorized by |
29 | the copyright owner that is granting the License. | 29 | the copyright owner that is granting the License. |
30 | 30 | ||
31 | "Legal Entity" shall mean the union of the acting entity and all | 31 | "Legal Entity" shall mean the union of the acting entity and all |
32 | other entities that control, are controlled by, or are under common | 32 | other entities that control, are controlled by, or are under common |
33 | control with that entity. For the purposes of this definition, | 33 | control with that entity. For the purposes of this definition, |
34 | "control" means (i) the power, direct or indirect, to cause the | 34 | "control" means (i) the power, direct or indirect, to cause the |
35 | direction or management of such entity, whether by contract or | 35 | direction or management of such entity, whether by contract or |
36 | otherwise, or (ii) ownership of fifty percent (50%) or more of the | 36 | otherwise, or (ii) ownership of fifty percent (50%) or more of the |
37 | outstanding shares, or (iii) beneficial ownership of such entity. | 37 | outstanding shares, or (iii) beneficial ownership of such entity. |
38 | 38 | ||
39 | "You" (or "Your") shall mean an individual or Legal Entity | 39 | "You" (or "Your") shall mean an individual or Legal Entity |
40 | exercising permissions granted by this License. | 40 | exercising permissions granted by this License. |
41 | 41 | ||
42 | "Source" form shall mean the preferred form for making modifications, | 42 | "Source" form shall mean the preferred form for making modifications, |
43 | including but not limited to software source code, documentation | 43 | including but not limited to software source code, documentation |
44 | source, and configuration files. | 44 | source, and configuration files. |
45 | 45 | ||
46 | "Object" form shall mean any form resulting from mechanical | 46 | "Object" form shall mean any form resulting from mechanical |
47 | transformation or translation of a Source form, including but | 47 | transformation or translation of a Source form, including but |
48 | not limited to compiled object code, generated documentation, | 48 | not limited to compiled object code, generated documentation, |
49 | and conversions to other media types. | 49 | and conversions to other media types. |
50 | 50 | ||
51 | "Work" shall mean the work of authorship, whether in Source or | 51 | "Work" shall mean the work of authorship, whether in Source or |
52 | Object form, made available under the License, as indicated by a | 52 | Object form, made available under the License, as indicated by a |
53 | copyright notice that is included in or attached to the work | 53 | copyright notice that is included in or attached to the work |
54 | (an example is provided in the Appendix below). | 54 | (an example is provided in the Appendix below). |
55 | 55 | ||
56 | "Derivative Works" shall mean any work, whether in Source or Object | 56 | "Derivative Works" shall mean any work, whether in Source or Object |
57 | form, that is based on (or derived from) the Work and for which the | 57 | form, that is based on (or derived from) the Work and for which the |
58 | editorial revisions, annotations, elaborations, or other modifications | 58 | editorial revisions, annotations, elaborations, or other modifications |
59 | represent, as a whole, an original work of authorship. For the purposes | 59 | represent, as a whole, an original work of authorship. For the purposes |
60 | of this License, Derivative Works shall not include works that remain | 60 | of this License, Derivative Works shall not include works that remain |
61 | separable from, or merely link (or bind by name) to the interfaces of, | 61 | separable from, or merely link (or bind by name) to the interfaces of, |
62 | the Work and Derivative Works thereof. | 62 | the Work and Derivative Works thereof. |
63 | 63 | ||
64 | "Contribution" shall mean any work of authorship, including | 64 | "Contribution" shall mean any work of authorship, including |
65 | the original version of the Work and any modifications or additions | 65 | the original version of the Work and any modifications or additions |
66 | to that Work or Derivative Works thereof, that is intentionally | 66 | to that Work or Derivative Works thereof, that is intentionally |
67 | submitted to Licensor for inclusion in the Work by the copyright owner | 67 | submitted to Licensor for inclusion in the Work by the copyright owner |
68 | or by an individual or Legal Entity authorized to submit on behalf of | 68 | or by an individual or Legal Entity authorized to submit on behalf of |
69 | the copyright owner. For the purposes of this definition, "submitted" | 69 | the copyright owner. For the purposes of this definition, "submitted" |
70 | means any form of electronic, verbal, or written communication sent | 70 | means any form of electronic, verbal, or written communication sent |
71 | to the Licensor or its representatives, including but not limited to | 71 | to the Licensor or its representatives, including but not limited to |
72 | communication on electronic mailing lists, source code control systems, | 72 | communication on electronic mailing lists, source code control systems, |
73 | and issue tracking systems that are managed by, or on behalf of, the | 73 | and issue tracking systems that are managed by, or on behalf of, the |
74 | Licensor for the purpose of discussing and improving the Work, but | 74 | Licensor for the purpose of discussing and improving the Work, but |
75 | excluding communication that is conspicuously marked or otherwise | 75 | excluding communication that is conspicuously marked or otherwise |
76 | designated in writing by the copyright owner as "Not a Contribution." | 76 | designated in writing by the copyright owner as "Not a Contribution." |
77 | 77 | ||
78 | "Contributor" shall mean Licensor and any individual or Legal Entity | 78 | "Contributor" shall mean Licensor and any individual or Legal Entity |
79 | on behalf of whom a Contribution has been received by Licensor and | 79 | on behalf of whom a Contribution has been received by Licensor and |
80 | subsequently incorporated within the Work. | 80 | subsequently incorporated within the Work. |
81 | 81 | ||
82 | 2. Grant of Copyright License. Subject to the terms and conditions of | 82 | 2. Grant of Copyright License. Subject to the terms and conditions of |
83 | this License, each Contributor hereby grants to You a perpetual, | 83 | this License, each Contributor hereby grants to You a perpetual, |
84 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable | 84 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
85 | copyright license to reproduce, prepare Derivative Works of, | 85 | copyright license to reproduce, prepare Derivative Works of, |
86 | publicly display, publicly perform, sublicense, and distribute the | 86 | publicly display, publicly perform, sublicense, and distribute the |
87 | Work and such Derivative Works in Source or Object form. | 87 | Work and such Derivative Works in Source or Object form. |
88 | 88 | ||
89 | 3. Grant of Patent License. Subject to the terms and conditions of | 89 | 3. Grant of Patent License. Subject to the terms and conditions of |
90 | this License, each Contributor hereby grants to You a perpetual, | 90 | this License, each Contributor hereby grants to You a perpetual, |
91 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable | 91 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
92 | (except as stated in this section) patent license to make, have made, | 92 | (except as stated in this section) patent license to make, have made, |
93 | use, offer to sell, sell, import, and otherwise transfer the Work, | 93 | use, offer to sell, sell, import, and otherwise transfer the Work, |
94 | where such license applies only to those patent claims licensable | 94 | where such license applies only to those patent claims licensable |
95 | by such Contributor that are necessarily infringed by their | 95 | by such Contributor that are necessarily infringed by their |
96 | Contribution(s) alone or by combination of their Contribution(s) | 96 | Contribution(s) alone or by combination of their Contribution(s) |
97 | with the Work to which such Contribution(s) was submitted. If You | 97 | with the Work to which such Contribution(s) was submitted. If You |
98 | institute patent litigation against any entity (including a | 98 | institute patent litigation against any entity (including a |
99 | cross-claim or counterclaim in a lawsuit) alleging that the Work | 99 | cross-claim or counterclaim in a lawsuit) alleging that the Work |
100 | or a Contribution incorporated within the Work constitutes direct | 100 | or a Contribution incorporated within the Work constitutes direct |
101 | or contributory patent infringement, then any patent licenses | 101 | or contributory patent infringement, then any patent licenses |
102 | granted to You under this License for that Work shall terminate | 102 | granted to You under this License for that Work shall terminate |
103 | as of the date such litigation is filed. | 103 | as of the date such litigation is filed. |
104 | 104 | ||
105 | 4. Redistribution. You may reproduce and distribute copies of the | 105 | 4. Redistribution. You may reproduce and distribute copies of the |
106 | Work or Derivative Works thereof in any medium, with or without | 106 | Work or Derivative Works thereof in any medium, with or without |
107 | modifications, and in Source or Object form, provided that You | 107 | modifications, and in Source or Object form, provided that You |
108 | meet the following conditions: | 108 | meet the following conditions: |
109 | 109 | ||
110 | (a) You must give any other recipients of the Work or | 110 | (a) You must give any other recipients of the Work or |
111 | Derivative Works a copy of this License; and | 111 | Derivative Works a copy of this License; and |
112 | 112 | ||
113 | (b) You must cause any modified files to carry prominent notices | 113 | (b) You must cause any modified files to carry prominent notices |
114 | stating that You changed the files; and | 114 | stating that You changed the files; and |
115 | 115 | ||
116 | (c) You must retain, in the Source form of any Derivative Works | 116 | (c) You must retain, in the Source form of any Derivative Works |
117 | that You distribute, all copyright, patent, trademark, and | 117 | that You distribute, all copyright, patent, trademark, and |
118 | attribution notices from the Source form of the Work, | 118 | attribution notices from the Source form of the Work, |
119 | excluding those notices that do not pertain to any part of | 119 | excluding those notices that do not pertain to any part of |
120 | the Derivative Works; and | 120 | the Derivative Works; and |
121 | 121 | ||
122 | (d) If the Work includes a "NOTICE" text file as part of its | 122 | (d) If the Work includes a "NOTICE" text file as part of its |
123 | distribution, then any Derivative Works that You distribute must | 123 | distribution, then any Derivative Works that You distribute must |
124 | include a readable copy of the attribution notices contained | 124 | include a readable copy of the attribution notices contained |
125 | within such NOTICE file, excluding those notices that do not | 125 | within such NOTICE file, excluding those notices that do not |
126 | pertain to any part of the Derivative Works, in at least one | 126 | pertain to any part of the Derivative Works, in at least one |
127 | of the following places: within a NOTICE text file distributed | 127 | of the following places: within a NOTICE text file distributed |
128 | as part of the Derivative Works; within the Source form or | 128 | as part of the Derivative Works; within the Source form or |
129 | documentation, if provided along with the Derivative Works; or, | 129 | documentation, if provided along with the Derivative Works; or, |
130 | within a display generated by the Derivative Works, if and | 130 | within a display generated by the Derivative Works, if and |
131 | wherever such third-party notices normally appear. The contents | 131 | wherever such third-party notices normally appear. The contents |
132 | of the NOTICE file are for informational purposes only and | 132 | of the NOTICE file are for informational purposes only and |
133 | do not modify the License. You may add Your own attribution | 133 | do not modify the License. You may add Your own attribution |
134 | notices within Derivative Works that You distribute, alongside | 134 | notices within Derivative Works that You distribute, alongside |
135 | or as an addendum to the NOTICE text from the Work, provided | 135 | or as an addendum to the NOTICE text from the Work, provided |
136 | that such additional attribution notices cannot be construed | 136 | that such additional attribution notices cannot be construed |
137 | as modifying the License. | 137 | as modifying the License. |
138 | 138 | ||
139 | You may add Your own copyright statement to Your modifications and | 139 | You may add Your own copyright statement to Your modifications and |
140 | may provide additional or different license terms and conditions | 140 | may provide additional or different license terms and conditions |
141 | for use, reproduction, or distribution of Your modifications, or | 141 | for use, reproduction, or distribution of Your modifications, or |
142 | for any such Derivative Works as a whole, provided Your use, | 142 | for any such Derivative Works as a whole, provided Your use, |
143 | reproduction, and distribution of the Work otherwise complies with | 143 | reproduction, and distribution of the Work otherwise complies with |
144 | the conditions stated in this License. | 144 | the conditions stated in this License. |
145 | 145 | ||
146 | 5. Submission of Contributions. Unless You explicitly state otherwise, | 146 | 5. Submission of Contributions. Unless You explicitly state otherwise, |
147 | any Contribution intentionally submitted for inclusion in the Work | 147 | any Contribution intentionally submitted for inclusion in the Work |
148 | by You to the Licensor shall be under the terms and conditions of | 148 | by You to the Licensor shall be under the terms and conditions of |
149 | this License, without any additional terms or conditions. | 149 | this License, without any additional terms or conditions. |
150 | Notwithstanding the above, nothing herein shall supersede or modify | 150 | Notwithstanding the above, nothing herein shall supersede or modify |
151 | the terms of any separate license agreement you may have executed | 151 | the terms of any separate license agreement you may have executed |
152 | with Licensor regarding such Contributions. | 152 | with Licensor regarding such Contributions. |
153 | 153 | ||
154 | 6. Trademarks. This License does not grant permission to use the trade | 154 | 6. Trademarks. This License does not grant permission to use the trade |
155 | names, trademarks, service marks, or product names of the Licensor, | 155 | names, trademarks, service marks, or product names of the Licensor, |
156 | except as required for reasonable and customary use in describing the | 156 | except as required for reasonable and customary use in describing the |
157 | origin of the Work and reproducing the content of the NOTICE file. | 157 | origin of the Work and reproducing the content of the NOTICE file. |
158 | 158 | ||
159 | 7. Disclaimer of Warranty. Unless required by applicable law or | 159 | 7. Disclaimer of Warranty. Unless required by applicable law or |
160 | agreed to in writing, Licensor provides the Work (and each | 160 | agreed to in writing, Licensor provides the Work (and each |
161 | Contributor provides its Contributions) on an "AS IS" BASIS, | 161 | Contributor provides its Contributions) on an "AS IS" BASIS, |
162 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | 162 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
163 | implied, including, without limitation, any warranties or conditions | 163 | implied, including, without limitation, any warranties or conditions |
164 | of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A | 164 | of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A |
165 | PARTICULAR PURPOSE. You are solely responsible for determining the | 165 | PARTICULAR PURPOSE. You are solely responsible for determining the |
166 | appropriateness of using or redistributing the Work and assume any | 166 | appropriateness of using or redistributing the Work and assume any |
167 | risks associated with Your exercise of permissions under this License. | 167 | risks associated with Your exercise of permissions under this License. |
168 | 168 | ||
169 | 8. Limitation of Liability. In no event and under no legal theory, | 169 | 8. Limitation of Liability. In no event and under no legal theory, |
170 | whether in tort (including negligence), contract, or otherwise, | 170 | whether in tort (including negligence), contract, or otherwise, |
171 | unless required by applicable law (such as deliberate and grossly | 171 | unless required by applicable law (such as deliberate and grossly |
172 | negligent acts) or agreed to in writing, shall any Contributor be | 172 | negligent acts) or agreed to in writing, shall any Contributor be |
173 | liable to You for damages, including any direct, indirect, special, | 173 | liable to You for damages, including any direct, indirect, special, |
174 | incidental, or consequential damages of any character arising as a | 174 | incidental, or consequential damages of any character arising as a |
175 | result of this License or out of the use or inability to use the | 175 | result of this License or out of the use or inability to use the |
176 | Work (including but not limited to damages for loss of goodwill, | 176 | Work (including but not limited to damages for loss of goodwill, |
177 | work stoppage, computer failure or malfunction, or any and all | 177 | work stoppage, computer failure or malfunction, or any and all |
178 | other commercial damages or losses), even if such Contributor | 178 | other commercial damages or losses), even if such Contributor |
179 | has been advised of the possibility of such damages. | 179 | has been advised of the possibility of such damages. |
180 | 180 | ||
181 | 9. Accepting Warranty or Additional Liability. While redistributing | 181 | 9. Accepting Warranty or Additional Liability. While redistributing |
182 | the Work or Derivative Works thereof, You may choose to offer, | 182 | the Work or Derivative Works thereof, You may choose to offer, |
183 | and charge a fee for, acceptance of support, warranty, indemnity, | 183 | and charge a fee for, acceptance of support, warranty, indemnity, |
184 | or other liability obligations and/or rights consistent with this | 184 | or other liability obligations and/or rights consistent with this |
185 | License. However, in accepting such obligations, You may act only | 185 | License. However, in accepting such obligations, You may act only |
186 | on Your own behalf and on Your sole responsibility, not on behalf | 186 | on Your own behalf and on Your sole responsibility, not on behalf |
187 | of any other Contributor, and only if You agree to indemnify, | 187 | of any other Contributor, and only if You agree to indemnify, |
188 | defend, and hold each Contributor harmless for any liability | 188 | defend, and hold each Contributor harmless for any liability |
189 | incurred by, or claims asserted against, such Contributor by reason | 189 | incurred by, or claims asserted against, such Contributor by reason |
190 | of your accepting any such warranty or additional liability. | 190 | of your accepting any such warranty or additional liability. |
191 | 191 | ||
192 | END OF TERMS AND CONDITIONS | 192 | END OF TERMS AND CONDITIONS |
193 | 193 | ||
194 | APPENDIX: How to apply the Apache License to your work. | 194 | APPENDIX: How to apply the Apache License to your work. |
195 | 195 | ||
196 | To apply the Apache License to your work, attach the following | 196 | To apply the Apache License to your work, attach the following |
197 | boilerplate notice, with the fields enclosed by brackets "[]" | 197 | boilerplate notice, with the fields enclosed by brackets "[]" |
198 | replaced with your own identifying information. (Don't include | 198 | replaced with your own identifying information. (Don't include |
199 | the brackets!) The text should be enclosed in the appropriate | 199 | the brackets!) The text should be enclosed in the appropriate |
200 | comment syntax for the file format. We also recommend that a | 200 | comment syntax for the file format. We also recommend that a |
201 | file or class name and description of purpose be included on the | 201 | file or class name and description of purpose be included on the |
202 | same "printed page" as the copyright notice for easier | 202 | same "printed page" as the copyright notice for easier |
203 | identification within third-party archives. | 203 | identification within third-party archives. |
204 | 204 | ||
205 | Copyright [yyyy] [name of copyright owner] | 205 | Copyright [yyyy] [name of copyright owner] |
206 | 206 | ||
207 | Licensed under the Apache License, Version 2.0 (the "License"); | 207 | Licensed under the Apache License, Version 2.0 (the "License"); |
208 | you may not use this file except in compliance with the License. | 208 | you may not use this file except in compliance with the License. |
209 | You may obtain a copy of the License at | 209 | You may obtain a copy of the License at |
210 | 210 | ||
211 | http://www.apache.org/licenses/LICENSE-2.0 | 211 | http://www.apache.org/licenses/LICENSE-2.0 |
212 | 212 | ||
213 | Unless required by applicable law or agreed to in writing, software | 213 | Unless required by applicable law or agreed to in writing, software |
214 | distributed under the License is distributed on an "AS IS" BASIS, | 214 | distributed under the License is distributed on an "AS IS" BASIS, |
215 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | 215 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
216 | See the License for the specific language governing permissions and | 216 | See the License for the specific language governing permissions and |
217 | limitations under the License. | 217 | limitations under the License. |
218 | 218 | ||