[jboss-cvs] JBossAS SVN: r88856 - in projects/jboss-osgi/trunk/bundle/blueprint/src: main/java/org/jboss/osgi/blueprint/parser and 3 other directories.

Thu May 14 04:47:33 EDT 2009

Author: thomas.diesler at jboss.com
Date: 2009-05-14 04:47:33 -0400 (Thu, 14 May 2009)
New Revision: 88856

Added:
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Availability.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Bean.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Blueprint.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Component.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TReferenceListener.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomparator.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TregistrationListener.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tservice.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TservicePropertyEntry.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceReference.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TtypeConverters.java
Removed:
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TReferenceListener.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tavailability.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tbean.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tblueprint.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomparator.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomponent.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tdescription.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TregistrationListener.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tservice.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TservicePropertyEntry.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceReference.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TtypeConverters.java
Modified:
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/parser/BlueprintParser.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TautoExportModes.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tinterfaces.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tmap.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tnull.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tprop.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tprops.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tref.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TrefCollection.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Treference.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceProperties.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TtypedCollection.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tvalue.java
   projects/jboss-osgi/trunk/bundle/blueprint/src/main/resources/schema/blueprint-jbxb.xsd
   projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/parser/ParserTestCase.java
Log:
BP: rename package model to reflect

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/parser/BlueprintParser.java
===================================================================

--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/parser/BlueprintParser.java	2009-05-14 08:11:21 UTC (rev 88855)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/parser/BlueprintParser.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -25,7 +25,7 @@
 
 import java.net.URL;
 
