[jboss-cvs] JBossAS SVN: r99866 - in branches/Branch_Hornet_Temporary_2: build and 15 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Jan 24 21:09:18 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-01-24 21:09:18 -0500 (Sun, 24 Jan 2010)
New Revision: 99866
Added:
branches/Branch_Hornet_Temporary_2/hornetq-int/
branches/Branch_Hornet_Temporary_2/hornetq-int/.classpath
branches/Branch_Hornet_Temporary_2/hornetq-int/.project
branches/Branch_Hornet_Temporary_2/hornetq-int/README.txt
branches/Branch_Hornet_Temporary_2/hornetq-int/build.bat
branches/Branch_Hornet_Temporary_2/hornetq-int/build.sh
branches/Branch_Hornet_Temporary_2/hornetq-int/pom.xml
branches/Branch_Hornet_Temporary_2/hornetq-int/src/
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/destination/
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/destination/DestinationManager.java
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/integration/
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/integration/DestinationFactoryDeployerPlugin.java
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQAdminFactory.java
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdmin.java
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdminFactory.java
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/TestRole.java
Removed:
branches/Branch_Hornet_Temporary_2/messaging/
Modified:
branches/Branch_Hornet_Temporary_2/build/build.xml
branches/Branch_Hornet_Temporary_2/build/pom.xml
branches/Branch_Hornet_Temporary_2/client/pom.xml
branches/Branch_Hornet_Temporary_2/component-matrix/pom.xml
branches/Branch_Hornet_Temporary_2/pom.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/CreateDestinationDeployer.java
branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestinationFactory.java
Log:
update hornetq integration branch
Modified: branches/Branch_Hornet_Temporary_2/build/build.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/build/build.xml 2010-01-25 01:39:34 UTC (rev 99865)
+++ branches/Branch_Hornet_Temporary_2/build/build.xml 2010-01-25 02:09:18 UTC (rev 99866)
@@ -86,7 +86,7 @@
<property name="dist.module.name" value="jboss"/>
<property name="dist.module.Name" value="JBoss Build"/>
<property name="dist.module.version" value="${pom.project.version}"/>
- <property name="dist.module.output" value="${basedir}/target"/>
+ <property name="dist.module.output" value="${basedir}/output"/>
<!-- Install/Release structure -->
<property name="install.id" value="${dist.module.name}-${dist.module.version}"/>
@@ -441,7 +441,7 @@
<include name="jmx-connector-client-factory.jar"/>
<include name="namespace.jar"/>
<include name="xmlsec.jar"/>
- <include name="jboss-messaging.jar"/>
+ <!-- <include name="jboss-messaging.jar"/> -->
<include name="jboss-mdr.jar"/>
<include name="jboss-deployers-core.jar"/>
<include name="jboss-deployers-core-spi.jar"/>
@@ -1085,139 +1085,88 @@
jboss-messaging libraries, unscoped deployment, same for "all" and "default" configurations.
-->
<mkdir dir="${install.common.lib}"/>
-
- <copy file="${messaging.module.output}/jboss-as-messaging.jar"
- tofile="${install.common.lib}/jboss-messaging-int.jar" filtering="no" />
-
- <!--
- Security metadata, same for "all" and "default" configurations.
- -->
- <mkdir dir="${install.all.conf}/props"/>
- <copy todir="${install.all.conf}/props">
- <fileset dir="${messaging.module.output}/etc/deploy/common">
- <include name="messaging-*.properties"/>
- </fileset>
- </copy>
+
+
+ <copy file="${org.hornetq:hornetq-jboss-as-integration:jar}" todir="${install.common.lib}">
+ <mapper refid="remove-versions" />
+ </copy>
+ <copy file="${org.hornetq:hornetq-bootstrap:jar}" todir="${install.common.lib}">
+ <mapper refid="remove-versions" />
+ </copy>
+ <copy file="${org.hornetq:hornetq-core-client:jar}" todir="${install.common.lib}">
+ <mapper refid="remove-versions" />
+ </copy>
- <!--
- Clustered Config, using HSQLDB (but not supposed to go into production mode, since clustering requires a shared DB)
- -->
- <mkdir dir="${install.all.deploy}/messaging"/>
- <!--<copy tofile="${install.all.deploy}/messaging/hsqldb-persistence-service.xml"
- file="${jboss.messaging.resources}/clustered-hsqldb-persistence-service.xml"/>-->
- <unzip src="${jboss.messaging:resources:jar}" dest="${install.all.deploy}/messaging/">
- <patternset>
- <include name="resources/clustered-hsqldb-persistence-service.xml"/>
- </patternset>
- <mapper type="glob" from="resources/clustered-hsqldb-persistence-service.xml" to="hsqldb-persistence-service.xml"/>
- </unzip>
- <copy todir="${install.all.deploy}/messaging">
- <fileset dir="${messaging.module.output}/etc/deploy/common">
- <include name="*-service.xml"/>
- <include name="*-jboss-beans.xml"/>
- <include name="jms-ds.xml"/>
- <include name="destinations-service.xml"/>
- </fileset>
- <!--<fileset dir="${jboss.messaging.resources}/">
- <include name="connection-factories-service.xml"/>
- <include name="remoting-bisocket-service.xml"/>
- </fileset>-->
+ <copy file="${org.hornetq:hornetq-core:jar}" todir="${install.common.lib}">
+ <mapper refid="remove-versions" />
</copy>
- <unzip src="${jboss.messaging:resources:jar}" dest="${install.all.deploy}/messaging">
- <patternset>
- <include name="resources/connection-factories-service.xml"/>
- <include name="resources/remoting-bisocket-service.xml"/>
- </patternset>
- <mapper type="flatten"/>
- </unzip>
+ <copy file="${org.hornetq:hornetq-logging:jar}" todir="${install.common.lib}">
+ <mapper refid="remove-versions" />
+ </copy>
- <!--
- The messaging profileservice definitions, to default and all
- -->
- <copy todir="${install.default.deployers}">
- <fileset dir="${messaging.module.output}/etc/deployers">
- <include name="*-jboss-beans.xml"/>
- </fileset>
- </copy>
- <copy todir="${install.all.deployers}">
- <fileset dir="${messaging.module.output}/etc/deployers">
- <include name="*-jboss-beans.xml"/>
- </fileset>
- </copy>
-
- <!--
- Default configuration
- -->
- <mkdir dir="${install.default.deploy}/messaging"/>
- <copy todir="${install.default.deploy}/messaging">
- <fileset dir="${messaging.module.output}/etc/deploy/common">
- <include name="*-service.xml"/>
- <include name="*-jboss-beans.xml"/>
- <include name="jms-ds.xml"/>
- </fileset>
-
- <!--<fileset dir="${jboss.messaging.resources}/">
- <include name="connection-factories-service.xml"/>
- <include name="hsqldb-persistence-service.xml"/>
- <include name="remoting-bisocket-service.xml"/>
- </fileset>-->
+ <copy file="${org.hornetq:hornetq-ra:jar}" todir="${install.common.lib}">
+ <mapper refid="remove-versions" />
</copy>
- <unzip src="${jboss.messaging:resources:jar}" dest="${install.default.deploy}/messaging">
- <patternset>
- <include name="resources/connection-factories-service.xml"/>
- <include name="resources/hsqldb-persistence-service.xml"/>
- <include name="resources/remoting-bisocket-service.xml"/>
- </patternset>
- <mapper type="flatten"/>
- </unzip>
-
- <!-- copy example jms configs -->
- <!-- we don't need them anymore, they are all in examples/config now
- <mkdir dir="${install.examples.jms}"/>
- <copy todir="${install.examples.jms}" filtering="no">
- <fileset dir="${jboss.messaging.resources}">
- <include name="*-persistence-service.xml"/>
- <include name="remoting-*-service.xml"/>
- </fileset>
- </copy>
- -->
- <!-- the JBM bundled destinations-service.xml comes with many examples -->
- <unzip src="${jboss.messaging:resources:jar}" dest="${install.examples.jms}">
- <patternset>
- <include name="resources/destinations-service.xml"/>
- </patternset>
- <mapper type="glob" from="resources/destinations-service.xml" to="example-destinations-service.xml"/>
- </unzip>
- <!-- <copy file="${jboss.messaging.resources}/destinations-service.xml"
- tofile="${install.examples.jms}/example-destinations-service.xml"/>-->
+ <copy file="${org.hornetq:hornetq-transports:jar}" todir="${install.common.lib}">
+ <mapper refid="remove-versions" />
+ </copy>
- <!-- JBM examples for JBoss 5 -->
- <mkdir dir="${install.examples.jms}"/>
- <copy todir="${install.examples.jms}" filtering="no">
- <fileset dir="${messaging.module.output}/etc/">
- </fileset>
- </copy>
- <!-- need to copy the following files as AS5 build while change the contents of them -->
- <copy todir="${install.examples.jms}/examples/secure-socket/etc/" overwrite="yes">
- <fileset dir="${project.root}/${messaging.module.name}/src/etc/examples/secure-socket/etc">
- <include name="messaging.keystore"/>
- <include name="messaging.truststore"/>
- </fileset>
- </copy>
+ <copy file="${org.jboss.jbossas:jboss-as-hornetq-int:jar}" todir="${install.common.lib}">
+ <mapper refid="remove-versions" />
+ </copy>
- </target>
+ <copy file="${org.hornetq:hornetq-jms-client:jar}" todir="${install.common.lib}">
+ <mapper refid="remove-versions" />
+ </copy>
- <target name="module-messaging-all" depends="module-messaging">
-
- <!-- Copy the generated javadocs -->
- <mkdir dir="${install.api}/${messaging.module.name}"/>
- <copy todir="${install.api}/${messaging.module.name}" filtering="no">
- <fileset dir="${messaging.module.output}/api">
- <include name="**/*"/>
- </fileset>
+ <copy file="${org.hornetq:hornetq-jms:jar}" todir="${install.common.lib}">
+ <mapper refid="remove-versions" />
</copy>
+
+
+ <!--
+ Default configuration
+ -->
+ <mkdir dir="${install.default.deploy}/hornetq.sar"/>
+ <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.default.deploy}/hornetq.sar">
+ <patternset>
+ <include name="jboss-as/non-clustered/*"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+ <mkdir dir="${install.default.deploy}/hornetq-ra.rar"/>
+ <mkdir dir="${install.default.deploy}/hornetq-ra.rar/META-INF"/>
+ <copy file="${org.hornetq:hornetq-ra:jar}" todir="${install.default.deploy}/hornetq-ra.rar">
+ <mapper refid="remove-versions" />
+ </copy>
+ <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.default.deploy}/hornetq-ra.rar/META-INF">
+ <patternset>
+ <include name="ra.xml"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+
+ <!--
+ All configuration
+ -->
+ <mkdir dir="${install.all.deploy}/hornetq.sar"/>
+ <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.all.deploy}/hornetq.sar">
+ <patternset>
+ <include name="jboss-as/clustered/*"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+ <mkdir dir="${install.all.deploy}/hornetq-ra.rar"/>
+ <mkdir dir="${install.all.deploy}/hornetq-ra.rar/META-INF"/>
+ <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.all.deploy}/hornetq-ra.rar/META-INF">
+ <patternset>
+ <include name="ra.xml"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+
</target>
<!-- ======== -->
@@ -2027,7 +1976,7 @@
<fileset refid="javax.mail:mail:jar"/>
<fileset refid="javax.validation:validation-api:jar"/>
<fileset refid="org.jboss.mc-int:jboss-mc-int-servlet:jar"/>
- <fileset refid="jboss.messaging:jboss-messaging:jar"/>
+ <!-- <fileset refid="jboss.messaging:jboss-messaging:jar"/> -->
<fileset refid="org.beanshell:bsh:jar"/>
<fileset refid="joesnmp:joesnmp:jar"/>
<fileset refid="wutka-dtdparser:dtdparser:jar"/>
@@ -2155,7 +2104,6 @@
<fileset refid="org.jboss.naming:jnp-client:jar"/>
<fileset refid="org.jboss.security:jbosssx-client:jar"/>
<fileset refid="org.jboss.mx:jboss-j2se:jar"/>
- <fileset refid="org.jboss.mx:jboss-jmx-annotations:jar"/>
<fileset refid="org.jboss.mx:jboss-jmx:jar"/>
<fileset refid="org.jboss.metadata:jboss-metadata-common:jar"/>
<fileset refid="org.jboss.metadata:jboss-metadata-client:jar"/>
@@ -2210,7 +2158,7 @@
<fileset refid="log4j:log4j:jar"/>
<fileset refid="gnu-getopt:getopt:jar"/>
<fileset refid="oswego-concurrent:concurrent:jar"/>
- <fileset refid="jboss.messaging:jboss-messaging-client:jar"/>
+ <!-- <fileset refid="jboss.messaging:jboss-messaging-client:jar"/> -->
<fileset refid="org.jboss.security:jbosssx-client:jar"/>
<fileset refid="apache-scout:scout:jar"/>
<fileset refid="jacorb:jacorb:jar"/>
Modified: branches/Branch_Hornet_Temporary_2/build/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/build/pom.xml 2010-01-25 01:39:34 UTC (rev 99865)
+++ branches/Branch_Hornet_Temporary_2/build/pom.xml 2010-01-25 02:09:18 UTC (rev 99866)
@@ -97,6 +97,11 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-hornetq-int</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-iiop</artifactId>
<optional>true</optional>
@@ -317,21 +322,46 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>jboss.messaging</groupId>
- <artifactId>jboss-messaging</artifactId>
- <optional>true</optional>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jboss-as-integration</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-resources</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-bootstrap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-ra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-resources</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-transports</artifactId>
+ </dependency>
<dependency>
- <groupId>jboss.messaging</groupId>
- <artifactId>jboss-messaging-client</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>jboss.messaging</groupId>
- <artifactId>resources</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>jboss.web</groupId>
<artifactId>el-api</artifactId>
<optional>true</optional>
Modified: branches/Branch_Hornet_Temporary_2/client/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/client/pom.xml 2010-01-25 01:39:34 UTC (rev 99865)
+++ branches/Branch_Hornet_Temporary_2/client/pom.xml 2010-01-25 02:09:18 UTC (rev 99866)
@@ -181,11 +181,6 @@
</dependency>
<dependency>
- <groupId>jboss.messaging</groupId>
- <artifactId>jboss-messaging</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
</dependency>
Modified: branches/Branch_Hornet_Temporary_2/component-matrix/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/component-matrix/pom.xml 2010-01-25 01:39:34 UTC (rev 99865)
+++ branches/Branch_Hornet_Temporary_2/component-matrix/pom.xml 2010-01-25 02:09:18 UTC (rev 99866)
@@ -52,7 +52,7 @@
<version.commons.beanutils>1.8.0</version.commons.beanutils>
<version.fastinfoset>1.2.2</version.fastinfoset>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
- <version.jboss.messaging>1.4.1.GA</version.jboss.messaging>
+ <version.hornetq>2.0.0.GA</version.hornetq>
<version.jboss.web>3.0.0-beta-1</version.jboss.web>
<version.jgroups>2.6.13.GA</version.jgroups>
<version.junit>3.8.2</version.junit>
@@ -529,6 +529,62 @@
</dependency>
<dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-resources</artifactId>
+ <version>${version.hornetq}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-bootstrap</artifactId>
+ <version>${version.hornetq}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core-client</artifactId>
+ <version>${version.hornetq}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core</artifactId>
+ <version>${version.hornetq}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jboss-as-integration</artifactId>
+ <version>${version.hornetq}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ <version>${version.hornetq}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms</artifactId>
+ <version>${version.hornetq}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-logging</artifactId>
+ <version>${version.hornetq}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-ra</artifactId>
+ <version>${version.hornetq}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-resources</artifactId>
+ <version>${version.hornetq}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-transports</artifactId>
+ <version>${version.hornetq}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-current-invocation-aspects</artifactId>
<version>${version.org.jboss.aspects.currentinvocation}</version>
Property changes on: branches/Branch_Hornet_Temporary_2/hornetq-int
___________________________________________________________________
Name: svn:ignore
+ target
.settings
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/.classpath
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/.classpath (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/.classpath 2010-01-25 02:09:18 UTC (rev 99866)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/.project
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/.project (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/.project 2010-01-25 02:09:18 UTC (rev 99866)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-as-messaging</name>
+ <comment>JBoss Application Server (messaging module)</comment>
+ <projects>
+ <project>jboss-as-connector</project>
+ <project>jboss-as-deployment</project>
+ <project>jboss-as-ejb3</project>
+ <project>jboss-as-iiop</project>
+ <project>jboss-as-main</project>
+ <project>jboss-as-security</project>
+ <project>jboss-as-server</project>
+ <project>jboss-as-system</project>
+ <project>jboss-as-system-jmx</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/README.txt
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/README.txt (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/README.txt 2010-01-25 02:09:18 UTC (rev 99866)
@@ -0,0 +1,10 @@
+$Id: README.txt 82920 2009-01-15 17:29:45Z pgier $
+The messaging project deals with integration of the JBoss Messaging code into
+the JBossAS server.
+
+src/etc/aspects - aop aspects that apply to messaging client/server classes
+src/etc/deploy/clustered -
+src/etc/deploy/common -
+src/etc/deploy/non-clustered -
+src/etc/xmbean - XMBean descriptors
+src/etc/examples - messaging examples
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/build.bat
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/build.bat (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/build.bat 2010-01-25 02:09:18 UTC (rev 99866)
@@ -0,0 +1,90 @@
+ at echo off
+REM ======================================================================
+REM
+REM This is the main entry point for the build system.
+REM
+REM Users should be sure to execute this file rather than 'mvn' to ensure
+REM the correct version is being used with the correct configuration.
+REM
+REM ======================================================================
+REM
+REM $Id: build.bat 85700 2009-03-10 22:06:28Z pgier $
+REM
+REM Authors:
+REM Jason Dillon <jason at planet57.com>
+REM Sacha Labourey <sacha.labourey at cogito-info.ch>
+REM
+
+REM ******************************************************
+REM Ignore the MAVEN_HOME variable: we want to use *our*
+REM Maven version and associated JARs.
+REM ******************************************************
+REM Ignore the users classpath, cause it might mess
+REM things up
+REM ******************************************************
+
+SETLOCAL
+
+set CLASSPATH=
+set MAVEN_HOME=
+
+REM ******************************************************
+REM - "for" loops have been unrolled for compatibility
+REM with some WIN32 systems.
+REM ******************************************************
+
+set NAMES=tools;tools\maven;tools\apache\maven
+set SUBFOLDERS=..;..\..;..\..\..;..\..\..\..
+
+REM ******************************************************
+REM ******************************************************
+
+SET EXECUTED=FALSE
+for %%i in (%NAMES%) do call :subLoop %%i %1 %2 %3 %4 %5 %6
+
+goto :EOF
+
+
+REM ******************************************************
+REM ********* Search for names in the subfolders *********
+REM ******************************************************
+
+:subLoop
+for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\mvn.bat %2 %3 %4 %5 %6 %7
+
+goto :EOF
+
+
+REM ******************************************************
+REM ************ Test if Maven Batch file exists ***********
+REM ******************************************************
+
+:testIfExists
+if exist %1 call :BatchFound %1 %2 %3 %4 %5 %6 %7 %8
+
+goto :EOF
+
+
+REM ******************************************************
+REM ************** Batch file has been found *************
+REM ******************************************************
+
+:BatchFound
+if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %2 %3 %4 %5 %6 %7 %8
+set EXECUTED=TRUE
+
+goto :EOF
+
+REM ******************************************************
+REM ************* Execute Batch file only once ***********
+REM ******************************************************
+
+:ExecuteBatch
+echo Calling %1 %2 %3 %4 %5 %6 %7 %8
+set GOAL=%2
+if "%GOAL%"=="" set GOAL=install
+call %1 %GOAL% %3 %4 %5 %6 %7 %8
+
+:end
+
+if "%NOPAUSE%" == "" pause
Property changes on: branches/Branch_Hornet_Temporary_2/hornetq-int/build.bat
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/build.sh
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/build.sh (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/build.sh 2010-01-25 02:09:18 UTC (rev 99866)
@@ -0,0 +1,175 @@
+#!/bin/sh
+### ====================================================================== ###
+## ##
+## This is the main entry point for the build system. ##
+## ##
+## Users should execute this file rather than 'mvn' to ensure ##
+## the correct version is being used with the correct configuration. ##
+## ##
+### ====================================================================== ###
+
+# $Id: build.sh 85700 2009-03-10 22:06:28Z pgier $
+
+PROGNAME=`basename $0`
+DIRNAME=`dirname $0`
+GREP="grep"
+ROOT="/"
+
+# Ignore user's MAVEN_HOME if it is set
+MAVEN_HOME=""
+
+# the default search path for maven
+MAVEN_SEARCH_PATH="\
+ tools
+ tools/maven \
+ tools/apache/maven \
+ maven"
+
+# the default arguments
+MVN_OPTIONS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that
+MAX_FD="maximum"
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+darwin=false;
+case "`uname`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+
+ Darwin*)
+ darwin=true
+ ;;
+esac
+
+#
+# Helper to complain.
+#
+die() {
+ echo "${PROGNAME}: $*"
+ exit 1
+}
+
+#
+# Helper to complain.
+#
+warn() {
+ echo "${PROGNAME}: $*"
+}
+
+#
+# Helper to source a file if it exists.
+#
+maybe_source() {
+ for file in $*; do
+ if [ -f "$file" ]; then
+ . $file
+ fi
+ done
+}
+
+search() {
+ search="$*"
+ for d in $search; do
+ MAVEN_HOME="`pwd`/$d"
+ MVN="$MAVEN_HOME/bin/mvn"
+ if [ -x "$MVN" ]; then
+ # found one
+ echo $MAVEN_HOME
+ break
+ fi
+ done
+}
+
+#
+# Main function.
+#
+main() {
+ # if there is a build config file. then source it
+ maybe_source "$DIRNAME/build.conf" "$HOME/.build.conf"
+
+ # Increase the maximum file descriptors if we can
+ if [ $cygwin = "false" ]; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ]; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
+ # use the system max
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ]; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+ fi
+
+ # try the search path
+ MAVEN_HOME=`search $MAVEN_SEARCH_PATH`
+
+ # try looking up to root
+ if [ "x$MAVEN_HOME" = "x" ]; then
+ target="build"
+ _cwd=`pwd`
+
+ while [ "x$MAVEN_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do
+ cd ..
+ cwd=`pwd`
+ MAVEN_HOME=`search $MAVEN_SEARCH_PATH`
+ done
+
+ # make sure we get back
+ cd $_cwd
+
+ if [ "$cwd" != "$ROOT" ]; then
+ found="true"
+ fi
+
+ # complain if we did not find anything
+ if [ "$found" != "true" ]; then
+ die "Could not locate Maven; check \$MVN or \$MAVEN_HOME."
+ fi
+ fi
+
+ # make sure we have one
+ MVN=$MAVEN_HOME/bin/mvn
+ if [ ! -x "$MVN" ]; then
+ die "Maven file is not executable: $MVN"
+ fi
+
+ # need to specify planet57/buildmagic protocol handler package
+ MVN_OPTS="-Djava.protocol.handler.pkgs=org.jboss.net.protocol"
+
+ # setup some build properties
+ MVN_OPTS="$MVN_OPTS -Dbuild.script=$0"
+
+ # change to the directory where the script lives so users are not forced
+ # to be in the same directory as build.xml
+ cd $DIRNAME
+
+ MVN_GOAL=$@
+ if [ -z "$MVN_GOAL" ]; then
+ MVN_GOAL="install"
+ fi
+
+ # export some stuff for maven
+ export MVN MAVEN_HOME MVN_OPTS MVN_GOAL
+
+
+ # execute in debug mode, or simply execute
+ if [ "x$MVN_DEBUG" != "x" ]; then
+ /bin/sh -x $MVN $MVN_OPTIONS $MVN_GOAL
+ else
+ exec $MVN $MVN_OPTIONS $MVN_GOAL
+ fi
+}
+
+##
+## Bootstrap
+##
+
+main "$@"
Property changes on: branches/Branch_Hornet_Temporary_2/hornetq-int/build.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/pom.xml (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/pom.xml 2010-01-25 02:09:18 UTC (rev 99866)
@@ -0,0 +1,111 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-hornetq-int</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Application Server HornetQ Integration</name>
+ <url>http://www.jboss.org/jbossas</url>
+ <description>JBoss Application Server (messaging module)</description>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <resources>
+ <resource>
+ <directory>src/resources</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-output</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- Compile (global dependencies) -->
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ejb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ear</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-rar</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-war</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-resources</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/destination/DestinationManager.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/destination/DestinationManager.java (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/destination/DestinationManager.java 2010-01-25 02:09:18 UTC (rev 99866)
@@ -0,0 +1,28 @@
+package org.jboss.jms.server.destination;
+
+public interface DestinationManager {
+
+ /**
+ * Creates a JMS Queue with the specified name and JNDI binding.
+ *
+ * @return {@code true} if the queue was created, {@code false} else
+ */
+ boolean createQueue(String name, String jndiBinding) throws Exception;
+
+ /**
+ * Destroys a JMS Queue with the specified name.
+ *
+ * @return {@code true} if the queue was destroyed, {@code false} else
+ */
+ boolean destroyQueue(String name) throws Exception;
+
+ /**
+ * Creates a JMS Topic with the specified name and JNDI binding.
+ *
+ * @return {@code true} if the topic was created, {@code false} else
+ */
+ boolean createTopic(String name, String jndiBinding) throws Exception;
+
+ boolean destroyTopic(String name) throws Exception;
+
+}
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/integration/DestinationFactoryDeployerPlugin.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/integration/DestinationFactoryDeployerPlugin.java (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/integration/DestinationFactoryDeployerPlugin.java 2010-01-25 02:09:18 UTC (rev 99866)
@@ -0,0 +1,102 @@
+package org.jboss.jms.server.integration;
+
+import javax.jms.Queue;
+import javax.jms.Topic;
+
+import org.hornetq.jms.server.JMSServerManager;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.ejb.deployers.CreateDestinationFactory;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
+import org.jboss.metadata.ejb.spec.ActivationConfigMetaData;
+import org.jboss.metadata.ejb.spec.ActivationConfigPropertiesMetaData;
+import org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData;
+
+/**
+ * An integration point for the EJB deployers on creating destinations
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="clebert.suconic at jboss.com">Clebert Suconic</a>
+ * @version $Revision: 82920 $
+ */
+public class DestinationFactoryDeployerPlugin implements CreateDestinationFactory {
+
+ private static final Logger log = Logger
+ .getLogger(DestinationFactoryDeployerPlugin.class);
+
+ private JMSServerManager jmsManager;
+
+ public JMSServerManager getJmsManager() {
+ return jmsManager;
+ }
+
+ public void setJmsManager(JMSServerManager jmsManager) {
+ this.jmsManager = jmsManager;
+ }
+
+ public boolean create(DeploymentUnit unit, JBossMessageDrivenBeanMetaData mdb)
+ throws DeploymentException {
+ String destinationName = null;
+ String destinationType = null;
+
+ ActivationConfigMetaData activationConfig = mdb.getActivationConfig();
+ if (activationConfig != null) {
+ ActivationConfigPropertiesMetaData properties = activationConfig
+ .getActivationConfigProperties();
+ if (properties != null) {
+ destinationName = getActivationConfigProperty(properties,
+ "destination");
+ destinationType = getActivationConfigProperty(properties,
+ "destinationType");
+ }
+ }
+
+ // TODO message-destination-link?
+
+ if (destinationName == null || destinationName.trim().length() == 0) {
+ log.warn("Unable to determine destination for " + mdb.getName());
+ return false;
+ }
+ boolean isTopic = false;
+ if (destinationType == null) {
+ log.warn("Unable to determine destination type for "
+ + mdb.getName());
+ return false;
+ } else if (destinationType.equals(Queue.class.getName())) {
+ // Its a queue
+ } else if (destinationType.equals(Topic.class.getName())) {
+ isTopic = true;
+ } else {
+ log.warn("Unknown destination type '" + destinationType + "' for "
+ + mdb.getName());
+ return false;
+ }
+
+ if (isTopic) {
+ System.out.println("Create topic " + destinationName);
+ } else {
+ System.out.println("Create queue " + destinationName);
+ }
+
+ return true;
+ }
+
+ /**
+ * Get an activation config property
+ *
+ * @param properties
+ * the properties
+ * @param name
+ * the name
+ * @return the property or null if not found
+ */
+ protected static String getActivationConfigProperty(
+ ActivationConfigPropertiesMetaData properties, String name) {
+ ActivationConfigPropertyMetaData property = properties.get(name);
+ if (property == null)
+ return null;
+ return property.getValue();
+ }
+
+}
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQAdminFactory.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQAdminFactory.java (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQAdminFactory.java 2010-01-25 02:09:18 UTC (rev 99866)
@@ -0,0 +1,26 @@
+package org.jboss.jms.testintegration;
+
+import javax.management.MBeanServerConnection;
+import javax.naming.InitialContext;
+
+
+public class HornetQAdminFactory extends JMSTestAdminFactory
+{
+
+ MBeanServerConnection server;
+
+ @Override
+ public JMSTestAdmin newAdmin() throws Exception
+ {
+ if (server == null)
+ {
+ InitialContext ctx = new InitialContext();
+ String adaptorName = System.getProperty("jbosstest.server.name",
+ "jmx/invoker/RMIAdaptor");
+ server = (MBeanServerConnection) ctx.lookup(adaptorName);
+ ctx.close();
+ }
+ return new HornetQTestAdmin(server);
+ }
+
+}
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java 2010-01-25 02:09:18 UTC (rev 99866)
@@ -0,0 +1,54 @@
+package org.jboss.jms.testintegration;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import org.jboss.util.NestedRuntimeException;
+
+public class HornetQTestAdmin implements JMSTestAdmin
+{
+ private final MBeanServerConnection jmx;
+
+ protected static final ObjectName hornetQJMSServerName;
+
+ static
+ {
+ try
+ {
+ hornetQJMSServerName = new ObjectName("module=JMS,type=Server");
+ } catch (Exception e)
+ {
+ throw new NestedRuntimeException(e);
+ }
+ }
+
+ public HornetQTestAdmin(MBeanServerConnection connection)
+ {
+ this.jmx = connection;
+ }
+
+ public Object createQueue(String name, TestRole[] securityConfig) throws Exception
+ {
+ jmx.invoke(hornetQJMSServerName, "createQueue", new Object[]{name, "/queue/" + name}, new String[] {"java.lang.String", "java.lang.String"});
+ return name;
+ }
+
+ public Object createTopic(String name, TestRole[] securityConfig) throws Exception
+ {
+ jmx.invoke(hornetQJMSServerName, "createTopic", new Object[]{name, "/queue/" + name}, new String[] {"java.lang.String", "java.lang.String"});
+ return name;
+ }
+
+ public void deleteQueue(Object name)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void deleteTopic(Object name)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdmin.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdmin.java (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdmin.java 2010-01-25 02:09:18 UTC (rev 99866)
@@ -0,0 +1,24 @@
+package org.jboss.jms.testintegration;
+
+/**
+ *
+ * @author <mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
+ *
+ */
+public interface JMSTestAdmin
+{
+ /**
+ *
+ * @param name
+ * @param securityConfig
+ * @return information about the deployment required to undeploy/remove the topic
+ * @throws Exception
+ */
+ Object createTopic(String name, TestRole[] securityConfig) throws Exception;
+
+ void deleteTopic(Object topic);
+
+ Object createQueue(String name, TestRole[] securityConfig) throws Exception;
+
+ void deleteQueue(Object queue);
+}
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdminFactory.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdminFactory.java (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdminFactory.java 2010-01-25 02:09:18 UTC (rev 99866)
@@ -0,0 +1,13 @@
+package org.jboss.jms.testintegration;
+
+
+public abstract class JMSTestAdminFactory
+{
+ public static JMSTestAdminFactory getFactory()
+ {
+ // TODO: make this configurable
+ return new HornetQAdminFactory();
+ }
+
+ public abstract JMSTestAdmin newAdmin() throws Exception;
+}
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/TestRole.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/TestRole.java (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/TestRole.java 2010-01-25 02:09:18 UTC (rev 99866)
@@ -0,0 +1,53 @@
+package org.jboss.jms.testintegration;
+
+public class TestRole
+{
+ private String name;
+
+ private boolean read;
+
+ private boolean write;
+
+ private boolean create;
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public boolean isRead()
+ {
+ return read;
+ }
+
+ public void setRead(boolean read)
+ {
+ this.read = read;
+ }
+
+ public boolean isWrite()
+ {
+ return write;
+ }
+
+ public void setWrite(boolean write)
+ {
+ this.write = write;
+ }
+
+ public boolean isCreate()
+ {
+ return create;
+ }
+
+ public void setCreate(boolean create)
+ {
+ this.create = create;
+ }
+
+}
Modified: branches/Branch_Hornet_Temporary_2/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/pom.xml 2010-01-25 01:39:34 UTC (rev 99865)
+++ branches/Branch_Hornet_Temporary_2/pom.xml 2010-01-25 02:09:18 UTC (rev 99866)
@@ -383,7 +383,7 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-messaging</artifactId>
+ <artifactId>jboss-as-hornetq-int</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -568,7 +568,7 @@
<module>jbossas-remoting</module>
<module>jmx-remoting</module>
<module>jbossas-jmx-remoting</module>
- <module>messaging</module>
+ <module>hornetq-int</module>
<module>cluster</module>
<module>varia</module>
<module>iiop</module>
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-01-25 01:39:34 UTC (rev 99865)
+++ branches/Branch_Hornet_Temporary_2/server/src/etc/deployers/ejb-deployer-jboss-beans.xml 2010-01-25 02:09:18 UTC (rev 99866)
@@ -99,20 +99,19 @@
</bean>
<!-- Destination creator for JBoss Messaging -->
- <bean name="JBossMessageDestinationCreator" class="org.jboss.ejb.deployers.CreateDestination">
+ <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">jms-ra.rar</property>
+ <property name="rarName">hornetq-ra.rar</property>
</bean>
</property>
<!-- Create a destination with JBoss Messaging -->
<property name="factory">
- <bean class="org.jboss.jms.server.destination.JBossMessagingCreateDestinationFactory">
- <property name="serverPeerName">jboss.messaging:service=ServerPeer</property>
- <property name="postOfficeName">jboss.messaging:service=PostOffice</property>
+ <bean class="org.jboss.jms.server.integration.DestinationFactoryDeployerPlugin">
+ <property name="jmsManager"><inject bean="JMSServerManager"/></property>
</bean>
</property>
</bean>
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-01-25 01:39:34 UTC (rev 99865)
+++ branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestinationDeployer.java 2010-01-25 02:09:18 UTC (rev 99866)
@@ -79,6 +79,7 @@
*/
public void removeCreateDestination(CreateDestination factory)
{
+ System.out.println("Adding createDestination " + factory.getClass().getCanonicalName());
if (factory == null)
throw new IllegalArgumentException("Null factory");
factories.add(factory);
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-01-25 01:39:34 UTC (rev 99865)
+++ branches/Branch_Hornet_Temporary_2/server/src/main/java/org/jboss/ejb/deployers/CreateDestinationFactory.java 2010-01-25 02:09:18 UTC (rev 99866)
@@ -41,5 +41,5 @@
* @return the attachment
* @throws DeploymentException for any error
*/
- Object create(DeploymentUnit unit, JBossMessageDrivenBeanMetaData mdb) throws DeploymentException;
+ boolean create(DeploymentUnit unit, JBossMessageDrivenBeanMetaData mdb) throws DeploymentException;
}
More information about the jboss-cvs-commits
mailing list