tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject cvs commit: jakarta-tapestry/web new.html
Date Sat, 01 Feb 2003 16:48:49 GMT
hlship      2003/02/01 08:48:49

  Modified:    config   common.properties
               examples/VlibBeans jbosscmp-jdbc.xml
               eclipse  Tapestry-Tutorial.launch Tapestry-Junit.launch
                        Tapestry-Mock.launch
               config/jboss/deploy mckoi-service.xml
               config/jboss tapestry-db.zip
               .        build.xml .classpath
               contrib/src/net/sf/tapestry/contrib/mckoi McKoiDB.java
                        McKoiDBMBean.java
               contrib  build.xml
               web      new.html
  Added:       lib/ext  mckoidb-0.94h.jar
  Removed:     lib/ext  mckoidb.jar
  Log:
  Update to McKoi DB 0.94h.
  
  Revision  Changes    Path
  1.19      +2 -1      jakarta-tapestry/config/common.properties
  
  Index: common.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/config/common.properties,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- common.properties	26 Jan 2003 02:57:08 -0000	1.18
  +++ common.properties	1 Feb 2003 16:48:47 -0000	1.19
  @@ -37,6 +37,7 @@
   jetty.jar=org.mortbay.jetty-jdk1.2.jar
   jfreechart.jar=jfreechart-0.9.2.jar
   log4j.jar=log4j-1.2.6.jar
  +mckoidb.jar=mckoidb-0.94h.jar
   ognl.jar=ognl-2.3.0-opt.jar
   
   # Used as part of copyrights
  
  
  
  1.1                  jakarta-tapestry/lib/ext/mckoidb-0.94h.jar
  
  	<<Binary file>>
  
  
  1.3       +1 -4      jakarta-tapestry/examples/VlibBeans/jbosscmp-jdbc.xml
  
  Index: jbosscmp-jdbc.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/examples/VlibBeans/jbosscmp-jdbc.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jbosscmp-jdbc.xml	17 Jan 2003 17:45:30 -0000	1.2
  +++ jbosscmp-jdbc.xml	1 Feb 2003 16:48:48 -0000	1.3
  @@ -102,7 +102,7 @@
         </cmp-field>
         <cmp-field>
           <field-name>password</field-name>
  -        <column-name>PASSWORD</column-name>
  +        <column-name>PASSWD</column-name>
           <jdbc-type>VARCHAR</jdbc-type>
           <sql-type>VARCHAR(20)</sql-type>
         </cmp-field>
  @@ -121,11 +121,8 @@
         <cmp-field>
           <field-name>verified</field-name>
           <column-name>VERIFIED</column-name>
  -        <!-- 
           <jdbc-type>BIT</jdbc-type>
           <sql-type>BIT</sql-type>
  -        
  -        -->
         </cmp-field>
         <cmp-field>
           <field-name>lockedOut</field-name>
  
  
  
  1.13      +13 -8     jakarta-tapestry/eclipse/Tapestry-Tutorial.launch
  
  Index: Tapestry-Tutorial.launch
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/eclipse/Tapestry-Tutorial.launch,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Tapestry-Tutorial.launch	26 Jan 2003 02:58:17 -0000	1.12
  +++ Tapestry-Tutorial.launch	1 Feb 2003 16:48:48 -0000	1.13
  @@ -8,6 +8,9 @@
       sourceAttachmentPath=&quot;JRE_SRC&quot; sourceRootPath=&quot;JRE_SRCROOT&quot;
