You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/06/19 20:40:55 UTC
svn commit: r548820 - in /webservices/axis2/trunk/java/modules/kernel:
maven.xml pom.xml test/org/apache/axis2/deployment/ModuleLoadingTest.java
Author: dims
Date: Tue Jun 19 11:40:54 2007
New Revision: 548820
URL: http://svn.apache.org/viewvc?view=rev&rev=548820
Log:
fix ModuleLoadingTest both in m1 and m2
Modified:
webservices/axis2/trunk/java/modules/kernel/maven.xml
webservices/axis2/trunk/java/modules/kernel/pom.xml
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleLoadingTest.java
Modified: webservices/axis2/trunk/java/modules/kernel/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/maven.xml?view=diff&rev=548820&r1=548819&r2=548820
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/maven.xml Tue Jun 19 11:40:54 2007
@@ -20,6 +20,12 @@
<ant:ant antfile="j2secbuild.xml" inheritall="true" inheritrefs="true" dir="test-resources/"/>
</j:jelly>
<ant:copy file="${basedir}/test-resources/deployment/axis2.xml" tofile="${basedir}/target/test-resources/deployment/axis2.xml"/>
+ <ant:path
+ id="ModuleLoadingTest.resource"
+ location="${basedir}/test-resources/deployment/ClasspathModule"/>
+ <maven:addPath
+ id="maven.dependency.classpath"
+ refid="ModuleLoadingTest.resource"/>
</j:if>
</postGoal>
Modified: webservices/axis2/trunk/java/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/pom.xml?view=diff&rev=548820&r1=548819&r2=548820
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/pom.xml Tue Jun 19 11:40:54 2007
@@ -119,7 +119,6 @@
</includes>
</testResource>
<testResource>
- <targetPath>../test-resources/deployment/ClasspathModule</targetPath>
<directory>test-resources/deployment/ClasspathModule</directory>
<includes>
<include>**/**</include>
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleLoadingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleLoadingTest.java?view=diff&rev=548820&r1=548819&r2=548820
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleLoadingTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleLoadingTest.java Tue Jun 19 11:40:54 2007
@@ -24,21 +24,21 @@
public class ModuleLoadingTest extends TestCase {
public void testModuleLoading() throws Exception {
-// String repoRoot = AbstractTestCase.basedir + "/test-resources/deployment/repositories/moduleLoadTest";
-// AxisConfiguration ac =
-// ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoRoot)
-// .getAxisConfiguration();
-//
-// // Make sure we got the exploded module in the repo/modules dir
-// AxisModule module = ac.getModule("explodedModule");
-// assertNotNull(module);
-// String val = (String)module.getParameter("color").getValue();
-// assertEquals("green", val);
-//
-// // Make sure we got the module that's outside the repo, but in the classpath
-// module = ac.getModule("classpathModule");
-// assertNotNull("Didn't find classpath module!", module);
-// val = (String)module.getParameter("color").getValue();
-// assertEquals("Parameter wasn't set correctly", "blue", val);
+ String repoRoot = AbstractTestCase.basedir + "/test-resources/deployment/repositories/moduleLoadTest";
+ AxisConfiguration ac =
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoRoot)
+ .getAxisConfiguration();
+
+ // Make sure we got the exploded module in the repo/modules dir
+ AxisModule module = ac.getModule("explodedModule");
+ assertNotNull(module);
+ String val = (String)module.getParameter("color").getValue();
+ assertEquals("green", val);
+
+ // Make sure we got the module that's outside the repo, but in the classpath
+ module = ac.getModule("classpathModule");
+ assertNotNull("Didn't find classpath module!", module);
+ val = (String)module.getParameter("color").getValue();
+ assertEquals("Parameter wasn't set correctly", "blue", val);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org