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 di...@apache.org on 2006/01/25 17:16:00 UTC
svn commit: r372255 - in /webservices/axis2/trunk/java:
etc/project.properties
modules/integration/test/org/apache/axis2/integration/UtilServer.java
modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
Author: dims
Date: Wed Jan 25 08:15:55 2006
New Revision: 372255
URL: http://svn.apache.org/viewcvs?rev=372255&view=rev
Log:
remove hardcoded file names in source code
Modified:
webservices/axis2/trunk/java/etc/project.properties
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=372255&r1=372254&r2=372255&view=diff
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Wed Jan 25 08:15:55 2006
@@ -18,11 +18,11 @@
# -------------------------------------------------------------------
# Project Information
# -------------------------------------------------------------------
-axis2_version=0.95-SNAPSHOT
-addressing_version=0.95
-security_version=SNAPSHOT-0.95
-release_date=January 11, 2006
-
+version_number=0.95
+version_affix=SNAPSHOT
+axis2_version=${version_number}-${version_affix}
+addressing_version=${version_number}
+security_version=${version_affix}-${version_number}
# -------------------------------------------------------------------
# Dependency Repositories
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?rev=372255&r1=372254&r2=372255&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java Wed Jan 25 08:15:55 2006
@@ -30,6 +30,7 @@
import javax.xml.namespace.QName;
import java.io.File;
+import java.io.FilenameFilter;
public class UtilServer {
private static int count = 0;
@@ -122,8 +123,7 @@
public static ServiceContext createAdressedEnabledClientSide(
AxisService service) throws AxisFault {
DeploymentEngine deploymentEngine = new DeploymentEngine();
- File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY
- + "/modules/addressing-0.95.mar");
+ File file = getAddressingMARFile();
TestCase.assertTrue(file.exists());
ConfigurationContext configContext = ConfigurationContextFactory
.createConfigurationContextFromFileSystem(
@@ -138,9 +138,23 @@
.getServiceContext(service);
}
+ static class AddressingFilter implements FilenameFilter {
+ public boolean accept(File dir, String name) {
+ return name.startsWith("addressing") && name.endsWith(".mar");
+ }
+ }
+
+ private static File getAddressingMARFile() {
+ File dir = new File(org.apache.axis2.Constants.TESTING_REPOSITORY);
+ File[] files = dir.listFiles(new AddressingFilter());
+ TestCase.assertTrue(files.length==1);
+ File file = files[0];
+ TestCase.assertTrue(file.exists());
+ return file;
+ }
+
public static ConfigurationContext createClientConfigurationContext() throws AxisFault {
- File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY
- + "/modules/addressing-0.95.mar");
+ File file = getAddressingMARFile();
TestCase.assertTrue(file.exists());
DeploymentEngine deploymentEngine = new DeploymentEngine();
@@ -156,8 +170,7 @@
public static ServiceContext createAdressedEnabledClientSide(
AxisService service, String clientHome) throws AxisFault {
DeploymentEngine deploymentEngine = new DeploymentEngine();
- File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY
- + "/modules/addressing-0.95.mar");
+ File file = getAddressingMARFile();
TestCase.assertTrue(file.exists());
ConfigurationContext configContext = ConfigurationContextFactory
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java?rev=372255&r1=372254&r2=372255&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java Wed Jan 25 08:15:55 2006
@@ -29,6 +29,7 @@
import javax.xml.namespace.QName;
import java.io.File;
+import java.io.FilenameFilter;
/**
*
@@ -110,11 +111,25 @@
return receiver.getConfigurationContext();
}
+ static class AddressingFilter implements FilenameFilter {
+ public boolean accept(File dir, String name) {
+ return name.startsWith("addressing") && name.endsWith(".mar");
+ }
+ }
+
+ private static File getAddressingMARFile() {
+ File dir = new File(org.apache.axis2.Constants.TESTING_REPOSITORY);
+ File[] files = dir.listFiles(new AddressingFilter());
+ TestCase.assertTrue(files.length==1);
+ File file = files[0];
+ TestCase.assertTrue(file.exists());
+ return file;
+ }
+
public static ServiceContext createAdressedEnabledClientSide(
AxisService service) throws AxisFault {
DeploymentEngine deploymentEngine = new DeploymentEngine();
- File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY
- + "/modules/addressing-0.95.mar");
+ File file = getAddressingMARFile();
TestCase.assertTrue(file.exists());
ConfigurationContext configContext = ConfigurationContextFactory
@@ -130,8 +145,7 @@
}
public static ConfigurationContext createClientConfigurationContext() throws AxisFault {
- File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY
- + "/modules/addressing-0.95.mar");
+ File file = getAddressingMARFile();
TestCase.assertTrue(file.exists());
DeploymentEngine deploymentEngine = new DeploymentEngine();
@@ -146,8 +160,7 @@
public static ServiceContext createAdressedEnabledClientSide(
AxisService service, String clientHome) throws AxisFault {
DeploymentEngine deploymentEngine = new DeploymentEngine();
- File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY
- + "/modules/addressing-0.95.mar");
+ File file = getAddressingMARFile();
TestCase.assertTrue(file.exists());
ConfigurationContext configContext = ConfigurationContextFactory