type=&quot;3&quot;/&gt;
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  +&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;Scratch&quot;
type=&quot;1&quot;/&gt;
  +"/>
  +        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
   &lt;runtimeClasspathEntry internalArchive=&quot;/jakarta-tapestry/config&quot;
       path=&quot;3&quot; type=&quot;2&quot;/&gt;
   "/>
  @@ -39,10 +42,6 @@
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
   &lt;runtimeClasspathEntry
  -    internalArchive=&quot;/jakarta-tapestry/lib/ext/mckoidb.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
  -"/>
  -        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  -&lt;runtimeClasspathEntry
       internalArchive=&quot;/jakarta-tapestry/lib/ext/commons-logging-1.0.2.jar&quot;
       path=&quot;3&quot; type=&quot;2&quot;/&gt;
   "/>
  @@ -101,16 +100,22 @@
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
   &lt;runtimeClasspathEntry
  -    internalArchive=&quot;/jakarta-tapestry/lib/ext/log4j-1.2.6.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
  +    internalArchive=&quot;/jakarta-tapestry/lib/ext/bcel-5.0.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
   &lt;runtimeClasspathEntry
  -    internalArchive=&quot;/jakarta-tapestry/lib/ext/org.mortbay.jetty-jdk1.2.jar&quot;
  -    path=&quot;3&quot; type=&quot;2&quot;/&gt;
  +    internalArchive=&quot;/jakarta-tapestry/lib/ext/mckoidb-0.94h.jar&quot;
  +    path=&quot;3&quot; sourceAttachmentPath=&quot;C:/Work/mckoi0.94h/src.zip&quot;
  +    sourceRootPath=&quot;src&quot; type=&quot;2&quot;/&gt;
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
   &lt;runtimeClasspathEntry
  -    internalArchive=&quot;/jakarta-tapestry/lib/ext/bcel-5.0.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
  +    internalArchive=&quot;/jakarta-tapestry/lib/ext/log4j-1.2.6.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
  +"/>
  +        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  +&lt;runtimeClasspathEntry
  +    internalArchive=&quot;/jakarta-tapestry/lib/ext/org.mortbay.jetty-jdk1.2.jar&quot;
  +    path=&quot;3&quot; type=&quot;2&quot;/&gt;
   "/>
       </listAttribute>
       <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jakarta-tapestry"/>
  
  
  
  1.8       +4 -18     jakarta-tapestry/eclipse/Tapestry-Junit.launch
  
  Index: Tapestry-Junit.launch
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/eclipse/Tapestry-Junit.launch,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Tapestry-Junit.launch	24 Jan 2003 00:49:38 -0000	1.7
  +++ Tapestry-Junit.launch	1 Feb 2003 16:48:48 -0000	1.8
  @@ -40,10 +40,6 @@
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
   &lt;runtimeClasspathEntry
  -    internalArchive=&quot;/jakarta-tapestry/lib/ext/mckoidb.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
  -"/>
  -        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  -&lt;runtimeClasspathEntry
       internalArchive=&quot;/jakarta-tapestry/lib/ext/commons-logging-1.0.2.jar&quot;
       path=&quot;3&quot; type=&quot;2&quot;/&gt;
   "/>
  @@ -66,16 +62,6 @@
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
   &lt;runtimeClasspathEntry
  -    internalArchive=&quot;/jakarta-tapestry/lib/ext/jcommon-0.6.4.jar&quot;
  -    path=&quot;3&quot; type=&quot;2&quot;/&gt;
  -"/>
  -        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  -&lt;runtimeClasspathEntry
  -    internalArchive=&quot;/jakarta-tapestry/lib/ext/jfreechart-0.9.2.jar&quot;
  -    path=&quot;3&quot; type=&quot;2&quot;/&gt;
  -"/>
  -        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  -&lt;runtimeClasspathEntry
       internalArchive=&quot;/jakarta-tapestry/junit/lib/jdom-b8.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  @@ -102,14 +88,14 @@
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
   &lt;runtimeClasspathEntry
  -    internalArchive=&quot;/jakarta-tapestry/lib/ext/log4j-1.2.6.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
  +    internalArchive=&quot;/jakarta-tapestry/lib/ext/bcel-5.0.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  -&lt;runtimeClasspathEntry containerPath=&quot;JYTHON_DIR/jython.jar&quot; path=&quot;3&quot;
type=&quot;3&quot;/&gt;
  +&lt;runtimeClasspathEntry
  +    internalArchive=&quot;/jakarta-tapestry/lib/ext/log4j-1.2.6.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  -&lt;runtimeClasspathEntry
  -    internalArchive=&quot;/jakarta-tapestry/lib/ext/bcel-5.0.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
  +&lt;runtimeClasspathEntry containerPath=&quot;JYTHON_DIR/jython.jar&quot; path=&quot;3&quot;
