diff --git a/engine/build-android.xml b/engine/build-android.xml deleted file mode 100644 index a5394ed4f..000000000 --- a/engine/build-android.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/engine/build.xml b/engine/build.xml index 305b3984a..f6daad52f 100644 --- a/engine/build.xml +++ b/engine/build.xml @@ -5,34 +5,103 @@ + + + + + + + + - - + + + + + + + + + - + - - - + + + + + + + - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -72,38 +141,12 @@ - - - - - - - - - - - - - - - - - - - + + @@ -135,35 +178,42 @@ - + + + + - - + + + + - + - - + + - - + + + - - + + + - + diff --git a/engine/lib/antlibs/depfinder/classes/dependencyfindertasks.properties b/engine/lib/antlibs/depfinder/classes/dependencyfindertasks.properties new file mode 100644 index 000000000..cc9f2d17d --- /dev/null +++ b/engine/lib/antlibs/depfinder/classes/dependencyfindertasks.properties @@ -0,0 +1,11 @@ +classmetrics=com.jeantessier.dependencyfinder.ant.ClassMetrics +dependencycycles=com.jeantessier.dependencyfinder.ant.DependencyCycles +dependencyclosure=com.jeantessier.dependencyfinder.ant.DependencyClosure +dependencyextractor=com.jeantessier.dependencyfinder.ant.DependencyExtractor +dependencymetrics=com.jeantessier.dependencyfinder.ant.DependencyMetrics +dependencyreporter=com.jeantessier.dependencyfinder.ant.DependencyReporter +jarjardiff=com.jeantessier.dependencyfinder.ant.JarJarDiff +listdeprecatedelements=com.jeantessier.dependencyfinder.ant.ListDeprecatedElements +listdiff=com.jeantessier.dependencyfinder.ant.ListDiff +listsymbols=com.jeantessier.dependencyfinder.ant.ListSymbols +oometrics=com.jeantessier.dependencyfinder.ant.OOMetrics diff --git a/engine/lib/antlibs/depfinder/classes/log4j.properties b/engine/lib/antlibs/depfinder/classes/log4j.properties new file mode 100644 index 000000000..b7973b968 --- /dev/null +++ b/engine/lib/antlibs/depfinder/classes/log4j.properties @@ -0,0 +1,20 @@ +# Default logging settings for Dependency Finder applications +log4j.rootLogger=ERROR, CONSOLE + +# log4j.logger.com.jeantessier.dependency=DEBUG, CHAINSAW +# log4j.logger.com.jeantessier.dependency.PackageNode=DEBUG, CHAINSAW +# log4j.logger.com.jeantessier.metrics.MetricsGatherer=DEBUG, CHAINSAW + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=[%d{yyyy/MM/dd HH:mm:ss.SSS}] %c{2} %m%n + +log4j.appender.FILE=org.apache.log4j.FileAppender +log4j.appender.FILE.File=C:\\language\\Java\\myprojects\\DependencyFinder\\logs\\default.log +log4j.appender.FILE.layout=org.apache.log4j.PatternLayout +log4j.appender.FILE.layout.ConversionPattern=[%d{yyyy/MM/dd HH:mm:ss.SSS}] %c{2} %m%n + +log4j.appender.CHAINSAW=org.apache.log4j.net.SocketAppender +log4j.appender.CHAINSAW.RemoteHost=localhost +log4j.appender.CHAINSAW.Port=4445 +log4j.appender.CHAINSAW.LocationInfo=true diff --git a/engine/lib/antlibs/depfinder/etc/DiffToHTML.xsl b/engine/lib/antlibs/depfinder/etc/DiffToHTML.xsl new file mode 100644 index 000000000..092361c46 --- /dev/null +++ b/engine/lib/antlibs/depfinder/etc/DiffToHTML.xsl @@ -0,0 +1,304 @@ + + + + + + + + + + + + + <xsl:if test="name/text()"><xsl:value-of select="name"/> - </xsl:if>API Change History + + + + +

- API Change History

+ + + +
+ + +

to

+ + + +
+ + + + + + + + + +

Removed Packages:

+
    + +
+ + + +

Removed Interfaces:

+
    + +
+ + + +

Removed Classes:

+
    + +
+ + + +

Newly Deprecated Interfaces:

+
    + +
+ + + +

Newly Deprecated Classes:

+
    + +
+ + + +

Modified Interfaces:

+
+ +
+ + + +

Modified Classes:

+
+ +
+ + + +

Formerly Deprecated Interfaces:

+
    + +
+ + + +

Formerly Deprecated Classes:

+
    + +
+ + + +

