[27434] Try to fix p2 service

Author: col-panic

bundles/es.core.p2/OSGI-INF/info.elexis.server.core.p2.internal.Provisioner.xml

@@ -4,5 +4,6 @@
       <provide interface="info.elexis.server.core.p2.IProvisioner"/>
    </service>
    <reference bind="setAgentProvider" cardinality="1..1" interface="org.eclipse.equinox.p2.core.IProvisioningAgentProvider" name="AgentProvider" policy="static" unbind="unsetAgentProvider"/>
+   <reference bind="setMetadataRepositoryManager" interface="org.eclipse.equinox.p2.core.spi.IAgentServiceFactory" name="MetadataRepositoryManager" target="(p2.agent.servicename=org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager)"/>
    <implementation class="info.elexis.server.core.p2.internal.Provisioner"/>
 </scr:component>

bundles/es.core.p2/src/info/elexis/server/core/p2/internal/Provisioner.java

@@ -18,6 +18,7 @@
 import org.eclipse.equinox.p2.core.IProvisioningAgent;
 import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
 import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.core.spi.IAgentServiceFactory;
 import org.eclipse.equinox.p2.engine.IProfile;
 import org.eclipse.equinox.p2.engine.IProfileRegistry;
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
@@ -70,6 +71,11 @@ protected void setAgentProvider(IProvisioningAgentProvider agentProvider) {
 		this.agentProvider = agentProvider;
 	}
 
+	@Reference(target = "(p2.agent.servicename=org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager)")
+	protected void setMetadataRepositoryManager(IAgentServiceFactory serviceFactory) {
+		// is necessary to have the service loaded on startup
+	}
+
 	protected void unsetAgentProvider(IProvisioningAgentProvider agentProvider) {
 		this.agentProvider = null;
 	}
@@ -225,16 +231,16 @@ public Collection<IInstallableUnit> getInstalledFeatures() {
 
 	@Override
 	public Collection<IInstallableUnit> getAllAvailableFeatures(IProgressMonitor monitor) {
-		if(monitor == null) {
+		if (monitor == null) {
 			monitor = new NullProgressMonitor();
 		}
-		IQueryResult<IInstallableUnit> result =
-			metadataRepositoryManager.query(QueryUtil.createIUGroupQuery(), monitor);
+		IQueryResult<IInstallableUnit> result = metadataRepositoryManager.query(QueryUtil.createIUGroupQuery(),
+				monitor);
 		return result.toSet();
 	}
 
 	@Override
-	public IInstallableUnit getFeatureInAllAvailableFeatures(IProgressMonitor monitor, String id){
+	public IInstallableUnit getFeatureInAllAvailableFeatures(IProgressMonitor monitor, String id) {
 		Collection<IInstallableUnit> allAvailableFeatures = getAllAvailableFeatures(monitor);
 		for (IInstallableUnit iu : allAvailableFeatures) {
 			if (iu.getId().equalsIgnoreCase(id))
@@ -286,9 +292,9 @@ public void addRepository(URI location, String username, String password) {
 
 		registerHttpAuthentication(location, username, password);
 	}
-	
+
 	@Override
-	public IStatus loadRepository(IProgressMonitor monitor, URI location){
+	public IStatus loadRepository(IProgressMonitor monitor, URI location) {
 		try {
 			metadataRepositoryManager.loadRepository(location, monitor);
 			return Status.OK_STATUS;