Browse code

Fix some typos

Mehdi Rande authored on 24/01/2014 23:44:49
Showing 22 changed files
... ...
@@ -1,5 +1,5 @@
1 1
 ////////////////////////////////////////////////////////////////////////////////
2
-Blue Mind LICENSE
2
+BlueMind LICENSE
3 3
 ////////////////////////////////////////////////////////////////////////////////
4 4
 
5 5
 URI: http://www.blue-mind.net/licenses
... ...
@@ -8,7 +8,7 @@ URI: http://www.blue-mind.net/licenses
8 8
 // English version (French version below) //
9 9
 //========================================//
10 10
 
11
-Blue Mind is free software, licensed under the terms of the GNU Affero General Public License as published by the Free 
11
+BlueMind is free software, licensed under the terms of the GNU Affero General Public License as published by the Free 
12 12
 Software Foundation, version 3 of the License.  You can redistribute it and/or modify since you respect the terms of 
13 13
 this License.
14 14
 
... ...
@@ -24,16 +24,16 @@ as published on CeCILL.info -- version 2 of the License -- with the following ex
24 24
 You can redistribute and/or modify them since you respect the terms of at least one of these licenses (either GNU
25 25
 Affero GPL v3 or CeCILL v2).
26 26
 
27
-You should have received a copy of the GNU Affero General Public License and the CeCILL along with Blue Mind. If not,
27
+You should have received a copy of the GNU Affero General Public License and the CeCILL along with BlueMind. If not,
28 28
 see : <http://www.gnu.org/licenses/> and <http://www.cecill.info/licences.en.html>.
29 29
 
30
-Finally, Blue Mind is made using those external components and libraries. They are listed at the end of this file.
30
+Finally, BlueMind is made using those external components and libraries. They are listed at the end of this file.
31 31
 
32 32
 //================//
33 33
 // French version //
34 34
 //================//
35 35
 
36
-Blue Mind est un logiciel libre, diffusé selon les termes de la GNU Affero General Public License telle que 
36
+BlueMind est un logiciel libre, diffusé selon les termes de la GNU Affero General Public License telle que 
37 37
 publiée par la Free Software Foundation dans sa version 3. Vous ne pouvez le redistribuer ou le modifier que si vous
38 38
 respectez les termes de cette licence.
39 39
 
... ...
@@ -49,10 +49,10 @@ de la licence CeCILL telle que publiée sur Cecill.info dans sa version 2 -- ave
49 49
 Vous ne pouvez redistribuer ou modifier ces fichiers que si vous respectez les termes de l'une au moins des deux 
50 50
 licences (GNU Affero General Public License v3 ou CeCILL v2).
51 51
 
52
-Vous devriez avoir reçu une copie de la GNU Affero General Public License et la licence CeCILL avec le logiciel Blue Mind.
52
+Vous devriez avoir reçu une copie de la GNU Affero General Public License et la licence CeCILL avec le logiciel BlueMind.
53 53
 Si n'est pas le cas, vous les trouverez sur : <http://www.gnu.org/licenses/> et <http://www.cecill.info/licences.fr.html>.
54 54
 
55
-Enfin, Blue Mind utilise des composants et bibliothèques externes. Ils sont listés à la fin de ce fichier.
55
+Enfin, BlueMind utilise des composants et bibliothèques externes. Ils sont listés à la fin de ce fichier.
56 56
 
57 57
 //===========================================================================//
58 58
 
... ...
@@ -62,7 +62,9 @@ External components, libraries and icons:
62 62
 - Glyphish : http://glyphish.com/ (Glyphish Pro)
63 63
 - Closure library (Apache 2.0)
64 64
 - GWT (Apache 2.0)
65
-- o-push : http://code.google.com/p/o-push/ (GPLv3). Integrated and modified (code and licence) with Author acceptance 
65
+- o-push : http://code.google.com/p/o-push/ (GPLv3)
66 66
 - ydn-db : https://bitbucket.org/ytkyaw/ydn-db/overview (Apache 2.0)
67 67
 - relief : http://code.google.com/p/relief/ (Apache 2.0)
68
-
68
+- ...
69
+Some other Open Source components have been used in parts or modified.
70
+Among those : iCal4j, netty, obm-sync, tigase, elasticsearch, guava, vert.x
... ...
@@ -4,4 +4,5 @@ ssl/createcert.sh usr/share/bm-ca/
4 4
 ssl/buildca.sh usr/share/bm-ca/
