Changeset 5031


Ignore:
Timestamp:
Jul 28, 2009, 2:53:57 PM (13 years ago)
Author:
Nicklas Nordborg
Message:

References #1353: Update to latest version of 3-rd party software

Updated JAI: 1.1.2 --> 1.1.3

Location:
trunk
Files:
2 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/doc/3rd-party-components.txt

    r5030 r5031  
    7878code libraries in order to follow the license.
    7979
    80 More info : http://java.sun.com/products/java-media/jai/index.jsp
    81 Version   : 1.1.2
     80More info : https://jai.dev.java.net/
     81Version   : 1.1.3
    8282License   : Sun Microsystems Binary Code License (jai.license.txt)
    83 Jar files : jai_core.jar, jai_codec.jar, mlibwrapper_jai.jar
    84 Other     : lbmlib_jai.so, checkmmx.exe, mlib_jai.dll, mlib_jai_mmx.dll
     83Jar files : jai_core.jar, jai_codec.jar
    8584
    8685
  • trunk/doc/licenses/jai.license.txt

    r1284 r5031  
    1                            Sun Microsystems, Inc.
    2                         Binary Code License Agreement
    3                   JAVA ADVANCED IMAGING API, VERSION 1.1.2
     1Sun Microsystems, Inc.
     2Binary Code License Agreement
    43
    5 READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL LICENSE TERMS
    6 (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE MEDIA
    7 PACKAGE.  BY OPENING THE SOFTWARE MEDIA PACKAGE, YOU AGREE TO THE TERMS OF
    8 THIS AGREEMENT.  IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, INDICATE
    9 YOUR ACCEPTANCE OF THESE TERMS BY SELECTING THE "ACCEPT" BUTTON AT THE END
    10 OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO ALL THESE TERMS, PROMPTLY RETURN
    11 THE UNUSED SOFTWARE TO YOUR PLACE OF PURCHASE FOR A REFUND OR, IF THE
    12 SOFTWARE IS ACCESSED ELECTRONICALLY, SELECT THE "DECLINE" BUTTON AT THE END
    13 OF THIS AGREEMENT.
     4JAVA ADVANCED IMAGING API, VERSION 1.1.3
    145
    15 1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable
    16 license for the internal use only of the accompanying software and
    17 documentation and any error corrections provided by Sun (collectively
    18 "Software"), by the number of users and the class of computer hardware for
    19 which the corresponding fee has been paid.
     6READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE MEDIA PACKAGE.� BY OPENING THE SOFTWARE MEDIA PACKAGE, YOU AGREE TO THE TERMS OF THIS AGREEMENT.� IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT.� IF YOU DO NOT AGREE TO ALL THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE OF PURCHASE FOR A REFUND OR, IF THE SOFTWARE IS ACCESSED ELECTRONICALLY, SELECT THE "DECLINE" BUTTON AT THE END OF THIS AGREEMENT.
    207
    21 2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to
    22 Software and all associated intellectual property rights is retained by Sun
    23 and/or its licensors.  Except as specifically authorized in any Supplemental
    24 License Terms, you may not make copies of Software, other than a single copy
    25 of Software for archival purposes.  Unless enforcement is prohibited by
    26 applicable law, you may not modify, decompile, or reverse engineer
    27 Software.  You acknowledge that Software is not designed, licensed or
    28 intended for use in the design, construction, operation or maintenance of
    29 any nuclear facility.  Sun disclaims any express or implied warranty of
    30 fitness for such uses.  No right, title or interest in or to any trademark,
    31 service mark, logo or trade name of Sun or its licensors is granted under
    32 this Agreement.
     81.� LICENSE TO USE.� Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer hardware for which the corresponding fee has been paid.
    339
    34 3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90)
    35 days from the date of purchase, as evidenced by a copy of the receipt, the
    36 media on which Software is furnished (if any) will be free of defects in
    37 materials and workmanship under normal use.  Except for the foregoing,
    38 Software is provided "AS IS".  Your exclusive remedy and Sun's entire
    39 liability under this limited warranty will be at Sun's option to replace
    40 Software media or refund the fee paid for Software.
     102.� RESTRICTIONS.� Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by Sun and/or its licensors.� Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other than a single copy of Software for archival purposes.� Unless enforcement is prohibited by applicable law, you may not modify, decompile, or reverse engineer Software.� Licensee acknowledges that Software is not designed or intended for use in the design, construction, operation or maintenance of any nuclear facility. Sun Microsystems, Inc. disclaims any express or implied warranty of fitness for such uses. � No right, title or interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement.
    4111
    42 4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS
    43 OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
    44 WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
    45 NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS
    46 ARE HELD TO BE LEGALLY INVALID.
     123.  LIMITED WARRANTY.� Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.� Except for the foregoing, Software is provided "AS IS".� Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's option to replace Software media or refund the fee paid for Software.
    4713
    48 5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO
    49 EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR
    50 DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
    51 DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT
    52 OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS
    53 BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  In no event will Sun's
    54 liability to you, whether in contract, tort (including negligence), or
    55 otherwise, exceed the amount paid by you for Software under this Agreement.
    56 The foregoing limitations will apply even if the above stated warranty fails
    57 of its essential purpose.
     144.� DISCLAIMER OF WARRANTY.� UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
    5815
    59 6.  Termination.  This Agreement is effective until terminated.  You may
    60 terminate this Agreement at any time by destroying all copies of Software.
    61 This Agreement will terminate immediately without notice from Sun if you
    62 fail to comply with any provision of this Agreement.  Upon Termination, you
    63 must destroy all copies of Software.
     165.� LIMITATION OF LIABILITY.� TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.� In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by you for Software under this Agreement.� The foregoing limitations will apply even if the above stated warranty fails of its essential purpose.
    6417
    65 7. Export Regulations. All Software and technical data delivered under this
    66 Agreement are subject to US export control laws and may be subject to export
    67 or import regulations in other countries.  You agree to comply strictly with
    68 all such laws and regulations and acknowledge that you have the
    69 responsibility to obtain such licenses to export, re-export, or import as
    70 may be required after delivery to you.
     186.� Termination.� This Agreement is effective until terminated.� You may terminate this Agreement at any time by destroying all copies of Software.� This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.� Upon Termination, you must destroy all copies of Software.
    7119
    72 8.   U.S. Government Restricted Rights.  If Software is being acquired by or
    73 on behalf of the U.S. Government or by a U.S. Government prime contractor or
    74 subcontractor (at any tier), then the Government's rights in Software and
    75 accompanying documentation will be only as set forth in this Agreement; this
    76 is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of
    77 Defense (DOD) acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD
    78 acquisitions).
     207.  Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be subject to export or import regulations in other countries.� You agree to comply strictly with all such laws and regulations and acknowledge that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you.
    7921
    80 9.  Governing Law.  Any action related to this Agreement will be governed by
    81 California law and controlling U.S. federal law.  No choice of law rules of
    82 any jurisdiction will apply.
     228.� U.S. Government Restricted Rights.� If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions).
    8323
    84 10.  Severability. If any provision of this Agreement is held to be
    85 unenforceable, this Agreement will remain in effect with the provision
    86 omitted, unless omission would frustrate the intent of the parties, in which
    87 case this Agreement will immediately terminate.
     249.� Governing Law.� Any action related to this Agreement will be governed by California law and controlling U.S. federal law.� No choice of law rules of any jurisdiction will apply.
    8825
    89 11.  Integration.  This Agreement is the entire agreement between you and
    90 Sun relating to its subject matter.  It supersedes all prior or
    91 contemporaneous oral or written communications, proposals, representations
    92 and warranties and prevails over any conflicting or additional terms of any
    93 quote, order, acknowledgment, or other communication between the parties
    94 relating to its subject matter during the term of this Agreement.  No
    95 modification of this Agreement will be binding, unless in writing and signed
    96 by an authorized representative of each party.
     2610. Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate.
    9727
    98                              DEVELOPMENT TOOLS
    99                     JAVA ADVANCED IMAGING, VERSION 1.1.2
     2811. Integration.� This Agreement is the entire agreement between you and Sun relating to its subject matter.� It supersedes all prior or contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement.� No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
     29
     30 
     31                    JAVA ADVANCED IMAGING, VERSION 1.1.3
     32                         
    10033                         SUPPLEMENTAL LICENSE TERMS
    10134
    102 These supplemental license terms ("Supplemental Terms") add to or modify the
    103 terms of the Binary Code License Agreement (collectively, the "Agreement").
    104 Capitalized terms not defined in these Supplemental Terms shall have the
    105 same meanings ascribed to them in the Agreement. These Supplemental Terms
    106 shall supersede any inconsistent or conflicting terms in the Agreement, or
    107 in any license contained within the Software.
     35These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively, the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained within the Software.
    10836
    109 1. Software Internal Use and Development License Grant. Subject to the terms
    110 and conditions of this Agreement, including, but not limited to Section 3
    111 (Java(TM) Technology Restrictions) of these Supplemental Terms, Sun grants
    112 you a non-exclusive, non-transferable, limited license to reproduce
    113 internally and use internally the binary form of the Software complete and
    114 unmodified for the sole purpose of designing, developing and testing your
    115 Java applets and applications intended to run on the Java platform
    116 ("Programs").
     371. Software Internal Use and Development License Grant.� Subject to the terms and conditions of this Agreement, including, but not limited to Section 3 (Java Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited license to reproduce internally and use internally the binary form of the Software, complete and unmodified, for the sole purpose of designing, developing and testing your Java applets and applications ("Programs").
    11738
    118 2. License to Distribute Software.  In addition to the license granted in
    119 Section 1 (Software Internal Use and Development License Grant) of these
    120 Supplemental Terms, subject to the terms and conditions of this Agreement,
    121 including but not limited to Section 3 (Java Technology Restrictions) of
    122 these Supplemental Terms, Sun grants you a non-exclusive, non-transferable,
    123 limited license to reproduce and distribute the Software in binary code form
    124 only, provided that you (i) distribute the Software complete and unmodified
    125 and only bundled as part of your Programs, (ii) do not distribute additional
    126 software intended to replace any component(s) of the Software, (iii) do not
    127 remove or alter any proprietary legends or notices contained in the
    128 Software, (iv) only distribute the Software subject to a license agreement
    129 that protects Sun's interests consistent with the terms contained in this
    130 Agreement, and (v) agree to defend and indemnify Sun and its licensors from
    131 and against any damages, costs, liabilities, settlement amounts and/or
    132 expenses (including attorneys' fees) incurred in connection with any claim,
    133 lawsuit or action by any third party that arises or results from the use or
    134 distribution of any and all Programs and/or Software.
     392. License to Distribute Software.� In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to, Section 3 (Java Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the Software in binary code form only, provided that you (i) distribute the Software complete and unmodified and only bundled as part of your Programs, (ii) do not distribute additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any proprietary legends or notices contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's interests consistent with the terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or distribution of any and all Programs and/or Software.
    13540
    136 3. Java Technology Restrictions. You may not modify the Java Platform
    137 Interface ("JPI", identified as classes contained within the "java" package
    138 or any subpackages of the "java" package), by creating additional classes
    139 within the JPI or otherwise causing the addition to or modification of the
    140 classes in the JPI.  In the event that you create an additional class and
    141 associated API(s) which (i) extends the functionality of the Java platform,
    142 and (ii) is exposed to third party software developers for the purpose of
    143 developing additional software which invokes such additional API, you must
    144 promptly publish broadly an accurate specification for such API for free use
    145 by all developers. You may not create, or authorize your licensees to
    146 create, additional classes, interfaces, or subpackages that are in any way
    147 identified as "java", "javax", "sun" or similar convention as specified by
    148 Sun in any naming convention designation.
     413. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java" package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or modification of the classes in the JPI.� In the event that you create an additional class and associated API(s) which (i) extends the functionality of the Java platform, and (ii) is exposed to third party software developers for the purpose of developing additional software which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers.� You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as "java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation.
    14942
    150 4.  Java Runtime Availability.  Refer to the appropriate version of the Java
    151 Runtime Environment binary code license (currently located at
    152 http://www.java.sun.com/jdk/index.html) for the availability of runtime code
    153 which may be distributed with Java applets and applications.
     434.  Java Runtime Availability.  Refer to the appropriate version of the Java Runtime Environment binary code license (currently located at http://www.java.sun.com/jdk/index.html) for the availability of runtime code which may be distributed with Java applets and applications.
    15444
    155 5. Trademarks and Logos. You acknowledge and agree as between you and Sun
    156 that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, STAROFFICE, STARPORTAL
    157 and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, STAROFFICE,
    158 STARPORTAL and iPLANET-related trademarks, service marks, logos and other
    159 brand designations ("Sun Marks"), and you agree to comply with the Sun
    160 Trademark and Logo Usage Requirements currently located at
    161 http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks
    162 inures to Sun's benefit.
     455. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks inures to Sun's benefit.
    16346
    164 6. Source Code. Software may contain source code that is provided solely for
    165 reference purposes pursuant to the terms of this Agreement.  Source code may
    166 not be redistributed unless expressly provided for in this Agreement.
     476. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement.� Source code may not be redistributed unless expressly provided for in this Agreement.
    16748
    168 7.  Termination for Infringement.  Either party may terminate this Agreement
    169 immediately should any Software become, or in either party's opinion be
    170 likely to become, the subject of a claim of infringement of any intellectual
    171 property right.
     497. Termination for Infringement.� Either party may terminate this Agreement immediately should any Software become, or in either party's opinion be likely to become, the subject of a claim of infringement of any intellectual property right.
    17250
    173 For inquiries please contact: Sun Microsystems, Inc.,.   4150 Network
    174 Circle, Santa Clara, California 95054, U.S.A
    175 (Form ID#011801)
     518. Third Party Code. Additional copyright notices and license terms applicable to portions of the Software are set forth in the THIRDPARTYLICENSEREADME. In addition to any terms and conditions of any third party open source/freeware license identified in the THIRDPARTYLICENSEREADME, the disclaimer of warranty and limitation of liability provisions in paragraphs 5 and 6 of the Binary Code License Agreement shall apply to all Software in this distribution.
     52
     53For inquiries please contact: Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, California 95054, U.S.A
     54
     55(LFI#143342/Form ID#011801)
  • trunk/doc/src/docbook/admindoc/installation_upgrade.xml

    r4889 r5031  
    678678            large enough. If you are using Tomcat 6.0.18 or higher
    679679            you also need to disable strict parsing of JSP files.
    680            
    681             To do this you have to set Java startup options
    682             in the <code>CATALINA_OPTS</code> environment variable.
     680          </para>
     681         
     682          <para>
     683            Unless you have manually downloaded and installed JAI (Java Advanced
     684            Imaging) native acceleration libraries (see <ulink
     685            url="https://jai.dev.java.net/">https://jai.dev.java.net/</ulink>)
     686            it is also a good idea to disable the native acceleration of JAI.
     687          </para>
     688          <para>
     689            All of the above is done by setting Java startup options for
     690            Tomcat in the <code>CATALINA_OPTS</code> environment variable.
    683691           
    684692            Basically add the next line (as a single line) close to the top of
     
    688696            class="directory">bin</filename>):
    689697<programlisting>CATALINA_OPTS="-Xmx500m
    690 -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false"</programlisting>
     698-Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false
     699-Dcom.sun.media.jai.disableMediaLib=true"</programlisting>
    691700          </para>
    692701          <para>
  • trunk/src/test/run.bat

    r4889 r5031  
    2626
    2727REM Execute test class
    28 java -Xmx512M -Xms128M -ea -server -cp %CP% %1 %2 %3 %4 %5 %6 %7 %8 %9
     28java -Xmx512M -Xms128M -ea -server -cp %CP% -Dcom.sun.media.jai.disableMediaLib=true %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/src/test/run.sh

    r4889 r5031  
    2525
    2626# Execute test class
    27 nice java -Xmx512M -Xms128M -ea -server -cp $CP $*
     27nice java -Xmx512M -Xms128M -ea -server -cp $CP -Dcom.sun.media.jai.disableMediaLib=true $*
  • trunk/src/test/test.bat

    r4514 r5031  
    3030
    3131REM Execute test: -ea = enable asserts; -server = server mode
    32 java -Xmx512M -Xms128M -ea -server -cp %CP% net.sf.basedb.test.%package%.Run %2 %3 %4 %5 %6 %7 %8 %9
     32java -Xmx512M -Xms128M -ea -server -cp %CP% -Dcom.sun.media.jai.disableMediaLib=true net.sf.basedb.test.%package%.Run %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/src/test/test.sh

    r4669 r5031  
    3232
    3333# Execute test: -ea = enable asserts; -server = server mode
    34 nice java -Xmx512M -Xms128M -ea -server -cp $CP net.sf.basedb.test.$package.Run $*
     34nice java -Xmx512M -Xms128M -ea -server -cp $CP -Dcom.sun.media.jai.disableMediaLib=true net.sf.basedb.test.$package.Run $*
Note: See TracChangeset for help on using the changeset viewer.