[jboss-cvs] JBossAS SVN: r104424 - in branches/JBPAPP_5_1_hornetq-int: hornetq-int and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 4 07:22:13 EDT 2010
Author: ataylor
Date: 2010-05-04 07:22:12 -0400 (Tue, 04 May 2010)
New Revision: 104424
Added:
branches/JBPAPP_5_1_hornetq-int/hornetq-int/src/resources/ejb-deployer-jboss-beans.xml
Removed:
branches/JBPAPP_5_1_hornetq-int/hornetq-int/src/resources/config/
Modified:
branches/JBPAPP_5_1_hornetq-int/build/build-distr.xml
branches/JBPAPP_5_1_hornetq-int/hornetq-int/build.xml
branches/JBPAPP_5_1_hornetq-int/hornetq-int/src/etc/switch.sh
Log:
fixed ejb problem and updated configuration
Modified: branches/JBPAPP_5_1_hornetq-int/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_1_hornetq-int/build/build-distr.xml 2010-05-04 10:08:22 UTC (rev 104423)
+++ branches/JBPAPP_5_1_hornetq-int/build/build-distr.xml 2010-05-04 11:22:12 UTC (rev 104424)
@@ -798,7 +798,7 @@
<mkdir dir="${install.root}/extras/hornetq"/>
<copy todir="${install.root}/extras/hornetq">
<fileset dir="${_module.output}/">
- <include name="resources/**/*"/>
+ <include name="resources/*.xml"/>
<include name="lib/**/*"/>
</fileset>
</copy>
@@ -810,11 +810,14 @@
<copy todir="${install.root}/extras/hornetq/resources">
<fileset dir="${_module.output}/etc">
<include name="ra.xml"/>
+ <include name="jboss-as-6/**/*"/>
</fileset>
+ <fileset dir="">
+ </fileset>
</copy>
<copy todir="${install.root}/extras/hornetq/lib">
- <fileset dir="${org.hornetq.lib}">
- </fileset>
+ <fileset dir="${org.hornetq.lib}"></fileset>
+ <fileset dir="${org.jboss.netty.lib}"></fileset>
</copy>
<chmod perm="+x">
Modified: branches/JBPAPP_5_1_hornetq-int/hornetq-int/build.xml
===================================================================
--- branches/JBPAPP_5_1_hornetq-int/hornetq-int/build.xml 2010-05-04 10:08:22 UTC (rev 104423)
+++ branches/JBPAPP_5_1_hornetq-int/hornetq-int/build.xml 2010-05-04 11:22:12 UTC (rev 104424)
@@ -158,6 +158,7 @@
<fileset dir="${source.resources}">
<include name="**/*"/>
</fileset>
+
</copy>
<unzip dest="output/etc" src="${org.hornetq.lib}/hornetq-resources.jar"/>
Modified: branches/JBPAPP_5_1_hornetq-int/hornetq-int/src/etc/switch.sh
===================================================================
--- branches/JBPAPP_5_1_hornetq-int/hornetq-int/src/etc/switch.sh 2010-05-04 10:08:22 UTC (rev 104423)
+++ branches/JBPAPP_5_1_hornetq-int/hornetq-int/src/etc/switch.sh 2010-05-04 11:22:12 UTC (rev 104424)
@@ -16,6 +16,7 @@
cp lib/hornetq-jms.jar $JBOSS_HOME/common/lib
cp lib/hornetq-logging.jar $JBOSS_HOME/common/lib
cp lib/hornetq-int.jar $JBOSS_HOME/common/lib
+cp lib/netty.jar $JBOSS_HOME/common/lib
rm $JBOSS_HOME/client/jboss-messaging-client.jar
@@ -23,13 +24,15 @@
cp lib/hornetq-jms-client.jar $JBOSS_HOME/client
rm -r $JBOSS_HOME/server/default/deploy/messaging
+rm $JBOSS_HOME/server/default/deployers/messaging-definitions-jboss-beans.xml
+cp resources/ejb-deployer-jboss-beans.xml $JBOSS_HOME/server/default/deployers/
mkdir $JBOSS_HOME/server/default/deploy/hornetq
-cp resources/config/non-clustered/hornetq-configuration.xml $JBOSS_HOME/server/default/deploy/hornetq
-cp resources/config/non-clustered/hornetq-jboss-beans.xml $JBOSS_HOME/server/default/deploy/hornetq
-cp resources/config/non-clustered/hornetq-jms.xml $JBOSS_HOME/server/default/deploy/hornetq
-cp resources/config/non-clustered/jms-ds.xml $JBOSS_HOME/server/default/deploy/hornetq
+cp resources/jboss-as-6/non-clustered/hornetq-configuration.xml $JBOSS_HOME/server/default/deploy/hornetq
+cp resources/jboss-as-6/non-clustered/hornetq-jboss-beans.xml $JBOSS_HOME/server/default/deploy/hornetq
+cp resources/jboss-as-6/non-clustered/hornetq-jms.xml $JBOSS_HOME/server/default/deploy/hornetq
+cp resources/jboss-as-6/non-clustered/jms-ds.xml $JBOSS_HOME/server/default/deploy/hornetq
rm $JBOSS_HOME/server/default/deploy/jms-ra.rar
Added: branches/JBPAPP_5_1_hornetq-int/hornetq-int/src/resources/ejb-deployer-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1_hornetq-int/hornetq-int/src/resources/ejb-deployer-jboss-beans.xml (rev 0)
+++ branches/JBPAPP_5_1_hornetq-int/hornetq-int/src/resources/ejb-deployer-jboss-beans.xml 2010-05-04 11:22:12 UTC (rev 104424)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ EJB 2.x Deployer
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- ejb-jar.xml parsing deployer -->
+ <bean name="Ejb2ParsingDeployer" class="org.jboss.deployment.EjbParsingDeployer">
+ <!--
+ <property name="useSchemaValidation">false</property>
+ -->
+ <property name="relativeOrder">3000</property>
+ </bean>
+ <bean name="JBossEjb2ParsingDeployer" class="org.jboss.deployment.JBossEjbParsingDeployer">
+ <property name="relativeOrder">3001</property>
+ <property name="useSchemaValidation">false</property>
+ <property name="ignoreMissingStandardJBossXml">false</property>
+ <!-- Can be used to override the default location of the standardjboss.xml -->
+ <property name="standardJBossXmlPath">${jboss.server.config.url}/standardjboss.xml</property>
+ </bean>
+
+ <bean name="EjbClassLoaderDeployer" class="org.jboss.deployment.EjbClassLoaderDeployer"/>
+
+ <bean name="EJB2xDeployer" class="org.jboss.ejb.deployers.EjbDeployer">
+ <install bean="ManagedDeploymentCreator" method="addVersionedAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
+ </parameter>
+ <parameter>
+ <value>ejb2x</value>
+ </parameter>
+ <parameter>
+ <value>[1-2].*</value>
+ </parameter>
+ <parameter>
+ <value>getEjbVersion</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeVersionedAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
+ </parameter>
+ <parameter>
+ <value>ejb2x</value>
+ </parameter>
+ </uninstall>
+ <!-- The EJBDeployer needs the JTA transaction manager service -->
+ <property name="transactionManagerServiceName">jboss:service=TransactionManager</property>
+ <!-- The dynamic class loading simple web server -->
+ <property name="webServiceName">jboss:service=WebService</property>
+ <!-- The CachedConnectionManager service used by the CachedConnectionInterceptor -->
+ <property name="cachedConnectionManagerName">jboss.jca:service=CachedConnectionManager</property>
+ <!-- The ejb timer service -->
+ <property name="timerServiceName">jboss.ejb:service=EJBTimerService</property>
+ <!-- A flag indicating if the ejb components should have in VM call
+ optimization disabled.
+ -->
+ <property name="callByValue">false</property>
+
+ <!-- Specify an unauthenticated identity -->
+ <property name="unauthenticatedIdentity">anonymous</property>
+
+ <!-- Specify a PolicyRegistration Bean -->
+ <property name="policyRegistrationName">JBossSecurityPolicyRegistration</property>
+
+ <!-- Specify a SecurityManagement Wrapper -->
+ <property name="securityManagementName">JNDIBasedSecurityManagement</property>
+
+ <!-- Specify a SecurityContext FQN class name -->
+ <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property>
+
+ <!-- Specify a SecurityDomain as fallback -->
+ <property name="defaultSecurityDomain">jboss-ejb-policy</property>
+
+ <!-- A flag indicating if the deployer should validate the ejb-jar.xml/jboss.xml descriptors and components -->
+ <property name="verifyDeployments">true</property>
+
+ <!-- A flag indicating if the verifier should be verbose about its operation -->
+ <property name="verifierVerbose">true</property>
+
+ <!-- Setting this to 'true' will cause all deployments
+ to fail when the Verifier detected a problem with the contained
+ Beans. If false, warnings/errors will be logged but the deployment
+ will not fail.
+ -->
+ <property name="strictVerifier">true</property>
+
+ </bean>
+
+ <bean name="MergedJBossMetaDataDeployer" class="org.jboss.ejb.deployers.MergedJBossMetaDataDeployer">
+ </bean>
+ <bean name="StandardJBossMetaDataDeployer" class="org.jboss.ejb.deployers.StandardJBossMetaDataDeployer">
+ </bean>
+
+ <!-- Deployer for automatically creating message driven destinations.
+ The JMS Integration layer will provide the proper CreateDestinations plugin for this.
+ Look at hornetq-deployers-jboss-beans.xml for an example (on hornetq-int project)
+ -->
+ <bean name="CreateDestinationDeployer" class="org.jboss.ejb.deployers.CreateDestinationDeployer">
+ <incallback method="addCreateDestination"/>
+ <uncallback method="removeCreateDestination"/>
+ </bean>
+</deployment>
More information about the jboss-cvs-commits
mailing list