5 5
 ssl/camgr.lib usr/share/bm-ca/
6 6
 ssl/checkBMCertCN.sh usr/share/bm-ca/
7
+LICENSE.txt usr/share/bm-ca/
7 8
 scripts/bmupdatecert usr/bin/
... ...
@@ -60,7 +60,8 @@ install/bm-core::
60 60
 	rm -f $(CURDIR)/debian/bm-core/usr/share/bm-core/plugins/net.bluemind.custom.samba_*jar
61 61
 	# Remove size and strength password policy
62 62
 	rm -f $(CURDIR)/debian/bm-core/usr/share/bm-core/plugins/net.bluemind.custom.password.sizestrength_*jar
63
-
63
+	# License
64
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-core/
64 65
 
65 66
 install/bm-plugin-core-ldap-import::
66 67
 	tar --wildcards -xjvf bm-core.tar.bz2 -C $(CURDIR)/debian/bm-plugin-core-ldap-import/usr/share bm-core/plugins/net.bluemind.system.ldap.importation_*jar bm-core/plugins/net.bluemind.system.ldap.importation.scanner_*jar
... ...
@@ -76,49 +77,77 @@ install/bm-plugin-core-password-sizestrength::
76 76
 
77 77
 install/bm-locator::
78 78
 	tar xjvf bm-locator.tar.bz2 -C $(CURDIR)/debian/bm-locator/usr/share
79
+	# License
80
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-locator/
79 81
 
80 82
 install/bm-lmtpd::
81 83
 	tar xjvf bm-lmtpd.tar.bz2 -C $(CURDIR)/debian/bm-lmtpd/usr/share
84
+	# License
85
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-lmtpd/
82 86
 
83 87
 install/bm-node::
84 88
 	tar xjvf bm-node.tar.bz2 -C $(CURDIR)/debian/bm-node/usr/share
