[jboss-cvs] JBossAS SVN: r108032 - in projects/jboss-jca/trunk/common/src: main/java/org/jboss/jca/common/metadata/resourceadapter and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 8 01:14:24 EDT 2010
Author: maeste
Date: 2010-09-08 01:14:23 -0400 (Wed, 08 Sep 2010)
New Revision: 108032
Added:
projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/asapxcess-jb3.2-ra.xml
Removed:
projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/asapxcess-jb3.2-ds.xml
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/AdminObject.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ConnectionDefinition.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java
Log:
JBJCA-401 few bug fixing
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/AdminObject.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/AdminObject.java 2010-09-08 04:14:12 UTC (rev 108031)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/AdminObject.java 2010-09-08 05:14:23 UTC (rev 108032)
@@ -169,10 +169,10 @@
*/
CLASS_NAME("class-name"),
- /** class-name attribute
+ /** pool-name attribute
*
*/
- POOL_NAME("class-name"),
+ POOL_NAME("pool-name"),
/** enabled attribute
*
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ConnectionDefinition.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ConnectionDefinition.java 2010-09-08 04:14:12 UTC (rev 108031)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ConnectionDefinition.java 2010-09-08 05:14:23 UTC (rev 108032)
@@ -229,10 +229,10 @@
*/
CLASS_NAME("class-name"),
- /** class-name attribute
+ /** pool-name attribute
*
*/
- POOL_NAME("class-name"),
+ POOL_NAME("pool-name"),
/** enabled attribute
*
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java 2010-09-08 04:14:12 UTC (rev 108031)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java 2010-09-08 05:14:23 UTC (rev 108032)
@@ -260,11 +260,12 @@
break;
}
case USEJAVACONTEXT : {
- useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), true);
+ useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), false);
break;
}
default :
- break;
+ throw new ParserException("Unexpected attribute:" + attribute.getLocalName() + "at " +
+ reader.getLocalName());
}
}
@@ -465,7 +466,7 @@
break;
}
case USEJAVACONTEXT : {
- useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), true);
+ useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), false);
break;
}
case POOL_NAME : {
@@ -473,7 +474,8 @@
break;
}
default :
- break;
+ throw new ParserException("Unexpected attribute:" + attribute.getLocalName() + "at " +
+ reader.getLocalName());
}
}
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java 2010-09-08 04:14:12 UTC (rev 108031)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java 2010-09-08 05:14:23 UTC (rev 108032)
@@ -53,7 +53,7 @@
//given
File directory = new File(Thread.currentThread().getContextClassLoader().getResource("resource-adapter").toURI());
- for (File xmlFile : directory.listFiles(new FileSuffixFilter("-ds.xml")))
+ for (File xmlFile : directory.listFiles(new FileSuffixFilter("-ra.xml")))
{
System.out.println(xmlFile.getName());
try
Deleted: projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/asapxcess-jb3.2-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/asapxcess-jb3.2-ds.xml 2010-09-08 04:14:12 UTC (rev 108031)
+++ projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/asapxcess-jb3.2-ds.xml 2010-09-08 05:14:23 UTC (rev 108032)
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- configuration for aSAPXcess SAP adapter for jboss 3.2 -->
-<!-- ==================================================================== -->
-<!-- aSAPXcess adapter configuration for SAP R3 -->
-<!-- Contact: aif_support at asapsolutions.com -->
-<!-- -->
-<!-- ==================================================================== -->
-<resource-adapters xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../main/resources/schema/resource-adapter_1_0.xsd">
- <resource-adapter>
- <archive>token</archive>
- <transaction-support>NoTransaction</transaction-support>
- <connection-definitions>
- <connection-definition class-name="token" enabled="true" jndi-name="aSAPXcess" pool-name="aSAPXcess">
- <config-property name="LogConfigFile">ASAP_SAP_1_0.xml</config-property>
- <config-property name="RootLogContext">ASAP_SAP_1_0</config-property>
- <config-property name="LogLevel">WARN</config-property>
- <config-property name="MessageBundleBase">ASAP_SAP_1_0</config-property>
- <config-property name="LanguageCode">en</config-property>
- <config-property name="CountryCode">US</config-property>
- <config-property name="UserName"></config-property>
- <config-property name="Password"></config-property>
- <config-property name="ClientNumber"></config-property>
- <config-property name="ServerName"></config-property>
- <config-property name="SystemNumber"></config-property>
- <config-property name="GatewayServerName"></config-property>
- <config-property name="GatewayServiceNumber"></config-property>
- <config-property name="SystemName"></config-property>
- <config-property name="MessageServerName"></config-property>
- <config-property name="GroupName"></config-property>
- <config-property name="ConnectionURL"></config-property>
- <pool>
- <min-pool-size>0</min-pool-size>
- <max-pool-size>64</max-pool-size>
- </pool>
- <security>
- <user-name>aaa</user-name>
- <password>bbb</password>
- </security>
- <timeout>
- <blocking-timeout-millis>5000</blocking-timeout-millis>
- <idle-timeout-minutes>15</idle-timeout-minutes>
- </timeout>
- </connection-definition>
- </connection-definitions>
- <admin-objects>
- <admin-object class-name="token" enabled="true" jndi-name="token" use-java-context="false">
- <config-property name="token" />
- </admin-object>
- </admin-objects>
- </resource-adapter>
-</resource-adapters>
\ No newline at end of file
Copied: projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/asapxcess-jb3.2-ra.xml (from rev 108006, projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/asapxcess-jb3.2-ds.xml)
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/asapxcess-jb3.2-ra.xml (rev 0)
+++ projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/asapxcess-jb3.2-ra.xml 2010-09-08 05:14:23 UTC (rev 108032)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- configuration for aSAPXcess SAP adapter for jboss 3.2 -->
+<!-- ==================================================================== -->
+<!-- aSAPXcess adapter configuration for SAP R3 -->
+<!-- Contact: aif_support at asapsolutions.com -->
+<!-- -->
+<!-- ==================================================================== -->
+<resource-adapters xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../main/resources/schema/resource-adapter_1_0.xsd">
+ <resource-adapter>
+ <archive>token</archive>
+ <transaction-support>NoTransaction</transaction-support>
+ <connection-definitions>
+ <connection-definition class-name="token" enabled="true" jndi-name="aSAPXcess" pool-name="aSAPXcess">
+ <config-property name="LogConfigFile">ASAP_SAP_1_0.xml</config-property>
+ <config-property name="RootLogContext">ASAP_SAP_1_0</config-property>
+ <config-property name="LogLevel">WARN</config-property>
+ <config-property name="MessageBundleBase">ASAP_SAP_1_0</config-property>
+ <config-property name="LanguageCode">en</config-property>
+ <config-property name="CountryCode">US</config-property>
+ <config-property name="UserName"></config-property>
+ <config-property name="Password"></config-property>
+ <config-property name="ClientNumber"></config-property>
+ <config-property name="ServerName"></config-property>
+ <config-property name="SystemNumber"></config-property>
+ <config-property name="GatewayServerName"></config-property>
+ <config-property name="GatewayServiceNumber"></config-property>
+ <config-property name="SystemName"></config-property>
+ <config-property name="MessageServerName"></config-property>
+ <config-property name="GroupName"></config-property>
+ <config-property name="ConnectionURL"></config-property>
+ <pool>
+ <min-pool-size>0</min-pool-size>
+ <max-pool-size>64</max-pool-size>
+ </pool>
+ <security>
+ <user-name>aaa</user-name>
+ <password>bbb</password>
+ </security>
+ <timeout>
+ <blocking-timeout-millis>5000</blocking-timeout-millis>
+ <idle-timeout-minutes>15</idle-timeout-minutes>
+ </timeout>
+ </connection-definition>
+ </connection-definitions>
+ <admin-objects>
+ <admin-object class-name="token" enabled="true" jndi-name="token" use-java-context="false">
+ <config-property name="token" />
+ </admin-object>
+ </admin-objects>
+ </resource-adapter>
+</resource-adapters>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list