axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r180224 - in /webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment: DeploymentEngine.java repository/utill/ArchiveReader.java server.xml
Date Mon, 06 Jun 2005 05:17:26 GMT
Author: deepal
Date: Sun Jun  5 22:17:26 2005
New Revision: 180224

URL: http://svn.apache.org/viewcvs?rev=180224&view=rev
Log:
loading modules form axis2 distribution archive file

Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java?rev=180224&r1=180223&r2=180224&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
Sun Jun  5 22:17:26 2005
@@ -62,6 +62,8 @@
     private Log log = LogFactory.getLog(getClass());
     private static Scheduler scheduler;
 
+    public static String axis2repository = null;
+
 
     private boolean hotDeployment = true;   //to do hot deployment or not
     private boolean hotUpdate = true;  // to do hot update or not
@@ -121,6 +123,7 @@
 
     public DeploymentEngine(String RepositaryName, String serverXMLFile) throws DeploymentException
{
         this.folderName = RepositaryName;
+        axis2repository = RepositaryName;
         File repository = new File(RepositaryName);
         if (!repository.exists()) {
             repository.mkdirs();
@@ -227,6 +230,7 @@
 
     public AxisConfiguration loadClient(String clientHome) throws DeploymentException {
         InputStream in = null;
+        axis2repository = clientHome;
         boolean isRepositoryExist = false;
         if (clientHome != null) {
             checkClientHome(clientHome);

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java?rev=180224&r1=180223&r2=180224&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java
Sun Jun  5 22:17:26 2005
@@ -128,16 +128,24 @@
      */
     public File creatModuleArchivefromResource(String moduleName) throws DeploymentException
{
         File modulearchiveFile = null;
+        File modules = null;
         try {
             int BUFFER = 2048;
-            String userHome = System.getProperty("user.home");
-            File userHomedir = new File(userHome);
-            File modules = null;
-            File repository = new File(userHomedir, "Axis2Home");
-            if (!repository.exists()) {
-                repository.mkdirs();
-                modules = new File(repository, "modules");
-                modules.mkdirs();
+            if(DeploymentEngine.axis2repository == null ){
+                String userHome = System.getProperty("user.home");
+                File userHomedir = new File(userHome);
+                File repository = new File(userHomedir, "Axis2Home");
+                if (!repository.exists()) {
+                    repository.mkdirs();
+                    modules = new File(repository, "modules");
+                    modules.mkdirs();
+                }
+            } else {
+                modules = new File(DeploymentEngine.axis2repository , "modules");
+                if(!modules.exists()){
+                    modules = new File(DeploymentEngine.axis2repository, "modules");
+                    modules.mkdirs();
+                }
             }
             String modulearchiveName =moduleName + ".mar";
             modulearchiveFile = new File(modules,modulearchiveName);
@@ -166,7 +174,6 @@
             while ((entry = zin.getNextEntry()) != null) {
                 ZipEntry zip = new ZipEntry(entry);
                 out.putNextEntry(zip);
-                System.out.println("entry = " + entry.getName());
                 int count;
                 while ((count = zin.read(data, 0, BUFFER)) != -1) {
                     out.write(data, 0, count);

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml?rev=180224&r1=180223&r2=180224&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml Sun
Jun  5 22:17:26 2005
@@ -55,7 +55,7 @@
    <!-- ================================================= -->
    <!-- Global Modules  -->
    <!-- ================================================= -->
-    <!-- Uncomment this to enable Addressing   
+    <!-- Uncomment this to enable Addressing
     <module ref="addressing"/> -->
 
    <!-- ================================================= -->



Mime
View raw message