tigase/_server/server-core

Issue #1057 - added support for loading repository implementations for external jars in OSGi
Andrzej Wójcik committed 1 decade ago

ec2195ef

1 parent 003a24eb

src/main/java/tigase/db/RepositoryFactory.java

■ ■ ■ ■ ■ ■

		skipped 31 lines
32	32		import java.util.concurrent.ConcurrentMap;
33	33		import java.util.LinkedHashMap;
34	34		import java.util.Map;
	35	+	import tigase.osgi.ModulesManagerImpl;
35	36
36	37		/**
37	38		* Describe class RepositoryFactory here.
		skipped 282 lines
320	321		repo_pool_size));
321	322		params.put(RepositoryFactory.DATABASE_TYPE_PROP_KEY, class_name);
322	323		if (repo_pool_cls != null) {
323		-	AuthRepositoryPool repo_pool = (AuthRepositoryPool) Class.forName(repo_pool_cls)
	324	+	AuthRepositoryPool repo_pool = (AuthRepositoryPool) ModulesManagerImpl.getInstance().forName(repo_pool_cls)
324	325		.newInstance();
325	326
326	327		repo_pool.initRepository(resource, params);
327	328		for (int i = 0; i < repo_pool_size; i++) {
328		-	repo = (AuthRepository) Class.forName(cls).newInstance();
	329	+	repo = (AuthRepository) ModulesManagerImpl.getInstance().forName(cls).newInstance();
329	330		repo.initRepository(resource, params);
330	331		repo_pool.addRepo(repo);
331	332		}
332	333		repo = repo_pool;
333	334		} else {
334		-	repo = (AuthRepository) Class.forName(cls).newInstance();
	335	+	repo = (AuthRepository) ModulesManagerImpl.getInstance().forName(cls).newInstance();
335	336		repo.initRepository(resource, params);
336	337		}
337	338		auth_repos.put(cls + resource, repo);
		skipped 45 lines
383	384		}
384	385		params.put(RepositoryFactory.DATABASE_TYPE_PROP_KEY, class_name);
385	386
386		-	DataRepositoryPool repo_pool = (DataRepositoryPool) Class.forName(System
	387	+	DataRepositoryPool repo_pool = (DataRepositoryPool) ModulesManagerImpl.getInstance().forName(System
387	388		.getProperty(DATA_REPO_POOL_CLASS_PROP_KEY, DATA_REPO_POOL_CLASS_PROP_VAL))
388	389		.newInstance();
389	390
390	391		repo_pool.initRepository(resource, params);
391	392		for (int i = 0; i < repo_pool_size; i++) {
392		-	repo = (DataRepository) Class.forName(cls).newInstance();
	393	+	repo = (DataRepository) ModulesManagerImpl.getInstance().forName(cls).newInstance();
393	394		repo.initRepository(resource, params);
394	395		repo_pool.addRepo(repo);
395	396		}
		skipped 91 lines
487	488		repo_pool_size));
488	489		params.put(RepositoryFactory.DATABASE_TYPE_PROP_KEY, class_name);
489	490		if (repo_pool_cls != null) {
490		-	UserRepositoryPool repo_pool = (UserRepositoryPool) Class.forName(repo_pool_cls)
	491	+	UserRepositoryPool repo_pool = (UserRepositoryPool) ModulesManagerImpl.getInstance().forName(repo_pool_cls)
491	492		.newInstance();
492	493
493	494		repo_pool.initRepository(resource, params);
494	495		for (int i = 0; i < repo_pool_size; i++) {
495		-	repo = (UserRepository) Class.forName(cls).newInstance();
	496	+	repo = (UserRepository) ModulesManagerImpl.getInstance().forName(cls).newInstance();
496	497		repo.initRepository(resource, params);
497	498		repo_pool.addRepo(repo);
498	499		}
499	500		repo = repo_pool;
500	501		} else {
501		-	repo = (UserRepository) Class.forName(cls).newInstance();
	502	+	repo = (UserRepository) ModulesManagerImpl.getInstance().forName(cls).newInstance();
502	503		repo.initRepository(resource, params);
503	504		}
504	505		user_repos.put(cls + resource, repo);
		skipped 9 lines

src/main/java/tigase/osgi/Activator.java

■ ■ ■ ■ ■ ■

		skipped 71 lines
72	72		log.log(Level.SEVERE, "Plugin loading excepton", e);
73	73		}
74	74
	75	+	// we need to export this before we start, so if start will fail due to missing
	76	+	// dependencies we would be able to add them later and recorver from this
	77	+	ModulesManagerImpl.getInstance().setActive(true);
	78	+	bc.registerService(ModulesManager.class.getName(), ModulesManagerImpl.getInstance(), new Hashtable());
	79	+
75	80		XMPPServer.start(new String[]{
76	81		ConfiguratorAbstract.PROPERTY_FILENAME_PROP_KEY, "etc/init.properties"
77	82		});
78	83
79	84		// if it is not too late
80	85		SLF4JBridgeHandler.install();
81		-
82		-	ModulesManagerImpl.getInstance().setActive(true);
83		-	bc.registerService(ModulesManager.class.getName(), ModulesManagerImpl.getInstance(), new Hashtable());
84	86		}
85	87		catch (Exception ex) {
86	88		log.log(Level.SEVERE, "Error starting bundle: ", ex);
		skipped 21 lines

Issue #1057 - added support for loading repository implementations for external jars in OSGi