[wsas-java-dev] svn commit r68 - in wsas/java/trunk: . etc modules/core/src/org/wso2/wsas

[svn at wso2.com]

Author: azeez
Date: Fri Dec  1 07:42:43 2006
New Revision: 68

Added:
   wsas/java/trunk/etc/src-dist-README.txt
   wsas/java/trunk/etc/src-dist-project.properties
      - copied, changed from r58, wsas/java/trunk/etc/project.properties
Removed:
   wsas/java/trunk/etc/project.properties
Modified:
   wsas/java/trunk/maven.xml
   wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
Log:
Checking null modules

Added: wsas/java/trunk/etc/src-dist-README.txt
==============================================================================

Copied: wsas/java/trunk/etc/src-dist-project.properties (from r58, wsas/java/trunk/etc/project.properties)
==============================================================================

Modified: wsas/java/trunk/maven.xml
==============================================================================
--- wsas/java/trunk/maven.xml	(original)
+++ wsas/java/trunk/maven.xml	Fri Dec  1 07:42:43 2006
@@ -1275,13 +1275,14 @@
                 <exclude name="project.properties"/>
             </ant:fileset>
         </ant:copy>
-        <ant:copy todir="${dist.temp.src.dir}" filtering="on">
-            <ant:fileset file="etc/project.properties"/>
-        </ant:copy>
+        <ant:copy tofile="${dist.temp.src.dir}/project.properties"
+                  file="etc/src-dist-project.properties" filtering="on"/>
         <ant:delete dir="${dist.temp.src.dir}/plugins" failonerror="false"/>
         <ant:delete dir="${dist.temp.src.dir}/distchecker" failonerror="false"/>
         <ant:delete dir="${dist.temp.src.dir}/target" failonerror="false"/>
         <ant:delete dir="${dist.temp.src.dir}/database" failonerror="false"/>
+        <ant:copy tofile="${dist.temp.src.dir}/README.txt"
+                  file="etc/src-dist-README.txt" filtering="on" overwrite="true"/>
         <ant:delete failonerror="false">
             <fileset dir="${dist.temp.src.dir}/xdocs/images">
                 <include name="**/*"/>

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 07:42:43 2006
@@ -189,9 +189,11 @@
                 AxisModule axisModule =
                         configContext.getAxisConfiguration().getModule(new QName(module));
 
-                ModuleDO moduleDO = pm.getModule(ModuleIdUtil.getModuleId(axisModule),
-                                                 ModuleIdUtil.getModuleVersion(axisModule));
-                scenario.addModule(moduleDO);
+                if (axisModule != null) {
+                    ModuleDO moduleDO = pm.getModule(ModuleIdUtil.getModuleId(axisModule),
+                                                     ModuleIdUtil.getModuleVersion(axisModule));
+                    scenario.addModule(moduleDO);
+                }
             }
             try {
                 pm.addSecurityScenario(scenario);