[jboss-cvs] JBossAS SVN: r90263 - in projects/jboss-osgi/trunk/blueprint: impl/src/main/resources/schema and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 16 15:06:26 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-06-16 15:06:26 -0400 (Tue, 16 Jun 2009)
New Revision: 90263
Added:
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/comp/
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/BeanA.java
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/BeanB.java
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/ServiceA.java
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/ServiceB.java
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-all-elements.xml
Removed:
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BeanA.java
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BeanB.java
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/ServiceA.java
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/ServiceB.java
Modified:
projects/jboss-osgi/trunk/blueprint/impl/pom.xml
projects/jboss-osgi/trunk/blueprint/impl/src/main/resources/schema/blueprint-jbxb.xsd
projects/jboss-osgi/trunk/blueprint/impl/src/main/resources/schema/blueprint.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-basic-beans.xml
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-basic-service.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 17:08:00 UTC (rev 90262)
+++ projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-06-16 19:06:26 UTC (rev 90263)
@@ -90,6 +90,14 @@
<excludePackageNames>org.jboss.osgi.*</excludePackageNames>
</configuration>
</plugin>
+ <plugin>
+ <groupId>xsddoc</groupId>
+ <artifactId>maven-xsddoc-plugin</artifactId>
+ <configuration>
+ <maven.xsddoc.src>src/main/resources/schema</maven.xsddoc.src>
+ <maven.xsddoc.include>blueprint.xsd</maven.xsddoc.include>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
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 17:08:00 UTC (rev 90262)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/resources/schema/blueprint-jbxb.xsd 2009-06-16 19:06:26 UTC (rev 90263)
@@ -218,7 +218,7 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
- <xsd:element name="refFIXME" type="Tref" />
+ <xsd:element name="ref" type="Tref" />
<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="unbounded" />
</xsd:choice>
</xsd:group>
@@ -373,7 +373,7 @@
<xsd:attribute name="index" type="xsd:nonNegativeInteger" />
<xsd:attribute name="type" type="Tclass" />
<xsd:attribute name="ref" type="Tidref" />
- <xsd:attribute name="valueFIXME" type="TstringValue" />
+ <xsd:attribute name="value" type="TstringValue" />
</xsd:complexType>
<xsd:complexType name="Tproperty">
@@ -397,7 +397,7 @@
</xsd:sequence>
<xsd:attribute name="name" type="Tmethod" use="required" />
<xsd:attribute name="ref" type="Tidref" />
- <xsd:attribute name="valueFIXME" type="TstringValue" />
+ <xsd:attribute name="value" type="TstringValue" />
</xsd:complexType>
<xsd:complexType name="Tkey">
@@ -788,7 +788,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:element name="bean" type="Tbean" />
- <xsd:element name="refFIXME" type="Tref" />
+ <xsd:element name="ref" type="Tref" />
</xsd:choice>
</xsd:sequence>
</xsd:group>
@@ -1002,12 +1002,12 @@
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="keyFIXME" type="Tkey" minOccurs="0" />
+ <xsd:element name="key" type="Tkey" minOccurs="0" />
<xsd:group ref="value" />
</xsd:sequence>
<xsd:attribute name="key" type="TstringValue" />
<xsd:attribute name="key-ref" type="Tidref" />
- <xsd:attribute name="valueFIXME" type="TstringValue" />
+ <xsd:attribute name="value" type="TstringValue" />
<xsd:attribute name="value-ref" type="Tidref" />
</xsd:complexType>
@@ -1045,7 +1045,7 @@
<xsd:group ref="value" />
</xsd:sequence>
<xsd:attribute name="key" type="TstringValue" use="required" />
- <xsd:attribute name="valueFIXME" type="TstringValue" use="optional" />
+ <xsd:attribute name="value" type="TstringValue" use="optional" />
</xsd:complexType>
<!-- General types -->
Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/resources/schema/blueprint.xsd
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/resources/schema/blueprint.xsd 2009-06-16 17:08:00 UTC (rev 90262)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/resources/schema/blueprint.xsd 2009-06-16 19:06:26 UTC (rev 90263)
@@ -200,7 +200,7 @@
<xsd:choice>
<xsd:element name="bean" type="Tbean" />
<xsd:element name="reference" type="Treference" />
- <xsd:element name="refFIXME" type="Tref" />
+ <xsd:element name="ref" type="Tref" />
<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="unbounded" />
</xsd:choice>
</xsd:group>
@@ -322,7 +322,7 @@
<xsd:attribute name="index" type="xsd:nonNegativeInteger" />
<xsd:attribute name="type" type="Tclass" />
<xsd:attribute name="ref" type="Tidref" />
- <xsd:attribute name="valueFIXME" type="TstringValue" />
+ <xsd:attribute name="value" type="TstringValue" />
</xsd:complexType>
<xsd:complexType name="Tproperty">
@@ -346,7 +346,7 @@
</xsd:sequence>
<xsd:attribute name="name" type="Tmethod" use="required" />
<xsd:attribute name="ref" type="Tidref" />
- <xsd:attribute name="valueFIXME" type="TstringValue" />
+ <xsd:attribute name="value" type="TstringValue" />
</xsd:complexType>
<xsd:complexType name="Tkey">
@@ -715,7 +715,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:element name="bean" type="Tbean" />
- <xsd:element name="refFIXME" type="Tref" />
+ <xsd:element name="ref" type="Tref" />
</xsd:choice>
</xsd:sequence>
</xsd:group>
@@ -929,12 +929,12 @@
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="keyFIXME" type="Tkey" minOccurs="0" />
+ <xsd:element name="key" type="Tkey" minOccurs="0" />
<xsd:group ref="value" />
</xsd:sequence>
<xsd:attribute name="key" type="TstringValue" />
<xsd:attribute name="key-ref" type="Tidref" />
- <xsd:attribute name="valueFIXME" type="TstringValue" />
+ <xsd:attribute name="value" type="TstringValue" />
<xsd:attribute name="value-ref" type="Tidref" />
</xsd:complexType>
@@ -972,7 +972,7 @@
<xsd:group ref="value" />
</xsd:sequence>
<xsd:attribute name="key" type="TstringValue" use="required" />
- <xsd:attribute name="valueFIXME" type="TstringValue" use="optional" />
+ <xsd:attribute name="value" type="TstringValue" use="optional" />
</xsd:complexType>
<!-- General types -->
Added: 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 (rev 0)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/AllElementsParserTestCase.java 2009-06-16 19:06:26 UTC (rev 90263)
@@ -0,0 +1,59 @@
+/*
+ * 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.test.osgi.blueprint.parser;
+
+//$Id$
+
+import java.net.URL;
+
+import org.jboss.osgi.blueprint.parser.BlueprintParser;
+import org.jboss.osgi.blueprint.reflect.BlueprintImpl;
+import org.jboss.osgi.blueprint.reflect.TtypeConverters;
+import org.jboss.osgi.spi.testing.OSGiTestHelper;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Blueprint parser tests
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 13-May-2009
+ */
+public class AllElementsParserTestCase
+{
+ private static BlueprintImpl blueprint;
+
+ @BeforeClass
+ public static void beforeClass()
+ {
+ URL xmlURL = new OSGiTestHelper().getResourceURL("parser/blueprint-all-elements.xml");
+ //blueprint = new BlueprintParser().parse(xmlURL);
+ }
+
+ @Test
+ @Ignore
+ public void getTypeConverters() throws Exception
+ {
+ TtypeConverters typeConverters = blueprint.getTypeConverters();
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/AllElementsParserTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
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 17:08:00 UTC (rev 90262)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicBeansParserTestCase.java 2009-06-16 19:06:26 UTC (rev 90263)
@@ -33,6 +33,8 @@
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;
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 17:08:00 UTC (rev 90262)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BasicServiceParserTestCase.java 2009-06-16 19:06:26 UTC (rev 90263)
@@ -33,6 +33,9 @@
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.ServiceMetadata;
Deleted: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BeanA.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BeanA.java 2009-06-16 17:08:00 UTC (rev 90262)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BeanA.java 2009-06-16 19:06:26 UTC (rev 90263)
@@ -1,45 +0,0 @@
-/*
- * 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.test.osgi.blueprint.parser;
-
-//$Id$
-
-/**
- * A basic bean
- *
- * @author thomas.diesler at jboss.com
- * @since 13-May-2009
- */
-public class BeanA
-{
- private BeanB beanB;
-
- public BeanB getBeanB()
- {
- return beanB;
- }
-
- public void setBeanB(BeanB beanB)
- {
- this.beanB = beanB;
- }
-}
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BeanB.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BeanB.java 2009-06-16 17:08:00 UTC (rev 90262)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BeanB.java 2009-06-16 19:06:26 UTC (rev 90263)
@@ -1,45 +0,0 @@
-/*
- * 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.test.osgi.blueprint.parser;
-
-//$Id$
-
-/**
- * A basic bean
- *
- * @author thomas.diesler at jboss.com
- * @since 13-May-2009
- */
-public class BeanB
-{
- private BeanA beanA;
-
- public BeanA getBeanA()
- {
- return beanA;
- }
-
- public void setBeanA(BeanA beanA)
- {
- this.beanA = beanA;
- }
-}
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/ServiceA.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/ServiceA.java 2009-06-16 17:08:00 UTC (rev 90262)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/ServiceA.java 2009-06-16 19:06:26 UTC (rev 90263)
@@ -1,34 +0,0 @@
-/*
- * 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.test.osgi.blueprint.parser;
-
-//$Id$
-
-/**
- * A basic service
- *
- * @author thomas.diesler at jboss.com
- * @since 13-May-2009
- */
-public interface ServiceA
-{
-}
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/ServiceB.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/ServiceB.java 2009-06-16 17:08:00 UTC (rev 90262)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/ServiceB.java 2009-06-16 19:06:26 UTC (rev 90263)
@@ -1,34 +0,0 @@
-/*
- * 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.test.osgi.blueprint.parser;
-
-//$Id$
-
-/**
- * A basic service
- *
- * @author thomas.diesler at jboss.com
- * @since 13-May-2009
- */
-public interface ServiceB
-{
-}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/BeanA.java (from rev 90249, projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BeanA.java)
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/BeanA.java (rev 0)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/BeanA.java 2009-06-16 19:06:26 UTC (rev 90263)
@@ -0,0 +1,46 @@
+/*
+ * 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.test.osgi.blueprint.parser.comp;
+
+
+//$Id$
+
+/**
+ * A basic bean
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 13-May-2009
+ */
+public class BeanA
+{
+ private BeanB beanB;
+
+ public BeanB getBeanB()
+ {
+ return beanB;
+ }
+
+ public void setBeanB(BeanB beanB)
+ {
+ this.beanB = beanB;
+ }
+}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/BeanB.java (from rev 90249, projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/BeanB.java)
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/BeanB.java (rev 0)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/BeanB.java 2009-06-16 19:06:26 UTC (rev 90263)
@@ -0,0 +1,46 @@
+/*
+ * 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.test.osgi.blueprint.parser.comp;
+
+
+//$Id$
+
+/**
+ * A basic bean
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 13-May-2009
+ */
+public class BeanB
+{
+ private BeanA beanA;
+
+ public BeanA getBeanA()
+ {
+ return beanA;
+ }
+
+ public void setBeanA(BeanA beanA)
+ {
+ this.beanA = beanA;
+ }
+}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/ServiceA.java (from rev 90249, projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/ServiceA.java)
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/ServiceA.java (rev 0)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/ServiceA.java 2009-06-16 19:06:26 UTC (rev 90263)
@@ -0,0 +1,34 @@
+/*
+ * 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.test.osgi.blueprint.parser.comp;
+
+//$Id$
+
+/**
+ * A basic service
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 13-May-2009
+ */
+public interface ServiceA
+{
+}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/ServiceB.java (from rev 90249, projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/ServiceB.java)
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/ServiceB.java (rev 0)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/comp/ServiceB.java 2009-06-16 19:06:26 UTC (rev 90263)
@@ -0,0 +1,34 @@
+/*
+ * 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.test.osgi.blueprint.parser.comp;
+
+//$Id$
+
+/**
+ * A basic service
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 13-May-2009
+ */
+public interface ServiceB
+{
+}
\ No newline at end of file
Added: 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 (rev 0)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-all-elements.xml 2009-06-16 19:06:26 UTC (rev 90263)
@@ -0,0 +1,73 @@
+<?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>
+
+ <type-converters>
+ <bean class="foo.TypeConverterBean" />
+ <reference component-name="typeConverterReferenceA" />
+ <reference component-name="typeConverterReferenceB" />
+ <ref component="typeConverterRefA" />
+ <ref component="typeConverterRefB" />
+ </type-converters>
+
+ <service id="idServiceA" auto-export="disabled" depends-on="someServiceDependency" interface="foo.ServiceInterface" ranking="0" ref="NCName">
+
+ <description>
+ service description
+ </description>
+
+ <interfaces>
+ <value>foo.ServiceInterfA</value>
+ <value>foo.ServiceInterfB</value>
+ </interfaces>
+
+ <service-properties>
+ <entry key="keyA" value="valueA" />
+ <entry key="keyB" value="valueB" />
+ </service-properties>
+
+ <registration-listener registration-method="regMethod" unregistration-method="unregMethod">
+ <bean class="foo.RegistrationListenerBean" />
+ </registration-listener>
+
+ <registration-listener ref="regListenerRef" />
+
+ <bean class="foo.ServiceBean" />
+ </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>
+ <interfaces>
+ <value>foo.ReferenceInterfA</value>
+ <value>foo.ReferenceInterfB</value>
+ </interfaces>
+ <listener ref="referenceListenerA" bind-method="bindMethod" unbind-method="unbindMethod" />
+ <listener ref="referenceListenerB" />
+ </reference>
+
+ <ref component="refCompA" />
+ <ref component="refCompB" />
+
+</blueprint>
Property changes on: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-all-elements.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
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-06-16 17:08:00 UTC (rev 90262)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-basic-beans.xml 2009-06-16 19:06:26 UTC (rev 90263)
@@ -1,10 +1,10 @@
<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">
- <bean id="beanA" class="org.jboss.test.osgi.blueprint.parser.BeanA">
+ <bean id="beanA" class="org.jboss.test.osgi.blueprint.parser.comp.BeanA">
</bean>
- <bean id="beanB" class="org.jboss.test.osgi.blueprint.parser.BeanB">
+ <bean id="beanB" class="org.jboss.test.osgi.blueprint.parser.comp.BeanB">
<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-06-16 17:08:00 UTC (rev 90262)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-basic-service.xml 2009-06-16 19:06:26 UTC (rev 90263)
@@ -1,14 +1,14 @@
<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">
- <bean id="beanA" class="org.jboss.test.osgi.blueprint.parser.BeanA">
+ <bean id="beanA" class="org.jboss.test.osgi.blueprint.parser.comp.BeanA">
</bean>
- <service id="serviceA" ref="beanA" interface="org.jboss.test.osgi.blueprint.parser.ServiceA">
+ <service id="serviceA" ref="beanA" interface="org.jboss.test.osgi.blueprint.parser.comp.ServiceA">
</service>
- <service id="serviceB" interface="org.jboss.test.osgi.blueprint.parser.ServiceB">
- <bean class="org.jboss.test.osgi.blueprint.parser.BeanB"/>
+ <service id="serviceB" interface="org.jboss.test.osgi.blueprint.parser.comp.ServiceB">
+ <bean class="org.jboss.test.osgi.blueprint.parser.comp.BeanB"/>
</service>
</blueprint>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list