svn commit: r497326 - in /webservices/wsif/trunk/java: build.xml lib/README.html src/META-INF/services/org.apache.wsif.spi.WSIFProvider src/org/apache/wsif/base/PrivateCompositeExtensionRegistry.java

Author: aslom
Date: Wed Jan 17 23:15:51 2007
New Revision: 497326

URL: http://svn.apache.org/viewvc?view=rev&rev=497326
Log:
added BSF to build
updated version number

Modified:
    webservices/wsif/trunk/java/build.xml
    webservices/wsif/trunk/java/lib/README.html
    webservices/wsif/trunk/java/src/META-INF/services/org.apache.wsif.spi.WSIFProvider
    webservices/wsif/trunk/java/src/org/apache/wsif/base/PrivateCompositeExtensionRegistry.java

Modified: webservices/wsif/trunk/java/build.xml
URL: http://svn.apache.org/viewvc/webservices/wsif/trunk/java/build.xml?view=diff&rev=497326&r1=497325&r2=497326
==============================================================================
--- webservices/wsif/trunk/java/build.xml (original)
+++ webservices/wsif/trunk/java/build.xml Wed Jan 17 23:15:51 2007
@@ -48,14 +48,16 @@
     <property name="name" value="wsif"/>
     <property name="dynamic.name" value="wsif-dynamic"/>
     <property name="Name" value="wsif"/>
-    <property name="wsif.version" value="2.0.1_IB4"/>
+    <property name="wsif.version" value="2.1.0_RC2"/>
     <property name="year-from" value="2002"/>
-    <property name="year-to" value="2005"/>
+    <property name="year-to" value="2007"/>
     <property name="version.postfix" value="-${wsif.version}"/>
     <property name="javadoc.title" value="${Name}"/>    
 
     <property name="build.compiler" value="modern"/>
     <property name="debug" value="on"/>
+    <property name="java_source" value="1.4"/>
+    <property name="java_target" value="1.4"/>
 
     <property name="src.dir" value="./src"/>
     <property name="samples.dir" value="./samples"/>
@@ -167,6 +169,9 @@
     <fail unless="commons.logging.present">Warning: AXIS is required 
     Put AXIS JAR in lib directory and for more details see lib/README.html</fail>
 
+    <available property="bsf.present" classname="org.apache.bsf.BSFEngine" classpathref="project.classpath"  />
+    <fail unless="bsf.present">Warning: BSF is required 
+    Put BSF JARs in lib directory and for more details see lib/README.html</fail>
 
   </target>
 
@@ -205,6 +210,10 @@
     <echo message="Warning: Forrest dependencies were not resolved. If you wish to build the WSIF web site, download Forrest from http://xml.apache.org/forrest and specify installation directory in the forrest.home variable."/>
   </target>
 
+  <target name="checkBSF" unless="bsf.present">
+    <echo message="Warning: BSF dependencies were not resolved (see lib/README.html on how to required jar files)."/>
+  </target>
+  
   <target name="checkDependencies" depends="prepare" unless="javac.notRequired">
     <antcall target="checkSoapRMI"/>
     <antcall target="checkJMS"/>
@@ -212,6 +221,7 @@
     <antcall target="checkApacheSOAP"/>
     <antcall target="checkApacheAxis"/>
     <antcall target="checkJ2C"/>
+    <antcall target="checkBSF"/>
   </target>
 
   <!-- =================================================================== -->
@@ -229,6 +239,7 @@
     <exclude name="**/wsif/**/apachesoap/**/*.java" unless="apachesoap.present"/>
     <exclude name="**/wsif/**/apacheaxis/**/*.java" unless="apacheaxis.present"/>
     <exclude name="**/wsif/**/jca/**/*.java"/>
+    <exclude name="**/wsif/**/bsf/**/*.java" unless="bsf.present"/>
   </patternset>
 
   <patternset id="compiler.source.files">
@@ -274,7 +285,7 @@
   <!-- =================================================================== -->
   <target name="dynamic" depends="checkDependencies">
     <mkdir dir="${dynamic.dest}"/>
-    <javac srcdir="${src.dir}" destdir="${dynamic.dest}" debug="${debug}">
+    <javac srcdir="${src.dir}" destdir="${dynamic.dest}" debug="${debug}" source="${java_source}" target="${java_target}">
       <classpath refid="project.classpath"/>
       <patternset refid="dynamic.source.files"/>
     </javac>
@@ -637,7 +648,7 @@
   <!-- ================================================================= -->
   <!-- Creates the "all inclusive" distribution                          -->
   <!-- ================================================================= -->
-  <target name="alldist" depends="srcdist">
+  <target name="alldist" depends="javadocs,srcdist">
 
     <mkdir dir="${dist.dir}/doc/api"/>
     <copy todir="${dist.dir}/doc/api">

