You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2015/09/21 13:54:38 UTC
svn commit: r1704272 - in /aries/trunk/transaction:
transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/
transaction-blueprint/src/main/resources/OSGI-INF/blueprint/
transaction-blueprint/src/main/resources/org/apache/aries/transac...
Author: cschneider
Date: Mon Sep 21 11:54:29 2015
New Revision: 1704272
URL: http://svn.apache.org/viewvc?rev=1704272&view=rev
Log:
[ARIES-1413] Switch to 2.0.0 namespace
Added:
aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv20.xsd
- copied, changed from r1704205, aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/enable-annotations.xml
Removed:
aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv10.xsd
aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv11.xsd
aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv12.xsd
Modified:
aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java
aries/trunk/transaction/transaction-blueprint/src/main/resources/OSGI-INF/blueprint/transaction.xml
aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java
aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/enable-annotations.xml
aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/enable-annotations2.xml
aries/trunk/transaction/transaction-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml
Modified: aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java?rev=1704272&r1=1704271&r2=1704272&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java (original)
+++ aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java Mon Sep 21 11:54:29 2015
@@ -39,6 +39,7 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
public class TxNamespaceHandler implements NamespaceHandler {
+ public static final String TX_NAMESPACE_URI = "http://aries.apache.org/xmlns/transactions/v2.0.0";
public static final String ANNOTATION_PARSER_BEAN_NAME = ".org_apache_aries_transaction_annotations";
private static final Logger LOGGER = LoggerFactory.getLogger(TxNamespaceHandler.class);
private TransactionManager tm;
@@ -48,9 +49,7 @@ public class TxNamespaceHandler implemen
public TxNamespaceHandler() {
schemaMap = new HashMap<String, String>();
- schemaMap.put("http://aries.apache.org/xmlns/transactions/v1.0.0", "transactionv10.xsd");
- schemaMap.put("http://aries.apache.org/xmlns/transactions/v1.1.0", "transactionv11.xsd");
- schemaMap.put("http://aries.apache.org/xmlns/transactions/v1.2.0", "transactionv12.xsd");
+ schemaMap.put(TX_NAMESPACE_URI, "transactionv20.xsd");
}
private void parseElement(Element elt, ComponentMetadata cm, ParserContext pc)
@@ -58,7 +57,7 @@ public class TxNamespaceHandler implemen
LOGGER.debug("parser asked to parse element {} ", elt.getNodeName());
ComponentDefinitionRegistry cdr = pc.getComponentDefinitionRegistry();
- if ("enable-annotations".equals(elt.getLocalName())) {
+ if ("enable".equals(elt.getLocalName())) {
Node n = elt.getChildNodes().item(0);
if (n == null || Boolean.parseBoolean(n.getNodeValue())) {
//We need to register a bean processor to add annotation-based config
Modified: aries/trunk/transaction/transaction-blueprint/src/main/resources/OSGI-INF/blueprint/transaction.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/src/main/resources/OSGI-INF/blueprint/transaction.xml?rev=1704272&r1=1704271&r2=1704272&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/src/main/resources/OSGI-INF/blueprint/transaction.xml (original)
+++ aries/trunk/transaction/transaction-blueprint/src/main/resources/OSGI-INF/blueprint/transaction.xml Mon Sep 21 11:54:29 2015
@@ -24,17 +24,7 @@
<service interface="org.apache.aries.blueprint.NamespaceHandler" ref="nsHandler">
<service-properties>
- <entry key="osgi.service.blueprint.namespace" value="http://aries.apache.org/xmlns/transactions/v1.0.0"/>
- </service-properties>
- </service>
- <service interface="org.apache.aries.blueprint.NamespaceHandler" ref="nsHandler">
- <service-properties>
- <entry key="osgi.service.blueprint.namespace" value="http://aries.apache.org/xmlns/transactions/v1.1.0"/>
- </service-properties>
- </service>
- <service interface="org.apache.aries.blueprint.NamespaceHandler" ref="nsHandler">
- <service-properties>
- <entry key="osgi.service.blueprint.namespace" value="http://aries.apache.org/xmlns/transactions/v1.2.0"/>
+ <entry key="osgi.service.blueprint.namespace" value="http://aries.apache.org/xmlns/transactions/v2.0.0"/>
</service-properties>
</service>
Copied: aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv20.xsd (from r1704205, aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/enable-annotations.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv20.xsd?p2=aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv20.xsd&p1=aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/enable-annotations.xml&r1=1704205&r2=1704272&rev=1704272&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/enable-annotations.xml (original)
+++ aries/trunk/transaction/transaction-blueprint/src/main/resources/org/apache/aries/transaction/parsing/transactionv20.xsd Mon Sep 21 11:54:29 2015
@@ -17,10 +17,19 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.2.0">
+<xsd:schema xmlns="http://aries.apache.org/xmlns/transactions/v2.0.0"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://aries.apache.org/xmlns/transactions/v2.0.0"
+ elementFormDefault="qualified" attributeFormDefault="unqualified"
+ version="2.0.0">
- <tx:enable-annotations/>
-
- <bean id="top" class="org.apache.aries.transaction.pojo.JtaAnnotatedPojo"/>
-</blueprint>
\ No newline at end of file
+ <xsd:element name="enable" type="xsd:boolean" default="true">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The <enable-annotations> element is used to enable annotation scanning for @Transactional annotations
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+</xsd:schema>
Modified: aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java?rev=1704272&r1=1704271&r2=1704272&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java (original)
+++ aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java Mon Sep 21 11:54:29 2015
@@ -57,11 +57,7 @@ public class BaseNameSpaceHandlerSetup {
namespaceHandler.setTm(tm);
namespaceHandler.setCoordinator(coordinator);
- String[] namespaces = new String[]
- {"http://aries.apache.org/xmlns/transactions/v1.0.0",
- "http://aries.apache.org/xmlns/transactions/v1.1.0",
- "http://aries.apache.org/xmlns/transactions/v1.2.0"
- };
+ String[] namespaces = new String[] { "http://aries.apache.org/xmlns/transactions/v2.0.0" };
nhri = new DummyNamespaceHandlerRegistry();
nhri.addNamespaceHandlers(namespaces, namespaceHandler);
}
Modified: aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/enable-annotations.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/enable-annotations.xml?rev=1704272&r1=1704271&r2=1704272&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/enable-annotations.xml (original)
+++ aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/enable-annotations.xml Mon Sep 21 11:54:29 2015
@@ -18,9 +18,9 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.2.0">
+ xmlns:tx="http://aries.apache.org/xmlns/transactions/v2.0.0">
- <tx:enable-annotations/>
+ <tx:enable/>
<bean id="top" class="org.apache.aries.transaction.pojo.JtaAnnotatedPojo"/>
</blueprint>
\ No newline at end of file
Modified: aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/enable-annotations2.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/enable-annotations2.xml?rev=1704272&r1=1704271&r2=1704272&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/enable-annotations2.xml (original)
+++ aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/enable-annotations2.xml Mon Sep 21 11:54:29 2015
@@ -18,9 +18,9 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.2.0">
+ xmlns:tx="http://aries.apache.org/xmlns/transactions/v2.0.0">
- <tx:enable-annotations>false</tx:enable-annotations>
+ <tx:enable>false</tx:enable>
<bean id="top" class="org.apache.aries.transaction.TestBean"/>
</blueprint>
\ No newline at end of file
Modified: aries/trunk/transaction/transaction-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml?rev=1704272&r1=1704271&r2=1704272&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml (original)
+++ aries/trunk/transaction/transaction-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml Mon Sep 21 11:54:29 2015
@@ -6,10 +6,10 @@
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. -->
<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" xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.2.0"
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:tx="http://aries.apache.org/xmlns/transactions/v2.0.0"
default-activation="lazy">
- <tx:enable-annotations />
+ <tx:enable />
<reference id="enlistingDataSource" interface="javax.sql.DataSource" filter="(osgi.jndi.service.name=jdbc/xads)" />