aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r1630727 - in /aries/trunk/transaction/transaction-jdbc: ./ src/main/resources/ src/main/resources/META-INF/ src/main/resources/META-INF/services/ src/main/resources/META-INF/services/org/ src/main/resources/META-INF/services/org/apache/ sr...
Date Fri, 10 Oct 2014 08:38:24 GMT
Author: gnodet
Date: Fri Oct 10 08:38:24 2014
New Revision: 1630727

URL: http://svn.apache.org/r1630727
Log:
[ARIES-1259] Namespacehandler still identifies as 2.0 rather than 2.1

Added:
    aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/
    aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/services/
    aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/services/org/
    aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/services/org/apache/
    aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/services/org/apache/xbean/
    aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/services/org/apache/xbean/spring/
    aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/services/org/apache/xbean/spring/http/
    aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/services/org/apache/xbean/spring/http/aries.apache.org/
    aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/services/org/apache/xbean/spring/http/aries.apache.org/xmlns/
    aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/services/org/apache/xbean/spring/http/aries.apache.org/xmlns/transaction-jdbc/
    aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/services/org/apache/xbean/spring/http/aries.apache.org/xmlns/transaction-jdbc/2.0
    aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/spring.handlers
    aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/spring.schemas
    aries/trunk/transaction/transaction-jdbc/src/main/resources/org.apache.aries.transaction.jdbc-2.0.xsd
Modified:
    aries/trunk/transaction/transaction-jdbc/pom.xml

Modified: aries/trunk/transaction/transaction-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/pom.xml?rev=1630727&r1=1630726&r2=1630727&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/pom.xml (original)
+++ aries/trunk/transaction/transaction-jdbc/pom.xml Fri Oct 10 08:38:24 2014
@@ -135,7 +135,30 @@
                             <goal>mapping</goal>
                         </goals>
                         <configuration>
-                            <namespace>http://aries.apache.org/xmlns/transaction-jdbc/2.0</namespace>
+                            <namespace>http://aries.apache.org/xmlns/transaction-jdbc/2.1</namespace>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <id>concat</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <target name="concat">
+                                <concat destfile="${basedir}/target/xbean/META-INF/spring.handlers"
append="true">
+                                    <filelist dir="${basedir}/src/main/resources/META-INF"
files="spring.handlers"/>
+                                </concat>
+                                <concat destfile="${basedir}/target/xbean/META-INF/spring.schemas"
append="true">
+                                    <filelist dir="${basedir}/src/main/resources/META-INF"
files="spring.schemas"/>
+                                </concat>
+                            </target>
                         </configuration>
                     </execution>
                 </executions>

Added: aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/services/org/apache/xbean/spring/http/aries.apache.org/xmlns/transaction-jdbc/2.0
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/services/org/apache/xbean/spring/http/aries.apache.org/xmlns/transaction-jdbc/2.0?rev=1630727&view=auto
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/services/org/apache/xbean/spring/http/aries.apache.org/xmlns/transaction-jdbc/2.0
(added)
+++ aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/services/org/apache/xbean/spring/http/aries.apache.org/xmlns/transaction-jdbc/2.0
Fri Oct 10 08:38:24 2014
@@ -0,0 +1,6 @@
+# NOTE: this file is autogenerated by Apache XBean
+
+# beans
+recoverableDataSource = org.apache.aries.transaction.jdbc.RecoverableDataSource
+recoverableDataSource.initMethod = start
+

Added: aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/spring.handlers?rev=1630727&view=auto
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/spring.handlers (added)
+++ aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/spring.handlers Fri
Oct 10 08:38:24 2014
@@ -0,0 +1,3 @@
+#Generated by xbean-spring
+#Tue Dec 17 16:21:03 EST 2013
+http\://aries.apache.org/xmlns/transaction-jdbc/2.0=org.apache.xbean.spring.context.v2.XBeanNamespaceHandler

Added: aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/spring.schemas?rev=1630727&view=auto
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/spring.schemas (added)
+++ aries/trunk/transaction/transaction-jdbc/src/main/resources/META-INF/spring.schemas Fri
Oct 10 08:38:24 2014
@@ -0,0 +1,3 @@
+#Generated by xbean-spring
+#Tue Dec 17 16:21:03 EST 2013
+http\://aries.apache.org/xmlns/transaction-jdbc/2.0/org.apache.aries.transaction.jdbc.xsd=org.apache.aries.transaction.jdbc.xsd

