[jboss-cvs] JBossAS SVN: r59860 - 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
Fri Jan 19 17:21:18 EST 2007
Author: bill.burke at jboss.com
Date: 2007-01-19 17:21:17 -0500 (Fri, 19 Jan 2007)
New Revision: 59860
Added:
trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperty.java
Removed:
trunk/embedded/bin2.bat
trunk/embedded/simple-beans.xml
trunk/embedded/src/main/resources/javase/conf/bootstrap-all-beans.xml
Modified:
trunk/embedded/build.xml
trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java
trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java
trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml
Log:
Make sure JBossTS uses data/ dir and point JBossTS to its configuration file
Deleted: trunk/embedded/bin2.bat
===================================================================
--- trunk/embedded/bin2.bat 2007-01-19 21:43:43 UTC (rev 59859)
+++ trunk/embedded/bin2.bat 2007-01-19 22:21:17 UTC (rev 59860)
@@ -1,8 +0,0 @@
-set CLASSPATH=output\lib\embedded-jboss\lib\jboss-embedded-all.jar;output\lib\embedded-jboss\lib\hibernate-all.jar;output\lib\embedded-jboss\lib\thirdparty-all.jar;output\lib\embedded-jboss\bootstrap;output\test-classes
-
-rem java -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=javadebug org.jboss.embedded.test.BeanCompilerTester simple-beans.xml
-
-java org.jboss.embedded.test.BeanCompilerTester simple-beans.xml
-
-
-
Modified: trunk/embedded/build.xml
===================================================================
--- trunk/embedded/build.xml 2007-01-19 21:43:43 UTC (rev 59859)
+++ trunk/embedded/build.xml 2007-01-19 22:21:17 UTC (rev 59860)
@@ -262,9 +262,16 @@
<copy todir="${build.lib}/embedded-jboss/bootstrap">
<fileset dir="${resources}/javase">
<include name="**/*"/>
+ <exclude name="conf/binarybootstrap-beans.xml"/>
</fileset>
</copy>
+ <copy todir="${build.lib}/embedded-jboss/bootstrap/conf">
+ <fileset dir="${jboss.jbossts.resources}">
+ <include name="jbossjta-properties.xml"/>
+ </fileset>
+ </copy>
+
<jar jarfile="${build.lib}/jboss-local-jdbc.rar">
<fileset dir="../connector/src/resources/local-rar">
<include name="META-INF/ra.xml"/>
@@ -296,7 +303,7 @@
</fileset>
</copy>
- <mkdir dir="${build.lib}/embedded-jboss/bootstrp/conf/props"/>
+ <mkdir dir="${build.lib}/embedded-jboss/bootstrap/conf/props"/>
<copy todir="${build.lib}/embedded-jboss/bootstrap/conf/props">
<fileset dir="../messaging/output/etc/deploy">
<include name="*.properties"/>
Deleted: trunk/embedded/simple-beans.xml
===================================================================
--- trunk/embedded/simple-beans.xml 2007-01-19 21:43:43 UTC (rev 59859)
+++ trunk/embedded/simple-beans.xml 2007-01-19 22:21:17 UTC (rev 59860)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- The bootstrap of the server
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="Two" class="org.jboss.embedded.test.SimpleBean">
- <property name="kernel">
- <inject bean="jboss.kernel:service=Kernel"/>
- </property>
- </bean>
-</deployment>
Modified: trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java 2007-01-19 21:43:43 UTC (rev 59859)
+++ trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java 2007-01-19 22:21:17 UTC (rev 59860)
@@ -38,9 +38,12 @@
import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URI;
import java.io.FileInputStream;
import java.io.ObjectInputStream;
import java.io.File;
+import java.io.FileOutputStream;
+import java.io.ObjectOutputStream;
import java.lang.reflect.Field;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.List;
@@ -72,17 +75,88 @@
return instance;
}
+ public static KernelDeployment parse(URL url)
+ throws JBossXBException, MalformedURLException
+ {
+ SchemaBindingResolver resolver = SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
+ UnmarshallerFactory factory = UnmarshallerFactory.newInstance();
+ Unmarshaller unmarshaller = factory.newUnmarshaller();
+ KernelDeployment deployment = (KernelDeployment) unmarshaller.unmarshal(url.toString(), resolver);
+ return deployment;
+ }
+
+ public static void store(KernelDeployment deployment, File binFile) throws Exception
+ {
+ FileOutputStream fos = new FileOutputStream(binFile);
+ ObjectOutputStream oos = new ObjectOutputStream(fos);
+ try
+ {
+ oos.writeObject(deployment);
+ }
+ finally
+ {
+ oos.close();
+ fos.close();
+ }
+ }
+
+ public static KernelDeployment load(File binFile) throws Exception
+ {
+ FileInputStream fis = new FileInputStream(binFile);
+ ObjectInputStream ois = new ObjectInputStream(fis);
+ try
+ {
+ KernelDeployment deployment = (KernelDeployment)ois.readObject();
+ return deployment;
+ }
+ finally
+ {
+ ois.close();
+ fis.close();
+ }
+ }
+
+
@Override
protected void bootstrapURL(URL url) throws DeploymentException
{
try
{
- String urlString = url.toString() + ".bin";
- url = new URL(urlString);
+ URI uri = url.toURI();
+ URI binUri = new URI(uri.toString() + ".bin");
+ File textFile = new File(uri);
+ File binFile = new File(binUri);
+ KernelDeployment deployment;
+
+
+ if (!binFile.exists() && !textFile.exists())
+ {
+ throw new DeploymentException("Unable to locate bootstrap file: " + url);
+ }
+ else if (binFile.exists() && textFile.exists())
+ {
+ if (textFile.lastModified() > binFile.lastModified())
+ {
+ deployment = parse(url);
+ store(deployment, binFile);
+ }
+ else
+ {
+ deployment = load(binFile);
+ }
+ }
+ else if (textFile.exists())
+ {
+ deployment = parse(url);
+ store(deployment, binFile);
+ }
+ else
+ {
+ deployment = load(binFile);
+ }
+
+
AbstractKernelDeployer deployer = new AbstractKernelDeployer(kernel);
- ObjectInputStream ois = new ObjectInputStream(url.openStream());
- KernelDeployment deployment = (KernelDeployment) ois.readObject();
- ois.close();
deployer.deploy(deployment);
mainDeployer = (MainDeployer) kernel.getRegistry().getEntry("MainDeployer").getTarget();
}
Modified: trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java 2007-01-19 21:43:43 UTC (rev 59859)
+++ trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java 2007-01-19 22:21:17 UTC (rev 59860)
@@ -32,6 +32,8 @@
import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
import org.jboss.virtual.VirtualFile;
import org.jboss.logging.Logger;
+import org.jboss.embedded.adapters.ServerConfig;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import java.net.URL;
import java.io.IOException;
@@ -141,6 +143,12 @@
{
try
{
+ // ServerConfig has to be created and installed before boostrap as we may want to use
+ // system properties set up in ServerConfig
+ ServerConfig config = new ServerConfig();
+ AbstractBeanMetaData bmd = new AbstractBeanMetaData("ServerConfig", ServerConfig.class.getName());
+ kernel.getController().install(bmd, config);
+
BeanXMLDeployer deployer = new BeanXMLDeployer(kernel);
deployer.deploy(url);
mainDeployer = (MainDeployer)kernel.getRegistry().getEntry("MainDeployer").getTarget();
Added: trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperty.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperty.java (rev 0)
+++ trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperty.java 2007-01-19 22:21:17 UTC (rev 59860)
@@ -0,0 +1,63 @@
+/*
+* 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 SystemProperty
+{
+ private String name;
+ private String value;
+
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public String getValue()
+ {
+ return value;
+ }
+
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
+
+ public void start()
+ {
+ System.setProperty(name, value);
+ System.out.println("System.setProperty("+name+","+value);
+ }
+}
Deleted: trunk/embedded/src/main/resources/javase/conf/bootstrap-all-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/conf/bootstrap-all-beans.xml 2007-01-19 21:43:43 UTC (rev 59859)
+++ trunk/embedded/src/main/resources/javase/conf/bootstrap-all-beans.xml 2007-01-19 22:21:17 UTC (rev 59860)
@@ -1,335 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- The bootstrap of the server
--->
-<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.adapters.ServerConfig"/>
-
- <!-- The legacy JMX kernel -->
- <bean name="JMXKernel" class="org.jboss.embedded.adapters.JMXKernel">
- <property name="kernel">
- <inject bean="jboss.kernel:service=Kernel"/>
- </property>
- <property name="serverConfig">
- <inject bean="ServerConfig"/>
- </property>
- </bean>
-
- <!-- The MainDeployer -->
- <bean name="MainDeployer" class="org.jboss.deployers.plugins.deployment.MainDeployerImpl">
- <property name="structureDeployers">
- <list>
- <!-- A declared structure descriptor deployer -->
- <bean name="DeclaredStructure" class="org.jboss.deployers.plugins.structure.vfs.explicit.DeclaredStructure">
- </bean>
- <!-- JAR Structure -->
- <bean name="JARStructure" class="org.jboss.deployers.plugins.structure.vfs.jar.JARStructure">
- <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop -->
- <constructor>
- <parameter>
- <set elementClass="java.lang.String">
- <value>.zip</value>
- <value>.ear</value>
- <value>.jar</value>
- <value>.rar</value>
- <value>.war</value>
- <value>.sar</value>
- <value>.har</value>
- <value>.aop</value>
- <value>.deployer</value>
- <value>.beans</value>
- </set>
- </parameter>
- </constructor>
- <property name="candidateStructureVisitorFactory">
- <!-- Any file that is not an ordinary directory is a candidate -->
- <bean name="JARStructureCandidates"
- class="org.jboss.deployers.plugins.structure.vfs.jar.JARCandidateStructureVisitorFactory">
- <!-- A filter to exclude some obvious non-subdeployments -->
- <property name="filter">
- <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
- <constructor>
- <parameter>
- <list elementClass="java.lang.String">
- <!-- Exclude class files as subdeployments -->
- <value>.class</value>
- </list>
- </parameter>
- </constructor>
- </bean>
- </property>
- </bean>
- </property>
- </bean>
- <!-- File Structure -->
- <bean name="FileStructure" class="org.jboss.deployers.plugins.structure.vfs.file.FileStructure">
- <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
- <constructor>
- <parameter>
- <set elementClass="java.lang.String">
- <value>-service.xml</value>
- <value>-beans.xml</value>
- <value>-ds.xml</value>
- <value>-aop.xml</value>
- </set>
- </parameter>
- </constructor>
- </bean>
- </list>
- </property>
- <property name="deployers">
- <list>
- <!-- POJO Deployment -->
- <bean name="BeanDeployer" class="org.jboss.deployers.plugins.deployers.kernel.BeanDeployer"/>
- <bean name="KernelDeploymentDeployer"
- class="org.jboss.deployers.plugins.deployers.kernel.KernelDeploymentDeployer"/>
- <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.plugins.deployers.kernel.BeanMetaDataDeployer">
- <constructor>
- <parameter>
- <inject bean="jboss.kernel:service=Kernel"/>
- </parameter>
- </constructor>
- </bean>
- <!-- JMX Deployment -->
- <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer"/>
- <bean name="ServiceClassLoaderDeployer" class="org.jboss.embedded.ClassLoaderDeployer"/>
- <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer"/>
- <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer">
- <constructor>
- <parameter>
- <inject bean="JMXKernel" property="serviceController"/>
- </parameter>
- </constructor>
- </bean>
- </list>
- </property>
- </bean>
-
- <!-- A filter for excluding files from the scanner -->
- <bean name="DeploymentFilter" class="org.jboss.virtual.plugins.vfs.helpers.ExtensibleFilter">
- <!-- Files starting with theses strings are ignored -->
- <property name="prefixes">#,%,\,,.,_$</property>
- <!-- Files ending with theses strings are ignored -->
- <property name="suffixes">#,$,%,~,\,v,.BAK,.bak,.old,.orig,.tmp,.rej,.sh</property>
- <!-- Files matching with theses strings are ignored -->
- <property name="matches">.make.state,.nse_depinfo,CVS,CVS.admin,RCS,RCSLOG,SCCS,TAGS,core,tags</property>
- </bean>
-
- <!--
- JNDI Initialization of basic beans (NO REMOTING)
- -->
- <bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
- <bean name="java:comp" class="org.jboss.naming.JavaCompInitializer"/>
-
- <!--
- Bootstrap old JMX-based core services
- setup deployers
- setup deploy/ directory
- -->
- <bean name="ResourcesToDeploy" class="org.jboss.embedded.DeploymentScanner">
- <property name="filter"><inject bean="DeploymentFilter"/></property>
- <property name="mainDeployer">
- <inject bean="MainDeployer"/>
- </property>
- <property name="kernel">
- <inject bean="jboss.kernel:service=Kernel"/>
- </property>
- <property name="resources">
- <list elementClass="java.lang.String">
- <value>${jboss.embedded.bootstrap.resource.path}conf/jboss-service.xml</value>
- </list>
- </property>
- </bean>
-
- <bean name="UserTransaction" class="org.jboss.embedded.adapters.LocalOnlyUserTransaction"/>
-
- <bean name="UserTransactionBinding" class="org.jboss.naming.JndiBinder">
- <property name="target"><inject bean="UserTransaction"/></property>
- <property name="bindTo">UserTransaction</property>
- <property name="serializable">false</property>
- </bean>
-
- <!-- Aspect Deployment -->
- <bean name="AspectDeployer" class="org.jboss.aop.deployers.AspectDeployer">
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
- </bean>
-
- <bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
-
- <bean name="EJBRegistrationDeployer" class="org.jboss.ejb3.deployers.EJBRegistrationDeployer">
- <install bean="MainDeployer" method="addDeployer">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="defaultPersistenceProperties"><inject bean="DefaultPersistenceProperties" property="properties"/></property>
- <property name="ignoredJarsSet">
- <set elementClass="java.lang.String">
- <value>snmp-adaptor.jar</value>
- <value>otherimages.jar</value>
- <value>applet.jar</value>
- <value>jcommon.jar</value>
- <value>console-mgr-classes.jar</value>
- <value>jfreechart.jar</value>
- <value>juddi-service.jar</value>
- <value>wsdl4j.jar</value>
- <value>commons-collections.jar</value>
- <value>commons-pool.jar</value>
- <value>juddi.jar</value>
- <value>commons-discovery.jar</value>
- <value>uddi4j.jar</value>
- <value>axis.jar</value>
- <value>commons-dbcp.jar</value>
- <value>jboss-juddiaxis.jar</value>
- <value>trove.jar</value>
- <value>javassist.jar</value>
- <value>jboss-aop-jdk50.jar</value>
- <value>jboss-aspect-library-jdk50.jar</value>
- <value>ejb3-persistence.jar</value>
- <value>commons-validator-1.1.3.jar</value>
- <value>commons-collections.jar</value>
- <value>commons-fileupload.jar</value>
- <value>commons-pool.jar</value>
- <value>hibernate-entitymanager.jar</value>
- <value>jboss-ejb3x.jar</value>
- <value>commons-digester-1.6.jar</value>
- <value>cglib-2.1.1.jar</value>
- <value>commons-discovery.jar</value>
- <value>jboss-annotations-ejb3.jar</value>
- <value>jaxen-1.1-beta-4.jar</value>
- <value>hibernate-annotations.jar</value>
- <value>commons-httpclient.jar</value>
- <value>commons-logging.jar</value>
- <value>commons-vfs.jar</value>
- <value>hibernate3.jar</value>
- <value>commons-logging-api.jar</value>
- <value>asm.jar</value>
- <value>asm-attrs.jar</value>
- <value>commons-lang-2.0.jar</value>
- <value>commons-beanutils.jar</value>
- <value>jboss-ejb3.jar</value>
- <value>dom4j.jar</value>
- <value>commons-codec-1.2.jar</value>
- <value>wsdl4j.jar</value>
- <value>xmlsec.jar</value>
- <value>jbossws.jar</value>
- <value>jboss-bean-deployer.jar</value>
- <value>jboss-microcontainer.jar</value>
- <value>jboss-dependency.jar</value>
- <value>jboss-container.jar</value>
- <value>tomcat-coyote.jar</value>
- <value>commons-collections.jar</value>
- <value>myfaces.jar</value>
- <value>jstl.jar</value>
- <value>commons-digester-1.6.jar</value>
- <value>myfaces-impl.jar</value>
- <value>commons-beanutils.jar</value>
- <value>myfaces-jsf-api.jar</value>
- <value>commons-codec-1.2.jar</value>
- <value>catalina-optional.jar</value>
- <value>tomcat-util.jar</value>
- <value>jasper-compiler.jar</value>
- <value>commons-el.jar</value>
- <value>jasper-compiler-jdt.jar</value>
- <value>tomcat-http.jar</value>
- <value>catalina-manager.jar</value>
- <value>jasper-runtime.jar</value>
- <value>tomcat55-service.jar</value>
- <value>servlets-invoker.jar</value>
- <value>catalina.jar</value>
- <value>naming-resources.jar</value>
- <value>servlets-default.jar</value>
- <value>tomcat-ajp.jar</value>
- <value>commons-modeler.jar</value>
- <value>tomcat-apr.jar</value>
- <value>servlets-webdav.jar</value>
- </set>
- </property>
- <depends>AspectDeployer</depends>
- </bean>
- <bean name="EJBStage2Deployer" class="org.jboss.ejb3.deployers.EJBStage2Deployer">
- <install bean="MainDeployer" method="addDeployer">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
- <depends>AspectDeployer</depends>
- </bean>
-
- <!-- RAR Deployment -->
- <bean name="RARParserDeployer" class="org.jboss.resource.deployers.RARParserDeployer">
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
- </bean>
- <bean name="RARDeployer" class="org.jboss.resource.deployers.RARDeployer">
- <property name="workManagerName">jboss.jca:service=WorkManager</property>
- <property name="XATerminatorName">jboss:service=TransactionManager</property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
- </bean>
-
- <!-- ConnectionFactory Deployment -->
- <bean name="ConnectionFactoryDeployer" class="org.jboss.system.deployers.ServiceXSLDeployer">
- <property name="suffix">-ds.xml</property>
- <property name="XSLPath">stylesheets/NoJRMPConnectionFactoryTemplate.xsl</property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
- </bean>
-
- <bean name="ResourcesToDeploy3" class="org.jboss.embedded.DeploymentScanner">
- <property name="filter"><inject bean="DeploymentFilter"/></property>
- <property name="mainDeployer">
- <inject bean="MainDeployer"/>
- </property>
- <property name="kernel">
- <inject bean="jboss.kernel:service=Kernel"/>
- </property>
- <property name="directoriesByResource">
- <list elementClass="java.lang.String">
- <value>${jboss.embedded.bootstrap.resource.path}conf/jboss-service.xml/../deploy</value>
- </list>
- </property>
- </bean>
-</deployment>
Modified: trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml 2007-01-19 21:43:43 UTC (rev 59859)
+++ trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml 2007-01-19 22:21:17 UTC (rev 59860)
@@ -12,12 +12,18 @@
<key>jboss.bind.address</key>
<value>0.0.0.0</value>
</entry>
+ <entry>
+ <key>com.arjuna.ats.arjuna.common.propertiesFile</key>
+ <value>${jboss.home.dir}/conf/jbossjta-properties.xml</value>
+ </entry>
+ <entry>
+ <key>com.arjuna.ats.arjuna.objectstore.objectStoreDir</key>
+ <value>${jboss.server.data.dir}/ObjectStore</value>
+ </entry>
</map>
</property>
</bean>
- <bean name="ServerConfig" class="org.jboss.embedded.adapters.ServerConfig"/>
-
<!-- The legacy JMX kernel -->
<bean name="JMXKernel" class="org.jboss.embedded.adapters.JMXKernel">
<property name="kernel">
@@ -140,7 +146,9 @@
setup deploy/ directory
-->
<bean name="ResourcesToDeploy" class="org.jboss.embedded.DeploymentScanner">
- <property name="filter"><inject bean="DeploymentFilter"/></property>
+ <property name="filter">
+ <inject bean="DeploymentFilter"/>
+ </property>
<property name="mainDeployer">
<inject bean="MainDeployer"/>
</property>
@@ -157,14 +165,18 @@
<bean name="UserTransaction" class="org.jboss.embedded.adapters.LocalOnlyUserTransaction"/>
<bean name="UserTransactionBinding" class="org.jboss.naming.JndiBinder">
- <property name="target"><inject bean="UserTransaction"/></property>
+ <property name="target">
+ <inject bean="UserTransaction"/>
+ </property>
<property name="bindTo">UserTransaction</property>
<property name="serializable">false</property>
</bean>
<bean name="ResourcesToDeploy2" class="org.jboss.embedded.DeploymentScanner">
- <property name="filter"><inject bean="DeploymentFilter"/></property>
+ <property name="filter">
+ <inject bean="DeploymentFilter"/>
+ </property>
<property name="mainDeployer">
<inject bean="MainDeployer"/>
</property>
@@ -178,7 +190,9 @@
</property>
</bean>
<bean name="ResourcesToDeploy3" class="org.jboss.embedded.DeploymentScanner">
- <property name="filter"><inject bean="DeploymentFilter"/></property>
+ <property name="filter">
+ <inject bean="DeploymentFilter"/>
+ </property>
<property name="mainDeployer">
<inject bean="MainDeployer"/>
</property>
More information about the jboss-cvs-commits
mailing list