[wsas-java-dev] svn commit r6248 - in trunk/wsas/java: . modules/distribution modules/www/extensions/tools modules/www/extensions/tools/js

[svn at wso2.org]

Author: saminda
Date: Mon Aug 13 11:04:04 2007
New Revision: 6248

Modified:
   trunk/wsas/java/modules/distribution/bin-release-assembly.xml
   trunk/wsas/java/modules/distribution/pom.xml
   trunk/wsas/java/modules/www/extensions/tools/js/tools.js
   trunk/wsas/java/modules/www/extensions/tools/menu.html
   trunk/wsas/java/pom.xml
Log:
Integration of Archive validators; MAR/modules.xml and AAR/services.xml


Modified: trunk/wsas/java/modules/distribution/bin-release-assembly.xml
==============================================================================
--- trunk/wsas/java/modules/distribution/bin-release-assembly.xml	(original)
+++ trunk/wsas/java/modules/distribution/bin-release-assembly.xml	Mon Aug 13 11:04:04 2007
@@ -165,6 +165,15 @@
         </dependencySet>
 
         <dependencySet>
+            <outputDirectory>temp/wso2wsas-${wso2wsas.version}/repository/services</outputDirectory>
+            <!-- TODO Until service version has become meaningful, version has been truncated from the service -->
+            <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+            <includes>
+                <include>org.wso2.validator:archive-validator:aar</include>
+            </includes>
+        </dependencySet>
+
+        <dependencySet>
             <outputDirectory>${dist.temp.assembly.bin.dir}/lib</outputDirectory>
             <includes>
                 <include>*:jar:*</include>

Modified: trunk/wsas/java/modules/distribution/pom.xml
==============================================================================
--- trunk/wsas/java/modules/distribution/pom.xml	(original)
+++ trunk/wsas/java/modules/distribution/pom.xml	Mon Aug 13 11:04:04 2007
@@ -241,6 +241,14 @@
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${dist.dir.temp.www}</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.wso2.validator</groupId>
+                                    <artifactId>archive-validator</artifactId>
+                                    <version>${archive.validator.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${dist.dir.temp.www}</outputDirectory>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
@@ -799,6 +807,18 @@
             <type>aar</type>
         </dependency>
 
+        <dependency>
+            <groupId>org.wso2.validator</groupId>
+            <artifactId>archive-validator</artifactId>
+            <version>${archive.validator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.validator</groupId>
+            <artifactId>archive-validator</artifactId>
+            <version>${archive.validator.version}</version>
+            <type>aar</type>
+        </dependency>
+
     </dependencies>
 
 </project>

Modified: trunk/wsas/java/modules/www/extensions/tools/js/tools.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/tools/js/tools.js	(original)
+++ trunk/wsas/java/modules/www/extensions/tools/js/tools.js	Mon Aug 13 11:04:04 2007
@@ -19,6 +19,11 @@
         }
     },
 
+    avTool : function(thisObj, index){
+        this.renderHelper(thisObj, index);
+        wso2.tool.AV.showValidator();
+    },
+
     wcTool : function(thisObj, index) {
         this.renderHelper(thisObj, index);
         wso2.tool.WC.showWC();

Modified: trunk/wsas/java/modules/www/extensions/tools/menu.html
==============================================================================
--- trunk/wsas/java/modules/www/extensions/tools/menu.html	(original)
+++ trunk/wsas/java/modules/www/extensions/tools/menu.html	Mon Aug 13 11:04:04 2007
@@ -3,5 +3,6 @@
         <!--<li><a href="#" id="menu_wsdl2code_class_id" onclick="javascript:wso2.wsas.Tools.wsdl2code(this,13); return false;" class="menu_wsdl2code_class" title="WSDL To Code">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;WSDL2Code</a></li>-->
         <li><a href="#" id="menu_wsdl2code_class_id" onclick="javascript:wso2.wsas.Tools.wsdl2code2(this,14); return false;" class="menu_item_class" title="WSDL To Code">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;WSDL2Code</a></li>
         <li><a href="#" id="menu_wc_class_id" onclick="javascript:wso2.wsas.Tools.wcTool(this,14); return false;" class="menu_item_class" title="WSDL To Code">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;WSDL Converter</a></li>
+        <li><a href="#" id="menu_av_class_id" onclick="javascript:wso2.wsas.Tools.avTool(this,14); return false;" class="menu_item_class" title="WSDL To Code">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Archive Validators</a></li>
     </ul>
 </li>
\ No newline at end of file

Modified: trunk/wsas/java/pom.xml
==============================================================================
--- trunk/wsas/java/pom.xml	(original)
+++ trunk/wsas/java/pom.xml	Mon Aug 13 11:04:04 2007
@@ -1668,6 +1668,7 @@
         <axis1.version>1.4</axis1.version>
 
         <wsdlconverter.version>SNAPSHOT</wsdlconverter.version>
+        <archive.validator.version>SNAPSHOT</archive.validator.version>
 
     </properties>