Added: aries/trunk/transaction/transaction-jdbc/src/main/resources/org.apache.aries.transaction.jdbc-2.0.xsd
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/src/main/resources/org.apache.aries.transaction.jdbc-2.0.xsd?rev=1630727&view=auto
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/src/main/resources/org.apache.aries.transaction.jdbc-2.0.xsd
(added)
+++ aries/trunk/transaction/transaction-jdbc/src/main/resources/org.apache.aries.transaction.jdbc-2.0.xsd
Fri Oct 10 08:38:24 2014
@@ -0,0 +1,134 @@
+<?xml version='1.0'?>
+<!-- NOTE: this file is autogenerated by Apache XBean -->
+
+<xs:schema elementFormDefault='qualified'
+           targetNamespace='http://aries.apache.org/xmlns/transaction-jdbc/2.0'
+           xmlns:xs='http://www.w3.org/2001/XMLSchema'
+           xmlns:tns='http://aries.apache.org/xmlns/transaction-jdbc/2.0'>
+
+  <!-- element for type: org.apache.aries.transaction.jdbc.RecoverableDataSource -->
+  <xs:element name='recoverableDataSource'>
+    <xs:annotation>
+      <xs:documentation><![CDATA[
+        Defines a JDBC DataSource that will auto-enlist into existing XA transactions.
+The DataSource will also be registered with the Aries/Geronimo transaction
+manager in order to provide proper transaction recovery at startup.
+Other considerations such as connection pooling and error handling are
+completely ignored.
+      ]]></xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name='dataSource' minOccurs='0' maxOccurs='1'>
+          <xs:annotation>
+            <xs:documentation><![CDATA[
+              The XADataSource to wrap.
+            ]]></xs:documentation>
+          </xs:annotation>
+          <xs:complexType>
+            <xs:sequence minOccurs='0' maxOccurs='1'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name='transactionManager' minOccurs='0' maxOccurs='1'>
+          <xs:annotation>
+            <xs:documentation><![CDATA[
+              The XA TransactionManager to use to enlist the JDBC connections into.
+            ]]></xs:documentation>
+          </xs:annotation>
+          <xs:complexType>
+            <xs:sequence minOccurs='0' maxOccurs='1'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
+      </xs:sequence>
+      <xs:attribute name='allConnectionsEquals' type='xs:boolean'/>
+      <xs:attribute name='connectionMaxIdleMinutes' type='xs:integer'/>
+      <xs:attribute name='connectionMaxWaitMilliseconds' type='xs:integer'/>
+      <xs:attribute name='dataSource' type='xs:string'>
+        <xs:annotation>
+          <xs:documentation><![CDATA[
+            The XADataSource to wrap.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name='exceptionSorter' type='xs:string'>
+        <xs:annotation>
+          <xs:documentation><![CDATA[
+            Specify which SQL exceptions are fatal.
+Can be all, none, known or custom(xx,yy...).
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name='name' type='xs:string'>
+        <xs:annotation>
+          <xs:documentation><![CDATA[
+            The unique name for this managed XAResource. This name will be used
+by the transaction manager to recover transactions.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name='partitionStrategy' type='xs:string'>
+        <xs:annotation>
+          <xs:documentation><![CDATA[
+            Pool partition strategy.
+Can be none, by-connector-properties or by-subject (defaults to none).
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name='password' type='xs:string'>
+        <xs:annotation>
+          <xs:documentation><![CDATA[
+            The password credential used to establish the connection.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name='poolMaxSize' type='xs:integer'>
+        <xs:annotation>
+          <xs:documentation><![CDATA[
+            Maximum pool size (defaults to 10).
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name='poolMinSize' type='xs:integer'>
+        <xs:annotation>
+          <xs:documentation><![CDATA[
+            Minimum pool size (defaults to 0).
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name='pooling' type='xs:boolean'>
+        <xs:annotation>
+          <xs:documentation><![CDATA[
+            If pooling is enabled (defaults to true).
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name='transaction' type='xs:string'>
+        <xs:annotation>
+          <xs:documentation><![CDATA[
+            Transaction support.
+Can be none, local or xa (defaults to xa).
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name='transactionManager' type='xs:string'>
+        <xs:annotation>
+          <xs:documentation><![CDATA[
+            The XA TransactionManager to use to enlist the JDBC connections into.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name='username' type='xs:string'>
+        <xs:annotation>
+          <xs:documentation><![CDATA[
+            The user name used to establish the connection.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name='id' type='xs:ID'/>
+      <xs:anyAttribute namespace='##other' processContents='lax'/>
+    </xs:complexType>
+  </xs:element>
+
+
+</xs:schema>



Mime
View raw message