svn commit: r240152 - in /geronimo/trunk/modules/assembly: maven.xml src/plan/default-database-plan.xml

[da...@apache.org]

Author: dain
Date: Thu Aug 25 15:44:46 2005
New Revision: 240152

URL: http://svn.apache.org/viewcvs?rev=240152&view=rev
Log:
Switched default database to derby

Modified:
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=240152&r1=240151&r2=240152&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Thu Aug 25 15:44:46 2005
@@ -46,6 +46,7 @@
         <attainGoal name="build"/>
     </goal>
 
+
     <goal name="build">
         <attainGoal name="jar:install"/>
     </goal>
@@ -448,7 +449,7 @@
                 <ant:arg value="manager"/>
                 <ant:arg value="distribute"/>
                 <ant:arg value="target/plan/default-database-plan.xml"/>
-<!--                <ant:arg value="${maven.repo.local}/tranql/rars/tranql-connector-${tranql_connector_version}.rar"/>-->
+                <ant:arg value="${maven.repo.local}/geronimo/rars/geronimo-derby-connector-${pom.currentVersion}.rar"/>
             </ant:java>
 
             <!-- building system database configuration-->

Modified: geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml?rev=240152&r1=240151&r2=240152&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml Thu Aug 25 15:44:46 2005
@@ -18,31 +18,19 @@
 
 <!-- $Rev$ $Date$ -->
 
-<application
-    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
-    configId="org/apache/geronimo/DefaultDatabase"
-    parentId="org/apache/geronimo/Server">
-
-    <ext-module>
-        <connector>DefaultDatabase</connector>
-        <external-path>tranql/rars/tranql-connector-${tranql_connector_version}.rar</external-path>
 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
     version="1.5"
-    configId="org/apache/geronimo/DefaultDatabasex">
+    configId="org/apache/geronimo/DefaultDatabase"
+    parentId="org/apache/geronimo/Server">
 
     <dependency>
-        <uri>axion/jars/axion-${axion_version}.jar</uri>
+        <uri>org.apache.derby/jars/derby-${derby_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-collections/jars/commons-collections-${commons_collections_version}.jar</uri>
+        <uri>org.apache.derby/jars/derbynet-${derby_version}.jar</uri>
     </dependency>
-
     <dependency>
-        <uri>commons-primitives/jars/commons-primitives-${commons_primitives_version}.jar</uri>
-    </dependency>
-
-    <dependency>
-        <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
+        <uri>geronimo/jars/geronimo-derby-${geronimo_version}.jar</uri>
     </dependency>
 
     <resourceadapter>
@@ -53,33 +41,15 @@
                     <name>DefaultDatasource</name>
                     <config-property-setting name="UserName"></config-property-setting>
                     <config-property-setting name="Password"></config-property-setting>
-                    <config-property-setting name="Driver">org.axiondb.jdbc.AxionDriver</config-property-setting>
-                    <config-property-setting name="ConnectionURL">jdbc:axiondb:DefaultDatabase</config-property-setting>
-                    <config-property-setting name="CommitBeforeAutocommit">true</config-property-setting>
-                    <config-property-setting name="ExceptionSorterClass">org.tranql.connector.NoExceptionsAreFatalSorter</config-property-setting>
+                    <config-property-setting name="DatabaseName">DefaultDatasource</config-property-setting>
+                    <config-property-setting name="CreateDatabase">create</config-property-setting>
                     <connectionmanager>
-                        <local-transaction/>
                         <single-pool>
-                            <max-size>10</max-size>
-                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
                             <match-one/>
                         </single-pool>
                     </connectionmanager>
-                    <global-jndi-name>tranql/axion</global-jndi-name>
-                    <!--credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface-->
                 </connectiondefinition-instance>
             </connection-definition>
         </outbound-resourceadapter>
     </resourceadapter>
-
-    <!--gbean gbeanName="geronimo.security:service=RealmBridge,name=TargetRealm" class="org.apache.geronimo.security.bridge.ConfiguredIdentityUserPasswordRealmBridge">
-        <attribute name="TargetRealm">TargetRealm</attribute>
-        <attribute name="ConfiguredUser">testUser</attribute>
-        <attribute name="ConfiguredPassword">testPassword</attribute>
-    </gbean-->
-
 </connector>
-
-
-    </ext-module>
-</application>
\ No newline at end of file