[jboss-cvs] JBossAS SVN: r59662 - in trunk/embedded: src/main/java/org/jboss/embedded and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 15 17:49:32 EST 2007
Author: bill.burke at jboss.com
Date: 2007-01-15 17:49:28 -0500 (Mon, 15 Jan 2007)
New Revision: 59662
Added:
trunk/embedded/src/main/java/org/jboss/embedded/util/
trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperties.java
Modified:
trunk/embedded/build.xml
trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java
trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml
trunk/embedded/src/main/resources/javase/conf/login-config.xml
Log:
add JMS to embedded distribution
Modified: trunk/embedded/build.xml
===================================================================
--- trunk/embedded/build.xml 2007-01-15 22:17:22 UTC (rev 59661)
+++ trunk/embedded/build.xml 2007-01-15 22:49:28 UTC (rev 59662)
@@ -275,12 +275,33 @@
</fileset>
</jar>
+ <jar jarfile="${build.lib}/jms-ra.rar">
+ <fileset dir="../connector/src/resources/jms-rar">
+ <include name="META-INF/ra.xml"/>
+ </fileset>
+ </jar>
+
<copy todir="${build.lib}/embedded-jboss/bootstrap/deploy">
<fileset dir="${build.lib}">
<include name="*.rar"/>
</fileset>
</copy>
+ <mkdir dir="${build.lib}/embedded-jboss/bootstrap/deploy/messaging"/>
+
+ <copy todir="${build.lib}/embedded-jboss/bootstrap/deploy/messaging">
+ <fileset dir="../messaging/output/etc/deploy">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${build.lib}/embedded-jboss/bootstrp/conf/props"/>
+ <copy todir="${build.lib}/embedded-jboss/bootstrap/conf/props">
+ <fileset dir="../messaging/output/etc/deploy">
+ <include name="*.properties"/>
+ </fileset>
+ </copy>
+
<mkdir dir="${build.lib}/embedded-jboss/optional-lib"/>
<copy todir="${build.lib}/embedded-jboss/optional-lib">
@@ -345,6 +366,7 @@
<zipfileset src="${jboss.jca.lib}/jboss-common-jdbc-wrapper.jar"/>
<zipfileset src="${jboss.jca.lib}/jboss-local-jdbc.jar"/>
<zipfileset src="${jboss.jca.lib}/jboss-xa-jdbc.jar"/>
+ <zipfileset src="${jboss.jca.lib}/jms-ra.jar"/>
<zipfileset src="${jboss.jmx.lib}/jboss-jmx.jar"/>
<zipfileset src="${jboss.mbeans.lib}/jboss-mbeans.jar"/>
<zipfileset src="${jboss.system.lib}/jboss-system.jar"/>
@@ -356,6 +378,8 @@
<zipfileset src="${jboss.jbossws.lib}/jboss-jaxrpc.jar"/>
<zipfileset src="${jboss.jbossws.lib}/jboss-jaxws.jar"/>
<zipfileset src="${jboss.jboss.vfs.lib}/jboss-vfs.jar"/>
+ <zipfileset src="${jboss.messaging.lib}/jboss-messaging.jar"/>
+ <zipfileset src="../messaging/output/lib/jboss-messaging-int.jar"/>
</jar>
Modified: trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java 2007-01-15 22:17:22 UTC (rev 59661)
+++ trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java 2007-01-15 22:49:28 UTC (rev 59662)
@@ -130,7 +130,6 @@
{
BeanXMLDeployer deployer = new BeanXMLDeployer(kernel);
deployer.deploy(url);
- deployer.validate();
mainDeployer = (MainDeployer)kernel.getRegistry().getEntry("MainDeployer").getTarget();
}
catch (Throwable throwable)
Added: trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperties.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperties.java 2007-01-15 22:17:22 UTC (rev 59661)
+++ trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperties.java 2007-01-15 22:49:28 UTC (rev 59662)
@@ -0,0 +1,55 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.embedded.util;
+
+import java.util.Map;
+
+/**
+ * little class to set system properties
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision: 1.1 $
+ */
+public class SystemProperties
+{
+ private Map<String, String> properties;
+
+
+ public Map<String, String> getProperties()
+ {
+ return properties;
+ }
+
+ public void setProperties(Map<String, String> properties)
+ {
+ this.properties = properties;
+ }
+
+ public void start()
+ {
+ for (String key : properties.keySet())
+ {
+ String value = properties.get(key);
+ System.setProperty(key, value);
+ }
+ }
+}
Modified: trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml 2007-01-15 22:17:22 UTC (rev 59661)
+++ trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml 2007-01-15 22:49:28 UTC (rev 59662)
@@ -5,6 +5,17 @@
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="SystemProperties" class="org.jboss.embedded.util.SystemProperties">
+ <property name="properties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>jboss.bind.address</key>
+ <value>0.0.0.0</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
<bean name="ServerConfig" class="org.jboss.embedded.ServerConfig"/>
<!-- The legacy JMX kernel -->
Modified: trunk/embedded/src/main/resources/javase/conf/login-config.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/conf/login-config.xml 2007-01-15 22:17:22 UTC (rev 59661)
+++ trunk/embedded/src/main/resources/javase/conf/login-config.xml 2007-01-15 22:49:28 UTC (rev 59662)
@@ -39,6 +39,17 @@
</login-module>
</authentication>
</application-policy>
+
+ <application-policy name="messaging">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag = "required">
+ <module-option name="unauthenticatedIdentity">guest</module-option>
+ <module-option name="usersProperties">conf/props/messaging-users.properties</module-option>
+ <module-option name="rolesProperties">conf/props/messaging-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
<!-- Used by clients within the application server VM such as
mbeans and servlets that access EJBs.
More information about the jboss-cvs-commits
mailing list