No commit message

advanced.tutorial/pom.xml

@@ -14,6 +14,5 @@
 		<module>vendor.customer.creator</module>
 		<module>vendor.popcorn</module>
 		<module>vendor.corn.transporter</module>
-		<module>vender.test</module>
 	</modules>
 </project>

advanced.tutorial/vendor.buns-and-wieners/src/main/java/org/vendor/buns/and/wieners/BunWienerProvider.java

@@ -10,7 +10,7 @@
 /**
  * Component implementation providing both buns and wieners.
  */
-@Component(name="buns_and_wieners", public_factory=false, architecture=true)
+@Component(name="buns_and_wieners", publicFactory=false, architecture=true)
 @Provides
 @Instantiate(name="buns_and_wieners")
 public class BunWienerProvider implements Bun, Wiener {

advanced.tutorial/vendor.corn.transporter/pom.xml

@@ -24,7 +24,6 @@
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.configadmin</artifactId>
 			<version>1.2.8</version>
-			<scope>compile</scope>
 		</dependency>
 	</dependencies>
 

advanced.tutorial/vendor.corn.transporter/src/main/java/org/vendor/corn/transporter/CornTransporter.java

@@ -32,7 +32,7 @@
  * The corn transport refill corn stock. This class use iPOJO reconfiguration
  * features to reconfigure the popcorn vendor.
  */
-@Component(name = "transporter", public_factory = false, architecture = true)
+@Component(name = "transporter", publicFactory = false, architecture = true)
 @Instantiate
 public class CornTransporter {
 
@@ -49,9 +49,9 @@ public void refillStock() {
 			// configuration admin
 			Configuration configuration = m_configAdmin.getConfiguration(
 					"Super.PopCorn.Stock",
-					"file:D:/may/sDrive/advanced.tutorial/vendor.corn.transporter/target/vendor.corn.transporter-1.0.0.jar");
+					"file:D:/svn/uims/advanced.tutorial/vendor.popcorn/target/vendor.popcorn-1.0.0.jar");
 			configuration
-					.setBundleLocation("file:D:/may/sDrive/advanced.tutorial/vendor.corn.transporter/target/vendor.corn.transporter-1.0.0.jar");
+					.setBundleLocation("file:D:/svn/uims/advanced.tutorial/vendor.popcorn/target/vendor.popcorn-1.0.0.jar");
 			Properties props = new Properties();
 			props.put("stock", new Integer(15)); // Delivered corn
 			configuration.update(props);

advanced.tutorial/vendor.customer/src/main/java/org/vendor/customer/Customer.java

@@ -51,7 +51,7 @@ public class Customer {
      */
     public Customer() {
         Product product = vendor.sell();
-        System.out.println("Customer " + name + " bought " +  product.getProductType() + " from " + product.getProductType());
+        System.out.println("Customer " + name + " bought " +  product.getProductType() + " from " + product.getProductOrigin());
     }
 
 }

advanced.tutorial/vendor.customer/src/main/resources/metadata.xml

@@ -1,34 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/CURRENT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
-	<instance component="customer">
-		<property name="name" value="customer-1" />
-	</instance>
-	<instance component="customer">
-		<property name="name" value="customer-2" />
-	</instance>
-	<instance component="customer">
-		<property name="name" value="customer-3" />
-	</instance>
-	<instance component="customer">
-		<property name="name" value="customer-4" />
-	</instance>
-	<instance component="customer">
-		<property name="name" value="customer-5" />
-	</instance>
-	<instance component="customer">
-		<property name="name" value="customer-6" />
-	</instance>
-	<instance component="customer">
-		<property name="name" value="customer-7" />
-	</instance>
-	<instance component="customer">
-		<property name="name" value="customer-8" />
-	</instance>
-	<instance component="customer">
-		<property name="name" value="customer-9" />
-	</instance>
-	<instance component="customer">
-		<property name="name" value="customer-10" />
-	</instance>
+
 </ipojo>

advanced.tutorial/vendor.hotdog/src/main/java/org/vendor/hotdog/HotDogVendor.java

@@ -9,7 +9,7 @@
 import org.vendor.services.ingredient.Bun;
 import org.vendor.services.ingredient.Wiener;
 
-@Component(name="HD", public_factory=false, architecture=true)
+@Component(name="HD", publicFactory=false, architecture=true)
 @Provides
 @Instantiate
 public class HotDogVendor implements Vendor {

advanced.tutorial/vendor.services/src/main/java/org/vendor/services/Product.java

@@ -3,5 +3,7 @@
 public interface Product {
 
 	String getProductType();
+
+	String getProductOrigin();
 
 }