[wsas-java-dev] svn commit r56 - in wsas/java/trunk: . modules/admin modules/core/src/org/wso2/wsas modules/wsf-common-core/src/org/wso2/wsf/common/util xdocs

[svn at wso2.com]

Author: azeez
Date: Fri Dec  1 05:58:22 2006
New Revision: 56

Modified:
   wsas/java/trunk/maven.xml
   wsas/java/trunk/modules/admin/maven.xml
   wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
   wsas/java/trunk/modules/wsf-common-core/src/org/wso2/wsf/common/util/NetworkUtils.java
   wsas/java/trunk/xdocs/installation_src.html
Log:
1. Do not copy generated stuff when creating src distro
2. Caching the hostname



Modified: wsas/java/trunk/maven.xml
==============================================================================
--- wsas/java/trunk/maven.xml	(original)
+++ wsas/java/trunk/maven.xml	Fri Dec  1 05:58:22 2006
@@ -415,7 +415,7 @@
         </j:if>
 
         <ant:delete
-                file="modules/admin/test-resources/repository/modules/addressing-1.1-SNAPSHOT.mar"/>
+                file="modules/admin/test-resources/repository/modules/addressing-${addressing.version}.mar"/>
     </goal>
 
     <goal name="clean">
@@ -1251,6 +1251,8 @@
     <!--- Create the source distro -->
     <!-- ================================================================ -->
     <goal name="dist-src" prereqs="init-dist">
+        <attainGoal name="clean"/>
+        <attainGoal name="modules:clean"/>
         <ant:property name="dist.dir" value="target/dist"/>
         <ant:property name="dist.temp.src.dir"
                       value="${dist.dir}/temp-src/wso2wsas-src-${wso2wsas.version}"/>

Modified: wsas/java/trunk/modules/admin/maven.xml
==============================================================================
--- wsas/java/trunk/modules/admin/maven.xml	(original)
+++ wsas/java/trunk/modules/admin/maven.xml	Fri Dec  1 05:58:22 2006
@@ -91,13 +91,13 @@
             <ant:fileset
                     file="${maven.repo.local}/org.apache.axis2/mars/addressing-${addressing.version}.mar"/>
         </ant:copy>
-    </preGoal>
+    </preGoal> >
 
     <postGoal name="test:test">
         <delete dir="database"/>
         <delete dir="logs"/>
         <delete dir="work"/>
-        <delete file="resources/test-repository/modules/addressing-${addressing.version}.mar"/>
+        <delete file="test-resources/repository/modules/addressing-${addressing.version}.mar"/>
     </postGoal>
 
     <postGoal name="jar:jar">

Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java	Fri Dec  1 05:58:22 2006
@@ -151,6 +151,7 @@
 
 
             NetworkUtils.hostName = serverConfig.getFirstProperty("HostName");
+            NetworkUtils.init();
         } catch (Exception e) {
             String msg = "Cannot start WSO2 WSAS";
             log.fatal(msg, e);

Modified: wsas/java/trunk/modules/wsf-common-core/src/org/wso2/wsf/common/util/NetworkUtils.java
==============================================================================
--- wsas/java/trunk/modules/wsf-common-core/src/org/wso2/wsf/common/util/NetworkUtils.java	(original)
+++ wsas/java/trunk/modules/wsf-common-core/src/org/wso2/wsf/common/util/NetworkUtils.java	Fri Dec  1 05:58:22 2006
@@ -46,6 +46,12 @@
     private NetworkUtils() {
     }
 
+    public static void init() throws SocketException {
+        if (hostName == null) {
+            hostName = HttpUtils.getIpAddress();
+        }
+    }
+
     /**
      * Get the string defining the hostname of the system, as taken from
      * the default network adapter of the system. There is no guarantee that
@@ -65,5 +71,4 @@
         }
         return ip;
     }
-
 }

Modified: wsas/java/trunk/xdocs/installation_src.html
==============================================================================
--- wsas/java/trunk/xdocs/installation_src.html	(original)
+++ wsas/java/trunk/xdocs/installation_src.html	Fri Dec  1 05:58:22 2006
@@ -108,18 +108,13 @@
     <tr>
       <td><strong>Maven release</strong></td>
       <td>To create the complete release artifacts including Standalone
-        Edition, Servlet Edition, docs distribution and source distributions.</td>
+        Edition, Servlet Edition, and source distributions.</td>
     </tr>
     <tr>
       <td><strong>Maven dist</strong></td>
       <td>To create Standalone Edition and Servlet Edition distributions.</td>
     </tr>
     <tr>
-      <td><strong>Maven dist-min</strong></td>
-      <td>Creating the minimum distribution (minimum jars needed for WSO2 WSAS
-        to run)</td>
-    </tr>
-    <tr>
       <td><strong>Maven jar</strong></td>
       <td>Compiling and building the jars</td>
     </tr>