type=&quot;3&quot;/&gt;
   "/>
       </listAttribute>
       <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jakarta-tapestry"/>
  
  
  
  1.9       +4 -18     jakarta-tapestry/eclipse/Tapestry-Mock.launch
  
  Index: Tapestry-Mock.launch
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/eclipse/Tapestry-Mock.launch,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Tapestry-Mock.launch	24 Jan 2003 00:49:38 -0000	1.8
  +++ Tapestry-Mock.launch	1 Feb 2003 16:48:48 -0000	1.9
  @@ -40,10 +40,6 @@
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
   &lt;runtimeClasspathEntry
  -    internalArchive=&quot;/jakarta-tapestry/lib/ext/mckoidb.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
  -"/>
  -        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  -&lt;runtimeClasspathEntry
       internalArchive=&quot;/jakarta-tapestry/lib/ext/commons-logging-1.0.2.jar&quot;
       path=&quot;3&quot; type=&quot;2&quot;/&gt;
   "/>
  @@ -66,16 +62,6 @@
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
   &lt;runtimeClasspathEntry
  -    internalArchive=&quot;/jakarta-tapestry/lib/ext/jcommon-0.6.4.jar&quot;
  -    path=&quot;3&quot; type=&quot;2&quot;/&gt;
  -"/>
  -        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  -&lt;runtimeClasspathEntry
  -    internalArchive=&quot;/jakarta-tapestry/lib/ext/jfreechart-0.9.2.jar&quot;
  -    path=&quot;3&quot; type=&quot;2&quot;/&gt;
  -"/>
  -        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  -&lt;runtimeClasspathEntry
       internalArchive=&quot;/jakarta-tapestry/junit/lib/jdom-b8.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  @@ -102,14 +88,14 @@
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
   &lt;runtimeClasspathEntry
  -    internalArchive=&quot;/jakarta-tapestry/lib/ext/log4j-1.2.6.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
  +    internalArchive=&quot;/jakarta-tapestry/lib/ext/bcel-5.0.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  -&lt;runtimeClasspathEntry containerPath=&quot;JYTHON_DIR/jython.jar&quot; path=&quot;3&quot;
type=&quot;3&quot;/&gt;
  +&lt;runtimeClasspathEntry
  +    internalArchive=&quot;/jakarta-tapestry/lib/ext/log4j-1.2.6.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
   "/>
           <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  -&lt;runtimeClasspathEntry
  -    internalArchive=&quot;/jakarta-tapestry/lib/ext/bcel-5.0.jar&quot; path=&quot;3&quot;
type=&quot;2&quot;/&gt;
  +&lt;runtimeClasspathEntry containerPath=&quot;JYTHON_DIR/jython.jar&quot; path=&quot;3&quot;
