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 de...@apache.org on 2005/02/22 08:09:25 UTC

svn commit: r154810 - in webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment: DeploymentEngine.java EngineRegistryFactoryImpl.java repository/utill/UnZipJAR.java

Author: deepal
Date: Mon Feb 21 23:09:23 2005
New Revision: 154810

URL: http://svn.apache.org/viewcvs?view=rev&rev=154810
Log: (empty)


Modified:
    webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java
    webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/EngineRegistryFactoryImpl.java
    webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/repository/utill/UnZipJAR.java

Modified: webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java?view=diff&r1=154809&r2=154810
==============================================================================
--- webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java Mon Feb 21 23:09:23 2005
@@ -171,7 +171,6 @@
      *
      * @return
      * @throws AxisFault
-     * @throws PhaseException
      */
     public EngineRegistry start() throws AxisFault, DeploymentException, XMLStreamException {
         //String fileName;
@@ -422,17 +421,15 @@
                             AxisService service = new AxisService();
                             unZipJAR.unzipService(currentFileItem.getAbsolutePath(), this, service);
                             addnewService(service);
-                            log.info("Invalid service" + currentFileItem.getName() );
                             log.info("Deployement WS Name  " + currentFileItem.getName());
                         } catch (DeploymentException de) {
-                            log.info("Invalid module" + currentFileItem.getName() );
+                            log.info("Invalid service" + currentFileItem.getName() );
                             log.info("DeploymentException  " + de);
                         } catch (AxisFault axisFault) {
-                            log.info("Invalid module" + currentFileItem.getName() );
+                            log.info("Invalid service" + currentFileItem.getName() );
                             log.info("AxisFault  " + axisFault);
-                            throw new RuntimeException(axisFault);
                         } catch (Exception e) {
-                            log.info("Invalid module" + currentFileItem.getName() );
+                            log.info("Invalid service" + currentFileItem.getName() );
                             log.info("Exception  " + e);
                         } finally {
                             currentFileItem = null;
@@ -443,7 +440,6 @@
                             AxisModule metaData = new AxisModule();
                             unZipJAR.unzipModule(currentFileItem.getAbsolutePath(), this, metaData);
                             addNewModule(metaData);
-                            log.info("Invalid module" + currentFileItem.getName() );
                             log.info("Moduel WS Name  " + currentFileItem.getName() + " modulename :" + metaData.getName());
                         } catch (DeploymentException e) {
                             log.info("Invalid module" + currentFileItem.getName() );
@@ -472,7 +468,6 @@
                     if(wsInfo.getType()==SERVICE) {
                         serviceName = getAxisServiceName(wsInfo.getFilename());
                         engineRegistry.removeService(new QName(serviceName));
-                        log.info("Invalid service" + currentFileItem.getName() );
                         log.info("UnDeployement WS Name  " + wsInfo.getFilename());
                     }
                 }

Modified: webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/EngineRegistryFactoryImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/EngineRegistryFactoryImpl.java?view=diff&r1=154809&r2=154810
==============================================================================
--- webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/EngineRegistryFactoryImpl.java (original)
+++ webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/EngineRegistryFactoryImpl.java Mon Feb 21 23:09:23 2005
@@ -1,19 +1,19 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- 
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 package org.apache.axis.deployment;
 
 import org.apache.axis.engine.AxisFault;
@@ -29,9 +29,7 @@
         try {
             DeploymentEngine deploymentEngine = new DeploymentEngine(file);
             return deploymentEngine.start();
-        } catch (PhaseException e) {
-            throw AxisFault.makeFault(e);
-        } catch (DeploymentException e) {
+        }catch (DeploymentException e) {
             throw AxisFault.makeFault(e);
         } catch (XMLStreamException e) {
             throw AxisFault.makeFault(e);

Modified: webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/repository/utill/UnZipJAR.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/repository/utill/UnZipJAR.java?view=diff&r1=154809&r2=154810
==============================================================================
--- webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/repository/utill/UnZipJAR.java (original)
+++ webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/repository/utill/UnZipJAR.java Mon Feb 21 23:09:23 2005
@@ -58,7 +58,6 @@
                 throw new DeploymentException("service.xml not found");
             }
         } catch (Exception e) {
-            e.printStackTrace();
             throw new DeploymentException(e.getMessage());
         }
     }