85 89
 	cp conf/bm-node/* $(CURDIR)/debian/bm-node/etc/bm-node/
90
+	# License
91
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-node/
86 92
 
87 93
 install/ysnp::
88 94
 	tar xjvf ysnp.tar.bz2 -C $(CURDIR)/debian/ysnp/usr/share
95
+	# License
96
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/ysnp/
89 97
 
90 98
 install/bm-eas::
91 99
 	tar xjvf bm-eas.tar.bz2 -C $(CURDIR)/debian/bm-eas/usr/share
100
+	# License
101
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-eas/
92 102
 
93 103
 install/bm-mq::
94 104
 	tar xjvf bm-mq.tar.bz2 -C $(CURDIR)/debian/bm-mq/usr/share
105
+	# License
106
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-mq/
95 107
 
96 108
 install/bm-hps::
97 109
 	tar xjvf bm-hps.tar.bz2 -C $(CURDIR)/debian/bm-hps/usr/share
110
+	# License
111
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-hps/
98 112
 
99 113
 install/bm-smbtools::
100 114
 	tar xjvf bm-smbtools.tar.bz2 -C $(CURDIR)/debian/bm-smbtools/usr/share
115
+	# License
116
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-smbtools/
101 117
 
102 118
 install/bm-apache::
103 119
 	(/bin/bash $(CURDIR)/debian/build_bm-apache.sh $(CURDIR))
104 120
 
105 121
 install/bm-admin-console::
106 122
 	(/bin/bash $(CURDIR)/debian/build_bm-java-ui.sh $(CURDIR) AdminConsole bm-admin-console adminconsole)
123
+	# License
124
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-admin-console/
107 125
 
108 126
 install/bm-default-app::
109 127
 	(/bin/bash $(CURDIR)/debian/build_bm-java-ui.sh $(CURDIR) DefaultApp bm-default-app ROOT)
128
+	# License
129
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-default-app/
110 130
 
111 131
 install/bm-soap::
112 132
 	(/bin/bash $(CURDIR)/debian/build_bm-java-ui.sh $(CURDIR) SoapProxy bm-soap soap)
133
+	# License
134
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-soap/
113 135
 
114 136
 install/bm-calendar::
115 137
 	(/bin/bash $(CURDIR)/debian/build_bm-java-ui.sh $(CURDIR) Calendar bm-calendar cal)
138
+	# License
139
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-calendar/
116 140
 
117 141
 install/bm-contact::
118 142
 	(/bin/bash $(CURDIR)/debian/build_bm-java-ui.sh $(CURDIR) Contact bm-contact contact)
143
+	# License
144
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-contact/
119 145
 
120 146
 install/bm-settings::
121 147
 	(/bin/bash $(CURDIR)/debian/build_bm-java-ui.sh $(CURDIR) Settings bm-settings settings)
148
+	# License
149
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-settings/
122 150
 
123 151
 install/bm-tomcat::
124 152
 	tar xvfj tomcat/bm-tomcat-6.0.35.tar.bz2 -C $(CURDIR)/debian/bm-tomcat/usr/share
... ...
@@ -151,6 +180,8 @@ install/bm-solr::
151 151
 
152 152
 install/bm-webmail::
153 153
 	(/bin/bash $(CURDIR)/debian/build_bm-webmail.sh $(CURDIR))
154
+	# License
155
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-webmail/
154 156
 
155 157
 install/bm-ldap-role::
156 158
 	cp ${CURDIR}/conf/ldap_sasl2_slapd.conf debian/slapd.conf
... ...
@@ -158,6 +189,8 @@ install/bm-ldap-role::
158 158
 install/bm-cyrus::
159 159
 	cp ${CURDIR}/scripts/resetCyrus.sh $(CURDIR)/debian/bm-cyrus/usr/share/bm-cyrus/resetCyrus.sh
160 160
 	cp ${CURDIR}/scripts/fixQuotas.sh $(CURDIR)/debian/bm-cyrus/usr/share/bm-cyrus/fixQuotas.sh
161
+	# License
162
+	cp $(CURDIR)/LICENSE.txt  $(CURDIR)/debian/bm-core/usr/share/bm-cyrus/
161 163
 
162 164
 install/bm-jdk::
163 165
 	tar xfj jdk/bm-jdk.tar.bz2 -C $(CURDIR)/debian/bm-jdk/usr/lib/jvm
164 166
deleted file mode 100644
... ...
@@ -1,111 +0,0 @@
1
-/* BEGIN LICENSE
2
- * Copyright © Blue Mind SAS, 2012-2014
3
- *
4
- * This file is part of Blue Mind. Blue Mind is a messaging and collaborative
5
- * solution.
6
- *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of either the GNU Affero General Public License as
9
- * published by the Free Software Foundation (version 3 of the License)
10
- * or the CeCILL as published by CeCILL.info (version 2 of the License).
11
- *
12
- * There are special exceptions to the terms and conditions of the
13
- * licenses as they are applied to this program. See LICENSE.txt in
14
- * the directory of this program distribution.
15
- *
16
- * This program is distributed in the hope that it will be useful,
17
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
18
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
19
- *
20
- * See LICENSE.txt
21
- * END LICENSE
22
- */
23
-package net.bluemind.core.configuration;
24
-
25
-import java.io.FileInputStream;
26
-import java.io.IOException;
27
-import java.util.ArrayList;
28
-import java.util.HashMap;
29
-import java.util.Map;
30
-import java.util.Properties;
31
-
32
-import org.slf4j.Logger;
33
-import org.slf4j.LoggerFactory;
34
-
35
-public class SpecialAccounts {
36
-	private static final Logger logger = LoggerFactory.getLogger(SpecialAccounts.class);
37
-
38
-	private static SpecialAccounts sa = new SpecialAccounts();
39
-
40
-	public static SpecialAccounts getInstance() {
41
-		return sa;
42
-	}
43
-
44
-	private Properties props;
45
-	private Map<String, String> rootAccounts;
46
-	private ArrayList<String> anyUserAccounts;
47
-	private Map<String, String> appliAccounts;
48
-
49
-	private SpecialAccounts() {
50
-		props = new Properties();
51
-		FileInputStream in = null;
52
-		try {
53
-			rootAccounts = new HashMap<String, String>();
54
-			anyUserAccounts = new ArrayList<String>();
55
-			appliAccounts = new HashMap<String, String>();
56
-			in = new FileInputStream("/etc/bm/bm.ini");
57
-			props.load(in);
58
-
59
-			String roots = props.getProperty("rootAccounts");
60
-			String applis = props.getProperty("appliAccounts");
61
-			String anyUsers = props.getProperty("anyUserAccounts");
62
-
63
-			if (roots != null && !roots.equals("")) {
64
-				for (String account : roots.split(",")) {
65
-					account = account.replace("|", "#");
66
-					rootAccounts.put(account.split("#")[0],
67
-							account.split("#")[1]);
68
-				}
69
-			}
70
-			if (applis != null && !applis.equals("")) {
71
-				for (String account : applis.split(",")) {
72
-					account = account.replace("|", "#");
73
-					appliAccounts.put(account.split("#")[0],
74
-							account.split("#")[1]);
75
-				}
76
-			}
77
-			if (anyUsers != null && !anyUsers.equals("")) {
78
-				for (String account : anyUsers.split(",")) {
79
-					anyUserAccounts.add(account);
80
-				}
81
-			}
82
-
83
-		} catch (IOException e) {
84
-			logger.error("/etc/bm/bm.ini not found", e);
85
-		} catch (Exception e) {
86
-			logger.error("invalid parameters in conf file", e);
87
-		} finally {
88
-			if (in != null) {
89
-				try {
90
-					in.close();
91
-				} catch (IOException e) {
92
-				}
93
-			}
94
-		}
95
-	}
96
-
97
-	public boolean isRootAccount(String login, String IP) {
98
-		String accountIP = rootAccounts.get(login);
99
-		return accountIP != null && accountIP.equals(IP);
100
-	}
101
-
102
-	public boolean isApplicAccount(String login, String IP) {
103
-		String accountIP = appliAccounts.get(login);
104
-		return accountIP != null && accountIP.equals(IP);
105
-	}
106
-
107
-	public boolean isAnyUserAccount(String IP) {
108
-		return anyUserAccounts.contains(IP);
109
-	}
110
-
111
-}
... ...
@@ -1,24 +1,17 @@
1
-/* BEGIN LICENSE
1
+/* BEGIN OLD_LICENSE
2 2
  * Copyright © Blue Mind SAS, 2012-2014
3
+ * Copyright © 1997-2008 Aliasource - Groupe LINAGORA
3 4
  *
4
- * This file is part of Blue Mind. Blue Mind is a messaging and collaborative
5
- * solution.
6
- *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of either the GNU Affero General Public License as
9
- * published by the Free Software Foundation (version 3 of the License)
10
- * or the CeCILL as published by CeCILL.info (version 2 of the License).
11
- *
12
- * There are special exceptions to the terms and conditions of the
13
- * licenses as they are applied to this program. See LICENSE.txt in
14
- * the directory of this program distribution.
5
+ * This program is free software; you can redistribute it and/or
6
+ * modify it under the terms of the GNU General Public License as
7
+ * published by the Free Software Foundation; either version 3 of the
8
+ * License, (at your option) any later version.
15 9
  *
16 10
  * This program is distributed in the hope that it will be useful,
17 11
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
18
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
19
- *
20
- * See LICENSE.txt
21
- * END LICENSE
12
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
13
+ * General Public License for more details.
14
+ * END OLD_LICENSE
22 15
  */
