geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r896306 - in /geronimo/xbean/trunk/xbean-blueprint/src/test: java/org/apache/xbean/blueprint/context/ resources/org/apache/xbean/blueprint/context/
Date Wed, 06 Jan 2010 02:23:27 GMT
Author: djencks
Date: Wed Jan  6 02:23:26 2010
New Revision: 896306

URL: http://svn.apache.org/viewvc?rev=896306&view=rev
Log:
XBEAN-142 a few more test fixes

Added:
    geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/gin.xml
  (with props)
Modified:
    geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/BlueprintTestSupport.java
    geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/GinUsingSpringTest.java
    geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/KegXBeanTest.java
    geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/PizzaUsingSpringTest.java
    geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/RestaurantUsingSpringTest.java
    geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/SaladUsingSpringTest.java
    geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/keg-xbean.xml
    geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/restaurant-normal.xml
    geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/restaurant-xbean.xml
    geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/salad-xbean.xml

Modified: geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/BlueprintTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/BlueprintTestSupport.java?rev=896306&r1=896305&r2=896306&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/BlueprintTestSupport.java
(original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/BlueprintTestSupport.java
Wed Jan  6 02:23:26 2010
@@ -25,21 +25,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.xbean.blueprint.context.impl.XBeanNamespaceHandler;
-import org.apache.xbean.blueprint.example.BeerService;
-import org.apache.xbean.blueprint.example.ContainerBean;
-import org.apache.xbean.blueprint.example.DummyBean;
-import org.apache.xbean.blueprint.example.FavoriteService;
-import org.apache.xbean.blueprint.example.FlatMapService;
-import org.apache.xbean.blueprint.example.GinService;
-import org.apache.xbean.blueprint.example.InnerBean;
-import org.apache.xbean.blueprint.example.KegService;
-import org.apache.xbean.blueprint.example.MilliLittersPropertyEditor;
-import org.apache.xbean.blueprint.example.PizzaService;
-import org.apache.xbean.blueprint.example.QNameService;
-import org.apache.xbean.blueprint.example.Recipe;
-import org.apache.xbean.blueprint.example.RecipeService;
-import org.apache.xbean.blueprint.example.RestaurantService;
-import org.apache.xbean.blueprint.example.SaladService;
 import org.xml.sax.SAXException;
 import org.osgi.service.blueprint.reflect.BeanProperty;
 import org.osgi.service.blueprint.reflect.ValueMetadata;
@@ -48,6 +33,7 @@
 import org.osgi.service.blueprint.reflect.BeanMetadata;
 
 import javax.xml.validation.Schema;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -61,7 +47,7 @@
 
 /**
  * A useful base class for testing spring based utilities.
- * 
+ *
  * @author James Strachan
  * @version $Id$
  * @since 2.0
@@ -88,7 +74,7 @@
 
         Set<Class> classes = new HashSet<Class>();
         ClassLoader cl = BlueprintTestSupport.class.getClassLoader();
-        for (Map.Entry entry: properties.entrySet()) {
+        for (Map.Entry entry : properties.entrySet()) {
             String key = (String) entry.getKey();
             if (!key.contains(".")) {
                 String className = (String) entry.getValue();
@@ -102,19 +88,25 @@
             public Set<URI> getNamespaces() {
                 return Collections.singleton(NAMESPACE_URI);
             }
+
             public NamespaceHandler getNamespaceHandler(URI namespace) {
                 return xbeanHandler;
             }
+
             public void removeListener(NamespaceHandlerRegistry.Listener listener) {
             }
+
             public Schema getSchema() throws SAXException, IOException {
                 return null;
             }
+
             public boolean isComplete() {
                 return false;
             }
+
             public void addListener(NamespaceHandlerRegistry.Listener listener) {
             }
+
             public void destroy() {
             }
         };
@@ -132,22 +124,27 @@
 
     protected abstract String getPlan();
 
-    protected void checkPropertyValue(String name, String expectedValued, BeanMetadataImpl
meta) {
+    protected void checkPropertyValue(String name, Object expectedValued, BeanMetadataImpl
meta) {
+        BeanProperty prop = propertyByName(name, meta);
+        assertEquals(expectedValued, ((ValueMetadata) prop.getValue()).getStringValue());
+    }
+
+    protected BeanProperty propertyByName(String name, BeanMetadataImpl meta) {
         List<BeanProperty> props = meta.getProperties();
-        for (BeanProperty prop: props) {
+        for (BeanProperty prop : props) {
             if (name.equals(prop.getName())) {
-                assertEquals(expectedValued, ((ValueMetadata)prop.getValue()).getStringValue());
-                return;
+                return prop;
             }
         }
         throw new RuntimeException("No such property: " + name + " in metadata: " + meta);
+
     }
 
     protected void checkArgumentValue(int index, String expectedValued, BeanMetadataImpl
meta, boolean allowNesting) {
         List<BeanArgument> props = meta.getArguments();
         Metadata metadata = props.get(index).getValue();
         if (allowNesting && metadata instanceof BeanMetadata) {
-            metadata = ((BeanMetadata)metadata).getArguments().get(0).getValue();
+            metadata = ((BeanMetadata) metadata).getArguments().get(0).getValue();
         }
         assertEquals(expectedValued, ((ValueMetadata) metadata).getStringValue());
     }

Modified: geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/GinUsingSpringTest.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/GinUsingSpringTest.java?rev=896306&r1=896305&r2=896306&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/GinUsingSpringTest.java
(original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/GinUsingSpringTest.java
Wed Jan  6 02:23:26 2010
@@ -28,7 +28,7 @@
     
     public void testWine() throws Exception {
         BeanMetadataImpl meta = (BeanMetadataImpl)  reg.getComponentDefinition("ginService");
-
+        //TODO content processing
         checkPropertyValue("name", "Bombay Sapphire", meta);
     }
 

Modified: geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/KegXBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/KegXBeanTest.java?rev=896306&r1=896305&r2=896306&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/KegXBeanTest.java
(original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/KegXBeanTest.java
Wed Jan  6 02:23:26 2010
@@ -29,16 +29,16 @@
 public class KegXBeanTest extends BlueprintTestSupport {
 
     public void testBeer() throws Exception {
-
+        //TODO blueprint value conversion using units??
         BeanMetadataImpl ml1000 = (BeanMetadataImpl) reg.getComponentDefinition("ml1000");
         BeanMetadataImpl empty = (BeanMetadataImpl) reg.getComponentDefinition("empty");
         BeanMetadataImpl pints5 = (BeanMetadataImpl) reg.getComponentDefinition("pints5");
         BeanMetadataImpl liter20 = (BeanMetadataImpl) reg.getComponentDefinition("liter20");
         
-        checkPropertyValue("remainging", "1000", ml1000);
-        checkPropertyValue("remainging", "0", empty);
-        checkPropertyValue("remainging", "8750", pints5);
-        checkPropertyValue("remainging", "20000", liter20);
+        checkPropertyValue("remaining", "1000", ml1000);
+        checkPropertyValue("remaining", "0", empty);
+        checkPropertyValue("remaining", "8750", pints5);
+        checkPropertyValue("remaining", "20000", liter20);
         
     }
 

Modified: geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/PizzaUsingSpringTest.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/PizzaUsingSpringTest.java?rev=896306&r1=896305&r2=896306&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/PizzaUsingSpringTest.java
(original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/PizzaUsingSpringTest.java
Wed Jan  6 02:23:26 2010
@@ -32,7 +32,7 @@
 
         checkPropertyValue("topping", "Salami", meta);
         checkPropertyValue("cheese", "Edam", meta);
-        //TODO blueprint
+        //TODO blueprint int values
 //        checkPropertyValue("size", 17, meta);
     }
 

Modified: geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/RestaurantUsingSpringTest.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/RestaurantUsingSpringTest.java?rev=896306&r1=896305&r2=896306&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/RestaurantUsingSpringTest.java
(original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/RestaurantUsingSpringTest.java
Wed Jan  6 02:23:26 2010
@@ -17,12 +17,13 @@
 package org.apache.xbean.blueprint.context;
 
 import java.util.List;
-import java.util.Set;
 
-import javax.xml.namespace.QName;
-
-import org.apache.xbean.blueprint.example.PizzaService;
-import org.apache.xbean.blueprint.example.RestaurantService;
+import org.apache.aries.blueprint.reflect.BeanMetadataImpl;
+import org.apache.aries.blueprint.reflect.ValueMetadataImpl;
+import org.apache.aries.blueprint.reflect.CollectionMetadataImpl;
+import org.osgi.service.blueprint.reflect.BeanProperty;
+import org.osgi.service.blueprint.reflect.CollectionMetadata;
+import org.osgi.service.blueprint.reflect.Metadata;
 
 /**
  * @author James Strachan
@@ -32,60 +33,71 @@
 public class RestaurantUsingSpringTest extends BlueprintTestSupport {
 
     public void testPizza() throws Exception {
-        RestaurantService restaurant = (RestaurantService) reg.getComponentDefinition("restaurant");
+        BeanMetadataImpl restaurant = (BeanMetadataImpl) reg.getComponentDefinition("restaurant");
+
+        BeanProperty prop = propertyByName("serviceName", restaurant);
 
-        QName service = restaurant.getServiceName();
-        assertEquals(new QName("http://acme.com", "xyz"), service);
+        BeanMetadataImpl qname = (BeanMetadataImpl) prop.getValue();
+        assertEquals(2, qname.getArguments().size());
+        assertEquals("http://acme.com", ((ValueMetadataImpl) qname.getArguments().get(0).getValue()).getStringValue());
+        assertEquals("xyz", ((ValueMetadataImpl) qname.getArguments().get(1).getValue()).getStringValue());
 
         // dinners (1-many using list)
-        List dinners = restaurant.getDinnerMenu();
+        BeanProperty dinnerProp = propertyByName("dinnerMenu", restaurant);
+        List<Metadata> dinners = ((CollectionMetadata) dinnerProp.getValue()).getValues();
         assertNotNull("dinners is null!", dinners);
         assertEquals("dinners size: " + dinners, 2, dinners.size());
 
-        PizzaService pizza = (PizzaService) dinners.get(0);
-        assertEquals("topping", "Ham", pizza.getTopping());
-        assertEquals("cheese", "Mozzarella", pizza.getCheese());
-        assertEquals("size", 15, pizza.getSize());
-
-        pizza = (PizzaService) dinners.get(1);
-        assertEquals("topping", "Eggs", pizza.getTopping());
-        assertEquals("cheese", "Mozzarella", pizza.getCheese());
-        assertEquals("size", 16, pizza.getSize());
+        BeanMetadataImpl pizza = (BeanMetadataImpl) dinners.get(0);
+        checkPropertyValue("topping", "Ham", pizza);
+        checkPropertyValue("cheese", "Mozzarella", pizza);
+        //TODO blueprint int value
+        checkPropertyValue("size", "15", pizza);
+
+        pizza = (BeanMetadataImpl) dinners.get(1);
+        checkPropertyValue("topping", "Eggs", pizza);
+        checkPropertyValue("cheese", "Mozzarella", pizza);
+        //TODO blueprint int value
+        checkPropertyValue("size", "16", pizza);
 
         // dinners (1-many using Set)
-        Set<PizzaService> snacks = restaurant.getSnackMenu();
+        BeanProperty snackProp = propertyByName("snackMenu", restaurant);
+        List<Metadata> snacks = ((CollectionMetadata) snackProp.getValue()).getValues();
         assertNotNull("dinners is null!", snacks);
         assertEquals("dinners size: " + snacks, 2, snacks.size());
-        for (PizzaService snack : snacks) {
-            String topping = snack.getTopping();
+        for (Metadata snackMeta : snacks) {
+            BeanMetadataImpl snack = (BeanMetadataImpl) snackMeta;
+            BeanProperty toppingProp = propertyByName("topping", snack);
+            String topping = ((ValueMetadataImpl)toppingProp.getValue()).getStringValue();
             if ("Tofu".equals(topping)) {
-                assertEquals("cheese", "Parmesan", snack.getCheese());
-                assertEquals("size", 6, snack.getSize());
+                checkPropertyValue("cheese", "Parmesan", snack);
+                checkPropertyValue("size", "6", snack);
             } else if ("Prosciutto".equals(topping)) {
-                assertEquals("cheese", "Blue", snack.getCheese());
-                assertEquals("size", 8, snack.getSize());
+                checkPropertyValue("cheese", "Blue", snack);
+                checkPropertyValue("size", "8", snack);
             } else {
-                fail("wrong topping: " + snack);
+                fail("wrong topping: " + snackMeta);
             }
         }
         // lunches (1-many using array)
-        PizzaService[] lunches = restaurant.getLunchMenu();
+        CollectionMetadataImpl lunches = (CollectionMetadataImpl) propertyByName("lunchMenu",
restaurant).getValue();
         assertNotNull("lunches is null!", lunches);
-        assertEquals("lunches size: " + lunches, 1, lunches.length);
+        assertEquals("lunches size: " + lunches, 1, lunches.getValues().size());
 
-        pizza = lunches[0];
-        assertEquals("topping", "Chicken", pizza.getTopping());
-        assertEquals("cheese", "Brie", pizza.getCheese());
-        assertEquals("size", 17, pizza.getSize());
+        pizza = (BeanMetadataImpl) lunches.getValues().get(0);
+        checkPropertyValue("topping", "Chicken", pizza);
+        checkPropertyValue("cheese", "Brie", pizza);
+        checkPropertyValue("size", "17", pizza);
 
         // favourite (1-1)
-        pizza = restaurant.getFavourite();
+        BeanProperty favourite = propertyByName("favourite", restaurant);
+        pizza = (BeanMetadataImpl) favourite.getValue();
         assertNotNull("Pizza is null!", pizza);
-        pizza.makePizza();
-
-        assertEquals("topping", "Salami", pizza.getTopping());
-        assertEquals("cheese", "Edam", pizza.getCheese());
-        assertEquals("size", 17, pizza.getSize());
+//        pizza.makePizza();
+//
+        checkPropertyValue("topping", "Salami", pizza);
+        checkPropertyValue("cheese", "Edam", pizza);
+        checkPropertyValue("size", "17", pizza);
 
     }
 

Modified: geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/SaladUsingSpringTest.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/SaladUsingSpringTest.java?rev=896306&r1=896305&r2=896306&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/SaladUsingSpringTest.java
(original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/java/org/apache/xbean/blueprint/context/SaladUsingSpringTest.java
Wed Jan  6 02:23:26 2010
@@ -17,6 +17,7 @@
 package org.apache.xbean.blueprint.context;
 
 import org.apache.xbean.blueprint.example.SaladService;
+import org.apache.aries.blueprint.reflect.BeanMetadataImpl;
 
 /**
  * @author Dain Sundstrom
@@ -25,11 +26,11 @@
  */
 public class SaladUsingSpringTest extends BlueprintTestSupport {
     public void testSalad() throws Exception {
-        SaladService salad = (SaladService) reg.getComponentDefinition("saladService");
+        BeanMetadataImpl salad = (BeanMetadataImpl) reg.getComponentDefinition("saladService");
 
-        assertEquals("dressing", "Cesar", salad.getDressing());
-        assertEquals("size", "Small", salad.getSize());
-        assertEquals("crouton", true, salad.isCrouton());
+        checkArgumentValue(0, "Cesar", salad, false);
+        checkArgumentValue(1, "Small", salad, false);
+        checkArgumentValue(2, "true", salad, false);
     }
 
     protected String getPlan() {

Added: geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/gin.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/gin.xml?rev=896306&view=auto
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/gin.xml
(added)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/gin.xml
Wed Jan  6 02:23:26 2010
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF 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.
+
+-->
+<!-- START SNIPPET: xml -->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:b="http://xbean.apache.org/schemas/pizza">
+
+  <b:gin id="ginService"><![CDATA[Bombay Sapphire]]></b:gin>
+
+</blueprint>
+<!-- END SNIPPET: xml -->
+

Propchange: geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/gin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/gin.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/gin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/keg-xbean.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/keg-xbean.xml?rev=896306&r1=896305&r2=896306&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/keg-xbean.xml
(original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/keg-xbean.xml
Wed Jan  6 02:23:26 2010
@@ -18,12 +18,12 @@
 
 -->
 <!-- START SNIPPET: xml -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:x="http://xbean.apache.org/schemas/pizza">
+<b:blueprint xmlns:b="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:x="http://xbean.apache.org/schemas/pizza">
 
-  <x:keg id="ml1000" remaining="1000 ml"/>
-  <x:keg id="pints5" remaining="5 pints"/>
-  <x:keg id="liter20" remaining="20 liter"/>
-  <x:keg id="empty" remaining="0"/>
+  <x:keg b:id="ml1000" x:remaining="1000 ml"/>
+  <x:keg b:id="pints5" x:remaining="5 pints"/>
+  <x:keg b:id="liter20" x:remaining="20 liter"/>
+  <x:keg b:id="empty" x:remaining="0"/>
 
-</blueprint>
+</b:blueprint>
 <!-- END SNIPPET: xml -->

Modified: geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/restaurant-normal.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/restaurant-normal.xml?rev=896306&r1=896305&r2=896306&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/restaurant-normal.xml
(original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/restaurant-normal.xml
Wed Jan  6 02:23:26 2010
@@ -25,8 +25,8 @@
     class="org.apache.xbean.blueprint.example.RestaurantService">
     <property name="serviceName">
       <bean class="javax.xml.namespace.QName">
-        <constructor-arg value="http://acme.com"/>
-        <constructor-arg value="xyz"/>
+        <argument value="http://acme.com"/>
+        <argument value="xyz"/>
       </bean>
     </property>
     <property name="favourite">

Modified: geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/restaurant-xbean.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/restaurant-xbean.xml?rev=896306&r1=896305&r2=896306&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/restaurant-xbean.xml
(original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/restaurant-xbean.xml
Wed Jan  6 02:23:26 2010
@@ -21,7 +21,7 @@
 <b:blueprint xmlns:b="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns="http://xbean.apache.org/schemas/pizza">
        xmlns:foo="http://acme.com">
 
-  <restaurant id="restaurant" 
+  <restaurant b:id="restaurant" 
               serviceName="foo:xyz" 
               uri="http://cheese.com">
     <dinnerMenu>

Modified: geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/salad-xbean.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/salad-xbean.xml?rev=896306&r1=896305&r2=896306&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/salad-xbean.xml
(original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/test/resources/org/apache/xbean/blueprint/context/salad-xbean.xml
Wed Jan  6 02:23:26 2010
@@ -18,10 +18,10 @@
 
 -->
 <!-- START SNIPPET: xml -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:s="http://xbean.apache.org/schemas/salad">
+<b:blueprint xmlns:b="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:s="http://xbean.apache.org/schemas/salad">
 
   <s:salad id="saladService" dressing="Cesar" size="Small" addCroutons="true"/>
   
-</blueprint>
+</b:blueprint>
 <!-- END SNIPPET: xml -->
 



Mime
View raw message