You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/06/25 19:26:44 UTC
svn commit: r788445 - in /geronimo/sandbox/blueprint/blueprint-core/src:
main/resources/org/apache/geronimo/blueprint/
test/java/org/apache/geronimo/blueprint/container/
test/java/org/apache/geronimo/blueprint/utils/ test/resources/
Author: gawor
Date: Thu Jun 25 17:26:43 2009
New Revision: 788445
URL: http://svn.apache.org/viewvc?rev=788445&view=rev
Log:
get things compiling at least
Removed:
geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/utils/TypeUtilsTest.java
Modified:
geronimo/sandbox/blueprint/blueprint-core/src/main/resources/org/apache/geronimo/blueprint/blueprint.xsd
geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/container/GenericTypeTest.java
geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test.xml
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/resources/org/apache/geronimo/blueprint/blueprint.xsd
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/resources/org/apache/geronimo/blueprint/blueprint.xsd?rev=788445&r1=788444&r2=788445&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/resources/org/apache/geronimo/blueprint/blueprint.xsd (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/resources/org/apache/geronimo/blueprint/blueprint.xsd Thu Jun 25 17:26:43 2009
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
/*
- * $Revision: 7376 $
+ * $Revision: 7441 $
*
* Copyright (c) OSGi Alliance (2008, 2009). All Rights Reserved.
*
@@ -48,7 +48,7 @@
The Tcomponent type is the base type for top-level
Blueprint components. The <bean> <reference>, <service>,
- and <ref-list> elements are all derived from
+ and <reference-list> elements are all derived from
the Tcomponent type. This type defines an id attributre
that is used create references between different components.
Component elements can also be inlined within other component
@@ -59,13 +59,13 @@
<xsd:attribute name="id" type="xsd:ID" />
- <xsd:attribute name="initialization" type="Tinitialization">
+ <xsd:attribute name="activation" type="Tactivation">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
- The initialization attribute for this component. This can either
+ The activation attribute for this component. This can either
be "eager" or "lazy". If not specified, it
- defaults to default-initialization attribute of the enclosing
+ defaults to default-activation attribute of the enclosing
<blueprint> element. The default, default is "eager"
]]>
</xsd:documentation>
@@ -79,7 +79,7 @@
depends-on identifies (by name) other components that this component
depends on. The component only be activated after the
depends-on components are successfully activated. Also, if there
- are <reference> or <ref-list> elements with unstatisfied
+ are <reference> or <reference-list> elements with unstatisfied
manadatory references, then the depends-on relationship will also
be used to determine whether this service is registered or
unregistered.
@@ -103,7 +103,7 @@
Following the type converters are the component definitions.
Components are <bean>, <service>, <reference>, and
- <ref-list> elements that identify the bundle components that will
+ <reference-list> elements that identify the bundle components that will
be managed by the blueprint service.
]]>
</xsd:documentation>
@@ -118,7 +118,7 @@
<!-- top-level components -->
<xsd:choice minOccurs="0" maxOccurs="unbounded">
<xsd:element name="service" type="Tservice" />
- <xsd:element name="ref-list" type="Tref-list" />
+ <xsd:element name="reference-list" type="Treference-list" />
<xsd:element name="bean" type="Tbean" />
<xsd:element name="reference" type="Treference" />
<xsd:any namespace="##other" processContents="strict"/>
@@ -126,11 +126,11 @@
</xsd:sequence>
<!-- Defaults-->
- <xsd:attribute name="default-initialization" default="eager" type="Tinitialization">
+ <xsd:attribute name="default-activation" default="eager" type="Tactivation">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
- Specifies the default initialization setting that will be defined
+ Specifies the default activation setting that will be defined
for <bean> components. If not specified, the global
default is "eager". Individual <bean> components may
override the default
@@ -158,24 +158,13 @@
<xsd:documentation>
<![CDATA[
Specifies the default availability value to be used for
- <reference>, and <ref-list> components. The
+ <reference>, and <reference-list> components. The
normal default is "mandatory", and can be changed by individual
service reference components.
]]>
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute name="compliance" type="Tcompliance" default="strict">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Specifies the whether the blueprint definition must be interpreted
- using strict specification compliance, or whether additional extensions
- can be enabled.
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
<xsd:anyAttribute namespace="##other" processContents="strict" />
</xsd:complexType>
@@ -228,13 +217,13 @@
<![CDATA[
allComponents is used in contexts where all component element
types are value. The set of component elements contains
- <bean>, <service>, <reference>, and <ref-list>.
+ <bean>, <service>, <reference>, and <reference-list>.
]]>
</xsd:documentation>
</xsd:annotation>
<xsd:choice>
<xsd:element name="service" type="Tinlined-service" />
- <xsd:element name="ref-list" type="Tinlined-ref-list" />
+ <xsd:element name="reference-list" type="Tinlined-reference-list" />
<xsd:group ref="targetComponent" />
</xsd:choice>
</xsd:group>
@@ -301,10 +290,10 @@
<xsd:group ref="beanElements" />
<xsd:attribute name="id" use="prohibited"/>
<xsd:attribute name="depends-on" type="TdependsOn" use="optional"/>
- <xsd:attribute name="initialization" use="prohibited"/>
+ <xsd:attribute name="activation" use="prohibited"/>
<xsd:attribute name="class" type="Tclass" />
<xsd:attribute name="init-method" type="Tmethod" />
- <xsd:attribute name="destroy-method" use="prohibited"/>
+ <xsd:attribute name="destroy-method" type="Tmethod"/>
<xsd:attribute name="factory-method" type="Tmethod" />
<xsd:attribute name="factory-ref" type="Tidref" />
<xsd:attribute name="scope" fixed="prototype" type="Tscope"/>
@@ -421,7 +410,7 @@
</xsd:sequence>
<xsd:attribute name="id" use="prohibited"/>
<xsd:attribute name="depends-on" type="TdependsOn" use="optional"/>
- <xsd:attribute name="initialization" use="prohibited"/>
+ <xsd:attribute name="activation" use="prohibited"/>
<xsd:attribute name="interface" type="Tclass" use="required"/>
<xsd:attribute name="filter" type="xsd:normalizedString" use="optional"/>
<xsd:attribute name="component-name" type="Tidref" use="optional"/>
@@ -432,14 +421,14 @@
</xsd:complexContent>
</xsd:complexType>
- <!-- ref-list -->
- <xsd:complexType name="Tref-list">
+ <!-- reference-list -->
+ <xsd:complexType name="Treference-list">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
- The Tref-list builds in the characteristics of the
+ The Treference-list builds in the characteristics of the
TserviceReference type to define characteristics of the
- <ref-list>. This adds in the characteristics that
+ <reference-list>. This adds in the characteristics that
only apply to collections of references (e.g., memberType).
]]>
</xsd:documentation>
@@ -466,24 +455,24 @@
</xsd:complexContent>
</xsd:complexType>
- <xsd:complexType name="Tinlined-ref-list">
+ <xsd:complexType name="Tinlined-reference-list">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
- The Tinlined-ref-list type is used for inlined (i.e. non top level)
- <ref-list> elements.
+ The Tinlined-reference-list type is used for inlined (i.e. non top level)
+ <reference-list> elements.
]]>
</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
- <xsd:restriction base="Tref-list">
+ <xsd:restriction base="Treference-list">
<xsd:sequence>
<xsd:group ref="serviceReferenceElements"/>
<xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="strict" />
</xsd:sequence>
<xsd:attribute name="id" use="prohibited"/>
<xsd:attribute name="depends-on" type="TdependsOn" use="optional"/>
- <xsd:attribute name="initialization" use="prohibited"/>
+ <xsd:attribute name="activation" use="prohibited"/>
<xsd:attribute name="interface" type="Tclass" use="required"/>
<xsd:attribute name="filter" type="xsd:normalizedString" use="optional"/>
<xsd:attribute name="component-name" type="Tidref" use="optional"/>
@@ -500,7 +489,7 @@
<xsd:documentation>
<![CDATA[
TserviceReference is the base element type used for <reference>
- and <ref-list> elements. This type defines all of the
+ and <reference-list> elements. This type defines all of the
characteristics common to both sorts of references.
]]>
</xsd:documentation>
@@ -578,7 +567,7 @@
<xsd:documentation>
<![CDATA[
TReferenceListener defines a reference listener that is attached
- to a <reference> or <ref-list> element. The listener
+ to a <reference> or <reference-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.
@@ -593,13 +582,13 @@
<xsd:attribute name="unbind-method" type="Tmethod" use="optional" />
</xsd:complexType>
- <xsd:simpleType name="Tinitialization">
+ <xsd:simpleType name="Tactivation">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
- Tinitializationt defines the initialization type for components. This is used in this
- schema by the <blueprint> default-initialization attribute and the
- initialization attribute.
+ Tactivation defines the activation type for components. This is used in this
+ schema by the <blueprint> default-activation attribute and the
+ activation attribute.
]]>
</xsd:documentation>
</xsd:annotation>
@@ -615,7 +604,7 @@
<![CDATA[
Tavailability defines an availability attribute type. This is used in this
schema by the <blueprint> default-availability attribute and the
- <reference> and <ref-list> availability attribute.
+ <reference> and <reference-list> availability attribute.
]]>
</xsd:documentation>
</xsd:annotation>
@@ -625,21 +614,6 @@
</xsd:restriction>
</xsd:simpleType>
- <xsd:simpleType name="Tcompliance">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Tcompliance defines a compliance attribute type. This is used in this
- schema by the <blueprint> compliance atribute.
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:restriction base="xsd:NMTOKEN">
- <xsd:enumeration value="strict"/>
- <xsd:enumeration value="loose" />
- </xsd:restriction>
- </xsd:simpleType>
-
<!-- service -->
<xsd:complexType name="Tservice">
@@ -691,7 +665,7 @@
</xsd:sequence>
<xsd:attribute name="id" use="prohibited"/>
<xsd:attribute name="depends-on" type="TdependsOn" use="optional"/>
- <xsd:attribute name="initialization" use="prohibited"/>
+ <xsd:attribute name="activation" use="prohibited"/>
<xsd:attribute name="interface" type="Tclass" use="optional" />
<xsd:attribute name="ref" type="Tidref" use="optional" />
<xsd:attribute name="auto-export" type="TautoExportModes" default="disabled" />
Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/container/GenericTypeTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/container/GenericTypeTest.java?rev=788445&r1=788444&r2=788445&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/container/GenericTypeTest.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/container/GenericTypeTest.java Thu Jun 25 17:26:43 2009
@@ -18,10 +18,7 @@
*/
package org.apache.geronimo.blueprint.container;
-import java.lang.reflect.Type;
-
import junit.framework.TestCase;
-import org.apache.geronimo.blueprint.utils.TypeUtils;
public class GenericTypeTest extends TestCase {
@@ -32,8 +29,7 @@
type = GenericType.parse("java.util.Map<int, java.util.List<java.lang.Integer>[]>", getClass().getClassLoader());
System.out.println(type);
- Type t = TypeUtils.parseJavaType("java.util.List<java.lang.Integer>[]", getClass().getClassLoader());
- type = new GenericType(t);
+ type = GenericType.parse("java.util.List<java.lang.Integer>[]", getClass().getClassLoader());
System.out.println(type.toString());
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test.xml?rev=788445&r1=788444&r2=788445&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test.xml Thu Jun 25 17:26:43 2009
@@ -42,6 +42,6 @@
<bean id="listenerA" class="org.apache.geronimo.blueprint.pojos.ListenerA"/>
- <ref-list availability="optional" member-type="service-object"/>
+ <reference-list availability="optional" member-type="service-object"/>
</blueprint>
\ No newline at end of file