You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/06/02 20:45:47 UTC
svn commit: r662516 - in
/geronimo/server/trunk/plugins/connector/geronimo-connector-builder: ./
src/test/data/connector_1_0/ src/test/data/connector_1_5/
src/test/data/connector_1_5_localtx/ src/test/data/connector_1_5_notx/
src/test/data/data/ src/te...
Author: djencks
Date: Mon Jun 2 11:45:46 2008
New Revision: 662516
URL: http://svn.apache.org/viewvc?rev=662516&view=rev
Log:
Put the test resources in test/resources
Added:
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/connector_1_0/
- copied from r658471, geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/data/connector_1_0/
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/connector_1_5/
- copied from r658471, geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/data/connector_1_5/
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/connector_1_5_localtx/
- copied from r658471, geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/data/connector_1_5_localtx/
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/connector_1_5_notx/
- copied from r658471, geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/data/connector_1_5_notx/
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/data/
- copied from r658471, geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/data/data/
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/ear/
- copied from r658471, geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/data/ear/
Removed:
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/data/connector_1_0/
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/data/connector_1_5/
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/data/connector_1_5_localtx/
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/data/connector_1_5_notx/
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/data/data/
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/data/ear/
Modified:
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/script/test-setup.xml
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml?rev=662516&r1=662515&r2=662516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml Mon Jun 2 11:45:46 2008
@@ -118,7 +118,7 @@
<systemProperties>
<property>
<name>java.security.auth.login.config</name>
- <value>${basedir}/src/test/data/data/login.config</value>
+ <value>${basedir}/src/test/resources/data/login.config</value>
</property>
</systemProperties>
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=662516&r1=662515&r2=662516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Mon Jun 2 11:45:46 2008
@@ -145,7 +145,7 @@
ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, Collections.singleton(repository), null);
try {
- File planFile = new File(BASEDIR, "src/test/data/data/external-application-plan.xml");
+ File planFile = new File(BASEDIR, "src/test/resources/data/external-application-plan.xml");
ModuleIDBuilder idBuilder = new ModuleIDBuilder();
Object plan = configBuilder.getDeploymentPlan(planFile, rarFile, idBuilder);
context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, rarFile, idBuilder), plan, rarFile, Collections.singleton(configurationStore), artifactResolver, configurationStore);
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/script/test-setup.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/script/test-setup.xml?rev=662516&r1=662515&r2=662516&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/script/test-setup.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/script/test-setup.xml Mon Jun 2 11:45:46 2008
@@ -24,20 +24,20 @@
<!-- Build test-rar-10 -->
<mkdir dir="${basedir}/target/test-rar-10/META-INF"/>
<copy todir="${basedir}/target/test-rar-10/META-INF">
- <fileset dir="${basedir}/src/test/data/connector_1_0"/>
+ <fileset dir="${basedir}/src/test/resources/connector_1_0"/>
</copy>
<jar destfile="${basedir}/target/test-rar-10.rar" basedir="${basedir}/target/test-rar-10"/>
<!-- Build test-rar-15 -->
<mkdir dir="${basedir}/target/test-rar-15/META-INF"/>
<copy todir="${basedir}/target/test-rar-15/META-INF">
- <fileset dir="${basedir}/src/test/data/connector_1_5"/>
+ <fileset dir="${basedir}/src/test/resources/connector_1_5"/>
</copy>
<jar destfile="${basedir}/target/test-rar-15.rar" basedir="${basedir}/target/test-rar-15"/>
<mkdir dir="${basedir}/target/test-rar-15-notx/META-INF"/>
<copy todir="${basedir}/target/test-rar-15-notx/META-INF">
- <fileset dir="${basedir}/src/test/data/connector_1_5_notx"/>
+ <fileset dir="${basedir}/src/test/resources/connector_1_5_notx"/>
</copy>
<jar destfile="${basedir}/target/test-rar-15-notx.rar"
@@ -46,7 +46,7 @@
<mkdir dir="${basedir}/target/test-rar-15-localtx/META-INF"/>
<copy todir="${basedir}/target/test-rar-15-localtx/META-INF">
- <fileset dir="${basedir}/src/test/data/connector_1_5_localtx"/>
+ <fileset dir="${basedir}/src/test/resources/connector_1_5_localtx"/>
</copy>
<jar destfile="${basedir}/target/test-rar-15-localtx.rar"
@@ -58,14 +58,14 @@
<include name="test-rar-10.rar"/>
<include name="test-rar-15.rar"/>
</fileset>
- <zipfileset dir="${basedir}/src/test/data/ear" prefix="META-INF"/>
+ <zipfileset dir="${basedir}/src/test/resources/ear" prefix="META-INF"/>
</jar>
<!--do it again without geronimo dds-->
<!-- Build test-rar-10 -->
<mkdir dir="${basedir}/target/test-rar-10-noger/META-INF"/>
<copy todir="${basedir}/target/test-rar-10-noger/META-INF">
- <fileset dir="${basedir}/src/test/data/connector_1_0">
+ <fileset dir="${basedir}/src/test/resources/connector_1_0">
<exclude name="geronimo-ra.xml"/>
</fileset>
</copy>
@@ -74,7 +74,7 @@
<!-- Build test-rar-15 -->
<mkdir dir="${basedir}/target/test-rar-15-noger/META-INF"/>
<copy todir="${basedir}/target/test-rar-15-noger/META-INF">
- <fileset dir="${basedir}/src/test/data/connector_1_5">
+ <fileset dir="${basedir}/src/test/resources/connector_1_5">
<exclude name="geronimo-ra.xml"/>
</fileset>
</copy>
@@ -86,7 +86,7 @@
<include name="test-rar-10-noger.rar"/>
<include name="test-rar-15-noger.rar"/>
</fileset>
- <zipfileset dir="${basedir}/src/test/data/ear" prefix="META-INF">
+ <zipfileset dir="${basedir}/src/test/resources/ear" prefix="META-INF">
<exclude name="geronimo-application.xml"/>
</zipfileset>
</jar>