Changeset 18694 in vbox for trunk/src

Timestamp:

Apr 3, 2009 2:23:27 PM (16 years ago)

Author:

vboxsync

Message:

SDK licensing

Location:

trunk/src/VBox/Main/webservice

Files:

• Makefile.kmk (modified) (2 diffs)
• glue-jaxws.xsl (modified) (6 diffs)
• samples/java/axis/clienttest.java (modified) (1 diff)
• samples/java/jax-ws/clienttest.java (modified) (3 diffs)
• samples/java/jax-ws/metrictest.java (modified) (4 diffs)
• samples/perl/clienttest.pl (modified) (1 diff)

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

@@ -369 +369 @@
  # Changed with every new version, so beware!
  VBOX_API_SUFFIX               = _$(VBOX_VERSION_MAJOR)_$(VBOX_VERSION_MINOR)
- VBOX_JAVA_PACKAGE             = org.virtualbox$(VBOX_API_SUFFIX) 
+ VBOX_JAVA_PACKAGE             = org.virtualbox$(VBOX_API_SUFFIX)
 
  VBOXWEB_OTHERS               += \
@@ -608 +608 @@
         $(QUIET)$(MKDIR) -p $(VBOXWEB_PATH_SDK_GLUE_JAVA)
         $(QUIET)$(TARGET_filesplitter) $@ $(VBOXWEB_PATH_SDK_GLUE_JAVA)
+        $(QUIET)$(CP) -f $(VBOX_PATH_WEBSERVICE)/../../../../COPYING.LIB $(VBOXWEB_PATH_SDK_GLUE_JAVA)
 
 # likely those 4 rules can be changed to INSTALLS

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

@@ -54 +54 @@
   <xsl:param name="name" />
   <xsl:text>/**
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
  *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ * This file is part of a free software library; you can redistribute
+ * it and/or modify it under the terms of the GNU Lesser General
+ * Public License version 2.1 as published by the Free Software
+ * Foundation and shipped in the "COPYING.LIB" file with this library.
+ * The library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY of any kind.
+ *
+ * Sun LGPL Disclaimer: For the avoidance of doubt, except that if
+ * any license choice other than GPL or LGPL is available it will
+ * apply instead, Sun elects to use only the Lesser General Public
+ * License version 2.1 (LGPLv2) at this time for any software where
+ * a choice of LGPL license versions is made available with the
+ * language indicating that LGPLv2 or any later version may be used,
+ * or where a choice of which version of the LGPL is applied is
+ * otherwise unspecified.
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
@@ -69 +77 @@
  *
 </xsl:text>
-  <xsl:value-of select="concat(' * ',$name)"/> 
+  <xsl:value-of select="concat(' * ',$name)"/>
 <xsl:text>
  *
@@ -326 +334 @@
 <xsl:template name="startFile">
   <xsl:param name="file" />
-  
+
   <xsl:value-of select="concat('&#10;// ##### BEGINFILE &quot;', $file, '&quot;&#10;&#10;')" />
   <xsl:call-template name="fileheader">
@@ -358 +366 @@
   <xsl:with-param name="file" select="'IUnknown.java'" />
  </xsl:call-template>
- 
+
  <xsl:text><![CDATA[
 public class IUnknown
@@ -727 +735 @@
       <xsl:with-param name="file" select="concat($filename, '.java')" />
     </xsl:call-template>
-    
+
   </xsl:for-each>
 
@@ -806 +814 @@
       <xsl:text>import java.util.UUID;&#10;</xsl:text>
       <xsl:text>import javax.xml.ws.Holder;&#10;</xsl:text>
-      <xsl:text>import javax.xml.ws.WebServiceException;&#10;</xsl:text>      
+      <xsl:text>import javax.xml.ws.WebServiceException;&#10;</xsl:text>
 
       <xsl:choose>

trunk/src/VBox/Main/webservice/samples/java/axis/clienttest.java

@@ -5 +5 @@
  * User Manual, which describe in detail how to get this code running.
  *
- * Copyright (C) 2008 Sun Microsystems, Inc.
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
- * Clara, CA 95054 USA or visit http://www.sun.com if you need
- * additional information or have any questions.
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
+ *
+ * The following license applies to this file only:
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 

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

@@ -5 +5 @@
  * with 'vboxwebsrv -t 1000' command, to calm down watchdog thread.
  *
- * Copyright (C) 2008 Sun Microsystems, Inc.
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
- * Clara, CA 95054 USA or visit http://www.sun.com if you need
- * additional information or have any questions.
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
+ *
+ * The following license applies to this file only:
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 /* Somewhat ugly way to support versioning */
@@ -94 +104 @@
     public void test3()
     {
-        
+
         IWebsessionManager mgr1 = new IWebsessionManager("http://localhost:18082/");
         IWebsessionManager mgr2 = new IWebsessionManager("http://localhost:18083/");
         IVirtualBox vbox1 = mgr1.logon("test", "test");
         IVirtualBox vbox2 = mgr2.logon("test", "test");
-        
+
 
         System.out.println("connection 1 to VirtualBox version " + vbox1.getVersion());
@@ -110 +120 @@
         vbox1 = mgr1.logon("test", "test");
         vbox2 = mgr2.logon("test", "test");
-        
+
         System.out.println("second connection 1 to VirtualBox version " + vbox1.getVersion());
         System.out.println("second connection 2 to VirtualBox version " + vbox2.getVersion());

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

@@ -2 +2 @@
  * Sample of performance API usage, written in Java.
  *
- * Don't forget to run VBOX webserver 
- * with 'vboxwebsrv -t 1000' command, to calm down watchdog thread. 
- * 
- * Copyright (C) 2008 Sun Microsystems, Inc.
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
- * Clara, CA 95054 USA or visit http://www.sun.com if you need
- * additional information or have any questions.
+ * Don't forget to run VBOX webserver
+ * with 'vboxwebsrv -t 1000' command, to calm down watchdog thread.
+ *
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
+ *
+ * The following license applies to this file only:
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 import com.sun.xml.ws.commons.virtualbox{VBOX_API_SUFFIX}.*;
@@ -100 +110 @@
         Holder<List<Long>> indices =  new Holder<List<Long>>();
         Holder<List<Long>> lengths =  new Holder<List<Long>>();
-        List<Integer> values = 
+        List<Integer> values =
             _collector.queryMetricsData(filterMetrics, filterObjects,
                                         names, objects, units, scales, sequenceNumbers, indices, lengths);
@@ -165 +175 @@
             List<PerformanceData> metricData = perf.query(Arrays.asList(new String[]{"*"}),
                                                           allObjects);
-            for (PerformanceData md : metricData) 
+            for (PerformanceData md : metricData)
             {
                 System.out.println("(" + getObjectName(md.object) + ") " +
@@ -200 +210 @@
         }
     }
-    
+
     public static void main(String[] args) throws InterruptedException
     {

trunk/src/VBox/Main/webservice/samples/perl/clienttest.pl

@@ -6 +6 @@
 # programming reference (SDKRef.pdf) for how to use this sample.
 #
-# Copyright (C) 2006-2009 Sun Microsystems, Inc.
+# Copyright (C) 2008-2009 Sun Microsystems, Inc.
 #
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License (GPL) as published by the Free Software
-# Foundation, in version 2 as it comes in the "COPYING" file of the
-# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+# The following license applies to this file only:
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
-# Clara, CA 95054 USA or visit http://www.sun.com if you need
-# additional information or have any questions.
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
 #