[jboss-cvs] JBossAS SVN: r100660 - in branches/Branch_Hornet_Temporary_2: build and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Feb 6 22:31:24 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-02-06 22:31:24 -0500 (Sat, 06 Feb 2010)
New Revision: 100660
Modified:
branches/Branch_Hornet_Temporary_2/README.txt
branches/Branch_Hornet_Temporary_2/build/build.xml
branches/Branch_Hornet_Temporary_2/server/src/etc/deployers/ejb-deployer-jboss-beans.xml
branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestination.java
branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestinationDeployer.java
branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestinationFactory.java
Log:
Deployers
Modified: branches/Branch_Hornet_Temporary_2/README.txt
===================================================================
--- branches/Branch_Hornet_Temporary_2/README.txt 2010-02-07 03:30:19 UTC (rev 100659)
+++ branches/Branch_Hornet_Temporary_2/README.txt 2010-02-07 03:31:24 UTC (rev 100660)
@@ -22,7 +22,7 @@
Generation of the source jars can be skipping by deactivating the sources
profile.
-./build.sh -P-sources
+./build.sh -P-sources -P-enforce
During development you may want to build only a single module and update the
distribution build. This can be done using the property "module".
@@ -43,7 +43,7 @@
Note about this branch
----------------------
-this branch currently has two manual dependencies on the local maven repository.
+this branch currently has a few manual dependencies on the local maven repository.
Before building this branch you will have to do these steps once (in this specific order):
Modified: branches/Branch_Hornet_Temporary_2/build/build.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/build/build.xml 2010-02-07 03:30:19 UTC (rev 100659)
+++ branches/Branch_Hornet_Temporary_2/build/build.xml 2010-02-07 03:31:24 UTC (rev 100660)
@@ -1820,8 +1820,8 @@
</fileset>
</copy>
- <copy file="${hornetq.module.output}/resources/hornetq-deployer-jboss-beans.xml" todir="${install.server}/default/deployers"/>
- <copy file="${hornetq.module.output}/resources/hornetq-deployer-jboss-beans.xml" todir="${install.server}/all/deployers"/>
+ <copy file="${hornetq.module.output}/resources/hornetq-deployers-jboss-beans.xml" todir="${install.server}/default/deployers"/>
+ <copy file="${hornetq.module.output}/resources/hornetq-deployers-jboss-beans.xml" todir="${install.server}/all/deployers"/>
</target>
Modified: branches/Branch_Hornet_Temporary_2/server/src/etc/deployers/ejb-deployer-jboss-beans.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/server/src/etc/deployers/ejb-deployer-jboss-beans.xml 2010-02-07 03:30:19 UTC (rev 100659)
+++ branches/Branch_Hornet_Temporary_2/server/src/etc/deployers/ejb-deployer-jboss-beans.xml 2010-02-07 03:31:24 UTC (rev 100660)
@@ -92,27 +92,13 @@
<bean name="StandardJBossMetaDataDeployer" class="org.jboss.ejb.deployers.StandardJBossMetaDataDeployer">
</bean>
- <!-- Deployer for automatically creating message driven destinations -->
+ <!-- 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>
- <!-- Destination creator for JBoss Messaging -->
- <bean name="HornetQDestinationCreator" class="org.jboss.ejb.deployers.CreateDestination">
- <!-- We match any jms mdb that is going to be deployed using our rar -->
- <property name="matcher">
- <bean class="org.jboss.ejb.deployers.SimpleCreateDestinationMatcher">
- <property name="default">true</property>
- <property name="messageListener">javax.jms.MessageListener</property>
- <property name="rarName">hornetq-ra.rar</property>
- </bean>
- </property>
- <!-- Create a destination with HornetQ -->
- <property name="factory">
- <bean class="org.jboss.as.integration.hornetq.deployer.DestinationFactoryDeployerPlugin">
- <property name="jmsManager"><inject bean="JMSServerManager"/></property>
- </bean>
- </property>
- </bean>
</deployment>
Modified: branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestination.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestination.java 2010-02-07 03:30:19 UTC (rev 100659)
+++ branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestination.java 2010-02-07 03:31:24 UTC (rev 100660)
@@ -98,6 +98,11 @@
{
this.factory = factory;
}
+
+ public Class<?> getOutput()
+ {
+ return factory.getOutput();
+ }
/**
* Validate the parameters
Modified: branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestinationDeployer.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestinationDeployer.java 2010-02-07 03:30:19 UTC (rev 100659)
+++ branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestinationDeployer.java 2010-02-07 03:31:24 UTC (rev 100660)
@@ -69,6 +69,8 @@
if (factory == null)
throw new IllegalArgumentException("Null factory");
factories.add(factory);
+
+ addOutput(factory.getOutput());
}
/**
Modified: branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestinationFactory.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestinationFactory.java 2010-02-07 03:30:19 UTC (rev 100659)
+++ branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestinationFactory.java 2010-02-07 03:31:24 UTC (rev 100660)
@@ -42,4 +42,11 @@
* @throws DeploymentException for any error
*/
boolean create(DeploymentUnit unit, JBossMessageDrivenBeanMetaData mdb) throws DeploymentException;
+
+ /**
+ * Return the Output class used by this factory.
+ * The DestinationFactory may choose to deploy other objects instead of calling the deployment directly.
+ * @return
+ */
+ Class<?> getOutput();
}
More information about the jboss-cvs-commits
mailing list