svn commit: r278604 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment: DeploymentConstants.java DeploymentEngine.java axis2.xml listener/RepositoryListenerImpl.java

[di...@apache.org]

Author: dims
Date: Sun Sep  4 08:52:32 2005
New Revision: 278604

URL: http://svn.apache.org/viewcvs?rev=278604&view=rev
Log:
- replace extract_service_archieve with extractServiceArchive
- Prevent NPE when services directory is absent.
- fix some typos



Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=278604&r1=278603&r2=278604&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java Sun Sep  4 08:52:32 2005
@@ -86,6 +86,7 @@
 
     String HOTDEPLOYMENT = "hotdeployment";
     String HOTUPDATE = "hotupdate";
+    String EXTRACTSERVICEARCHIVE = "extractServiceArchive";
 
     String AXIS_STORAGE = "axisStorage";
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=278604&r1=278603&r2=278604&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Sun Sep  4 08:52:32 2005
@@ -178,7 +178,7 @@
         String value;
         Parameter parahotdeployment = axisConfig.getParameter(HOTDEPLOYMENT);
         Parameter parahotupdate = axisConfig.getParameter(HOTUPDATE);
-        Parameter exatrctServiceArchive = axisConfig.getParameter("extract_service_archieve");
+        Parameter paraextractServiceArchive = axisConfig.getParameter(EXTRACTSERVICEARCHIVE);
         if (parahotdeployment != null) {
             value = (String) parahotdeployment.getValue();
             if ("false".equalsIgnoreCase(value))
@@ -189,8 +189,8 @@
             if ("false".equalsIgnoreCase(value))
                 hotUpdate = false;
         }
-        if(exatrctServiceArchive != null){
-            value = (String) exatrctServiceArchive.getValue();
+        if(paraextractServiceArchive != null){
+            value = (String) paraextractServiceArchive.getValue();
             if ("true".equalsIgnoreCase(value))
                 extractServiceArchive = true;
         }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml?rev=278604&r1=278603&r2=278604&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml Sun Sep  4 08:52:32 2005
@@ -14,9 +14,9 @@
 
 
     <!--if you want to extract the service archive file and work with that please uncomment this-->
-    <!--else , it wont exatract archive file or does not take into consideration if someone drop-->
+    <!--else , it wont extract archive file or does not take into consideration if someone drop-->
     <!--exploded directory into /service directory-->
-    <!--<parameter name="extract_service_archieve" locked="false">true</parameter>-->
+    <!--<parameter name="extractServiceArchive" locked="false">true</parameter>-->
 
 
 <!--    The way of adding listener to the system-->

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java?rev=278604&r1=278603&r2=278604&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java Sun Sep  4 08:52:32 2005
@@ -182,7 +182,7 @@
         ArrayList tobedelete = new ArrayList();
         ArrayList tobeextarct = new ArrayList();
         ArrayList allFiles = new ArrayList();
-        for (int i = 0; i < fileList.length; i++) {
+        for (int i = 0; fileList != null && i < fileList.length; i++) {
             File file_first = fileList[i];
             boolean isservice = ArchiveFileData.isServiceArchiveFile(file_first.getName());
             boolean found = false;
@@ -222,7 +222,7 @@
             allFiles.add(outFile);
         }
 
-        for (int i = 0; i < fileList.length; i++) {
+        for (int i = 0; fileList != null && i < fileList.length; i++) {
             File file = fileList[i];
             boolean found = false;
             boolean todo = ArchiveFileData.isServiceArchiveFile(file.getName());