[jboss-cvs] JBossAS SVN: r90813 - in projects/jboss-osgi/trunk/blueprint: testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jul 3 09:25:36 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-07-03 09:25:35 -0400 (Fri, 03 Jul 2009)
New Revision: 90813
Modified:
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TArgument.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TBean.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TBlueprint.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TComponent.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TProperty.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TRef.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TReference.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TRegistrationListener.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TService.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TServicePropertyEntry.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TServiceReference.java
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TTypeConverters.java
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/BasicBeansParserTestCase.java
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicRootParserTestCase.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/container/OSGI-INF/blueprint/basic-service.xml
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-basic-beans.xml
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-basic-service.xml
Log:
More annotation based parsing
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TArgument.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TArgument.java 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TArgument.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -27,7 +27,11 @@
import java.util.ArrayList;
import java.util.List;
+import javax.xml.bind.annotation.XmlType;
+import org.jboss.osgi.blueprint.BlueprintContext;
+
+
/**
*
* An argument used to create an object defined by a <bean> component. The <argument> elements are the arguments for the bean class constructor or passed to the bean
@@ -63,6 +67,7 @@
*
*
*/
+ at XmlType(name = "Targument", namespace = BlueprintContext.XMLNS_BLUEPRINT, propOrder = { "description" })
public class TArgument
{
protected String description;
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TBean.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TBean.java 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TBean.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -40,7 +40,7 @@
* @author thomas.diesler at jboss.com
* @since 13-May-2009
*/
- at XmlType(name = "Tbean", namespace = BlueprintContext.XMLNS_BLUEPRINT)
+ at XmlType(name = "Tbean", namespace = BlueprintContext.XMLNS_BLUEPRINT, propOrder = { "description", "properties", "arguments" })
public class TBean extends TComponent
{
protected String description;
@@ -65,7 +65,7 @@
this.description = value;
}
- @XmlElement(name = "property", namespace = BlueprintContext.XMLNS_BLUEPRINT)
+ @XmlElement(name = "property")
public List<TProperty> getProperties()
{
return properties;
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TBlueprint.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TBlueprint.java 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TBlueprint.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -59,7 +59,7 @@
*/
@JBossXmlSchema(namespace = BlueprintContext.XMLNS_BLUEPRINT, elementFormDefault = XmlNsForm.QUALIFIED)
@XmlRootElement(name = "blueprint", namespace = BlueprintContext.XMLNS_BLUEPRINT)
- at XmlType(name = "Tblueprint", namespace = BlueprintContext.XMLNS_BLUEPRINT, propOrder = { "description", "typeConverters" })
+ at XmlType(name = "Tblueprint", namespace = BlueprintContext.XMLNS_BLUEPRINT, propOrder = { "description", "typeConverters", "components" })
public class TBlueprint
{
protected String description;
@@ -92,9 +92,10 @@
this.typeConverters = value;
}
- @XmlElements( { @XmlElement(name = "bean", namespace = BlueprintContext.XMLNS_BLUEPRINT, type = TBean.class),
- @XmlElement(name = "service", namespace = BlueprintContext.XMLNS_BLUEPRINT, type = TService.class),
- @XmlElement(name = "reference", namespace = BlueprintContext.XMLNS_BLUEPRINT, type = TReference.class) })
+ @XmlElements( {
+ @XmlElement(name = "bean", namespace = BlueprintContext.XMLNS_BLUEPRINT, type = TBean.class),
+ @XmlElement(name = "service", namespace = BlueprintContext.XMLNS_BLUEPRINT, type = TService.class),
+ @XmlElement(name = "reference", namespace = BlueprintContext.XMLNS_BLUEPRINT, type = TReference.class) })
public List<TComponent> getComponents()
{
if (components == null)
@@ -146,8 +147,8 @@
return compMetadata;
}
- @XmlAttribute(name = "default-lazy-init", namespace = BlueprintContext.XMLNS_BLUEPRINT)
- public Boolean isDefaultLazyInit()
+ @XmlAttribute
+ public Boolean getDefaultLazyInit()
{
return defaultLazyInit;
}
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TComponent.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TComponent.java 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TComponent.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -45,7 +45,7 @@
* @author thomas.diesler at jboss.com
* @since 13-May-2009
*/
- at XmlType(name = "TComponent", namespace = BlueprintContext.XMLNS_BLUEPRINT)
+ at XmlType(name = "Tcomponent", namespace = BlueprintContext.XMLNS_BLUEPRINT)
public abstract class TComponent
{
protected String id;
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TProperty.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TProperty.java 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TProperty.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -64,7 +64,7 @@
*
*
*/
- at XmlType(name = "TProperty", namespace = BlueprintContext.XMLNS_BLUEPRINT)
+ at XmlType(name = "Tproperty", namespace = BlueprintContext.XMLNS_BLUEPRINT, propOrder = { "description" })
public class TProperty
{
protected String description;
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TRef.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TRef.java 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TRef.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -21,6 +21,11 @@
*/
package org.jboss.osgi.blueprint.parser.xb;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.osgi.blueprint.BlueprintContext;
+
//$Id$
/**
@@ -48,27 +53,17 @@
*
*
*/
+ at XmlType(name = "Tref", namespace = BlueprintContext.XMLNS_BLUEPRINT)
public class TRef
{
protected String component;
- /**
- * Gets the value of the component property.
- *
- * @return possible object is {@link String }
- *
- */
+ @XmlAttribute
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;
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TReference.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TReference.java 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TReference.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -58,7 +58,10 @@
*
*
*/
- at XmlType(name = "Treference", namespace = BlueprintContext.XMLNS_BLUEPRINT)
+
+// [JBXB-210] Property order cannot be defined on super type
+// https://jira.jboss.org/jira/browse/JBXB-210
+ at XmlType(name = "Treference", namespace = BlueprintContext.XMLNS_BLUEPRINT, propOrder = { "description" })
public class TReference extends TServiceReference
{
protected BigInteger timeout;
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TRegistrationListener.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TRegistrationListener.java 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TRegistrationListener.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -26,7 +26,11 @@
import java.util.ArrayList;
import java.util.List;
+import javax.xml.bind.annotation.XmlType;
+import org.jboss.osgi.blueprint.BlueprintContext;
+
+
/**
*
*
@@ -58,6 +62,10 @@
*
*
*/
+
+// [JBXB-211] @XmlType.propOrder required with no schema sequence
+// https://jira.jboss.org/jira/browse/JBXB-211
+ at XmlType(name = "TregistrationListener", namespace = BlueprintContext.XMLNS_BLUEPRINT, propOrder = { "bean" })
public class TRegistrationListener
{
protected TBean bean;
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TService.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TService.java 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TService.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -42,7 +42,8 @@
* @author thomas.diesler at jboss.com
* @since 13-May-2009
*/
- at XmlType(name = "Tservice", namespace = BlueprintContext.XMLNS_BLUEPRINT)
+ at XmlType(name = "Tservice", namespace = BlueprintContext.XMLNS_BLUEPRINT,
+ propOrder = { "description", "interfaceNames", "serviceProperties", "registrationListeners", "bean", "ref" })
public class TService extends TComponent
{
protected String description;
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TServicePropertyEntry.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TServicePropertyEntry.java 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TServicePropertyEntry.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -21,6 +21,10 @@
*/
package org.jboss.osgi.blueprint.parser.xb;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.osgi.blueprint.BlueprintContext;
+
// $Id$
/**
@@ -28,6 +32,7 @@
* attributes.
*
*/
+ at XmlType(name = "TservicePropertyEntry", namespace = BlueprintContext.XMLNS_BLUEPRINT, propOrder = { "value" })
public class TServicePropertyEntry
{
protected String key;
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TServiceReference.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TServiceReference.java 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TServiceReference.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -28,9 +28,12 @@
import java.util.List;
import java.util.Map;
+import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
+import org.jboss.osgi.blueprint.BlueprintContext;
+
/**
* TserviceReference is the base element type used for <reference>, <ref-set>, and <ref-list> elements. This type defines all of the characteristics common to both
* sorts of references.
@@ -63,6 +66,7 @@
*
*
*/
+ at XmlType(name = "TserviceReference", namespace = BlueprintContext.XMLNS_BLUEPRINT, propOrder = { "description" })
public class TServiceReference extends TComponent
{
protected String description;
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TTypeConverters.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TTypeConverters.java 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/parser/xb/TTypeConverters.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -26,6 +26,8 @@
import java.util.ArrayList;
import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlType;
import org.jboss.osgi.blueprint.BlueprintContext;
@@ -64,6 +66,10 @@
{
protected List<Object> components;
+ @XmlElements( {
+ @XmlElement(name = "bean", namespace = BlueprintContext.XMLNS_BLUEPRINT, type = TBean.class),
+ @XmlElement(name = "reference", namespace = BlueprintContext.XMLNS_BLUEPRINT, type = TReference.class),
+ @XmlElement(name = "ref", namespace = BlueprintContext.XMLNS_BLUEPRINT, type = TRef.class)})
public List<Object> getComponents()
{
if (components == null)
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-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/AllElementsParserTestCase.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -73,7 +73,7 @@
String defaultInitMethod = blueprint.getDefaultInitMethod();
assertEquals("defaultInitMethod", defaultInitMethod);
- Boolean defaultLazyInit = blueprint.isDefaultLazyInit();
+ Boolean defaultLazyInit = blueprint.getDefaultLazyInit();
assertEquals(Boolean.FALSE, defaultLazyInit);
long defaultTimeout = blueprint.getDefaultTimeout().longValue();
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-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicBeansParserTestCase.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -59,9 +59,11 @@
TBean beanA = (TBean)compList.get(0);
assertEquals(BeanA.class.getName(), beanA.getClassName());
assertEquals("beanA", beanA.getId());
+ assertEquals("BeanA Description", beanA.getDescription());
TBean beanB = (TBean)compList.get(1);
assertEquals(BeanB.class.getName(), beanB.getClassName());
assertEquals("beanB", beanB.getId());
+ assertEquals("BeanB Description", beanB.getDescription());
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicRootParserTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicRootParserTestCase.java 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicRootParserTestCase.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -53,7 +53,7 @@
// assert default attributes
assertEquals("default-availability: mandatory", TAvailability.mandatory, blueprint.getDefaultAvailability());
assertEquals("default-timeout: 300000", new BigInteger("300000"), blueprint.getDefaultTimeout());
- assertEquals("default-lazy-init: FALSE", Boolean.FALSE, blueprint.isDefaultLazyInit());
+ assertEquals("default-lazy-init: FALSE", Boolean.FALSE, blueprint.getDefaultLazyInit());
assertNull("default-init-method: null", blueprint.getDefaultInitMethod());
assertNull("default-destroy-method: null", blueprint.getDefaultDestroyMethod());
}
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-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicServiceParserTestCase.java 2009-07-03 13:25:35 UTC (rev 90813)
@@ -50,7 +50,7 @@
public class BasicServiceParserTestCase extends OSGiTest
{
@Test
- public void testBasicBeans() throws Exception
+ public void testBasicService() throws Exception
{
URL xmlURL = getResourceURL("parser/blueprint-basic-service.xml");
TBlueprint blueprint = new BlueprintParser(new MockBlueprintContext()).parse(xmlURL);
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/OSGI-INF/blueprint/basic-service.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/OSGI-INF/blueprint/basic-service.xml 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/OSGI-INF/blueprint/basic-service.xml 2009-07-03 13:25:35 UTC (rev 90813)
@@ -1,5 +1,5 @@
<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 schema/blueprint.xsd">
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
<bean id="beanA" class="org.jboss.test.osgi.blueprint.container.bundle.BeanA">
<property name="mbeanServer" ref="mbeanService"/>
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-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-all-elements.xml 2009-07-03 13:25:35 UTC (rev 90813)
@@ -1,6 +1,6 @@
<?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 "
+<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 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>blueprint description</description>
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-basic-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-basic-beans.xml 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-basic-beans.xml 2009-07-03 13:25:35 UTC (rev 90813)
@@ -1,10 +1,12 @@
<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 schema/blueprint.xsd">
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
<bean id="beanA" class="org.jboss.test.osgi.blueprint.parser.comp.BeanA">
+ <description>BeanA Description</description>
</bean>
<bean id="beanB" class="org.jboss.test.osgi.blueprint.parser.comp.BeanB">
+ <description>BeanB Description</description>
<property name="beanA" ref="beanA"/>
</bean>
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-basic-service.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-basic-service.xml 2009-07-03 12:03:39 UTC (rev 90812)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-basic-service.xml 2009-07-03 13:25:35 UTC (rev 90813)
@@ -1,5 +1,5 @@
<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 schema/blueprint.xsd">
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
<bean id="beanA" class="org.jboss.test.osgi.blueprint.parser.comp.BeanA">
</bean>
More information about the jboss-cvs-commits
mailing list