cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r699546 - in /cxf/branches/2.0.x-fixes: ./ integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ integration/jca/src/main/java/org/apache/cxf/jca/cxf/ integration/jca/src/main/rar/META-INF/ integration/jca/src/test/java/org...
Date Sat, 27 Sep 2008 02:52:05 GMT
Author: ningjiang
Date: Fri Sep 26 19:52:04 2008
New Revision: 699546

URL: http://svn.apache.org/viewvc?rev=699546&view=rev
Log:
Merged revisions 699543 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r699543 | ningjiang | 2008-09-27 10:26:04 +0800 (Sat, 27 Sep 2008) | 9 lines
  
  Merged revisions 699541 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r699541 | ningjiang | 2008-09-27 10:05:04 +0800 (Sat, 27 Sep 2008) | 1 line
    
    CAMEL-1826 Applied patch with thanks to William
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
    cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
    cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
    cxf/branches/2.0.x-fixes/integration/jca/src/main/rar/META-INF/ra.xml
    cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java?rev=699546&r1=699545&r2=699546&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
(original)
+++ cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
Fri Sep 26 19:52:04 2008
@@ -37,8 +37,12 @@
 
     public static final String DEFAULT_VALUE_STRING = "DEFAULT";
     public static final String LOG_LEVEL = "log.level";
+    
+    @Deprecated
     public static final String CONFIG_DOMAIN = "cxf";
+    @Deprecated
     public static final String CONFIG_SCOPE = "j2ee";
+    
     public static final String DEFAULT_MONITOR_POLL_INTERVAL = "120";    
     public static final String EJB_SERVICE_PROPERTIES_URL = "ejb.service.properties.url";
     public static final String MONITOR_EJB_SERVICE_PROPERTIES = "monitor.ejb.service.properties";

Modified: cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java?rev=699546&r1=699545&r2=699546&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
(original)
+++ cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
Fri Sep 26 19:52:04 2008
@@ -62,16 +62,6 @@
     public JCABusFactory(ManagedConnectionFactoryImpl aMcf) {
         this.mcf = aMcf;
     }
-
-    protected String[] getBusArgs() throws ResourceException {
-        //There is only setting up the BUSID        
-        String busId = mcf.getConfigurationScope();
-
-        String busArgs[] = new String[2];
-        busArgs[0] = "-BUSid";
-        busArgs[1] = busId;
-        return busArgs;
-    }   
     
     protected synchronized void init() throws ResourceException {
         

Modified: cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java?rev=699546&r1=699545&r2=699546&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
(original)
+++ cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
Fri Sep 26 19:52:04 2008
@@ -61,14 +61,16 @@
         setProperty(LOG_LEVEL, logLevel);
     }
 
+    @Deprecated
     public void setConfigurationDomain(String name) {
         setProperty(CONFIG_DOMAIN, name);
     }
 
+    @Deprecated
     public void setConfigurationScope(String name) {
         setProperty(CONFIG_SCOPE, name);
     }
-   
+    
     public void setEJBServicePropertiesURL(String name) {
         setProperty(EJB_SERVICE_PROPERTIES_URL, name);
     }
@@ -85,10 +87,12 @@
         return getPluginProps().getProperty(LOG_LEVEL);
     }
     
+    @Deprecated
     public String getConfigurationDomain() {
         return getPluginProps().getProperty(CONFIG_DOMAIN, CONFIG_DOMAIN);
     }
 
+    @Deprecated
     public String getConfigurationScope() {
         return getPluginProps().getProperty(CONFIG_SCOPE, CONFIG_SCOPE);
     }

Modified: cxf/branches/2.0.x-fixes/integration/jca/src/main/rar/META-INF/ra.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/integration/jca/src/main/rar/META-INF/ra.xml?rev=699546&r1=699545&r2=699546&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/integration/jca/src/main/rar/META-INF/ra.xml (original)
+++ cxf/branches/2.0.x-fixes/integration/jca/src/main/rar/META-INF/ra.xml Fri Sep 26 19:52:04
2008
@@ -39,21 +39,14 @@
       <connection-definition>
         <managedconnectionfactory-class>org.apache.cxf.jca.cxf.AssociatedManagedConnectionFactoryImpl</managedconnectionfactory-class>
         <config-property>
+          <!-- 
+              LogLevel deprecated.  Please use log management provided by application server.

+          -->
           <config-property-name>LogLevel</config-property-name> 
           <config-property-type>java.lang.String</config-property-type> 
           <config-property-value>INFO</config-property-value> 
         </config-property> 
         <config-property>
-          <config-property-name>ConfigurationDomain</config-property-name> 
-          <config-property-type>java.lang.String</config-property-type> 
-          <config-property-value>DEFAULT</config-property-value> 
-        </config-property>
-        <config-property>
-          <config-property-name>ConfigurationScope</config-property-name> 
-          <config-property-type>java.lang.String</config-property-type> 
-          <config-property-value>DEFAULT</config-property-value> 
-        </config-property>
-        <config-property>
           <config-property-name>EJBServicePropertiesURL</config-property-name>

           <config-property-type>java.lang.String</config-property-type> 
           <config-property-value>file:CXF_HOME/etc/ejb_servants.properties</config-property-value>

@@ -88,3 +81,4 @@
   </resourceadapter>
 </connector>
 
+

Modified: cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java?rev=699546&r1=699545&r2=699546&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
(original)
+++ cxf/branches/2.0.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
Fri Sep 26 19:52:04 2008
@@ -43,22 +43,6 @@
         assertSame("Checking appserverClassLoader.", loader, bf.getAppserverClassLoader());
     } 
 
-     
-    @Test
-    public void testModifiedBusArguments() throws Exception {
-        ManagedConnectionFactoryImpl mcf = new ManagedConnectionFactoryImpl();
-        mcf.setConfigurationScope("a.b.c");
-
-        JCABusFactory jcaBusFactory = new JCABusFactory(mcf);
-        String[] args = jcaBusFactory.getBusArgs();
-
-        assertTrue("Wrong arguments length: " + args.length, args.length == 2);
-        assertEquals("Wrong Argument. ", args[0], "-BUSid");
-        assertEquals("Wrong Argument. ", args[1],  "a.b.c");        
-    }
-
-
-
     @Test
     public void testLoadNonexistentProperties() throws Exception {
         ManagedConnectionFactoryImpl mcf = new ManagedConnectionFactoryImpl();



Mime
View raw message