You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by li...@apache.org on 2010/09/02 21:44:43 UTC
svn commit: r992076 - in
/incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing:
transactionv10.xsd transactionv11.xsd
Author: linsun
Date: Thu Sep 2 19:44:42 2010
New Revision: 992076
URL: http://svn.apache.org/viewvc?rev=992076&view=rev
Log:
format changes only on schema files to make Joe happy
Modified:
incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd
incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd
Modified: incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd?rev=992076&r1=992075&r2=992076&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd (original)
+++ incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd Thu Sep 2 19:44:42 2010
@@ -1,45 +1,37 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<xsd:schema xmlns="http://aries.apache.org/xmlns/transactions/v1.0.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://aries.apache.org/xmlns/transactions/v1.0.0"
- elementFormDefault="qualified" attributeFormDefault="unqualified"
- version="1.0.0">
-
-<xsd:simpleType name="TtransactionStrategy">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="Required"/>
- <xsd:enumeration value="Mandatory"/>
- <xsd:enumeration value="RequiresNew"/>
- <xsd:enumeration value="Supports"/>
- <xsd:enumeration value="NotSupported"/>
- <xsd:enumeration value="Never"/>
- </xsd:restriction>
-</xsd:simpleType>
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://aries.apache.org/xmlns/transactions/v1.0.0"
+ elementFormDefault="qualified" attributeFormDefault="unqualified"
+ version="1.0.0">
+
+ <xsd:simpleType name="TtransactionStrategy">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="Required" />
+ <xsd:enumeration value="Mandatory" />
+ <xsd:enumeration value="RequiresNew" />
+ <xsd:enumeration value="Supports" />
+ <xsd:enumeration value="NotSupported" />
+ <xsd:enumeration value="Never" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:complexType name="Ttransaction">
+ <xsd:attribute name="method" type="xsd:string" />
+ <xsd:attribute name="value" type="TtransactionStrategy" />
+ </xsd:complexType>
-<xsd:complexType name="Ttransaction">
- <xsd:attribute name="method" type="xsd:string"/>
- <xsd:attribute name="value" type="TtransactionStrategy"/>
-</xsd:complexType>
+ <xsd:element name="transaction" type="Ttransaction">
+ </xsd:element>
-<xsd:element name="transaction" type="Ttransaction">
-</xsd:element>
-
</xsd:schema>
\ No newline at end of file
Modified: incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd?rev=992076&r1=992075&r2=992076&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd (original)
+++ incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd Thu Sep 2 19:44:42 2010
@@ -1,73 +1,68 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
- -->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<xsd:schema xmlns="http://aries.apache.org/xmlns/transactions/v1.1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://aries.apache.org/xmlns/transactions/v1.1.0"
- elementFormDefault="qualified" attributeFormDefault="unqualified"
- version="1.1.0">
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://aries.apache.org/xmlns/transactions/v1.1.0"
+ elementFormDefault="qualified" attributeFormDefault="unqualified"
+ version="1.1.0">
- <xsd:annotation>
- <xsd:documentation>
+ <xsd:annotation>
+ <xsd:documentation>
<![CDATA[
This is the XML Schema for the OSGi Blueprint declarative transaction 1.1.0 development descriptor. Blueprint declarative transaction is a custom namespace for OSGi Blueprint service 1.0.0 development descriptor. It is designed to decorate transaction attribute of the bean components, which can be done at the bean level or at the bundle wide level. In other words, the transaction element can reside in the bean element or in the root of the blueprint element as a top level transaction element. Blueprint configuration files using this schema must indicate the schema using the transactions/v1.1.0 namespace. For example,
<transaction xmlns="http://aries.apache.org/xmlns/transactions/v1.1.0">
if used as a qualified namespace, "tx" is the recommended namespace prefix.
]]>
- </xsd:documentation>
- </xsd:annotation>
+ </xsd:documentation>
+ </xsd:annotation>
- <xsd:simpleType name="TtransactionAttribute">
- <xsd:annotation>
- <xsd:documentation>
+ <xsd:simpleType name="TtransactionAttribute">
+ <xsd:annotation>
+ <xsd:documentation>
<![CDATA[
The TtransactionAttribute type defines the transaction attribute for blueprint declarative transaction.
]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="Required" />
- <xsd:enumeration value="Mandatory" />
- <xsd:enumeration value="RequiresNew" />
- <xsd:enumeration value="Supports" />
- <xsd:enumeration value="NotSupported" />
- <xsd:enumeration value="Never" />
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Ttransaction">
- <xsd:annotation>
- <xsd:documentation>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="Required" />
+ <xsd:enumeration value="Mandatory" />
+ <xsd:enumeration value="RequiresNew" />
+ <xsd:enumeration value="Supports" />
+ <xsd:enumeration value="NotSupported" />
+ <xsd:enumeration value="Never" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:complexType name="Ttransaction">
+ <xsd:annotation>
+ <xsd:documentation>
<![CDATA[
Ttransaction defines one or more methods that are intercepted with the specified transaction attribute. Multiple methods names can be wild-carded with '*'. Methods can be whitespace separated and be a mixture of fixed string and wild-cards. The bean attribute refers to the bean component id and can only be used for top level transaction element. Similar as methods, beans can be whitespace separated and be a mixture of fixed string and wild-cards. Two wild-cards next to each other are not supported for either the bean or method attribute. ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:attribute name="method" type="xsd:string" />
- <xsd:attribute name="value" type="TtransactionAttribute" use="required" />
- <xsd:attribute name="bean" type="xsd:string" />
- </xsd:complexType>
-
- <xsd:element name="transaction" type="Ttransaction">
- <xsd:annotation>
- <xsd:documentation>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="method" type="xsd:string" />
+ <xsd:attribute name="value" type="TtransactionAttribute"
+ use="required" />
+ <xsd:attribute name="bean" type="xsd:string" />
+ </xsd:complexType>
+
+ <xsd:element name="transaction" type="Ttransaction">
+ <xsd:annotation>
+ <xsd:documentation>
<![CDATA[
The <transaction> element is the root element for blueprint declarative transaction
]]>
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
</xsd:schema>
\ No newline at end of file
Re: svn commit: r992076 - in /incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing:
transactionv10.xsd transactionv11.xsd
Posted by Joe Bohn <jo...@gmail.com>.
:-) Thanks for making a change just to make me happy! :-)
Joe
On 9/2/10 3:44 PM, linsun@apache.org wrote:
> Author: linsun
> Date: Thu Sep 2 19:44:42 2010
> New Revision: 992076
>
> URL: http://svn.apache.org/viewvc?rev=992076&view=rev
> Log:
> format changes only on schema files to make Joe happy
>
> Modified:
> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd
> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd
>
> Modified: incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd?rev=992076&r1=992075&r2=992076&view=diff
> ==============================================================================
> --- incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd (original)
> +++ incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd Thu Sep 2 19:44:42 2010
> @@ -1,45 +1,37 @@
> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
> -<!--
> -
> - Licensed to the Apache Software Foundation (ASF) under one or more
> - contributor license agreements. See the NOTICE file distributed with
> - this work for additional information regarding copyright ownership.
> - The ASF licenses this file to You under the Apache License, Version 2.0
> - (the "License"); you may not use this file except in compliance with
> - the License. You may obtain a copy of the License at
> -
> - http://www.apache.org/licenses/LICENSE-2.0
> -
> - Unless required by applicable law or agreed to in writing, software
> - distributed under the License is distributed on an "AS IS" BASIS,
> - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> - See the License for the specific language governing permissions and
> - limitations under the License.
> -
> --->
> +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
> + license agreements. See the NOTICE file distributed with this work for additional
> + information regarding copyright ownership. The ASF licenses this file to
> + You under the Apache License, Version 2.0 (the "License"); you may not use
> + this file except in compliance with the License. You may obtain a copy of
> + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
> + by applicable law or agreed to in writing, software distributed under the
> + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
> + OF ANY KIND, either express or implied. See the License for the specific
> + language governing permissions and limitations under the License. -->
> <xsd:schema xmlns="http://aries.apache.org/xmlns/transactions/v1.0.0"
> - xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://aries.apache.org/xmlns/transactions/v1.0.0"
> - elementFormDefault="qualified" attributeFormDefault="unqualified"
> - version="1.0.0">
> -
> -<xsd:simpleType name="TtransactionStrategy">
> -<xsd:restriction base="xsd:string">
> -<xsd:enumeration value="Required"/>
> -<xsd:enumeration value="Mandatory"/>
> -<xsd:enumeration value="RequiresNew"/>
> -<xsd:enumeration value="Supports"/>
> -<xsd:enumeration value="NotSupported"/>
> -<xsd:enumeration value="Never"/>
> -</xsd:restriction>
> -</xsd:simpleType>
> + xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://aries.apache.org/xmlns/transactions/v1.0.0"
> + elementFormDefault="qualified" attributeFormDefault="unqualified"
> + version="1.0.0">
> +
> +<xsd:simpleType name="TtransactionStrategy">
> +<xsd:restriction base="xsd:string">
> +<xsd:enumeration value="Required" />
> +<xsd:enumeration value="Mandatory" />
> +<xsd:enumeration value="RequiresNew" />
> +<xsd:enumeration value="Supports" />
> +<xsd:enumeration value="NotSupported" />
> +<xsd:enumeration value="Never" />
> +</xsd:restriction>
> +</xsd:simpleType>
> +
> +<xsd:complexType name="Ttransaction">
> +<xsd:attribute name="method" type="xsd:string" />
> +<xsd:attribute name="value" type="TtransactionStrategy" />
> +</xsd:complexType>
>
> -<xsd:complexType name="Ttransaction">
> -<xsd:attribute name="method" type="xsd:string"/>
> -<xsd:attribute name="value" type="TtransactionStrategy"/>
> -</xsd:complexType>
> +<xsd:element name="transaction" type="Ttransaction">
> +</xsd:element>
>
> -<xsd:element name="transaction" type="Ttransaction">
> -</xsd:element>
>
> -
> </xsd:schema>
> \ No newline at end of file
>
> Modified: incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd?rev=992076&r1=992075&r2=992076&view=diff
> ==============================================================================
> --- incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd (original)
> +++ incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd Thu Sep 2 19:44:42 2010
> @@ -1,73 +1,68 @@
> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
> - <!--
> -
> - Licensed to the Apache Software Foundation (ASF) under one or more
> - contributor license agreements. See the NOTICE file distributed with
> - this work for additional information regarding copyright ownership.
> - The ASF licenses this file to You under the Apache License, Version
> - 2.0 (the "License"); you may not use this file except in compliance
> - with the License. You may obtain a copy of the License at
> -
> - http://www.apache.org/licenses/LICENSE-2.0 Unless required by
> - applicable law or agreed to in writing, software distributed under the
> - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
> - CONDITIONS OF ANY KIND, either express or implied. See the License for
> - the specific language governing permissions and limitations under the
> - License.
> - -->
> +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
> + license agreements. See the NOTICE file distributed with this work for additional
> + information regarding copyright ownership. The ASF licenses this file to
> + You under the Apache License, Version 2.0 (the "License"); you may not use
> + this file except in compliance with the License. You may obtain a copy of
> + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
> + by applicable law or agreed to in writing, software distributed under the
> + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
> + OF ANY KIND, either express or implied. See the License for the specific
> + language governing permissions and limitations under the License. -->
> <xsd:schema xmlns="http://aries.apache.org/xmlns/transactions/v1.1.0"
> - xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://aries.apache.org/xmlns/transactions/v1.1.0"
> - elementFormDefault="qualified" attributeFormDefault="unqualified"
> - version="1.1.0">
> + xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://aries.apache.org/xmlns/transactions/v1.1.0"
> + elementFormDefault="qualified" attributeFormDefault="unqualified"
> + version="1.1.0">
>
> -<xsd:annotation>
> -<xsd:documentation>
> +<xsd:annotation>
> +<xsd:documentation>
> <![CDATA[
> This is the XML Schema for the OSGi Blueprint declarative transaction 1.1.0 development descriptor. Blueprint declarative transaction is a custom namespace for OSGi Blueprint service 1.0.0 development descriptor. It is designed to decorate transaction attribute of the bean components, which can be done at the bean level or at the bundle wide level. In other words, the transaction element can reside in the bean element or in the root of the blueprint element as a top level transaction element. Blueprint configuration files using this schema must indicate the schema using the transactions/v1.1.0 namespace. For example,
> <transaction xmlns="http://aries.apache.org/xmlns/transactions/v1.1.0">
> if used as a qualified namespace, "tx" is the recommended namespace prefix.
> ]]>
> -</xsd:documentation>
> -</xsd:annotation>
> +</xsd:documentation>
> +</xsd:annotation>
>
> -<xsd:simpleType name="TtransactionAttribute">
> -<xsd:annotation>
> -<xsd:documentation>
> +<xsd:simpleType name="TtransactionAttribute">
> +<xsd:annotation>
> +<xsd:documentation>
> <![CDATA[
> The TtransactionAttribute type defines the transaction attribute for blueprint declarative transaction.
> ]]>
> -</xsd:documentation>
> -</xsd:annotation>
> -<xsd:restriction base="xsd:string">
> -<xsd:enumeration value="Required" />
> -<xsd:enumeration value="Mandatory" />
> -<xsd:enumeration value="RequiresNew" />
> -<xsd:enumeration value="Supports" />
> -<xsd:enumeration value="NotSupported" />
> -<xsd:enumeration value="Never" />
> -</xsd:restriction>
> -</xsd:simpleType>
> -
> -<xsd:complexType name="Ttransaction">
> -<xsd:annotation>
> -<xsd:documentation>
> +</xsd:documentation>
> +</xsd:annotation>
> +<xsd:restriction base="xsd:string">
> +<xsd:enumeration value="Required" />
> +<xsd:enumeration value="Mandatory" />
> +<xsd:enumeration value="RequiresNew" />
> +<xsd:enumeration value="Supports" />
> +<xsd:enumeration value="NotSupported" />
> +<xsd:enumeration value="Never" />
> +</xsd:restriction>
> +</xsd:simpleType>
> +
> +<xsd:complexType name="Ttransaction">
> +<xsd:annotation>
> +<xsd:documentation>
> <![CDATA[
> Ttransaction defines one or more methods that are intercepted with the specified transaction attribute. Multiple methods names can be wild-carded with '*'. Methods can be whitespace separated and be a mixture of fixed string and wild-cards. The bean attribute refers to the bean component id and can only be used for top level transaction element. Similar as methods, beans can be whitespace separated and be a mixture of fixed string and wild-cards. Two wild-cards next to each other are not supported for either the bean or method attribute. ]]>
> -</xsd:documentation>
> -</xsd:annotation>
> -<xsd:attribute name="method" type="xsd:string" />
> -<xsd:attribute name="value" type="TtransactionAttribute" use="required" />
> -<xsd:attribute name="bean" type="xsd:string" />
> -</xsd:complexType>
> -
> -<xsd:element name="transaction" type="Ttransaction">
> -<xsd:annotation>
> -<xsd:documentation>
> +</xsd:documentation>
> +</xsd:annotation>
> +<xsd:attribute name="method" type="xsd:string" />
> +<xsd:attribute name="value" type="TtransactionAttribute"
> + use="required" />
> +<xsd:attribute name="bean" type="xsd:string" />
> +</xsd:complexType>
> +
> +<xsd:element name="transaction" type="Ttransaction">
> +<xsd:annotation>
> +<xsd:documentation>
> <![CDATA[
> The<transaction> element is the root element for blueprint declarative transaction
> ]]>
> -</xsd:documentation>
> -</xsd:annotation>
> -</xsd:element>
> +</xsd:documentation>
> +</xsd:annotation>
> +</xsd:element>
>
> </xsd:schema>
> \ No newline at end of file
>
>
>
--
Joe