[jboss-cvs] JBossAS SVN: r100442 - in branches/Branch_Hornet_Temporary_2: build and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 4 17:51:00 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-02-04 17:50:59 -0500 (Thu, 04 Feb 2010)
New Revision: 100442
Added:
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployer/JMSDeployer.java
branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/hornetq-deployer-jboss-beans.xml
Modified:
branches/Branch_Hornet_Temporary_2/README.txt
branches/Branch_Hornet_Temporary_2/build/build.xml
branches/Branch_Hornet_Temporary_2/component-matrix/pom.xml
branches/Branch_Hornet_Temporary_2/hornetq-int/pom.xml
branches/Branch_Hornet_Temporary_2/resteasy-int/.settings/org.maven.ide.eclipse.prefs
Log:
Adding deployers
Modified: branches/Branch_Hornet_Temporary_2/README.txt
===================================================================
--- branches/Branch_Hornet_Temporary_2/README.txt 2010-02-04 21:25:28 UTC (rev 100441)
+++ branches/Branch_Hornet_Temporary_2/README.txt 2010-02-04 22:50:59 UTC (rev 100442)
@@ -59,3 +59,7 @@
cd joram-tests
mvn install
+
+on hornetq's trunk (https://svn.jboss.org/repos/hornetq/trunk)
+./build.sh jar
+./build.sh -f build-maven.xml install
Modified: branches/Branch_Hornet_Temporary_2/build/build.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/build/build.xml 2010-02-04 21:25:28 UTC (rev 100441)
+++ branches/Branch_Hornet_Temporary_2/build/build.xml 2010-02-04 22:50:59 UTC (rev 100442)
@@ -1788,6 +1788,8 @@
</patternset>
<mapper type="flatten"/>
</unzip>
+
+
<!--
@@ -1808,7 +1810,7 @@
<mapper type="flatten"/>
</unzip>
- <!-- The hibernate-int module output -->
+ <!-- The hornetq-int module output -->
<copy file="${hornetq.module.output}/jboss-as-hornetq-int.jar"
todir="${install.common.lib}/" filtering="no" />
@@ -1818,6 +1820,10 @@
</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"/>
+
+
</target>
<target name="module-hornetq-int-all" depends="module-hornetq-int">
@@ -1828,6 +1834,8 @@
<include name="**/*"/>
</fileset>
</copy>
+
+
</target>
<!-- ================= -->
Modified: branches/Branch_Hornet_Temporary_2/component-matrix/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/component-matrix/pom.xml 2010-02-04 21:25:28 UTC (rev 100441)
+++ branches/Branch_Hornet_Temporary_2/component-matrix/pom.xml 2010-02-04 22:50:59 UTC (rev 100442)
@@ -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.hornetq>2.0.0.GA</version.hornetq>
+ <version.hornetq>2.1.0.snapshot</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>
Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/pom.xml 2010-02-04 21:25:28 UTC (rev 100441)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/pom.xml 2010-02-04 22:50:59 UTC (rev 100442)
@@ -30,6 +30,7 @@
<excludes>
<exclude>org/jboss/as/integration/hornetq/jopr/**</exclude>
<exclude>**/rhq-plugin.xml</exclude>
+ <exclude>**/hornetq-deployer-beans.xml</exclude>
</excludes>
</configuration>
</plugin>
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployer/JMSDeployer.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployer/JMSDeployer.java (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployer/JMSDeployer.java 2010-02-04 22:50:59 UTC (rev 100442)
@@ -0,0 +1,69 @@
+package org.jboss.as.integration.hornetq.deployer;
+
+import java.io.InputStream;
+
+import org.hornetq.core.config.Configuration;
+import org.hornetq.jms.server.JMSServerConfigParser;
+import org.hornetq.jms.server.JMSServerManager;
+import org.hornetq.jms.server.config.JMSConfiguration;
+import org.hornetq.jms.server.config.impl.JMSConfigurationImpl;
+import org.hornetq.jms.server.impl.JMSServerConfigParserImpl;
+import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.virtual.VirtualFile;
+
+public class JMSDeployer extends AbstractVFSParsingDeployer<JMSConfiguration>{
+ public static final String FILENAME = "hornetq-jms.xml";
+
+
+ private final Configuration configuration;
+ private final JMSServerManager jmsServer;
+ private final JMSServerConfigParser jmsConfigParser;
+
+
+ public JMSDeployer(Configuration hornetQConfig, JMSServerManager jmsServer)
+ {
+ super(JMSConfiguration.class);
+
+ this.configuration = hornetQConfig;
+ this.jmsServer = jmsServer;
+ this.jmsConfigParser = new JMSServerConfigParserImpl(configuration);
+ setName(FILENAME);
+ }
+
+
+ @Override
+ protected JMSConfiguration parse(VFSDeploymentUnit unit, VirtualFile file,
+ JMSConfiguration root) throws Exception {
+
+ for (int i = 0 ; i < 100; i++) System.out.println("Deployed file " + file);
+
+ System.out.flush();
+
+
+ InputStream deploymentStream = null;
+
+ try
+ {
+ deploymentStream = file.openStream();
+ JMSConfiguration config = jmsConfigParser.parseConfiguration(deploymentStream);
+ System.out.println("Config = " + config);
+
+ System.out.flush();
+
+ return config;
+ }
+ finally
+ {
+ try
+ {
+ deploymentStream.close();
+ }
+ catch (Exception ignored)
+ {
+ }
+ }
+ }
+
+
+}
Added: branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/hornetq-deployer-jboss-beans.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/hornetq-deployer-jboss-beans.xml (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/hornetq-deployer-jboss-beans.xml 2010-02-04 22:50:59 UTC (rev 100442)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="HornetJMSDeployer" class="org.jboss.as.integration.hornetq.deployer.JMSDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="JMSServerManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
\ No newline at end of file
Modified: branches/Branch_Hornet_Temporary_2/resteasy-int/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- branches/Branch_Hornet_Temporary_2/resteasy-int/.settings/org.maven.ide.eclipse.prefs 2010-02-04 21:25:28 UTC (rev 100441)
+++ branches/Branch_Hornet_Temporary_2/resteasy-int/.settings/org.maven.ide.eclipse.prefs 2010-02-04 22:50:59 UTC (rev 100442)
@@ -1,8 +1,9 @@
-#Mon Aug 03 19:49:17 PDT 2009
+#Thu Feb 04 10:30:53 CST 2010
activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
includeModules=false
resolveWorkspaceProjects=true
resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
version=1
More information about the jboss-cvs-commits
mailing list