Fix CNFE by removal of optional resolution (#1395)

Move the service that needs packages from core.transform and
model.script bundle to model.script. The core.transform is a core bundle
and also part of the base target platform, so it should be available.
The model script bundle is optional.

PR: https://github.com/eclipse/smarthome/pull/1395
Bug: https://github.com/eclipse/smarthome/issues/1394
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>

bundles/core/org.eclipse.smarthome.core.transform/META-INF/MANIFEST.MF

@@ -11,12 +11,10 @@ Import-Package: org.apache.commons.io,
  org.eclipse.smarthome.config.core,
  org.eclipse.smarthome.core.transform,
  org.eclipse.smarthome.core.transform.actions,
- org.eclipse.smarthome.model.script.engine.action;resolution:=optional,
  org.osgi.framework,
  org.slf4j
 Bundle-SymbolicName: org.eclipse.smarthome.core.transform
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Service-Component: OSGI-INF/transformationaction.xml
 Bundle-ClassPath: .
-Export-Package: org.eclipse.smarthome.core.transform,org.eclipse.smart
- home.core.transform.actions
+Export-Package: org.eclipse.smarthome.core.transform,
+ org.eclipse.smarthome.core.transform.actions

bundles/core/org.eclipse.smarthome.core.transform/build.properties

@@ -1,7 +1,6 @@
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
-               OSGI-INF/,\
                about.html
 source.. = src/main/java/,\
            src/main/resources/

bundles/model/org.eclipse.smarthome.model.script/META-INF/MANIFEST.MF

@@ -31,6 +31,7 @@ Import-Package: com.google.common.base,
  org.eclipse.smarthome.core.library.items,
  org.eclipse.smarthome.core.library.types,
  org.eclipse.smarthome.core.persistence,
+ org.eclipse.smarthome.core.transform.actions,
  org.eclipse.smarthome.core.types,
  org.eclipse.smarthome.io.console,
  org.eclipse.smarthome.io.console.extensions,

bundles/model/org.eclipse.smarthome.model.script/OSGI-INF/transformationaction.xml

@@ -9,8 +9,7 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" immediate="true" name="org.eclipse.smarthome.action.transformation.action">
-	<implementation class="org.eclipse.smarthome.core.transform.internal.TransformationActionService" />
-
+	<implementation class="org.eclipse.smarthome.model.script.internal.engine.action.TransformationActionService" />
 	<service>
 		<provide interface="org.eclipse.smarthome.model.script.engine.action.ActionService" />
 	</service>

bundles/model/org.eclipse.smarthome.model.script/src/org/eclipse/smarthome/model/script/internal/engine/action/TransformationActionService.java

@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.core.transform.internal;
+package org.eclipse.smarthome.model.script.internal.engine.action;
 
 import org.eclipse.smarthome.core.transform.actions.Transformation;
 import org.eclipse.smarthome.model.script.engine.action.ActionService;