Changeset 18608 in vbox

Timestamp:

Apr 1, 2009 4:37:34 PM (15 years ago)

Author:

vboxsync

Message:

SDK: better versioning

Location:

trunk/src/VBox/Main/webservice

Files:

• Makefile.kmk (modified) (2 diffs)
• glue-jaxws.xsl (modified) (2 diffs)
• samples/java/jax-ws/clienttest.java (modified) (1 diff)

trunk/src/VBox/Main/webservice/Makefile.kmk

@@ -366 +366 @@
  endif
  VBOX_JAR                      = jar
- # Keep in sync with G_virtualBoxPackage and G_virtualBoxPackage2 in glue-jaxws.xsl
- # Bump up once incompatible API version takes place
- VBOX_JAVA_PACKAGE             = org.virtualbox22
+ # Keep in sync with G_virtualBoxPackage in glue-jaxws.xsl
+ # Changed with every new version, so beware!
+ VBOX_API_SUFFIX               = _$(VBOX_VERSION_MAJOR)_$(VBOX_VERSION_MINOR)
+ VBOX_JAVA_PACKAGE             = org.virtualbox$(VBOX_API_SUFFIX) 
 
  VBOXWEB_OTHERS               += \
@@ -601 +602 @@
         $(QUIET)$(MKDIR) -p $(@D)
         $(call MSG_GENERATE,,$@,$(VBOXWEB_IDL_SRC) using glue-jaxws.xsl)
-        $(QUIET)$(VBOX_XSLTPROC) $(VBOXWEB_XSLTPROC_VERBOSE) -o $@ $(VBOX_PATH_WEBSERVICE)/glue-jaxws.xsl $<
+        $(QUIET)$(VBOX_XSLTPROC) $(VBOXWEB_XSLTPROC_VERBOSE)         \
+              --stringparam G_vboxApiSuffix $(VBOX_API_SUFFIX)       \
+              -o $@ $(VBOX_PATH_WEBSERVICE)/glue-jaxws.xsl $<
         $(call MSG_GENERATE,,java client glue files in $(VBOXWEB_PATH_SDK_GLUE_JAVA))
         $(RM) -R -f $(VBOXWEB_PATH_SDK_GLUE_JAVA)

trunk/src/VBox/Main/webservice/glue-jaxws.xsl

@@ -39 +39 @@
 
 <xsl:variable name="G_xsltFilename" select="'glue-jaxws.xsl'" />
-
 <!-- Keep in sync with VBOX_JAVA_PACKAGE in webservices/Makefile.kmk -->
-<xsl:variable name="G_virtualBoxPackage" select="'org.virtualbox22'" />
-<xsl:variable name="G_virtualBoxPackage2" select="'com.sun.xml.ws.commons.virtualbox22'" />
+<xsl:variable name="G_virtualBoxPackage" select="concat('org.virtualbox',$G_vboxApiSuffix)" />
+<xsl:variable name="G_virtualBoxPackage2" select="concat('com.sun.xml.ws.commons.virtualbox',$G_vboxApiSuffix)" />
 
 <xsl:include href="websrv-shared.inc.xsl" />
@@ -351 +350 @@
 
 <xsl:template match="/idl">
+ <xsl:if test="not($G_vboxApiSuffix)">
+  <xsl:call-template name="fatalError">
+    <xsl:with-param name="msg" select="'G_vboxApiSuffix must be given'" />
+  </xsl:call-template>
+ </xsl:if>
  <xsl:call-template name="startFile">
   <xsl:with-param name="file" select="'IUnknown.java'" />
  </xsl:call-template>
-
+ 
  <xsl:text><![CDATA[
 public class IUnknown

trunk/src/VBox/Main/webservice/samples/java/jax-ws/clienttest.java

@@ -19 +19 @@
  * additional information or have any questions.
  */
-import com.sun.xml.ws.commons.virtualbox22.*;
+import com.sun.xml.ws.commons.virtualbox_2_1.*;
 import java.util.*;
 import javax.xml.ws.Holder;
-import org.virtualbox22.*;
+import org.virtualbox_2_1.*;
 
 public class clienttest