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/08/14 20:21:55 UTC

svn commit: r1695953 - in /aries/trunk/transaction/transaction-testbundle/src/main: java/org/apache/aries/transaction/test/impl/Connector.java resources/OSGI-INF/blueprint/config.xml

Author: cschneider
Date: Fri Aug 14 18:21:55 2015
New Revision: 1695953

URL: http://svn.apache.org/r1695953
Log:
Remove unused DataSource

Modified:
    aries/trunk/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/Connector.java
    aries/trunk/transaction/transaction-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml

Modified: aries/trunk/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/Connector.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/Connector.java?rev=1695953&r1=1695952&r2=1695953&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/Connector.java (original)
+++ aries/trunk/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/Connector.java Fri Aug 14 18:21:55 2015
@@ -26,16 +26,12 @@ import javax.sql.DataSource;
 
 public class Connector {
     private DataSource xads;
-    private DataSource ds;
     private String user;
     private String password;
 
     public void setXads(DataSource xads) {
         this.xads = xads;
     }
-    public void setDs(DataSource ds) {
-        this.ds = ds;
-    }
     public void setUser(String user) {
         this.user = user;
     }

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=1695953&r1=1695952&r2=1695953&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 Fri Aug 14 18:21:55 2015
@@ -27,7 +27,6 @@
 
    <bean id="connector" class="org.apache.aries.transaction.test.impl.Connector" init-method="initialize">
        <property name="xads" ref="enlistingDataSource"/>
-       <property name="ds" ref="dataSource"/>
        <property name="user" value="user"/>
        <property name="password" value="password"/>
    </bean>
@@ -136,8 +135,6 @@
             <entry key="tranAttribute" value="MandatoryJtaAnnotated"/>
         </service-properties>
     </service>
-   
-   <reference id="enlistingDataSource" interface="javax.sql.DataSource" filter="(osgi.jndi.service.name=jdbc/xads)"/>
-   
-   <reference id="dataSource" interface="javax.sql.DataSource" filter="(osgi.jndi.service.name=jdbc/nonxads)"/>
+    
+    <reference id="enlistingDataSource" interface="javax.sql.DataSource" filter="(osgi.jndi.service.name=jdbc/xads)"/>
 </blueprint>