Modified: webservices/wsif/trunk/java/lib/README.html
URL: http://svn.apache.org/viewvc/webservices/wsif/trunk/java/lib/README.html?view=diff&rev=497326&r1=497325&r2=497326
==============================================================================
--- webservices/wsif/trunk/java/lib/README.html (original)
+++ webservices/wsif/trunk/java/lib/README.html Wed Jan 17 23:15:51 2007
@@ -110,6 +110,16 @@
 <p>Download latest Xerces 2 from
 <a href="http://xml.apache.org/dist/xerces-j/">http://xml.apache.org/dist/xerces-j/</a>. Used by WSIF, independent of
 what providers you use. <a href="#appendixa">License for using this JAR</a></p></li>
+
+<li><b>BSF</b>
+<p>Download latest BSF from
+<a href="http://jakarta.apache.org/site/downloads/downloads_bsf.html">http://jakarta.apache.org/site/downloads/downloads_bsf.html</a>. Used by WSIF's BSF provider. 
+<a href="#appendixa">License for using this JAR</a></p></li>
+<ul>
+<li><a href="http://jakarta.apache.org/bsf/projects.html">BSF related projects</a>:You also need to download the JAR files for the scripting languages you need to invoke through BSF. Information on where to obtain scripting languages for use with BSF is available on the <a href="http://jakarta.apache.org/bsf/projects.html">Related Projects page</a>.</li>
+<li><a href="http://www.mozilla.org/rhino/bsf.html#bsf-issue">BSF-Javascript issue</a>:<i>For js.jar for Bean Scripting Framework (BSF), please read <a href="http://www.mozilla.org/rhino/bsf.html#bsf-issue">this</a> note and then download the zip files.</i></li>
+</ul>
+</p>
 </ol>
 
 <p><b><a name="appendixa"/>Appendix A: License for Jakarta Ant, Apache SOAP, Apache Axis, Servlet

Modified: webservices/wsif/trunk/java/src/META-INF/services/org.apache.wsif.spi.WSIFProvider
URL: http://svn.apache.org/viewvc/webservices/wsif/trunk/java/src/META-INF/services/org.apache.wsif.spi.WSIFProvider?view=diff&rev=497326&r1=497325&r2=497326
==============================================================================
--- webservices/wsif/trunk/java/src/META-INF/services/org.apache.wsif.spi.WSIFProvider (original)
+++ webservices/wsif/trunk/java/src/META-INF/services/org.apache.wsif.spi.WSIFProvider Wed Jan 17 23:15:51 2007
@@ -11,4 +11,7 @@
 org.apache.wsif.providers.soap.apachesoap.WSIFDynamicProvider_ApacheSOAP
 
 # Native JMS provider
-org.apache.wsif.providers.jms.WSIFDynamicProvider_Jms
\ No newline at end of file
+org.apache.wsif.providers.jms.WSIFDynamicProvider_Jms
+
+# Native BSF provider
+org.apache.wsif.providers.bsf.WSIFDynamicProvider_BSF
\ No newline at end of file

Modified: webservices/wsif/trunk/java/src/org/apache/wsif/base/PrivateCompositeExtensionRegistry.java
URL: http://svn.apache.org/viewvc/webservices/wsif/trunk/java/src/org/apache/wsif/base/PrivateCompositeExtensionRegistry.java?view=diff&rev=497326&r1=497325&r2=497326
==============================================================================
--- webservices/wsif/trunk/java/src/org/apache/wsif/base/PrivateCompositeExtensionRegistry.java (original)
+++ webservices/wsif/trunk/java/src/org/apache/wsif/base/PrivateCompositeExtensionRegistry.java Wed Jan 17 23:15:51 2007
@@ -40,6 +40,7 @@
 import org.apache.wsif.wsdl.extensions.ejb.EJBBindingSerializer;
 import org.apache.wsif.wsdl.extensions.format.FormatBindingSerializer;
 import org.apache.wsif.wsdl.extensions.java.JavaBindingSerializer;
+import org.apache.wsif.wsdl.extensions.bsf.BSFBindingSerializer;
 
 import com.ibm.wsdl.extensions.PopulatedExtensionRegistry;
 
@@ -72,6 +73,8 @@
         formatSerializer.registerSerializer(per);
         EJBBindingSerializer ejbBindingSerializer = new EJBBindingSerializer();
         ejbBindingSerializer.registerSerializer(per);
+        BSFBindingSerializer bsfBindingSerializer = new BSFBindingSerializer();
+        bsfBindingSerializer.registerSerializer(per);
         extRegs.add(per);
         Trc.exit();
     }