23 16
 package net.bluemind.core.server;
24 17
 
... ...
@@ -1,24 +1,17 @@
1
-/* BEGIN LICENSE
1
+/* BEGIN OLD_LICENSE
2 2
  * Copyright © Blue Mind SAS, 2012-2014
3
+ * Copyright © 1997-2008 Aliasource - Groupe LINAGORA
3 4
  *
4
- * This file is part of Blue Mind. Blue Mind is a messaging and collaborative
5
- * solution.
6
- *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of either the GNU Affero General Public License as
9
- * published by the Free Software Foundation (version 3 of the License)
10
- * or the CeCILL as published by CeCILL.info (version 2 of the License).
11
- *
12
- * There are special exceptions to the terms and conditions of the
13
- * licenses as they are applied to this program. See LICENSE.txt in
14
- * the directory of this program distribution.
5
+ * This program is free software; you can redistribute it and/or
6
+ * modify it under the terms of the GNU General Public License as
7
+ * published by the Free Software Foundation; either version 3 of the
8
+ * License, (at your option) any later version.
15 9
  *
16 10
  * This program is distributed in the hope that it will be useful,
17 11
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
18
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
19
- *
20
- * See LICENSE.txt
21
- * END LICENSE
12
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
13
+ * General Public License for more details.
14
+ * END OLD_LICENSE
22 15
  */
23 16
 package net.bluemind.core.setting;
24 17
 
