diff --git a/.gitignore b/.gitignore index 415960d..f1a5903 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ hs_err_pid* /nbproject/private/ build/ -dist/ \ No newline at end of file +dist/ +/target/ \ No newline at end of file diff --git a/README.md b/README.md index f48e92e..c05f2c1 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,12 @@ This is fork of ksar project hosted originally at sourceforce.net. Since origina seams to be abandoned, this fork is created to maintain and develop the application. If you want just to run the application, download JAR file from releases page and run -with `java -jar `. - -Lastest jar is also avaialble in *distrib* directory. +with `java -jar `. To compile, you need to have Maven installed, in source directory run `mvn install`. IDE project configuration is included for NetBeans. You need to use JDK >=6 and <= 8. # News +v0.0.5 + - Build system changed to Maven, dependent libraries are no longer included in source. + v0.0.4 - File open fixes. diff --git a/build.xml b/build.xml deleted file mode 100644 index 2644b1f..0000000 --- a/build.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - Builds, tests, and runs the project kSar2. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distrib/kSar2-0.0.4.zip b/distrib/kSar2-0.0.4.zip deleted file mode 100644 index ad60835..0000000 Binary files a/distrib/kSar2-0.0.4.zip and /dev/null differ diff --git a/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar b/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar deleted file mode 100644 index 35f1121..0000000 Binary files a/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar and /dev/null differ diff --git a/lib/absolutelayout/AbsoluteLayout.jar b/lib/absolutelayout/AbsoluteLayout.jar deleted file mode 100644 index 6f01524..0000000 Binary files a/lib/absolutelayout/AbsoluteLayout.jar and /dev/null differ diff --git a/lib/commons-cli/LICENSE.txt b/lib/commons-cli/LICENSE.txt deleted file mode 100644 index 57bc88a..0000000 --- a/lib/commons-cli/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - 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/lib/commons-cli/NOTICE.txt b/lib/commons-cli/NOTICE.txt deleted file mode 100644 index 02e26d0..0000000 --- a/lib/commons-cli/NOTICE.txt +++ /dev/null @@ -1,5 +0,0 @@ -Apache Commons CLI -Copyright 2001-2017 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). diff --git a/lib/commons-cli/commons-cli-1.4.jar b/lib/commons-cli/commons-cli-1.4.jar deleted file mode 100644 index 22deb30..0000000 Binary files a/lib/commons-cli/commons-cli-1.4.jar and /dev/null differ diff --git a/lib/iText-5.0.3.jar b/lib/iText-5.0.3.jar deleted file mode 100644 index 1d5effe..0000000 Binary files a/lib/iText-5.0.3.jar and /dev/null differ diff --git a/lib/jcommon-1.0.16.jar b/lib/jcommon-1.0.16.jar deleted file mode 100644 index 4cd6807..0000000 Binary files a/lib/jcommon-1.0.16.jar and /dev/null differ diff --git a/lib/jfreechart-1.0.13.jar b/lib/jfreechart-1.0.13.jar deleted file mode 100644 index 83c6993..0000000 Binary files a/lib/jfreechart-1.0.13.jar and /dev/null differ diff --git a/lib/jsch-0.1.42.jar b/lib/jsch-0.1.42.jar deleted file mode 100644 index c65eff0..0000000 Binary files a/lib/jsch-0.1.42.jar and /dev/null differ diff --git a/lib/junit/junit-3.8.2-api.zip b/lib/junit/junit-3.8.2-api.zip deleted file mode 100644 index 6d792fd..0000000 Binary files a/lib/junit/junit-3.8.2-api.zip and /dev/null differ diff --git a/lib/junit/junit-3.8.2.jar b/lib/junit/junit-3.8.2.jar deleted file mode 100644 index d835872..0000000 Binary files a/lib/junit/junit-3.8.2.jar and /dev/null differ diff --git a/lib/junit_4/junit-4.5-api.zip b/lib/junit_4/junit-4.5-api.zip deleted file mode 100644 index 5748c44..0000000 Binary files a/lib/junit_4/junit-4.5-api.zip and /dev/null differ diff --git a/lib/junit_4/junit-4.5-src.jar b/lib/junit_4/junit-4.5-src.jar deleted file mode 100644 index 18774a5..0000000 Binary files a/lib/junit_4/junit-4.5-src.jar and /dev/null differ diff --git a/lib/junit_4/junit-4.5.jar b/lib/junit_4/junit-4.5.jar deleted file mode 100644 index 83f8bc7..0000000 Binary files a/lib/junit_4/junit-4.5.jar and /dev/null differ diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties deleted file mode 100644 index 31843a7..0000000 --- a/lib/nblibraries.properties +++ /dev/null @@ -1,35 +0,0 @@ -libs.absolutelayout.classpath=\ - ${base}/absolutelayout/AbsoluteLayout.jar -libs.commons-cli.classpath=\ - ${base}/commons-cli/commons-cli-1.4.jar -libs.commons-cli.displayName=commons-cli -libs.CopyLibs.classpath=\ - ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar -libs.CopyLibs.displayName=CopyLibs Task -libs.CopyLibs.prop-version=2.0 -libs.hamcrest.classpath=\ - ${base}/hamcrest/hamcrest-core-1.3.jar -libs.hamcrest.displayName=Hamcrest 1.3 -libs.hamcrest.prop-maven-dependencies=org.hamcrest:hamcrest-core:1.3:jar -libs.junit.classpath=\ - ${base}/junit/junit-3.8.2.jar -libs.junit.javadoc=\ - ${base}/junit/junit-3.8.2-api.zip -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.net-commons.classpath=\ - ${base}/net-commons/commons-net-2.0.jar -libs.net-commons.javadoc=\ - ${base}/net-commons/commons-net-2.0-javadoc.jar!// -libs.net-commons.src=\ - ${base}/net-commons/commons-net-2.0-sources.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!/swing-layout-1.0.4/src/java/ diff --git a/lib/net-commons/commons-net-2.0-javadoc.jar b/lib/net-commons/commons-net-2.0-javadoc.jar deleted file mode 100644 index c68405d..0000000 Binary files a/lib/net-commons/commons-net-2.0-javadoc.jar and /dev/null differ diff --git a/lib/net-commons/commons-net-2.0-sources.jar b/lib/net-commons/commons-net-2.0-sources.jar deleted file mode 100644 index 50cc210..0000000 Binary files a/lib/net-commons/commons-net-2.0-sources.jar and /dev/null differ diff --git a/lib/net-commons/commons-net-2.0.jar b/lib/net-commons/commons-net-2.0.jar deleted file mode 100644 index dd7a52a..0000000 Binary files a/lib/net-commons/commons-net-2.0.jar and /dev/null differ diff --git a/lib/swing-layout/swing-layout-1.0.4-doc.zip b/lib/swing-layout/swing-layout-1.0.4-doc.zip deleted file mode 100644 index 6ea4f2b..0000000 Binary files a/lib/swing-layout/swing-layout-1.0.4-doc.zip and /dev/null differ diff --git a/lib/swing-layout/swing-layout-1.0.4-src.zip b/lib/swing-layout/swing-layout-1.0.4-src.zip deleted file mode 100644 index ec9836e..0000000 Binary files a/lib/swing-layout/swing-layout-1.0.4-src.zip and /dev/null differ diff --git a/lib/swing-layout/swing-layout-1.0.4.jar b/lib/swing-layout/swing-layout-1.0.4.jar deleted file mode 100644 index 46fe3a2..0000000 Binary files a/lib/swing-layout/swing-layout-1.0.4.jar and /dev/null differ diff --git a/manifest.mf b/manifest.mf deleted file mode 100644 index 1574df4..0000000 --- a/manifest.mf +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -X-COMMENT: Main-Class will be added automatically by build - diff --git a/nb-configuration.xml b/nb-configuration.xml new file mode 100644 index 0000000..a65c451 --- /dev/null +++ b/nb-configuration.xml @@ -0,0 +1,18 @@ + + + + + + JDK_1.8 + + diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml deleted file mode 100644 index 4ceac6b..0000000 --- a/nbproject/build-impl.xml +++ /dev/null @@ -1,916 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.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 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}" - - - - - - - - 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 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/nbproject/genfiles.properties b/nbproject/genfiles.properties deleted file mode 100644 index 260a036..0000000 --- a/nbproject/genfiles.properties +++ /dev/null @@ -1,11 +0,0 @@ -build.xml.data.CRC32=ae570216 -build.xml.script.CRC32=355ac37d -build.xml.stylesheet.CRC32=28e38971@1.38.1.45 -# 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=e10002a5 -nbproject/build-impl.xml.script.CRC32=5fafdfc0 -nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45 -nbproject/profiler-build-impl.xml.data.CRC32=e10002a5 -nbproject/profiler-build-impl.xml.script.CRC32=abda56ed -nbproject/profiler-build-impl.xml.stylesheet.CRC32=f10cf54c@1.11.1 diff --git a/nbproject/profiler-build-impl.xml b/nbproject/profiler-build-impl.xml deleted file mode 100644 index 7c8995d..0000000 --- a/nbproject/profiler-build-impl.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set JVM to use for profiling in profiler.info.jvm - Must set profiler agent JVM arguments in profiler.info.jvmargs.agent - - - - - - - - - - - - Must select one file in the IDE or set profile.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index 8617cd7..0000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,109 +0,0 @@ -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=false -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -application.title=kSar2 -application.vendor=Max -auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml -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}/kSar2.jar -dist.javadoc.dir=${dist.dir}/javadoc -endorsed.classpath= -excludes= -file.reference.iText-5.0.3.jar=lib/iText-5.0.3.jar -file.reference.jcommon-1.0.16.jar=lib/jcommon-1.0.16.jar -file.reference.jfreechart-1.0.13.jar=lib/jfreechart-1.0.13.jar -file.reference.jsch-0.1.42.jar=lib/jsch-0.1.42.jar -includes=** -jar.archive.disabled=${jnlp.enabled} -jar.compress=false -jar.index=${jnlp.enabled} -javac.classpath=\ - ${file.reference.jcommon-1.0.16.jar}:\ - ${file.reference.jfreechart-1.0.13.jar}:\ - ${file.reference.jsch-0.1.42.jar}:\ - ${file.reference.iText-5.0.3.jar}:\ - ${libs.swing-layout.classpath}:\ - ${libs.commons-cli.classpath} -# Space-separated list of extra javac options -javac.compilerargs=-Xlint:unchecked -Xlint:deprecation -javac.deprecation=true -javac.external.vm=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit_4.classpath}:\ - ${libs.hamcrest.classpath} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=true -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -jnlp.codebase.type=user -jnlp.codebase.user= -jnlp.descriptor=application -jnlp.enabled=false -jnlp.mixed.code=trusted_only -jnlp.offline-allowed=true -jnlp.signed=true -jnlp.signing=generated -jnlp.signing.alias=ksar2 -jnlp.signing.keystore= -main.class=net.atomique.ksar.Main -# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found. -manifest.custom.application.library.allowable.codebase= -# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts. -manifest.custom.caller.allowable.codebase= -# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed -manifest.custom.codebase= -# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions) -manifest.custom.permissions= -manifest.file=manifest.mf -meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false -platform.active=default_platform -project.license=cddl-netbeans-sun -project.licensePath=./LICENSE -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs=-Xmx128m -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.dir=src -test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index 394c342..0000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - org.netbeans.modules.java.j2seproject - - - kSar2 - - - - - - - - - .\lib\nblibraries.properties - - - diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..bc40849 --- /dev/null +++ b/pom.xml @@ -0,0 +1,78 @@ + + + 4.0.0 + net.atomique + kSar2 + 0.0.5 + jar + + + commons-cli + commons-cli + 1.4 + + + org.jfree + jfreechart + 1.0.19 + + + com.itextpdf + itextpdf + 5.0.6 + + + com.jcraft + jsch + 0.1.54 + + + junit + junit + 4.12 + + + + 1.8 + 1.8 + UTF-8 + + + + + maven-assembly-plugin + 3.1.0 + + + jar-with-dependencies + + + + net.atomique.ksar.Main + + + + + + make-assembly + + package + + + single + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0 + + private + true + + + + + diff --git a/src/kSar.version b/src/kSar.version deleted file mode 100644 index 81340c7..0000000 --- a/src/kSar.version +++ /dev/null @@ -1 +0,0 @@ -0.0.4 diff --git a/src/net/atomique/ksar/AllParser.java b/src/main/java/net/atomique/ksar/AllParser.java similarity index 100% rename from src/net/atomique/ksar/AllParser.java rename to src/main/java/net/atomique/ksar/AllParser.java diff --git a/src/net/atomique/ksar/Config.java b/src/main/java/net/atomique/ksar/Config.java similarity index 100% rename from src/net/atomique/ksar/Config.java rename to src/main/java/net/atomique/ksar/Config.java diff --git a/src/net/atomique/ksar/Export/FileCSV.java b/src/main/java/net/atomique/ksar/Export/FileCSV.java similarity index 100% rename from src/net/atomique/ksar/Export/FileCSV.java rename to src/main/java/net/atomique/ksar/Export/FileCSV.java diff --git a/src/net/atomique/ksar/Export/FilePDF.java b/src/main/java/net/atomique/ksar/Export/FilePDF.java similarity index 100% rename from src/net/atomique/ksar/Export/FilePDF.java rename to src/main/java/net/atomique/ksar/Export/FilePDF.java diff --git a/src/net/atomique/ksar/FileRead.java b/src/main/java/net/atomique/ksar/FileRead.java similarity index 100% rename from src/net/atomique/ksar/FileRead.java rename to src/main/java/net/atomique/ksar/FileRead.java diff --git a/src/net/atomique/ksar/GlobalOptions.java b/src/main/java/net/atomique/ksar/GlobalOptions.java similarity index 100% rename from src/net/atomique/ksar/GlobalOptions.java rename to src/main/java/net/atomique/ksar/GlobalOptions.java diff --git a/src/net/atomique/ksar/Graph/Graph.java b/src/main/java/net/atomique/ksar/Graph/Graph.java similarity index 100% rename from src/net/atomique/ksar/Graph/Graph.java rename to src/main/java/net/atomique/ksar/Graph/Graph.java diff --git a/src/net/atomique/ksar/Graph/IEEE1541Number.java b/src/main/java/net/atomique/ksar/Graph/IEEE1541Number.java similarity index 100% rename from src/net/atomique/ksar/Graph/IEEE1541Number.java rename to src/main/java/net/atomique/ksar/Graph/IEEE1541Number.java diff --git a/src/net/atomique/ksar/Graph/List.java b/src/main/java/net/atomique/ksar/Graph/List.java similarity index 100% rename from src/net/atomique/ksar/Graph/List.java rename to src/main/java/net/atomique/ksar/Graph/List.java diff --git a/src/net/atomique/ksar/LocalCommand.java b/src/main/java/net/atomique/ksar/LocalCommand.java similarity index 100% rename from src/net/atomique/ksar/LocalCommand.java rename to src/main/java/net/atomique/ksar/LocalCommand.java diff --git a/src/net/atomique/ksar/Main.java b/src/main/java/net/atomique/ksar/Main.java similarity index 100% rename from src/net/atomique/ksar/Main.java rename to src/main/java/net/atomique/ksar/Main.java diff --git a/src/net/atomique/ksar/OSParser.java b/src/main/java/net/atomique/ksar/OSParser.java similarity index 100% rename from src/net/atomique/ksar/OSParser.java rename to src/main/java/net/atomique/ksar/OSParser.java diff --git a/src/net/atomique/ksar/Parser/AIX.java b/src/main/java/net/atomique/ksar/Parser/AIX.java similarity index 100% rename from src/net/atomique/ksar/Parser/AIX.java rename to src/main/java/net/atomique/ksar/Parser/AIX.java diff --git a/src/net/atomique/ksar/Parser/HPUX.java b/src/main/java/net/atomique/ksar/Parser/HPUX.java similarity index 100% rename from src/net/atomique/ksar/Parser/HPUX.java rename to src/main/java/net/atomique/ksar/Parser/HPUX.java diff --git a/src/net/atomique/ksar/Parser/Linux.java b/src/main/java/net/atomique/ksar/Parser/Linux.java similarity index 100% rename from src/net/atomique/ksar/Parser/Linux.java rename to src/main/java/net/atomique/ksar/Parser/Linux.java diff --git a/src/net/atomique/ksar/Parser/SunOS.java b/src/main/java/net/atomique/ksar/Parser/SunOS.java similarity index 100% rename from src/net/atomique/ksar/Parser/SunOS.java rename to src/main/java/net/atomique/ksar/Parser/SunOS.java diff --git a/src/net/atomique/ksar/SSHCommand.java b/src/main/java/net/atomique/ksar/SSHCommand.java similarity index 100% rename from src/net/atomique/ksar/SSHCommand.java rename to src/main/java/net/atomique/ksar/SSHCommand.java diff --git a/src/net/atomique/ksar/UI/AboutBox.form b/src/main/java/net/atomique/ksar/UI/AboutBox.form similarity index 100% rename from src/net/atomique/ksar/UI/AboutBox.form rename to src/main/java/net/atomique/ksar/UI/AboutBox.form diff --git a/src/net/atomique/ksar/UI/AboutBox.java b/src/main/java/net/atomique/ksar/UI/AboutBox.java similarity index 100% rename from src/net/atomique/ksar/UI/AboutBox.java rename to src/main/java/net/atomique/ksar/UI/AboutBox.java diff --git a/src/net/atomique/ksar/UI/DataView.form b/src/main/java/net/atomique/ksar/UI/DataView.form similarity index 100% rename from src/net/atomique/ksar/UI/DataView.form rename to src/main/java/net/atomique/ksar/UI/DataView.form diff --git a/src/net/atomique/ksar/UI/DataView.java b/src/main/java/net/atomique/ksar/UI/DataView.java similarity index 100% rename from src/net/atomique/ksar/UI/DataView.java rename to src/main/java/net/atomique/ksar/UI/DataView.java diff --git a/src/net/atomique/ksar/UI/Desktop.form b/src/main/java/net/atomique/ksar/UI/Desktop.form similarity index 100% rename from src/net/atomique/ksar/UI/Desktop.form rename to src/main/java/net/atomique/ksar/UI/Desktop.form diff --git a/src/net/atomique/ksar/UI/Desktop.java b/src/main/java/net/atomique/ksar/UI/Desktop.java similarity index 100% rename from src/net/atomique/ksar/UI/Desktop.java rename to src/main/java/net/atomique/ksar/UI/Desktop.java diff --git a/src/net/atomique/ksar/UI/GraphSelection.form b/src/main/java/net/atomique/ksar/UI/GraphSelection.form similarity index 100% rename from src/net/atomique/ksar/UI/GraphSelection.form rename to src/main/java/net/atomique/ksar/UI/GraphSelection.form diff --git a/src/net/atomique/ksar/UI/GraphSelection.java b/src/main/java/net/atomique/ksar/UI/GraphSelection.java similarity index 100% rename from src/net/atomique/ksar/UI/GraphSelection.java rename to src/main/java/net/atomique/ksar/UI/GraphSelection.java diff --git a/src/net/atomique/ksar/UI/GraphView.form b/src/main/java/net/atomique/ksar/UI/GraphView.form similarity index 100% rename from src/net/atomique/ksar/UI/GraphView.form rename to src/main/java/net/atomique/ksar/UI/GraphView.form diff --git a/src/net/atomique/ksar/UI/GraphView.java b/src/main/java/net/atomique/ksar/UI/GraphView.java similarity index 100% rename from src/net/atomique/ksar/UI/GraphView.java rename to src/main/java/net/atomique/ksar/UI/GraphView.java diff --git a/src/net/atomique/ksar/UI/HostInfoView.form b/src/main/java/net/atomique/ksar/UI/HostInfoView.form similarity index 100% rename from src/net/atomique/ksar/UI/HostInfoView.form rename to src/main/java/net/atomique/ksar/UI/HostInfoView.form diff --git a/src/net/atomique/ksar/UI/HostInfoView.java b/src/main/java/net/atomique/ksar/UI/HostInfoView.java similarity index 100% rename from src/net/atomique/ksar/UI/HostInfoView.java rename to src/main/java/net/atomique/ksar/UI/HostInfoView.java diff --git a/src/net/atomique/ksar/UI/LinuxDateFormat.form b/src/main/java/net/atomique/ksar/UI/LinuxDateFormat.form similarity index 100% rename from src/net/atomique/ksar/UI/LinuxDateFormat.form rename to src/main/java/net/atomique/ksar/UI/LinuxDateFormat.form diff --git a/src/net/atomique/ksar/UI/LinuxDateFormat.java b/src/main/java/net/atomique/ksar/UI/LinuxDateFormat.java similarity index 100% rename from src/net/atomique/ksar/UI/LinuxDateFormat.java rename to src/main/java/net/atomique/ksar/UI/LinuxDateFormat.java diff --git a/src/net/atomique/ksar/UI/ParentNodeInfo.java b/src/main/java/net/atomique/ksar/UI/ParentNodeInfo.java similarity index 100% rename from src/net/atomique/ksar/UI/ParentNodeInfo.java rename to src/main/java/net/atomique/ksar/UI/ParentNodeInfo.java diff --git a/src/net/atomique/ksar/UI/Preferences.form b/src/main/java/net/atomique/ksar/UI/Preferences.form similarity index 100% rename from src/net/atomique/ksar/UI/Preferences.form rename to src/main/java/net/atomique/ksar/UI/Preferences.form diff --git a/src/net/atomique/ksar/UI/Preferences.java b/src/main/java/net/atomique/ksar/UI/Preferences.java similarity index 100% rename from src/net/atomique/ksar/UI/Preferences.java rename to src/main/java/net/atomique/ksar/UI/Preferences.java diff --git a/src/net/atomique/ksar/UI/SortedTreeNode.java b/src/main/java/net/atomique/ksar/UI/SortedTreeNode.java similarity index 100% rename from src/net/atomique/ksar/UI/SortedTreeNode.java rename to src/main/java/net/atomique/ksar/UI/SortedTreeNode.java diff --git a/src/net/atomique/ksar/UI/SplashPicture.java b/src/main/java/net/atomique/ksar/UI/SplashPicture.java similarity index 100% rename from src/net/atomique/ksar/UI/SplashPicture.java rename to src/main/java/net/atomique/ksar/UI/SplashPicture.java diff --git a/src/net/atomique/ksar/UI/SplashScreen.java b/src/main/java/net/atomique/ksar/UI/SplashScreen.java similarity index 100% rename from src/net/atomique/ksar/UI/SplashScreen.java rename to src/main/java/net/atomique/ksar/UI/SplashScreen.java diff --git a/src/net/atomique/ksar/UI/TreeNodeInfo.java b/src/main/java/net/atomique/ksar/UI/TreeNodeInfo.java similarity index 100% rename from src/net/atomique/ksar/UI/TreeNodeInfo.java rename to src/main/java/net/atomique/ksar/UI/TreeNodeInfo.java diff --git a/src/net/atomique/ksar/VersionNumber.java b/src/main/java/net/atomique/ksar/VersionNumber.java similarity index 100% rename from src/net/atomique/ksar/VersionNumber.java rename to src/main/java/net/atomique/ksar/VersionNumber.java diff --git a/src/net/atomique/ksar/XML/CnxHistory.java b/src/main/java/net/atomique/ksar/XML/CnxHistory.java similarity index 100% rename from src/net/atomique/ksar/XML/CnxHistory.java rename to src/main/java/net/atomique/ksar/XML/CnxHistory.java diff --git a/src/net/atomique/ksar/XML/ColumnConfig.java b/src/main/java/net/atomique/ksar/XML/ColumnConfig.java similarity index 100% rename from src/net/atomique/ksar/XML/ColumnConfig.java rename to src/main/java/net/atomique/ksar/XML/ColumnConfig.java diff --git a/src/net/atomique/ksar/XML/GraphConfig.java b/src/main/java/net/atomique/ksar/XML/GraphConfig.java similarity index 100% rename from src/net/atomique/ksar/XML/GraphConfig.java rename to src/main/java/net/atomique/ksar/XML/GraphConfig.java diff --git a/src/net/atomique/ksar/XML/HostInfo.java b/src/main/java/net/atomique/ksar/XML/HostInfo.java similarity index 100% rename from src/net/atomique/ksar/XML/HostInfo.java rename to src/main/java/net/atomique/ksar/XML/HostInfo.java diff --git a/src/net/atomique/ksar/XML/OSConfig.java b/src/main/java/net/atomique/ksar/XML/OSConfig.java similarity index 100% rename from src/net/atomique/ksar/XML/OSConfig.java rename to src/main/java/net/atomique/ksar/XML/OSConfig.java diff --git a/src/net/atomique/ksar/XML/PlotConfig.java b/src/main/java/net/atomique/ksar/XML/PlotConfig.java similarity index 100% rename from src/net/atomique/ksar/XML/PlotConfig.java rename to src/main/java/net/atomique/ksar/XML/PlotConfig.java diff --git a/src/net/atomique/ksar/XML/StackConfig.java b/src/main/java/net/atomique/ksar/XML/StackConfig.java similarity index 100% rename from src/net/atomique/ksar/XML/StackConfig.java rename to src/main/java/net/atomique/ksar/XML/StackConfig.java diff --git a/src/net/atomique/ksar/XML/StatConfig.java b/src/main/java/net/atomique/ksar/XML/StatConfig.java similarity index 100% rename from src/net/atomique/ksar/XML/StatConfig.java rename to src/main/java/net/atomique/ksar/XML/StatConfig.java diff --git a/src/net/atomique/ksar/XMLConfig.java b/src/main/java/net/atomique/ksar/XMLConfig.java similarity index 100% rename from src/net/atomique/ksar/XMLConfig.java rename to src/main/java/net/atomique/ksar/XMLConfig.java diff --git a/src/net/atomique/ksar/kSar.java b/src/main/java/net/atomique/ksar/kSar.java similarity index 100% rename from src/net/atomique/ksar/kSar.java rename to src/main/java/net/atomique/ksar/kSar.java diff --git a/src/AIX.xml b/src/main/resources/AIX.xml similarity index 100% rename from src/AIX.xml rename to src/main/resources/AIX.xml diff --git a/src/Config.dtd b/src/main/resources/Config.dtd similarity index 100% rename from src/Config.dtd rename to src/main/resources/Config.dtd diff --git a/src/Config.xml b/src/main/resources/Config.xml similarity index 100% rename from src/Config.xml rename to src/main/resources/Config.xml diff --git a/src/Esar.xml b/src/main/resources/Esar.xml similarity index 100% rename from src/Esar.xml rename to src/main/resources/Esar.xml diff --git a/src/HPUX.xml b/src/main/resources/HPUX.xml similarity index 100% rename from src/HPUX.xml rename to src/main/resources/HPUX.xml diff --git a/src/Linux.xml b/src/main/resources/Linux.xml similarity index 100% rename from src/Linux.xml rename to src/main/resources/Linux.xml diff --git a/src/SunOS.xml b/src/main/resources/SunOS.xml similarity index 100% rename from src/SunOS.xml rename to src/main/resources/SunOS.xml diff --git a/src/main/resources/kSar.version b/src/main/resources/kSar.version new file mode 100644 index 0000000..bbdeab6 --- /dev/null +++ b/src/main/resources/kSar.version @@ -0,0 +1 @@ +0.0.5 diff --git a/src/logo_ksar2.png b/src/main/resources/logo_ksar2.png similarity index 100% rename from src/logo_ksar2.png rename to src/main/resources/logo_ksar2.png diff --git a/src/net/atomique/ksar/Language/Message.properties b/src/main/resources/net/atomique/ksar/Language/Message.properties similarity index 100% rename from src/net/atomique/ksar/Language/Message.properties rename to src/main/resources/net/atomique/ksar/Language/Message.properties diff --git a/src/net/atomique/ksar/Language/Message_fr_FR.properties b/src/main/resources/net/atomique/ksar/Language/Message_fr_FR.properties similarity index 100% rename from src/net/atomique/ksar/Language/Message_fr_FR.properties rename to src/main/resources/net/atomique/ksar/Language/Message_fr_FR.properties diff --git a/test/net/atomique/ksar/Parser/LinuxTest.java b/src/test/java/net/atomique/ksar/Parser/LinuxTest.java similarity index 100% rename from test/net/atomique/ksar/Parser/LinuxTest.java rename to src/test/java/net/atomique/ksar/Parser/LinuxTest.java