You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2007/02/05 07:56:26 UTC
svn commit: r503569 - in /webservices/axis2/trunk/java/modules/kernel: ./
src/org/apache/axis2/deployment/ test/org/apache/axis2/deployment/
Author: deepal
Date: Sun Feb 4 22:56:25 2007
New Revision: 503569
URL: http://svn.apache.org/viewvc?view=rev&rev=503569
Log:
fixing AXIS2-1839
- Exclude MessageContextChangeTest from , Bill pls include that again once you fix that
Modified:
webservices/axis2/trunk/java/modules/kernel/project.xml
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/FileSystemConfigurator.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuilderSelectorDeploymentTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java
Modified: webservices/axis2/trunk/java/modules/kernel/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/project.xml?view=diff&rev=503569&r1=503568&r2=503569
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/project.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/project.xml Sun Feb 4 22:56:25 2007
@@ -220,6 +220,12 @@
</resource>
</resources>
<unitTest>
+ <includes>
+ <include>**/*Test.class</include>
+ </includes>
+ <excludes>
+ <exclude>**/*MessageContextChangeTest*.class</exclude>
+ </excludes>
<resources>
<resource>
<targetPath>../test-resources</targetPath>
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/FileSystemConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/FileSystemConfigurator.java?view=diff&rev=503569&r1=503568&r2=503569
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/FileSystemConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/FileSystemConfigurator.java Sun Feb 4 22:56:25 2007
@@ -33,7 +33,7 @@
public class FileSystemConfigurator extends DeploymentEngine implements AxisConfigurator {
- private static final Log log = LogFactory.getLog(FileSystemConfigurator.class);
+ private static final Log log = LogFactory.getLog(FileSystemConfigurator.class);
/**
* To check whether need to create a service side or client side
*/
@@ -46,7 +46,7 @@
* @param repoLocation
* @param axis2xml
*/
- public FileSystemConfigurator(String repoLocation, String axis2xml) {
+ public FileSystemConfigurator(String repoLocation, String axis2xml) throws AxisFault {
if (repoLocation == null) {
//checking wether user has set the system property
repoLocation = System.getProperty(Constants.AXIS2_REPO);
@@ -54,20 +54,18 @@
// OK, we've got a repository location in mind. Let's make
// sure it exists.
- try {
- if (repoLocation != null) {
- File repo = new File(repoLocation);
- if (repo.exists()) {
- // ok, save it if so
- this.repoLocation = repo.getAbsolutePath();
- }
+ if (repoLocation != null) {
+ File repo = new File(repoLocation);
+ if (repo.exists()) {
+ // ok, save it if so
+ this.repoLocation = repo.getAbsolutePath();
+ } else {
+ log.info("Couldn't find repository location '" +
+ repoLocation + "'");
+ throw new AxisFault("Couldn't find repository location '" +
+ repoLocation + "'");
}
- } catch (Exception e) {
- log.info("Couldn't find repository location '" +
- repoLocation + "'");
- this.repoLocation = null;
}
-
// Deal with the config file. If a filename was specified as an
// arg to this constructor, just respect it.
if (axis2xml == null) {
@@ -76,14 +74,10 @@
// In either case, check that the file exists... if not
// we'll use the default axis2.xml on the classpath.
if (axis2xml != null) {
- try {
- File configFile = new File(axis2xml);
- if (!configFile.exists()) {
- axis2xml = null;
- }
- } catch (Exception e) {
- axis2xml = null;
+ File configFile = new File(axis2xml);
+ if (!configFile.exists()) {
log.info("Error in file (axis2.xml) creation inside FileSystemConfigurator");
+ throw new AxisFault("Error in file (axis2.xml) creation inside FileSystemConfigurator");
}
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuilderSelectorDeploymentTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuilderSelectorDeploymentTest.java?view=diff&rev=503569&r1=503568&r2=503569
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuilderSelectorDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuilderSelectorDeploymentTest.java Sun Feb 4 22:56:25 2007
@@ -48,7 +48,7 @@
assertEquals(className,"org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder");
}
- public void testBuilderSelectionInvalidEntry() {
+ public void testBuilderSelectionInvalidEntry() throws AxisFault{
String repositoryName =System.getProperty("basedir",".")+"/"+"target/test-resources/deployment";
File repo = new File(repositoryName);
String xmlFile = System.getProperty("basedir",".")+"/"+"test-resources/deployment/builderSelectorTest/bad-axis2.xml";
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java?view=diff&rev=503569&r1=503568&r2=503569
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java Sun Feb 4 22:56:25 2007
@@ -46,7 +46,7 @@
assertEquals("org.apache.axis2.transport.http.SOAPMessageFormatter",className);
}
- public void testBuilderSelectionInvalidEntry() {
+ public void testBuilderSelectionInvalidEntry() throws AxisFault{
String repositoryName =System.getProperty("basedir",".")+"/"+"target/test-resources/deployment";
File repo = new File(repositoryName);
String xmlFile = System.getProperty("basedir",".")+"/"+"test-resources/deployment/messageFormatterTest/bad-axis2.xml";
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org