... ...
@@ -1,24 +1,17 @@
1
-/* BEGIN LICENSE
1
+/* BEGIN OLD_LICENSE
2 2
  * Copyright © Blue Mind SAS, 2012-2014
3
+ * Copyright © 1997-2008 Aliasource - Groupe LINAGORA
3 4
  *
4
- * This file is part of Blue Mind. Blue Mind is a messaging and collaborative
5
- * solution.
6
- *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of either the GNU Affero General Public License as
9
- * published by the Free Software Foundation (version 3 of the License)
10
- * or the CeCILL as published by CeCILL.info (version 2 of the License).
11
- *
12
- * There are special exceptions to the terms and conditions of the
13
- * licenses as they are applied to this program. See LICENSE.txt in
14
- * the directory of this program distribution.
5
+ * This program is free software; you can redistribute it and/or
6
+ * modify it under the terms of the GNU General Public License as
7
+ * published by the Free Software Foundation; either version 3 of the
8
+ * License, (at your option) any later version.
15 9
  *
16 10
  * This program is distributed in the hope that it will be useful,
17 11
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
18
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
19
- *
20
- * See LICENSE.txt
21
- * END LICENSE
12
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
13
+ * General Public License for more details.
14
+ * END OLD_LICENSE
22 15
  */
23 16
 package net.bluemind.core.setting;
24 17
 
