[jboss-osgi-commits] JBoss-OSGI SVN: r90293 - in projects/jboss-osgi/trunk/blueprint: impl/src/main/resources/schema and 3 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Wed Jun 17 02:57:14 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-06-17 02:57:14 -0400 (Wed, 17 Jun 2009)
New Revision: 90293
Added:
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RefImpl.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ReferenceListenerImpl.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TypeConverters.java
Removed:
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TReferenceListener.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tref.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TtypeConverters.java
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/ComparatorImpl.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RegistrationListenerImpl.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/ServiceReferenceMetadataImpl.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/AllElementsParserTestCase.java
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/log4j.xml
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-all-elements.xml
Log:
BP parsing - WIP
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-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BlueprintImpl.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -35,13 +35,15 @@
import org.osgi.service.blueprint.reflect.ComponentMetadata;
/**
- * The blueprint element is the top element. The definitions consist of two sections:
+ * 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
+ * blueprint ::= <type-converters> component
+ * component ::= <bean> | <service> | service-reference
* service-reference ::= <reference> | <ref-list> | <ref-set>
- * type-converter ::= <bean> | <ref> *
+ * type-converter ::= <bean> | <ref>
*
* @author thomas.diesler at jboss.com
* @since 13-May-2009
@@ -49,7 +51,7 @@
public class BlueprintImpl
{
protected String description;
- protected TtypeConverters typeConverters;
+ protected TypeConverters typeConverters;
protected List<ComponentMetadata> components;
protected Boolean defaultLazyInit;
protected String defaultInitMethod;
@@ -79,10 +81,10 @@
/**
* Gets the value of the typeConverters property.
*
- * @return possible object is {@link TtypeConverters }
+ * @return possible object is {@link TypeConverters }
*
*/
- public TtypeConverters getTypeConverters()
+ public TypeConverters getTypeConverters()
{
return typeConverters;
}
@@ -90,10 +92,10 @@
/**
* Sets the value of the typeConverters property.
*
- * @param value allowed object is {@link TtypeConverters }
+ * @param value allowed object is {@link TypeConverters }
*
*/
- public void setTypeConverters(TtypeConverters value)
+ public void setTypeConverters(TypeConverters value)
{
this.typeConverters = value;
}
@@ -105,7 +107,7 @@
{
if (components == null)
components = new ArrayList<ComponentMetadata>();
-
+
return this.components;
}
@@ -181,13 +183,9 @@
public BigInteger getDefaultTimeout()
{
if (defaultTimeout == null)
- {
- return new BigInteger("300000");
- }
- else
- {
- return defaultTimeout;
- }
+ defaultTimeout = new BigInteger("300000");
+
+ return defaultTimeout;
}
/**
@@ -207,13 +205,9 @@
public Availability getDefaultAvailability()
{
if (defaultAvailability == null)
- {
- return Availability.MANDATORY;
- }
- else
- {
- return defaultAvailability;
- }
+ defaultAvailability = Availability.MANDATORY;
+
+ return defaultAvailability;
}
/**
@@ -248,7 +242,7 @@
{
if (other == null)
return this;
-
+
throw new NotImplementedException("Blueprint metadata merge not yet implemented");
}
}
Modified: 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/ComparatorImpl.java 2009-06-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComparatorImpl.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -26,6 +26,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
+
/**
* <p>
* Java class for Tcomparator complex type.
@@ -47,78 +49,20 @@
*/
public class ComparatorImpl
{
- protected BeanMetadataImpl bean;
- protected ReferenceMetadataImpl reference;
- protected Tref refFIXME;
+ protected List<ComponentMetadata> components;
protected List<Object> any;
- /**
- * Gets the value of the bean property.
- *
- * @return possible object is {@link BeanMetadataImpl }
- *
- */
- public BeanMetadataImpl getBean()
+ public List<ComponentMetadata> getComponents()
{
- return bean;
+ return components;
}
- /**
- * Sets the value of the bean property.
- *
- * @param value allowed object is {@link BeanMetadataImpl }
- *
- */
- public void setBean(BeanMetadataImpl value)
+ public void setComponents(List<ComponentMetadata> components)
{
- this.bean = value;
+ this.components = components;
}
/**
- * 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>
Copied: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RefImpl.java (from rev 90249, projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tref.java)
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RefImpl.java (rev 0)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RefImpl.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -0,0 +1,77 @@
+/*
+ * 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$
+
+/**
+ *
+ *
+ * Tref is the type used for <ref> elements. This specifies a required component id for the reference component.
+ *
+ *
+ *
+ * <p>
+ * Java class for Tref complex type.
+ *
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Tref">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="component" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+public class RefImpl
+{
+ protected String component;
+
+ /**
+ * Gets the value of the component property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getComponent()
+ {
+ return component;
+ }
+
+ /**
+ * Sets the value of the component property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setComponent(String value)
+ {
+ this.component = value;
+ }
+
+}
Copied: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ReferenceListenerImpl.java (from rev 90249, projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TReferenceListener.java)
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ReferenceListenerImpl.java (rev 0)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ReferenceListenerImpl.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -0,0 +1,229 @@
+/*
+ * 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;
+
+/**
+ *
+ *
+ * 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>
+ * <complexType name="TReferenceListener">
+ * <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.w3.org/2001/XMLSchema}token" />
+ * <attribute name="bind-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
+ * <attribute name="unbind-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+public class ReferenceListenerImpl
+{
+ protected BeanMetadataImpl bean;
+ protected ReferenceMetadataImpl reference;
+ protected RefImpl 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 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 RefImpl }
+ *
+ */
+ public RefImpl getRefFIXME()
+ {
+ return refFIXME;
+ }
+
+ /**
+ * Sets the value of the refFIXME property.
+ *
+ * @param value allowed object is {@link RefImpl }
+ *
+ */
+ public void setRefFIXME(RefImpl 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;
+ }
+
+}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RegistrationListenerImpl.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RegistrationListenerImpl.java 2009-06-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/RegistrationListenerImpl.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -65,7 +65,7 @@
{
protected BeanMetadataImpl bean;
protected ReferenceMetadataImpl reference;
- protected Tref refFIXME;
+ protected RefImpl refFIXME;
protected List<Object> any;
protected String ref;
protected String registrationMethod;
@@ -118,10 +118,10 @@
/**
* Gets the value of the refFIXME property.
*
- * @return possible object is {@link Tref }
+ * @return possible object is {@link RefImpl }
*
*/
- public Tref getRefFIXME()
+ public RefImpl getRefFIXME()
{
return refFIXME;
}
@@ -129,10 +129,10 @@
/**
* Sets the value of the refFIXME property.
*
- * @param value allowed object is {@link Tref }
+ * @param value allowed object is {@link RefImpl }
*
*/
- public void setRefFIXME(Tref value)
+ public void setRefFIXME(RefImpl value)
{
this.refFIXME = value;
}
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-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -50,7 +50,7 @@
protected List<ServicePropertyEntry> serviceProperties;
protected Collection<RegistrationListener> registrationListener;
protected BeanMetadataImpl bean;
- protected Tref refFIXME;
+ protected RefImpl refFIXME;
protected List<Object> any;
protected String ref;
protected String dependsOn;
@@ -148,10 +148,10 @@
/**
* Gets the value of the refFIXME property.
*
- * @return possible object is {@link Tref }
+ * @return possible object is {@link RefImpl }
*
*/
- public Tref getRefFIXME()
+ public RefImpl getRefFIXME()
{
return refFIXME;
}
@@ -159,10 +159,10 @@
/**
* Sets the value of the refFIXME property.
*
- * @param value allowed object is {@link Tref }
+ * @param value allowed object is {@link RefImpl }
*
*/
- public void setRefFIXME(Tref value)
+ public void setRefFIXME(RefImpl value)
{
this.refFIXME = value;
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceReferenceMetadataImpl.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceReferenceMetadataImpl.java 2009-06-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceReferenceMetadataImpl.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -72,7 +72,7 @@
{
protected String description;
protected List<String> interfaces;
- protected List<TReferenceListener> listener;
+ protected List<ReferenceListenerImpl> listener;
protected List<Object> any;
protected String filter;
protected String componentName;
@@ -129,19 +129,23 @@
*
*
* <p>
- * Objects of the following type(s) are allowed in the list {@link TReferenceListener }
+ * Objects of the following type(s) are allowed in the list {@link ReferenceListenerImpl }
*
*
*/
- public List<TReferenceListener> getListener()
+ public List<ReferenceListenerImpl> getListener()
{
if (listener == null)
- {
- listener = new ArrayList<TReferenceListener>();
- }
+ listener = new ArrayList<ReferenceListenerImpl>();
+
return this.listener;
}
+ public void setListener(List<ReferenceListenerImpl> listener)
+ {
+ this.listener = listener;
+ }
+
/**
* Gets the value of the any property.
*
Deleted: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TReferenceListener.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TReferenceListener.java 2009-06-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TReferenceListener.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -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.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>
- * <complexType name="TReferenceListener">
- * <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.w3.org/2001/XMLSchema}token" />
- * <attribute name="bind-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
- * <attribute name="unbind-method" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tmethod" />
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-public class TReferenceListener {
-
- protected BeanMetadataImpl bean;
- protected ReferenceMetadataImpl 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 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 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;
- }
-
-}
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-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Targument.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -64,9 +64,9 @@
protected RefCollectionImpl refSet;
protected BeanMetadataImpl bean;
protected ReferenceMetadataImpl reference;
- protected Tref refFIXME;
+ protected RefImpl refFIXME;
protected List<Object> any;
- protected Tref idref;
+ protected RefImpl idref;
protected Tvalue value;
protected Tcollection list;
protected Tcollection set;
@@ -228,10 +228,10 @@
*
* @return
* possible object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public Tref getRefFIXME() {
+ public RefImpl getRefFIXME() {
return refFIXME;
}
@@ -240,10 +240,10 @@
*
* @param value
* allowed object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public void setRefFIXME(Tref value) {
+ public void setRefFIXME(RefImpl value) {
this.refFIXME = value;
}
@@ -281,10 +281,10 @@
*
* @return
* possible object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public Tref getIdref() {
+ public RefImpl getIdref() {
return idref;
}
@@ -293,10 +293,10 @@
*
* @param value
* allowed object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public void setIdref(Tref value) {
+ public void setIdref(RefImpl value) {
this.idref = 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-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tcollection.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -61,9 +61,9 @@
* Objects of the following type(s) are allowed in the list
* {@link JAXBElement }{@code <}{@link Tvalue }{@code >}
* {@link JAXBElement }{@code <}{@link ServiceMetadataImpl }{@code >}
- * {@link JAXBElement }{@code <}{@link Tref }{@code >}
+ * {@link JAXBElement }{@code <}{@link RefImpl }{@code >}
* {@link JAXBElement }{@code <}{@link ReferenceMetadataImpl }{@code >}
- * {@link JAXBElement }{@code <}{@link Tref }{@code >}
+ * {@link JAXBElement }{@code <}{@link RefImpl }{@code >}
* {@link JAXBElement }{@code <}{@link Tmap }{@code >}
* {@link JAXBElement }{@code <}{@link BeanMetadataImpl }{@code >}
* {@link JAXBElement }{@code <}{@link Tnull }{@code >}
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-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tkey.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -44,9 +44,9 @@
protected RefCollectionImpl refSet;
protected BeanMetadataImpl bean;
protected ReferenceMetadataImpl reference;
- protected Tref refFIXME;
+ protected RefImpl refFIXME;
protected List<Object> any;
- protected Tref idref;
+ protected RefImpl idref;
protected Tvalue value;
protected Tcollection list;
protected Tcollection set;
@@ -179,10 +179,10 @@
*
* @return
* possible object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public Tref getRefFIXME() {
+ public RefImpl getRefFIXME() {
return refFIXME;
}
@@ -191,10 +191,10 @@
*
* @param value
* allowed object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public void setRefFIXME(Tref value) {
+ public void setRefFIXME(RefImpl value) {
this.refFIXME = value;
}
@@ -232,10 +232,10 @@
*
* @return
* possible object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public Tref getIdref() {
+ public RefImpl getIdref() {
return idref;
}
@@ -244,10 +244,10 @@
*
* @param value
* allowed object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public void setIdref(Tref value) {
+ public void setIdref(RefImpl value) {
this.idref = 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-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TmapEntry.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -55,9 +55,9 @@
protected RefCollectionImpl refSet;
protected BeanMetadataImpl bean;
protected ReferenceMetadataImpl reference;
- protected Tref refFIXME;
+ protected RefImpl refFIXME;
protected List<Object> any;
- protected Tref idref;
+ protected RefImpl idref;
protected Tvalue value;
protected Tcollection list;
protected Tcollection set;
@@ -219,10 +219,10 @@
*
* @return
* possible object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public Tref getRefFIXME() {
+ public RefImpl getRefFIXME() {
return refFIXME;
}
@@ -231,10 +231,10 @@
*
* @param value
* allowed object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public void setRefFIXME(Tref value) {
+ public void setRefFIXME(RefImpl value) {
this.refFIXME = value;
}
@@ -272,10 +272,10 @@
*
* @return
* possible object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public Tref getIdref() {
+ public RefImpl getIdref() {
return idref;
}
@@ -284,10 +284,10 @@
*
* @param value
* allowed object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public void setIdref(Tref value) {
+ public void setIdref(RefImpl value) {
this.idref = 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-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tproperty.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -56,9 +56,9 @@
protected RefCollectionImpl refSet;
protected BeanMetadataImpl bean;
protected ReferenceMetadataImpl reference;
- protected Tref refFIXME;
+ protected RefImpl refFIXME;
protected List<Object> any;
- protected Tref idref;
+ protected RefImpl idref;
protected Tvalue value;
protected Tcollection list;
protected Tcollection set;
@@ -219,10 +219,10 @@
*
* @return
* possible object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public Tref getRefFIXME() {
+ public RefImpl getRefFIXME() {
return refFIXME;
}
@@ -231,10 +231,10 @@
*
* @param value
* allowed object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public void setRefFIXME(Tref value) {
+ public void setRefFIXME(RefImpl value) {
this.refFIXME = value;
}
@@ -272,10 +272,10 @@
*
* @return
* possible object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public Tref getIdref() {
+ public RefImpl getIdref() {
return idref;
}
@@ -284,10 +284,10 @@
*
* @param value
* allowed object is
- * {@link Tref }
+ * {@link RefImpl }
*
*/
- public void setIdref(Tref value) {
+ public void setIdref(RefImpl value) {
this.idref = value;
}
Deleted: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tref.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tref.java 2009-06-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Tref.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -1,63 +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;
-
-/**
- *
- *
- * Tref is the type used for <ref> elements. This specifies a required
- * component id for the reference component.
- *
- *
- *
- * <p>Java class for Tref complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="Tref">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <attribute name="component" use="required" type="{http://www.osgi.org/xmlns/blueprint/v1.0.0}Tidref" />
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-public class Tref {
-
- protected String component;
-
- /**
- * Gets the value of the component property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getComponent() {
- return component;
- }
-
- /**
- * Sets the value of the component property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setComponent(String value) {
- this.component = value;
- }
-
-}
Deleted: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TtypeConverters.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TtypeConverters.java 2009-06-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TtypeConverters.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -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.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>
- * <complexType name="Ttype-converters">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <choice maxOccurs="unbounded" minOccurs="0">
- * <group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}targetComponent"/>
- * </choice>
- * </restriction>
- * </complexContent>
- * </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 BeanMetadataImpl }{@code >}
- * {@link JAXBElement }{@code <}{@link ReferenceMetadataImpl }{@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/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TypeConverters.java (from rev 90249, projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TtypeConverters.java)
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TypeConverters.java (rev 0)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/TypeConverters.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -0,0 +1,74 @@
+/*
+ * 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;
+
+/**
+ *
+ *
+ * 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>
+ * <complexType name="Ttype-converters">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <choice maxOccurs="unbounded" minOccurs="0">
+ * <group ref="{http://www.osgi.org/xmlns/blueprint/v1.0.0}targetComponent"/>
+ * </choice>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+public class TypeConverters
+{
+ protected List<Object> beanOrReferenceOrRef;
+
+ /**
+ * Gets the value of the beanOrReferenceOrRef property.
+ *
+ */
+ public List<Object> getBeanOrReferenceOrRef()
+ {
+ if (beanOrReferenceOrRef == null)
+ {
+ beanOrReferenceOrRef = new ArrayList<Object>();
+ }
+ return this.beanOrReferenceOrRef;
+ }
+
+}
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-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/resources/schema/blueprint-jbxb.xsd 2009-06-17 06:57:14 UTC (rev 90293)
@@ -173,6 +173,9 @@
<xsd:complexType name="Ttype-converters">
<xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.osgi.blueprint.reflect.TypeConverters"></jbxb:class>
+ </xsd:appinfo>
<xsd:documentation>
<![CDATA[
The type used for the <type-converters> element. The
@@ -218,7 +221,13 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
- <xsd:element name="ref" type="Tref" />
+ <xsd:element name="ref" type="Tref" >
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:property name="components"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ </xsd:element>
<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="unbounded" />
</xsd:choice>
</xsd:group>
@@ -618,6 +627,9 @@
<xsd:complexType name="TReferenceListener">
<xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.osgi.blueprint.reflect.ReferenceListenerImpl"></jbxb:class>
+ </xsd:appinfo>
<xsd:documentation>
<![CDATA[
TReferenceListener defines a reference listener that is attached
@@ -895,6 +907,9 @@
<xsd:complexType name="Tref">
<xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.osgi.blueprint.reflect.RefImpl"></jbxb:class>
+ </xsd:appinfo>
<xsd:documentation>
<![CDATA[
Tref is the type used for <ref> elements. This specifies a required
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/AllElementsParserTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/AllElementsParserTestCase.java 2009-06-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/AllElementsParserTestCase.java 2009-06-17 06:57:14 UTC (rev 90293)
@@ -23,14 +23,18 @@
//$Id$
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.net.URL;
+import java.util.List;
import org.jboss.osgi.blueprint.parser.BlueprintParser;
+import org.jboss.osgi.blueprint.reflect.Availability;
import org.jboss.osgi.blueprint.reflect.BlueprintImpl;
-import org.jboss.osgi.blueprint.reflect.TtypeConverters;
+import org.jboss.osgi.blueprint.reflect.TypeConverters;
import org.jboss.osgi.spi.testing.OSGiTestHelper;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -47,13 +51,42 @@
public static void beforeClass()
{
URL xmlURL = new OSGiTestHelper().getResourceURL("parser/blueprint-all-elements.xml");
- //blueprint = new BlueprintParser().parse(xmlURL);
+ blueprint = new BlueprintParser().parse(xmlURL);
}
@Test
- @Ignore
+ public void testRootAttributes() throws Exception
+ {
+ Availability defaultAvailability = blueprint.getDefaultAvailability();
+ assertEquals(Availability.MANDATORY, defaultAvailability);
+
+ String defaultDestroyMethod = blueprint.getDefaultDestroyMethod();
+ assertEquals("defaultDestroyMethod", defaultDestroyMethod);
+
+ String defaultInitMethod = blueprint.getDefaultInitMethod();
+ assertEquals("defaultInitMethod", defaultInitMethod);
+
+ Boolean defaultLazyInit = blueprint.isDefaultLazyInit();
+ assertEquals(Boolean.FALSE, defaultLazyInit);
+
+ long defaultTimeout = blueprint.getDefaultTimeout().longValue();
+ assertEquals(300000, defaultTimeout);
+ }
+
+ @Test
+ public void getDescription() throws Exception
+ {
+ String description = blueprint.getDescription();
+ assertEquals("blueprint description", description);
+ }
+
+ @Test
public void getTypeConverters() throws Exception
{
- TtypeConverters typeConverters = blueprint.getTypeConverters();
+ TypeConverters typeConverters = blueprint.getTypeConverters();
+ assertNotNull("TypeConverters not null", typeConverters);
+
+ List<Object> beanOrReferenceOrRef = typeConverters.getBeanOrReferenceOrRef();
+ assertEquals("TypeConverters size", 5, beanOrReferenceOrRef);
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/log4j.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/log4j.xml 2009-06-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/log4j.xml 2009-06-17 06:57:14 UTC (rev 90293)
@@ -38,11 +38,11 @@
</category>
-->
- <!-- Show jboss deployer traces
+ <!-- Show jboss deployer traces -->
<category name="org.jboss.xb">
<priority value="TRACE" />
</category>
- -->
+
<!-- ======================= -->
<!-- Setup the Root category -->
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-17 06:28:57 UTC (rev 90292)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-all-elements.xml 2009-06-17 06:57:14 UTC (rev 90293)
@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 blueprint.xsd "
-
default-availability="mandatory" default-destroy-method="defaultDestroyMethod" default-init-method="defaultInitMethod" default-lazy-init="false" default-timeout="300000">
- <!--
- <description>
- Some Blueprint Description
- </description>
+ <description>blueprint description</description>
<type-converters>
<bean class="foo.TypeConverterBean" />
@@ -19,9 +15,7 @@
<service id="idServiceA" auto-export="disabled" depends-on="someServiceDependency" interface="foo.ServiceInterface" ranking="0" ref="NCName">
- <description>
- service description
- </description>
+ <description>service description</description>
<interfaces>
<value>foo.ServiceInterfA</value>
@@ -43,24 +37,24 @@
</service>
<service id="idServiceB" ref="serviceRef" />
- -->
<ref-set id="myServices" interface="com.xyz.MyService" member-type="service-instance" ordering-basis="service" comparator-ref="someComparator" />
<ref-list id="myEventListeners" interface="com.xyz.EventListener" />
+
+ <!--
<ref-list id="myOtherServices" interface="com.xyz.OtherService" ordering-basis="service-reference">
<comparator>
<bean class="MyOtherServiceComparator" />
</comparator>
</ref-list>
+ -->
<bean id="beanA" class="foo.Bean" depends-on="beanDependency" init-method="initMethod" destroy-method="destroyMethod" factory-method="factoryMethod"
factory-component="factoryComponent" scope="singleton" lazy-init="lazy" />
<reference component-name="referenceCompName" interface="foo.referenceInterf" filter="referenceFilter" availablitity="optional">
- <description>
- reference description
- </description>
+ <description>reference description</description>
<interfaces>
<value>foo.ReferenceInterfA</value>
<value>foo.ReferenceInterfB</value>
@@ -69,7 +63,4 @@
<listener ref="referenceListenerB" />
</reference>
- <ref component="refCompA" />
- <ref component="refCompB" />
-
</blueprint>
More information about the jboss-osgi-commits
mailing list