-import org.jboss.osgi.blueprint.model.Blueprint;
+import org.jboss.osgi.blueprint.reflect.Blueprint;
 import org.jboss.xb.binding.JBossXBException;
 import org.jboss.xb.binding.Unmarshaller;
 import org.jboss.xb.binding.UnmarshallerFactory;

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect (from rev 88810, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model)

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Availability.java (from rev 88821, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Availability.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Availability.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Availability.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.blueprint.reflect;
+
+/**
+ * Defines an availability attribute type.  This is used in this
+ * schema by the &lt;blueprint> default-availability attribute and the
+ * &lt;reference&gt;, &lt;ref-set&gt;, and &lt;ref-list&gt; availability attribute.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 13-May-2009
+ */
+public enum Availability
+{
+   MANDATORY("mandatory"), 
+   OPTIONAL("optional");
+
+   private final String value;
+
+   Availability(String v)
+   {
+      value = v;
+   }
+
+   public String value()
+   {
+      return value;
+   }
+
+   public static Availability fromValue(String v)
+   {
+      for (Availability c : Availability.values())
+      {
+         if (c.value.equals(v))
+         {
+            return c;
+         }
+      }
+      throw new IllegalArgumentException(v);
+   }
+}
\ No newline at end of file

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Bean.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Bean.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Bean.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Bean.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,285 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.blueprint.reflect;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.namespace.QName;
+
+/**
+ * The type defintion for a <bean> component.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 13-May-2009
+ */
+public class Bean extends Component
+{
+   protected String description;
+   protected List<Object> argumentOrPropertyOrAny;
+   protected String className;
+   protected String dependsOn;
+   protected String initMethod;
+   protected String destroyMethod;
+   protected String factoryMethod;
+   protected String factoryComponent;
+   protected String scope;
+   protected Boolean lazyInit;
+   private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+   /**
+    * Gets the value of the description property.
+    */
+   public String getDescription()
+   {
+      return description;
+   }
+
+   /**
+    * Sets the value of the description property.
+    */
+   public void setDescription(String value)
+   {
+      this.description = value;
+   }
+
+   /**
+    * Gets the value of the argumentOrPropertyOrAny property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the
+    * JAXB object. This is why there is not a <CODE>set</CODE> method for the argumentOrPropertyOrAny property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * 
+    * <pre>
+    * getArgumentOrPropertyOrAny().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list {@link Object } {@link JAXBElement }{@code <}{@link Targument }{@code >} {@link JAXBElement }{@code <}
+    * {@link Tproperty }{@code >}
+    * 
+    * 
+    */
+   public List<Object> getArgumentOrPropertyOrAny()
+   {
+      if (argumentOrPropertyOrAny == null)
+      {
+         argumentOrPropertyOrAny = new ArrayList<Object>();
+      }
+      return this.argumentOrPropertyOrAny;
+   }
+
+   /**
+    * Gets the value of the class property.
+    */
+   public String getClassName()
+   {
+      return className;
+   }
+
+   /**
+    * Sets the value of the class property.
+    */
+   public void setClassName(String value)
+   {
+      this.className = value;
+   }
+
+   /**
+    * Gets the value of the dependsOn property.
+    * 
+    * @return possible object is {@link String }
+    * 
+    */
+   public String getDependsOn()
+   {
+      return dependsOn;
+   }
+
+   /**
+    * Sets the value of the dependsOn property.
+    * 
+    * @param value allowed object is {@link String }
+    * 
+    */
+   public void setDependsOn(String value)
+   {
+      this.dependsOn = value;
+   }
+
+   /**
+    * Gets the value of the initMethod property.
+    * 
+    * @return possible object is {@link String }
+    * 
+    */
+   public String getInitMethod()
+   {
+      return initMethod;
+   }
+
+   /**
+    * Sets the value of the initMethod property.
+    * 
+    * @param value allowed object is {@link String }
+    * 
+    */
+   public void setInitMethod(String value)
+   {
+      this.initMethod = value;
+   }
+
+   /**
+    * Gets the value of the destroyMethod property.
+    * 
+    * @return possible object is {@link String }
+    * 
+    */
+   public String getDestroyMethod()
+   {
+      return destroyMethod;
+   }
+
+   /**
+    * Sets the value of the destroyMethod property.
+    * 
+    * @param value allowed object is {@link String }
+    * 
+    */
+   public void setDestroyMethod(String value)
+   {
+      this.destroyMethod = value;
+   }
+
+   /**
+    * Gets the value of the factoryMethod property.
+    * 
+    * @return possible object is {@link String }
+    * 
+    */
+   public String getFactoryMethod()
+   {
+      return factoryMethod;
+   }
+
+   /**
+    * Sets the value of the factoryMethod property.
+    * 
+    * @param value allowed object is {@link String }
+    * 
+    */
+   public void setFactoryMethod(String value)
+   {
+      this.factoryMethod = value;
+   }
+
+   /**
+    * Gets the value of the factoryComponent property.
+    * 
+    * @return possible object is {@link String }
+    * 
+    */
+   public String getFactoryComponent()
+   {
+      return factoryComponent;
+   }
+
+   /**
+    * Sets the value of the factoryComponent property.
+    * 
+    * @param value allowed object is {@link String }
+    * 
+    */
+   public void setFactoryComponent(String value)
+   {
+      this.factoryComponent = value;
+   }
+
+   /**
+    * Gets the value of the scope property.
+    * 
+    * @return possible object is {@link String }
+    * 
+    */
+   public String getScope()
+   {
+      return scope;
+   }
+
+   /**
+    * Sets the value of the scope property.
+    * 
+    * @param value allowed object is {@link String }
+    * 
+    */
+   public void setScope(String value)
+   {
+      this.scope = value;
+   }
+
+   /**
+    * Gets the value of the lazyInit property.
+    * 
+    * @return possible object is {@link Boolean }
+    * 
+    */
+   public Boolean isLazyInit()
+   {
+      return lazyInit;
+   }
+
+   /**
+    * Sets the value of the lazyInit property.
+    * 
+    * @param value allowed object is {@link Boolean }
+    * 
+    */
+   public void setLazyInit(Boolean value)
+   {
+      this.lazyInit = value;
+   }
+
+   /**
+    * Gets a map that contains attributes that aren't bound to any typed property on this class.
+    * 
+    * <p>
+    * the map is keyed by the name of the attribute and the value is the string value of the attribute.
+    * 
+    * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of this design, there's no setter.
+    * 
+    * 
+    * @return always non-null
+    */
+   public Map<QName, String> getOtherAttributes()
+   {
+      return otherAttributes;
+   }
+}

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Blueprint.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Blueprint.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Blueprint.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Blueprint.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,243 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.blueprint.reflect;
+
+// $Id$
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+/**
+ * The blueprint element is the top element. The definitions consist of two sections:
+ * the type-converter section and the components section.
+ * 
+ * blueprint ::= <type-converters> component *
+ * component ::= <bean> | <service> | service-reference
+ * service-reference ::= <reference> | <ref-list> | <ref-set>
+ * type-converter ::= <bean> | <ref> * 
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 13-May-2009
+ */
+public class Blueprint
+{
+   protected String description;
+   protected TtypeConverters typeConverters;
+   protected List<Component> components;
+   protected Boolean defaultLazyInit;
+   protected String defaultInitMethod;
+   protected String defaultDestroyMethod;
+   protected BigInteger defaultTimeout;
+   protected Availability defaultAvailability;
+   private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+   /**
+    * Gets the value of the description property.
+    * 
+    */
+   public String getDescription()
+   {
+      return description;
+   }
+
+   /**
+    * Sets the value of the description property.
+    * 
+    */
+   public void setDescription(String value)
+   {
+      this.description = value;
+   }
+
+   /**
+    * Gets the value of the typeConverters property.
+    * 
+    * @return possible object is {@link TtypeConverters }
+    * 
+    */
+   public TtypeConverters getTypeConverters()
+   {
+      return typeConverters;
+   }
+
+   /**
+    * Sets the value of the typeConverters property.
+    * 
+    * @param value allowed object is {@link TtypeConverters }
+    * 
+    */
+   public void setTypeConverters(TtypeConverters value)
+   {
+      this.typeConverters = value;
+   }
+
+   /**
+    * Gets the value of components
+    */
+   public List<Component> getComponents()
+   {
+      if (components == null)
+      {
+         components = new ArrayList<Component>();
+      }
+      return this.components;
+   }
+
+   /**
+    * Gets the value of the defaultLazyInit property.
+    * 
+    * @return possible object is {@link Boolean }
+    * 
+    */
+   public Boolean isDefaultLazyInit()
+   {
+      return defaultLazyInit;
+   }
+
+   /**
+    * Sets the value of the defaultLazyInit property.
+    * 
+    * @param value allowed object is {@link Boolean }
+    * 
+    */
+   public void setDefaultLazyInit(Boolean value)
+   {
+      this.defaultLazyInit = value;
+   }
+
+   /**
+    * Gets the value of the defaultInitMethod property.
+    * 
+    * @return possible object is {@link String }
+    * 
+    */
+   public String getDefaultInitMethod()
+   {
+      return defaultInitMethod;
+   }
+
+   /**
+    * Sets the value of the defaultInitMethod property.
+    * 
+    * @param value allowed object is {@link String }
+    * 
+    */
+   public void setDefaultInitMethod(String value)
+   {
+      this.defaultInitMethod = value;
+   }
+
+   /**
+    * Gets the value of the defaultDestroyMethod property.
+    * 
+    * @return possible object is {@link String }
+    * 
+    */
+   public String getDefaultDestroyMethod()
+   {
+      return defaultDestroyMethod;
+   }
+
+   /**
+    * Sets the value of the defaultDestroyMethod property.
+    * 
+    * @param value allowed object is {@link String }
+    * 
+    */
+   public void setDefaultDestroyMethod(String value)
+   {
+      this.defaultDestroyMethod = value;
+   }
+
+   /**
+    * Gets the value of the defaultTimeout property.
+    */
+   public BigInteger getDefaultTimeout()
+   {
+      if (defaultTimeout == null)
+      {
+         return new BigInteger("300000");
+      }
+      else
+      {
+         return defaultTimeout;
+      }
+   }
+
+   /**
+    * Sets the value of the defaultTimeout property.
+    */
+   public void setDefaultTimeout(BigInteger value)
+   {
+      this.defaultTimeout = value;
+   }
+
+   /**
+    * Gets the value of the defaultAvailability property.
+    * 
+    * @return possible object is {@link Tavailability }
+    * 
+    */
+   public Availability getDefaultAvailability()
+   {
+      if (defaultAvailability == null)
+      {
+         return Availability.MANDATORY;
+      }
+      else
+      {
+         return defaultAvailability;
+      }
+   }
+
+   /**
+    * Sets the value of the defaultAvailability property.
+    * 
+    * @param value allowed object is {@link Tavailability }
+    * 
+    */
+   public void setDefaultAvailability(Availability value)
+   {
+      this.defaultAvailability = value;
+   }
+
+   /**
+    * Gets a map that contains attributes that aren't bound to any typed property on this class.
+    * 
+    * <p>
+    * the map is keyed by the name of the attribute and the value is the string value of the attribute.
+    * 
+    * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of this design, there's no setter.
+    * 
+    * 
+    * @return always non-null
+    */
+   public Map<QName, String> getOtherAttributes()
+   {
+      return otherAttributes;
+   }
+}

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Component.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Component.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Component.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Component.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.blueprint.reflect;
+
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
+
+// $Id$
+
+/**
+ * The Component type is the base type for top-level
+ * Blueprint components.  The <bean> <reference>, <service>, <ref-set>, and <ref-list> 
+ * elements are all derived from the Component type.  
+ * 
+ * This type defines an id attributre that is used create references between different components.
+ * Component elements can also be inlined within other component definitions.
+ *   
+ * The id attribute is not valid when inliine.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 13-May-2009
+ */
+public abstract class Component implements ComponentMetadata
+{
+   protected String id;
+
+   /**
+    * Gets the value of the id property.
+    */
+   public String getId()
+   {
+      return id;
+   }
+
+   /**
+    * Sets the value of the id property.
+    */
+   public void setId(String value)
+   {
+      this.id = value;
+   }
+
+}

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TReferenceListener.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TReferenceListener.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TReferenceListener.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,228 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * 
- *               
- *               TReferenceListener defines a reference listener that is attached
- *               to a <reference>, <ref-set>, or <ref-list> element.  The listener
- *               object can be specified as a <ref> or as an inline <bean> or
- *               <reference> component.  Listener events are mapped to the indicated
- *               bind or unbind methods.
- *               
- *             
- * 
- * <p>Java class for TReferenceListener complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TReferenceListener">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}targetComponent"/>
- *       &lt;attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}token" />
- *       &lt;attribute name="bind-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
- *       &lt;attribute name="unbind-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class TReferenceListener {
-
-    protected Tbean bean;
-    protected Treference reference;
-    protected Tref refFIXME;
-    protected List<Object> any;
-    protected String ref;
-    protected String bindMethod;
-    protected String unbindMethod;
-
-    /**
-     * Gets the value of the bean property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tbean }
-     *     
-     */
-    public Tbean getBean() {
-        return bean;
-    }
-
-    /**
-     * Sets the value of the bean property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tbean }
-     *     
-     */
-    public void setBean(Tbean value) {
-        this.bean = value;
-    }
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Treference }
-     *     
-     */
-    public Treference getReference() {
-        return reference;
-    }
-
-    /**
-     * Sets the value of the reference property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Treference }
-     *     
-     */
-    public void setReference(Treference value) {
-        this.reference = value;
-    }
-
-    /**
-     * Gets the value of the refFIXME property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tref }
-     *     
-     */
-    public Tref getRefFIXME() {
-        return refFIXME;
-    }
-
-    /**
-     * Sets the value of the refFIXME property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tref }
-     *     
-     */
-    public void setRefFIXME(Tref value) {
-        this.refFIXME = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the ref property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRef() {
-        return ref;
-    }
-
-    /**
-     * Sets the value of the ref property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRef(String value) {
-        this.ref = value;
-    }
-
-    /**
-     * Gets the value of the bindMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBindMethod() {
-        return bindMethod;
-    }
-
-    /**
-     * Sets the value of the bindMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBindMethod(String value) {
-        this.bindMethod = value;
-    }
-
-    /**
-     * Gets the value of the unbindMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUnbindMethod() {
-        return unbindMethod;
-    }
-
-    /**
-     * Sets the value of the unbindMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUnbindMethod(String value) {
-        this.unbindMethod = value;
-    }
-
-}

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TReferenceListener.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TReferenceListener.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TReferenceListener.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TReferenceListener.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,228 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.05.13 at 02:16:52 PM CEST 
+//
+
+
+package org.jboss.osgi.blueprint.reflect;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 
+ *               
+ *               TReferenceListener defines a reference listener that is attached
+ *               to a <reference>, <ref-set>, or <ref-list> element.  The listener
+ *               object can be specified as a <ref> or as an inline <bean> or
+ *               <reference> component.  Listener events are mapped to the indicated
+ *               bind or unbind methods.
+ *               
+ *             
+ * 
+ * <p>Java class for TReferenceListener complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TReferenceListener">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}targetComponent"/>
+ *       &lt;attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}token" />
+ *       &lt;attribute name="bind-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
+ *       &lt;attribute name="unbind-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+public class TReferenceListener {
+
+    protected Bean bean;
+    protected Treference reference;
+    protected Tref refFIXME;
+    protected List<Object> any;
+    protected String ref;
+    protected String bindMethod;
+    protected String unbindMethod;
+
+    /**
+     * Gets the value of the bean property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Bean }
+     *     
+     */
+    public Bean getBean() {
+        return bean;
+    }
+
+    /**
+     * Sets the value of the bean property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Bean }
+     *     
+     */
+    public void setBean(Bean value) {
+        this.bean = value;
+    }
+
+    /**
+     * Gets the value of the reference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Treference }
+     *     
+     */
+    public Treference getReference() {
+        return reference;
+    }
+
+    /**
+     * Sets the value of the reference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Treference }
+     *     
+     */
+    public void setReference(Treference value) {
+        this.reference = value;
+    }
+
+    /**
+     * Gets the value of the refFIXME property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tref }
+     *     
+     */
+    public Tref getRefFIXME() {
+        return refFIXME;
+    }
+
+    /**
+     * Sets the value of the refFIXME property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tref }
+     *     
+     */
+    public void setRefFIXME(Tref value) {
+        this.refFIXME = value;
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Object }
+     * 
+     * 
+     */
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
+
+    /**
+     * Gets the value of the ref property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRef() {
+        return ref;
+    }
+
+    /**
+     * Sets the value of the ref property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRef(String value) {
+        this.ref = value;
+    }
+
+    /**
+     * Gets the value of the bindMethod property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBindMethod() {
+        return bindMethod;
+    }
+
+    /**
+     * Sets the value of the bindMethod property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBindMethod(String value) {
+        this.bindMethod = value;
+    }
+
+    /**
+     * Gets the value of the unbindMethod property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getUnbindMethod() {
+        return unbindMethod;
+    }
+
+    /**
+     * Sets the value of the unbindMethod property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setUnbindMethod(String value) {
+        this.unbindMethod = value;
+    }
+
+}

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Targument.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,567 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * 
- *               
- *               An argument used to create an object defined by a <bean>
- *               component.  The <argument> elements are the arguments for the
- *               bean class constructor or passed to the bean factory method.
- * 
- *               The type, if specified, is used to disambiguate the constructor
- *               or method signature.  Arguments may also be matched up with
- *               arguments by explicitly specifying the index position.  If the
- *               index is used, then all <argument> elements for the bean must
- *               also specify the index.
- * 
- *               The value and ref attributes are convenience shortcuts to make
- *               the <argument> tag easier to code.  A fuller set of injected
- *               values and types can be specified using one of the "value"
- *               type elements.
- *               
- *             
- * 
- * <p>Java class for Targument complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="Targument">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="description" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tdescription" minOccurs="0"/>
- *         &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}value"/>
- *       &lt;/sequence>
- *       &lt;attribute name="index" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
- *       &lt;attribute name="type" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tclass" />
- *       &lt;attribute name="ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
- *       &lt;attribute name="valueFIXME" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TstringValue" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class Targument {
-
-    protected Tdescription description;
-    protected Tservice service;
-    protected TrefCollection refList;
-    protected TrefCollection refSet;
-    protected Tbean bean;
-    protected Treference reference;
-    protected Tref refFIXME;
-    protected List<Object> any;
-    protected Tref idref;
-    protected Tvalue value;
-    protected Tcollection list;
-    protected Tcollection set;
-    protected Tmap map;
-    protected Tcollection array;
-    protected Tprops props;
-    protected Tnull _null;
-    protected BigInteger index;
-    protected String type;
-    protected String ref;
-    protected String valueFIXME;
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tdescription }
-     *     
-     */
-    public Tdescription getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tdescription }
-     *     
-     */
-    public void setDescription(Tdescription value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the service property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tservice }
-     *     
-     */
-    public Tservice getService() {
-        return service;
-    }
-
-    /**
-     * Sets the value of the service property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tservice }
-     *     
-     */
-    public void setService(Tservice value) {
-        this.service = value;
-    }
-
-    /**
-     * Gets the value of the refList property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public TrefCollection getRefList() {
-        return refList;
-    }
-
-    /**
-     * Sets the value of the refList property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public void setRefList(TrefCollection value) {
-        this.refList = value;
-    }
-
-    /**
-     * Gets the value of the refSet property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public TrefCollection getRefSet() {
-        return refSet;
-    }
-
-    /**
-     * Sets the value of the refSet property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public void setRefSet(TrefCollection value) {
-        this.refSet = value;
-    }
-
-    /**
-     * Gets the value of the bean property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tbean }
-     *     
-     */
-    public Tbean getBean() {
-        return bean;
-    }
-
-    /**
-     * Sets the value of the bean property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tbean }
-     *     
-     */
-    public void setBean(Tbean value) {
-        this.bean = value;
-    }
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Treference }
-     *     
-     */
-    public Treference getReference() {
-        return reference;
-    }
-
-    /**
-     * Sets the value of the reference property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Treference }
-     *     
-     */
-    public void setReference(Treference value) {
-        this.reference = value;
-    }
-
-    /**
-     * Gets the value of the refFIXME property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tref }
-     *     
-     */
-    public Tref getRefFIXME() {
-        return refFIXME;
-    }
-
-    /**
-     * Sets the value of the refFIXME property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tref }
-     *     
-     */
-    public void setRefFIXME(Tref value) {
-        this.refFIXME = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tref }
-     *     
-     */
-    public Tref getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tref }
-     *     
-     */
-    public void setIdref(Tref value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tvalue }
-     *     
-     */
-    public Tvalue getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tvalue }
-     *     
-     */
-    public void setValue(Tvalue value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the list property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getList() {
-        return list;
-    }
-
-    /**
-     * Sets the value of the list property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setList(Tcollection value) {
-        this.list = value;
-    }
-
-    /**
-     * Gets the value of the set property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getSet() {
-        return set;
-    }
-
-    /**
-     * Sets the value of the set property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setSet(Tcollection value) {
-        this.set = value;
-    }
-
-    /**
-     * Gets the value of the map property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tmap }
-     *     
-     */
-    public Tmap getMap() {
-        return map;
-    }
-
-    /**
-     * Sets the value of the map property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tmap }
-     *     
-     */
-    public void setMap(Tmap value) {
-        this.map = value;
-    }
-
-    /**
-     * Gets the value of the array property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getArray() {
-        return array;
-    }
-
-    /**
-     * Sets the value of the array property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setArray(Tcollection value) {
-        this.array = value;
-    }
-
-    /**
-     * Gets the value of the props property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tprops }
-     *     
-     */
-    public Tprops getProps() {
-        return props;
-    }
-
-    /**
-     * Sets the value of the props property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tprops }
-     *     
-     */
-    public void setProps(Tprops value) {
-        this.props = value;
-    }
-
-    /**
-     * Gets the value of the null property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tnull }
-     *     
-     */
-    public Tnull getNull() {
-        return _null;
-    }
-
-    /**
-     * Sets the value of the null property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tnull }
-     *     
-     */
-    public void setNull(Tnull value) {
-        this._null = value;
-    }
-
-    /**
-     * Gets the value of the index property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getIndex() {
-        return index;
-    }
-
-    /**
-     * Sets the value of the index property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setIndex(BigInteger value) {
-        this.index = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the ref property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRef() {
-        return ref;
-    }
-
-    /**
-     * Sets the value of the ref property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRef(String value) {
-        this.ref = value;
-    }
-
-    /**
-     * Gets the value of the valueFIXME property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValueFIXME() {
-        return valueFIXME;
-    }
-
-    /**
-     * Sets the value of the valueFIXME property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValueFIXME(String value) {
-        this.valueFIXME = value;
-    }
-
-}

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Targument.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,567 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.05.13 at 02:16:52 PM CEST 
+//
+
+
+package org.jboss.osgi.blueprint.reflect;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 
+ *               
+ *               An argument used to create an object defined by a <bean>
+ *               component.  The <argument> elements are the arguments for the
+ *               bean class constructor or passed to the bean factory method.
+ * 
+ *               The type, if specified, is used to disambiguate the constructor
+ *               or method signature.  Arguments may also be matched up with
+ *               arguments by explicitly specifying the index position.  If the
+ *               index is used, then all <argument> elements for the bean must
+ *               also specify the index.
+ * 
+ *               The value and ref attributes are convenience shortcuts to make
+ *               the <argument> tag easier to code.  A fuller set of injected
+ *               values and types can be specified using one of the "value"
+ *               type elements.
+ *               
+ *             
+ * 
+ * <p>Java class for Targument complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Targument">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="description" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}String" minOccurs="0"/>
+ *         &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}value"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="index" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *       &lt;attribute name="type" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tclass" />
+ *       &lt;attribute name="ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
+ *       &lt;attribute name="valueFIXME" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TstringValue" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+public class Targument {
+
+    protected String description;
+    protected Tservice service;
+    protected TrefCollection refList;
+    protected TrefCollection refSet;
+    protected Bean bean;
+    protected Treference reference;
+    protected Tref refFIXME;
+    protected List<Object> any;
+    protected Tref idref;
+    protected Tvalue value;
+    protected Tcollection list;
+    protected Tcollection set;
+    protected Tmap map;
+    protected Tcollection array;
+    protected Tprops props;
+    protected Tnull _null;
+    protected BigInteger index;
+    protected String type;
+    protected String ref;
+    protected String valueFIXME;
+
+    /**
+     * Gets the value of the description property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDescription(String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the service property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tservice }
+     *     
+     */
+    public Tservice getService() {
+        return service;
+    }
+
+    /**
+     * Sets the value of the service property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tservice }
+     *     
+     */
+    public void setService(Tservice value) {
+        this.service = value;
+    }
+
+    /**
+     * Gets the value of the refList property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public TrefCollection getRefList() {
+        return refList;
+    }
+
+    /**
+     * Sets the value of the refList property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public void setRefList(TrefCollection value) {
+        this.refList = value;
+    }
+
+    /**
+     * Gets the value of the refSet property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public TrefCollection getRefSet() {
+        return refSet;
+    }
+
+    /**
+     * Sets the value of the refSet property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public void setRefSet(TrefCollection value) {
+        this.refSet = value;
+    }
+
+    /**
+     * Gets the value of the bean property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Bean }
+     *     
+     */
+    public Bean getBean() {
+        return bean;
+    }
+
+    /**
+     * Sets the value of the bean property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Bean }
+     *     
+     */
+    public void setBean(Bean value) {
+        this.bean = value;
+    }
+
+    /**
+     * Gets the value of the reference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Treference }
+     *     
+     */
+    public Treference getReference() {
+        return reference;
+    }
+
+    /**
+     * Sets the value of the reference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Treference }
+     *     
+     */
+    public void setReference(Treference value) {
+        this.reference = value;
+    }
+
+    /**
+     * Gets the value of the refFIXME property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tref }
+     *     
+     */
+    public Tref getRefFIXME() {
+        return refFIXME;
+    }
+
+    /**
+     * Sets the value of the refFIXME property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tref }
+     *     
+     */
+    public void setRefFIXME(Tref value) {
+        this.refFIXME = value;
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Object }
+     * 
+     * 
+     */
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tref }
+     *     
+     */
+    public Tref getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tref }
+     *     
+     */
+    public void setIdref(Tref value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tvalue }
+     *     
+     */
+    public Tvalue getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tvalue }
+     *     
+     */
+    public void setValue(Tvalue value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the list property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getList() {
+        return list;
+    }
+
+    /**
+     * Sets the value of the list property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setList(Tcollection value) {
+        this.list = value;
+    }
+
+    /**
+     * Gets the value of the set property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getSet() {
+        return set;
+    }
+
+    /**
+     * Sets the value of the set property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setSet(Tcollection value) {
+        this.set = value;
+    }
+
+    /**
+     * Gets the value of the map property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tmap }
+     *     
+     */
+    public Tmap getMap() {
+        return map;
+    }
+
+    /**
+     * Sets the value of the map property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tmap }
+     *     
+     */
+    public void setMap(Tmap value) {
+        this.map = value;
+    }
+
+    /**
+     * Gets the value of the array property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getArray() {
+        return array;
+    }
+
+    /**
+     * Sets the value of the array property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setArray(Tcollection value) {
+        this.array = value;
+    }
+
+    /**
+     * Gets the value of the props property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tprops }
+     *     
+     */
+    public Tprops getProps() {
+        return props;
+    }
+
+    /**
+     * Sets the value of the props property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tprops }
+     *     
+     */
+    public void setProps(Tprops value) {
+        this.props = value;
+    }
+
+    /**
+     * Gets the value of the null property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tnull }
+     *     
+     */
+    public Tnull getNull() {
+        return _null;
+    }
+
+    /**
+     * Sets the value of the null property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tnull }
+     *     
+     */
+    public void setNull(Tnull value) {
+        this._null = value;
+    }
+
+    /**
+     * Gets the value of the index property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getIndex() {
+        return index;
+    }
+
+    /**
+     * Sets the value of the index property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setIndex(BigInteger value) {
+        this.index = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setType(String value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the ref property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRef() {
+        return ref;
+    }
+
+    /**
+     * Sets the value of the ref property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRef(String value) {
+        this.ref = value;
+    }
+
+    /**
+     * Gets the value of the valueFIXME property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValueFIXME() {
+        return valueFIXME;
+    }
+
+    /**
+     * Sets the value of the valueFIXME property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValueFIXME(String value) {
+        this.valueFIXME = value;
+    }
+
+}

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TautoExportModes.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TautoExportModes.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TautoExportModes.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.osgi.blueprint.model;
+package org.jboss.osgi.blueprint.reflect;
 
 
 /**

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tavailability.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tavailability.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tavailability.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,50 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-
-/**
- * <p>Java class for Tavailability.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="Tavailability">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
- *     &lt;enumeration value="mandatory"/>
- *     &lt;enumeration value="optional"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-public enum Tavailability {
-
-    MANDATORY("mandatory"),
-    OPTIONAL("optional");
-    private final String value;
-
-    Tavailability(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static Tavailability fromValue(String v) {
-        for (Tavailability c: Tavailability.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tbean.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tbean.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tbean.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,344 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.namespace.QName;
-
-
-/**
- * 
- *               
- *               The type defintion for a <bean> component.
- *               This definition is also used by the <bpcm:managed-component>
- *               element used in the blueprint-cm schema.  The <bean> attributes
- *               provide the characteristics for how to create a bean instance.
- *               Constructor arguments and injected properties are specified
- *               via child <argument> and <property> elements.
- *               
- *             
- * 
- * <p>Java class for Tbean complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="Tbean">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tcomponent">
- *       &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}beanElements"/>
- *       &lt;attribute name="class" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tclass" />
- *       &lt;attribute name="depends-on" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TdependsOn" />
- *       &lt;attribute name="init-method" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TnullableMethod" />
- *       &lt;attribute name="destroy-method" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TnullableMethod" />
- *       &lt;attribute name="factory-method" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
- *       &lt;attribute name="factory-component" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
- *       &lt;attribute name="scope">
- *         &lt;simpleType>
- *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *             &lt;enumeration value="singleton"/>
- *             &lt;enumeration value="prototype"/>
- *             &lt;enumeration value="bundle"/>
- *           &lt;/restriction>
- *         &lt;/simpleType>
- *       &lt;/attribute>
- *       &lt;attribute name="lazy-init" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tlazy-init" />
- *       &lt;anyAttribute processContents='lax' namespace='##other'/>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class Tbean
-    extends Tcomponent
-{
-
-    protected Tdescription description;
-    protected List<Object> argumentOrPropertyOrAny;
-    protected String clazz;
-    protected String dependsOn;
-    protected String initMethod;
-    protected String destroyMethod;
-    protected String factoryMethod;
-    protected String factoryComponent;
-    protected String scope;
-    protected Boolean lazyInit;
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tdescription }
-     *     
-     */
-    public Tdescription getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tdescription }
-     *     
-     */
-    public void setDescription(Tdescription value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the argumentOrPropertyOrAny property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the argumentOrPropertyOrAny property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getArgumentOrPropertyOrAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link Targument }{@code >}
-     * {@link JAXBElement }{@code <}{@link Tproperty }{@code >}
-     * 
-     * 
-     */
-    public List<Object> getArgumentOrPropertyOrAny() {
-        if (argumentOrPropertyOrAny == null) {
-            argumentOrPropertyOrAny = new ArrayList<Object>();
-        }
-        return this.argumentOrPropertyOrAny;
-    }
-
-    /**
-     * Gets the value of the clazz property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getClazz() {
-        return clazz;
-    }
-
-    /**
-     * Sets the value of the clazz property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setClazz(String value) {
-        this.clazz = value;
-    }
-
-    /**
-     * Gets the value of the dependsOn property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDependsOn() {
-        return dependsOn;
-    }
-
-    /**
-     * Sets the value of the dependsOn property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDependsOn(String value) {
-        this.dependsOn = value;
-    }
-
-    /**
-     * Gets the value of the initMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getInitMethod() {
-        return initMethod;
-    }
-
-    /**
-     * Sets the value of the initMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setInitMethod(String value) {
-        this.initMethod = value;
-    }
-
-    /**
-     * Gets the value of the destroyMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDestroyMethod() {
-        return destroyMethod;
-    }
-
-    /**
-     * Sets the value of the destroyMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDestroyMethod(String value) {
-        this.destroyMethod = value;
-    }
-
-    /**
-     * Gets the value of the factoryMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFactoryMethod() {
-        return factoryMethod;
-    }
-
-    /**
-     * Sets the value of the factoryMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFactoryMethod(String value) {
-        this.factoryMethod = value;
-    }
-
-    /**
-     * Gets the value of the factoryComponent property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFactoryComponent() {
-        return factoryComponent;
-    }
-
-    /**
-     * Sets the value of the factoryComponent property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFactoryComponent(String value) {
-        this.factoryComponent = value;
-    }
-
-    /**
-     * Gets the value of the scope property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getScope() {
-        return scope;
-    }
-
-    /**
-     * Sets the value of the scope property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setScope(String value) {
-        this.scope = value;
-    }
-
-    /**
-     * Gets the value of the lazyInit property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isLazyInit() {
-        return lazyInit;
-    }
-
-    /**
-     * Sets the value of the lazyInit property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setLazyInit(Boolean value) {
-        this.lazyInit = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tblueprint.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tblueprint.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tblueprint.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,293 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.namespace.QName;
-
-
-/**
- * <p>Java class for Tblueprint complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="Tblueprint">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="description" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tdescription" minOccurs="0"/>
- *         &lt;element name="type-converters" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Ttype-converters" minOccurs="0"/>
- *         &lt;choice maxOccurs="unbounded" minOccurs="0">
- *           &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}allComponents"/>
- *         &lt;/choice>
- *       &lt;/sequence>
- *       &lt;attribute name="default-lazy-init" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tlazy-init" default="false" />
- *       &lt;attribute name="default-init-method" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
- *       &lt;attribute name="default-destroy-method" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
- *       &lt;attribute name="default-timeout" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Ttimeout" default="300000" />
- *       &lt;attribute name="default-availability" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tavailability" default="mandatory" />
- *       &lt;anyAttribute processContents='lax' namespace='##other'/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class Tblueprint {
-
-    protected Tdescription description;
-    protected TtypeConverters typeConverters;
-    protected List<Object> serviceOrRefListOrRefSet;
-    protected Boolean defaultLazyInit;
-    protected String defaultInitMethod;
-    protected String defaultDestroyMethod;
-    protected BigInteger defaultTimeout;
-    protected Tavailability defaultAvailability;
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tdescription }
-     *     
-     */
-    public Tdescription getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tdescription }
-     *     
-     */
-    public void setDescription(Tdescription value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the typeConverters property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TtypeConverters }
-     *     
-     */
-    public TtypeConverters getTypeConverters() {
-        return typeConverters;
-    }
-
-    /**
-     * Sets the value of the typeConverters property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TtypeConverters }
-     *     
-     */
-    public void setTypeConverters(TtypeConverters value) {
-        this.typeConverters = value;
-    }
-
-    /**
-     * Gets the value of the serviceOrRefListOrRefSet property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the serviceOrRefListOrRefSet property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getServiceOrRefListOrRefSet().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link TrefCollection }{@code >}
-     * {@link JAXBElement }{@code <}{@link Treference }{@code >}
-     * {@link JAXBElement }{@code <}{@link Tservice }{@code >}
-     * {@link JAXBElement }{@code <}{@link TrefCollection }{@code >}
-     * {@link JAXBElement }{@code <}{@link Tref }{@code >}
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link Tbean }{@code >}
-     * 
-     * 
-     */
-    public List<Object> getServiceOrRefListOrRefSet() {
-        if (serviceOrRefListOrRefSet == null) {
-            serviceOrRefListOrRefSet = new ArrayList<Object>();
-        }
-        return this.serviceOrRefListOrRefSet;
-    }
-
-    /**
-     * Gets the value of the defaultLazyInit property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isDefaultLazyInit() {
-        if (defaultLazyInit == null) {
-            return false;
-        } else {
-            return defaultLazyInit;
-        }
-    }
-
-    /**
-     * Sets the value of the defaultLazyInit property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setDefaultLazyInit(Boolean value) {
-        this.defaultLazyInit = value;
-    }
-
-    /**
-     * Gets the value of the defaultInitMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDefaultInitMethod() {
-        return defaultInitMethod;
-    }
-
-    /**
-     * Sets the value of the defaultInitMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDefaultInitMethod(String value) {
-        this.defaultInitMethod = value;
-    }
-
-    /**
-     * Gets the value of the defaultDestroyMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDefaultDestroyMethod() {
-        return defaultDestroyMethod;
-    }
-
-    /**
-     * Sets the value of the defaultDestroyMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDefaultDestroyMethod(String value) {
-        this.defaultDestroyMethod = value;
-    }
-
-    /**
-     * Gets the value of the defaultTimeout property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getDefaultTimeout() {
-        if (defaultTimeout == null) {
-            return new BigInteger("300000");
-        } else {
-            return defaultTimeout;
-        }
-    }
-
-    /**
-     * Sets the value of the defaultTimeout property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setDefaultTimeout(BigInteger value) {
-        this.defaultTimeout = value;
-    }
-
-    /**
-     * Gets the value of the defaultAvailability property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tavailability }
-     *     
-     */
-    public Tavailability getDefaultAvailability() {
-        if (defaultAvailability == null) {
-            return Tavailability.MANDATORY;
-        } else {
-            return defaultAvailability;
-        }
-    }
-
-    /**
-     * Sets the value of the defaultAvailability property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tavailability }
-     *     
-     */
-    public void setDefaultAvailability(Tavailability value) {
-        this.defaultAvailability = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tcollection.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,87 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * 
- *               
- *               Tcollection is the base schema type for different ordered collection
- *               types.  This is shared between the <array>, <list>, and <set> elements.
- *               
- *             
- * 
- * <p>Java class for Tcollection complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="Tcollection">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TtypedCollection">
- *       &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}value" maxOccurs="unbounded" minOccurs="0"/>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class Tcollection
-    extends TtypedCollection
-{
-    protected List<Object> value;
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the value property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getValue().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link Tvalue }{@code >}
-     * {@link JAXBElement }{@code <}{@link Tservice }{@code >}
-     * {@link JAXBElement }{@code <}{@link Tref }{@code >}
-     * {@link JAXBElement }{@code <}{@link Treference }{@code >}
-     * {@link JAXBElement }{@code <}{@link Tref }{@code >}
-     * {@link JAXBElement }{@code <}{@link Tmap }{@code >}
-     * {@link JAXBElement }{@code <}{@link Tbean }{@code >}
-     * {@link JAXBElement }{@code <}{@link Tnull }{@code >}
-     * {@link JAXBElement }{@code <}{@link TrefCollection }{@code >}
-     * {@link JAXBElement }{@code <}{@link TrefCollection }{@code >}
-     * {@link JAXBElement }{@code <}{@link Tcollection }{@code >}
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link Tcollection }{@code >}
-     * {@link JAXBElement }{@code <}{@link Tcollection }{@code >}
-     * {@link JAXBElement }{@code <}{@link Tprops }{@code >}
-     * 
-     * 
-     */
-    public List<Object> getValue() {
-        if (value == null) {
-            value = new ArrayList<Object>();
-        }
-        return this.value;
-    }
-
-}

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tcollection.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,87 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.05.13 at 02:16:52 PM CEST 
+//
+
+
+package org.jboss.osgi.blueprint.reflect;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 
+ *               
+ *               Tcollection is the base schema type for different ordered collection
+ *               types.  This is shared between the <array>, <list>, and <set> elements.
+ *               
+ *             
+ * 
+ * <p>Java class for Tcollection complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Tcollection">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TtypedCollection">
+ *       &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}value" maxOccurs="unbounded" minOccurs="0"/>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+public class Tcollection
+    extends TtypedCollection
+{
+    protected List<Object> value;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the value property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getValue().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link Tvalue }{@code >}
+     * {@link JAXBElement }{@code <}{@link Tservice }{@code >}
+     * {@link JAXBElement }{@code <}{@link Tref }{@code >}
+     * {@link JAXBElement }{@code <}{@link Treference }{@code >}
+     * {@link JAXBElement }{@code <}{@link Tref }{@code >}
+     * {@link JAXBElement }{@code <}{@link Tmap }{@code >}
+     * {@link JAXBElement }{@code <}{@link Bean }{@code >}
+     * {@link JAXBElement }{@code <}{@link Tnull }{@code >}
+     * {@link JAXBElement }{@code <}{@link TrefCollection }{@code >}
+     * {@link JAXBElement }{@code <}{@link TrefCollection }{@code >}
+     * {@link JAXBElement }{@code <}{@link Tcollection }{@code >}
+     * {@link Object }
+     * {@link JAXBElement }{@code <}{@link Tcollection }{@code >}
+     * {@link JAXBElement }{@code <}{@link Tcollection }{@code >}
+     * {@link JAXBElement }{@code <}{@link Tprops }{@code >}
+     * 
+     * 
+     */
+    public List<Object> getValue() {
+        if (value == null) {
+            value = new ArrayList<Object>();
+        }
+        return this.value;
+    }
+
+}

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomparator.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tcomparator.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomparator.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,140 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * <p>Java class for Tcomparator complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="Tcomparator">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}targetComponent"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class Tcomparator {
-
-    protected Tbean bean;
-    protected Treference reference;
-    protected Tref refFIXME;
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the bean property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tbean }
-     *     
-     */
-    public Tbean getBean() {
-        return bean;
-    }
-
-    /**
-     * Sets the value of the bean property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tbean }
-     *     
-     */
-    public void setBean(Tbean value) {
-        this.bean = value;
-    }
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Treference }
-     *     
-     */
-    public Treference getReference() {
-        return reference;
-    }
-
-    /**
-     * Sets the value of the reference property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Treference }
-     *     
-     */
-    public void setReference(Treference value) {
-        this.reference = value;
-    }
-
-    /**
-     * Gets the value of the refFIXME property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tref }
-     *     
-     */
-    public Tref getRefFIXME() {
-        return refFIXME;
-    }
-
-    /**
-     * Sets the value of the refFIXME property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tref }
-     *     
-     */
-    public void setRefFIXME(Tref value) {
-        this.refFIXME = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomparator.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tcomparator.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomparator.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomparator.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,140 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.05.13 at 02:16:52 PM CEST 
+//
+
+
+package org.jboss.osgi.blueprint.reflect;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * <p>Java class for Tcomparator complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Tcomparator">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}targetComponent"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+public class Tcomparator {
+
+    protected Bean bean;
+    protected Treference reference;
+    protected Tref refFIXME;
+    protected List<Object> any;
+
+    /**
+     * Gets the value of the bean property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Bean }
+     *     
+     */
+    public Bean getBean() {
+        return bean;
+    }
+
+    /**
+     * Sets the value of the bean property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Bean }
+     *     
+     */
+    public void setBean(Bean value) {
+        this.bean = value;
+    }
+
+    /**
+     * Gets the value of the reference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Treference }
+     *     
+     */
+    public Treference getReference() {
+        return reference;
+    }
+
+    /**
+     * Sets the value of the reference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Treference }
+     *     
+     */
+    public void setReference(Treference value) {
+        this.reference = value;
+    }
+
+    /**
+     * Gets the value of the refFIXME property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tref }
+     *     
+     */
+    public Tref getRefFIXME() {
+        return refFIXME;
+    }
+
+    /**
+     * Sets the value of the refFIXME property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tref }
+     *     
+     */
+    public void setRefFIXME(Tref value) {
+        this.refFIXME = value;
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Object }
+     * 
+     * 
+     */
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
+
+}

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomponent.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tcomponent.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomponent.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,69 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-/**
- * 
- *             
- * 
- *           The Tcomponent type is the base type for top-level
- *           Blueprint components.  The <bean> <reference>, <service>,
- *           <ref-set>, and <ref-list> elements are all derived from
- *           the Tcomponent type.  This type defines an id attributre
- *           that is used create references between different components.
- *           Component elements can also be inlined within other component
- *           definitions.  The id attribute is not valid when inliine.
- *           
- *             
- * 
- * <p>Java class for Tcomponent complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="Tcomponent">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public abstract class Tcomponent {
-
-    protected String id;
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-}

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tdescription.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tdescription.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tdescription.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,78 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * 
- *               
- *               A generic <description> element type to allow documentation to added to the
- *               blueprint configuration.
- *               
- *             
- * 
- * <p>Java class for Tdescription complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="Tdescription">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class Tdescription {
-
-    protected List<String> content;
-
-    /**
-     * 
-     *               
-     *               A generic <description> element type to allow documentation to added to the
-     *               blueprint configuration.
-     *               
-     *             Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getContent() {
-        if (content == null) {
-            content = new ArrayList<String>();
-        }
-        return this.content;
-    }
-
-}

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tinterfaces.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tinterfaces.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tinterfaces.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.osgi.blueprint.model;
+package org.jboss.osgi.blueprint.reflect;
 
 import java.util.ArrayList;
 import java.util.List;

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tkey.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,398 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * 
- *               
- *               The Tkey type defines the element types that are permitted
- *               for Map key situations.  These can be any of the "value"
- *               types other than the <null> element.
- *               
- *             
- * 
- * <p>Java class for Tkey complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="Tkey">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}nonNullValue"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class Tkey {
-
-    protected Tservice service;
-    protected TrefCollection refList;
-    protected TrefCollection refSet;
-    protected Tbean bean;
-    protected Treference reference;
-    protected Tref refFIXME;
-    protected List<Object> any;
-    protected Tref idref;
-    protected Tvalue value;
-    protected Tcollection list;
-    protected Tcollection set;
-    protected Tmap map;
-    protected Tcollection array;
-    protected Tprops props;
-
-    /**
-     * Gets the value of the service property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tservice }
-     *     
-     */
-    public Tservice getService() {
-        return service;
-    }
-
-    /**
-     * Sets the value of the service property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tservice }
-     *     
-     */
-    public void setService(Tservice value) {
-        this.service = value;
-    }
-
-    /**
-     * Gets the value of the refList property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public TrefCollection getRefList() {
-        return refList;
-    }
-
-    /**
-     * Sets the value of the refList property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public void setRefList(TrefCollection value) {
-        this.refList = value;
-    }
-
-    /**
-     * Gets the value of the refSet property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public TrefCollection getRefSet() {
-        return refSet;
-    }
-
-    /**
-     * Sets the value of the refSet property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public void setRefSet(TrefCollection value) {
-        this.refSet = value;
-    }
-
-    /**
-     * Gets the value of the bean property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tbean }
-     *     
-     */
-    public Tbean getBean() {
-        return bean;
-    }
-
-    /**
-     * Sets the value of the bean property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tbean }
-     *     
-     */
-    public void setBean(Tbean value) {
-        this.bean = value;
-    }
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Treference }
-     *     
-     */
-    public Treference getReference() {
-        return reference;
-    }
-
-    /**
-     * Sets the value of the reference property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Treference }
-     *     
-     */
-    public void setReference(Treference value) {
-        this.reference = value;
-    }
-
-    /**
-     * Gets the value of the refFIXME property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tref }
-     *     
-     */
-    public Tref getRefFIXME() {
-        return refFIXME;
-    }
-
-    /**
-     * Sets the value of the refFIXME property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tref }
-     *     
-     */
-    public void setRefFIXME(Tref value) {
-        this.refFIXME = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tref }
-     *     
-     */
-    public Tref getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tref }
-     *     
-     */
-    public void setIdref(Tref value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tvalue }
-     *     
-     */
-    public Tvalue getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tvalue }
-     *     
-     */
-    public void setValue(Tvalue value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the list property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getList() {
-        return list;
-    }
-
-    /**
-     * Sets the value of the list property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setList(Tcollection value) {
-        this.list = value;
-    }
-
-    /**
-     * Gets the value of the set property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getSet() {
-        return set;
-    }
-
-    /**
-     * Sets the value of the set property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setSet(Tcollection value) {
-        this.set = value;
-    }
-
-    /**
-     * Gets the value of the map property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tmap }
-     *     
-     */
-    public Tmap getMap() {
-        return map;
-    }
-
-    /**
-     * Sets the value of the map property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tmap }
-     *     
-     */
-    public void setMap(Tmap value) {
-        this.map = value;
-    }
-
-    /**
-     * Gets the value of the array property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getArray() {
-        return array;
-    }
-
-    /**
-     * Sets the value of the array property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setArray(Tcollection value) {
-        this.array = value;
-    }
-
-    /**
-     * Gets the value of the props property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tprops }
-     *     
-     */
-    public Tprops getProps() {
-        return props;
-    }
-
-    /**
-     * Sets the value of the props property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tprops }
-     *     
-     */
-    public void setProps(Tprops value) {
-        this.props = value;
-    }
-
-}

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tkey.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,398 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.05.13 at 02:16:52 PM CEST 
+//
+
+
+package org.jboss.osgi.blueprint.reflect;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 
+ *               
+ *               The Tkey type defines the element types that are permitted
+ *               for Map key situations.  These can be any of the "value"
+ *               types other than the <null> element.
+ *               
+ *             
+ * 
+ * <p>Java class for Tkey complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Tkey">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}nonNullValue"/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+public class Tkey {
+
+    protected Tservice service;
+    protected TrefCollection refList;
+    protected TrefCollection refSet;
+    protected Bean bean;
+    protected Treference reference;
+    protected Tref refFIXME;
+    protected List<Object> any;
+    protected Tref idref;
+    protected Tvalue value;
+    protected Tcollection list;
+    protected Tcollection set;
+    protected Tmap map;
+    protected Tcollection array;
+    protected Tprops props;
+
+    /**
+     * Gets the value of the service property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tservice }
+     *     
+     */
+    public Tservice getService() {
+        return service;
+    }
+
+    /**
+     * Sets the value of the service property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tservice }
+     *     
+     */
+    public void setService(Tservice value) {
+        this.service = value;
+    }
+
+    /**
+     * Gets the value of the refList property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public TrefCollection getRefList() {
+        return refList;
+    }
+
+    /**
+     * Sets the value of the refList property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public void setRefList(TrefCollection value) {
+        this.refList = value;
+    }
+
+    /**
+     * Gets the value of the refSet property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public TrefCollection getRefSet() {
+        return refSet;
+    }
+
+    /**
+     * Sets the value of the refSet property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public void setRefSet(TrefCollection value) {
+        this.refSet = value;
+    }
+
+    /**
+     * Gets the value of the bean property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Bean }
+     *     
+     */
+    public Bean getBean() {
+        return bean;
+    }
+
+    /**
+     * Sets the value of the bean property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Bean }
+     *     
+     */
+    public void setBean(Bean value) {
+        this.bean = value;
+    }
+
+    /**
+     * Gets the value of the reference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Treference }
+     *     
+     */
+    public Treference getReference() {
+        return reference;
+    }
+
+    /**
+     * Sets the value of the reference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Treference }
+     *     
+     */
+    public void setReference(Treference value) {
+        this.reference = value;
+    }
+
+    /**
+     * Gets the value of the refFIXME property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tref }
+     *     
+     */
+    public Tref getRefFIXME() {
+        return refFIXME;
+    }
+
+    /**
+     * Sets the value of the refFIXME property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tref }
+     *     
+     */
+    public void setRefFIXME(Tref value) {
+        this.refFIXME = value;
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Object }
+     * 
+     * 
+     */
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tref }
+     *     
+     */
+    public Tref getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tref }
+     *     
+     */
+    public void setIdref(Tref value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tvalue }
+     *     
+     */
+    public Tvalue getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tvalue }
+     *     
+     */
+    public void setValue(Tvalue value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the list property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getList() {
+        return list;
+    }
+
+    /**
+     * Sets the value of the list property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setList(Tcollection value) {
+        this.list = value;
+    }
+
+    /**
+     * Gets the value of the set property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getSet() {
+        return set;
+    }
+
+    /**
+     * Sets the value of the set property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setSet(Tcollection value) {
+        this.set = value;
+    }
+
+    /**
+     * Gets the value of the map property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tmap }
+     *     
+     */
+    public Tmap getMap() {
+        return map;
+    }
+
+    /**
+     * Sets the value of the map property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tmap }
+     *     
+     */
+    public void setMap(Tmap value) {
+        this.map = value;
+    }
+
+    /**
+     * Gets the value of the array property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getArray() {
+        return array;
+    }
+
+    /**
+     * Sets the value of the array property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setArray(Tcollection value) {
+        this.array = value;
+    }
+
+    /**
+     * Gets the value of the props property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tprops }
+     *     
+     */
+    public Tprops getProps() {
+        return props;
+    }
+
+    /**
+     * Sets the value of the props property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tprops }
+     *     
+     */
+    public void setProps(Tprops value) {
+        this.props = value;
+    }
+
+}

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tmap.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tmap.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tmap.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.osgi.blueprint.model;
+package org.jboss.osgi.blueprint.reflect;
 
 import java.util.ArrayList;
 import java.util.List;

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TmapEntry.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,558 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * 
- *               
- *               TmapEntry is used for <entry> elements nested inside of a <map> element.
- *               Each <entry> instance defines a key/value pair that will be added to the
- *               Map.  Both the keys and values may be arbitrary types.  Keys must not
- *               be <null> but <null> is permitted for entry values.  A default type
- *               can be specified for both the keys and the values, but individual keys
- *               or values can override the default.
- *               
- *             
- * 
- * <p>Java class for TmapEntry complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TmapEntry">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="keyFIXME" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tkey" minOccurs="0"/>
- *         &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}value"/>
- *       &lt;/sequence>
- *       &lt;attribute name="key" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TstringValue" />
- *       &lt;attribute name="key-ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
- *       &lt;attribute name="valueFIXME" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TstringValue" />
- *       &lt;attribute name="value-ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class TmapEntry {
-
-    protected Tkey keyFIXME;
-    protected Tservice service;
-    protected TrefCollection refList;
-    protected TrefCollection refSet;
-    protected Tbean bean;
-    protected Treference reference;
-    protected Tref refFIXME;
-    protected List<Object> any;
-    protected Tref idref;
-    protected Tvalue value;
-    protected Tcollection list;
-    protected Tcollection set;
-    protected Tmap map;
-    protected Tcollection array;
-    protected Tprops props;
-    protected Tnull _null;
-    protected String key;
-    protected String keyRef;
-    protected String valueFIXME;
-    protected String valueRef;
-
-    /**
-     * Gets the value of the keyFIXME property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tkey }
-     *     
-     */
-    public Tkey getKeyFIXME() {
-        return keyFIXME;
-    }
-
-    /**
-     * Sets the value of the keyFIXME property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tkey }
-     *     
-     */
-    public void setKeyFIXME(Tkey value) {
-        this.keyFIXME = value;
-    }
-
-    /**
-     * Gets the value of the service property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tservice }
-     *     
-     */
-    public Tservice getService() {
-        return service;
-    }
-
-    /**
-     * Sets the value of the service property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tservice }
-     *     
-     */
-    public void setService(Tservice value) {
-        this.service = value;
-    }
-
-    /**
-     * Gets the value of the refList property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public TrefCollection getRefList() {
-        return refList;
-    }
-
-    /**
-     * Sets the value of the refList property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public void setRefList(TrefCollection value) {
-        this.refList = value;
-    }
-
-    /**
-     * Gets the value of the refSet property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public TrefCollection getRefSet() {
-        return refSet;
-    }
-
-    /**
-     * Sets the value of the refSet property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public void setRefSet(TrefCollection value) {
-        this.refSet = value;
-    }
-
-    /**
-     * Gets the value of the bean property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tbean }
-     *     
-     */
-    public Tbean getBean() {
-        return bean;
-    }
-
-    /**
-     * Sets the value of the bean property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tbean }
-     *     
-     */
-    public void setBean(Tbean value) {
-        this.bean = value;
-    }
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Treference }
-     *     
-     */
-    public Treference getReference() {
-        return reference;
-    }
-
-    /**
-     * Sets the value of the reference property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Treference }
-     *     
-     */
-    public void setReference(Treference value) {
-        this.reference = value;
-    }
-
-    /**
-     * Gets the value of the refFIXME property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tref }
-     *     
-     */
-    public Tref getRefFIXME() {
-        return refFIXME;
-    }
-
-    /**
-     * Sets the value of the refFIXME property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tref }
-     *     
-     */
-    public void setRefFIXME(Tref value) {
-        this.refFIXME = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tref }
-     *     
-     */
-    public Tref getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tref }
-     *     
-     */
-    public void setIdref(Tref value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tvalue }
-     *     
-     */
-    public Tvalue getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tvalue }
-     *     
-     */
-    public void setValue(Tvalue value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the list property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getList() {
-        return list;
-    }
-
-    /**
-     * Sets the value of the list property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setList(Tcollection value) {
-        this.list = value;
-    }
-
-    /**
-     * Gets the value of the set property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getSet() {
-        return set;
-    }
-
-    /**
-     * Sets the value of the set property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setSet(Tcollection value) {
-        this.set = value;
-    }
-
-    /**
-     * Gets the value of the map property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tmap }
-     *     
-     */
-    public Tmap getMap() {
-        return map;
-    }
-
-    /**
-     * Sets the value of the map property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tmap }
-     *     
-     */
-    public void setMap(Tmap value) {
-        this.map = value;
-    }
-
-    /**
-     * Gets the value of the array property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getArray() {
-        return array;
-    }
-
-    /**
-     * Sets the value of the array property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setArray(Tcollection value) {
-        this.array = value;
-    }
-
-    /**
-     * Gets the value of the props property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tprops }
-     *     
-     */
-    public Tprops getProps() {
-        return props;
-    }
-
-    /**
-     * Sets the value of the props property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tprops }
-     *     
-     */
-    public void setProps(Tprops value) {
-        this.props = value;
-    }
-
-    /**
-     * Gets the value of the null property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tnull }
-     *     
-     */
-    public Tnull getNull() {
-        return _null;
-    }
-
-    /**
-     * Sets the value of the null property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tnull }
-     *     
-     */
-    public void setNull(Tnull value) {
-        this._null = value;
-    }
-
-    /**
-     * Gets the value of the key property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKey() {
-        return key;
-    }
-
-    /**
-     * Sets the value of the key property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKey(String value) {
-        this.key = value;
-    }
-
-    /**
-     * Gets the value of the keyRef property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKeyRef() {
-        return keyRef;
-    }
-
-    /**
-     * Sets the value of the keyRef property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKeyRef(String value) {
-        this.keyRef = value;
-    }
-
-    /**
-     * Gets the value of the valueFIXME property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValueFIXME() {
-        return valueFIXME;
-    }
-
-    /**
-     * Sets the value of the valueFIXME property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValueFIXME(String value) {
-        this.valueFIXME = value;
-    }
-
-    /**
-     * Gets the value of the valueRef property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValueRef() {
-        return valueRef;
-    }
-
-    /**
-     * Sets the value of the valueRef property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValueRef(String value) {
-        this.valueRef = value;
-    }
-
-}

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TmapEntry.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,558 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.05.13 at 02:16:52 PM CEST 
+//
+
+
+package org.jboss.osgi.blueprint.reflect;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 
+ *               
+ *               TmapEntry is used for <entry> elements nested inside of a <map> element.
+ *               Each <entry> instance defines a key/value pair that will be added to the
+ *               Map.  Both the keys and values may be arbitrary types.  Keys must not
+ *               be <null> but <null> is permitted for entry values.  A default type
+ *               can be specified for both the keys and the values, but individual keys
+ *               or values can override the default.
+ *               
+ *             
+ * 
+ * <p>Java class for TmapEntry complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TmapEntry">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="keyFIXME" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tkey" minOccurs="0"/>
+ *         &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}value"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="key" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TstringValue" />
+ *       &lt;attribute name="key-ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
+ *       &lt;attribute name="valueFIXME" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TstringValue" />
+ *       &lt;attribute name="value-ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+public class TmapEntry {
+
+    protected Tkey keyFIXME;
+    protected Tservice service;
+    protected TrefCollection refList;
+    protected TrefCollection refSet;
+    protected Bean bean;
+    protected Treference reference;
+    protected Tref refFIXME;
+    protected List<Object> any;
+    protected Tref idref;
+    protected Tvalue value;
+    protected Tcollection list;
+    protected Tcollection set;
+    protected Tmap map;
+    protected Tcollection array;
+    protected Tprops props;
+    protected Tnull _null;
+    protected String key;
+    protected String keyRef;
+    protected String valueFIXME;
+    protected String valueRef;
+
+    /**
+     * Gets the value of the keyFIXME property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tkey }
+     *     
+     */
+    public Tkey getKeyFIXME() {
+        return keyFIXME;
+    }
+
+    /**
+     * Sets the value of the keyFIXME property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tkey }
+     *     
+     */
+    public void setKeyFIXME(Tkey value) {
+        this.keyFIXME = value;
+    }
+
+    /**
+     * Gets the value of the service property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tservice }
+     *     
+     */
+    public Tservice getService() {
+        return service;
+    }
+
+    /**
+     * Sets the value of the service property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tservice }
+     *     
+     */
+    public void setService(Tservice value) {
+        this.service = value;
+    }
+
+    /**
+     * Gets the value of the refList property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public TrefCollection getRefList() {
+        return refList;
+    }
+
+    /**
+     * Sets the value of the refList property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public void setRefList(TrefCollection value) {
+        this.refList = value;
+    }
+
+    /**
+     * Gets the value of the refSet property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public TrefCollection getRefSet() {
+        return refSet;
+    }
+
+    /**
+     * Sets the value of the refSet property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public void setRefSet(TrefCollection value) {
+        this.refSet = value;
+    }
+
+    /**
+     * Gets the value of the bean property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Bean }
+     *     
+     */
+    public Bean getBean() {
+        return bean;
+    }
+
+    /**
+     * Sets the value of the bean property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Bean }
+     *     
+     */
+    public void setBean(Bean value) {
+        this.bean = value;
+    }
+
+    /**
+     * Gets the value of the reference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Treference }
+     *     
+     */
+    public Treference getReference() {
+        return reference;
+    }
+
+    /**
+     * Sets the value of the reference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Treference }
+     *     
+     */
+    public void setReference(Treference value) {
+        this.reference = value;
+    }
+
+    /**
+     * Gets the value of the refFIXME property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tref }
+     *     
+     */
+    public Tref getRefFIXME() {
+        return refFIXME;
+    }
+
+    /**
+     * Sets the value of the refFIXME property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tref }
+     *     
+     */
+    public void setRefFIXME(Tref value) {
+        this.refFIXME = value;
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Object }
+     * 
+     * 
+     */
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tref }
+     *     
+     */
+    public Tref getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tref }
+     *     
+     */
+    public void setIdref(Tref value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tvalue }
+     *     
+     */
+    public Tvalue getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tvalue }
+     *     
+     */
+    public void setValue(Tvalue value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the list property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getList() {
+        return list;
+    }
+
+    /**
+     * Sets the value of the list property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setList(Tcollection value) {
+        this.list = value;
+    }
+
+    /**
+     * Gets the value of the set property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getSet() {
+        return set;
+    }
+
+    /**
+     * Sets the value of the set property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setSet(Tcollection value) {
+        this.set = value;
+    }
+
+    /**
+     * Gets the value of the map property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tmap }
+     *     
+     */
+    public Tmap getMap() {
+        return map;
+    }
+
+    /**
+     * Sets the value of the map property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tmap }
+     *     
+     */
+    public void setMap(Tmap value) {
+        this.map = value;
+    }
+
+    /**
+     * Gets the value of the array property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getArray() {
+        return array;
+    }
+
+    /**
+     * Sets the value of the array property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setArray(Tcollection value) {
+        this.array = value;
+    }
+
+    /**
+     * Gets the value of the props property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tprops }
+     *     
+     */
+    public Tprops getProps() {
+        return props;
+    }
+
+    /**
+     * Sets the value of the props property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tprops }
+     *     
+     */
+    public void setProps(Tprops value) {
+        this.props = value;
+    }
+
+    /**
+     * Gets the value of the null property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tnull }
+     *     
+     */
+    public Tnull getNull() {
+        return _null;
+    }
+
+    /**
+     * Sets the value of the null property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tnull }
+     *     
+     */
+    public void setNull(Tnull value) {
+        this._null = value;
+    }
+
+    /**
+     * Gets the value of the key property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getKey() {
+        return key;
+    }
+
+    /**
+     * Sets the value of the key property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setKey(String value) {
+        this.key = value;
+    }
+
+    /**
+     * Gets the value of the keyRef property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getKeyRef() {
+        return keyRef;
+    }
+
+    /**
+     * Sets the value of the keyRef property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setKeyRef(String value) {
+        this.keyRef = value;
+    }
+
+    /**
+     * Gets the value of the valueFIXME property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValueFIXME() {
+        return valueFIXME;
+    }
+
+    /**
+     * Sets the value of the valueFIXME property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValueFIXME(String value) {
+        this.valueFIXME = value;
+    }
+
+    /**
+     * Gets the value of the valueRef property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValueRef() {
+        return valueRef;
+    }
+
+    /**
+     * Sets the value of the valueRef property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValueRef(String value) {
+        this.valueRef = value;
+    }
+
+}

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tnull.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tnull.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tnull.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.osgi.blueprint.model;
+package org.jboss.osgi.blueprint.reflect;
 
 
 /**

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tprop.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tprop.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tprop.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.osgi.blueprint.model;
+package org.jboss.osgi.blueprint.reflect;
 
 /**
  * 

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tproperty.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,534 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * 
- *               
- *               A property that will be injected into a created <bean>
- *               component.  The <property> elements correspond to named
- *               JavaBean setting methods for a created bean object.
- * 
- *               The value and ref attributes are convenience shortcuts to make
- *               the <argument> tag easier to code.  A fuller set of injected
- *               values and types can be specified using one of the "value"
- *               type elements.
- *               
- *             
- * 
- * <p>Java class for Tproperty complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="Tproperty">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="description" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tdescription" minOccurs="0"/>
- *         &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}value"/>
- *       &lt;/sequence>
- *       &lt;attribute name="name" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
- *       &lt;attribute name="ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
- *       &lt;attribute name="valueFIXME" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TstringValue" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class Tproperty {
-
-    protected Tdescription description;
-    protected Tservice service;
-    protected TrefCollection refList;
-    protected TrefCollection refSet;
-    protected Tbean bean;
-    protected Treference reference;
-    protected Tref refFIXME;
-    protected List<Object> any;
-    protected Tref idref;
-    protected Tvalue value;
-    protected Tcollection list;
-    protected Tcollection set;
-    protected Tmap map;
-    protected Tcollection array;
-    protected Tprops props;
-    protected Tnull _null;
-    protected String name;
-    protected String ref;
-    protected String valueFIXME;
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tdescription }
-     *     
-     */
-    public Tdescription getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tdescription }
-     *     
-     */
-    public void setDescription(Tdescription value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the service property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tservice }
-     *     
-     */
-    public Tservice getService() {
-        return service;
-    }
-
-    /**
-     * Sets the value of the service property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tservice }
-     *     
-     */
-    public void setService(Tservice value) {
-        this.service = value;
-    }
-
-    /**
-     * Gets the value of the refList property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public TrefCollection getRefList() {
-        return refList;
-    }
-
-    /**
-     * Sets the value of the refList property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public void setRefList(TrefCollection value) {
-        this.refList = value;
-    }
-
-    /**
-     * Gets the value of the refSet property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public TrefCollection getRefSet() {
-        return refSet;
-    }
-
-    /**
-     * Sets the value of the refSet property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public void setRefSet(TrefCollection value) {
-        this.refSet = value;
-    }
-
-    /**
-     * Gets the value of the bean property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tbean }
-     *     
-     */
-    public Tbean getBean() {
-        return bean;
-    }
-
-    /**
-     * Sets the value of the bean property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tbean }
-     *     
-     */
-    public void setBean(Tbean value) {
-        this.bean = value;
-    }
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Treference }
-     *     
-     */
-    public Treference getReference() {
-        return reference;
-    }
-
-    /**
-     * Sets the value of the reference property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Treference }
-     *     
-     */
-    public void setReference(Treference value) {
-        this.reference = value;
-    }
-
-    /**
-     * Gets the value of the refFIXME property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tref }
-     *     
-     */
-    public Tref getRefFIXME() {
-        return refFIXME;
-    }
-
-    /**
-     * Sets the value of the refFIXME property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tref }
-     *     
-     */
-    public void setRefFIXME(Tref value) {
-        this.refFIXME = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tref }
-     *     
-     */
-    public Tref getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tref }
-     *     
-     */
-    public void setIdref(Tref value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tvalue }
-     *     
-     */
-    public Tvalue getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tvalue }
-     *     
-     */
-    public void setValue(Tvalue value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the list property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getList() {
-        return list;
-    }
-
-    /**
-     * Sets the value of the list property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setList(Tcollection value) {
-        this.list = value;
-    }
-
-    /**
-     * Gets the value of the set property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getSet() {
-        return set;
-    }
-
-    /**
-     * Sets the value of the set property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setSet(Tcollection value) {
-        this.set = value;
-    }
-
-    /**
-     * Gets the value of the map property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tmap }
-     *     
-     */
-    public Tmap getMap() {
-        return map;
-    }
-
-    /**
-     * Sets the value of the map property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tmap }
-     *     
-     */
-    public void setMap(Tmap value) {
-        this.map = value;
-    }
-
-    /**
-     * Gets the value of the array property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getArray() {
-        return array;
-    }
-
-    /**
-     * Sets the value of the array property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setArray(Tcollection value) {
-        this.array = value;
-    }
-
-    /**
-     * Gets the value of the props property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tprops }
-     *     
-     */
-    public Tprops getProps() {
-        return props;
-    }
-
-    /**
-     * Sets the value of the props property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tprops }
-     *     
-     */
-    public void setProps(Tprops value) {
-        this.props = value;
-    }
-
-    /**
-     * Gets the value of the null property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tnull }
-     *     
-     */
-    public Tnull getNull() {
-        return _null;
-    }
-
-    /**
-     * Sets the value of the null property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tnull }
-     *     
-     */
-    public void setNull(Tnull value) {
-        this._null = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the ref property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRef() {
-        return ref;
-    }
-
-    /**
-     * Sets the value of the ref property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRef(String value) {
-        this.ref = value;
-    }
-
-    /**
-     * Gets the value of the valueFIXME property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValueFIXME() {
-        return valueFIXME;
-    }
-
-    /**
-     * Sets the value of the valueFIXME property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValueFIXME(String value) {
-        this.valueFIXME = value;
-    }
-
-}

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tproperty.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,534 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.05.13 at 02:16:52 PM CEST 
+//
+
+
+package org.jboss.osgi.blueprint.reflect;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 
+ *               
+ *               A property that will be injected into a created <bean>
+ *               component.  The <property> elements correspond to named
+ *               JavaBean setting methods for a created bean object.
+ * 
+ *               The value and ref attributes are convenience shortcuts to make
+ *               the <argument> tag easier to code.  A fuller set of injected
+ *               values and types can be specified using one of the "value"
+ *               type elements.
+ *               
+ *             
+ * 
+ * <p>Java class for Tproperty complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Tproperty">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="description" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}String" minOccurs="0"/>
+ *         &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}value"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="name" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
+ *       &lt;attribute name="ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
+ *       &lt;attribute name="valueFIXME" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TstringValue" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+public class Tproperty {
+
+    protected String description;
+    protected Tservice service;
+    protected TrefCollection refList;
+    protected TrefCollection refSet;
+    protected Bean bean;
+    protected Treference reference;
+    protected Tref refFIXME;
+    protected List<Object> any;
+    protected Tref idref;
+    protected Tvalue value;
+    protected Tcollection list;
+    protected Tcollection set;
+    protected Tmap map;
+    protected Tcollection array;
+    protected Tprops props;
+    protected Tnull _null;
+    protected String name;
+    protected String ref;
+    protected String valueFIXME;
+
+    /**
+     * Gets the value of the description property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDescription(String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the service property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tservice }
+     *     
+     */
+    public Tservice getService() {
+        return service;
+    }
+
+    /**
+     * Sets the value of the service property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tservice }
+     *     
+     */
+    public void setService(Tservice value) {
+        this.service = value;
+    }
+
+    /**
+     * Gets the value of the refList property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public TrefCollection getRefList() {
+        return refList;
+    }
+
+    /**
+     * Sets the value of the refList property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public void setRefList(TrefCollection value) {
+        this.refList = value;
+    }
+
+    /**
+     * Gets the value of the refSet property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public TrefCollection getRefSet() {
+        return refSet;
+    }
+
+    /**
+     * Sets the value of the refSet property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public void setRefSet(TrefCollection value) {
+        this.refSet = value;
+    }
+
+    /**
+     * Gets the value of the bean property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Bean }
+     *     
+     */
+    public Bean getBean() {
+        return bean;
+    }
+
+    /**
+     * Sets the value of the bean property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Bean }
+     *     
+     */
+    public void setBean(Bean value) {
+        this.bean = value;
+    }
+
+    /**
+     * Gets the value of the reference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Treference }
+     *     
+     */
+    public Treference getReference() {
+        return reference;
+    }
+
+    /**
+     * Sets the value of the reference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Treference }
+     *     
+     */
+    public void setReference(Treference value) {
+        this.reference = value;
+    }
+
+    /**
+     * Gets the value of the refFIXME property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tref }
+     *     
+     */
+    public Tref getRefFIXME() {
+        return refFIXME;
+    }
+
+    /**
+     * Sets the value of the refFIXME property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tref }
+     *     
+     */
+    public void setRefFIXME(Tref value) {
+        this.refFIXME = value;
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Object }
+     * 
+     * 
+     */
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tref }
+     *     
+     */
+    public Tref getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tref }
+     *     
+     */
+    public void setIdref(Tref value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tvalue }
+     *     
+     */
+    public Tvalue getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tvalue }
+     *     
+     */
+    public void setValue(Tvalue value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the list property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getList() {
+        return list;
+    }
+
+    /**
+     * Sets the value of the list property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setList(Tcollection value) {
+        this.list = value;
+    }
+
+    /**
+     * Gets the value of the set property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getSet() {
+        return set;
+    }
+
+    /**
+     * Sets the value of the set property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setSet(Tcollection value) {
+        this.set = value;
+    }
+
+    /**
+     * Gets the value of the map property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tmap }
+     *     
+     */
+    public Tmap getMap() {
+        return map;
+    }
+
+    /**
+     * Sets the value of the map property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tmap }
+     *     
+     */
+    public void setMap(Tmap value) {
+        this.map = value;
+    }
+
+    /**
+     * Gets the value of the array property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getArray() {
+        return array;
+    }
+
+    /**
+     * Sets the value of the array property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setArray(Tcollection value) {
+        this.array = value;
+    }
+
+    /**
+     * Gets the value of the props property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tprops }
+     *     
+     */
+    public Tprops getProps() {
+        return props;
+    }
+
+    /**
+     * Sets the value of the props property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tprops }
+     *     
+     */
+    public void setProps(Tprops value) {
+        this.props = value;
+    }
+
+    /**
+     * Gets the value of the null property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tnull }
+     *     
+     */
+    public Tnull getNull() {
+        return _null;
+    }
+
+    /**
+     * Sets the value of the null property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tnull }
+     *     
+     */
+    public void setNull(Tnull value) {
+        this._null = value;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the ref property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRef() {
+        return ref;
+    }
+
+    /**
+     * Sets the value of the ref property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRef(String value) {
+        this.ref = value;
+    }
+
+    /**
+     * Gets the value of the valueFIXME property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValueFIXME() {
+        return valueFIXME;
+    }
+
+    /**
+     * Sets the value of the valueFIXME property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValueFIXME(String value) {
+        this.valueFIXME = value;
+    }
+
+}

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tprops.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tprops.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tprops.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.osgi.blueprint.model;
+package org.jboss.osgi.blueprint.reflect;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tref.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tref.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tref.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.osgi.blueprint.model;
+package org.jboss.osgi.blueprint.reflect;
 
 /**
  * 

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TrefCollection.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TrefCollection.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TrefCollection.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.osgi.blueprint.model;
+package org.jboss.osgi.blueprint.reflect;
 
 
 /**

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Treference.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Treference.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Treference.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.osgi.blueprint.model;
+package org.jboss.osgi.blueprint.reflect;
 
 import java.math.BigInteger;
 

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TregistrationListener.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TregistrationListener.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TregistrationListener.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,230 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 
- *               
- *               A registration listener definition.  The target registration listener
- *               can be either a <ref> to a <bean> or <service> component, or an inline
- *               <bean> or <service> component definition.  The registration-method and
- *               unregistration-method attributes define the methods that will be called
- *               for the respective events.
- * 
- *               For the very common case of using a <ref> to a listener component, the
- *               ref attribute may also be used as a shortcut.
- *               
- *             
- * 
- * <p>Java class for TregistrationListener complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TregistrationListener">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}targetComponent"/>
- *       &lt;attribute name="ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
- *       &lt;attribute name="registration-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
- *       &lt;attribute name="unregistration-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class TregistrationListener {
-
-    protected Tbean bean;
-    protected Treference reference;
-    protected Tref refFIXME;
-    protected List<Object> any;
-    protected String ref;
-    protected String registrationMethod;
-    protected String unregistrationMethod;
-
-    /**
-     * Gets the value of the bean property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tbean }
-     *     
-     */
-    public Tbean getBean() {
-        return bean;
-    }
-
-    /**
-     * Sets the value of the bean property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tbean }
-     *     
-     */
-    public void setBean(Tbean value) {
-        this.bean = value;
-    }
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Treference }
-     *     
-     */
-    public Treference getReference() {
-        return reference;
-    }
-
-    /**
-     * Sets the value of the reference property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Treference }
-     *     
-     */
-    public void setReference(Treference value) {
-        this.reference = value;
-    }
-
-    /**
-     * Gets the value of the refFIXME property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tref }
-     *     
-     */
-    public Tref getRefFIXME() {
-        return refFIXME;
-    }
-
-    /**
-     * Sets the value of the refFIXME property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tref }
-     *     
-     */
-    public void setRefFIXME(Tref value) {
-        this.refFIXME = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the ref property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRef() {
-        return ref;
-    }
-
-    /**
-     * Sets the value of the ref property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRef(String value) {
-        this.ref = value;
-    }
-
-    /**
-     * Gets the value of the registrationMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRegistrationMethod() {
-        return registrationMethod;
-    }
-
-    /**
-     * Sets the value of the registrationMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRegistrationMethod(String value) {
-        this.registrationMethod = value;
-    }
-
-    /**
-     * Gets the value of the unregistrationMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUnregistrationMethod() {
-        return unregistrationMethod;
-    }
-
-    /**
-     * Sets the value of the unregistrationMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUnregistrationMethod(String value) {
-        this.unregistrationMethod = value;
-    }
-
-}

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TregistrationListener.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TregistrationListener.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TregistrationListener.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TregistrationListener.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,230 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.05.13 at 02:16:52 PM CEST 
+//
+
+
+package org.jboss.osgi.blueprint.reflect;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 
+ *               
+ *               A registration listener definition.  The target registration listener
+ *               can be either a <ref> to a <bean> or <service> component, or an inline
+ *               <bean> or <service> component definition.  The registration-method and
+ *               unregistration-method attributes define the methods that will be called
+ *               for the respective events.
+ * 
+ *               For the very common case of using a <ref> to a listener component, the
+ *               ref attribute may also be used as a shortcut.
+ *               
+ *             
+ * 
+ * <p>Java class for TregistrationListener complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TregistrationListener">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}targetComponent"/>
+ *       &lt;attribute name="ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
+ *       &lt;attribute name="registration-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
+ *       &lt;attribute name="unregistration-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+public class TregistrationListener {
+
+    protected Bean bean;
+    protected Treference reference;
+    protected Tref refFIXME;
+    protected List<Object> any;
+    protected String ref;
+    protected String registrationMethod;
+    protected String unregistrationMethod;
+
+    /**
+     * Gets the value of the bean property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Bean }
+     *     
+     */
+    public Bean getBean() {
+        return bean;
+    }
+
+    /**
+     * Sets the value of the bean property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Bean }
+     *     
+     */
+    public void setBean(Bean value) {
+        this.bean = value;
+    }
+
+    /**
+     * Gets the value of the reference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Treference }
+     *     
+     */
+    public Treference getReference() {
+        return reference;
+    }
+
+    /**
+     * Sets the value of the reference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Treference }
+     *     
+     */
+    public void setReference(Treference value) {
+        this.reference = value;
+    }
+
+    /**
+     * Gets the value of the refFIXME property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tref }
+     *     
+     */
+    public Tref getRefFIXME() {
+        return refFIXME;
+    }
+
+    /**
+     * Sets the value of the refFIXME property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tref }
+     *     
+     */
+    public void setRefFIXME(Tref value) {
+        this.refFIXME = value;
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Object }
+     * 
+     * 
+     */
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
+
+    /**
+     * Gets the value of the ref property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRef() {
+        return ref;
+    }
+
+    /**
+     * Sets the value of the ref property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRef(String value) {
+        this.ref = value;
+    }
+
+    /**
+     * Gets the value of the registrationMethod property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRegistrationMethod() {
+        return registrationMethod;
+    }
+
+    /**
+     * Sets the value of the registrationMethod property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRegistrationMethod(String value) {
+        this.registrationMethod = value;
+    }
+
+    /**
+     * Gets the value of the unregistrationMethod property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getUnregistrationMethod() {
+        return unregistrationMethod;
+    }
+
+    /**
+     * Sets the value of the unregistrationMethod property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setUnregistrationMethod(String value) {
+        this.unregistrationMethod = value;
+    }
+
+}

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tservice.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tservice.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tservice.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,396 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * 
- *               
- *               Tservice is the type for services exported by this blueprint bundle.
- *               Services are sourced by either a <ref> to a <bean> component or an
- *               <inline> bean component.
- *               
- *             
- * 
- * <p>Java class for Tservice complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="Tservice">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tcomponent">
- *       &lt;sequence>
- *         &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}serviceElements"/>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="interface" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tclass" />
- *       &lt;attribute name="ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
- *       &lt;attribute name="depends-on" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TdependsOn" />
- *       &lt;attribute name="auto-export" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TautoExportModes" default="disabled" />
- *       &lt;attribute name="ranking" type="{http://www.w3.org/2001/XMLSchema}int" default="0" />
- *       &lt;anyAttribute processContents='lax' namespace='##other'/>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class Tservice
-    extends Tcomponent
-{
-
-    protected Tdescription description;
-    protected Tinterfaces interfaces;
-    protected TserviceProperties serviceProperties;
-    protected List<TregistrationListener> registrationListener;
-    protected Tbean bean;
-    protected Tref refFIXME;
-    protected List<Object> any;
-    protected String _interface;
-    protected String ref;
-    protected String dependsOn;
-    protected TautoExportModes autoExport;
-    protected Integer ranking;
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tdescription }
-     *     
-     */
-    public Tdescription getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tdescription }
-     *     
-     */
-    public void setDescription(Tdescription value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the interfaces property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tinterfaces }
-     *     
-     */
-    public Tinterfaces getInterfaces() {
-        return interfaces;
-    }
-
-    /**
-     * Sets the value of the interfaces property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tinterfaces }
-     *     
-     */
-    public void setInterfaces(Tinterfaces value) {
-        this.interfaces = value;
-    }
-
-    /**
-     * Gets the value of the serviceProperties property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TserviceProperties }
-     *     
-     */
-    public TserviceProperties getServiceProperties() {
-        return serviceProperties;
-    }
-
-    /**
-     * Sets the value of the serviceProperties property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TserviceProperties }
-     *     
-     */
-    public void setServiceProperties(TserviceProperties value) {
-        this.serviceProperties = value;
-    }
-
-    /**
-     * Gets the value of the registrationListener property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the registrationListener property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getRegistrationListener().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link TregistrationListener }
-     * 
-     * 
-     */
-    public List<TregistrationListener> getRegistrationListener() {
-        if (registrationListener == null) {
-            registrationListener = new ArrayList<TregistrationListener>();
-        }
-        return this.registrationListener;
-    }
-
-    /**
-     * Gets the value of the bean property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tbean }
-     *     
-     */
-    public Tbean getBean() {
-        return bean;
-    }
-
-    /**
-     * Sets the value of the bean property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tbean }
-     *     
-     */
-    public void setBean(Tbean value) {
-        this.bean = value;
-    }
-
-    /**
-     * Gets the value of the refFIXME property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tref }
-     *     
-     */
-    public Tref getRefFIXME() {
-        return refFIXME;
-    }
-
-    /**
-     * Sets the value of the refFIXME property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tref }
-     *     
-     */
-    public void setRefFIXME(Tref value) {
-        this.refFIXME = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the interface property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getInterface() {
-        return _interface;
-    }
-
-    /**
-     * Sets the value of the interface property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setInterface(String value) {
-        this._interface = value;
-    }
-
-    /**
-     * Gets the value of the ref property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRef() {
-        return ref;
-    }
-
-    /**
-     * Sets the value of the ref property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRef(String value) {
-        this.ref = value;
-    }
-
-    /**
-     * Gets the value of the dependsOn property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDependsOn() {
-        return dependsOn;
-    }
-
-    /**
-     * Sets the value of the dependsOn property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDependsOn(String value) {
-        this.dependsOn = value;
-    }
-
-    /**
-     * Gets the value of the autoExport property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TautoExportModes }
-     *     
-     */
-    public TautoExportModes getAutoExport() {
-        if (autoExport == null) {
-            return TautoExportModes.DISABLED;
-        } else {
-            return autoExport;
-        }
-    }
-
-    /**
-     * Sets the value of the autoExport property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TautoExportModes }
-     *     
-     */
-    public void setAutoExport(TautoExportModes value) {
-        this.autoExport = value;
-    }
-
-    /**
-     * Gets the value of the ranking property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public int getRanking() {
-        if (ranking == null) {
-            return  0;
-        } else {
-            return ranking;
-        }
-    }
-
-    /**
-     * Sets the value of the ranking property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setRanking(Integer value) {
-        this.ranking = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tservice.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tservice.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tservice.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tservice.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,396 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.05.13 at 02:16:52 PM CEST 
+//
+
+
+package org.jboss.osgi.blueprint.reflect;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.xml.namespace.QName;
+import org.w3c.dom.Element;
+
+
+/**
+ * 
+ *               
+ *               Tservice is the type for services exported by this blueprint bundle.
+ *               Services are sourced by either a <ref> to a <bean> component or an
+ *               <inline> bean component.
+ *               
+ *             
+ * 
+ * <p>Java class for Tservice complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Tservice">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tcomponent">
+ *       &lt;sequence>
+ *         &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}serviceElements"/>
+ *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="interface" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tclass" />
+ *       &lt;attribute name="ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
+ *       &lt;attribute name="depends-on" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TdependsOn" />
+ *       &lt;attribute name="auto-export" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TautoExportModes" default="disabled" />
+ *       &lt;attribute name="ranking" type="{http://www.w3.org/2001/XMLSchema}int" default="0" />
+ *       &lt;anyAttribute processContents='lax' namespace='##other'/>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+public class Tservice
+    extends Component
+{
+
+    protected String description;
+    protected Tinterfaces interfaces;
+    protected TserviceProperties serviceProperties;
+    protected List<TregistrationListener> registrationListener;
+    protected Bean bean;
+    protected Tref refFIXME;
+    protected List<Object> any;
+    protected String _interface;
+    protected String ref;
+    protected String dependsOn;
+    protected TautoExportModes autoExport;
+    protected Integer ranking;
+    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+    /**
+     * Gets the value of the description property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDescription(String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the interfaces property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tinterfaces }
+     *     
+     */
+    public Tinterfaces getInterfaces() {
+        return interfaces;
+    }
+
+    /**
+     * Sets the value of the interfaces property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tinterfaces }
+     *     
+     */
+    public void setInterfaces(Tinterfaces value) {
+        this.interfaces = value;
+    }
+
+    /**
+     * Gets the value of the serviceProperties property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TserviceProperties }
+     *     
+     */
+    public TserviceProperties getServiceProperties() {
+        return serviceProperties;
+    }
+
+    /**
+     * Sets the value of the serviceProperties property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TserviceProperties }
+     *     
+     */
+    public void setServiceProperties(TserviceProperties value) {
+        this.serviceProperties = value;
+    }
+
+    /**
+     * Gets the value of the registrationListener property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the registrationListener property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRegistrationListener().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link TregistrationListener }
+     * 
+     * 
+     */
+    public List<TregistrationListener> getRegistrationListener() {
+        if (registrationListener == null) {
+            registrationListener = new ArrayList<TregistrationListener>();
+        }
+        return this.registrationListener;
+    }
+
+    /**
+     * Gets the value of the bean property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Bean }
+     *     
+     */
+    public Bean getBean() {
+        return bean;
+    }
+
+    /**
+     * Sets the value of the bean property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Bean }
+     *     
+     */
+    public void setBean(Bean value) {
+        this.bean = value;
+    }
+
+    /**
+     * Gets the value of the refFIXME property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tref }
+     *     
+     */
+    public Tref getRefFIXME() {
+        return refFIXME;
+    }
+
+    /**
+     * Sets the value of the refFIXME property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tref }
+     *     
+     */
+    public void setRefFIXME(Tref value) {
+        this.refFIXME = value;
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Object }
+     * {@link Element }
+     * 
+     * 
+     */
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
+
+    /**
+     * Gets the value of the interface property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getInterface() {
+        return _interface;
+    }
+
+    /**
+     * Sets the value of the interface property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setInterface(String value) {
+        this._interface = value;
+    }
+
+    /**
+     * Gets the value of the ref property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRef() {
+        return ref;
+    }
+
+    /**
+     * Sets the value of the ref property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRef(String value) {
+        this.ref = value;
+    }
+
+    /**
+     * Gets the value of the dependsOn property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDependsOn() {
+        return dependsOn;
+    }
+
+    /**
+     * Sets the value of the dependsOn property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDependsOn(String value) {
+        this.dependsOn = value;
+    }
+
+    /**
+     * Gets the value of the autoExport property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TautoExportModes }
+     *     
+     */
+    public TautoExportModes getAutoExport() {
+        if (autoExport == null) {
+            return TautoExportModes.DISABLED;
+        } else {
+            return autoExport;
+        }
+    }
+
+    /**
+     * Sets the value of the autoExport property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TautoExportModes }
+     *     
+     */
+    public void setAutoExport(TautoExportModes value) {
+        this.autoExport = value;
+    }
+
+    /**
+     * Gets the value of the ranking property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Integer }
+     *     
+     */
+    public int getRanking() {
+        if (ranking == null) {
+            return  0;
+        } else {
+            return ranking;
+        }
+    }
+
+    /**
+     * Sets the value of the ranking property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Integer }
+     *     
+     */
+    public void setRanking(Integer value) {
+        this.ranking = value;
+    }
+
+    /**
+     * Gets a map that contains attributes that aren't bound to any typed property on this class.
+     * 
+     * <p>
+     * the map is keyed by the name of the attribute and 
+     * the value is the string value of the attribute.
+     * 
+     * the map returned by this method is live, and you can add new attribute
+     * by updating the map directly. Because of this design, there's no setter.
+     * 
+     * 
+     * @return
+     *     always non-null
+     */
+    public Map<QName, String> getOtherAttributes() {
+        return otherAttributes;
+    }
+
+}

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceProperties.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TserviceProperties.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceProperties.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.osgi.blueprint.model;
+package org.jboss.osgi.blueprint.reflect;
 
 import java.util.ArrayList;
 import java.util.List;

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TservicePropertyEntry.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TservicePropertyEntry.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TservicePropertyEntry.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,476 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 
- *               
- *               TservicePropertyEntry is an entry value used for the <service-properties>
- *               element.  This does not allow a child <key> element and there are no
- *               key-ref or value-ref attributes.
- *               
- *             
- * 
- * <p>Java class for TservicePropertyEntry complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TservicePropertyEntry">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}value"/>
- *       &lt;/sequence>
- *       &lt;attribute name="key" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TstringValue" />
- *       &lt;attribute name="valueFIXME" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TstringValue" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class TservicePropertyEntry {
-
-    protected Tservice service;
-    protected TrefCollection refList;
-    protected TrefCollection refSet;
-    protected Tbean bean;
-    protected Treference reference;
-    protected Tref refFIXME;
-    protected List<Object> any;
-    protected Tref idref;
-    protected Tvalue value;
-    protected Tcollection list;
-    protected Tcollection set;
-    protected Tmap map;
-    protected Tcollection array;
-    protected Tprops props;
-    protected Tnull _null;
-    protected String key;
-    protected String valueFIXME;
-
-    /**
-     * Gets the value of the service property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tservice }
-     *     
-     */
-    public Tservice getService() {
-        return service;
-    }
-
-    /**
-     * Sets the value of the service property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tservice }
-     *     
-     */
-    public void setService(Tservice value) {
-        this.service = value;
-    }
-
-    /**
-     * Gets the value of the refList property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public TrefCollection getRefList() {
-        return refList;
-    }
-
-    /**
-     * Sets the value of the refList property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public void setRefList(TrefCollection value) {
-        this.refList = value;
-    }
-
-    /**
-     * Gets the value of the refSet property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public TrefCollection getRefSet() {
-        return refSet;
-    }
-
-    /**
-     * Sets the value of the refSet property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TrefCollection }
-     *     
-     */
-    public void setRefSet(TrefCollection value) {
-        this.refSet = value;
-    }
-
-    /**
-     * Gets the value of the bean property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tbean }
-     *     
-     */
-    public Tbean getBean() {
-        return bean;
-    }
-
-    /**
-     * Sets the value of the bean property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tbean }
-     *     
-     */
-    public void setBean(Tbean value) {
-        this.bean = value;
-    }
-
-    /**
-     * Gets the value of the reference property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Treference }
-     *     
-     */
-    public Treference getReference() {
-        return reference;
-    }
-
-    /**
-     * Sets the value of the reference property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Treference }
-     *     
-     */
-    public void setReference(Treference value) {
-        this.reference = value;
-    }
-
-    /**
-     * Gets the value of the refFIXME property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tref }
-     *     
-     */
-    public Tref getRefFIXME() {
-        return refFIXME;
-    }
-
-    /**
-     * Sets the value of the refFIXME property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tref }
-     *     
-     */
-    public void setRefFIXME(Tref value) {
-        this.refFIXME = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the idref property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tref }
-     *     
-     */
-    public Tref getIdref() {
-        return idref;
-    }
-
-    /**
-     * Sets the value of the idref property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tref }
-     *     
-     */
-    public void setIdref(Tref value) {
-        this.idref = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tvalue }
-     *     
-     */
-    public Tvalue getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tvalue }
-     *     
-     */
-    public void setValue(Tvalue value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets the value of the list property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getList() {
-        return list;
-    }
-
-    /**
-     * Sets the value of the list property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setList(Tcollection value) {
-        this.list = value;
-    }
-
-    /**
-     * Gets the value of the set property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getSet() {
-        return set;
-    }
-
-    /**
-     * Sets the value of the set property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setSet(Tcollection value) {
-        this.set = value;
-    }
-
-    /**
-     * Gets the value of the map property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tmap }
-     *     
-     */
-    public Tmap getMap() {
-        return map;
-    }
-
-    /**
-     * Sets the value of the map property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tmap }
-     *     
-     */
-    public void setMap(Tmap value) {
-        this.map = value;
-    }
-
-    /**
-     * Gets the value of the array property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tcollection }
-     *     
-     */
-    public Tcollection getArray() {
-        return array;
-    }
-
-    /**
-     * Sets the value of the array property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tcollection }
-     *     
-     */
-    public void setArray(Tcollection value) {
-        this.array = value;
-    }
-
-    /**
-     * Gets the value of the props property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tprops }
-     *     
-     */
-    public Tprops getProps() {
-        return props;
-    }
-
-    /**
-     * Sets the value of the props property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tprops }
-     *     
-     */
-    public void setProps(Tprops value) {
-        this.props = value;
-    }
-
-    /**
-     * Gets the value of the null property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tnull }
-     *     
-     */
-    public Tnull getNull() {
-        return _null;
-    }
-
-    /**
-     * Sets the value of the null property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tnull }
-     *     
-     */
-    public void setNull(Tnull value) {
-        this._null = value;
-    }
-
-    /**
-     * Gets the value of the key property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKey() {
-        return key;
-    }
-
-    /**
-     * Sets the value of the key property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKey(String value) {
-        this.key = value;
-    }
-
-    /**
-     * Gets the value of the valueFIXME property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValueFIXME() {
-        return valueFIXME;
-    }
-
-    /**
-     * Sets the value of the valueFIXME property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValueFIXME(String value) {
-        this.valueFIXME = value;
-    }
-
-}

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TservicePropertyEntry.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TservicePropertyEntry.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TservicePropertyEntry.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TservicePropertyEntry.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,476 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.05.13 at 02:16:52 PM CEST 
+//
+
+
+package org.jboss.osgi.blueprint.reflect;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 
+ *               
+ *               TservicePropertyEntry is an entry value used for the <service-properties>
+ *               element.  This does not allow a child <key> element and there are no
+ *               key-ref or value-ref attributes.
+ *               
+ *             
+ * 
+ * <p>Java class for TservicePropertyEntry complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TservicePropertyEntry">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}value"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="key" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TstringValue" />
+ *       &lt;attribute name="valueFIXME" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TstringValue" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+public class TservicePropertyEntry {
+
+    protected Tservice service;
+    protected TrefCollection refList;
+    protected TrefCollection refSet;
+    protected Bean bean;
+    protected Treference reference;
+    protected Tref refFIXME;
+    protected List<Object> any;
+    protected Tref idref;
+    protected Tvalue value;
+    protected Tcollection list;
+    protected Tcollection set;
+    protected Tmap map;
+    protected Tcollection array;
+    protected Tprops props;
+    protected Tnull _null;
+    protected String key;
+    protected String valueFIXME;
+
+    /**
+     * Gets the value of the service property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tservice }
+     *     
+     */
+    public Tservice getService() {
+        return service;
+    }
+
+    /**
+     * Sets the value of the service property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tservice }
+     *     
+     */
+    public void setService(Tservice value) {
+        this.service = value;
+    }
+
+    /**
+     * Gets the value of the refList property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public TrefCollection getRefList() {
+        return refList;
+    }
+
+    /**
+     * Sets the value of the refList property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public void setRefList(TrefCollection value) {
+        this.refList = value;
+    }
+
+    /**
+     * Gets the value of the refSet property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public TrefCollection getRefSet() {
+        return refSet;
+    }
+
+    /**
+     * Sets the value of the refSet property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TrefCollection }
+     *     
+     */
+    public void setRefSet(TrefCollection value) {
+        this.refSet = value;
+    }
+
+    /**
+     * Gets the value of the bean property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Bean }
+     *     
+     */
+    public Bean getBean() {
+        return bean;
+    }
+
+    /**
+     * Sets the value of the bean property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Bean }
+     *     
+     */
+    public void setBean(Bean value) {
+        this.bean = value;
+    }
+
+    /**
+     * Gets the value of the reference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Treference }
+     *     
+     */
+    public Treference getReference() {
+        return reference;
+    }
+
+    /**
+     * Sets the value of the reference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Treference }
+     *     
+     */
+    public void setReference(Treference value) {
+        this.reference = value;
+    }
+
+    /**
+     * Gets the value of the refFIXME property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tref }
+     *     
+     */
+    public Tref getRefFIXME() {
+        return refFIXME;
+    }
+
+    /**
+     * Sets the value of the refFIXME property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tref }
+     *     
+     */
+    public void setRefFIXME(Tref value) {
+        this.refFIXME = value;
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Object }
+     * 
+     * 
+     */
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
+
+    /**
+     * Gets the value of the idref property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tref }
+     *     
+     */
+    public Tref getIdref() {
+        return idref;
+    }
+
+    /**
+     * Sets the value of the idref property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tref }
+     *     
+     */
+    public void setIdref(Tref value) {
+        this.idref = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tvalue }
+     *     
+     */
+    public Tvalue getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tvalue }
+     *     
+     */
+    public void setValue(Tvalue value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the list property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getList() {
+        return list;
+    }
+
+    /**
+     * Sets the value of the list property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setList(Tcollection value) {
+        this.list = value;
+    }
+
+    /**
+     * Gets the value of the set property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getSet() {
+        return set;
+    }
+
+    /**
+     * Sets the value of the set property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setSet(Tcollection value) {
+        this.set = value;
+    }
+
+    /**
+     * Gets the value of the map property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tmap }
+     *     
+     */
+    public Tmap getMap() {
+        return map;
+    }
+
+    /**
+     * Sets the value of the map property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tmap }
+     *     
+     */
+    public void setMap(Tmap value) {
+        this.map = value;
+    }
+
+    /**
+     * Gets the value of the array property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tcollection }
+     *     
+     */
+    public Tcollection getArray() {
+        return array;
+    }
+
+    /**
+     * Sets the value of the array property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tcollection }
+     *     
+     */
+    public void setArray(Tcollection value) {
+        this.array = value;
+    }
+
+    /**
+     * Gets the value of the props property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tprops }
+     *     
+     */
+    public Tprops getProps() {
+        return props;
+    }
+
+    /**
+     * Sets the value of the props property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tprops }
+     *     
+     */
+    public void setProps(Tprops value) {
+        this.props = value;
+    }
+
+    /**
+     * Gets the value of the null property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Tnull }
+     *     
+     */
+    public Tnull getNull() {
+        return _null;
+    }
+
+    /**
+     * Sets the value of the null property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Tnull }
+     *     
+     */
+    public void setNull(Tnull value) {
+        this._null = value;
+    }
+
+    /**
+     * Gets the value of the key property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getKey() {
+        return key;
+    }
+
+    /**
+     * Sets the value of the key property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setKey(String value) {
+        this.key = value;
+    }
+
+    /**
+     * Gets the value of the valueFIXME property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValueFIXME() {
+        return valueFIXME;
+    }
+
+    /**
+     * Sets the value of the valueFIXME property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValueFIXME(String value) {
+        this.valueFIXME = value;
+    }
+
+}

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceReference.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TserviceReference.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceReference.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,289 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.namespace.QName;
-import org.w3c.dom.Element;
-
-
-/**
- * 
- *               
- *               TserviceReference is the base element type used for <reference>,
- *               <ref-set>, and <ref-list> elements.  This type defines all of the
- *               characteristics common to both sorts of references.
- *               
- *             
- * 
- * <p>Java class for TserviceReference complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TserviceReference">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tcomponent">
- *       &lt;sequence>
- *         &lt;element name="description" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tdescription" minOccurs="0"/>
- *         &lt;element name="interfaces" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tinterfaces" minOccurs="0"/>
- *         &lt;element name="listener" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TReferenceListener" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="interface" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tclass" />
- *       &lt;attribute name="filter" type="{http://www.w3.org/2001/XMLSchema}normalizedString" />
- *       &lt;attribute name="component-name" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
- *       &lt;attribute name="availability" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tavailability" />
- *       &lt;anyAttribute processContents='lax' namespace='##other'/>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class TserviceReference
-    extends Tcomponent
-{
-
-    protected Tdescription description;
-    protected Tinterfaces interfaces;
-    protected List<TReferenceListener> listener;
-    protected List<Object> any;
-    protected String _interface;
-    protected String filter;
-    protected String componentName;
-    protected Tavailability availability;
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tdescription }
-     *     
-     */
-    public Tdescription getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tdescription }
-     *     
-     */
-    public void setDescription(Tdescription value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the interfaces property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tinterfaces }
-     *     
-     */
-    public Tinterfaces getInterfaces() {
-        return interfaces;
-    }
-
-    /**
-     * Sets the value of the interfaces property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tinterfaces }
-     *     
-     */
-    public void setInterfaces(Tinterfaces value) {
-        this.interfaces = value;
-    }
-
-    /**
-     * Gets the value of the listener property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the listener property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getListener().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link TReferenceListener }
-     * 
-     * 
-     */
-    public List<TReferenceListener> getListener() {
-        if (listener == null) {
-            listener = new ArrayList<TReferenceListener>();
-        }
-        return this.listener;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the interface property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getInterface() {
-        return _interface;
-    }
-
-    /**
-     * Sets the value of the interface property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setInterface(String value) {
-        this._interface = value;
-    }
-
-    /**
-     * Gets the value of the filter property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFilter() {
-        return filter;
-    }
-
-    /**
-     * Sets the value of the filter property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFilter(String value) {
-        this.filter = value;
-    }
-
-    /**
-     * Gets the value of the componentName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getComponentName() {
-        return componentName;
-    }
-
-    /**
-     * Sets the value of the componentName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setComponentName(String value) {
-        this.componentName = value;
-    }
-
-    /**
-     * Gets the value of the availability property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Tavailability }
-     *     
-     */
-    public Tavailability getAvailability() {
-        return availability;
-    }
-
-    /**
-     * Sets the value of the availability property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Tavailability }
-     *     
-     */
-    public void setAvailability(Tavailability value) {
-        this.availability = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceReference.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TserviceReference.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceReference.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TserviceReference.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,274 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.05.13 at 02:16:52 PM CEST 
+//
+
+package org.jboss.osgi.blueprint.reflect;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+
+/**
+ * 
+ * 
+ * TserviceReference is the base element type used for <reference>, <ref-set>, and <ref-list> elements. This type defines all of the characteristics common to both
+ * sorts of references.
+ * 
+ * 
+ * 
+ * <p>
+ * Java class for TserviceReference complex type.
+ * 
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name=&quot;TserviceReference&quot;&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;extension base=&quot;{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tcomponent&quot;&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name=&quot;description&quot; type=&quot;{http://www.osgi.org/xmlns/blueprint/v1.0.0}String&quot; minOccurs=&quot;0&quot;/&gt;
+ *         &lt;element name=&quot;interfaces&quot; type=&quot;{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tinterfaces&quot; minOccurs=&quot;0&quot;/&gt;
+ *         &lt;element name=&quot;listener&quot; type=&quot;{http://www.osgi.org/xmlns/blueprint/v1.0.0}TReferenceListener&quot; maxOccurs=&quot;unbounded&quot; minOccurs=&quot;0&quot;/&gt;
+ *         &lt;any processContents='lax' namespace='##other' maxOccurs=&quot;unbounded&quot; minOccurs=&quot;0&quot;/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attribute name=&quot;interface&quot; type=&quot;{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tclass&quot; /&gt;
+ *       &lt;attribute name=&quot;filter&quot; type=&quot;{http://www.w3.org/2001/XMLSchema}normalizedString&quot; /&gt;
+ *       &lt;attribute name=&quot;component-name&quot; type=&quot;{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref&quot; /&gt;
+ *       &lt;attribute name=&quot;availability&quot; type=&quot;{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tavailability&quot; /&gt;
+ *       &lt;anyAttribute processContents='lax' namespace='##other'/&gt;
+ *     &lt;/extension&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+public class TserviceReference extends Component
+{
+
+   protected String description;
+   protected Tinterfaces interfaces;
+   protected List<TReferenceListener> listener;
+   protected List<Object> any;
+   protected String _interface;
+   protected String filter;
+   protected String componentName;
+   protected Availability availability;
+   private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+   /**
+    * Gets the value of the description property.
+    * 
+    * @return possible object is {@link String }
+    * 
+    */
+   public String getDescription()
+   {
+      return description;
+   }
+
+   /**
+    * Sets the value of the description property.
+    * 
+    * @param value allowed object is {@link String }
+    * 
+    */
+   public void setDescription(String value)
+   {
+      this.description = value;
+   }
+
+   /**
+    * Gets the value of the interfaces property.
+    * 
+    * @return possible object is {@link Tinterfaces }
+    * 
+    */
+   public Tinterfaces getInterfaces()
+   {
+      return interfaces;
+   }
+
+   /**
+    * Sets the value of the interfaces property.
+    * 
+    * @param value allowed object is {@link Tinterfaces }
+    * 
+    */
+   public void setInterfaces(Tinterfaces value)
+   {
+      this.interfaces = value;
+   }
+
+   /**
+    * Gets the value of the listener property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the
+    * JAXB object. This is why there is not a <CODE>set</CODE> method for the listener property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * 
+    * <pre>
+    * getListener().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list {@link TReferenceListener }
+    * 
+    * 
+    */
+   public List<TReferenceListener> getListener()
+   {
+      if (listener == null)
+      {
+         listener = new ArrayList<TReferenceListener>();
+      }
+      return this.listener;
+   }
+
+   /**
+    * Gets the value of the any property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the
+    * JAXB object. This is why there is not a <CODE>set</CODE> method for the any property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * 
+    * <pre>
+    * getAny().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list {@link Object } {@link Element }
+    * 
+    * 
+    */
+   public List<Object> getAny()
+   {
+      if (any == null)
+      {
+         any = new ArrayList<Object>();
+      }
+      return this.any;
+   }
+
+   /**
+    * Gets the value of the interface property.
+    * 
+    * @return possible object is {@link String }
+    * 
+    */
+   public String getInterface()
+   {
+      return _interface;
+   }
+
+   /**
+    * Sets the value of the interface property.
+    * 
+    * @param value allowed object is {@link String }
+    * 
+    */
+   public void setInterface(String value)
+   {
+      this._interface = value;
+   }
+
+   /**
+    * Gets the value of the filter property.
+    * 
+    * @return possible object is {@link String }
+    * 
+    */
+   public String getFilter()
+   {
+      return filter;
+   }
+
+   /**
+    * Sets the value of the filter property.
+    * 
+    * @param value allowed object is {@link String }
+    * 
+    */
+   public void setFilter(String value)
+   {
+      this.filter = value;
+   }
+
+   /**
+    * Gets the value of the componentName property.
+    * 
+    * @return possible object is {@link String }
+    * 
+    */
+   public String getComponentName()
+   {
+      return componentName;
+   }
+
+   /**
+    * Sets the value of the componentName property.
+    * 
+    * @param value allowed object is {@link String }
+    * 
+    */
+   public void setComponentName(String value)
+   {
+      this.componentName = value;
+   }
+
+   /**
+    * Gets the value of the availability property.
+    * 
+    * @return possible object is {@link Tavailability }
+    * 
+    */
+   public Availability getAvailability()
+   {
+      return availability;
+   }
+
+   /**
+    * Sets the value of the availability property.
+    * 
+    * @param value allowed object is {@link Tavailability }
+    * 
+    */
+   public void setAvailability(String value)
+   {
+      this.availability = Availability.valueOf(value);
+   }
+
+   /**
+    * Gets a map that contains attributes that aren't bound to any typed property on this class.
+    * 
+    * <p>
+    * the map is keyed by the name of the attribute and the value is the string value of the attribute.
+    * 
+    * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of this design, there's no setter.
+    * 
+    * 
+    * @return always non-null
+    */
+   public Map<QName, String> getOtherAttributes()
+   {
+      return otherAttributes;
+   }
+
+}

Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TtypeConverters.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TtypeConverters.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TtypeConverters.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -1,79 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.05.13 at 02:16:52 PM CEST 
-//
-
-
-package org.jboss.osgi.blueprint.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * 
- *               
- *               The type used for the <type-converters> element.  The
- *               <type-converters> section is a set of <bean>, <ref>, or
- *               <reference> elements that identify the type convert components
- *               that will ference components.
- *               
- *             
- * 
- * <p>Java class for Ttype-converters complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="Ttype-converters">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}targetComponent"/>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class TtypeConverters {
-
-    protected List<Object> beanOrReferenceOrRefFIXME;
-
-    /**
-     * Gets the value of the beanOrReferenceOrRefFIXME property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the beanOrReferenceOrRefFIXME property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getBeanOrReferenceOrRefFIXME().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link Tbean }{@code >}
-     * {@link JAXBElement }{@code <}{@link Treference }{@code >}
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link Tref }{@code >}
-     * 
-     * 
-     */
-    public List<Object> getBeanOrReferenceOrRefFIXME() {
-        if (beanOrReferenceOrRefFIXME == null) {
-            beanOrReferenceOrRefFIXME = new ArrayList<Object>();
-        }
-        return this.beanOrReferenceOrRefFIXME;
-    }
-
-}

Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TtypeConverters.java (from rev 88854, projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TtypeConverters.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TtypeConverters.java	                        (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TtypeConverters.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -0,0 +1,79 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-793 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2009.05.13 at 02:16:52 PM CEST 
+//
+
+
+package org.jboss.osgi.blueprint.reflect;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 
+ *               
+ *               The type used for the <type-converters> element.  The
+ *               <type-converters> section is a set of <bean>, <ref>, or
+ *               <reference> elements that identify the type convert components
+ *               that will ference components.
+ *               
+ *             
+ * 
+ * <p>Java class for Ttype-converters complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Ttype-converters">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}targetComponent"/>
+ *       &lt;/choice>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+public class TtypeConverters {
+
+    protected List<Object> beanOrReferenceOrRefFIXME;
+
+    /**
+     * Gets the value of the beanOrReferenceOrRefFIXME property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the beanOrReferenceOrRefFIXME property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getBeanOrReferenceOrRefFIXME().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link Bean }{@code >}
+     * {@link JAXBElement }{@code <}{@link Treference }{@code >}
+     * {@link Object }
+     * {@link JAXBElement }{@code <}{@link Tref }{@code >}
+     * 
+     * 
+     */
+    public List<Object> getBeanOrReferenceOrRefFIXME() {
+        if (beanOrReferenceOrRefFIXME == null) {
+            beanOrReferenceOrRefFIXME = new ArrayList<Object>();
+        }
+        return this.beanOrReferenceOrRefFIXME;
+    }
+
+}

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TtypedCollection.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/TtypedCollection.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/TtypedCollection.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.osgi.blueprint.model;
+package org.jboss.osgi.blueprint.reflect;
 
 
 

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tvalue.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/model/Tvalue.java	2009-05-13 12:30:09 UTC (rev 88810)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/reflect/Tvalue.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.osgi.blueprint.model;
+package org.jboss.osgi.blueprint.reflect;
 
 /**
  * 

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/resources/schema/blueprint-jbxb.xsd
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/main/resources/schema/blueprint-jbxb.xsd	2009-05-14 08:11:21 UTC (rev 88855)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/resources/schema/blueprint-jbxb.xsd	2009-05-14 08:47:33 UTC (rev 88856)
@@ -64,7 +64,7 @@
     <xsd:element name="blueprint" type="Tblueprint">
         <xsd:annotation>
             <xsd:appinfo>
-              <jbxb:class impl="org.jboss.osgi.blueprint.model.Blueprint"></jbxb:class>
+              <jbxb:class impl="org.jboss.osgi.blueprint.reflect.Blueprint"></jbxb:class>
             </xsd:appinfo>
             <xsd:documentation>
             <![CDATA[
@@ -257,7 +257,7 @@
     <xsd:complexType name="Tbean">
         <xsd:annotation>
             <xsd:appinfo>
-              <jbxb:class impl="org.jboss.osgi.blueprint.model.Bean"></jbxb:class>
+              <jbxb:class impl="org.jboss.osgi.blueprint.reflect.Bean"></jbxb:class>
             </xsd:appinfo>
             <xsd:documentation>
               <![CDATA[
@@ -605,7 +605,7 @@
     <xsd:simpleType name="Tavailability">
         <xsd:annotation>
             <xsd:appinfo>
-                <jbxb:class impl="org.jboss.osgi.blueprint.model.Availability"></jbxb:class>
+                <jbxb:class impl="org.jboss.osgi.blueprint.reflect.Availability"></jbxb:class>
             </xsd:appinfo>
             <xsd:documentation>
               <![CDATA[

Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/parser/ParserTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/parser/ParserTestCase.java	2009-05-14 08:11:21 UTC (rev 88855)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/parser/ParserTestCase.java	2009-05-14 08:47:33 UTC (rev 88856)
@@ -27,11 +27,11 @@
 import java.net.URL;
 import java.util.List;
 
-import org.jboss.osgi.blueprint.model.Availability;
-import org.jboss.osgi.blueprint.model.Bean;
-import org.jboss.osgi.blueprint.model.Blueprint;
-import org.jboss.osgi.blueprint.model.Component;
 import org.jboss.osgi.blueprint.parser.BlueprintParser;
+import org.jboss.osgi.blueprint.reflect.Availability;
+import org.jboss.osgi.blueprint.reflect.Bean;
+import org.jboss.osgi.blueprint.reflect.Blueprint;
+import org.jboss.osgi.blueprint.reflect.Component;
 import org.jboss.osgi.spi.testing.OSGiTest;
 
 /**


