notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2181 - in development/planet/users/niclas/jdo: . common jdo-enhancer kodo-hsqldb kodo-hsqldb-test kodo-hsqldb-test/src/main/net/dpml/jdo/kodo/test kodo-hsqldb-test/src/test kodo-hsqldb-test/src/test/net kodo-hsqldb-test/src/test/net/dpml kodo-hsqldb-test/src/test/net/dpml/jdo kodo-hsqldb-test/src/test/net/dpml/jdo/kodo kodo-hsqldb-test/src/test/net/dpml/jdo/kodo/test kodo-task tjdo-hsqldb

From: niclas AT hedhman.org
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2181 - in development/planet/users/niclas/jdo: . common jdo-enhancer kodo-hsqldb kodo-hsqldb-test kodo-hsqldb-test/src/main/net/dpml/jdo/kodo/test kodo-hsqldb-test/src/test kodo-hsqldb-test/src/test/net kodo-hsqldb-test/src/test/net/dpml kodo-hsqldb-test/src/test/net/dpml/jdo kodo-hsqldb-test/src/test/net/dpml/jdo/kodo kodo-hsqldb-test/src/test/net/dpml/jdo/kodo/test kodo-task tjdo-hsqldb
Date: Thu, 31 Mar 2005 17:11:48 -0500

Author: niclas AT hedhman.org
Date: Thu Mar 31 17:11:44 2005
New Revision: 2181

Added:
development/planet/users/niclas/jdo/kodo-hsqldb-test/src/test/
development/planet/users/niclas/jdo/kodo-hsqldb-test/src/test/net/
development/planet/users/niclas/jdo/kodo-hsqldb-test/src/test/net/dpml/
development/planet/users/niclas/jdo/kodo-hsqldb-test/src/test/net/dpml/jdo/

development/planet/users/niclas/jdo/kodo-hsqldb-test/src/test/net/dpml/jdo/kodo/

development/planet/users/niclas/jdo/kodo-hsqldb-test/src/test/net/dpml/jdo/kodo/test/

development/planet/users/niclas/jdo/kodo-hsqldb-test/src/test/net/dpml/jdo/kodo/test/KodoTestCase.java
(contents, props changed)
Removed:

development/planet/users/niclas/jdo/kodo-hsqldb-test/src/main/net/dpml/jdo/kodo/test/KodoTestCase.java
Modified:
development/planet/users/niclas/jdo/build.xml
development/planet/users/niclas/jdo/common/build.xml
development/planet/users/niclas/jdo/index.xml
development/planet/users/niclas/jdo/jdo-enhancer/build.xml
development/planet/users/niclas/jdo/kodo-hsqldb-test/build.xml
development/planet/users/niclas/jdo/kodo-hsqldb/build.xml
development/planet/users/niclas/jdo/kodo-task/build.xml
development/planet/users/niclas/jdo/tjdo-hsqldb/build.xml
Log:
Updating JDO to be able to build under new Magic.

Modified: development/planet/users/niclas/jdo/build.xml
==============================================================================
--- development/planet/users/niclas/jdo/build.xml (original)
+++ development/planet/users/niclas/jdo/build.xml Thu Mar 31 17:11:44
2005
@@ -6,9 +6,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.dpml.net/central/about/legal/
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,8 @@
-->

<project name="dpml-jdo" default="install" basedir="."
- xmlns:transit="antlib:net.dpml.transit"
->
+ xmlns:transit="antlib:net.dpml.transit">

- <transit:init />
- <import file="${dpml.templates}/reactor.xml"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

-</project>
+</project>
\ No newline at end of file

Modified: development/planet/users/niclas/jdo/common/build.xml
==============================================================================
--- development/planet/users/niclas/jdo/common/build.xml (original)
+++ development/planet/users/niclas/jdo/common/build.xml Thu Mar 31
17:11:44 2005
@@ -19,7 +19,6 @@
<project name="dpml-jdo-kodo" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit">

- <transit:init />
- <import file="${dpml.templates}/standard.xml"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

-</project>
+</project>
\ No newline at end of file

Modified: development/planet/users/niclas/jdo/index.xml
==============================================================================
--- development/planet/users/niclas/jdo/index.xml (original)
+++ development/planet/users/niclas/jdo/index.xml Thu Mar 31 17:11:44
2005
@@ -17,9 +17,7 @@

<index>
<import uri="artifact:module:dpml/magic/dpml-magic#SNAPSHOT" />
- <import uri="artifact:module:dpml/metro/public/dpml-metro-public#SNAPSHOT"
/>
- <import
uri="artifact:module:dpml/metro/protected/dpml-metro-protected#SNAPSHOT" />
- <import uri="artifact:module:dpml/metro/tools/dpml-metro-tools#SNAPSHOT" />
+ <import uri="artifact:module:dpml/metro/dpml-metro#SNAPSHOT" />

