Changeset 18856 in vbox

Timestamp:

Apr 9, 2009 5:22:07 PM (16 years ago)

Author:

vboxsync

Message:

SDK: missed resource versioning

Location:

trunk/src/VBox/Main/webservice

Files:

• Makefile.kmk (modified) (2 diffs)
• glue-jaxws.xsl (modified) (4 diffs)

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

@@ -634 +634 @@
                 $(VBOXWEB_JAVALIB)/gen15:$(VBOX_JAXWS_LIBDIR)/jaxws-api.jar:$(VBOX_JAXWS_LIBDIR)/lib/jaxb-api.jar:$(VBOX_JAXWS_LIBDIR)/jsr181-api.jar \
                 $(VBOXWEB_PATH_SDK_GLUE_JAVA)/*.java  -d  $(VBOXWEB_JAVALIB)/gen15
-        $(QUIET)$(CP) -f $(VBOXWEBSERVICE_WSDL) $(VBOXWEB_JAVALIB)/gen15/
-        $(QUIET)$(CP) -f $(VBOXWEB_WSDL) $(VBOXWEB_JAVALIB)/gen15/
+        $(SED) -e "s/vboxweb.wsdl/vboxweb$(VBOX_API_SUFFIX).wsdl/" <  $(VBOXWEBSERVICE_WSDL) > $(VBOXWEB_JAVALIB)/gen15/vboxwebService$(VBOX_API_SUFFIX).wsdl
+        $(QUIET)$(CP) -f $(VBOXWEB_WSDL) $(VBOXWEB_JAVALIB)/gen15/vboxweb$(VBOX_API_SUFFIX).wsdl
         $(QUIET)$(RM) -f  $(VBOXWEB_JAVALIB)/gen15/*.java
-        $(QUIET)$(CP) -f $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL) $(VBOXWEB_JAVALIB)/gen15
         $(QUIET)$(VBOX_JAR) cf $@ -C $(VBOXWEB_JAVALIB)/gen15 .
 
@@ -648 +647 @@
         $(QUIET)$(VBOX_JAVAC16) -cp $(VBOXWEB_JAVALIB)/gen16 \
                 $(VBOXWEB_PATH_SDK_GLUE_JAVA)/*.java  -d  $(VBOXWEB_JAVALIB)/gen16
-        $(QUIET)$(CP) -f $(VBOXWEBSERVICE_WSDL) $(VBOXWEB_JAVALIB)/gen16/
-        $(QUIET)$(CP) -f $(VBOXWEB_WSDL) $(VBOXWEB_JAVALIB)/gen16/
+        $(SED) -e "s/vboxweb.wsdl/vboxweb$(VBOX_API_SUFFIX).wsdl/" <  $(VBOXWEBSERVICE_WSDL) > $(VBOXWEB_JAVALIB)/gen16/vboxwebService$(VBOX_API_SUFFIX).wsdl
+        $(QUIET)$(CP) -f $(VBOXWEB_WSDL) $(VBOXWEB_JAVALIB)/gen16/vboxweb$(VBOX_API_SUFFIX).wsdl
         $(QUIET)$(RM) -f  $(VBOXWEB_JAVALIB)/gen16/*.java
-        $(QUIET)$(CP) -f $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL) $(VBOXWEB_JAVALIB)/gen16
         $(QUIET)$(VBOX_JAR) cf $@ -C $(VBOXWEB_JAVALIB)/gen16 .
 

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

@@ -42 +42 @@
 <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:variable name="G_virtualBoxWsdl" select="concat(concat('&quot;vboxwebService',$G_vboxApiSuffix), '.wsdl&quot;')" />
 
 <xsl:include href="websrv-shared.inc.xsl" />
@@ -485 +486 @@
  </xsl:call-template>
 
- <xsl:text><![CDATA[
+
 import java.net.URL;
 import java.math.BigInteger;
@@ -499 +500 @@
 class PortPool
 {
+    private final static String wsdlFile = <xsl:value-of select="$G_virtualBoxWsdl" />;
+
+ <xsl:text><![CDATA[
     private Map<VboxPortType, Integer> known;
     private boolean initStarted;
-    private VboxService svc;
+    private VboxService svc;    
 
     PortPool(boolean usePreinit)
@@ -559 +563 @@
         {
             if (svc == null) {
-                URL wsdl = PortPool.class.getClassLoader().getResource("vboxwebService.wsdl");
+                URL wsdl = PortPool.class.getClassLoader().getResource(wsdlFile);
                 if (wsdl == null)
-                    throw new LinkageError("vboxwebService.wsdl not found, but it should have been in the jar");
+                    throw new LinkageError(wsdlFile+" not found, but it should have been in the jar");
                 svc = new VboxService(wsdl,
                                       new QName("http://www.virtualbox.org/Service",