continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1600033 - in /continuum/trunk: .gitignore continuum-test/src/main/resources/META-INF/plexus/components.xml continuum-test/src/main/resources/META-INF/spring-context.xml
Date Wed, 04 Jun 2014 09:06:59 GMT
Author: brett
Date: Wed Jun  4 09:06:58 2014
New Revision: 1600033

URL: http://svn.apache.org/r1600033
Log:
prevent ${plexus.home} creation in continuum-core when tests run

Modified:
    continuum/trunk/.gitignore
    continuum/trunk/continuum-test/src/main/resources/META-INF/plexus/components.xml
    continuum/trunk/continuum-test/src/main/resources/META-INF/spring-context.xml

Modified: continuum/trunk/.gitignore
URL: http://svn.apache.org/viewvc/continuum/trunk/.gitignore?rev=1600033&r1=1600032&r2=1600033&view=diff
==============================================================================
--- continuum/trunk/.gitignore (original)
+++ continuum/trunk/.gitignore Wed Jun  4 09:06:58 2014
@@ -6,4 +6,3 @@ target
 continuum-webapp/src/main/webapp/template/
 *.iml
 .idea
-continuum-core/${plexus.home}/

Modified: continuum/trunk/continuum-test/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-test/src/main/resources/META-INF/plexus/components.xml?rev=1600033&r1=1600032&r2=1600033&view=diff
==============================================================================
--- continuum/trunk/continuum-test/src/main/resources/META-INF/plexus/components.xml (original)
+++ continuum/trunk/continuum-test/src/main/resources/META-INF/plexus/components.xml Wed Jun
 4 09:06:58 2014
@@ -19,57 +19,6 @@
 
 <component-set>
   <components>
-    <!--
-        <component>
-          <role>org.codehaus.plexus.jdo.JdoFactory</role>
-          <role-hint>continuum</role-hint>
-          <implementation>org.apache.maven.continuum.jdo.MemoryJdoFactory</implementation>
-          <configuration>
-            <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
-            <driverName>org.hsqldb.jdbcDriver</driverName>
-            <url>jdbc:hsqldb:${plexus.home}/database</url>
-            <userName>sa</userName>
-            <password></password>
-            <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
-
-            <otherProperties>
-              <property>
-                <name>org.jpox.autoCreateSchema</name>
-                <value>true</value>
-              </property>
-              <property>
-                <name>org.jpox.validateTables</name>
-                <value>false</value>
-              </property>
-              <property>
-                <name>org.jpox.validateColumns</name>
-                <value>false</value>
-              </property>
-              <property>
-                <name>org.jpox.validateConstraints</name>
-                <value>false</value>
-              </property>
-
-              <property>
-                <name>org.jpox.autoStartMechanism</name>
-                <value>SchemaTable</value>
-              </property>
-              <property>
-                <name>org.jpox.autoStartMechanismMode</name>
-                <value>Ignored</value>
-              </property>
-              <property>
-                <name>org.jpox.transactionIsolation</name>
-                <value>READ_COMMITTED</value>
-              </property>
-              <property>
-                <name>org.jpox.poid.transactionIsolation</name>
-                <value>READ_COMMITTED</value>
-              </property>
-            </otherProperties>
-          </configuration>
-        </component>
-    -->
     <component>
       <role>org.codehaus.plexus.jdo.JdoFactory</role>
       <role-hint>users</role-hint>
@@ -77,7 +26,7 @@
       <configuration>
         <!-- Database Configuration -->
         <driverName>org.hsqldb.jdbcDriver</driverName>
-        <url>jdbc:hsqldb:${plexus.home}/database</url>
+        <url>jdbc:hsqldb:mem:userstest</url>
         <userName>sa</userName>
         <password></password>
         <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>

Modified: continuum/trunk/continuum-test/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-test/src/main/resources/META-INF/spring-context.xml?rev=1600033&r1=1600032&r2=1600033&view=diff
==============================================================================
--- continuum/trunk/continuum-test/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/trunk/continuum-test/src/main/resources/META-INF/spring-context.xml Wed Jun
 4 09:06:58 2014
@@ -27,11 +27,6 @@
 
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
-  <!--
-    <bean id="jdoProperties" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
-      <property name="location" value="classpath:jdo.properties"/>
-    </bean>
-  -->
   <util:properties id="jdoProperties" location="classpath:jdo.properties"/>
 
   <bean name="jdoFactory#continuum" depends-on="jdoProperties"
@@ -42,13 +37,7 @@
         p:password=""
         p:url="jdbc:hsqldb:mem:test">
 
-    <!--
-            <property name="persistenceManagerFactoryClass" value="org.jpox.PersistenceManagerFactoryImpl"/>
-    -->
     <property name="otherProperties" ref="jdoProperties"/>
   </bean>
-  <!--
-          p:url="jdbc:hsqldb:${plexus.home}/database"
-  -->
 
 </beans>



Mime
View raw message