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 ch...@apache.org on 2006/10/12 06:27:06 UTC
svn commit: r463130 -
/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
Author: chinthaka
Date: Wed Oct 11 21:26:56 2006
New Revision: 463130
URL: http://svn.apache.org/viewvc?view=rev&rev=463130
Log:
Arghh !! The meta-inf folder name should not be case sensitive. I fixed this lot of times, but seems to be appearing again and again.
Modified:
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?view=diff&rev=463130&r1=463129&r2=463130
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Wed Oct 11 21:26:56 2006
@@ -220,17 +220,21 @@
File meta_inf = new File(serviceFile, META_INF);
if (!meta_inf.exists()) {
- throw new DeploymentException(
- Messages.getMessage(
- DeploymentErrorMsgs.META_INF_MISSING, serviceFile.getName()));
+ meta_inf = new File(serviceFile, META_INF.toLowerCase());
+ if (!meta_inf.exists()) {
+ throw new DeploymentException(
+ Messages.getMessage(
+ DeploymentErrorMsgs.META_INF_MISSING, serviceFile.getName()));
+ }
}
+
File files[] = meta_inf.listFiles();
for (int i = 0; i < files.length; i++) {
File file1 = files[i];
if (file1.getName().toLowerCase().endsWith(SUFFIX_WSDL)) {
InputStream in = new FileInputStream(file1);
FileInputStream in2 = null;
-
+
// now the question is which version of WSDL file this archive contains.
// lets check the namespace of the root element and decide. But since we are
// using axiom (dude, you are becoming handy here :)), we will not build the
@@ -253,7 +257,7 @@
FileInputStream in3 = new FileInputStream(file1);
AxisService service = processWSDLFile(wsdlToAxisServiceBuilder, file1, false, in2);
try {
- if(in2 != null) {
+ if (in2 != null) {
in2.close();
}
in3.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org
Re: svn commit: r463130 - /webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
Posted by Davanum Srinivas <da...@gmail.com>.
What we call here a "Whack-A-Mole" (http://en.wikipedia.org/wiki/Whac-A-Mole)
-- dims
On 10/12/06, chinthaka@apache.org <ch...@apache.org> wrote:
> Author: chinthaka
> Date: Wed Oct 11 21:26:56 2006
> New Revision: 463130
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=463130
> Log:
> Arghh !! The meta-inf folder name should not be case sensitive. I fixed this lot of times, but seems to be appearing again and again.
>
> Modified:
> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
>
> Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?view=diff&rev=463130&r1=463129&r2=463130
> ==============================================================================
> --- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
> +++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Wed Oct 11 21:26:56 2006
> @@ -220,17 +220,21 @@
> File meta_inf = new File(serviceFile, META_INF);
>
> if (!meta_inf.exists()) {
> - throw new DeploymentException(
> - Messages.getMessage(
> - DeploymentErrorMsgs.META_INF_MISSING, serviceFile.getName()));
> + meta_inf = new File(serviceFile, META_INF.toLowerCase());
> + if (!meta_inf.exists()) {
> + throw new DeploymentException(
> + Messages.getMessage(
> + DeploymentErrorMsgs.META_INF_MISSING, serviceFile.getName()));
> + }
> }
> +
> File files[] = meta_inf.listFiles();
> for (int i = 0; i < files.length; i++) {
> File file1 = files[i];
> if (file1.getName().toLowerCase().endsWith(SUFFIX_WSDL)) {
> InputStream in = new FileInputStream(file1);
> FileInputStream in2 = null;
> -
> +
> // now the question is which version of WSDL file this archive contains.
> // lets check the namespace of the root element and decide. But since we are
> // using axiom (dude, you are becoming handy here :)), we will not build the
> @@ -253,7 +257,7 @@
> FileInputStream in3 = new FileInputStream(file1);
> AxisService service = processWSDLFile(wsdlToAxisServiceBuilder, file1, false, in2);
> try {
> - if(in2 != null) {
> + if (in2 != null) {
> in2.close();
> }
> in3.close();
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
> For additional commands, e-mail: axis-cvs-help@ws.apache.org
>
>
--
Davanum Srinivas : http://www.wso2.net (Oxygen for Web Service Developers)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org