prevent ${plexus.home} creation in continuum-core when tests run
git-svn-id: https://svn.apache.org/repos/asf/continuum/trunk@1600033 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/.gitignore b/.gitignore
index f260f21..7b6cdf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@
continuum-webapp/src/main/webapp/template/
*.iml
.idea
-continuum-core/${plexus.home}/
diff --git a/continuum-test/src/main/resources/META-INF/plexus/components.xml b/continuum-test/src/main/resources/META-INF/plexus/components.xml
index 7108d24..b5f2e00 100644
--- a/continuum-test/src/main/resources/META-INF/plexus/components.xml
+++ b/continuum-test/src/main/resources/META-INF/plexus/components.xml
@@ -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>
diff --git a/continuum-test/src/main/resources/META-INF/spring-context.xml b/continuum-test/src/main/resources/META-INF/spring-context.xml
index c04d7a5..b6cdb03 100644
--- a/continuum-test/src/main/resources/META-INF/spring-context.xml
+++ b/continuum-test/src/main/resources/META-INF/spring-context.xml
@@ -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>
