/**
 * Licensed to the Austrian Association for Software Tool Integration (AASTI)
 * under one or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information regarding copyright
 * ownership. The AASTI 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.
 */

package org.openengsb.core.workflow;

import java.util.HashMap;
import java.util.Map;

import org.openengsb.core.api.remote.MethodCall;
import org.openengsb.core.api.remote.OutgoingPortUtilService;
import org.openengsb.core.api.workflow.model.RemoteEvent;
import org.openengsb.core.common.OpenEngSBCoreServices;

public final class OsgiHelper {

    private static OutgoingPortUtilService outgoingPortUtil = OpenEngSBCoreServices.getOutgoingPortUtilService();

    public static void sendRemoteEvent(String portId, String destination, RemoteEvent e)
        throws PortNotAvailableException {
        sendRemoteEvent(portId, destination, e, new HashMap<String, String>());
    }

    public static void sendRemoteEvent(String portId, String destination, RemoteEvent e, Map<String, String> metaData)
        throws PortNotAvailableException {
        MethodCall methodCall = new MethodCall("processRemoteEvent", new Object[]{ e }, metaData);
        outgoingPortUtil.sendMethodCall(portId, destination, methodCall);
    }

    public static void sendRemoteEvent(String portId, String destination, RemoteEvent e, String serviceId)
        throws PortNotAvailableException {
        Map<String, String> metaData = new HashMap<String, String>();
        metaData.put("serviceId", serviceId);
        sendRemoteEvent(portId, destination, e, metaData);
    }

    private OsgiHelper() {
    }

}

@@ -963,70 +963,8 @@
 ll;%0A
-import org.openengsb.core.api.remote.OutgoingPortUtilService;%0A
 impo
@@ -1111,123 +1111,8 @@
  %7B%0A%0A
-    private static OutgoingPortUtilService outgoingPortUtil = OpenEngSBCoreServices.getOutgoingPortUtilService();%0A%0A
     
@@ -1595,17 +1595,42 @@
         
-o
+OpenEngSBCoreServices.getO
 utgoingP
@@ -1636,16 +1636,25 @@
 PortUtil
+Service()
 .sendMet

fix possible unit-test-fail