Hi Joe Yea, I didn't add the additional documentation in the transaction10.xsd since it is purely based on the released transaction schema in 0.1 release. I think it could be confusing to user if we attempt to add/modify minor things here and there thus they may think they are different files but in fact they are the same thing!
I don't recall we have a code format guideline for xml or xsd files. I basically used my Eclipse to format them. I'd be fine if you want to change them to whatever format you like if we'll release a newer version of the schema. But I don't feel releasing a newer version of the schema just on these formatting issues. P.S. I will probably add/remove some code to simplify our logic in selecting the right transaction attribute when there are multiple matches, but I don't know if we'll need to release a newer version of the xsd file for the 0.3 release. Thanks Lin On Wed, Sep 1, 2010 at 5:24 PM, Joe Bohn <[email protected]> wrote: > Hi Lin, > > Yes, I realize that you added the annotation documentation after we released > 0.1-incubating ... and that the current transactionv10.xsd is the same > content as released with 0.1-incubating then called transaction.xsd. > However, you originally added the documentation to transaction.xsd before > it was split into 2 files. I thought that was a nice addition and saw no > need to leave it out of the v10 version when you split transaction.xsd into > v10 and v11. > > Among the format differences between v10 and v11 was the removal of some > tabs (which is good) ... but unfortunately the addition of other tabs > (notably in the Apache License Header) and reformatting. This makes it > nearly impossible to do a file compare on the two versions. It would be nice > to clean up with the Apache License Header in the v11 version and other > tabs/formatting in v10 but I'm not sure if you think we cannot touch these > now that we are releasing 0.2-incubating and long ago released > 0.1-incubating (hence my next paragraph). > > So, I guess that raises the question of what we "should" and "should not" > change in these xsd files after they have been released. I'm of the opinion > that it is fine to modify them to clean things up by removing tabs, > reformatting, and adding annotation documentation in all versions of the xsd > (even those we keep for compatibility with previous releases). The thing we > must avoid is any incompatible changes that would change the semantics of > the schema of prior releases. Is there some reason that we must retain the > exact xsd without any changes at all once a version of the schema has been > released (except perhaps for necessary renames of the xsd file like you did > from transaction.xsd to transactionv10.xsd)? > > Joe > > > > On 9/1/10 4:08 PM, Lin Sun wrote: >> >> Hi Joe >> >> Thanks for the review. I didn't think it removed any annotation >> documentation for transaction10.xsd. Do you see something >> diifferently? >> >> The annotation documentation was added by me after 0.1 release thus >> only exists for 0.2 release in the transaction11.xsd file. >> >> I probably should have done a svn copy to retain the history but at >> the time, it was not obvious to figure out which revision I should use >> to copy from. >> >> Lin >> >> >> >> On Wed, Sep 1, 2010 at 3:30 PM, Joe Bohn<[email protected]> wrote: >>> >>> I just happened to notice that this change removed the annotation >>> documentation (and perhaps a few other minor format changes) from the >>> renamed transactionv10.xsd that had been added to transaction.xsd back in >>> rev. 955815 and following. I understand that it was necessary to undo >>> the >>> updates that were not backward compatible - but was it it also the >>> intention >>> to remove the documentation and format changes? I'm not sure if it >>> really >>> matters that much but it seems that some doc is always better than none >>> ... >>> and having consistent doc and formatting makes comparison between the >>> v10& >>> v11 files easier to highlight the more substantial changes. >>> >>> Also, because the v10 part was added rather than being copied from an >>> earlier revision we lost the change history. It might have been better >>> if >>> we could have copied this from an earlier revision (as was done for >>> transactionv11.xsd). >>> >>> Joe >>> >>> >>> On 8/5/10 3:11 PM, [email protected] wrote: >>>> >>>> Author: linsun >>>> Date: Thu Aug 5 19:11:58 2010 >>>> New Revision: 982734 >>>> >>>> URL: http://svn.apache.org/viewvc?rev=982734&view=rev >>>> Log: >>>> ARIES-375 Update blueprint transaction schema from v1.0.0 to v1.1.0 >>>> >>>> Added: >>>> >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd >>>> (with props) >>>> >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd >>>> - copied, changed from r982704, >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transaction.xsd >>>> Removed: >>>> >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transaction.xsd >>>> Modified: >>>> incubator/aries/trunk/transaction/transaction-blueprint/pom.xml >>>> >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/Constants.java >>>> >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxElementHandler.java >>>> >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/OSGI-INF/blueprint/transaction.xml >>>> >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java >>>> >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java >>>> >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/aries.xml >>>> >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries.xml >>>> >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries2.xml >>>> >>>> Modified: >>>> incubator/aries/trunk/transaction/transaction-blueprint/pom.xml >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=982734&r1=982733&r2=982734&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- incubator/aries/trunk/transaction/transaction-blueprint/pom.xml >>>> (original) >>>> +++ incubator/aries/trunk/transaction/transaction-blueprint/pom.xml Thu >>>> Aug 5 19:11:58 2010 >>>> @@ -1,90 +1,89 @@ >>>> <?xml version="1.0" encoding="UTF-8"?> >>>> -<!-- >>>> - 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. >>>> ---> >>>> -<project xmlns="http://maven.apache.org/POM/4.0.0"; >>>> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; >>>> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 >>>> http://maven.apache.org/maven-v4_0_0.xsd";> >>>> - >>>> -<parent> >>>> -<groupId>org.apache.aries.transaction</groupId> >>>> -<artifactId>transaction</artifactId> >>>> -<version>0.2-incubating-SNAPSHOT</version> >>>> -</parent> >>>> - >>>> -<modelVersion>4.0.0</modelVersion> >>>> -<groupId>org.apache.aries.transaction</groupId> >>>> -<artifactId>org.apache.aries.transaction.blueprint</artifactId> >>>> -<packaging>bundle</packaging> >>>> -<name>Apache Aries Transaction Blueprint</name> >>>> - >>>> -<properties> >>>> -<aries.osgi.export.pkg> >>>> - org.apache.aries.transaction.exception >>>> +<!-- >>>> + 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. >>>> + --> >>>> +<project xmlns="http://maven.apache.org/POM/4.0.0"; >>>> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; >>>> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 >>>> http://maven.apache.org/maven-v4_0_0.xsd";> >>>> + >>>> +<parent> >>>> +<groupId>org.apache.aries.transaction</groupId> >>>> +<artifactId>transaction</artifactId> >>>> +<version>0.2-incubating-SNAPSHOT</version> >>>> +</parent> >>>> + >>>> +<modelVersion>4.0.0</modelVersion> >>>> +<groupId>org.apache.aries.transaction</groupId> >>>> +<artifactId>org.apache.aries.transaction.blueprint</artifactId> >>>> +<packaging>bundle</packaging> >>>> +<name>Apache Aries Transaction Blueprint</name> >>>> + >>>> +<properties> >>>> +<aries.osgi.export.pkg> >>>> + org.apache.aries.transaction.exception >>>> </aries.osgi.export.pkg> >>>> -<aries.osgi.import> >>>> - org.osgi.framework;version="1.5", >>>> - org.osgi.service.cm;version="[1.2.0,2.0.0)", >>>> - * >>>> +<aries.osgi.import> >>>> + org.osgi.framework;version="1.5", >>>> + org.osgi.service.cm;version="[1.2.0,2.0.0)", >>>> + * >>>> </aries.osgi.import> >>>> -<aries.osgi.private.pkg> >>>> - org.apache.aries.transaction, >>>> - org.apache.aries.transaction.parsing >>>> +<aries.osgi.private.pkg> >>>> + org.apache.aries.transaction, >>>> + org.apache.aries.transaction.parsing >>>> </aries.osgi.private.pkg> >>>> -</properties> >>>> +</properties> >>>> >>>> -<dependencies> >>>> -<dependency> >>>> -<groupId>org.osgi</groupId> >>>> -<artifactId>org.osgi.core</artifactId> >>>> -<scope>test</scope> >>>> -</dependency> >>>> -<dependency> >>>> -<groupId>org.osgi</groupId> >>>> -<artifactId>org.osgi.compendium</artifactId> >>>> -<scope>test</scope> >>>> -</dependency> >>>> +<dependencies> >>>> +<dependency> >>>> +<groupId>org.osgi</groupId> >>>> +<artifactId>org.osgi.core</artifactId> >>>> +<scope>test</scope> >>>> +</dependency> >>>> +<dependency> >>>> +<groupId>org.osgi</groupId> >>>> +<artifactId>org.osgi.compendium</artifactId> >>>> +<scope>test</scope> >>>> +</dependency> >>>> <dependency> >>>> <groupId>org.apache.geronimo.specs</groupId> >>>> <artifactId>geronimo-jta_1.1_spec</artifactId> >>>> </dependency> >>>> -<dependency> >>>> -<groupId>org.apache.aries.blueprint</groupId> >>>> -<artifactId>org.apache.aries.blueprint</artifactId> >>>> -<scope>provided</scope> >>>> -</dependency> >>>> -<dependency> >>>> -<groupId>org.apache.aries.testsupport</groupId> >>>> -<artifactId>org.apache.aries.testsupport.unit</artifactId> >>>> -<scope>test</scope> >>>> -</dependency> >>>> -<dependency> >>>> -<groupId>org.slf4j</groupId> >>>> -<artifactId>slf4j-api</artifactId> >>>> -</dependency> >>>> -<dependency> >>>> -<groupId>org.slf4j</groupId> >>>> -<artifactId>slf4j-simple</artifactId> >>>> -<scope>test</scope> >>>> -</dependency> >>>> -<dependency> >>>> -<groupId>junit</groupId> >>>> -<artifactId>junit</artifactId> >>>> -<scope>test</scope> >>>> -</dependency> >>>> -</dependencies> >>>> +<dependency> >>>> +<groupId>org.apache.aries.blueprint</groupId> >>>> + >>>> <artifactId>org.apache.aries.blueprint</artifactId> >>>> +<scope>provided</scope> >>>> +</dependency> >>>> +<dependency> >>>> +<groupId>org.apache.aries.testsupport</groupId> >>>> + >>>> <artifactId>org.apache.aries.testsupport.unit</artifactId> >>>> +<scope>test</scope> >>>> +</dependency> >>>> +<dependency> >>>> +<groupId>org.slf4j</groupId> >>>> +<artifactId>slf4j-api</artifactId> >>>> +</dependency> >>>> +<dependency> >>>> +<groupId>org.slf4j</groupId> >>>> +<artifactId>slf4j-simple</artifactId> >>>> +<scope>test</scope> >>>> +</dependency> >>>> +<dependency> >>>> +<groupId>junit</groupId> >>>> +<artifactId>junit</artifactId> >>>> +<scope>test</scope> >>>> +</dependency> >>>> + >>>> +</dependencies> >>>> >>>> </project> >>>> >>>> Modified: >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/Constants.java >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/Constants.java?rev=982734&r1=982733&r2=982734&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/Constants.java >>>> (original) >>>> +++ >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/Constants.java >>>> Thu Aug 5 19:11:58 2010 >>>> @@ -7,5 +7,9 @@ public class Constants { >>>> public static final String BEAN = "bean"; >>>> public static final String VALUE = "value"; >>>> public static final String METHOD = "method"; >>>> - public static final String TX_SCHEMA = "transaction.xsd"; >>>> + public static final String TX11_SCHEMA = "transactionv11.xsd"; >>>> + public static final String TX10_SCHEMA = "transactionv10.xsd"; >>>> + >>>> + public final static String TRANSACTION10URI = >>>> "http://aries.apache.org/xmlns/transactions/v1.0.0";; >>>> + public final static String TRANSACTION11URI = >>>> "http://aries.apache.org/xmlns/transactions/v1.1.0";; >>>> } >>>> >>>> Modified: >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxElementHandler.java >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxElementHandler.java?rev=982734&r1=982733&r2=982734&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxElementHandler.java >>>> (original) >>>> +++ >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxElementHandler.java >>>> Thu Aug 5 19:11:58 2010 >>>> @@ -98,7 +98,11 @@ public class TxElementHandler implements >>>> >>>> public URL getSchemaLocation(String arg0) >>>> { >>>> - return this.getClass().getResource(Constants.TX_SCHEMA); >>>> + if (arg0.equals(Constants.TRANSACTION10URI)) { >>>> + return >>>> this.getClass().getResource(Constants.TX10_SCHEMA); >>>> + } else { >>>> + return this.getClass().getResource(Constants.TX11_SCHEMA); >>>> + } >>>> } >>>> >>>> public final void setTxMetaDataHelper(TxComponentMetaDataHelper >>>> transactionEnhancer) >>>> >>>> Modified: >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/OSGI-INF/blueprint/transaction.xml >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/OSGI-INF/blueprint/transaction.xml?rev=982734&r1=982733&r2=982734&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/OSGI-INF/blueprint/transaction.xml >>>> (original) >>>> +++ >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/OSGI-INF/blueprint/transaction.xml >>>> Thu Aug 5 19:11:58 2010 >>>> @@ -24,7 +24,12 @@ >>>> >>>> <service interface="org.apache.aries.blueprint.NamespaceHandler"> >>>> <service-properties> >>>> -<entry key="osgi.service.blueprint.namespace" >>>> value="http://aries.apache.org/xmlns/transactions/v1.0.0"/> >>>> +<entry key="osgi.service.blueprint.namespace"> >>>> +<list> >>>> + >>>> <value>http://aries.apache.org/xmlns/transactions/v1.0.0</value> >>>> + >>>> <value>http://aries.apache.org/xmlns/transactions/v1.1.0</value> >>>> +</list> >>>> +</entry> >>>> </service-properties> >>>> <bean >>>> class="org.apache.aries.transaction.parsing.TxElementHandler"> >>>> <property ref="txenhancer" name="txMetaDataHelper"/> >>>> >>>> Added: >>>> >>>> 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=982734&view=auto >>>> >>>> >>>> ============================================================================== >>>> --- >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd >>>> (added) >>>> +++ >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd >>>> Thu Aug 5 19:11:58 2010 >>>> @@ -0,0 +1,45 @@ >>>> +<?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. >>>> + >>>> +--> >>>> +<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> >>>> + >>>> +<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:schema> >>>> \ No newline at end of file >>>> >>>> Propchange: >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd >>>> >>>> >>>> ------------------------------------------------------------------------------ >>>> svn:eol-style = native >>>> >>>> Propchange: >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd >>>> >>>> >>>> ------------------------------------------------------------------------------ >>>> svn:keywords = Date Revision >>>> >>>> Propchange: >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd >>>> >>>> >>>> ------------------------------------------------------------------------------ >>>> svn:mime-type = text/xml >>>> >>>> Copied: >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd >>>> (from r982704, >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transaction.xsd) >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd?p2=incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd&p1=incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transaction.xsd&r1=982704&r2=982734&rev=982734&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transaction.xsd >>>> (original) >>>> +++ >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd >>>> Thu Aug 5 19:11:58 2010 >>>> @@ -15,16 +15,16 @@ >>>> 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"; >>>> +<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.0.0"> >>>> + version="1.1.0"> >>>> >>>> <xsd:annotation> >>>> <xsd:documentation> >>>> <![CDATA[ >>>> - This is the XML Schema for the OSGi Blueprint declarative >>>> transaction 1.0.0 development descriptor. Blueprint declarative >>>> transaction >>>> is a custom namespace for OSGi Blueprint service 1.0.0 development >>>> descriptor. It is designed to be used to decorate transaction attribute >>>> of >>>> the bean component. Blueprint configuration files using this schema >>>> must >>>> indicate the schema using the transactions/v1.0.0 namespace. For >>>> example, >>>> -<transaction xmlns="http://aries.apache.org/xmlns/transactions/v1.0.0";> >>>> + 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> >>>> @@ -52,8 +52,7 @@ >>>> <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. 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 both the bean or method attributes. >>>> - ]]> >>>> + 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" /> >>>> >>>> Modified: >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java?rev=982734&r1=982733&r2=982734&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java >>>> (original) >>>> +++ >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java >>>> Thu Aug 5 19:11:58 2010 >>>> @@ -23,7 +23,6 @@ import static org.junit.Assert.assertNot >>>> >>>> import java.net.URI; >>>> import java.net.URL; >>>> -import java.util.ArrayList; >>>> import java.util.LinkedList; >>>> import java.util.List; >>>> import java.util.Properties; >>>> @@ -31,8 +30,6 @@ import java.util.Set; >>>> >>>> import javax.transaction.TransactionManager; >>>> >>>> -import org.apache.aries.mocks.BundleMock; >>>> - >>>> import org.apache.aries.blueprint.ComponentDefinitionRegistry; >>>> import org.apache.aries.blueprint.NamespaceHandler; >>>> import org.apache.aries.blueprint.container.NamespaceHandlerRegistry; >>>> @@ -40,19 +37,15 @@ import org.apache.aries.blueprint.contai >>>> import >>>> >>>> org.apache.aries.blueprint.container.NamespaceHandlerRegistry.NamespaceHandlerSet; >>>> import >>>> org.apache.aries.blueprint.namespace.ComponentDefinitionRegistryImpl; >>>> import >>>> org.apache.aries.blueprint.namespace.NamespaceHandlerRegistryImpl; >>>> +import org.apache.aries.mocks.BundleMock; >>>> +import org.apache.aries.transaction.parsing.TxElementHandler; >>>> +import org.apache.aries.unittest.mocks.Skeleton; >>>> import org.junit.After; >>>> import org.junit.Before; >>>> import org.junit.Test; >>>> import org.osgi.framework.Bundle; >>>> import org.osgi.framework.BundleContext; >>>> import org.osgi.service.blueprint.reflect.BeanMetadata; >>>> -import org.osgi.service.blueprint.reflect.BeanProperty; >>>> -import org.osgi.util.tracker.ServiceTracker; >>>> - >>>> -import org.apache.aries.transaction.TxComponentMetaDataHelperImpl; >>>> -import org.apache.aries.transaction.TxInterceptorImpl; >>>> -import org.apache.aries.transaction.parsing.TxElementHandler; >>>> -import org.apache.aries.unittest.mocks.Skeleton; >>>> >>>> public class BundleWideNameSpaceHandlerTest { >>>> >>>> @@ -79,7 +72,7 @@ public class BundleWideNameSpaceHandlerT >>>> namespaceHandler.setTxMetaDataHelper(txenhancer); >>>> >>>> Properties props = new Properties(); >>>> - props.put("osgi.service.blueprint.namespace", >>>> "http://aries.apache.org/xmlns/transactions/v1.0.0";); >>>> + props.put("osgi.service.blueprint.namespace", new >>>> String[]{"http://aries.apache.org/xmlns/transactions/v1.0.0";, >>>> "http://aries.apache.org/xmlns/transactions/v1.1.0"}); >>>> ctx.registerService(NamespaceHandler.class.getName(), >>>> namespaceHandler, props); >>>> } >>>> >>>> >>>> Modified: >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java?rev=982734&r1=982733&r2=982734&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java >>>> (original) >>>> +++ >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java >>>> Thu Aug 5 19:11:58 2010 >>>> @@ -72,7 +72,7 @@ public class NameSpaceHandlerTest { >>>> namespaceHandler.setTxMetaDataHelper(txenhancer); >>>> >>>> Properties props = new Properties(); >>>> - props.put("osgi.service.blueprint.namespace", >>>> "http://aries.apache.org/xmlns/transactions/v1.0.0";); >>>> + props.put("osgi.service.blueprint.namespace", new >>>> String[]{"http://aries.apache.org/xmlns/transactions/v1.0.0";, >>>> "http://aries.apache.org/xmlns/transactions/v1.1.0"}); >>>> ctx.registerService(NamespaceHandler.class.getName(), >>>> namespaceHandler, props); >>>> Parser p = new Parser(); >>>> >>>> >>>> Modified: >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/aries.xml >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/aries.xml?rev=982734&r1=982733&r2=982734&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/aries.xml >>>> (original) >>>> +++ >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/aries.xml >>>> Thu Aug 5 19:11:58 2010 >>>> @@ -19,6 +19,7 @@ >>>> --> >>>> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; >>>> >>>> xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.0.0";> >>>> + >>>> >>>> <bean id="top" class="org.apache.aries.transaction.TestBean"> >>>> <property name="txRequired"> >>>> >>>> Modified: >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries.xml >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries.xml?rev=982734&r1=982733&r2=982734&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries.xml >>>> (original) >>>> +++ >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries.xml >>>> Thu Aug 5 19:11:58 2010 >>>> @@ -18,7 +18,7 @@ >>>> >>>> --> >>>> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; >>>> - >>>> xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.0.0";> >>>> + >>>> xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.1.0";> >>>> <tx:transaction bean="top1" method="*" value="Required"/> >>>> <tx:transaction bean="down1" method="*" value="Never"/> >>>> >>>> >>>> Modified: >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries2.xml >>>> URL: >>>> >>>> http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries2.xml?rev=982734&r1=982733&r2=982734&view=diff >>>> >>>> >>>> ============================================================================== >>>> --- >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries2.xml >>>> (original) >>>> +++ >>>> >>>> incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries2.xml >>>> Thu Aug 5 19:11:58 2010 >>>> @@ -18,7 +18,7 @@ >>>> >>>> --> >>>> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; >>>> - >>>> xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.0.0";> >>>> + >>>> xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.1.0";> >>>> <tx:transaction bean="top2" method="*" value="NotSupported"/> >>>> <tx:transaction bean="down2" method="*" value="Required"/> >>>> >>>> >>>> >>>> >>> >>> >>> -- >>> Joe >>> >> > > > -- > Joe >
