[jboss-osgi-commits] JBoss-OSGI SVN: r90271 - in projects/jboss-osgi/trunk/blueprint: impl/src/main/java/org/jboss/osgi/blueprint/reflect and 3 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Tue Jun 16 16:27:35 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-06-16 16:27:34 -0400 (Tue, 16 Jun 2009)
New Revision: 90271
Added:
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComparatorImpl.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RefCollectionImpl.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RegistrationListenerImpl.java
Removed:
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomparator.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TrefCollection.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TregistrationListener.java
Modified:
projects/jboss-osgi/trunk/blueprint/impl/pom.xml
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BlueprintImpl.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComponentMetadataImpl.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/resources/schema/blueprint-jbxb.xsd
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicBeansParserTestCase.java
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicServiceParserTestCase.java
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-all-elements.xml
Log:
Add more BP parser tests
Modified: projects/jboss-osgi/trunk/blueprint/impl/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-06-16 20:27:34 UTC (rev 90271)
@@ -90,6 +90,7 @@
<excludePackageNames>org.jboss.osgi.*</excludePackageNames>
</configuration>
</plugin>
+ <!--
<plugin>
<groupId>xsddoc</groupId>
<artifactId>maven-xsddoc-plugin</artifactId>
@@ -98,6 +99,7 @@
<maven.xsddoc.include>blueprint.xsd</maven.xsddoc.include>
</configuration>
</plugin>
+ -->
</plugins>
</reporting>
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BlueprintImpl.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BlueprintImpl.java 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BlueprintImpl.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -32,6 +32,7 @@
import javax.xml.namespace.QName;
import org.jboss.osgi.spi.NotImplementedException;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
/**
* The blueprint element is the top element. The definitions consist of two sections:
@@ -49,7 +50,7 @@
{
protected String description;
protected TtypeConverters typeConverters;
- protected List<ComponentMetadataImpl> components;
+ protected List<ComponentMetadata> components;
protected Boolean defaultLazyInit;
protected String defaultInitMethod;
protected String defaultDestroyMethod;
@@ -100,12 +101,11 @@
/**
* Gets the value of components
*/
- public List<ComponentMetadataImpl> getComponents()
+ public List<ComponentMetadata> getComponents()
{
if (components == null)
- {
- components = new ArrayList<ComponentMetadataImpl>();
- }
+ components = new ArrayList<ComponentMetadata>();
+
return this.components;
}
Copied: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComparatorImpl.java (from rev 90249, projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomparator.java)
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComparatorImpl.java (rev 0)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComparatorImpl.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -0,0 +1,150 @@
+/*
+ * 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.List;
+
+/**
+ * <p>
+ * Java class for Tcomparator complex type.
+ *
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Tcomparator">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}targetComponent"/>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+public class ComparatorImpl
+{
+ protected BeanMetadataImpl bean;
+ protected ReferenceMetadataImpl reference;
+ protected Tref refFIXME;
+ protected List<Object> any;
+
+ /**
+ * Gets the value of the bean property.
+ *
+ * @return possible object is {@link BeanMetadataImpl }
+ *
+ */
+ public BeanMetadataImpl getBean()
+ {
+ return bean;
+ }
+
+ /**
+ * Sets the value of the bean property.
+ *
+ * @param value allowed object is {@link BeanMetadataImpl }
+ *
+ */
+ public void setBean(BeanMetadataImpl value)
+ {
+ this.bean = value;
+ }
+
+ /**
+ * Gets the value of the reference property.
+ *
+ * @return possible object is {@link ReferenceMetadataImpl }
+ *
+ */
+ public ReferenceMetadataImpl getReference()
+ {
+ return reference;
+ }
+
+ /**
+ * Sets the value of the reference property.
+ *
+ * @param value allowed object is {@link ReferenceMetadataImpl }
+ *
+ */
+ public void setReference(ReferenceMetadataImpl 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;
+ }
+
+}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComponentMetadataImpl.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComponentMetadataImpl.java 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComponentMetadataImpl.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -21,10 +21,10 @@
*/
package org.jboss.osgi.blueprint.reflect;
+//$Id$
+
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>
Copied: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RefCollectionImpl.java (from rev 90249, projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TrefCollection.java)
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RefCollectionImpl.java (rev 0)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RefCollectionImpl.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -0,0 +1,165 @@
+/*
+ * 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$
+
+/**
+ *
+ *
+ * The Tref-collection builds in the characteristics of the TserviceReference type to define characteristics of the <ref-set> and <ref-list> elements. This adds in the
+ * characteristics that only apply to collections of references (e.g., sorting).
+ *
+ * <p>
+ * Java class for Tref-collection complex type.
+ *
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Tref-collection">
+ * <complexContent>
+ * <extension base="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TserviceReference">
+ * <sequence>
+ * <element name="comparator" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tcomparator" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="comparator-ref" type="{http://www.w3.org/2001/XMLSchema}token" />
+ * <attribute name="member-type">
+ * <simpleType>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ * <enumeration value="service-instance"/>
+ * <enumeration value="service-reference"/>
+ * </restriction>
+ * </simpleType>
+ * </attribute>
+ * <attribute name="ordering-basis">
+ * <simpleType>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ * <enumeration value="service"/>
+ * <enumeration value="service-reference"/>
+ * </restriction>
+ * </simpleType>
+ * </attribute>
+ * <anyAttribute processContents='lax' namespace='##other'/>
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+public class RefCollectionImpl extends ServiceReferenceMetadataImpl
+{
+ protected ComparatorImpl comparator;
+ protected String comparatorRef;
+ protected String memberType;
+ protected String orderingBasis;
+
+ /**
+ * Gets the value of the comparator property.
+ *
+ * @return possible object is {@link ComparatorImpl }
+ *
+ */
+ public ComparatorImpl getComparator()
+ {
+ return comparator;
+ }
+
+ /**
+ * Sets the value of the comparator property.
+ *
+ * @param value allowed object is {@link ComparatorImpl }
+ *
+ */
+ public void setComparator(ComparatorImpl value)
+ {
+ this.comparator = value;
+ }
+
+ /**
+ * Gets the value of the comparatorRef property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getComparatorRef()
+ {
+ return comparatorRef;
+ }
+
+ /**
+ * Sets the value of the comparatorRef property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setComparatorRef(String value)
+ {
+ this.comparatorRef = value;
+ }
+
+ /**
+ * Gets the value of the memberType property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getMemberType()
+ {
+ return memberType;
+ }
+
+ /**
+ * Sets the value of the memberType property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setMemberType(String value)
+ {
+ this.memberType = value;
+ }
+
+ /**
+ * Gets the value of the orderingBasis property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getOrderingBasis()
+ {
+ return orderingBasis;
+ }
+
+ /**
+ * Sets the value of the orderingBasis property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setOrderingBasis(String value)
+ {
+ this.orderingBasis = value;
+ }
+
+}
Copied: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RegistrationListenerImpl.java (from rev 90249, projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TregistrationListener.java)
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RegistrationListenerImpl.java (rev 0)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RegistrationListenerImpl.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -0,0 +1,249 @@
+/*
+ * 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.List;
+
+import org.jboss.osgi.spi.NotImplementedException;
+import org.osgi.service.blueprint.reflect.RegistrationListener;
+import org.osgi.service.blueprint.reflect.Target;
+
+/**
+ *
+ *
+ * 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>
+ * <complexType name="TregistrationListener">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}targetComponent"/>
+ * <attribute name="ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
+ * <attribute name="registration-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
+ * <attribute name="unregistration-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+public class RegistrationListenerImpl implements RegistrationListener
+{
+ protected BeanMetadataImpl bean;
+ protected ReferenceMetadataImpl 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 BeanMetadataImpl }
+ *
+ */
+ public BeanMetadataImpl getBean()
+ {
+ return bean;
+ }
+
+ /**
+ * Sets the value of the bean property.
+ *
+ * @param value allowed object is {@link BeanMetadataImpl }
+ *
+ */
+ public void setBean(BeanMetadataImpl value)
+ {
+ this.bean = value;
+ }
+
+ /**
+ * Gets the value of the reference property.
+ *
+ * @return possible object is {@link ReferenceMetadataImpl }
+ *
+ */
+ public ReferenceMetadataImpl getReference()
+ {
+ return reference;
+ }
+
+ /**
+ * Sets the value of the reference property.
+ *
+ * @param value allowed object is {@link ReferenceMetadataImpl }
+ *
+ */
+ public void setReference(ReferenceMetadataImpl 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;
+ }
+
+ public Target getListenerComponent()
+ {
+ throw new NotImplementedException();
+ }
+
+ public String getRegistrationMethodName()
+ {
+ throw new NotImplementedException();
+ }
+
+ public String getUnregistrationMethodName()
+ {
+ throw new NotImplementedException();
+ }
+}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -28,6 +28,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import javax.xml.namespace.QName;
import org.jboss.osgi.spi.NotImplementedException;
@@ -47,11 +48,10 @@
protected String description;
protected List<String> interfaces;
protected List<ServicePropertyEntry> serviceProperties;
- protected List<TregistrationListener> registrationListener;
+ protected Collection<RegistrationListener> registrationListener;
protected BeanMetadataImpl bean;
protected Tref refFIXME;
protected List<Object> any;
- protected String _interface;
protected String ref;
protected String dependsOn;
protected AutoExportModes autoExport;
@@ -102,35 +102,27 @@
return serviceProperties;
}
+ public void setServiceProperties(List<ServicePropertyEntry> serviceProperties)
+ {
+ this.serviceProperties = serviceProperties;
+ }
+
/**
* 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()
+ public Collection<RegistrationListener> getRegistrationListeners()
{
if (registrationListener == null)
- {
- registrationListener = new ArrayList<TregistrationListener>();
- }
- return this.registrationListener;
+ registrationListener = new ArrayList<RegistrationListener>();
+
+ return registrationListener;
}
+ public void setRegistrationListeners(Collection<RegistrationListener> registrationListener)
+ {
+ this.registrationListener = registrationListener;
+ }
+
/**
* Gets the value of the bean property.
*
@@ -205,28 +197,6 @@
}
/**
- * 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 }
@@ -343,11 +313,6 @@
throw new NotImplementedException();
}
- public Collection<RegistrationListener> getRegistrationListeners()
- {
- throw new NotImplementedException();
- }
-
public Target getServiceComponent()
{
throw new NotImplementedException();
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -60,8 +60,8 @@
protected String description;
protected ServiceMetadataImpl service;
- protected TrefCollection refList;
- protected TrefCollection refSet;
+ protected RefCollectionImpl refList;
+ protected RefCollectionImpl refSet;
protected BeanMetadataImpl bean;
protected ReferenceMetadataImpl reference;
protected Tref refFIXME;
@@ -132,10 +132,10 @@
*
* @return
* possible object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public TrefCollection getRefList() {
+ public RefCollectionImpl getRefList() {
return refList;
}
@@ -144,10 +144,10 @@
*
* @param value
* allowed object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public void setRefList(TrefCollection value) {
+ public void setRefList(RefCollectionImpl value) {
this.refList = value;
}
@@ -156,10 +156,10 @@
*
* @return
* possible object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public TrefCollection getRefSet() {
+ public RefCollectionImpl getRefSet() {
return refSet;
}
@@ -168,10 +168,10 @@
*
* @param value
* allowed object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public void setRefSet(TrefCollection value) {
+ public void setRefSet(RefCollectionImpl value) {
this.refSet = value;
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -67,8 +67,8 @@
* {@link JAXBElement }{@code <}{@link Tmap }{@code >}
* {@link JAXBElement }{@code <}{@link BeanMetadataImpl }{@code >}
* {@link JAXBElement }{@code <}{@link Tnull }{@code >}
- * {@link JAXBElement }{@code <}{@link TrefCollection }{@code >}
- * {@link JAXBElement }{@code <}{@link TrefCollection }{@code >}
+ * {@link JAXBElement }{@code <}{@link RefCollectionImpl }{@code >}
+ * {@link JAXBElement }{@code <}{@link RefCollectionImpl }{@code >}
* {@link JAXBElement }{@code <}{@link Tcollection }{@code >}
* {@link Object }
* {@link JAXBElement }{@code <}{@link Tcollection }{@code >}
Deleted: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomparator.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomparator.java 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tcomparator.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -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.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>
- * <complexType name="Tcomparator">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}targetComponent"/>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-public class Tcomparator {
-
- protected BeanMetadataImpl bean;
- protected ReferenceMetadataImpl reference;
- protected Tref refFIXME;
- protected List<Object> any;
-
- /**
- * Gets the value of the bean property.
- *
- * @return
- * possible object is
- * {@link BeanMetadataImpl }
- *
- */
- public BeanMetadataImpl getBean() {
- return bean;
- }
-
- /**
- * Sets the value of the bean property.
- *
- * @param value
- * allowed object is
- * {@link BeanMetadataImpl }
- *
- */
- public void setBean(BeanMetadataImpl value) {
- this.bean = value;
- }
-
- /**
- * Gets the value of the reference property.
- *
- * @return
- * possible object is
- * {@link ReferenceMetadataImpl }
- *
- */
- public ReferenceMetadataImpl getReference() {
- return reference;
- }
-
- /**
- * Sets the value of the reference property.
- *
- * @param value
- * allowed object is
- * {@link ReferenceMetadataImpl }
- *
- */
- public void setReference(ReferenceMetadataImpl 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;
- }
-
-}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -40,8 +40,8 @@
public class Tkey {
protected ServiceMetadataImpl service;
- protected TrefCollection refList;
- protected TrefCollection refSet;
+ protected RefCollectionImpl refList;
+ protected RefCollectionImpl refSet;
protected BeanMetadataImpl bean;
protected ReferenceMetadataImpl reference;
protected Tref refFIXME;
@@ -83,10 +83,10 @@
*
* @return
* possible object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public TrefCollection getRefList() {
+ public RefCollectionImpl getRefList() {
return refList;
}
@@ -95,10 +95,10 @@
*
* @param value
* allowed object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public void setRefList(TrefCollection value) {
+ public void setRefList(RefCollectionImpl value) {
this.refList = value;
}
@@ -107,10 +107,10 @@
*
* @return
* possible object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public TrefCollection getRefSet() {
+ public RefCollectionImpl getRefSet() {
return refSet;
}
@@ -119,10 +119,10 @@
*
* @param value
* allowed object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public void setRefSet(TrefCollection value) {
+ public void setRefSet(RefCollectionImpl value) {
this.refSet = value;
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -51,8 +51,8 @@
protected Tkey keyFIXME;
protected ServiceMetadataImpl service;
- protected TrefCollection refList;
- protected TrefCollection refSet;
+ protected RefCollectionImpl refList;
+ protected RefCollectionImpl refSet;
protected BeanMetadataImpl bean;
protected ReferenceMetadataImpl reference;
protected Tref refFIXME;
@@ -123,10 +123,10 @@
*
* @return
* possible object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public TrefCollection getRefList() {
+ public RefCollectionImpl getRefList() {
return refList;
}
@@ -135,10 +135,10 @@
*
* @param value
* allowed object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public void setRefList(TrefCollection value) {
+ public void setRefList(RefCollectionImpl value) {
this.refList = value;
}
@@ -147,10 +147,10 @@
*
* @return
* possible object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public TrefCollection getRefSet() {
+ public RefCollectionImpl getRefSet() {
return refSet;
}
@@ -159,10 +159,10 @@
*
* @param value
* allowed object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public void setRefSet(TrefCollection value) {
+ public void setRefSet(RefCollectionImpl value) {
this.refSet = value;
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -52,8 +52,8 @@
protected String description;
protected ServiceMetadataImpl service;
- protected TrefCollection refList;
- protected TrefCollection refSet;
+ protected RefCollectionImpl refList;
+ protected RefCollectionImpl refSet;
protected BeanMetadataImpl bean;
protected ReferenceMetadataImpl reference;
protected Tref refFIXME;
@@ -123,10 +123,10 @@
*
* @return
* possible object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public TrefCollection getRefList() {
+ public RefCollectionImpl getRefList() {
return refList;
}
@@ -135,10 +135,10 @@
*
* @param value
* allowed object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public void setRefList(TrefCollection value) {
+ public void setRefList(RefCollectionImpl value) {
this.refList = value;
}
@@ -147,10 +147,10 @@
*
* @return
* possible object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public TrefCollection getRefSet() {
+ public RefCollectionImpl getRefSet() {
return refSet;
}
@@ -159,10 +159,10 @@
*
* @param value
* allowed object is
- * {@link TrefCollection }
+ * {@link RefCollectionImpl }
*
*/
- public void setRefSet(TrefCollection value) {
+ public void setRefSet(RefCollectionImpl value) {
this.refSet = value;
}
Deleted: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TrefCollection.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TrefCollection.java 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TrefCollection.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -1,163 +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.reflect;
-
-
-/**
- *
- *
- * The Tref-collection builds in the characteristics of the
- * TserviceReference type to define characteristics of the <ref-set>
- * and <ref-list> elements. This adds in the characteristics that
- * only apply to collections of references (e.g., sorting).
- *
- *
- *
- * <p>Java class for Tref-collection complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="Tref-collection">
- * <complexContent>
- * <extension base="{http://www.osgi.org/xmlns/blueprint/v1.0.0}TserviceReference">
- * <sequence>
- * <element name="comparator" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tcomparator" minOccurs="0"/>
- * </sequence>
- * <attribute name="comparator-ref" type="{http://www.w3.org/2001/XMLSchema}token" />
- * <attribute name="member-type">
- * <simpleType>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- * <enumeration value="service-instance"/>
- * <enumeration value="service-reference"/>
- * </restriction>
- * </simpleType>
- * </attribute>
- * <attribute name="ordering-basis">
- * <simpleType>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- * <enumeration value="service"/>
- * <enumeration value="service-reference"/>
- * </restriction>
- * </simpleType>
- * </attribute>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-public class TrefCollection
- extends ServiceReferenceMetadataImpl
-{
-
- protected Tcomparator comparator;
- protected String comparatorRef;
- protected String memberType;
- protected String orderingBasis;
-
- /**
- * Gets the value of the comparator property.
- *
- * @return
- * possible object is
- * {@link Tcomparator }
- *
- */
- public Tcomparator getComparator() {
- return comparator;
- }
-
- /**
- * Sets the value of the comparator property.
- *
- * @param value
- * allowed object is
- * {@link Tcomparator }
- *
- */
- public void setComparator(Tcomparator value) {
- this.comparator = value;
- }
-
- /**
- * Gets the value of the comparatorRef property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getComparatorRef() {
- return comparatorRef;
- }
-
- /**
- * Sets the value of the comparatorRef property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setComparatorRef(String value) {
- this.comparatorRef = value;
- }
-
- /**
- * Gets the value of the memberType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMemberType() {
- return memberType;
- }
-
- /**
- * Sets the value of the memberType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setMemberType(String value) {
- this.memberType = value;
- }
-
- /**
- * Gets the value of the orderingBasis property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOrderingBasis() {
- return orderingBasis;
- }
-
- /**
- * Sets the value of the orderingBasis property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOrderingBasis(String value) {
- this.orderingBasis = value;
- }
-
-}
Deleted: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TregistrationListener.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TregistrationListener.java 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TregistrationListener.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -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.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>
- * <complexType name="TregistrationListener">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}targetComponent"/>
- * <attribute name="ref" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
- * <attribute name="registration-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
- * <attribute name="unregistration-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-public class TregistrationListener {
-
- protected BeanMetadataImpl bean;
- protected ReferenceMetadataImpl 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 BeanMetadataImpl }
- *
- */
- public BeanMetadataImpl getBean() {
- return bean;
- }
-
- /**
- * Sets the value of the bean property.
- *
- * @param value
- * allowed object is
- * {@link BeanMetadataImpl }
- *
- */
- public void setBean(BeanMetadataImpl value) {
- this.bean = value;
- }
-
- /**
- * Gets the value of the reference property.
- *
- * @return
- * possible object is
- * {@link ReferenceMetadataImpl }
- *
- */
- public ReferenceMetadataImpl getReference() {
- return reference;
- }
-
- /**
- * Sets the value of the reference property.
- *
- * @param value
- * allowed object is
- * {@link ReferenceMetadataImpl }
- *
- */
- public void setReference(ReferenceMetadataImpl 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;
- }
-
-}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/resources/schema/blueprint-jbxb.xsd
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/resources/schema/blueprint-jbxb.xsd 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/resources/schema/blueprint-jbxb.xsd 2009-06-16 20:27:34 UTC (rev 90271)
@@ -439,6 +439,9 @@
<!-- ref-set, ref-list -->
<xsd:complexType name="Tref-collection">
<xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.osgi.blueprint.reflect.RefCollectionImpl"></jbxb:class>
+ </xsd:appinfo>
<xsd:documentation>
<![CDATA[
The Tref-collection builds in the characteristics of the
@@ -664,6 +667,11 @@
</xsd:simpleType>
<xsd:complexType name="Tcomparator">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.osgi.blueprint.reflect.ComparatorImpl"></jbxb:class>
+ </xsd:appinfo>
+ </xsd:annotation>
<xsd:group ref="targetComponent" />
</xsd:complexType>
@@ -768,6 +776,9 @@
<xsd:element name="registration-listener" type="TregistrationListener"
minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:property name="registrationListeners"/>
+ </xsd:appinfo>
<xsd:documentation>
<![CDATA[
A set of 0 or more registration listeners attached to this service
@@ -796,6 +807,9 @@
<xsd:complexType name="TregistrationListener">
<xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.osgi.blueprint.reflect.RegistrationListenerImpl"></jbxb:class>
+ </xsd:appinfo>
<xsd:documentation>
<![CDATA[
A registration listener definition. The target registration listener
@@ -1033,6 +1047,9 @@
<!-- 'entry' element type -->
<xsd:complexType name="TservicePropertyEntry">
<xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.osgi.blueprint.reflect.ServicePropertyEntry"></jbxb:class>
+ </xsd:appinfo>
<xsd:documentation>
<![CDATA[
TservicePropertyEntry is an entry value used for the <service-properties>
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicBeansParserTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicBeansParserTestCase.java 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicBeansParserTestCase.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -31,12 +31,12 @@
import org.jboss.osgi.blueprint.parser.BlueprintParser;
import org.jboss.osgi.blueprint.reflect.BlueprintImpl;
-import org.jboss.osgi.blueprint.reflect.ComponentMetadataImpl;
import org.jboss.osgi.spi.testing.OSGiTest;
import org.jboss.test.osgi.blueprint.parser.comp.BeanA;
import org.jboss.test.osgi.blueprint.parser.comp.BeanB;
import org.junit.Test;
import org.osgi.service.blueprint.reflect.BeanMetadata;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
/**
* Blueprint parser tests
@@ -52,7 +52,7 @@
URL xmlURL = getResourceURL("parser/blueprint-basic-beans.xml");
BlueprintImpl blueprint = new BlueprintParser().parse(xmlURL);
- List<ComponentMetadataImpl> compList = blueprint.getComponents();
+ List<ComponentMetadata> compList = blueprint.getComponents();
assertTrue(compList.size() > 0);
BeanMetadata beanA = (BeanMetadata)compList.get(0);
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicServiceParserTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicServiceParserTestCase.java 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicServiceParserTestCase.java 2009-06-16 20:27:34 UTC (rev 90271)
@@ -31,13 +31,13 @@
import org.jboss.osgi.blueprint.parser.BlueprintParser;
import org.jboss.osgi.blueprint.reflect.BlueprintImpl;
-import org.jboss.osgi.blueprint.reflect.ComponentMetadataImpl;
import org.jboss.osgi.spi.testing.OSGiTest;
import org.jboss.test.osgi.blueprint.parser.comp.BeanA;
import org.jboss.test.osgi.blueprint.parser.comp.ServiceA;
import org.jboss.test.osgi.blueprint.parser.comp.ServiceB;
import org.junit.Test;
import org.osgi.service.blueprint.reflect.BeanMetadata;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.ServiceMetadata;
/**
@@ -54,7 +54,7 @@
URL xmlURL = getResourceURL("parser/blueprint-basic-service.xml");
BlueprintImpl blueprint = new BlueprintParser().parse(xmlURL);
- List<ComponentMetadataImpl> compList = blueprint.getComponents();
+ List<ComponentMetadata> compList = blueprint.getComponents();
assertTrue(compList.size() > 0);
BeanMetadata beanA = (BeanMetadata)compList.get(0);
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-all-elements.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-all-elements.xml 2009-06-16 20:06:19 UTC (rev 90270)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-all-elements.xml 2009-06-16 20:27:34 UTC (rev 90271)
@@ -4,6 +4,7 @@
default-availability="mandatory" default-destroy-method="defaultDestroyMethod" default-init-method="defaultInitMethod" default-lazy-init="false" default-timeout="300000">
+ <!--
<description>
Some Blueprint Description
</description>
@@ -42,6 +43,7 @@
</service>
<service id="idServiceB" ref="serviceRef" />
+ -->
<ref-set id="myServices" interface="com.xyz.MyService" member-type="service-instance" ordering-basis="service" comparator-ref="someComparator" />
More information about the jboss-osgi-commits
mailing list