Templates fixes

osgi.enroute.bndtools.templates/resources/api/template/{{srcDir}}/{{basePackageDir}}/package-info.java

@@ -1,2 +1,2 @@
 @org.osgi.annotation.versioning.Version("1.0.0")
-package {{basePackageName}}.api;
+package {{basePackageName}};

osgi.enroute.bndtools.templates/resources/api/template/{{srcDir}}/{{basePackageDir}}/{{service}}.java

@@ -1,18 +1,18 @@
-package {{basePackageName}}.api;
+package {{basePackageName}};
 
 import org.osgi.annotation.versioning.ProviderType;
 
 /**
- * This is an example enroute bundle that has a component that implements a
- * simple API. 
+ * This is an example OSGi enRoute bundle that has a component that implements an
+ * API.
  */
 
 @ProviderType
-public interface ExampleApi {
-	
+public interface {{service}} {
+
 	/**
 	 * The interface is a minimal method.
-	 * 
+	 *
 	 * @param message the message to say
 	 * @return true if the message could be spoken
 	 */

osgi.enroute.bndtools.templates/resources/application/template/{{srcDir}}/{{basePackageDir}}/{{primaryName}}.java

@@ -13,7 +13,7 @@
 @RequireWebServerExtender
 @RequireConfigurerExtender
 @Component(name="{{projectName}}")
-public class ExampleApplication implements REST {
+public class {{primaryName}} implements REST {
 
 	public String getUpper(String string) {
 		return string.toUpperCase();

osgi.enroute.bndtools.templates/resources/provider/template/{{srcDir}}/{{basePackageDir}}/ProviderImpl.java

@@ -1,35 +1,32 @@
-package {{basePackageName}}.provider;
+package {{basePackageName}};
 
 import java.util.Map;
 
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+import org.osgi.service.metatype.annotations.Designate;
 
-import {{basePackageName}}.api.Provider;
 
-/**
- * This is the implementation.It registers a Provider service.
- */
-@Component(immediate=true, name="{{projectName}}")
-public class ProviderImpl implements Provider {
+@Designate( ocd=ProviderImpl.Config.class, factory=true)
+@Component(name="{{projectName}}")
+public class ProviderImpl /* implements SomeApi */ {
+
+	@ObjectClassDefinition
+	@interface Config {
+		String name() default "World";
+	}
+
 	private String name;
 
 	@Activate
-	void activate(Map<String, Object> map) {
-		name = map.containsKey("name") ? (String) map.get("name") : "World";
-		say("Hello");
+	void activate(Config config) {
+		this.name = config.name();
 	}
 
 	@Deactivate
-	void deactivate(Map<String, Object> map) {
-		say("Goodbye");
-	}
-
-	@Override
-	public boolean say(String message) {
-		System.out.println(name + ":"  + message);
-		return false;
+	void deactivate() {
 	}
 
 }