Author: rareddy Date: 2011-11-16 18:54:12 -0500 (Wed, 16 Nov 2011) New Revision: 3663 Modified: branches/as7/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml branches/as7/jboss-integration/src/main/java/org/teiid/jboss/Element.java branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemParser.java branches/as7/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties branches/as7/jboss-integration/src/main/resources/schema/jboss-teiid.xsd branches/as7/jboss-integration/src/test/resources/teiid-model-config.txt branches/as7/jboss-integration/src/test/resources/teiid-model-json.txt branches/as7/jboss-integration/src/test/resources/teiid-sample-config.xml Log: TEIID-1720: Moving up latest nightly; added workmanager configuration. Modified: branches/as7/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml =================================================================== --- branches/as7/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2011-11-16 23:24:34 UTC (rev 3662) +++ branches/as7/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml 2011-11-16 23:54:12 UTC (rev 3663) @@ -24,12 +24,15 @@ <extensions> <extension module="org.jboss.as.clustering.infinispan"/> + <extension module="org.jboss.as.cmp"/> <extension module="org.jboss.as.connector"/> <extension module="org.jboss.as.deployment-scanner"/> <extension module="org.jboss.as.ee"/> <extension module="org.jboss.as.ejb3"/> <extension module="org.jboss.as.jacorb"/> + <extension module="org.jboss.as.jaxr"/> <extension module="org.jboss.as.jaxrs"/> + <extension module="org.jboss.as.jdr"/> <extension module="org.jboss.as.jmx"/> <extension module="org.jboss.as.jpa"/> <extension module="org.jboss.as.logging"/> @@ -37,6 +40,7 @@ <extension module="org.jboss.as.messaging"/> <extension module="org.jboss.as.naming"/> <extension module="org.jboss.as.osgi"/> + <extension module="org.jboss.as.pojo"/> <extension module="org.jboss.as.remoting"/> <extension module="org.jboss.as.sar"/> <extension module="org.jboss.as.security"/> @@ -49,16 +53,20 @@ </extensions> <management> - <security-realms> - <security-realm name="PropertiesMgmtSecurityRealm"> - <authentication> - <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir" /> - </authentication> - </security-realm> - </security-realms> + <security-realms> + <security-realm name="ManagementRealm"> + <authentication> + <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/> + </authentication> + </security-realm> + </security-realms> <management-interfaces> - <native-interface interface="management" port="9999" /> - <http-interface interface="management" port="9990"/> + <native-interface security-realm="ManagementRealm"> + <socket-binding native="management-native"/> + </native-interface> + <http-interface security-realm="ManagementRealm"> + <socket-binding http="management-http"/> + </http-interface> </management-interfaces> </management> @@ -72,12 +80,12 @@ </console-handler> <periodic-rotating-file-handler name="FILE"> - <level name="INFO"/> <formatter> <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> </formatter> <file relative-to="jboss.server.log.dir" path="server.log"/> <suffix value=".yyyy-MM-dd"/> + <append value="true"/> </periodic-rotating-file-handler> <logger category="com.arjuna"> @@ -105,6 +113,7 @@ </handlers> </root-logger> </subsystem> + <subsystem xmlns="urn:jboss:domain:cmp:1.0"/> <subsystem xmlns="urn:jboss:domain:datasources:1.0"> <datasources> <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" @@ -213,7 +222,7 @@ </local-cache> <local-cache name="timestamps"> <eviction strategy="NONE"/> - </local-cache> + </local-cache> </cache-container> <cache-container name="teiid" default-cache="resultset"> <local-cache name="resultset"> @@ -222,15 +231,9 @@ </local-cache> </cache-container> </subsystem> - <subsystem xmlns="urn:jboss:domain:jacorb:1.0"> - <orb name="JBoss" print-version="off" giop-minor-version="2"> - <connection max-managed-buf-size="24" outbuf-cache-timeout="-1"/> - <naming root-context="JBoss/Naming/root" export-corbaloc="on"/> - </orb> - <poa monitoring="off" queue-wait="off"> - <request-processors pool-size="2" max-threads="8"/> - </poa> - <interop sun="on" chunk-custom-rmi-valuetypes="on" strict-check-on-tc-creation="off"/> + <subsystem xmlns="urn:jboss:domain:jacorb:1.1"/> + <subsystem xmlns="urn:jboss:domain:jaxr:1.0"> + <datasource jndi-name="java:jboss/datasources/ExampleDS"/> </subsystem> <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> <subsystem xmlns="urn:jboss:domain:jca:1.0"> @@ -251,6 +254,7 @@ </long-running-threads> </default-workmanager> </subsystem> + <subsystem xmlns="urn:jboss:domain:jdr:1.0"/> <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true"> <jmx-connector registry-binding="jmx-connector-registry" server-binding="jmx-connector-server" /> </subsystem> @@ -267,13 +271,12 @@ <!-- Default journal file size is 10Mb, reduced here to 100k for faster first boot --> <journal-file-size>102400</journal-file-size> <journal-min-files>2</journal-min-files> - <journal-type>NIO</journal-type> <!-- disable messaging persistence --> <persistence-enabled>false</persistence-enabled> <connectors> - <netty-connector name="netty" socket-binding="messaging"/> - <netty-connector name="netty-throughput" socket-binding="messaging-throughput"> + <netty-connector name="netty" socket-binding="messaging-client"/> + <netty-connector name="netty-throughput" socket-binding="messaging-throughput-client"> <param key="batch-delay" value="50"/> </netty-connector> <in-vm-connector name="in-vm" server-id="0"/> @@ -387,6 +390,7 @@ <capability name="org.jboss.osgi.xerces" startlevel="3"/> </capabilities> </subsystem> + <subsystem xmlns="urn:jboss:domain:pojo:1.0" /> <subsystem xmlns="urn:jboss:domain:remoting:1.0"> <connector name="remoting-connector" socket-binding="remoting"/> </subsystem> @@ -484,7 +488,7 @@ <max-threads count="2" per-cpu="2"/> </queueless-thread-pool> </subsystem> - <subsystem xmlns="urn:jboss:domain:transactions:1.0"> + <subsystem xmlns="urn:jboss:domain:transactions:1.1"> <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> <core-environment> <process-id> @@ -502,7 +506,7 @@ </subsystem> <subsystem xmlns="urn:jboss:domain:webservices:1.0"> <modify-wsdl-address>true</modify-wsdl-address> - <wsdl-host>localhost</wsdl-host> + <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host> <!-- <wsdl-port>8080</wsdl-port> <wsdl-secure-port>8443</wsdl-secure-port> @@ -543,15 +547,22 @@ <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="jndi" port="1099"/> + <socket-binding name="management-native" interface="management" port="9999"/> + <socket-binding name="management-http" interface="management" port="9990"/> <socket-binding name="messaging" port="5445"/> <socket-binding name="messaging-throughput" port="5455"/> <socket-binding name="osgi-http" interface="management" port="8090"/> <socket-binding name="remoting" port="4447"/> <socket-binding name="txn-recovery-environment" port="4712"/> <socket-binding name="txn-status-manager" port="4713"/> - <socket-binding name="teiid-jdbc" port="31000"/> - <socket-binding name="teiid-odbc" port="35432"/> + <socket-binding name="teiid-jdbc" port="31000"/> + <socket-binding name="teiid-odbc" port="35432"/> + <outbound-socket-binding name="messaging-client"> + <local-destination socket-binding-ref="messaging"/> + </outbound-socket-binding> + <outbound-socket-binding name="messaging-throughput-client"> + <local-destination socket-binding-ref="messaging-throughput"/> + </outbound-socket-binding> </socket-binding-group> </server> Modified: branches/as7/jboss-integration/src/main/java/org/teiid/jboss/Element.java =================================================================== --- branches/as7/jboss-integration/src/main/java/org/teiid/jboss/Element.java 2011-11-16 23:24:34 UTC (rev 3662) +++ branches/as7/jboss-integration/src/main/java/org/teiid/jboss/Element.java 2011-11-16 23:54:12 UTC (rev 3663) @@ -57,6 +57,7 @@ EXCEPTION_ON_MAX_SOURCE_ROWS_ELEMENT("exception-on-max-source-rows", "exception-on-max-source-rows", ModelType.BOOLEAN, false, "true"), DETECTING_CHANGE_EVENTS_ELEMENT("detect-change-events", "detect-change-events", ModelType.BOOLEAN, false, "true"), QUERY_TIMEOUT("query-timeout", "query-timeout", ModelType.LONG, false, "0"), + WORKMANAGER("workmanager", "workmanager", ModelType.STRING, false, "default"), POLICY_DECIDER_ELEMENT("policy-decider"), POLICY_DECIDER_MODULE_ATTRIBUTE("module", "policy-decider-module", ModelType.STRING, false, null), Modified: branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java =================================================================== --- branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-11-16 23:24:34 UTC (rev 3662) +++ branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-11-16 23:54:12 UTC (rev 3663) @@ -98,6 +98,7 @@ Element.EXCEPTION_ON_MAX_SOURCE_ROWS_ELEMENT, Element.DETECTING_CHANGE_EVENTS_ELEMENT, Element.QUERY_TIMEOUT, + Element.WORKMANAGER, Element.AUTHORIZATION_VALIDATOR_MODULE_ATTRIBUTE, Element.POLICY_DECIDER_MODULE_ATTRIBUTE, @@ -308,9 +309,13 @@ // Query Engine final RuntimeEngineDeployer engine = buildQueryEngine(operation); + String workManager = "default"; //$NON-NLS-1$ + if (Element.WORKMANAGER.isDefined(operation)) { + workManager = Element.WORKMANAGER.asString(operation); + } ServiceBuilder<DQPCore> engineBuilder = target.addService(TeiidServiceNames.ENGINE, engine); - engineBuilder.addDependency(ServiceName.JBOSS.append("connector", "workmanager"), WorkManager.class, engine.getWorkManagerInjector()); //$NON-NLS-1$ //$NON-NLS-2$ + engineBuilder.addDependency(ServiceName.JBOSS.append("connector", "workmanager", workManager), WorkManager.class, engine.getWorkManagerInjector()); //$NON-NLS-1$ //$NON-NLS-2$ engineBuilder.addDependency(ServiceName.JBOSS.append("txn", "XATerminator"), XATerminator.class, engine.getXaTerminatorInjector()); //$NON-NLS-1$ //$NON-NLS-2$ engineBuilder.addDependency(ServiceName.JBOSS.append("txn", "TransactionManager"), TransactionManager.class, engine.getTxnManagerInjector()); //$NON-NLS-1$ //$NON-NLS-2$ engineBuilder.addDependency(TeiidServiceNames.BUFFER_MGR, BufferServiceImpl.class, engine.getBufferServiceInjector()); Modified: branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemParser.java =================================================================== --- branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemParser.java 2011-11-16 23:24:34 UTC (rev 3662) +++ branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemParser.java 2011-11-16 23:54:12 UTC (rev 3663) @@ -73,6 +73,7 @@ writeElement(writer, Element.EXCEPTION_ON_MAX_SOURCE_ROWS_ELEMENT, node); writeElement(writer, Element.DETECTING_CHANGE_EVENTS_ELEMENT, node); writeElement(writer, Element.QUERY_TIMEOUT, node); + writeElement(writer, Element.WORKMANAGER, node); if (like(node, Element.AUTHORIZATION_VALIDATOR_ELEMENT)) { @@ -282,6 +283,10 @@ case DETECTING_CHANGE_EVENTS_ELEMENT: bootServices.get(reader.getLocalName()).set(Boolean.parseBoolean(reader.getElementText())); break; + + case WORKMANAGER: + bootServices.get(reader.getLocalName()).set(reader.getElementText()); + break; case MAX_THREADS_ELEMENT: case MAX_ACTIVE_PLANS_ELEMENT: Modified: branches/as7/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties =================================================================== --- branches/as7/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2011-11-16 23:24:34 UTC (rev 3662) +++ branches/as7/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties 2011-11-16 23:54:12 UTC (rev 3663) @@ -89,6 +89,7 @@ detect-change-events.describe=Set to true for the engine to detect local change events. Should be disabled if using external change data capture tools. (default true) allow-env-function.describe=Allow the execution of ENV function. (default false) query-timeout.describe=Set the default query timeout for all queries in milliseconds. 0 indicates no timeout. Lesser timeout values may be set per VDB or by clients. (default 0) +workmanager.describe=WorkManager name to use in processing. (default name is "default") policy-decider-module.describe=Policy Module; Implementation of org.teiid.PolicyDecider class authorization-validator-module.describe=Authorization Module; Implementation of org.teiid.dqp.internal.process.AuthorizationValidator class. Modified: branches/as7/jboss-integration/src/main/resources/schema/jboss-teiid.xsd =================================================================== --- branches/as7/jboss-integration/src/main/resources/schema/jboss-teiid.xsd 2011-11-16 23:24:34 UTC (rev 3662) +++ branches/as7/jboss-integration/src/main/resources/schema/jboss-teiid.xsd 2011-11-16 23:54:12 UTC (rev 3663) @@ -184,8 +184,14 @@ <xs:annotation> <xs:documentation>Set the default query timeout for all queries in milliseconds. 0 indicates no timeout. Lesser timeout values may be set per VDB or by clients. (default 0)</xs:documentation> </xs:annotation> - </xs:element> + </xs:element> + <xs:element name="workmanager" type="xs:string" minOccurs="0" maxOccurs="1" default="default"> + <xs:annotation> + <xs:documentation>WorkManager name to use in processing. (default name is "default")</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="authorization-validator" minOccurs="0" maxOccurs="1"> <xs:complexType> <xs:attribute name="module" type="xs:string" use="required"> Modified: branches/as7/jboss-integration/src/test/resources/teiid-model-config.txt =================================================================== --- branches/as7/jboss-integration/src/test/resources/teiid-model-config.txt 2011-11-16 23:24:34 UTC (rev 3662) +++ branches/as7/jboss-integration/src/test/resources/teiid-model-config.txt 2011-11-16 23:54:12 UTC (rev 3663) @@ -89,6 +89,13 @@ "max-occurs" => 1, "default" => 0L }, + "workmanager" => { + "type" => STRING, + "description" => "WorkManager name to use in processing. (default name is \"default\")", + "required" => false, + "max-occurs" => 1, + "default" => "default" + }, "authorization-validator-module" => { "type" => STRING, "description" => "Authorization Module; Implementation of org.teiid.dqp.internal.process.AuthorizationValidator class.", Modified: branches/as7/jboss-integration/src/test/resources/teiid-model-json.txt =================================================================== --- branches/as7/jboss-integration/src/test/resources/teiid-model-json.txt 2011-11-16 23:24:34 UTC (rev 3662) +++ branches/as7/jboss-integration/src/test/resources/teiid-model-json.txt 2011-11-16 23:54:12 UTC (rev 3663) @@ -17,6 +17,7 @@ "exception-on-max-source-rows" : true, "lob-chunk-size-in-kb" : 100, "query-timeout" : 23, + "workmanager" : "wm", "max-active-plans" : 20, "max-row-fetch-size" : 20480, "max-source-rows-allowed" : -1, Modified: branches/as7/jboss-integration/src/test/resources/teiid-sample-config.xml =================================================================== --- branches/as7/jboss-integration/src/test/resources/teiid-sample-config.xml 2011-11-16 23:24:34 UTC (rev 3662) +++ branches/as7/jboss-integration/src/test/resources/teiid-sample-config.xml 2011-11-16 23:54:12 UTC (rev 3663) @@ -17,7 +17,7 @@ <exception-on-max-source-rows>true</exception-on-max-source-rows> <detect-change-events>true</detect-change-events> <query-timeout>23</query-timeout> - + <workmanager>wm</workmanager> <!-- <authorization-validator module="javax.api"/> <policy-decider module="javax.api"/>