[jboss-cvs] JBossAS SVN: r60471 - 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 Feb 9 17:22:00 EST 2007
Author: bill.burke at jboss.com
Date: 2007-02-09 17:21:59 -0500 (Fri, 09 Feb 2007)
New Revision: 60471
Modified:
trunk/embedded/compiler.bat
trunk/embedded/src/main/java/org/jboss/embedded/BeanCompiler.java
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/jboss-service.xml
trunk/embedded/src/main/resources/javase/deploy/hsqldb-ds.xml
Log:
make hypersonic persistent between reboots.
Modified: trunk/embedded/compiler.bat
===================================================================
--- trunk/embedded/compiler.bat 2007-02-09 22:21:21 UTC (rev 60470)
+++ trunk/embedded/compiler.bat 2007-02-09 22:21:59 UTC (rev 60471)
@@ -1,6 +1,6 @@
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
-java org.jboss.embedded.BeanCompiler %1
+java org.jboss.embedded.BeanCompiler %1 %2
Modified: trunk/embedded/src/main/java/org/jboss/embedded/BeanCompiler.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/BeanCompiler.java 2007-02-09 22:21:21 UTC (rev 60470)
+++ trunk/embedded/src/main/java/org/jboss/embedded/BeanCompiler.java 2007-02-09 22:21:59 UTC (rev 60471)
@@ -41,24 +41,30 @@
* @author <a href="bill at jboss.com">Bill Burke</a>
* @version $Revision: 1.1 $
*/
-public class BeanCompiler
+public class BeanCompiler
{
public static void main(String[] args) throws Exception
{
- System.out.println("compiling: " + args[0]);
- File fp = new File(args[0]);
-
+ for (String arg : args)
+ {
+ compile(arg);
+ }
+ }
+ public static void compile(String arg) throws Exception
+ {
+ System.out.println("compiling: " + arg);
+ File fp = new File(arg);
KernelDeployment deployment = parse(fp);
long start = System.currentTimeMillis();
- FileOutputStream fos = new FileOutputStream(args[0] + ".bin");
+ FileOutputStream fos = new FileOutputStream(arg + ".bin");
ObjectOutputStream oos = new ObjectOutputStream(fos);
oos.writeObject(deployment);
oos.close();
fos.close();
- FileInputStream fis = new FileInputStream(args[0] + ".bin");
+ FileInputStream fis = new FileInputStream(arg + ".bin");
ObjectInputStream ois = new ObjectInputStream(fis);
deployment = (KernelDeployment)ois.readObject();
ois.close();
@@ -75,8 +81,8 @@
public static KernelDeployment parse(File fp)
throws JBossXBException, MalformedURLException
{
+ long start = System.currentTimeMillis();
SchemaBindingResolver resolver = SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
- long start = System.currentTimeMillis();
UnmarshallerFactory factory = UnmarshallerFactory.newInstance();
Unmarshaller unmarshaller = factory.newUnmarshaller();
KernelDeployment deployment = (KernelDeployment) unmarshaller.unmarshal(fp.toURL().toString(), resolver);
Modified: trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java 2007-02-09 22:21:21 UTC (rev 60470)
+++ trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java 2007-02-09 22:21:59 UTC (rev 60471)
@@ -118,7 +118,7 @@
@Override
- protected void bootstrapURL(URL url) throws DeploymentException
+ protected void deployBaseBootstrapUrl(URL url) throws DeploymentException
{
try
{
@@ -137,6 +137,7 @@
{
if (textFile.lastModified() > binFile.lastModified())
{
+ System.out.println("new bootstrap file...");
deployment = parse(url);
store(deployment, binFile);
}
@@ -158,13 +159,10 @@
AbstractKernelDeployer deployer = new AbstractKernelDeployer(kernel);
deployer.deploy(deployment);
- mainDeployer = (MainDeployer) kernel.getRegistry().getEntry("MainDeployer").getTarget();
}
catch (Throwable throwable)
{
throw new RuntimeException("Unable to bootstrap: ", throwable);
}
- checkIncomplete();
- started = true;
}
}
Modified: trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java 2007-02-09 22:21:21 UTC (rev 60470)
+++ trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java 2007-02-09 22:21:59 UTC (rev 60471)
@@ -142,6 +142,12 @@
throw new IncompleteDeploymentException(incomplete);
}
+ protected void deployBaseBootstrapUrl(URL url) throws Throwable
+ {
+ BeanXMLDeployer deployer = new BeanXMLDeployer(kernel);
+ deployer.deploy(url);
+ }
+
protected void bootstrapURL(URL url) throws DeploymentException
{
try
@@ -151,9 +157,7 @@
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);
+ deployBaseBootstrapUrl(url);
mainDeployer = (MainDeployer)kernel.getRegistry().getEntry("MainDeployer").getTarget();
}
catch (Throwable throwable)
Modified: trunk/embedded/src/main/resources/javase/conf/jboss-service.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/conf/jboss-service.xml 2007-02-09 22:21:21 UTC (rev 60470)
+++ trunk/embedded/src/main/resources/javase/conf/jboss-service.xml 2007-02-09 22:21:59 UTC (rev 60471)
@@ -89,7 +89,22 @@
name="jboss:service=XidFactory">
<!--attribute name="Pad">true</attribute-->
</mbean>
+
+ <!--
+ | The fast in-memory transaction manager.
+ | Deprecated in 5.0. Use JBossTS JTA instead.
+ <mbean code="org.jboss.tm.TransactionManagerService"
+ name="jboss:service=TransactionManager"
+ xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
+ <attribute name="TransactionTimeout">300</attribute>
+ <attribute name="XARetryTimeout">60</attribute>
+ <attribute name="PreparedTimeout">60</attribute>
+ <attribute name="GlobalIdsEnabled">true</attribute>
+ <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
+ </mbean>
+ -->
+
<!-- JBossTS JTA -->
<mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
name="jboss:service=TransactionManager">
Modified: trunk/embedded/src/main/resources/javase/deploy/hsqldb-ds.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deploy/hsqldb-ds.xml 2007-02-09 22:21:21 UTC (rev 60470)
+++ trunk/embedded/src/main/resources/javase/deploy/hsqldb-ds.xml 2007-02-09 22:21:59 UTC (rev 60471)
@@ -22,7 +22,7 @@
<!-- For in-process persistent db, saved when jboss stops.
The org.jboss.jdbc.HypersonicDatabase mbean is required for proper db shutdown
-->
- <connection-url>jdbc:hsqldb:.</connection-url>
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
<!-- The driver class -->
<driver-class>org.hsqldb.jdbcDriver</driver-class>
@@ -38,7 +38,7 @@
<!--<check-valid-connection-sql>select * from something</check-valid-connection-sql> -->
<!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
- <min-pool-size>5</min-pool-size>
+ <min-pool-size>0</min-pool-size>
<!-- The maximum connections in a pool/sub-pool -->
<max-pool-size>20</max-pool-size>
@@ -79,6 +79,35 @@
<!-- HSQL DB benefits from prepared statement caching -->
<prepared-statement-cache-size>32</prepared-statement-cache-size>
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>Hypersonic SQL</type-mapping>
+ </metadata>
+
+ <!-- When using in-process (standalone) mode -->
+ <depends>jboss:service=Hypersonic,database=localDB</depends>
+ <!-- Uncomment when using hsqldb in server mode
+ <depends>jboss:service=Hypersonic</depends>
+ -->
</local-tx-datasource>
+ <!-- Uncomment if you want hsqldb accessed over tcp (server mode)
+ <mbean code="org.jboss.jdbc.HypersonicDatabase"
+ name="jboss:service=Hypersonic">
+ <attribute name="Port">1701</attribute>
+ <attribute name="BindAddress">${jboss.bind.address}</attribute>
+ <attribute name="Silent">true</attribute>
+ <attribute name="Database">default</attribute>
+ <attribute name="Trace">false</attribute>
+ <attribute name="No_system_exit">true</attribute>
+ </mbean>
+ -->
+
+ <!-- For hsqldb accessed from jboss only, in-process (standalone) mode -->
+ <mbean code="org.jboss.jdbc.HypersonicDatabase"
+ name="jboss:service=Hypersonic,database=localDB">
+ <attribute name="Database">localDB</attribute>
+ <attribute name="InProcessMode">true</attribute>
+ </mbean>
+
</datasources>
More information about the jboss-cvs-commits
mailing list