... ...
@@ -35,7 +35,10 @@ public class Activator implements BundleActivator {
35 35
 
36 36
 	/*
37 37
 	 * (non-Javadoc)
38
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
38
+	 * 
39
+	 * @see
40
+	 * org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext
41
+	 * )
39 42
 	 */
40 43
 	public void start(BundleContext bundleContext) throws Exception {
41 44
 		Activator.context = bundleContext;
... ...
@@ -43,7 +46,9 @@ public class Activator implements BundleActivator {
43 43
 
44 44
 	/*
45 45
 	 * (non-Javadoc)
46
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
46
+	 * 
47
+	 * @see
48
+	 * org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
47 49
 	 */
48 50
 	public void stop(BundleContext bundleContext) throws Exception {
49 51
 		Activator.context = null;
... ...
@@ -35,7 +35,10 @@ public class Activator implements BundleActivator {
35 35
 
36 36
 	/*
37 37
 	 * (non-Javadoc)
38
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
38
+	 * 
39
+	 * @see
40
+	 * org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext
41
+	 * )
39 42
 	 */
40 43
 	public void start(BundleContext bundleContext) throws Exception {
41 44
 		Activator.context = bundleContext;
... ...
@@ -43,7 +46,9 @@ public class Activator implements BundleActivator {
43 43
 
44 44
 	/*
45 45
 	 * (non-Javadoc)
46
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
46
+	 * 
47
+	 * @see
48
+	 * org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
47 49
 	 */
48 50
 	public void stop(BundleContext bundleContext) throws Exception {
49 51
 		Activator.context = null;
... ...
@@ -35,7 +35,10 @@ public class Activator implements BundleActivator {
35 35
 
36 36
 	/*
37 37
 	 * (non-Javadoc)
38
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
38
+	 * 
39
+	 * @see
40
+	 * org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext
41
+	 * )
39 42
 	 */
40 43
 	public void start(BundleContext bundleContext) throws Exception {
41 44
 		Activator.context = bundleContext;
... ...
@@ -43,7 +46,9 @@ public class Activator implements BundleActivator {
43 43
 
44 44
 	/*
45 45
 	 * (non-Javadoc)
46
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
46
+	 * 
47
+	 * @see
48
+	 * org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
47 49
 	 */
48 50
 	public void stop(BundleContext bundleContext) throws Exception {
49 51
 		Activator.context = null;
... ...
@@ -35,7 +35,10 @@ public class Activator implements BundleActivator {
35 35
 
36 36
 	/*
37 37
 	 * (non-Javadoc)
38
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
38
+	 * 
39
+	 * @see
40
+	 * org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext
41
+	 * )
39 42
 	 */
40 43
 	public void start(BundleContext bundleContext) throws Exception {
41 44
 		Activator.context = bundleContext;
... ...
@@ -43,7 +46,9 @@ public class Activator implements BundleActivator {
43 43
 
44 44
 	/*
45 45
 	 * (non-Javadoc)
46
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
46
+	 * 
47
+	 * @see
48
+	 * org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
47 49
 	 */
48 50
 	public void stop(BundleContext bundleContext) throws Exception {
49 51
 		Activator.context = null;
... ...
@@ -35,7 +35,10 @@ public class Activator implements BundleActivator {
35 35
 
36 36
 	/*
37 37
 	 * (non-Javadoc)
38
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
38
+	 * 
39
+	 * @see
40
+	 * org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext
41
+	 * )
39 42
 	 */
40 43
 	public void start(BundleContext bundleContext) throws Exception {
41 44
 		Activator.context = bundleContext;
... ...
@@ -43,7 +46,9 @@ public class Activator implements BundleActivator {
43 43
 
44 44
 	/*
45 45
 	 * (non-Javadoc)
46
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
46
+	 * 
47
+	 * @see
48
+	 * org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
47 49
 	 */
48 50
 	public void stop(BundleContext bundleContext) throws Exception {
49 51
 		Activator.context = null;
... ...
@@ -27,6 +27,6 @@ import net.bluemind.unixsocket.UnixDomainSocketChannel;
27 27
 public interface IAuthExecutor {
28 28
 
29 29
 	void doAuthenticationDialog(UnixDomainSocketChannel channel);
30
-	
30
+
31 31
 	void shutdown();
32 32
 }
... ...
@@ -27,5 +27,5 @@ import net.bluemind.unixsocket.UnixDomainSocketChannel;
27 27
 public interface IConnectionListener {
28 28
 
29 29
 	void connectionAccepted(UnixDomainSocketChannel channel);
30
-	
30
+
31 31
 }
... ...
@@ -54,10 +54,8 @@ public class MainLoop extends Thread {
54 54
 			} catch (SocketClosedException sce) {
55 55
 				logger.info("gracefull shutdown initiated.");
56 56
 			} catch (IOException ioe) {
57
-				logger
58
-						.error(
59
-								"problem accepting connections, leaving main loop",
60
-								ioe);
57
+				logger.error(
58
+						"problem accepting connections, leaving main loop", ioe);
61 59
 				return;
62 60
 			}
63 61
 		}
... ...
@@ -29,9 +29,9 @@ public class SaslauthdProtocolFactory {
29 29
 	public SaslauthdProtocolFactory(ValidationPolicy vp) {
30 30
 		this.vp = vp;
31 31
 	}
32
-	
32
+
33 33
 	public SaslauthdProtocol get() {
34 34
 		return new SaslauthdProtocol(vp);
35 35
 	}
36
-	
36
+
37 37
 }
... ...
@@ -29,7 +29,7 @@ import net.bluemind.ysnp.ICredentialValidatorFactory;
29 29
 /**
30 30
  * sort by ascending priority (low number means high priority)
31 31
  * 
32
- *
32
+ * 
33 33
  */
34 34
 public class ValidatorsComparator implements
35 35
 		Comparator<ICredentialValidatorFactory> {
... ...
@@ -33,7 +33,6 @@ import org.eclipse.core.runtime.Platform;
33 33
 import org.slf4j.Logger;
34 34
 import org.slf4j.LoggerFactory;
35 35
 
36
-
37 36
 /**
38 37
  * Loads plugins based on some interface
39 38
  * 
... ...
@@ -35,6 +35,7 @@ cp %{_curdir}/ssl/buildca.sh %{buildroot}/usr/share/bm-ca
35 35
 cp %{_curdir}/ssl/camgr.lib %{buildroot}/usr/share/bm-ca
36 36
 cp %{_curdir}/ssl/checkBMCertCN.sh %{buildroot}/usr/share/bm-ca
37 37
 cp %{_curdir}/scripts/bmupdatecert %{buildroot}/usr/bin
38
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-ca
38 39
 
39 40
 %files
40 41
 %{_datadir}/bm-ca/cert.cnf.template
... ...
@@ -27,6 +27,7 @@ rm -rf %{buildroot}/*
27 27
 mkdir -p %{buildroot}/usr/share/bm-cyrus
28 28
 cp %{_curdir}/scripts/resetCyrus.sh %{buildroot}/usr/share/bm-cyrus
29 29
 cp %{_curdir}/scripts/fixQuotas.sh %{buildroot}/usr/share/bm-cyrus
30
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-cyrus
30 31
 
31 32
 %files
32 33
 %{_datadir}/bm-cyrus
... ...
@@ -67,6 +67,7 @@ cp %{_curdir}/conf/bm-core/bm-core.logback.xml %{buildroot}/etc/bm-core
67 67
 cp %{_curdir}/scripts/backupBMDatabase.sh %{buildroot}/usr/share/bm-core/backupBMDatabase.sh
68 68
 cp %{_curdir}/scripts/backupBMDocs.sh %{buildroot}/usr/share/bm-core/backupBMDocs.sh
69 69
 cp %{_curdir}/conf/rh-chkconfig.d/bm-core %{buildroot}/etc/chkconfig.d
70
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-core
70 71
 
71 72
 # Install bm-hps
72 73
 tar xjvf %{_curdir}/bm-hps.tar.bz2 -C %{buildroot}/usr/share
... ...
@@ -75,6 +76,7 @@ mkdir -p %{buildroot}/var/lib/bm-hps
75 75
 mkdir -p %{buildroot}/var/log/bm-hps
76 76
 cp %{_curdir}/debian/bm-hps.init %{buildroot}%{_initrddir}/bm-hps
77 77
 cp %{_curdir}/conf/rh-chkconfig.d/bm-hps %{buildroot}/etc/chkconfig.d
78
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-hps
78 79
 
79 80
 # Install bm-smbtools
80 81
 tar xjvf %{_curdir}/bm-smbtools.tar.bz2 -C %{buildroot}/usr/share
... ...
@@ -82,6 +84,7 @@ mkdir -p %{buildroot}/etc/bm-smbtools
82 82
 mkdir -p %{buildroot}/var/lib/bm-smbtools
83 83
 mkdir -p %{buildroot}/var/log/bm-smbtools
84 84
 cp %{_curdir}/conf/bm-smbtools/bm-smbtools.ini %{buildroot}/etc/bm-smbtools
85
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-smbtools
85 86
 
86 87
 # Install bm-locator
87 88
 tar xjvf %{_curdir}/bm-locator.tar.bz2 -C %{buildroot}/usr/share
... ...
@@ -90,6 +93,7 @@ mkdir -p %{buildroot}/var/lib/bm-locator
90 90
 mkdir -p %{buildroot}/var/log/bm-locator
91 91
 cp %{_curdir}/debian/bm-locator.init %{buildroot}%{_initrddir}/bm-locator
92 92
 cp %{_curdir}/conf/rh-chkconfig.d/bm-locator %{buildroot}/etc/chkconfig.d
93
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-locator
93 94
 
94 95
 # Install bm-node
95 96
 tar xjvf %{_curdir}/bm-node.tar.bz2 -C %{buildroot}/usr/share
... ...
@@ -99,6 +103,7 @@ mkdir -p %{buildroot}/var/log/bm-node
99 99
 cp %{_curdir}/debian/bm-node.init %{buildroot}%{_initrddir}/bm-node
100 100
 cp %{_curdir}/conf/rh-chkconfig.d/bm-node %{buildroot}/etc/chkconfig.d
101 101
 cp %{_curdir}/conf/bm-node/* %{buildroot}/etc/bm-node
102
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-node
102 103
 
103 104
 # Install bm-eas
104 105
 tar xjvf %{_curdir}/bm-eas.tar.bz2 -C %{buildroot}/usr/share
... ...
@@ -107,6 +112,7 @@ mkdir -p %{buildroot}/var/lib/bm-eas
107 107
 mkdir -p %{buildroot}/var/log/bm-eas
108 108
 cp %{_curdir}/debian/bm-eas.init %{buildroot}%{_initrddir}/bm-eas
109 109
 cp %{_curdir}/conf/rh-chkconfig.d/bm-eas %{buildroot}/etc/chkconfig.d
110
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-eas
110 111
 
111 112
 # Install bm-lmtpd
112 113
 tar xjvf %{_curdir}/bm-lmtpd.tar.bz2 -C %{buildroot}/usr/share
... ...
@@ -118,6 +124,7 @@ cp %{_curdir}/debian/bm-lmtpd.init %{buildroot}%{_initrddir}/bm-lmtpd
118 118
 cp %{_curdir}/conf/bm-lmtpd/bm-lmtpd.default %{buildroot}/etc/default/bm-lmtpd
119 119
 cp %{_curdir}/conf/bm-lmtpd/bm-lmtpd.logback.xml %{buildroot}/etc/bm-lmtpd
120 120
 cp %{_curdir}/conf/rh-chkconfig.d/bm-lmtpd %{buildroot}/etc/chkconfig.d
121
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-lmtpd
121 122
 
122 123
 # Install bm-mq
123 124
 tar xjvf %{_curdir}/bm-mq.tar.bz2 -C %{buildroot}/usr/share
... ...
@@ -127,6 +134,7 @@ mkdir -p %{buildroot}/var/lib/bm-mq-data
127 127
 mkdir -p %{buildroot}/var/log/bm-mq
128 128
 cp %{_curdir}/debian/bm-mq.init %{buildroot}%{_initrddir}/bm-mq
129 129
 cp %{_curdir}/conf/rh-chkconfig.d/bm-mq %{buildroot}/etc/chkconfig.d
130
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-mq
130 131
 
131 132
 # Install ysnp
132 133
 tar xjvf %{_curdir}/ysnp.tar.bz2 -C %{buildroot}/usr/share
... ...
@@ -136,6 +144,7 @@ mkdir -p %{buildroot}/var/log/ysnp
136 136
 mkdir -p %{buildroot}/var/run/saslauthd
137 137
 cp %{_curdir}/debian/ysnp.init %{buildroot}%{_initrddir}/ysnp
138 138
 cp %{_curdir}/conf/rh-chkconfig.d/ysnp %{buildroot}/etc/chkconfig.d
139
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/ysnp
139 140
 
140 141
 # Install bm-tomcat
141 142
 tar xvfj %{_curdir}/tomcat/bm-tomcat-6.0.35.tar.bz2 -C %{buildroot}/usr/share
... ...
@@ -159,28 +168,34 @@ cp %{_curdir}/conf/rh-chkconfig.d/bm-tomcat %{buildroot}/etc/chkconfig.d
159 159
 # Install bm-default-app
160 160
 cp -a %{_curdir}/debian/bm-default-app/usr/share/bm-default-app %{buildroot}/usr/share
161 161
 cp %{_curdir}/debian/bm-default-app/usr/share/bm-tomcat/applis/ROOT.xml %{buildroot}/usr/share/bm-tomcat/applis
162
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-default-app
162 163
 
163 164
 # Install bm-soap
164 165
 cp -a %{_curdir}/debian/bm-soap/usr/share/bm-soap %{buildroot}/usr/share
165 166
 cp %{_curdir}/debian/bm-soap/usr/share/bm-tomcat/applis/soap.xml %{buildroot}/usr/share/bm-tomcat/applis
167
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-soap
166 168
 
167 169
 # Install bm-calendar
168 170
 cp -a %{_curdir}/debian/bm-calendar/usr/share/bm-calendar %{buildroot}/usr/share
169 171
 cp %{_curdir}/debian/bm-calendar/usr/share/bm-tomcat/applis/cal.xml %{buildroot}/usr/share/bm-tomcat/applis
172
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-calendar
170 173
 
171 174
 # Install bm-contact
172 175
 cp -a %{_curdir}/debian/bm-contact/usr/share/bm-contact %{buildroot}/usr/share
173 176
 cp %{_curdir}/debian/bm-contact/usr/share/bm-tomcat/applis/contact.xml %{buildroot}/usr/share/bm-tomcat/applis
177
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-contact
174 178
 
175 179
 # Install bm-settings
176 180
 mkdir -p %{buildroot}/etc/bm/settings
177 181
 cp -a %{_curdir}/debian/bm-settings/usr/share/bm-settings %{buildroot}/usr/share
178 182
 cp %{_curdir}/debian/bm-settings/usr/share/bm-tomcat/applis/settings.xml %{buildroot}/usr/share/bm-tomcat/applis
183
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-settings
179 184
 
180 185
 # Install bm-admin-console
181 186
 mkdir -p %{buildroot}/etc/bm/adminconsole
182 187
 cp -a %{_curdir}/debian/bm-admin-console/usr/share/bm-admin-console %{buildroot}/usr/share
183 188
 cp %{_curdir}/debian/bm-admin-console/usr/share/bm-tomcat/applis/adminconsole.xml %{buildroot}/usr/share/bm-tomcat/applis
189
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-admin-console
184 190
 
185 191
 %clean
186 192
 # Clean RedHat build root
... ...
@@ -31,6 +31,7 @@ mkdir -p %{buildroot}/var/log/bm-webmail
31 31
 cp -a %{_curdir}/debian/bm-webmail/* %{buildroot}
32 32
 mkdir -p %{buildroot}/etc/logrotate.d
33 33
 cp -a %{_curdir}/debian/bm-webmail.logrotate %{buildroot}/etc/logrotate.d/bm-webmail
34
+cp %{_curdir}/LICENSE.txt  %{buildroot}/usr/share/bm-webmail
34 35
 
35 36
 %files
36 37
 %{_datadir}/bm-webmail