[jboss-cvs] JBossAS SVN: r103388 - in projects/profileservice/trunk/domain: .settings and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 1 02:00:52 EDT 2010
Author: scott.stark at jboss.org
Date: 2010-04-01 02:00:52 -0400 (Thu, 01 Apr 2010)
New Revision: 103388
Added:
projects/profileservice/trunk/domain/gf-domain.xml
projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/resources/TransactionIsolation.java
Modified:
projects/profileservice/trunk/domain/.settings/org.eclipse.jdt.core.prefs
projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/AbstractDomainMetaData.java
projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/resources/JdbcResource.java
projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/spi/DomainMetaData.java
projects/profileservice/trunk/domain/src/test/java/org/jboss/test/profileservice/domain/parsing/test/DomainUnitTestCase.java
projects/profileservice/trunk/domain/src/test/resources/parsing/domain.xml
Log:
Move jdbc-resources to separate namespace and expand test
Modified: projects/profileservice/trunk/domain/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/profileservice/trunk/domain/.settings/org.eclipse.jdt.core.prefs 2010-04-01 05:57:45 UTC (rev 103387)
+++ projects/profileservice/trunk/domain/.settings/org.eclipse.jdt.core.prefs 2010-04-01 06:00:52 UTC (rev 103388)
@@ -1,5 +1,6 @@
-#Thu Aug 13 15:18:50 CEST 2009
+#Wed Mar 31 10:53:18 PDT 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6
Added: projects/profileservice/trunk/domain/gf-domain.xml
===================================================================
--- projects/profileservice/trunk/domain/gf-domain.xml (rev 0)
+++ projects/profileservice/trunk/domain/gf-domain.xml 2010-04-01 06:00:52 UTC (rev 103388)
@@ -0,0 +1,208 @@
+ 1 <?xml version="1.0" encoding="UTF-8"?>
+2 <!--
+3 Copyright 2004-2005 Sun Microsystems, Inc. All rights reserved.
+4 Use is subject to license terms.
+5 -->
+6 <!-- Generated from default-domain.xml.template -->
+7 <!-- Avoid manual edits of this file. "Run asadmin verify-domain-xml" otherwise.-->
+8
+9 <domain application-root="${com.sun.aas.instanceRoot}/applications" log-root="${com.sun.aas.instanceRoot}/logs">
+10 <applications>
+11 <web-module name="adminapp" context-root="/web1" location="${com.sun.aas.installRoot}/lib/install/applications/adminapp/adminapp_war" object-type="system-admin" enabled="true" directory-deployed="true" availability-enabled="false">
+12 <!-- System Web Module - DO NOT DELETE! -->
+13 </web-module>
+14 <web-module name="admingui" context-root="" location="${com.sun.aas.installRoot}/lib/install/applications/admingui/adminGUI_war" object-type="system-admin" enabled="true" directory-deployed="true" availability-enabled="false">
+15 <!-- System Web Module - DO NOT DELETE! -->
+16 </web-module>
+17 <web-module name="WSTXServices" context-root="/__wstx-services" location="${com.sun.aas.installRoot}/lib/install/applications/wstx-services" object-type="system-all" enabled="true" directory-deployed="true" availability-enabled="false"/>
+18 <lifecycle-module class-name="com.sun.jbi.framework.sun.SunASJBIBootstrap" classpath="${com.sun.aas.installRoot}/jbi/lib/jbi_framework.jar" enabled="true" is-failure-fatal="false" name="JBIFramework" object-type="system-all">
+19 <property name="com.sun.jbi.home" value="${com.sun.aas.installRoot}/jbi"/>
+20 <property name="com.sun.jbi.defaultLogLevel" value="INFO"/>
+21 </lifecycle-module>
+22 <lifecycle-module class-name="com.sun.xml.ws.transport.tcp.server.glassfish.WSTCPLifeCycleModule" classpath="${com.sun.aas.installRoot}/lib/webservices-rt.jar" enabled="true" is-failure-fatal="false" object-type="system-all" name="WSTCPConnectorLCModule"/>
+23 </applications>
+24 <resources>
+25 <jdbc-resource jndi-name="jdbc/__TimerPool" pool-name="__TimerPool" object-type="system-admin" enabled="true"/>
+26 <jdbc-resource jndi-name="jdbc/__CallFlowPool" pool-name="__CallFlowPool" object-type="system-all" enabled="true"/>
+27 <jdbc-resource jndi-name="jdbc/__default" pool-name="DerbyPool" object-type="user" enabled="true"/>
+28
+29 <jdbc-connection-pool connection-validation-method="auto-commit" datasource-classname="org.apache.derby.jdbc.EmbeddedXADataSource" fail-all-connections="false" idle-timeout-in-seconds="300" is-connection-validation-required="false" is-isolation-level-guaranteed="true" max-pool-size="32" max-wait-time-in-millis="60000" res-type="javax.sql.XADataSource" name="__CallFlowPool" pool-resize-quantity="2" steady-pool-size="8" non-transactional-connections="false" allow-non-component-callers="false" validate-atmost-once-period-in-seconds="0" connection-leak-timeout-in-seconds="0" connection-leak-reclaim="false" connection-creation-retry-attempts="0" connection-creation-retry-interval-in-seconds="10" statement-timeout-in-seconds="-1" lazy-connection-enlistment="false" lazy-connection-association="false" associate-with-thread="false" match-connections="false" max-connection-usage-count="0" wrap-jdbc-objects="false">
+30 <property name="databaseName" value="${com.sun.aas.instanceRoot}/lib/databases/sun-callflow"/>
+31 <property name="connectionAttributes" value=";create=true"/>
+32 </jdbc-connection-pool>
+33
+34 <jdbc-connection-pool connection-validation-method="auto-commit" datasource-classname="org.apache.derby.jdbc.EmbeddedXADataSource" fail-all-connections="false" idle-timeout-in-seconds="300" is-connection-validation-required="false" is-isolation-level-guaranteed="true" max-pool-size="32" max-wait-time-in-millis="60000" res-type="javax.sql.XADataSource" name="__TimerPool" pool-resize-quantity="2" steady-pool-size="8" non-transactional-connections="false" allow-non-component-callers="false" validate-atmost-once-period-in-seconds="0" connection-leak-timeout-in-seconds="0" connection-leak-reclaim="false" connection-creation-retry-attempts="0" connection-creation-retry-interval-in-seconds="10" statement-timeout-in-seconds="-1" lazy-connection-enlistment="false" lazy-connection-association="false" associate-with-thread="false" match-connections="false" max-connection-usage-count="0" wrap-jdbc-objects="false">
+35 <property name="databaseName" value="${com.sun.aas.instanceRoot}/lib/databases/ejbtimer"/>
+36 </jdbc-connection-pool>
+37 <jdbc-connection-pool connection-validation-method="auto-commit" datasource-classname="org.apache.derby.jdbc.ClientDataSource" fail-all-connections="false" idle-timeout-in-seconds="300" is-connection-validation-required="false" is-isolation-level-guaranteed="false" max-pool-size="32" max-wait-time-in-millis="60000" name="DerbyPool" pool-resize-quantity="2" res-type="javax.sql.DataSource" steady-pool-size="8" non-transactional-connections="false" allow-non-component-callers="false" validate-atmost-once-period-in-seconds="0" connection-leak-timeout-in-seconds="0" connection-leak-reclaim="false" connection-creation-retry-attempts="0" connection-creation-retry-interval-in-seconds="10" statement-timeout-in-seconds="-1" lazy-connection-enlistment="false" lazy-connection-association="false" associate-with-thread="false" match-connections="false" max-connection-usage-count="0" wrap-jdbc-objects="false">
+38 <property name="PortNumber" value="1527"/>
+39 <property name="Password" value="APP"/>
+40 <property name="User" value="APP"/>
+41 <property name="serverName" value="localhost"/>
+42 <property name="DatabaseName" value="sun-appserv-samples"/>
+43 <property name="connectionAttributes" value=";create=true"/>
+44 </jdbc-connection-pool>
+45 </resources>
+46 <configs>
+47 <config name="server-config" dynamic-reconfiguration-enabled="true">
+48 <http-service>
+49 <access-log format="%client.name% %auth-user-name% %datetime% %request% %status% %response.length%" rotation-enabled="true" rotation-interval-in-minutes="15" rotation-policy="time" rotation-suffix="yyyy-MM-dd"/>
+50 <http-listener id="http-listener-1" address="0.0.0.0" port="8080" acceptor-threads="1" security-enabled="false" default-virtual-server="server" server-name="" xpowered-by="true" enabled="true" family="inet" blocking-enabled="false">
+51 <property name="proxiedProtocols" value="ws/tcp"/>
+52 </http-listener>
+53 <http-listener id="http-listener-2" address="0.0.0.0" port="8181" acceptor-threads="1" security-enabled="true" default-virtual-server="server" server-name="" xpowered-by="true" enabled="true" family="inet" blocking-enabled="false"/>
+54 <http-listener id="admin-listener" address="0.0.0.0" port="4848" acceptor-threads="1" security-enabled="false" default-virtual-server="__asadmin" server-name="" xpowered-by="true" enabled="true" family="inet" blocking-enabled="false"/>
+55 <virtual-server id="server" http-listeners="http-listener-1,http-listener-2" hosts="${com.sun.aas.hostName}" state="on" log-file="${com.sun.aas.instanceRoot}/logs/server.log">
+56 <property name="docroot" value="${com.sun.aas.instanceRoot}/docroot"/>
+57 <property name="accesslog" value="${com.sun.aas.instanceRoot}/logs/access"/>
+58 <property name="sso-enabled" value="false"/>
+59 </virtual-server>
+60 <virtual-server id="__asadmin" http-listeners="admin-listener" hosts="${com.sun.aas.hostName}" state="on" log-file="${com.sun.aas.instanceRoot}/logs/server.log">
+61 <property name="docroot" value="${com.sun.aas.instanceRoot}/docroot"/>
+62 <property name="accesslog" value="${com.sun.aas.instanceRoot}/logs/access"/>
+63 <property name="sso-enabled" value="false"/>
+64 </virtual-server>
+65 <request-processing header-buffer-length-in-bytes="8192" initial-thread-count="2" request-timeout-in-seconds="30" thread-count="20" thread-increment="1"/>
+66 <keep-alive max-connections="250" thread-count="1" timeout-in-seconds="30"/>
+67 <connection-pool max-pending-count="4096" queue-size-in-bytes="4096" receive-buffer-size-in-bytes="4096" send-buffer-size-in-bytes="8192"/>
+68 <http-protocol default-response-type="text/plain; charset=iso-8859-1" dns-lookup-enabled="false" forced-response-type="text/plain; charset=iso-8859-1" ssl-enabled="true" version="HTTP/1.1"/>
+69 <http-file-cache globally-enabled="false" file-caching-enabled="false" max-age-in-seconds="30" medium-file-size-limit-in-bytes="537600" medium-file-space-in-bytes="10485760" small-file-size-limit-in-bytes="2048" small-file-space-in-bytes="1048576" max-files-count="1024" file-transmission-enabled="false" hash-init-size="0"/>
+70 <property name="accessLoggingEnabled" value="false"/>
+71 </http-service>
+72 <iiop-service client-authentication-required="false">
+73 <orb use-thread-pool-ids="thread-pool-1" message-fragment-size="1024" max-connections="1024"/>
+74
+75 <iiop-listener id="orb-listener-1" address="0.0.0.0" port="3700" enabled="true" security-enabled="false"/>
+76 <iiop-listener id="SSL" address="0.0.0.0" port="3820" security-enabled="true" enabled="true">
+77 <ssl cert-nickname="s1as" client-auth-enabled="false" ssl2-enabled="false" ssl3-enabled="true" tls-enabled="true" tls-rollback-enabled="true"/>
+78 </iiop-listener>
+79 <iiop-listener id="SSL_MUTUALAUTH" address="0.0.0.0" port="3920" security-enabled="true" enabled="true">
+80 <ssl cert-nickname="s1as" client-auth-enabled="true" ssl2-enabled="false" ssl3-enabled="true" tls-enabled="true" tls-rollback-enabled="true"/>
+81 </iiop-listener>
+82 </iiop-service>
+83 <admin-service system-jmx-connector-name="system" type="das-and-server">
+84 <!-- The JSR 160 "system-jmx-connector" -->
+85 <jmx-connector accept-all="false" address="0.0.0.0" auth-realm-name="admin-realm" enabled="true" name="system" port="8686" protocol="rmi_jrmp" security-enabled="false"/>
+86 <!-- The JSR 160 "system-jmx-connector" -->
+87 <das-config dynamic-reload-enabled="true" dynamic-reload-poll-interval-in-seconds="2" autodeploy-enabled="true" autodeploy-polling-interval-in-seconds="2" autodeploy-dir="${com.sun.aas.instanceRoot}/autodeploy" autodeploy-verifier-enabled="false" autodeploy-jsp-precompilation-enabled="false" deploy-xml-validation="full" admin-session-timeout-in-minutes="60"/>
+88 </admin-service>
+89 <web-container>
+90 <session-config>
+91 <session-manager>
+92 <manager-properties/>
+93 <store-properties/>
+94 </session-manager>
+95 <session-properties/>
+96 </session-config>
+97 </web-container>
+98 <ejb-container steady-pool-size="0" pool-resize-quantity="8" max-pool-size="32" cache-resize-quantity="32" max-cache-size="512" pool-idle-timeout-in-seconds="600" cache-idle-timeout-in-seconds="600" removal-timeout-in-seconds="5400" victim-selection-policy="nru" commit-option="B" session-store="${com.sun.aas.instanceRoot}/session-store">
+99 <ejb-timer-service minimum-delivery-interval-in-millis="7000" max-redeliveries="1" redelivery-interval-internal-in-millis="5000"/>
+100 </ejb-container>
+101 <mdb-container steady-pool-size="0" pool-resize-quantity="8" max-pool-size="32" idle-timeout-in-seconds="600"/>
+102 <jms-service init-timeout-in-seconds="60" type="EMBEDDED" default-jms-host="default_JMS_host" reconnect-interval-in-seconds="5" reconnect-attempts="3" reconnect-enabled="true" addresslist-behavior="random" addresslist-iterations="3">
+103 <jms-host name="default_JMS_host" host="laturbie.sfbay.sun.com" port="7676" admin-user-name="admin" admin-password="admin"/>
+104 </jms-service>
+105 <log-service file="${com.sun.aas.instanceRoot}/logs/server.log" use-system-logging="false" log-to-console="false" alarms="false" log-rotation-limit-in-bytes="2000000" log-rotation-timelimit-in-minutes="0" retain-error-statistics-for-hours="5">
+106 <module-log-levels root="INFO" server="INFO" ejb-container="INFO" cmp-container="INFO" mdb-container="INFO" web-container="INFO" classloader="INFO" configuration="INFO" naming="INFO" security="INFO" admin="INFO" jts="INFO" jta="INFO" deployment="INFO" verifier="INFO" jaxr="INFO" jaxrpc="INFO" saaj="INFO" corba="INFO" javamail="INFO" jms="INFO" connector="INFO" jdo="INFO" cmp="INFO" util="INFO" resource-adapter="INFO" synchronization="INFO" node-agent="INFO" self-management="INFO" group-management-service="INFO" management-event="INFO"/>
+107 </log-service>
+108 <security-service default-realm="file" audit-enabled="false" jacc="default" audit-modules="default" anonymous-role="AttributeDeprecated" activate-default-principal-to-role-mapping="false">
+109 <!-- All administrative users use this realm by default. -->
+110 <auth-realm name="admin-realm" classname="com.sun.enterprise.security.auth.realm.file.FileRealm">
+111 <property name="file" value="${com.sun.aas.instanceRoot}/config/admin-keyfile"/>
+112 <property name="jaas-context" value="fileRealm"/>
+113 </auth-realm>
+114 <!-- All administrative users use this realm by default. -->
+115 <auth-realm name="file" classname="com.sun.enterprise.security.auth.realm.file.FileRealm">
+116 <property name="file" value="${com.sun.aas.instanceRoot}/config/keyfile"/>
+117 <property name="jaas-context" value="fileRealm"/>
+118 </auth-realm>
+119 <auth-realm name="certificate" classname="com.sun.enterprise.security.auth.realm.certificate.CertificateRealm">
+120 </auth-realm>
+121 <jacc-provider name="default" policy-provider="com.sun.enterprise.security.provider.PolicyWrapper" policy-configuration-factory-provider="com.sun.enterprise.security.provider.PolicyConfigurationFactoryImpl">
+122 <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy"/>
+123 </jacc-provider>
+124 <audit-module name="default" classname="com.sun.enterprise.security.Audit">
+125 <property name="auditOn" value="false"/>
+126 </audit-module>
+127 <message-security-config auth-layer="SOAP">
+128 <!-- turned off by default -->
+129 <provider-config class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule" provider-id="XWS_ClientProvider" provider-type="client">
+130 <request-policy auth-source="content"/>
+131 <response-policy auth-source="content"/>
+132 <property name="encryption.key.alias" value="s1as"/>
+133 <property name="signature.key.alias" value="s1as"/>
+134 <property name="dynamic.username.password" value="false"/>
+135 <property name="debug" value="false"/>
+136 </provider-config>
+137 <provider-config class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule" provider-id="ClientProvider" provider-type="client">
+138 <request-policy auth-source="content"/>
+139 <response-policy auth-source="content"/>
+140 <property name="encryption.key.alias" value="s1as"/>
+141 <property name="signature.key.alias" value="s1as"/>
+142 <property name="dynamic.username.password" value="false"/>
+143 <property name="debug" value="false"/>
+144 <property name="security.config" value="${com.sun.aas.instanceRoot}/config/wss-server-config-1.0.xml"/>
+145 </provider-config>
+146 <provider-config class-name="com.sun.xml.wss.provider.ServerSecurityAuthModule" provider-id="XWS_ServerProvider" provider-type="server">
+147 <request-policy auth-source="content"/>
+148 <response-policy auth-source="content"/>
+149 <property name="encryption.key.alias" value="s1as"/>
+150 <property name="signature.key.alias" value="s1as"/>
+151 <property name="debug" value="false"/>
+152 </provider-config>
+153 <provider-config class-name="com.sun.xml.wss.provider.ServerSecurityAuthModule" provider-id="ServerProvider" provider-type="server">
+154 <request-policy auth-source="content"/>
+155 <response-policy auth-source="content"/>
+156 <property name="encryption.key.alias" value="s1as"/>
+157 <property name="signature.key.alias" value="s1as"/>
+158 <property name="debug" value="false"/>
+159 <property name="security.config" value="${com.sun.aas.instanceRoot}/config/wss-server-config-1.0.xml"/>
+160 </provider-config>
+161 </message-security-config>
+162 </security-service>
+163 <transaction-service automatic-recovery="false" timeout-in-seconds="0" tx-log-dir="${com.sun.aas.instanceRoot}/logs" heuristic-decision="rollback" keypoint-interval="2048" retry-timeout-in-seconds="600"/>
+164 <monitoring-service>
+165 <module-monitoring-levels thread-pool="OFF" orb="OFF" ejb-container="OFF" web-container="OFF" transaction-service="OFF" http-service="OFF" jdbc-connection-pool="OFF" connector-connection-pool="OFF" connector-service="OFF" jms-service="OFF" jvm="OFF"/>
+166 </monitoring-service>
+167 <diagnostic-service compute-checksum="true" verify-config="true" capture-install-log="true" capture-system-info="true" capture-hadb-info="true" capture-app-dd="true" min-log-level="INFO" max-log-entries="500"/>
+168 <java-config java-home="${com.sun.aas.javaRoot}" debug-enabled="false" debug-options="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=9009" rmic-options="-iiop -poa -alwaysgenerate -keepgenerated -g" javac-options="-g" system-classpath="${com.sun.aas.installRoot}/lib/appserv-launch.jar" classpath-suffix="" env-classpath-ignored="true">
+169 <!-- various required jvm-options -->
+170 <jvm-options>-client</jvm-options>
+171 <jvm-options>-Djava.endorsed.dirs=${com.sun.aas.installRoot}/lib/endorsed</jvm-options>
+172 <jvm-options>-Djava.security.policy=${com.sun.aas.instanceRoot}/config/server.policy</jvm-options>
+173 <jvm-options>-Djava.security.auth.login.config=${com.sun.aas.instanceRoot}/config/login.conf</jvm-options>
+174 <jvm-options>-Dsun.rmi.dgc.server.gcInterval=3600000</jvm-options>
+175 <jvm-options>-Dsun.rmi.dgc.client.gcInterval=3600000</jvm-options>
+176 <jvm-options>-Xmx512m</jvm-options>
+177 <jvm-options>-Djavax.net.ssl.keyStore=${com.sun.aas.instanceRoot}/config/keystore.jks</jvm-options>
+178 <jvm-options>-Djavax.net.ssl.trustStore=${com.sun.aas.instanceRoot}/config/cacerts.jks</jvm-options>
+179 <jvm-options>-Djava.ext.dirs=${com.sun.aas.javaRoot}/lib/ext${path.separator}${com.sun.aas.javaRoot}/jre/lib/ext${path.separator}${com.sun.aas.instanceRoot}/lib/ext${path.separator}${com.sun.aas.derbyRoot}/lib</jvm-options>
+180 <jvm-options>-Djdbc.drivers=org.apache.derby.jdbc.ClientDriver</jvm-options>
+181 <jvm-options>-Djavax.management.builder.initial=com.sun.enterprise.admin.server.core.jmx.AppServerMBeanServerBuilder</jvm-options>
+182 <jvm-options>-Dcom.sun.enterprise.config.config_environment_factory_class=com.sun.enterprise.config.serverbeans.AppserverConfigEnvironmentFactory</jvm-options>
+183 <jvm-options>-Dcom.sun.enterprise.taglibs=appserv-jstl.jar,jsf-impl.jar</jvm-options>
+184 <jvm-options>-Dcom.sun.enterprise.taglisteners=jsf-impl.jar</jvm-options>
+185 <jvm-options>-XX:NewRatio=2</jvm-options>
+186 </java-config>
+187 <thread-pools>
+188 <thread-pool thread-pool-id="thread-pool-1" min-thread-pool-size="0" max-thread-pool-size="200" idle-thread-timeout-in-seconds="120" num-work-queues="1"/>
+189
+190 </thread-pools>
+191 <management-rules enabled="true">
+192 </management-rules>
+193 </config> <!-- config model with name "server-config" ends -->
+194 </configs>
+195 <servers>
+196 <server name="server" config-ref="server-config" lb-weight="100">
+197 <application-ref enabled="true" ref="adminapp" virtual-servers="__asadmin" lb-enabled="false" disable-timeout-in-minutes="30"/>
+198 <application-ref enabled="true" ref="admingui" virtual-servers="__asadmin" lb-enabled="false" disable-timeout-in-minutes="30"/>
+199 <application-ref enabled="true" ref="JBIFramework" lb-enabled="false" disable-timeout-in-minutes="30"/>
+200 <application-ref enabled="true" ref="WSTXServices" lb-enabled="false" disable-timeout-in-minutes="30"/>
+201 <application-ref enabled="true" ref="WSTCPConnectorLCModule" lb-enabled="false" disable-timeout-in-minutes="30"/>
+202 <resource-ref enabled="true" ref="jdbc/__TimerPool"/>
+203 <resource-ref enabled="true" ref="jdbc/__CallFlowPool"/>
+204 <resource-ref enabled="true" ref="jdbc/__default"/>
+205 </server>
+206 </servers>
+207 <property name="administrative.domain.name" value="domain1"/>
+208 </domain>
Modified: projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/AbstractDomainMetaData.java
===================================================================
--- projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/AbstractDomainMetaData.java 2010-04-01 05:57:45 UTC (rev 103387)
+++ projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/AbstractDomainMetaData.java 2010-04-01 06:00:52 UTC (rev 103388)
@@ -52,6 +52,7 @@
normalizeSpace=true,
replacePropertyRefs=true,
xmlns={@XmlNs(namespaceURI=DomainMetaData.SERVER_NAMESPACE, prefix="server"),
+ @XmlNs(namespaceURI=DomainMetaData.JDBC_RESOURCES_NAMESPACE, prefix="jdbc"),
@XmlNs(namespaceURI=DomainMetaData.THREADS_NAMESPACE, prefix="tp")})
@XmlRootElement(name = "domain")
@XmlType(name = "domainType", propOrder = {"server", "jdbcResources", "threads", "features"})
@@ -103,8 +104,9 @@
this.server = server;
}
- @XmlElementWrapper(name="jdbc-resources")
+ @XmlElementWrapper(name="jdbc-resources", namespace=DomainMetaData.JDBC_RESOURCES_NAMESPACE)
@XmlElement(name="jdbc-resource")
+ @JBossXmlNsPrefix(prefix="jdbc")
public List<JdbcResource> getJdbcResources()
{
return jdbcResources;
Modified: projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/resources/JdbcResource.java
===================================================================
--- projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/resources/JdbcResource.java 2010-04-01 05:57:45 UTC (rev 103387)
+++ projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/resources/JdbcResource.java 2010-04-01 06:00:52 UTC (rev 103388)
@@ -22,16 +22,41 @@
package org.jboss.profileservice.domain.resources;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jboss.profileservice.domain.PropertiesMetaData;
+import org.jboss.profileservice.domain.spi.DomainMetaData;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
/**
* @author Scott.Stark at jboss.org
* @version $Revision:$
*/
+ at JBossXmlSchema(namespace=DomainMetaData.JDBC_RESOURCES_NAMESPACE,
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true,
+ replacePropertyRefs=true
+)
+ at XmlRootElement(name = "jdbc-resources")
+ at XmlType(name="jdbcResType", propOrder={})
public class JdbcResource
{
private String jndiName;
private String poolName;
private boolean enabled;
+ private String connectionUrl;
+ private String driverClass;
+ private String typeMapping;
+ private int minPoolSize;
+ private int maxPoolSize;
+ private String username;
+ private String password;
+ private TransactionIsolation transactionIsolation;
+ private PropertiesMetaData properties;
@XmlAttribute(name="jndi-name")
public String getJndiName()
@@ -61,5 +86,78 @@
this.enabled = enabled;
}
-
+ public String getConnectionUrl()
+ {
+ return connectionUrl;
+ }
+ public void setConnectionUrl(String connectionUrl)
+ {
+ this.connectionUrl = connectionUrl;
+ }
+ public String getDriverClass()
+ {
+ return driverClass;
+ }
+ public void setDriverClass(String driverClass)
+ {
+ this.driverClass = driverClass;
+ }
+ public String getTypeMapping()
+ {
+ return typeMapping;
+ }
+ public void setTypeMapping(String typeMapping)
+ {
+ this.typeMapping = typeMapping;
+ }
+ public int getMinPoolSize()
+ {
+ return minPoolSize;
+ }
+ public void setMinPoolSize(int minPoolSize)
+ {
+ this.minPoolSize = minPoolSize;
+ }
+ public int getMaxPoolSize()
+ {
+ return maxPoolSize;
+ }
+ public void setMaxPoolSize(int maxPoolSize)
+ {
+ this.maxPoolSize = maxPoolSize;
+ }
+ public String getUsername()
+ {
+ return username;
+ }
+ public void setUsername(String username)
+ {
+ this.username = username;
+ }
+ public String getPassword()
+ {
+ return password;
+ }
+ public void setPassword(String password)
+ {
+ this.password = password;
+ }
+
+ public TransactionIsolation getTransactionIsolation()
+ {
+ return transactionIsolation;
+ }
+ public void setTransactionIsolation(TransactionIsolation transactionIsolation)
+ {
+ this.transactionIsolation = transactionIsolation;
+ }
+ @XmlElementWrapper(name="properties")
+ public PropertiesMetaData getProperties()
+ {
+ return properties;
+ }
+ public void setProperties(PropertiesMetaData properties)
+ {
+ this.properties = properties;
+ }
}
Added: projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/resources/TransactionIsolation.java
===================================================================
--- projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/resources/TransactionIsolation.java (rev 0)
+++ projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/resources/TransactionIsolation.java 2010-04-01 06:00:52 UTC (rev 103388)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.profileservice.domain.resources;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+ at XmlEnum(String.class)
+public enum TransactionIsolation
+{
+ TRANSACTION_READ_UNCOMMITTED,
+ TRANSACTION_READ_COMMITTED,
+ TRANSACTION_REPEATABLE_READ,
+ TRANSACTION_SERIALIZABLE,
+ TRANSACTION_NONE;
+}
Modified: projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/spi/DomainMetaData.java
===================================================================
--- projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/spi/DomainMetaData.java 2010-04-01 05:57:45 UTC (rev 103387)
+++ projects/profileservice/trunk/domain/src/main/java/org/jboss/profileservice/domain/spi/DomainMetaData.java 2010-04-01 06:00:52 UTC (rev 103388)
@@ -36,7 +36,9 @@
String DOMAIN_NAMESPACE = "urn:jboss:profileservice:domain:1.0";
/** The server xml namespace. */
String SERVER_NAMESPACE = "urn:jboss:profileservice:server:1.0";
- /** The thread-pool xml namespace. */
+ /** The jdbc resources xml namespace. */
+ String JDBC_RESOURCES_NAMESPACE = "urn:jboss:profileservice:jdbc-resources:1.0";
+ /** The threads xml namespace. */
String THREADS_NAMESPACE = "urn:jboss:profileservice:threads:1.0";
/**
Modified: projects/profileservice/trunk/domain/src/test/java/org/jboss/test/profileservice/domain/parsing/test/DomainUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/domain/src/test/java/org/jboss/test/profileservice/domain/parsing/test/DomainUnitTestCase.java 2010-04-01 05:57:45 UTC (rev 103387)
+++ projects/profileservice/trunk/domain/src/test/java/org/jboss/test/profileservice/domain/parsing/test/DomainUnitTestCase.java 2010-04-01 06:00:52 UTC (rev 103388)
@@ -9,6 +9,8 @@
import org.jboss.profileservice.domain.PropertiesMetaData;
import org.jboss.profileservice.domain.RefMetaData;
import org.jboss.profileservice.domain.ServerMetaData;
+import org.jboss.profileservice.domain.resources.JdbcResource;
+import org.jboss.profileservice.domain.resources.TransactionIsolation;
import org.jboss.profileservice.domain.spi.DomainMetaData;
import org.jboss.profileservice.domain.threadpool.BasicThreadPoolMetaData;
import org.jboss.profileservice.domain.threadpool.ExecutorMetaData;
@@ -59,6 +61,38 @@
assertTrue("domainMD is AbstractDomainMetaData",
domainMD instanceof AbstractDomainMetaData);
AbstractDomainMetaData amd = (AbstractDomainMetaData) domainMD;
+
+ // jdbc-resource
+ List<JdbcResource> jdbcResources = amd.getJdbcResources();
+ assertEquals(2, jdbcResources.size());
+ HashMap<String, JdbcResource> jdbcMap = new HashMap<String, JdbcResource>();
+ for(JdbcResource jdbc : jdbcResources)
+ jdbcMap.put(jdbc.getJndiName(), jdbc);
+ JdbcResource DefaultDS = jdbcMap.get("java:DefaultDS");
+ assertNotNull("java:DefaultDS", DefaultDS);
+ assertEquals("min-pool-size=1", 1, DefaultDS.getMinPoolSize());
+ assertEquals("max-pool-size=1", 10, DefaultDS.getMaxPoolSize());
+ assertEquals("connection-url", "jdbc:hsqldb:hsql://${jboss.bind.address}:1701", DefaultDS.getConnectionUrl());
+ assertEquals("driver-class", "org.hsqldb.jdbcDriver", DefaultDS.getDriverClass());
+ assertEquals("pool-name", "DefaultDS", DefaultDS.getPoolName());
+ assertEquals("type-mapping", "Hypersonic SQL", DefaultDS.getTypeMapping());
+ assertEquals("username=sa", "sa", DefaultDS.getUsername());
+ assertEquals("password=", "", DefaultDS.getPassword());
+ assertEquals("transaction-isolation", TransactionIsolation.TRANSACTION_READ_COMMITTED, DefaultDS.getTransactionIsolation());
+ PropertiesMetaData defaultDSPMD = DefaultDS.getProperties();
+ assertEquals("query-timeout", "30", defaultDSPMD.get("query-timeout"));
+ assertEquals("new-connection-sql", "select * from x", defaultDSPMD.get("new-connection-sql"));
+ assertEquals("idle-timeout-minutes", "0", defaultDSPMD.get("idle-timeout-minutes"));
+ assertEquals("track-statements", "true", defaultDSPMD.get("track-statements"));
+ assertEquals("security-domain", "HsqlDbRealm", defaultDSPMD.get("security-domain"));
+ assertEquals("prepared-statement-cache-size", "32", defaultDSPMD.get("prepared-statement-cache-size"));
+
+ JdbcResource TimerPool = jdbcMap.get("jdbc/TimerPool");
+ assertNotNull("jdbc/TimerPool", TimerPool);
+ assertEquals("min-pool-size=1", 1, TimerPool.getMinPoolSize());
+ assertEquals("max-pool-size=1", 10, TimerPool.getMaxPoolSize());
+
+ // threads
ThreadsMetaData threadsMD = amd.getThreads();
// thread
Modified: projects/profileservice/trunk/domain/src/test/resources/parsing/domain.xml
===================================================================
--- projects/profileservice/trunk/domain/src/test/resources/parsing/domain.xml 2010-04-01 05:57:45 UTC (rev 103387)
+++ projects/profileservice/trunk/domain/src/test/resources/parsing/domain.xml 2010-04-01 06:00:52 UTC (rev 103388)
@@ -15,9 +15,37 @@
<shutdown-timeout>3600000</shutdown-timeout>
</server>
- <jdbc-resources>
- <jdbc-resource jndi-name="jdbc/TimerPool" pool-name="TimerPool" enabled="true"/>
- </jdbc-resources>
+ <jdbc-resources xmlns="urn:jboss:profileservice:jdbc-resources:1.0">
+ <jdbc-resource jndi-name="jdbc/TimerPool" pool-name="TimerPool" enabled="true">
+ <min-pool-size>1</min-pool-size>
+ <max-pool-size>10</max-pool-size>
+ <username>userx</username>
+ <password>passy</password>
+ <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
+ <properties>
+ <entry key="query-timeout" value="30" />
+ <entry key="new-connection-sql" value="select * from x" />
+ </properties>
+ </jdbc-resource>
+ <jdbc-resource jndi-name="java:DefaultDS" pool-name="DefaultDS" enabled="true">
+ <min-pool-size>1</min-pool-size>
+ <max-pool-size>10</max-pool-size>
+ <username>sa</username>
+ <password></password>
+ <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1701</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <type-mapping>Hypersonic SQL</type-mapping>
+ <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
+ <properties>
+ <entry key="query-timeout" value="30" />
+ <entry key="new-connection-sql" value="select * from x" />
+ <entry key="idle-timeout-minutes" value="0" />
+ <entry key="track-statements" value="true" />
+ <entry key="security-domain" value="HsqlDbRealm" />
+ <entry key="prepared-statement-cache-size" value="32" />
+ </properties>
+ </jdbc-resource>
+ </jdbc-resources>
<threads xmlns="urn:jboss:profileservice:threads:1.0">
More information about the jboss-cvs-commits
mailing list