New Packages:

+
    + +
+ + + +

New Interfaces:

+
    + +
+ + + +

New Classes:

+
    + +
+ + + +

+
+ +
+ + + +
Removed Fields:
+
    + +
+ + + +
Removed Constructors:
+
    + +
+ + + +
Removed Methods:
+
    + +
+ + + +
Newly Deprecated Fields:
+
    + +
+ + + +
Newly Deprecated Constructors:
+
    + +
+ + + +
Newly Deprecated Methods:
+
    + +
+ + + +
Field Declaration Changes:
+ + + + +
Constructor Changes:
+ + + + +
Method Changes:
+ + + + +
+

+ +

+
+ + + + code: + + + + old: + [deprecated] +
+ new: + [deprecated] +
+ + + +
Formerly Deprecated Fields:
+
    + +
+ + + +
Formerly Deprecated Constructors:
+
    + +
+ + + +
Formerly Deprecated Methods:
+
    + +
+ + + +
New Fields:
+
    + +
+ + + +
New Constructors:
+
    + +
+ + + +
New Methods:
+
    + +
+ + + + + +
Declaration Changes:
+
+

+ old: + [deprecated] +
+ new: + [deprecated] +

+
+ + + +
  • [deprecated]
    • +     + + +
    • +     + +     diff --git a/engine/lib/antlibs/depfinder/lib/DependencyFinder.jar b/engine/lib/antlibs/depfinder/lib/DependencyFinder.jar new file mode 100644 index 000000000..33b3c5d83 Binary files /dev/null and b/engine/lib/antlibs/depfinder/lib/DependencyFinder.jar differ diff --git a/engine/lib/antlibs/depfinder/lib/guava.jar b/engine/lib/antlibs/depfinder/lib/guava.jar new file mode 100644 index 000000000..8ff3a8174 Binary files /dev/null and b/engine/lib/antlibs/depfinder/lib/guava.jar differ diff --git a/engine/lib/antlibs/depfinder/lib/guava.lic b/engine/lib/antlibs/depfinder/lib/guava.lic new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/engine/lib/antlibs/depfinder/lib/guava.lic @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/engine/lib/antlibs/depfinder/lib/jakarta-oro.jar b/engine/lib/antlibs/depfinder/lib/jakarta-oro.jar new file mode 100644 index 000000000..23488d260 Binary files /dev/null and b/engine/lib/antlibs/depfinder/lib/jakarta-oro.jar differ diff --git a/engine/lib/antlibs/depfinder/lib/jakarta-oro.lic b/engine/lib/antlibs/depfinder/lib/jakarta-oro.lic new file mode 100644 index 000000000..f571b1b6d --- /dev/null +++ b/engine/lib/antlibs/depfinder/lib/jakarta-oro.lic @@ -0,0 +1,53 @@ +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2000-2002 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Apache" and "Apache Software Foundation", "Jakarta-Oro" + * must not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * or "Jakarta-Oro", nor may "Apache" or "Jakarta-Oro" appear in their + * name, without prior written permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + */ diff --git a/engine/lib/antlibs/depfinder/lib/log4j.jar b/engine/lib/antlibs/depfinder/lib/log4j.jar new file mode 100644 index 000000000..c930a6ab4 Binary files /dev/null and b/engine/lib/antlibs/depfinder/lib/log4j.jar differ diff --git a/engine/lib/antlibs/depfinder/lib/log4j.lic b/engine/lib/antlibs/depfinder/lib/log4j.lic new file mode 100644 index 000000000..6279e5206 --- /dev/null +++ b/engine/lib/antlibs/depfinder/lib/log4j.lic @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 1999-2005 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/engine/lib/antlibs/depfinder/license.txt b/engine/lib/antlibs/depfinder/license.txt new file mode 100644 index 000000000..e2a47d5da --- /dev/null +++ b/engine/lib/antlibs/depfinder/license.txt @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2001-2009, Jean Tessier + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of Jean Tessier nor the names of his contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ diff --git a/engine/lib/antlibs/depfinder/readme.txt b/engine/lib/antlibs/depfinder/readme.txt new file mode 100644 index 000000000..6164b3ca0 --- /dev/null +++ b/engine/lib/antlibs/depfinder/readme.txt @@ -0,0 +1,28 @@ +Content +------- + +This is the Dependency Finder toolkit. It contains a number of +tools for exploring relationships in (compiled) Java code. + +Licensing +--------- + +This software is licensed under the terms of BSD-like license. +A copy of the licensing terms is in the file license.txt. You +can get the original BSD License template at opensource.org. + +This product includes software developed by the Apache Software +Foundation (http://www.apache.org/). The terms of the Apache +Software License are reproduced in the lib/ directory next to +the relevant binary .jar files. + +Installation and Tools +---------------------- + +Installation instructions are included in docs/Manual.html. + +A list of the tools and their usage is in docs/Tools.html. + +These documents are also available online at: + + http://depfind.sourceforge.net/ diff --git a/engine/lib/bullet/jME3-bullet-natives.jar b/engine/lib/bullet/jME3-bullet-natives.jar new file mode 100644 index 000000000..ba86584f7 Binary files /dev/null and b/engine/lib/bullet/jME3-bullet-natives.jar differ diff --git a/engine/lib/bullet/jarcontent/native/macosx/libbulletjme.jnilib b/engine/lib/bullet/jarcontent/native/macosx/libbulletjme.jnilib new file mode 100755 index 000000000..9f940216c Binary files /dev/null and b/engine/lib/bullet/jarcontent/native/macosx/libbulletjme.jnilib differ diff --git a/engine/lib/nblibraries.properties b/engine/lib/nblibraries.properties index 1a39e98ab..c9b9a2108 100644 --- a/engine/lib/nblibraries.properties +++ b/engine/lib/nblibraries.properties @@ -1,55 +1,57 @@ -libs.CopyLibs.classpath=\ - ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar -libs.jbullet.classpath=\ - ${base}/jbullet/jbullet.jar:\ - ${base}/jbullet/stack-alloc.jar:\ - ${base}/jbullet/vecmath.jar -libs.jheora.classpath=\ - ${base}/jheora/jheora-jst-debug-0.6.0.jar -libs.jme3-test-data.classpath=\ - ${base}/../src/test-data/ -libs.jogg.classpath=\ - ${base}/jogg/j-ogg-oggd.jar:\ - ${base}/jogg/j-ogg-vorbisd.jar -libs.jogl.classpath=\ - ${base}/jogl/gluegen-rt.jar:\ - ${base}/jogl/jME3-jogl-natives.jar:\ - ${base}/jogl/jogl.jar -libs.jogl2.classpath=\ - ${base}/jogl2/jogl.all.jar;\ - ${base}/jogl2/nativewindow.all.jar;\ - ${base}/jogl2/newt.all.jar;\ - ${base}/jogl2/gluegen-rt.jar -libs.junit_4.classpath=\ - ${base}/junit_4/junit-4.5.jar -libs.junit_4.javadoc=\ - ${base}/junit_4/junit-4.5-api.zip -libs.junit_4.src=\ - ${base}/junit_4/junit-4.5-src.jar -libs.JWSAntTasks.classpath=\ - ${base}/JWSAntTasks/org-netbeans-modules-javawebstart-anttasks.jar -libs.lwjgl.classpath=\ - ${base}/lwjgl/jME3-lwjgl-natives.jar;\ - ${base}/lwjgl/jinput.jar;\ - ${base}/lwjgl/lwjgl.jar -libs.niftygui1.2.classpath=\ - ${base}/niftygui/nifty-1.2-SNAPSHOT.jar;\ - ${base}/niftygui/nifty-default-controls-1.2-SNAPSHOT.jar;\ - ${base}/niftygui/nifty-style-black-1.2-SNAPSHOT.jar;\ - ${base}/niftygui/xmlpull-xpp3-1.1.4c.jar;\ - ${base}/niftygui/nifty-examples-1.2_small.jar -libs.niftygui1.3.classpath=\ - ${base}/niftygui/nifty-1.3-SNAPSHOT.jar;\ - ${base}/niftygui/nifty-default-controls-1.3-SNAPSHOT.jar;\ - ${base}/niftygui/nifty-style-black-1.3-SNAPSHOT.jar;\ - ${base}/niftygui/nifty-style-grey-1.0.jar;\ - ${base}/niftygui/nifty-examples-1.3-SNAPSHOT.jar;\ - ${base}/niftygui/xmlpull-xpp3-1.1.4c.jar;\ - ${base}/niftygui/eventbus-1.4.jar -libs.swing-layout.classpath=\ - ${base}/swing-layout/swing-layout-1.0.4.jar -libs.swing-layout.javadoc=\ - ${base}/swing-layout/swing-layout-1.0.4-doc.zip -libs.swing-layout.src=\ - ${base}/swing-layout/swing-layout-1.0.4-src.zip - +libs.bullet.classpath=\ + ${base}/bullet/jME3-bullet-natives.jar +libs.CopyLibs.classpath=\ + ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar +libs.jbullet.classpath=\ + ${base}/jbullet/jbullet.jar:\ + ${base}/jbullet/stack-alloc.jar:\ + ${base}/jbullet/vecmath.jar +libs.jheora.classpath=\ + ${base}/jheora/jheora-jst-debug-0.6.0.jar +libs.jme3-test-data.classpath=\ + ${base}/../src/test-data/ +libs.jogg.classpath=\ + ${base}/jogg/j-ogg-oggd.jar:\ + ${base}/jogg/j-ogg-vorbisd.jar +libs.jogl.classpath=\ + ${base}/jogl/gluegen-rt.jar:\ + ${base}/jogl/jME3-jogl-natives.jar:\ + ${base}/jogl/jogl.jar +libs.jogl2.classpath=\ + ${base}/jogl2/jogl.all.jar;\ + ${base}/jogl2/nativewindow.all.jar;\ + ${base}/jogl2/newt.all.jar;\ + ${base}/jogl2/gluegen-rt.jar +libs.junit_4.classpath=\ + ${base}/junit_4/junit-4.5.jar +libs.junit_4.javadoc=\ + ${base}/junit_4/junit-4.5-api.zip +libs.junit_4.src=\ + ${base}/junit_4/junit-4.5-src.jar +libs.JWSAntTasks.classpath=\ + ${base}/JWSAntTasks/org-netbeans-modules-javawebstart-anttasks.jar +libs.lwjgl.classpath=\ + ${base}/lwjgl/jME3-lwjgl-natives.jar;\ + ${base}/lwjgl/jinput.jar;\ + ${base}/lwjgl/lwjgl.jar +libs.niftygui1.2.classpath=\ + ${base}/niftygui/nifty-1.2-SNAPSHOT.jar;\ + ${base}/niftygui/nifty-default-controls-1.2-SNAPSHOT.jar;\ + ${base}/niftygui/nifty-style-black-1.2-SNAPSHOT.jar;\ + ${base}/niftygui/xmlpull-xpp3-1.1.4c.jar;\ + ${base}/niftygui/nifty-examples-1.2_small.jar +libs.niftygui1.3.classpath=\ + ${base}/niftygui/nifty-1.3-SNAPSHOT.jar;\ + ${base}/niftygui/nifty-default-controls-1.3-SNAPSHOT.jar;\ + ${base}/niftygui/nifty-style-black-1.3-SNAPSHOT.jar;\ + ${base}/niftygui/nifty-style-grey-1.0.jar;\ + ${base}/niftygui/nifty-examples-1.3-SNAPSHOT.jar;\ + ${base}/niftygui/xmlpull-xpp3-1.1.4c.jar;\ + ${base}/niftygui/eventbus-1.4.jar +libs.swing-layout.classpath=\ + ${base}/swing-layout/swing-layout-1.0.4.jar +libs.swing-layout.javadoc=\ + ${base}/swing-layout/swing-layout-1.0.4-doc.zip +libs.swing-layout.src=\ + ${base}/swing-layout/swing-layout-1.0.4-src.zip + diff --git a/engine/master-application.jnlp b/engine/master-application.jnlp index 04731feda..8316c8763 100644 --- a/engine/master-application.jnlp +++ b/engine/master-application.jnlp @@ -13,7 +13,8 @@ - + + diff --git a/engine/nbproject/build-impl.xml b/engine/nbproject/build-impl.xml index 8da45e46f..533455b8b 100644 --- a/engine/nbproject/build-impl.xml +++ b/engine/nbproject/build-impl.xml @@ -1,1230 +1,1229 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.core.dir - Must set src.core-data.dir - Must set src.core-plugins.dir - Must set src.terrain.dir - Must set src.networking.dir - Must set src.desktop.dir - Must set src.desktop-fx.dir - Must set src.games.dir - Must set src.jbullet.dir - Must set src.niftygui.dir - Must set src.jogg.dir - Must set src.lwjgl-oal.dir - Must set src.lwjgl-ogl.dir - Must set src.ogre.dir - Must set src.pack.dir - Must set src.jheora.dir - Must set src.test.dir - Must set src.tools.dir - Must set src.xml.dir - Must set test.test.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set JVM to use for profiling in profiler.info.jvm - Must set profiler agent JVM arguments in profiler.info.jvmargs.agent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - Must select one file in the IDE or set profile.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.core.dir + Must set src.core-data.dir + Must set src.core-plugins.dir + Must set src.terrain.dir + Must set src.networking.dir + Must set src.desktop.dir + Must set src.desktop-fx.dir + Must set src.games.dir + Must set src.jbullet.dir + Must set src.niftygui.dir + Must set src.jogg.dir + Must set src.lwjgl-oal.dir + Must set src.lwjgl-ogl.dir + Must set src.ogre.dir + Must set src.pack.dir + Must set src.jheora.dir + Must set src.test.dir + Must set src.tools.dir + Must set src.xml.dir + Must set test.test.dir + Must set build.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.test.classes.dir + Must set build.test.results.dir + Must set build.classes.excludes + Must set dist.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + + + + + + java -cp "${run.classpath.with.dist.jar}" ${main.class} + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + Must select one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + Must select one file in the IDE or set debug.class + + + + + Must set fix.includes + + + + + + + + + + + + + + + + + Must select one file in the IDE or set profile.class + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + Must select some files in the IDE or set test.includes + + + + Some tests failed; see details above. + + + + + Must select one file in the IDE or set test.class + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/engine/nbproject/genfiles.properties b/engine/nbproject/genfiles.properties index 09527169e..101bdc872 100644 --- a/engine/nbproject/genfiles.properties +++ b/engine/nbproject/genfiles.properties @@ -1,11 +1,11 @@ -build.xml.data.CRC32=52f8cb9e -build.xml.script.CRC32=34d4c2f2 -build.xml.stylesheet.CRC32=958a1d3e -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=759acdca -nbproject/build-impl.xml.script.CRC32=53d4e0e0 -nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.0.45 -nbproject/profiler-build-impl.xml.data.CRC32=aff514c1 -nbproject/profiler-build-impl.xml.script.CRC32=abda56ed -nbproject/profiler-build-impl.xml.stylesheet.CRC32=f10cf54c@1.11.1 +build.xml.data.CRC32=52f8cb9e +build.xml.script.CRC32=34d4c2f2 +build.xml.stylesheet.CRC32=958a1d3e +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. +nbproject/build-impl.xml.data.CRC32=759acdca +nbproject/build-impl.xml.script.CRC32=c2fd0217 +nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45 +nbproject/profiler-build-impl.xml.data.CRC32=aff514c1 +nbproject/profiler-build-impl.xml.script.CRC32=abda56ed +nbproject/profiler-build-impl.xml.stylesheet.CRC32=f10cf54c@1.11.1 diff --git a/engine/nbproject/project.properties b/engine/nbproject/project.properties index 2dab3f40c..127061203 100644 --- a/engine/nbproject/project.properties +++ b/engine/nbproject/project.properties @@ -1,112 +1,116 @@ -annotation.processing.enabled=false -annotation.processing.enabled.in.editor=false -annotation.processing.run.all.processors=true -ant.customtasks.libs=JWSAntTasks -application.homepage=http://www.jmonkeyengine.com/ -application.title=jMonkeyEngine 3.0 -application.vendor=jMonkeyEngine -assets.compress=false -assets.excludes= -assets.folder.name= -assets.jar.name= -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -# Uncomment to specify the preferred debugger connection transport: -#debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/jMonkeyEngine3.jar -dist.javadoc.dir=${dist.dir}/javadoc -endorsed.classpath= -excludes= -file.reference.src-test-data=src/test-data -includes=** -jar.archive.disabled=${jnlp.enabled} -jar.compress=true -jar.index=${jnlp.enabled} -javac.classpath=\ - ${libs.jogg.classpath}:\ - ${libs.jbullet.classpath}:\ - ${libs.lwjgl.classpath}:\ - ${libs.jheora.classpath}:\ - ${libs.niftygui1.3.classpath}:\ - ${libs.jme3-test-data.classpath} -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit_4.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle=jMonkeyEngine3 -jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api" -jnlp.applet.class=jme3test.awt.AppHarness -jnlp.applet.height=300 -jnlp.applet.width=300 -jnlp.codebase.type=user -jnlp.codebase.user=http://jmonkeyengine.com/javawebstart/ -jnlp.descriptor=application -jnlp.enabled=false -jnlp.icon=/Users/normenhansen/Pictures/jme/icons/jme-logo48.png -jnlp.mixed.code=defaut -jnlp.offline-allowed=true -jnlp.signed=true -main.class=jme3test.TestChooser -manifest.file=MANIFEST.MF -meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false -platform.active=default_platform -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -run.jvmargs=-Xms40m -Xmx40m -XX:MaxDirectMemorySize=256M -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.core-data.dir=src/core-data -src.core-plugins.dir=src/core-plugins -src.core.dir=src/core -src.desktop-fx.dir=src/desktop-fx -src.desktop.dir=src/desktop -src.games.dir=src/games -src.jbullet.dir=src/jbullet -src.jheora.dir=src/jheora -src.jogg.dir=src/jogg -src.lwjgl-oal.dir=src/lwjgl-oal -src.lwjgl-ogl.dir=src/lwjgl-ogl -src.networking.dir=src\\networking -src.niftygui.dir=src/niftygui -src.ogre.dir=src/ogre -src.pack.dir=src/pack -src.terrain.dir=src/terrain -src.test.dir=src/test -src.tools.dir=src/tools -src.xml.dir=src/xml -test.test.dir=test +annotation.processing.enabled=false +annotation.processing.enabled.in.editor=false +annotation.processing.run.all.processors=true +ant.customtasks.libs=JWSAntTasks +application.homepage=http://www.jmonkeyengine.com/ +application.title=jMonkeyEngine 3.0 +application.vendor=jMonkeyEngine +assets.compress=false +assets.excludes= +assets.folder.name= +assets.jar.name= +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/jMonkeyEngine3.jar +dist.javadoc.dir=${dist.dir}/javadoc +endorsed.classpath= +excludes= +file.reference.src-test-data=src/test-data +includes=** +jar.archive.disabled=${jnlp.enabled} +jar.compress=true +jar.index=${jnlp.enabled} +javac.classpath=\ + ${libs.jogg.classpath}:\ + ${libs.jbullet.classpath}:\ + ${libs.bullet.classpath}:\ + ${libs.lwjgl.classpath}:\ + ${libs.jheora.classpath}:\ + ${libs.niftygui1.3.classpath}:\ + ${libs.jme3-test-data.classpath} +# Space-separated list of extra javac options +javac.compilerargs= +javac.deprecation=false +javac.processorpath=\ + ${javac.classpath} +javac.source=1.5 +javac.target=1.5 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${libs.junit_4.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle=jMonkeyEngine3 +jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api" +jnlp.applet.class=jme3test.awt.AppHarness +jnlp.applet.height=300 +jnlp.applet.width=300 +jnlp.codebase.type=user +jnlp.codebase.user=http://jmonkeyengine.com/javawebstart/ +jnlp.descriptor=application +jnlp.enabled=false +jnlp.icon=/Users/normenhansen/Pictures/jme/icons/jme-logo48.png +jnlp.mixed.code=default +jnlp.offline-allowed=true +jnlp.signed=true +jnlp.signing=generated +jnlp.signing.alias= +jnlp.signing.keystore= +main.class=jme3test.TestChooser +manifest.file=MANIFEST.MF +meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=false +platform.active=default_platform +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +run.jvmargs=-Xms40m -Xmx40m -XX:MaxDirectMemorySize=256M +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.core-data.dir=src/core-data +src.core-plugins.dir=src/core-plugins +src.core.dir=src/core +src.desktop-fx.dir=src/desktop-fx +src.desktop.dir=src/desktop +src.games.dir=src/games +src.jbullet.dir=src/jbullet +src.jheora.dir=src/jheora +src.jogg.dir=src/jogg +src.lwjgl-oal.dir=src/lwjgl-oal +src.lwjgl-ogl.dir=src/lwjgl-ogl +src.networking.dir=src\\networking +src.niftygui.dir=src/niftygui +src.ogre.dir=src/ogre +src.pack.dir=src/pack +src.terrain.dir=src/terrain +src.test.dir=src/test +src.tools.dir=src/tools +src.xml.dir=src/xml +test.test.dir=test diff --git a/engine/src/desktop/com/jme3/system/JmeSystem.java b/engine/src/desktop/com/jme3/system/JmeSystem.java index f0b319118..76853faa8 100644 --- a/engine/src/desktop/com/jme3/system/JmeSystem.java +++ b/engine/src/desktop/com/jme3/system/JmeSystem.java @@ -178,6 +178,8 @@ public class JmeSystem { return true; else if (arch.equals("i386") || arch.equals("i686")) return false; + else if (arch.equals("universal")) + return false; else throw new UnsupportedOperationException("Unsupported architecture: "+arch); } @@ -190,7 +192,7 @@ public class JmeSystem { return is64 ? Platform.Windows64 : Platform.Windows32; }else if (os.contains("linux") || os.contains("freebsd") || os.contains("sunos")){ return is64 ? Platform.Linux64 : Platform.Linux32; - }else if (os.contains("mac os x")){ + }else if (os.contains("mac os x") || os.contains("darwin")){ if (arch.startsWith("ppc")){ return is64 ? Platform.MacOSX_PPC64 : Platform.MacOSX_PPC32; }else{ diff --git a/engine/src/desktop/com/jme3/system/Natives.java b/engine/src/desktop/com/jme3/system/Natives.java index 49a7a90c3..fc423c413 100644 --- a/engine/src/desktop/com/jme3/system/Natives.java +++ b/engine/src/desktop/com/jme3/system/Natives.java @@ -29,7 +29,6 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - package com.jme3.system; import com.jme3.system.JmeSystem.Platform; @@ -54,19 +53,20 @@ public class Natives { private static final byte[] buf = new byte[1024]; private static File workingDir = new File("").getAbsoluteFile(); - public static void setExtractionDir(String name){ + public static void setExtractionDir(String name) { workingDir = new File(name).getAbsoluteFile(); } - protected static void extractNativeLib(String sysName, String name) throws IOException{ + protected static void extractNativeLib(String sysName, String name) throws IOException { String fullname = System.mapLibraryName(name); - String path = "native/"+sysName+"/" + fullname; + String path = "native/" + sysName + "/" + fullname; InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(path); //InputStream in = Natives.class.getResourceAsStream(); if (in == null) { - logger.log(Level.WARNING, "Cannot locate native library: {0}/{1}", - new String[]{ sysName, fullname} ); + if(name!="bulletjme") + logger.log(Level.WARNING, "Cannot locate native library: {0}/{1}", + new String[]{sysName, fullname}); return; } File targetFile = new File(workingDir, fullname); @@ -78,9 +78,10 @@ public class Natives { } in.close(); out.close(); - } catch (FileNotFoundException ex){ - if (ex.getMessage().contains("used by another process")) + } catch (FileNotFoundException ex) { + if (ex.getMessage().contains("used by another process")) { return; + } throw ex; } @@ -88,7 +89,7 @@ public class Natives { logger.log(Level.FINE, "Copied {0} to {1}", new Object[]{fullname, targetFile}); } - private static String getExtractionDir(){ + private static String getExtractionDir() { URL temp = Natives.class.getResource(""); if (temp != null) { StringBuilder sb = new StringBuilder(temp.toString()); @@ -106,36 +107,27 @@ public class Natives { return null; } - protected static void extractNativeLibs(Platform platform, AppSettings settings) throws IOException{ + protected static void extractNativeLibs(Platform platform, AppSettings settings) throws IOException { String renderer = settings.getRenderer(); String audioRenderer = settings.getAudioRenderer(); boolean needLWJGL = false; - boolean needGG = false; - boolean needJOGL = false; - boolean needJOAL = false; boolean needOAL = false; boolean needJInput = false; - if (renderer != null){ - if (renderer.startsWith("LWJGL")){ + boolean needNativeBullet = true; + if (renderer != null) { + if (renderer.startsWith("LWJGL")) { needLWJGL = true; - }else if (renderer.startsWith("JOGL")){ - needGG = true; - needJOGL = true; } } - if (audioRenderer != null){ - if (audioRenderer.equals("LWJGL")){ + if (audioRenderer != null) { + if (audioRenderer.equals("LWJGL")) { needLWJGL = true; needOAL = true; - }else if (audioRenderer.equals("JOAL")){ - needJOAL = true; - needGG = true; - needOAL = true; } } needJInput = settings.useJoysticks(); - if (needLWJGL){ + if (needLWJGL) { logger.log(Level.INFO, "Extraction Directory #1: {0}", getExtractionDir()); logger.log(Level.INFO, "Extraction Directory #2: {0}", workingDir.toString()); logger.log(Level.INFO, "Extraction Directory #3: {0}", System.getProperty("user.dir")); @@ -146,188 +138,81 @@ public class Natives { System.setProperty("org.lwjgl.librarypath", workingDir.toString()); } - switch (platform){ + switch (platform) { case Windows64: - if (needLWJGL){ + if (needLWJGL) { extractNativeLib("windows", "lwjgl64"); } - if (needJOGL){ - extractNativeLib("win64", "jogl_awt"); - extractNativeLib("win64", "jogl"); - } - - if (needJOAL) - extractNativeLib("win64", "joal_native"); - - if (needGG) - extractNativeLib("win64", "gluegen-rt"); - - if (needOAL) + if (needOAL) { extractNativeLib("windows", "OpenAL64"); - - if (needJInput){ + } + if (needJInput) { extractNativeLib("windows", "jinput-dx8_64"); extractNativeLib("windows", "jinput-raw_64"); } + if(needNativeBullet){ + extractNativeLib("windows", "bulletjme_64"); + } break; case Windows32: - if (needLWJGL){ + if (needLWJGL) { extractNativeLib("windows", "lwjgl"); } - if (needJOGL){ - extractNativeLib("win32", "jogl_awt"); - extractNativeLib("win32", "jogl"); - } - - if (needJOAL) - extractNativeLib("win32", "joal_native"); - - if (needGG) - extractNativeLib("win32", "gluegen-rt"); - - if (needOAL) + if (needOAL) { extractNativeLib("windows", "OpenAL32"); - - if (needJInput){ + } + if (needJInput) { extractNativeLib("windows", "jinput-dx8"); extractNativeLib("windows", "jinput-raw"); } + if(needNativeBullet){ + extractNativeLib("windows", "bulletjme"); + } break; case Linux64: - if (needLWJGL){ + if (needLWJGL) { extractNativeLib("linux", "lwjgl64"); } - if (needJOGL){ - extractNativeLib("linux64", "jogl_awt"); - extractNativeLib("linux64", "jogl"); - } - - if (needJOAL) - extractNativeLib("linux64", "joal_native"); - - if (needGG) - extractNativeLib("linux64", "gluegen-rt"); - - if (needJInput) + if (needJInput) { extractNativeLib("linux", "jinput-linux64"); - - if (needOAL) + } + if (needOAL) { extractNativeLib("linux", "openal64"); - + } + if(needNativeBullet){ + extractNativeLib("linux", "bulletjme64"); + } break; case Linux32: - if (needLWJGL){ + if (needLWJGL) { extractNativeLib("linux", "lwjgl"); } - if (needJOGL){ - extractNativeLib("linux32", "jogl_awt"); - extractNativeLib("linux32", "jogl"); - } - - if (needJOAL) - extractNativeLib("linux32", "joal_native"); - - if (needGG) - extractNativeLib("linux32", "gluegen-rt"); - - if (needJInput) + if (needJInput) { extractNativeLib("linux", "jinput-linux"); - - if (needOAL) + } + if (needOAL) { extractNativeLib("linux", "openal"); - - break; - case MacOSX_PPC32: - if (needLWJGL){ - extractNativeLib("macosx", "lwjgl"); } - if (needJOGL){ - extractNativeLib("macosx_ppc", "jogl_awt"); - extractNativeLib("macosx_ppc", "jogl"); + if(needNativeBullet){ + extractNativeLib("linux", "bulletjme"); } - - if (needJOAL) - throw new UnsupportedOperationException("JOAL not available on Mac OS PPC"); - - if (needGG) - extractNativeLib("macosx_ppc", "gluegen-rt"); - -// if (needOAL) -// extractNativeLib("macosx", "openal"); - - if (needJInput) - extractNativeLib("macosx", "jinput-osx"); - break; + case MacOSX_PPC32: case MacOSX32: - if (needLWJGL){ - extractNativeLib("macosx", "lwjgl"); - } - if (needJOGL){ - extractNativeLib("macosx_universal", "jogl_awt"); - extractNativeLib("macosx_universal", "jogl"); - } - - if (needJOAL) - extractNativeLib("macosx_universal", "joal_native"); - - if (needGG) - extractNativeLib("macosx_universal", "gluegen-rt"); - -// if (needOAL) -// extractNativeLib("macosx", "openal"); - - if (needJInput) - extractNativeLib("macosx", "jinput-osx"); - - break; case MacOSX_PPC64: - if (needLWJGL){ + case MacOSX64: + if (needLWJGL) { extractNativeLib("macosx", "lwjgl"); } - if (needJOGL){ - extractNativeLib("macosx_ppc", "jogl_awt"); - extractNativeLib("macosx_ppc", "jogl"); - } - - if (needJOAL) - throw new UnsupportedOperationException("JOAL not available on Mac OS 64 bit"); - - if (needGG) - extractNativeLib("macosx_ppc", "gluegen-rt"); - // if (needOAL) // extractNativeLib("macosx", "openal"); - - if (needJInput) + if (needJInput) { extractNativeLib("macosx", "jinput-osx"); - - break; - case MacOSX64: - if (needLWJGL){ - extractNativeLib("macosx", "lwjgl"); } - if (needJOGL){ - extractNativeLib("macosx_universal", "jogl_awt"); - extractNativeLib("macosx_universal", "jogl"); + if(needNativeBullet){ + extractNativeLib("macosx", "bulletjme"); } - - if (needJOAL) - throw new UnsupportedOperationException("JOAL not available on Mac OS 64 bit"); - - if (needGG) - extractNativeLib("macosx_universal", "gluegen-rt"); - -// if (needOAL) -// extractNativeLib("macosx", "openal"); - - if (needJInput) - extractNativeLib("macosx", "jinput-osx"); - break; - - } } - }