<resource>
<info>

Modified: development/planet/users/niclas/jdo/jdo-enhancer/build.xml
==============================================================================
--- development/planet/users/niclas/jdo/jdo-enhancer/build.xml (original)
+++ development/planet/users/niclas/jdo/jdo-enhancer/build.xml Thu Mar 31
17:11:44 2005
@@ -18,15 +18,15 @@

<project name="dpml-jdo-enhancer" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
- xmlns:magic="antlib:net.dpml.magic"
+ xmlns:x="plugin:dpml/magic/dpml-magic-core"
>
- <transit:init />
- <import file="${dpml.templates}/standard.xml"/>
+
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
- <magic:export>
+ <x:export>
<antlib resource="net/dpml/jdo/antlib.xml" urn="antlib:net.dpml.jdo"/>
- </magic:export>
+ </x:export>
</target>
</project>

Modified: development/planet/users/niclas/jdo/kodo-hsqldb-test/build.xml
==============================================================================
--- development/planet/users/niclas/jdo/kodo-hsqldb-test/build.xml
(original)
+++ development/planet/users/niclas/jdo/kodo-hsqldb-test/build.xml Thu
Mar 31 17:11:44 2005
@@ -18,11 +18,11 @@

<project name="dpml-jdo-kodo-hsqldb-test" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
- xmlns:magic="antlib:net.dpml.magic"
+ xmlns:x="plugin:dpml/magic/dpml-magic-core"
xmlns:kodo="antlib:net.dpml.jdo.kodo"
>
- <transit:init />
- <import file="${dpml.templates}/standard.xml"/>
+
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build" >
<mkdir dir="${basedir}/target/schemas"/>

Added:
development/planet/users/niclas/jdo/kodo-hsqldb-test/src/test/net/dpml/jdo/kodo/test/KodoTestCase.java
==============================================================================
--- (empty file)
+++
development/planet/users/niclas/jdo/kodo-hsqldb-test/src/test/net/dpml/jdo/kodo/test/KodoTestCase.java
Thu Mar 31 17:11:44 2005
@@ -0,0 +1,66 @@
+package net.dpml.jdo.kodo.test;
+
+import java.io.InputStream;
+
+import java.util.Collection;
+import java.util.Properties;
+
+import javax.jdo.JDOHelper;
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+import javax.jdo.Query;
+import javax.jdo.Transaction;
+
+import junit.framework.TestCase;
+
+public class KodoTestCase extends TestCase
+{
+ private PersistenceManagerFactory m_Factory;
+ private PersistenceManager m_Jdo;
+
+ public void setUp()
+ throws Exception
+ {
+ Properties props = new Properties();
+ InputStream in = getClass().getClassLoader().getResourceAsStream(
"kodo.properties" );
+ props.load( in );
+
+ m_Factory = JDOHelper.getPersistenceManagerFactory( props );
+ m_Jdo = m_Factory.getPersistenceManager();
+ }
+
+ public void tearDown()
+ throws Exception
+ {
+ m_Jdo.close();
+ m_Factory.close();
+ }
+
+ public void testAddOneB()
+ throws Exception
+ {
+ Transaction tx = m_Jdo.currentTransaction();
+ try
+ {
+ tx.begin();
+ B b = new B( "My Name" );
+ m_Jdo.makePersistent( b );
+ tx.commit();
+ } catch( Exception e )
+ {
+ tx.rollback();
+ throw e;
+ }
+ Query q = m_Jdo.newQuery( B.class, "name == \"My Name\"" );
+ try
+ {
+ Collection c = (Collection) q.execute();
+ assertEquals( "Returned items", 1, c.size() );
+ String name = (String) c.iterator().next();
+ assertEquals( "Name", "My Name", name );
+ } finally
+ {
+ q.closeAll();
+ }
+ }
+}

Modified: development/planet/users/niclas/jdo/kodo-hsqldb/build.xml
==============================================================================
--- development/planet/users/niclas/jdo/kodo-hsqldb/build.xml (original)
+++ development/planet/users/niclas/jdo/kodo-hsqldb/build.xml Thu Mar 31
17:11:44 2005
@@ -18,91 +18,90 @@

<project name="dpml-jdo-kodo-hsqldb" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
- xmlns:magic="antlib:net.dpml.magic"
+ xmlns:x="plugin:dpml/magic/dpml-magic-core"
>

- <transit:init />
- <import file="${dpml.templates}/standard.xml"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build" >
- <magic:block name="kodo-hsqldb" >
- <magic:component name="factory"
class="net.dpml.jdo.kodo.PersistenceManagerFactoryImpl">
- <magic:parameters>
+ <x:block name="kodo-hsqldb" >
+ <x:component name="factory"
class="net.dpml.jdo.kodo.PersistenceManagerFactoryImpl">
+ <x:parameters>

