a possibility to build for jasper other versions

Author: dmitriy

bee-build.xml

@@ -5,6 +5,7 @@
       <!ENTITY jdk_root "">
       <!ENTITY tjws_src "/home/dmitriy/projects/TJWS2/1.x">
       <!ENTITY jasper "/home/dmitriy/projects/jasper-7.0.109">
+      <!ENTITY websoketx "no">
       <!ENTITY fast_scanner "/home/dmitriy/projects/fast-classpath-scanner/lib">
       <!ENTITY keystore "/home/dmitriy/Documents/android-publish.keystore">
       <!ENTITY sdklib_custom "/home/dmitriy/projects/sdklib/build">
@@ -101,10 +102,6 @@
          <value type="path">src</value>
       </operator>
      </expression>
-     <expression variable="idl file">
-        <operator name="append">
-        </operator>
-     </expression>
      <variable name="empty str">
 </variable>
      <target name="idl gen">
@@ -250,24 +247,38 @@
         <value value="${JAVA_HOME}/bin/javac"/>
      </operator>
   </expression>
-   <expression variable="CUSTOM CP">
+  <expression variable="CUSTOM CP">
     <operator name="append">
        <value>&tjws_src;/lib/webserver.jar</value>
        <value variable="PATH SEPARATOR"/>
        <value>&tjws_src;/lib/war.jar</value>
        <value variable="PATH SEPARATOR"/>
        <value>&tjws_src;/lib/wskt.jar</value>
        <value variable="PATH SEPARATOR"/>
-       <!--value  type="repo_artifact">maven:javax.servlet:javax.servlet-api:3.1.0</value>
-       <value variable="PATH SEPARATOR"/>
-       <value type="repo_artifact">maven:javax.websocket:javax.websocket-api:1.1</value>
-       <value variable="PATH SEPARATOR"/-->
        <value>&jasper;/build/jasper.jar</value>
        <value variable="PATH SEPARATOR"/>
        <value>&fast_scanner;/class-scanner.jar</value>
     </operator>
   </expression>
-
+  <expression variable="CUSTOM CP">
+	  <if>
+	     <expression>
+		 <operator name="eq">
+		    <value>&websoketx;</value>
+		    <value>yes</value>
+		</operator>
+	     </expression>
+	     <then>
+		   <operator name="append">
+		      <value>${CUSTOM CP}${PATH SEPARATOR}</value>
+		      <value type="repo_artifact">maven:javax.websocket:javax.websocket-api:1.1</value>
+		   </operator>
+	     </then>
+	     <else>
+	        <value variable="CUSTOM CP"/>
+	     </else>
+	  </if>
+  </expression>
   <expression variable="class path">
      <operator name="append">
         <value variable="CUSTOM CP"/>

bee-dexwar.xml

@@ -3,7 +3,7 @@
     "https://raw.githubusercontent.com/drogatkin/7Bee/master/bee.dtd" [
       <!ENTITY android_sdk "/home/dmitriy/Android/Sdk">
       <!ENTITY jasper_lib "/home/dmitriy/projects/jasper-7.0.109/build/jasper.jar">
-      <!ENTITY servlet_lib "maven:javax.servlet:javax.servlet-api:3.1.0">
+      <!ENTITY websoketx "no">
       <!ENTITY tjws_wskt_lib "/home/dmitriy/projects/TJWS2/1.x/lib/wskt.jar">
       <!ENTITY fast_scan_lib "/home/dmitriy/projects/fast-classpath-scanner/lib/class-scanner.jar">
       <!ENTITY target "30">
@@ -38,8 +38,6 @@
     <expression name="jasper path">
         <operator name="append">
             <value>&jasper_lib;</value>
-            <!--value name="path.separator" type="property"/>
-            <value>&servlet_lib;</value-->
             <value name="path.separator" type="property"/>
             <value variable="JAVA_HOME"/>
             <value>/lib/tools.jar</value>
@@ -302,8 +300,28 @@
                   <value variable="&jasper_lib;"></value>
                </operator>
             </expression>
-            <echo>Processing server endpoints</echo>
-            <echo variable="scanner path"/>
+            <expression name="scanner path">
+               <if>
+		     <expression>
+			 <operator name="eq">
+			    <value>&websoketx;</value>
+			    <value>yes</value>
+			</operator>
+		     </expression>
+		     <then>
+			   <operator name="append">
+			      <value variable="scanner path"/>
+			      <value>${scanner path}</value>
+			      <value name="path.separator" type="property"/>
+			      <value type="repo_artifact">maven:javax.websocket:javax.websocket-api:1.1</value>
+			   </operator>
+		     </then>
+		     <else>
+	      		  <value variable="scanner path"/>
+	    	     </else>
+	 	 </if>
+            </expression>
+            <echo>Processing server endpoints (cp: ${scanner path})</echo>
             <task name="scan" code="rogatkin.wskt.EndPointScanner" path="scanner path">
                 <parameter variable="web-inf"/>
                 <parameter variable="ws-info"/>
@@ -363,12 +381,12 @@
                             <value>/*</value>
                         </operator>
                     </expression>
-                    <echo>Zipping JSP classes</echo>
+                    <echo>Zipping JSP classes in ${jsp dir}</echo>
                     <function name="zip">
                         <parameter variable="jsp jar"/>
                         <parameter variable="jsp dir" type="file"/>
                     </function>
-                    <!-- keep JSP .class files here to make JSP engine think they are actual -->                    
+                    <!-- keep JSP .class files here to make JSP engine to think they are actual -->                    
                 </then>
                 <else>
                     <echo>No JSP</echo>
@@ -406,7 +424,7 @@
                     <value>/allclasses.jar</value>
                 </operator>
             </expression>
-            <echo variable="all jars"/>
+            <echo value="Doing d8 of ${all jars}"/>
             <if>
                 <expression>
                     <operator name="neq">

res/values/strings.xml

@@ -20,9 +20,8 @@
     <string name="t_warning">Warning</string>
     <string name="rescan">Rescan Apps</string>
     <string name="t_error">Error</string>
-    <string name="alrt_problem">Problem happened %s</string>
-    <string name="enable_log">Enable logging</string>
-
+    <string name="alrt_problem">Problem %s happened</string>
+    <string name="enable_log">Access log</string>
     <string name="enable_ssl">SSL</string>
     <string name="at_port">"@"</string>
 </resources>