[jboss-cvs] JBossAS SVN: r73539 - projects/ejb3/trunk/core/src/main/resources/META-INF.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 20 16:27:08 EDT 2008
Author: ALRubinger
Date: 2008-05-20 16:27:07 -0400 (Tue, 20 May 2008)
New Revision: 73539
Removed:
projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-service.xml
projects/ejb3/trunk/core/src/main/resources/META-INF/jboss-service.xml
Modified:
projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-beans.xml
Log:
[EJBTHREE-1234] Fixed Plugin installation by applying diff made to AS in Revision 73509
Modified: projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-beans.xml 2008-05-20 16:59:37 UTC (rev 73538)
+++ projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-beans.xml 2008-05-20 20:27:07 UTC (rev 73539)
@@ -114,9 +114,6 @@
</property>
<depends>AspectLibrary</depends>
</bean>
- <bean name="EJBStage2Deployer" class="org.jboss.ejb3.deployers.EJBStage2Deployer">
- <depends>AspectLibrary</depends>
- </bean>
<bean name="AppClientParsingDeployer" class="org.jboss.ejb3.deployers.AppClientParsingDeployer">
<property name="type">car</property>
Deleted: projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-service.xml
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-service.xml 2008-05-20 16:59:37 UTC (rev 73538)
+++ projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-service.xml 2008-05-20 20:27:07 UTC (rev 73539)
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss EJB3Deployer
-
- $Id: jboss-service.xml 41488 2006-02-25 00:14:09Z dimitris $
--->
-<server>
-
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
- <attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
- <attribute name="Configuration">
- <handlers>
- <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
- </handlers>
- </attribute>
- </mbean>
-
- <!-- ================================================ -->
- <!-- Defines the Quartz configuration for -->
- <!-- the EJB3 Timer Service -->
- <!-- ================================================ -->
- <mbean code="org.jboss.ejb3.timerservice.quartz.jmx.EJB3TimerService" name="jboss.ejb:service=EJB3TimerService">
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
- <depends optional-attribute-name="DataSource">jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-
- <attribute name="Properties">
- org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreCMT
- org.quartz.jobStore.nonManagedTXDataSource=myDS
- org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.HSQLDBDelegate
- org.quartz.jobStore.tablePrefix=QRTZ_
- org.quartz.jobStore.dataSource=myDS
-
- # To get it to work with hypersonic
- # FIXME: this doesn't lock the row
- org.quartz.jobStore.selectWithLockSQL=SELECT * FROM qrtz_locks WHERE lock_name = ?
-
- # from quartz.properties
- org.quartz.scheduler.instanceName=JBossEJB3QuartzScheduler
- org.quartz.scheduler.rmi.export=false
- org.quartz.scheduler.rmi.proxy=false
- org.quartz.scheduler.wrapJobExecutionInUserTransaction=false
-
- org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
- org.quartz.threadPool.threadCount=10
- org.quartz.threadPool.threadPriority=5
- org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true
-
- org.quartz.jobStore.misfireThreshold=60000
- </attribute>
- <attribute name="SqlProperties">
- CREATE_DB_ON_STARTUP = TRUE
-
- CREATE_TABLE_JOB_DETAILS = CREATE TABLE qrtz_job_details(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
- DESCRIPTION VARCHAR(120) NULL, JOB_CLASS_NAME VARCHAR(128) NOT NULL, IS_DURABLE VARCHAR(1) NOT NULL, \
- IS_VOLATILE VARCHAR(1) NOT NULL, IS_STATEFUL VARCHAR(1) NOT NULL, REQUESTS_RECOVERY VARCHAR(1) NOT NULL, \
- JOB_DATA BINARY NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP))
- CREATE_TABLE_JOB_LISTENERS = CREATE TABLE qrtz_job_listeners(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
- JOB_LISTENER VARCHAR(80) NOT NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP,JOB_LISTENER), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
- REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
- CREATE_TABLE_TRIGGERS = CREATE TABLE qrtz_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, TRIGGER_GROUP VARCHAR(80) NOT NULL, \
- JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, DESCRIPTION VARCHAR(120) NULL, \
- NEXT_FIRE_TIME NUMERIC(13) NULL, PREV_FIRE_TIME NUMERIC(13) NULL, TRIGGER_STATE VARCHAR(16) NOT NULL, \
- TRIGGER_TYPE VARCHAR(8) NOT NULL, START_TIME NUMERIC(13) NOT NULL, END_TIME NUMERIC(13) NULL, CALENDAR_NAME VARCHAR(80) NULL, \
- MISFIRE_INSTR NUMERIC(2) NULL, JOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
- REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
- CREATE_TABLE_SIMPLE_TRIGGERS = CREATE TABLE qrtz_simple_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
- TRIGGER_GROUP VARCHAR(80) NOT NULL, REPEAT_COUNT NUMERIC(7) NOT NULL, REPEAT_INTERVAL NUMERIC(12) NOT NULL, \
- TIMES_TRIGGERED NUMERIC(7) NOT NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
- REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
- CREATE_TABLE_CRON_TRIGGERS = CREATE TABLE qrtz_cron_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
- TRIGGER_GROUP VARCHAR(80) NOT NULL, CRON_EXPRESSION VARCHAR(80) NOT NULL, TIME_ZONE_ID VARCHAR(80), \
- PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
- REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
- CREATE_TABLE_BLOB_TRIGGERS = CREATE TABLE qrtz_blob_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
- TRIGGER_GROUP VARCHAR(80) NOT NULL, BLOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), \
- FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
- CREATE_TABLE_TRIGGER_LISTENERS = CREATE TABLE qrtz_trigger_listeners(TRIGGER_NAME VARCHAR(80) NOT NULL, \
- TRIGGER_GROUP VARCHAR(80) NOT NULL, TRIGGER_LISTENER VARCHAR(80) NOT NULL, \
- PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_LISTENER), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
- REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
- CREATE_TABLE_CALENDARS = CREATE TABLE qrtz_calendars(CALENDAR_NAME VARCHAR(80) NOT NULL, CALENDAR BINARY NOT NULL, \
- PRIMARY KEY (CALENDAR_NAME))
- CREATE_TABLE_PAUSED_TRIGGER_GRPS = CREATE TABLE qrtz_paused_trigger_grps(TRIGGER_GROUP VARCHAR(80) NOT NULL, \
- PRIMARY KEY (TRIGGER_GROUP))
- CREATE_TABLE_FIRED_TRIGGERS = CREATE TABLE qrtz_fired_triggers(ENTRY_ID VARCHAR(95) NOT NULL, TRIGGER_NAME VARCHAR(80) NOT NULL, \
- TRIGGER_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, INSTANCE_NAME VARCHAR(80) NOT NULL, \
- FIRED_TIME NUMERIC(13) NOT NULL, STATE VARCHAR(16) NOT NULL, JOB_NAME VARCHAR(80) NULL, JOB_GROUP VARCHAR(80) NULL, \
- IS_STATEFUL VARCHAR(1) NULL, REQUESTS_RECOVERY VARCHAR(1) NULL, PRIMARY KEY (ENTRY_ID))
- CREATE_TABLE_SCHEDULER_STATE = CREATE TABLE qrtz_scheduler_state(INSTANCE_NAME VARCHAR(80) NOT NULL, \
- LAST_CHECKIN_TIME NUMERIC(13) NOT NULL, CHECKIN_INTERVAL NUMERIC(13) NOT NULL, RECOVERER VARCHAR(80) NULL, \
- PRIMARY KEY (INSTANCE_NAME))
- CREATE_TABLE_LOCKS = CREATE TABLE qrtz_locks(LOCK_NAME VARCHAR(40) NOT NULL, PRIMARY KEY (LOCK_NAME))
- INSERT_TRIGGER_ACCESS = INSERT INTO qrtz_locks values('TRIGGER_ACCESS')
- INSERT_JOB_ACCESS = INSERT INTO qrtz_locks values('JOB_ACCESS')
- INSERT_CALENDAR_ACCESS = INSERT INTO qrtz_locks values('CALENDAR_ACCESS')
- INSERT_STATE_ACCESS = INSERT INTO qrtz_locks values('STATE_ACCESS')
- INSERT_MISFIRE_ACCESS = INSERT INTO qrtz_locks values('MISFIRE_ACCESS')
- </attribute>
- </mbean>
-
-</server>
Deleted: projects/ejb3/trunk/core/src/main/resources/META-INF/jboss-service.xml
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/META-INF/jboss-service.xml 2008-05-20 16:59:37 UTC (rev 73538)
+++ projects/ejb3/trunk/core/src/main/resources/META-INF/jboss-service.xml 2008-05-20 20:27:07 UTC (rev 73539)
@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss EJB3Deployer
-
- $Id$
--->
-<server>
-
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
- <depends>jboss.aop:service=AspectDeployer</depends>
- <attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
- <attribute name="Configuration">
- <handlers>
- <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
- </handlers>
- </attribute>
- </mbean>
-
- <!-- The following is sample configuration for modifying the Connector
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
- <depends>jboss.aop:service=AspectDeployer</depends>
- <attribute name="Configuration">
- <config>
- <invoker transport="socket">
- <attribute name="numAcceptThreads">1</attribute>
- <attribute name="maxPoolSize">300</attribute>
- <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
- <attribute name="timeout" isParam="true">60000</attribute>
- <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
- <attribute name="serverBindPort">3873</attribute>
- <attribute name="backlog">200</attribute>
- </invoker>
- <handlers>
- <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
- </handlers>
- </config>
- </attribute>
- </mbean-->
-
- <mbean code="org.jboss.ejb3.JarsIgnoredForScanning" name="jboss.ejb3:service=JarsIgnoredForScanning">
- <attribute name="IgnoredJars">
- snmp-adaptor.jar,
- otherimages.jar,
- applet.jar,
- jcommon.jar,
- console-mgr-classes.jar,
- jfreechart.jar,
- juddi-service.jar,
- wsdl4j.jar,
- commons-collections.jar,
- commons-pool.jar,
- juddi.jar,
- commons-discovery.jar,
- uddi4j.jar,
- axis.jar,
- commons-dbcp.jar,
- jboss-juddiaxis.jar,
- trove.jar,
- javassist.jar,
- jboss-aop-jdk50.jar,
- jboss-aspect-library-jdk50.jar,
- ejb3-persistence.jar,
- commons-validator-1.1.3.jar,
- commons-collections.jar,
- commons-fileupload.jar,
- commons-pool.jar,
- hibernate-entitymanager.jar,
- jboss-ejb3x.jar,
- commons-digester-1.6.jar,
- cglib-2.1.1.jar,
- commons-discovery.jar,
- jboss-annotations-ejb3.jar,
- jaxen-1.1-beta-4.jar,
- hibernate-annotations.jar,
- commons-httpclient.jar,
- commons-logging.jar,
- commons-vfs.jar,
- hibernate3.jar,
- commons-logging-api.jar,
- asm.jar,
- asm-attrs.jar,
- commons-lang-2.0.jar,
- commons-beanutils.jar,
- jboss-ejb3.jar,
- dom4j.jar,
- commons-codec-1.2.jar,
- wsdl4j.jar,
- xmlsec.jar,
- jbossws.jar,
- jboss-bean-deployer.jar,
- jboss-microcontainer.jar,
- jboss-dependency.jar,
- jboss-container.jar,
- tomcat-coyote.jar,
- commons-collections.jar,
- myfaces.jar,
- jstl.jar,
- commons-digester-1.6.jar,
- myfaces-impl.jar,
- commons-beanutils.jar,
- myfaces-jsf-api.jar,
- commons-codec-1.2.jar,
- catalina-optional.jar,
- tomcat-util.jar,
- jasper-compiler.jar,
- commons-el.jar,
- jasper-compiler-jdt.jar,
- tomcat-http.jar,
- catalina-manager.jar,
- jasper-runtime.jar,
- tomcat55-service.jar,
- servlets-invoker.jar,
- catalina.jar,
- naming-resources.jar,
- servlets-default.jar,
- tomcat-ajp.jar,
- commons-modeler.jar,
- tomcat-apr.jar,
- servlets-webdav.jar
- </attribute>
- </mbean>
-
- <mbean code="org.jboss.ejb3.EJB3Deployer" name="jboss.ejb3:service=EJB3Deployer" xmbean-dd="">
-
- <attribute name="DeployEjb3ExtensionOnly">false</attribute>
-
- <!--
-
- Configure the deployer to optionally require a deployment
- descriptor for deployable units. By turning this switch to "true",
- "META-INF/jboss.xml" or the EJB3 Deployment Descriptor "META-INF/ejb-jar.xml"
- will be required for deployment, enabling a performance increace in deployment by
- not scanning for annotations in non-deployable EJB3 JARs.
-
- Default for this value is "false".
-
- -->
- <attribute name="RequireDeploymentDescriptor">false</attribute>
-
- <!-- Inline XMBean Descriptor BEGIN -->
- <xmbean>
- <description>The EJB3Deployer responsible for ejb3 deployment</description>
- <descriptors>
- <interceptors>
- <!-- comment out DynamicInterceptor to disable dynamic addition of interceptors -->
- <interceptor code="org.jboss.mx.interceptor.DynamicInterceptor"/>
- </interceptors>
- </descriptors>
- <class>org.jboss.ejb3.EJB3Deployer</class>
-
- <!-- ServiceMBean attributes -->
- <attribute access="read-only" getMethod="getName">
- <description>The class name of the MBean</description>
- <name>Name</name>
- <type>java.lang.String</type>
- </attribute>
-
- <attribute access="read-only" getMethod="getState">
- <description>The status of the MBean</description>
- <name>State</name>
- <type>int</type>
- </attribute>
-
- <attribute access="read-only" getMethod="getStateString">
- <description>The status of the MBean in text form</description>
- <name>StateString</name>
- <type>java.lang.String</type>
- </attribute>
-
- <!-- SubDeployerMBean attributes -->
- <attribute access="read-only" getMethod="getServiceName">
- <description>The ObjectName of the Subdeployer</description>
- <name>ServiceName</name>
- <type>javax.management.ObjectName</type>
- </attribute>
-
- <attribute access="read-write" getMethod="getSuffixes" setMethod="setSuffixes">
- <description>The suffixes of interest to this deployer</description>
- <name>Suffixes</name>
- <type>[Ljava.lang.String;</type>
- </attribute>
-
- <attribute access="read-write" getMethod="getRelativeOrder" setMethod="setRelativeOrder">
- <description>The relative order of the suffixes in the global suffixes list</description>
- <name>RelativeOrder</name>
- <type>int</type>
- </attribute>
-
- <!-- EJB3DeployerMBean attributes -->
- <attribute access="read-only" getMethod="getDefaultProperties">
- <name>DefaultProperties</name>
- <type>java.util.Properties</type>
- </attribute>
-
- <attribute access="read-write" getMethod="getDeployEjb3ExtensionOnly" setMethod="setDeployEjb3ExtensionOnly">
- <description>If true, .jars will not be examined for annotations, 3.0 descriptors</description>
- <name>DeployEjb3ExtensionOnly</name>
- <type>boolean</type>
- </attribute>
-
- <attribute access="write-only" setMethod="setJarsIgnoredForScanning">
- <description>mbean that has list of jars to ignore</description>
- <name>JarsIgnoredForScanning</name>
- <type>org.jboss.ejb3.JarsIgnoredForScanningMBean</type>
- </attribute>
-
- <!-- ServiceMBean operations -->
- <operation>
- <description>Standard MBean lifecycle method</description>
- <name>create</name>
- </operation>
-
- <operation>
- <description>The start lifecycle operation</description>
- <name>start</name>
- </operation>
-
- <operation>
- <description>The stop lifecycle operation</description>
- <name>stop</name>
- </operation>
-
- <operation>
- <description>The destroy lifecycle operation</description>
- <name>destroy</name>
- </operation>
-
- <operation>
- <description>The detyped lifecycle operation (for internal use only)</description>
- <name>jbossInternalLifecycle</name>
- <parameter>
- <description>The lifecycle operation</description>
- <name>method</name>
- <type>java.lang.String</type>
- </parameter>
- <return-type>void</return-type>
- </operation>
-
- <!-- SubDeployerMBean operations -->
- <operation>
- <description>Accept a module for deployment</description>
- <name>accepts</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- <return-type>boolean</return-type>
- </operation>
-
- <operation>
- <description>Initialize deployment step</description>
- <name>init</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Create deployment step</description>
- <name>create</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Start deployment step</description>
- <name>start</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Stop deployment step</description>
- <name>stop</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Destroy deployment step</description>
- <name>destroy</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <!-- Interceptable operations -->
- <operation>
- <description>Add dynamically an operation interceptor</description>
- <name>addOperationInterceptor</name>
- <parameter>
- <description>The Interceptor</description>
- <name>interceptor</name>
- <type>org.jboss.mx.interceptor.Interceptor</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Remove dynamically an operation interceptor</description>
- <name>removeOperationInterceptor</name>
- <parameter>
- <description>The Interceptor</description>
- <name>interceptor</name>
- <type>org.jboss.mx.interceptor.Interceptor</type>
- </parameter>
- </operation>
- </xmbean>
- <!-- Inline XMBean Descriptor END -->
-
- <depends>jboss.aop:service=AspectDeployer</depends>
- <depends>jboss.ejb:service=EJBDeployer</depends>
- <depends optional-attribute-name="JarsIgnoredForScanning" proxy-type="org.jboss.ejb3.JarsIgnoredForScanningMBean">jboss.ejb3:service=JarsIgnoredForScanning</depends>
- </mbean>
-
-</server>
More information about the jboss-cvs-commits
mailing list