- <magic:parameter name="javax.jdo.option.ConnectionDriverName"
value="org.hsqldb.jdbcDriver" />
- <magic:parameter name="javax.jdo.option.ConnectionURL"
value="jdbc:hsqldb:db-kodo" />
- <magic:parameter name="javax.jdo.option.ConnectionUserName"
value="sa" />
- <magic:parameter name="javax.jdo.option.ConnectionPassword"
value="" />
+ <x:parameter name="javax.jdo.option.ConnectionDriverName"
value="org.hsqldb.jdbcDriver" />
+ <x:parameter name="javax.jdo.option.ConnectionURL"
value="jdbc:hsqldb:db-kodo" />
+ <x:parameter name="javax.jdo.option.ConnectionUserName" value="sa"
/>
+ <x:parameter name="javax.jdo.option.ConnectionPassword" value="" />




- <magic:parameter name="kodo.ConnectionFactoryProperties"
+ <x:parameter name="kodo.ConnectionFactoryProperties"
value="MaxActive=50, MaxIdle=10,
ValidationTimeout=50000, MaxCachedStatements=100, ValidationSQL=" />
- <magic:parameter name="kodo.LicenseKey" value="" />
+ <x:parameter name="kodo.LicenseKey" value="" />


- </magic:parameters>
- </magic:component>
- </magic:block>
+ </x:parameters>
+ </x:component>
+ </x:block>
</target>
</project>

Modified: development/planet/users/niclas/jdo/kodo-task/build.xml
==============================================================================
--- development/planet/users/niclas/jdo/kodo-task/build.xml (original)
+++ development/planet/users/niclas/jdo/kodo-task/build.xml Thu Mar 31
17:11:44 2005
@@ -18,15 +18,15 @@

<project name="dpml-jdo-kodo-task" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
- xmlns:magic="antlib:net.dpml.magic"
+ xmlns:x="plugin:dpml/magic/dpml-magic-core"
>
- <transit:init />
- <import file="${dpml.templates}/standard.xml"/>
+
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
- <magic:export>
+ <x:export>
<antlib resource="net/dpml/jdo/kodo/antlib.xml"
urn="antlib:net.dpml.jdo.kodo"/>
- </magic:export>
+ </x:export>
</target>
</project>

Modified: development/planet/users/niclas/jdo/tjdo-hsqldb/build.xml
==============================================================================
--- development/planet/users/niclas/jdo/tjdo-hsqldb/build.xml (original)
+++ development/planet/users/niclas/jdo/tjdo-hsqldb/build.xml Thu Mar 31
17:11:44 2005
@@ -18,21 +18,20 @@

<project name="dpml-jdo-tjdo-hsqldb" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
- xmlns:magic="antlib:net.dpml.magic"
+ xmlns:x="plugin:dpml/magic/dpml-magic-core"
>

- <transit:init />
- <import file="${dpml.templates}/standard.xml"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build" >
- <magic:block name="tjdo-hsqldb" >
- <magic:component name="factory"
class="net.dpml.jdo.kodo.PersistenceManagerFactoryImpl">
- <magic:parameters>
+ <x:block name="tjdo-hsqldb" >
+ <x:component name="factory"
class="net.dpml.jdo.kodo.PersistenceManagerFactoryImpl">
+ <x:parameters>

- <magic:parameter name="javax.jdo.option.ConnectionDriverName"
value="org.hsqldb.jdbcDriver" />
- <magic:parameter name="javax.jdo.option.ConnectionURL"
value="jdbc:hsqldb:db-kodo" />
- <magic:parameter name="javax.jdo.option.ConnectionUserName"
value="sa" />
- <magic:parameter name="javax.jdo.option.ConnectionPassword"
value="" />
+ <x:parameter name="javax.jdo.option.ConnectionDriverName"
value="org.hsqldb.jdbcDriver" />
+ <x:parameter name="javax.jdo.option.ConnectionURL"
value="jdbc:hsqldb:db-kodo" />
+ <x:parameter name="javax.jdo.option.ConnectionUserName" value="sa"
/>
+ <x:parameter name="javax.jdo.option.ConnectionPassword" value="" />



- </magic:parameters>
- </magic:component>
- </magic:block>
+ </x:parameters>
+ </x:component>
+ </x:block>
</target>
</project>

svn commit: r2181 - in development/planet/users/niclas/jdo: . common jdo-enhancer kodo-hsqldb kodo-hsqldb-test kodo-hsqldb-test/src/main/net/dpml/jdo/kodo/test kodo-hsqldb-test/src/test kodo-hsqldb-test/src/test/net kodo-hsqldb-test/src/test/net/dpml kodo-hsqldb-test/src/test/net/dpml/jdo kodo-hsqldb-test/src/test/net/dpml/jdo/kodo kodo-hsqldb-test/src/test/net/dpml/jdo/kodo/test kodo-task tjdo-hsqldb, niclas, 03/31/2005