[teiid-commits] teiid SVN: r3762 - in trunk: build/kits/jboss-as7/domain/configuration and 1 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Tue Jan 3 12:20:40 EST 2012
Author: rareddy
Date: 2012-01-03 12:20:39 -0500 (Tue, 03 Jan 2012)
New Revision: 3762
Modified:
trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml
trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml
trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml
trunk/pom.xml
Log:
TEIID-1720: Upgraded the configuration files to work with AS7-CR1b. This version will work with AS7-CR1b version.
Modified: trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml
===================================================================
--- trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml 2012-01-03 17:11:16 UTC (rev 3761)
+++ trunk/build/kits/jboss-as7/domain/configuration/domain-teiid.xml 2012-01-03 17:20:39 UTC (rev 3762)
@@ -77,7 +77,7 @@
</subsystem>
<subsystem xmlns="urn:jboss:domain:datasources:1.0">
<datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" pool-name="H2DS">
+ <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" pool-name="java:jboss/datasources/ExampleDS">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
<driver>h2</driver>
<pool></pool>
@@ -94,12 +94,12 @@
</datasources>
</subsystem>
<subsystem xmlns="urn:jboss:domain:ee:1.0"/>
- <subsystem xmlns="urn:jboss:domain:ejb3:1.2">
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.2" >
<session-bean>
<stateless>
<bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
</stateless>
- <stateful default-access-timeout="5000"/>
+ <stateful default-access-timeout="5000" cache-ref="simple" clustered-cache-ref="clustered"/>
<singleton default-access-timeout="5000"/>
</session-bean>
<mdb>
@@ -112,6 +112,15 @@
<strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
</bean-instance-pools>
</pools>
+ <caches>
+ <cache name="simple" aliases="NoPassivationCache"/>
+ <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/>
+ <cache name="clustered" passivation-store-ref="infinispan" aliases="StatefulTreeCache"/>
+ </caches>
+ <passivation-stores>
+ <file-passivation-store name="file"/>
+ <cluster-passivation-store name="infinispan" backing-cache="sfsb"/>
+ </passivation-stores>
<async thread-pool-name="default"/>
<timer-service thread-pool-name="default">
<data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
@@ -120,6 +129,7 @@
<thread-pools>
<thread-pool name="default" max-threads="10" keepalive-time="100"/>
</thread-pools>
+ <iiop enable-by-default="true" use-qualified-name="true"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="cluster">
<cache-container name="cluster" default-cache="default">
@@ -136,14 +146,19 @@
<distributed-cache name="dist" mode="ASYNC" batching="true">
<file-store/>
</distributed-cache>
+ <replicated-cache name="registry" mode="SYNC" batching="true"/>
+ <replicated-cache name="sso" mode="SYNC" batching="true"/>
</cache-container>
<cache-container name="sfsb" default-cache="repl">
<alias>sfsb-cache</alias>
- <alias>jboss.cache:service=EJB3SFSBClusteredCache</alias>
<replicated-cache name="repl" mode="ASYNC" batching="true">
- <eviction strategy="LRU" max-entries="10000"/>
+ <eviction strategy="LRU"/>
<file-store/>
</replicated-cache>
+ <distributed-cache name="dist" mode="ASYNC" batching="true">
+ <eviction strategy="LRU"/>
+ <file-store/>
+ </distributed-cache>
</cache-container>
<cache-container name="hibernate" default-cache="local-query">
<invalidation-cache name="entity" mode="SYNC">
@@ -226,7 +241,9 @@
<protocol type="pbcast.FLUSH"/>
</stack>
</subsystem>
- <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true"/>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.1">
+ <show-model value="true"/>
+ </subsystem>
<subsystem xmlns="urn:jboss:domain:jpa:1.0">
<jpa default-datasource=""/>
</subsystem>
Modified: trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml
===================================================================
--- trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml 2012-01-03 17:11:16 UTC (rev 3761)
+++ trunk/build/kits/jboss-as7/domain/configuration/host-teiid.xml 2012-01-03 17:20:39 UTC (rev 3762)
@@ -12,10 +12,10 @@
</security-realms>
<management-interfaces>
<native-interface security-realm="ManagementRealm">
- <socket interface="management" port="9999"/>
+ <socket interface="management" port="${jboss.management.native.port:9999}"/>
</native-interface>
<http-interface security-realm="ManagementRealm">
- <socket interface="management" port="9990"/>
+ <socket interface="management" port="${jboss.management.http.port:9990}"/>
</http-interface>
</management-interfaces>
</management>
@@ -23,7 +23,7 @@
<domain-controller>
<local/>
<!-- Alternative remote domain controller configuration with a host and port -->
- <!-- <remote host="192.168.100.1" port="9999"/> -->
+ <!-- <remote host="${jboss.domain.master.address}" port="${jboss.domain.master.port:9999}"/> -->
</domain-controller>
<interfaces>
@@ -37,27 +37,25 @@
<jvms>
<jvm name="default">
- <heap size="64m" max-size="128m"/>
+ <heap size="64m" max-size="256m"/>
</jvm>
</jvms>
<servers>
<server name="server-one" group="main-server-group">
- <socket-binding-group ref="ha-sockets" port-offset="0"/>
+ <!-- Remote JPDA debugging for a specific server
<jvm name="default">
- <!-- Remote JPDA debugging for a specific server
<jvm-options>
<option value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
</jvm-options>
- -->
</jvm>
+ -->
</server>
-
- <!-- If additional servers needed on same host un-comment and configure -->
<!--
<server name="server-two" group="main-server-group" auto-start="true">
- <socket-binding-group ref="ha-sockets" port-offset="150"/>
+ <socket-bindings port-offset="150"/>
</server>
-->
+
</servers>
</host>
Modified: trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml
===================================================================
--- trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2012-01-03 17:11:16 UTC (rev 3761)
+++ trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2012-01-03 17:20:39 UTC (rev 3762)
@@ -8,6 +8,7 @@
<extension module="org.jboss.as.deployment-scanner"/>
<extension module="org.jboss.as.ee"/>
<extension module="org.jboss.as.ejb3"/>
+ <extension module="org.jboss.as.jaxr"/>
<extension module="org.jboss.as.jaxrs"/>
<extension module="org.jboss.as.jdr"/>
<extension module="org.jboss.as.jmx"/>
@@ -88,7 +89,7 @@
<subsystem xmlns="urn:jboss:domain:datasources:1.0">
<datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true"
- pool-name="H2DS">
+ pool-name="ExampleDS">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
<driver>h2</driver>
<pool></pool>
@@ -113,7 +114,7 @@
<stateless>
<bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
</stateless>
- <stateful default-access-timeout="5000"/>
+ <stateful default-access-timeout="5000" cache-ref="simple"/>
<singleton default-access-timeout="5000"/>
</session-bean>
<mdb>
@@ -126,6 +127,13 @@
<strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
</bean-instance-pools>
</pools>
+ <caches>
+ <cache name="simple" aliases="NoPassivationCache"/>
+ <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/>
+ </caches>
+ <passivation-stores>
+ <file-passivation-store name="file"/>
+ </passivation-stores>
<async thread-pool-name="default"/>
<timer-service thread-pool-name="default">
<data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
@@ -156,6 +164,10 @@
</local-cache>
</cache-container>
</subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxr:1.0">
+ <connection-factory jndi-name="java:jboss/jaxr/ConnectionFactory"/>
+ <juddi-server publish-url="http://localhost:8080/juddi/publish" query-url="http://localhost:8080/juddi/query"/>
+ </subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
<subsystem xmlns="urn:jboss:domain:jca:1.1">
<archive-validation enabled="false"/>
@@ -176,7 +188,9 @@
</default-workmanager>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true"/>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.1">
+ <show-model value="true"/>
+ </subsystem>
<subsystem xmlns="urn:jboss:domain:jpa:1.0">
<jpa default-datasource=""/>
</subsystem>
@@ -357,15 +371,15 @@
</interface>
</interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public">
+ <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
<socket-binding name="http" port="8080"/>
<socket-binding name="https" port="8443"/>
<socket-binding name="jacorb" port="3528"/>
<socket-binding name="jacorb-ssl" port="3529"/>
<socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
<socket-binding name="jmx-connector-server" interface="management" port="1091"/>
- <socket-binding name="management-native" interface="management" port="9999"/>
- <socket-binding name="management-http" interface="management" port="9990"/>
+ <socket-binding name="management-native" interface="management" port="${jboss.management.native.port:9999}"/>
+ <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
<socket-binding name="messaging" port="5445"/>
<socket-binding name="messaging-throughput" port="5455"/>
<socket-binding name="osgi-http" interface="management" port="8090"/>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-01-03 17:11:16 UTC (rev 3761)
+++ trunk/pom.xml 2012-01-03 17:20:39 UTC (rev 3762)
@@ -15,27 +15,27 @@
<properties>
<ant.version>1.7.0</ant.version>
<site.url>http://www.jboss.org/teiid</site.url>
- <jbossas-version>7.1.0.Beta1</jbossas-version>
+ <jbossas-version>7.1.0.CR1b</jbossas-version>
<version.org.jboss.jboss-common-core>2.2.17.GA</version.org.jboss.jboss-common-core>
<version.org.jboss.staxmapper>1.0.0.Final</version.org.jboss.staxmapper>
- <version.org.jboss.jboss-dmr>1.1.0.Final</version.org.jboss.jboss-dmr>
+ <version.org.jboss.jboss-dmr>1.1.1.Final</version.org.jboss.jboss-dmr>
<version.org.jboss.msc.jboss-msc>1.0.1.GA</version.org.jboss.msc.jboss-msc>
- <version.org.jboss.modules.jboss-modules>1.1.0.CR3</version.org.jboss.modules.jboss-modules>
+ <version.org.jboss.modules.jboss-modules>1.1.0.CR6</version.org.jboss.modules.jboss-modules>
<version.org.jboss.jboss-vfs>3.1.0.CR1</version.org.jboss.jboss-vfs>
- <version.org.picketbox>4.0.6.Beta1</version.org.picketbox>
- <version.org.jboss.logging.jboss-logging>3.1.0.CR1</version.org.jboss.logging.jboss-logging>
- <version.org.jboss.logging.jboss-logging-tools>1.0.0.CR4</version.org.jboss.logging.jboss-logging-tools>
+ <version.org.picketbox>4.0.6.Beta2</version.org.picketbox>
+ <version.org.jboss.logging.jboss-logging>3.1.0.CR2</version.org.jboss.logging.jboss-logging>
+ <version.org.jboss.logging.jboss-logging-tools>1.0.0.CR5</version.org.jboss.logging.jboss-logging-tools>
<version.org.picketbox.jbosssx-client>3.0.0.CR2</version.org.picketbox.jbosssx-client>
- <version.org.jboss.arquillian.core>1.0.0.CR5</version.org.jboss.arquillian.core>
+ <version.org.jboss.arquillian.core>1.0.0.CR7</version.org.jboss.arquillian.core>
<version.javax.enterprise.cdi-api>1.0-SP4</version.javax.enterprise.cdi-api>
- <version.org.jboss.netty>3.2.4.Final</version.org.jboss.netty>
+ <version.org.jboss.netty>3.2.5.Final</version.org.jboss.netty>
<version.net.sourceforge.saxon>9.2.1.5</version.net.sourceforge.saxon>
<version.json-simple>1.1</version.json-simple>
- <version.org.jgroups>3.0.0.Final</version.org.jgroups>
+ <version.org.jgroups>3.0.1.Final</version.org.jgroups>
<version.connector-api>1.5</version.connector-api>
<version.jta>1.1</version.jta>
<version.sun.jaxb>2.2</version.sun.jaxb>
- <version.junit>4.8.2</version.junit>
+ <version.junit>4.10</version.junit>
</properties>
<scm>
<connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection>
More information about the teiid-commits
mailing list