type=&quot;3&quot;/&gt;
   "/>
       </listAttribute>
       <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jakarta-tapestry"/>
  
  
  
  1.5       +5 -3      jakarta-tapestry/config/jboss/deploy/mckoi-service.xml
  
  Index: mckoi-service.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/config/jboss/deploy/mckoi-service.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mckoi-service.xml	17 Jan 2003 17:38:31 -0000	1.4
  +++ mckoi-service.xml	1 Feb 2003 16:48:48 -0000	1.5
  @@ -10,12 +10,14 @@
   
   <!-- This is basically a cut-and-paste of the Solid example service, modified
         for McKoi DB.  The McKoi MBeans reside in 
  -      net.sf.tapestry.contrib-x-x-x.jar. -->
  +      tapestry-contrib-x-x-x.jar. -->
   
   <server>
   
  +	<!-- The current working directory is the JBoss/bin directory, so this
  +		 relative path works. -->
  +		 
   	<mbean code="net.sf.tapestry.contrib.mckoi.McKoiDB" name="jboss:service=McKoiDB">
  -  		<attribute name="RootPath">../server/tapestry/db</attribute>
     		<attribute name="ConfigPath">../server/tapestry/db/tapestry.conf</attribute>
   	</mbean>
   	  		
  
  
  
  1.3       +176 -108  jakarta-tapestry/config/jboss/tapestry-db.zip
  
  	<<Binary file>>
  
  
  1.67      +13 -10    jakarta-tapestry/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/build.xml,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- build.xml	26 Jan 2003 02:59:20 -0000	1.66
  +++ build.xml	1 Feb 2003 16:48:48 -0000	1.67
  @@ -356,7 +356,7 @@
   		  
   		<classpath>
   			<path refid="full.classpath"/>
  -			<pathelement location="${lib.ext.dir}/mckoidb.jar"/>
  +			<pathelement location="${lib.ext.dir}/${mckoidb.jar}"/>
   			<pathelement location="${lib.ext.dir}/junit.jar"/>
   		    <pathelement location="${jboss.lib.dir}/jboss-jmx.jar"/>    
   		    <pathelement location="${jboss.lib.dir}/jboss-system.jar"/>
  @@ -438,22 +438,24 @@
   			<exclude name="${commons-logging.jar}"/>
   			<exclude name="${bsf.jar}"/>
   			<exclude name="${bcel.jar}"/>
  +			<exclude name="${mckoidb.jar}"/>
   			
   			<!-- Match and include out-of-date versions -->
   			
  -			<include name="*tapestry*.jar"/>
  -			<include name="jakarta-oro-*.jar"/>
  -			<include name="ognl-*.jar"/>
  -			<include name="commons-logging*.jar"/>
  -			<include name="commons-lang*.jar"/>
  -			<include name="bsf*.jar"/>
  -			<include name="bcel*.jar"/>
  +			<include name="*tapestry*jar"/>
  +			<include name="jakarta-oro-*jar"/>
  +			<include name="ognl*jar"/>
  +			<include name="commons-logging*jar"/>
  +			<include name="commons-lang*jar"/>
  +			<include name="bsf*jar"/>
  +			<include name="bcel*jar"/>
  +			<include name="mckoidb*jar"/>
   		</fileset>
   	</delete>
   		
   	<copy todir="${tapestry.lib.dir}" flatten="true">
   		<fileset dir="${lib.ext.dir}">
  -			<include name="mckoidb.jar"/>
  +			<include name="${mckoidb.jar}"/>
   			<include name="${jakarta-oro.jar}"/>
   			<include name="${ognl.jar}"/>
   			<include name="${commons-logging.jar}"/>
  @@ -467,6 +469,7 @@
   				 but this is good for now.  -->
   				 
   			<include name="*.jar"/>
  +			<exclude name="bcel.jar"/>
   		</fileset>
   	</copy>
   
  
  
  
  1.23      +2 -1      jakarta-tapestry/.classpath
  
  Index: .classpath
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/.classpath,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- .classpath	24 Jan 2003 00:49:32 -0000	1.22
  +++ .classpath	1 Feb 2003 16:48:48 -0000	1.23
  @@ -13,7 +13,6 @@
       <classpathentry kind="lib" path="lib/ext/javax.servlet.jar"/>
       <classpathentry kind="lib" path="lib/ext/javax.xml.jaxp.jar"/>
       <classpathentry kind="lib" path="lib/ext/junit.jar"/>
  -    <classpathentry kind="lib" path="lib/ext/mckoidb.jar"/>
       <classpathentry kind="lib" path="lib/ext/commons-logging-1.0.2.jar"/>
       <classpathentry kind="lib" path="lib/ext/org.apache.crimson.jar"/>
       <classpathentry kind="var" path="JBOSS_DIR/client/jboss-j2ee.jar"/>
  @@ -28,5 +27,7 @@
       <classpathentry kind="lib" path="lib/ext/ognl-2.3.0-opt.jar"/>
       <classpathentry kind="lib" path="lib/ext/bsf-2.3.0.jar"/>
       <classpathentry kind="lib" path="lib/ext/bcel-5.0.jar"/>
  +    <classpathentry kind="lib" path="lib/ext/mckoidb-0.94h.jar"
  +        rootpath="src" sourcepath="C:/Work/mckoi0.94h/src.zip"/>
       <classpathentry kind="output" path="bin"/>
   </classpath>
  
  
  
  1.8       +52 -41    jakarta-tapestry/contrib/src/net/sf/tapestry/contrib/mckoi/McKoiDB.java
  
  Index: McKoiDB.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/net/sf/tapestry/contrib/mckoi/McKoiDB.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- McKoiDB.java	13 Jan 2003 03:33:52 -0000	1.7
  +++ McKoiDB.java	1 Feb 2003 16:48:48 -0000	1.8
  @@ -55,14 +55,17 @@
   package net.sf.tapestry.contrib.mckoi;
   
   import java.io.File;
  -import java.io.FileInputStream;
  -import java.io.InputStream;
  -import java.util.PropertyResourceBundle;
  -import java.util.ResourceBundle;
  +import java.io.IOException;
  +
   import javax.management.MBeanServer;
   import javax.management.ObjectName;
  +
   import org.jboss.system.ServiceMBeanSupport;
  -import com.mckoi.runtime.BootMain;
  +
  +import com.mckoi.database.control.DBController;
  +import com.mckoi.database.control.DBSystem;
  +import com.mckoi.database.control.DefaultDBConfig;
  +import com.mckoi.database.control.TCPJDBCServer;
   
   /**
    *  An MBean used to start and stop an embedded instance of
  @@ -76,60 +79,68 @@
   
   public class McKoiDB extends ServiceMBeanSupport implements McKoiDBMBean
   {
  -    private String rootPath;
  -    private String configPath;
  -    
  -    public String getRootPath()
  -    {
  -        return rootPath;
  -    }
  -    
  -    public void setRootPath(String path)
  -    {
  -        log.debug("Root path set to: " + path);
  -        rootPath = path;
  -    }
  -    
  +    private String _configPath;
  +    private DBSystem _database;
  +    private TCPJDBCServer _server;
  +
       public String getConfigPath()
       {
  -        return configPath;
  +        return _configPath;
       }
  -    
  +
       public void setConfigPath(String path)
       {
           log.debug("Config path set to: " + path);
  -        configPath = path;
  +        _configPath = path;
       }
  -    
  -    public ObjectName preRegister(MBeanServer server, ObjectName name)
  -        throws Exception
  +
  +    public ObjectName preRegister(MBeanServer server, ObjectName name) throws Exception
       {
           if (name != null)
               return name;
  +            
           return new ObjectName(":service=McKoiDB");
       }
  -    
  +
       public String getName()
       {
  -        return "McKoiDB";
  -    }
  -    
  +        return "McKoiDB";    }
  +
       public void startService() throws Exception
       {
  -        if (rootPath == null)
  -            throw new NullPointerException("McKoiDB: rootPath not specified.");
  -        if (configPath == null)
  +        if (_configPath == null)
               throw new NullPointerException("McKoiDB: configPath not specified.");
  -        log.debug("Root path: " + rootPath);
  -        log.debug("Config path: " + configPath);
  -        File file = new File(rootPath);
  -        InputStream stream = new FileInputStream(configPath);
  -        ResourceBundle bundle = new PropertyResourceBundle(stream);
  -        BootMain.boot(file, bundle);
  +
  +        log.debug("Config path: " + _configPath);
  +
  +        File configFile = new File(_configPath).getAbsoluteFile();
  +        File rootFile = configFile.getParentFile();
  +
  +        DefaultDBConfig config = new DefaultDBConfig(rootFile);
  +
  +        try
  +        {
  +            config.loadFromFile(configFile);
  +        }
  +        catch (IOException ex)
  +        {
  +            log.error("Unable to initialize McKoi database.", ex);
  +        }
  +
  +        DBController controller = DBController.getDefault();
  +        _database = controller.startDatabase(config);
  +
  +        _server = new TCPJDBCServer(_database);
  +
  +        _server.start();
  +
  +        log.info(_server);
  +
       }
  -    
  +
       public void stopService()
       {
  -        BootMain.shutdown();
  +        _server.stop();
  +        _database.close();
       }
   }
  
  
  
  1.8       +2 -11     jakarta-tapestry/contrib/src/net/sf/tapestry/contrib/mckoi/McKoiDBMBean.java
  
  Index: McKoiDBMBean.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/net/sf/tapestry/contrib/mckoi/McKoiDBMBean.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- McKoiDBMBean.java	13 Jan 2003 03:33:52 -0000	1.7
  +++ McKoiDBMBean.java	1 Feb 2003 16:48:48 -0000	1.8
  @@ -66,16 +66,7 @@
    **/
   
   public interface McKoiDBMBean extends ServiceMBean
  -{
  -    public String getRootPath();
  -    
  -    /**
  -     *  Sets the root directory name, which is where database files are stored.
  -     * 
  -     **/
  -    
  -    public void setRootPath(String path);
  -    
  +{   
       public String getConfigPath();
       
       /**
  
  
  
  1.15      +2 -2      jakarta-tapestry/contrib/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/build.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.xml	12 Oct 2002 17:30:27 -0000	1.14
  +++ build.xml	1 Feb 2003 16:48:48 -0000	1.15
  @@ -14,7 +14,7 @@
       <pathelement location="${lib.ext.dir}/javax.xml.jaxp.jar"/>
       <pathelement location="${lib.ext.dir}/org.apache.crimson.jar"/>
       <pathelement location="${framework.jar}"/>
  -    <pathelement location="${lib.ext.dir}/mckoidb.jar"/>
  +    <pathelement location="${lib.ext.dir}/${mckoidb.jar}"/>
       <pathelement location="${lib.ext.dir}/${ognl.jar}"/>
       <pathelement location="${jboss.client.dir}/jboss-client.jar"/>
       <pathelement location="${jboss.client.dir}/jboss-j2ee.jar"/>
  
  
  
  1.123     +4 -1      jakarta-tapestry/web/new.html
  
  Index: new.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/web/new.html,v
  retrieving revision 1.122
  retrieving revision 1.123
  diff -u -r1.122 -r1.123
  --- new.html	28 Jan 2003 22:47:28 -0000	1.122
  +++ new.html	1 Feb 2003 16:48:49 -0000	1.123
  @@ -21,6 +21,9 @@
   <li>Updated all examples to use the 1.4 Specification DTD.</li>
   <li>Refactored (severely) the relationship between services and link components,
splitting
    the rendering portion of links into a separate interface.</li>
  +<li>Upgrade to McKoi database 0.94h.</li>
  +<li>Tapestry will now create properties for connected parameters, if the properties
  + doe not already exist (or are abstract).</li>
   </ul>
   		
   <pre>
  
  
  

Mime
View raw message