This is an automated email from the ASF dual-hosted git repository.
cmarcum pushed a commit to branch maven-jars
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/maven-jars by this push:
new 3a5f00e Java UNO jars suitable for release using Apache Nexus
repository for Maven and Gradle built projects (#91)
3a5f00e is described below
commit 3a5f00ee77233415af74df3b753e2f6b02f50c8f
Author: Carl Marcum <carl.mar...@codebuilders.net>
AuthorDate: Wed Jul 15 08:20:39 2020 -0400
Java UNO jars suitable for release using Apache Nexus repository for Maven
and Gradle built projects (#91)
Changes to build UNO jars juh, jurt, ridl, officebean, and unoloader
libraries, javadoc, and source jars.
---
.gitignore | 1 +
main/bean/java/officebean/META-INF/LICENSE | 202 +++++++++++++++++++++
main/bean/java/officebean/META-INF/MANIFEST.MF | 0
main/bean/java/officebean/META-INF/NOTICE | 9 +
main/bean/java/officebean/build.xml | 7 +
.../{Module_javaunohelper.mk => Ant_juh.mk} | 11 +-
main/javaunohelper/Jar_juh.mk | 48 ++---
main/javaunohelper/Module_javaunohelper.mk | 3 +-
main/javaunohelper/Zip_juh_src.mk | 2 +-
main/javaunohelper/java/juh/META-INF/LICENSE | 202 +++++++++++++++++++++
main/javaunohelper/java/juh/META-INF/MANIFEST.MF | 0
main/javaunohelper/java/juh/META-INF/NOTICE | 9 +
main/javaunohelper/java/juh/build.xml | 83 +++++++++
.../com/sun/star/comp/JavaUNOHelperServices.java | 0
.../java}/com/sun/star/comp/helper/Bootstrap.java | 0
.../sun/star/comp/helper/BootstrapException.java | 0
.../com/sun/star/comp/helper/ComponentContext.java | 0
.../star/comp/helper/ComponentContextEntry.java | 0
.../star/comp/helper/RegistryServiceFactory.java | 0
.../sun/star/comp/helper/SharedLibraryLoader.java | 0
.../java}/com/sun/star/comp/helper/UnoInfo.java | 0
.../comp/juhtest/SmoketestCommandEnvironment.java | 0
.../adapter/ByteArrayToXInputStreamAdapter.java | 0
.../adapter/InputStreamToXInputStreamAdapter.java | 0
.../OutputStreamToXOutputStreamAdapter.java | 0
.../adapter/XInputStreamToInputStreamAdapter.java | 0
.../adapter/XOutputStreamToByteArrayAdapter.java | 0
.../XOutputStreamToOutputStreamAdapter.java | 0
.../com/sun/star/lib/uno/helper/ComponentBase.java | 0
.../java}/com/sun/star/lib/uno/helper/Factory.java | 0
.../star/lib/uno/helper/InterfaceContainer.java | 0
.../uno/helper/MultiTypeInterfaceContainer.java | 0
.../com/sun/star/lib/uno/helper/PropertySet.java | 0
.../sun/star/lib/uno/helper/PropertySetMixin.java | 0
.../java}/com/sun/star/lib/uno/helper/UnoUrl.java | 0
.../com/sun/star/lib/uno/helper/WeakAdapter.java | 0
.../com/sun/star/lib/uno/helper/WeakBase.java | 0
.../com/sun/star/comp/helper/Bootstrap_Test.java | 0
.../star/comp/helper/ComponentContext_Test.java | 0
.../comp/helper/RegistryServiceFactory_Test.java | 0
.../star/comp/helper/SharedLibraryLoader_Test.java | 0
.../java}/com/sun/star/comp/helper/makefile.mk | 0
.../com/sun/star/lib/uno/helper/AWeakBase.java | 0
.../star/lib/uno/helper/ComponentBase_Test.java | 0
.../com/sun/star/lib/uno/helper/Factory_Test.java | 0
.../lib/uno/helper/InterfaceContainer_Test.java | 0
.../helper/MultiTypeInterfaceContainer_Test.java | 0
.../sun/star/lib/uno/helper/PropertySet_Test.java | 0
.../com/sun/star/lib/uno/helper/ProxyProvider.java | 0
.../com/sun/star/lib/uno/helper/UnoUrlTest.java | 0
.../com/sun/star/lib/uno/helper/WeakBase_Test.java | 0
.../java}/com/sun/star/lib/uno/helper/makefile.mk | 0
main/jurt/java/jurt/META-INF/LICENSE | 202 +++++++++++++++++++++
main/jurt/java/jurt/META-INF/MANIFEST.MF | 0
main/jurt/java/jurt/META-INF/NOTICE | 9 +
main/jurt/java/jurt/build.xml | 49 ++---
main/ridljar/java/ridl/META-INF/LICENSE | 202 +++++++++++++++++++++
main/ridljar/java/ridl/META-INF/MANIFEST.MF | 0
main/ridljar/java/ridl/META-INF/NOTICE | 9 +
main/ridljar/java/ridl/META-INF/README | 6 +
main/ridljar/java/ridl/build.xml | 7 +
main/ridljar/java/unoloader/META-INF/LICENSE | 202 +++++++++++++++++++++
main/ridljar/java/unoloader/META-INF/MANIFEST.MF | 0
main/ridljar/java/unoloader/META-INF/NOTICE | 9 +
main/ridljar/java/unoloader/build.xml | 9 +
main/solenv/ant/aoo-ant.xml | 133 ++++++++++----
66 files changed, 1326 insertions(+), 88 deletions(-)
diff --git a/.gitignore b/.gitignore
index f541c96..7f50092 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@ CVS
TAGS
\#*
/log
+/.idea/
# id-utils, ctags, cscope
/ID
diff --git a/main/bean/java/officebean/META-INF/LICENSE
b/main/bean/java/officebean/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/main/bean/java/officebean/META-INF/LICENSE
@@ -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/main/bean/java/officebean/META-INF/MANIFEST.MF
b/main/bean/java/officebean/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e69de29
diff --git a/main/bean/java/officebean/META-INF/NOTICE
b/main/bean/java/officebean/META-INF/NOTICE
new file mode 100644
index 0000000..a8e4310
--- /dev/null
+++ b/main/bean/java/officebean/META-INF/NOTICE
@@ -0,0 +1,9 @@
+Apache OpenOffice (http://www.openoffice.org)
+Copyright 2011-2020 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software copyright (c) 2000-2011,
+Oracle and/or its affiliates <http://www.oracle.com/>.
+
diff --git a/main/bean/java/officebean/build.xml
b/main/bean/java/officebean/build.xml
index 68d2f9d..208158f 100644
--- a/main/bean/java/officebean/build.xml
+++ b/main/bean/java/officebean/build.xml
@@ -29,6 +29,13 @@
<target name="init-project">
+ <!-- for creating maven bundles for distribution -->
+ <property name="artifact.jar.enabled" value="true"/>
+ <property name="javadoc.jar.enabled" value="true"/>
+ <property name="javadoc.title" value="<h1>JavaBean for Office
Components</h1>"/>
+ <property name="javadoc.window.title" value="JavaBean for Office
Components"/>
+ <property name="source.jar.enabled" value="true"/>
+
<path id="main.classpath">
<pathelement location="${OUTDIR}/bin/ridl.jar"/>
<pathelement location="${OUTDIR}/bin/unoil.jar"/>
diff --git a/main/javaunohelper/Module_javaunohelper.mk
b/main/javaunohelper/Ant_juh.mk
similarity index 85%
copy from main/javaunohelper/Module_javaunohelper.mk
copy to main/javaunohelper/Ant_juh.mk
index fe1fe0f..aedbfa3 100644
--- a/main/javaunohelper/Module_javaunohelper.mk
+++ b/main/javaunohelper/Ant_juh.mk
@@ -20,14 +20,7 @@
#**************************************************************
-
-$(eval $(call gb_Module_Module,javaunohelper))
-
-$(eval $(call gb_Module_add_targets,javaunohelper,\
- Jar_juh \
- Library_juh \
- Library_juhx \
- Zip_juh_src \
-))
+$(eval $(call gb_Ant_Ant,juh,$(SRCDIR)/javaunohelper/java/juh/build.xml))
# vim: set noet sw=4 ts=4:
+
diff --git a/main/javaunohelper/Jar_juh.mk b/main/javaunohelper/Jar_juh.mk
index 3895edf..6afce4a 100644
--- a/main/javaunohelper/Jar_juh.mk
+++ b/main/javaunohelper/Jar_juh.mk
@@ -41,30 +41,30 @@ $(eval $(call gb_Jar_set_jarclasspath,juh,\
))
$(eval $(call gb_Jar_add_sourcefiles,juh,\
- javaunohelper/com/sun/star/lib/uno/helper/UnoUrl \
- javaunohelper/com/sun/star/lib/uno/helper/Factory \
- javaunohelper/com/sun/star/lib/uno/helper/ComponentBase \
- javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter \
- javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer \
- javaunohelper/com/sun/star/lib/uno/helper/WeakBase \
- javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin \
- javaunohelper/com/sun/star/lib/uno/helper/PropertySet \
- javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer \
-
javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter \
-
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter \
-
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter \
-
javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter \
-
javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter \
-
javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter \
- javaunohelper/com/sun/star/comp/JavaUNOHelperServices \
- javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment \
- javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory \
- javaunohelper/com/sun/star/comp/helper/UnoInfo \
- javaunohelper/com/sun/star/comp/helper/ComponentContext \
- javaunohelper/com/sun/star/comp/helper/BootstrapException \
- javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader \
- javaunohelper/com/sun/star/comp/helper/Bootstrap \
- javaunohelper/com/sun/star/comp/helper/ComponentContextEntry \
+ javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/UnoUrl
\
+
javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/Factory \
+
javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/ComponentBase \
+
javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/WeakAdapter \
+
javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer
\
+
javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/WeakBase \
+
javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/PropertySetMixin
\
+
javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/PropertySet \
+
javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/InterfaceContainer
\
+
javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter
\
+
javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter
\
+
javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter
\
+
javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter
\
+
javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter
\
+
javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter
\
+
javaunohelper/java/juh/src/main/java/com/sun/star/comp/JavaUNOHelperServices \
+
javaunohelper/java/juh/src/main/java/com/sun/star/comp/juhtest/SmoketestCommandEnvironment
\
+
javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/RegistryServiceFactory
\
+ javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/UnoInfo \
+
javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/ComponentContext \
+
javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/BootstrapException
\
+
javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/SharedLibraryLoader
\
+ javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/Bootstrap
\
+
javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/ComponentContextEntry
\
))
$(eval $(call gb_Jar_set_componentfile,juh,javaunohelper/util/juh,URE))
diff --git a/main/javaunohelper/Module_javaunohelper.mk
b/main/javaunohelper/Module_javaunohelper.mk
index fe1fe0f..c502d6e 100644
--- a/main/javaunohelper/Module_javaunohelper.mk
+++ b/main/javaunohelper/Module_javaunohelper.mk
@@ -24,10 +24,11 @@
$(eval $(call gb_Module_Module,javaunohelper))
$(eval $(call gb_Module_add_targets,javaunohelper,\
- Jar_juh \
+ Jar_juh \
Library_juh \
Library_juhx \
Zip_juh_src \
+ Ant_juh \
))
# vim: set noet sw=4 ts=4:
diff --git a/main/javaunohelper/Zip_juh_src.mk
b/main/javaunohelper/Zip_juh_src.mk
index 1fb12ba..23ef855 100644
--- a/main/javaunohelper/Zip_juh_src.mk
+++ b/main/javaunohelper/Zip_juh_src.mk
@@ -21,7 +21,7 @@
-$(eval $(call gb_Zip_Zip,juh_src,$(SRCDIR)/javaunohelper))
+$(eval $(call
gb_Zip_Zip,juh_src,$(SRCDIR)/javaunohelper/java/juh/src/main/java))
$(eval $(call gb_Zip_add_files,juh_src,\
com/sun/star/lib/uno/helper/UnoUrl.java \
diff --git a/main/javaunohelper/java/juh/META-INF/LICENSE
b/main/javaunohelper/java/juh/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/main/javaunohelper/java/juh/META-INF/LICENSE
@@ -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/main/javaunohelper/java/juh/META-INF/MANIFEST.MF
b/main/javaunohelper/java/juh/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e69de29
diff --git a/main/javaunohelper/java/juh/META-INF/NOTICE
b/main/javaunohelper/java/juh/META-INF/NOTICE
new file mode 100644
index 0000000..a8e4310
--- /dev/null
+++ b/main/javaunohelper/java/juh/META-INF/NOTICE
@@ -0,0 +1,9 @@
+Apache OpenOffice (http://www.openoffice.org)
+Copyright 2011-2020 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software copyright (c) 2000-2011,
+Oracle and/or its affiliates <http://www.oracle.com/>.
+
diff --git a/main/javaunohelper/java/juh/build.xml
b/main/javaunohelper/java/juh/build.xml
new file mode 100644
index 0000000..ea7b49c
--- /dev/null
+++ b/main/javaunohelper/java/juh/build.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you 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.
+*
+***********************************************************-->
+
+
+<project name="juh" default="main" xmlns:if="ant:if" xmlns:unless="ant:unless">
+
+ <property file="../../../ant.properties"/>
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+ <target name="init-project">
+
+ <property name="jar.classpath" value="ridl.jar jurt.jar ../../lib/
../bin/"/>
+ <property name="jar.manifest"
value="${SRC_ROOT}/javaunohelper/util/manifest"/>
+
+ <!-- for creating maven bundles for distribution -->
+ <property name="artifact.jar.enabled" value="true"/>
+ <property name="javadoc.jar.enabled" value="true"/>
+ <property name="javadoc.title" value="<h1>Java UNO
Helper</h1>"/>
+ <property name="javadoc.window.title" value="Java UNO Helper"/>
+ <property name="source.jar.enabled" value="true"/>
+
+ <path id="main.classpath">
+ <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+ <pathelement location="${OUTDIR}/bin/jurt.jar"/>
+ <pathelement location="${OUTDIR}/bin/unoil.jar"/>
+ </path>
+
+ </target>
+
+ <!-- custom jar target to create with version number instead of copying
gbuild juh.jar -->
+ <target name="jar" depends="compile" if="${artifact.jar.enabled}">
+ <jar destfile="${jar.dir}/${jar.name}-${aoo.ver}.jar"
+ manifest="${jar.manifest}"
+ duplicate="fail">
+ <manifest>
+ <attribute name="Class-Path" value="${jar.classpath}"
unless:blank="${jar.classpath}"/>
+ <attribute name="Solar-Version" value="${RSCREVISION}"/>
+ </manifest>
+ <fileset dir="${main.build.dir}"/>
+ <!-- Breaks trunk/test/smoketestdoc by packaging different classes
with the same name: -->
+ <!-- <fileset dir="${idl.build.classes.dir}"
erroronmissingdir="false"/> -->
+ <include name="**/*.class"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.css"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.form"/>
+ <include name="**/*.gif "/>
+ <include name="**/*.htm"/>
+ <include name="**/*.html"/>
+ <include name="**/*.js"/>
+ <include name="**/*.mod"/>
+ <include name="**/*.sql"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.xsl"/>
+ <include name="**/*.map"/>
+ </jar>
+ </target>
+
+ <!-- TEMP UNTIL WE USE THE ANT BUILT JAR THEN REMOVE TARGET-->
+ <!-- custom main has test and copy-artifact-jar removed from depends -->
+ <target name="main" depends="jar,jar-javadoc,jar-source"/>
+
+</project>
+
diff --git a/main/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/JavaUNOHelperServices.java
similarity index 100%
rename from main/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/JavaUNOHelperServices.java
diff --git a/main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/Bootstrap.java
similarity index 100%
rename from main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/Bootstrap.java
diff --git
a/main/javaunohelper/com/sun/star/comp/helper/BootstrapException.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/BootstrapException.java
similarity index 100%
rename from main/javaunohelper/com/sun/star/comp/helper/BootstrapException.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/BootstrapException.java
diff --git a/main/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/ComponentContext.java
similarity index 100%
rename from main/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/ComponentContext.java
diff --git
a/main/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/ComponentContextEntry.java
similarity index 100%
rename from
main/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/ComponentContextEntry.java
diff --git
a/main/javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/RegistryServiceFactory.java
similarity index 100%
rename from
main/javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/RegistryServiceFactory.java
diff --git
a/main/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/SharedLibraryLoader.java
similarity index 100%
rename from main/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/SharedLibraryLoader.java
diff --git a/main/javaunohelper/com/sun/star/comp/helper/UnoInfo.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/UnoInfo.java
similarity index 100%
rename from main/javaunohelper/com/sun/star/comp/helper/UnoInfo.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/helper/UnoInfo.java
diff --git
a/main/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java
similarity index 100%
rename from
main/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java
diff --git
a/main/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
similarity index 100%
rename from
main/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
diff --git
a/main/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
similarity index 100%
rename from
main/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
diff --git
a/main/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
similarity index 100%
rename from
main/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
diff --git
a/main/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
similarity index 100%
rename from
main/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
diff --git
a/main/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
similarity index 100%
rename from
main/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
diff --git
a/main/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
similarity index 100%
rename from
main/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
diff --git a/main/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/ComponentBase.java
similarity index 100%
rename from main/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/ComponentBase.java
diff --git a/main/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/Factory.java
similarity index 100%
rename from main/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/Factory.java
diff --git
a/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/InterfaceContainer.java
similarity index 100%
rename from
main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/InterfaceContainer.java
diff --git
a/main/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
similarity index 100%
rename from
main/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
diff --git a/main/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/PropertySet.java
similarity index 100%
rename from main/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/PropertySet.java
diff --git
a/main/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/PropertySetMixin.java
similarity index 100%
rename from main/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/PropertySetMixin.java
diff --git a/main/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/UnoUrl.java
similarity index 100%
rename from main/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/UnoUrl.java
diff --git a/main/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/WeakAdapter.java
similarity index 100%
rename from main/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/WeakAdapter.java
diff --git a/main/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java
b/main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/WeakBase.java
similarity index 100%
rename from main/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java
rename to
main/javaunohelper/java/juh/src/main/java/com/sun/star/lib/uno/helper/WeakBase.java
diff --git
a/main/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/comp/helper/Bootstrap_Test.java
similarity index 100%
rename from main/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/comp/helper/Bootstrap_Test.java
diff --git
a/main/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/comp/helper/ComponentContext_Test.java
similarity index 100%
rename from
main/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/comp/helper/ComponentContext_Test.java
diff --git
a/main/javaunohelper/test/com/sun/star/comp/helper/RegistryServiceFactory_Test.java
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/comp/helper/RegistryServiceFactory_Test.java
similarity index 100%
rename from
main/javaunohelper/test/com/sun/star/comp/helper/RegistryServiceFactory_Test.java
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/comp/helper/RegistryServiceFactory_Test.java
diff --git
a/main/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
similarity index 100%
rename from
main/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
diff --git a/main/javaunohelper/test/com/sun/star/comp/helper/makefile.mk
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/comp/helper/makefile.mk
similarity index 100%
rename from main/javaunohelper/test/com/sun/star/comp/helper/makefile.mk
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/comp/helper/makefile.mk
diff --git a/main/javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase.java
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/AWeakBase.java
similarity index 100%
rename from main/javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase.java
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/AWeakBase.java
diff --git
a/main/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/ComponentBase_Test.java
similarity index 100%
rename from
main/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/ComponentBase_Test.java
diff --git
a/main/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/Factory_Test.java
similarity index 100%
rename from
main/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/Factory_Test.java
diff --git
a/main/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
similarity index 100%
rename from
main/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
diff --git
a/main/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
similarity index 100%
rename from
main/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
diff --git
a/main/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/PropertySet_Test.java
similarity index 100%
rename from
main/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/PropertySet_Test.java
diff --git
a/main/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/ProxyProvider.java
similarity index 100%
rename from
main/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/ProxyProvider.java
diff --git
a/main/javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/UnoUrlTest.java
similarity index 100%
rename from main/javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/UnoUrlTest.java
diff --git
a/main/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/WeakBase_Test.java
similarity index 100%
rename from
main/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/WeakBase_Test.java
diff --git a/main/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk
b/main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/makefile.mk
similarity index 100%
rename from main/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk
rename to
main/javaunohelper/java/juh/src/test/java/com/sun/star/lib/uno/helper/makefile.mk
diff --git a/main/jurt/java/jurt/META-INF/LICENSE
b/main/jurt/java/jurt/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/main/jurt/java/jurt/META-INF/LICENSE
@@ -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/main/jurt/java/jurt/META-INF/MANIFEST.MF
b/main/jurt/java/jurt/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e69de29
diff --git a/main/jurt/java/jurt/META-INF/NOTICE
b/main/jurt/java/jurt/META-INF/NOTICE
new file mode 100644
index 0000000..a8e4310
--- /dev/null
+++ b/main/jurt/java/jurt/META-INF/NOTICE
@@ -0,0 +1,9 @@
+Apache OpenOffice (http://www.openoffice.org)
+Copyright 2011-2020 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software copyright (c) 2000-2011,
+Oracle and/or its affiliates <http://www.oracle.com/>.
+
diff --git a/main/jurt/java/jurt/build.xml b/main/jurt/java/jurt/build.xml
index 3da74f0..72f343b 100644
--- a/main/jurt/java/jurt/build.xml
+++ b/main/jurt/java/jurt/build.xml
@@ -1,36 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- *
- ***********************************************************-->
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you 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.
+*
+***********************************************************-->
<project name="jurt" default="main">
<property file="../../../ant.properties"/>
<import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
-
+
<target name="init-project">
<property name="jar.classpath" value="ridl.jar unoloader.jar
../../lib/ ../bin/"/>
<property name="jar.manifest" value="${SRC_ROOT}/jurt/util/manifest"/>
+ <!-- for creating maven bundles for distribution -->
+ <property name="artifact.jar.enabled" value="true"/>
+ <property name="javadoc.jar.enabled" value="true"/>
+ <property name="javadoc.title" value="<h1>Java UNO Runtime
API</h1>"/>
+ <property name="javadoc.window.title" value="Java UNO Runtime API"/>
+ <property name="source.jar.enabled" value="true"/>
+
<path id="main.classpath">
<pathelement location="${OUTDIR}/bin/ridl.jar"/>
<pathelement location="${OUTDIR}/bin/unoloader.jar"/>
@@ -41,6 +48,6 @@
</filelist>
</target>
-
+
</project>
diff --git a/main/ridljar/java/ridl/META-INF/LICENSE
b/main/ridljar/java/ridl/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/main/ridljar/java/ridl/META-INF/LICENSE
@@ -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/main/ridljar/java/ridl/META-INF/MANIFEST.MF
b/main/ridljar/java/ridl/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e69de29
diff --git a/main/ridljar/java/ridl/META-INF/NOTICE
b/main/ridljar/java/ridl/META-INF/NOTICE
new file mode 100644
index 0000000..a8e4310
--- /dev/null
+++ b/main/ridljar/java/ridl/META-INF/NOTICE
@@ -0,0 +1,9 @@
+Apache OpenOffice (http://www.openoffice.org)
+Copyright 2011-2020 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software copyright (c) 2000-2011,
+Oracle and/or its affiliates <http://www.oracle.com/>.
+
diff --git a/main/ridljar/java/ridl/META-INF/README
b/main/ridljar/java/ridl/META-INF/README
new file mode 100644
index 0000000..31a60e1
--- /dev/null
+++ b/main/ridljar/java/ridl/META-INF/README
@@ -0,0 +1,6 @@
+Not all Java source files or Javadocs exist for the Runtime Interface
Definition Library.
+ridl.jar is built from a combination of Java source files and class files
+generated from IDL files during a complete build of Apache OpenOffice.
+The IDL documentation can be found here:
+http://www.openoffice.org/api/docs/common/ref/com/sun/star/module-ix.html
+Available Java sources and generated Javadocs are included in their respective
jars.
diff --git a/main/ridljar/java/ridl/build.xml b/main/ridljar/java/ridl/build.xml
index 9da3c17..7bf1dbf 100644
--- a/main/ridljar/java/ridl/build.xml
+++ b/main/ridljar/java/ridl/build.xml
@@ -28,6 +28,13 @@
<target name="init-project">
+ <!-- for creating maven bundles for distribution -->
+ <property name="artifact.jar.enabled" value="true"/>
+ <property name="javadoc.jar.enabled" value="true"/>
+ <property name="javadoc.title" value="<h1>Java Runtime Interface
Definition Library</h1>"/>
+ <property name="javadoc.window.title" value="Java Runtime Interface
Definition Library"/>
+ <property name="source.jar.enabled" value="true"/>
+
<path id="main.classpath">
<pathelement location="${OUTDIR}/bin/ridl.jar"/>
<pathelement location="${OUTDIR}/bin/unoloader.jar"/>
diff --git a/main/ridljar/java/unoloader/META-INF/LICENSE
b/main/ridljar/java/unoloader/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/main/ridljar/java/unoloader/META-INF/LICENSE
@@ -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/main/ridljar/java/unoloader/META-INF/MANIFEST.MF
b/main/ridljar/java/unoloader/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e69de29
diff --git a/main/ridljar/java/unoloader/META-INF/NOTICE
b/main/ridljar/java/unoloader/META-INF/NOTICE
new file mode 100644
index 0000000..a8e4310
--- /dev/null
+++ b/main/ridljar/java/unoloader/META-INF/NOTICE
@@ -0,0 +1,9 @@
+Apache OpenOffice (http://www.openoffice.org)
+Copyright 2011-2020 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software copyright (c) 2000-2011,
+Oracle and/or its affiliates <http://www.oracle.com/>.
+
diff --git a/main/ridljar/java/unoloader/build.xml
b/main/ridljar/java/unoloader/build.xml
index edb726b..acda241 100644
--- a/main/ridljar/java/unoloader/build.xml
+++ b/main/ridljar/java/unoloader/build.xml
@@ -28,6 +28,15 @@
<target name="init-project">
<property name="jar.manifest"
location="${main.src.dir}/com/sun/star/lib/unoloader/manifest"/>
+
+ <!-- for creating maven bundles for distribution -->
+ <property name="artifact.jar.enabled" value="true"/>
+ <property name="javadoc.jar.enabled" value="true"/>
+ <!-- ignored due to only one package so overview is not included-->
+ <property name="javadoc.title" value="<h1>UNO
Loader</h1>"/>
+ <property name="javadoc.window.title" value="UNO Loader"/>
+ <property name="source.jar.enabled" value="true"/>
+
</target>
</project>
diff --git a/main/solenv/ant/aoo-ant.xml b/main/solenv/ant/aoo-ant.xml
index 4b0fa8f..4c46bc2 100644
--- a/main/solenv/ant/aoo-ant.xml
+++ b/main/solenv/ant/aoo-ant.xml
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- *
- ***********************************************************-->
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you 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.
+*
+***********************************************************-->
<project name="aoo-ant" default="main" xmlns:if="ant:if"
xmlns:unless="ant:unless">
@@ -58,6 +58,12 @@
<property name="main.deprecation" value="false"/>
<property name="test.debug" value="true"/>
<property name="test.deprecation" value="false"/>
+
+ <property name="aoo.ver" value="4.5.0"/>
+ <property name="javadoc.build.dir" location="${build.base.dir}/javadoc"/>
+ <tstamp>
+ <format property="this.year" pattern="yyyy"/>
+ </tstamp>
<import file="${aoo-ant.basedir}/externals.xml"/>
<import file="${aoo-ant.basedir}/idl.xml"/>
@@ -69,6 +75,17 @@
<property name="jar.name" value="${ant.project.name}"/>
<property name="jar.classpath" value=""/>
<property name="jar.manifest" value
="${aoo-ant.basedir}/manifest.empty"/>
+
+ <!-- for creating maven bundles for distribution -->
+ <property name="artifact.jar.enabled" value="false"/>
+ <property name="artifact.jar.name"
value="${ant.project.name}-${aoo.ver}"/>
+ <property name="javadoc.jar.enabled" value="false"/>
+ <property name="javadoc.jar.name"
value="${ant.project.name}-${aoo.ver}-javadoc"/>
+ <property name="javadoc.copyright" value="<i>Copyright ©
${this.year} Apache Software Foundation. All Rights Reserved.</i>"/>
+ <property name="javadoc.title" value="<h1>REPLACE ME IN MODULE
BUILD FILE</h1>"/>
+ <property name="javadoc.window.title" value="REPLACE ME IN MODULE
BUILD FILE"/>
+ <property name="source.jar.enabled" value="false"/>
+ <property name="source.jar.name"
value="${ant.project.name}-${aoo.ver}-source"/>
<local name="has.main.classpath"/>
<condition property="has.main.classpath">
@@ -109,9 +126,9 @@
<target name="res" depends="prepare">
<mkdir dir="${main.build.dir}"/>
<copy todir="${main.build.dir}" failonerror="false" quiet="true">
- <fileset dir="${res.src.dir}">
- <include name="**/*"/>
- </fileset>
+ <fileset dir="${res.src.dir}">
+ <include name="**/*"/>
+ </fileset>
</copy>
</target>
@@ -147,15 +164,21 @@
<condition property="only.junit.absent">
<and>
<isset property="tests.present"/>
- <not><isset property="OOO_JUNIT_JAR"/></not>
+ <not>
+ <isset property="OOO_JUNIT_JAR"/>
+ </not>
</and>
</condition>
<echo message="No junit, skipping tests"
if:set="only.junit.absent"/>
<condition property="test.skip">
<or>
- <not><isset property="tests.present"/></not>
- <not><isset property="OOO_JUNIT_JAR"/></not>
+ <not>
+ <isset property="tests.present"/>
+ </not>
+ <not>
+ <isset property="OOO_JUNIT_JAR"/>
+ </not>
</or>
</condition>
</sequential>
@@ -164,9 +187,9 @@
<target name="test-res" depends="pre-compile">
<mkdir dir="${test.build.dir}" unless:set="test.skip"/>
<copy todir="${test.build.dir}" failonerror="false" quiet="true"
unless:set="test.skip">
- <fileset dir="${test-res.src.dir}">
- <include name="**/*"/>
- </fileset>
+ <fileset dir="${test-res.src.dir}">
+ <include name="**/*"/>
+ </fileset>
</copy>
</target>
@@ -193,7 +216,7 @@
</target>
<!-- fork="true" is sadly necessary on Ubuntu due to multiple versions of
junit confusing Ant,
- see https://github.com/real-logic/simple-binary-encoding/issues/96 -->
+ see https://github.com/real-logic/simple-binary-encoding/issues/96 -->
<target name="test" depends="test-compile" unless="${test.skip}">
<mkdir dir="${test.reports.dir}"/>
<junit printsummary="yes" haltonfailure="yes" showoutput="true"
filtertrace="false" fork="true">
@@ -216,8 +239,8 @@
<attribute name="Solar-Version" value="${RSCREVISION}"/>
</manifest>
<fileset dir="${main.build.dir}"/>
-<!-- Breaks trunk/test/smoketestdoc by packaging different classes with the
same name: -->
-<!-- <fileset dir="${idl.build.classes.dir}"
erroronmissingdir="false"/> -->
+ <!-- Breaks trunk/test/smoketestdoc by packaging different classes
with the same name: -->
+ <!-- <fileset dir="${idl.build.classes.dir}"
erroronmissingdir="false"/> -->
<include name="**/*.class"/>
<include name="**/*.properties"/>
<include name="**/*.css"/>
@@ -234,15 +257,61 @@
<include name="**/*.map"/>
</jar>
</target>
+
+ <target name="copy-artifact-jar" depends="jar"
if="${artifact.jar.enabled}">
+ <copy verbose="true" file="${jar.dir}/${jar.name}.jar"
tofile="${jar.dir}/${jar.name}-${aoo.ver}.jar"/>
+ </target>
+
+ <target name="build-javadoc" depends="init-project"
if="${javadoc.jar.enabled}">
+ <mkdir dir="${javadoc.build.dir}"/>
+ <javadoc packagenames="com.*"
+ sourcepath="${main.src.dir}"
+ defaultexcludes="yes"
+ destdir="${javadoc.build.dir}"
+ author="true"
+ version="true"
+ use="true"
+ windowtitle="${javadoc.window.title}">
+ <doctitle>${javadoc.title}</doctitle>
+ <bottom>${javadoc.copyright}</bottom>
+ </javadoc>
+ </target>
+
+ <target name="jar-javadoc" depends="prepare, build-javadoc"
if="${javadoc.jar.enabled}">
+ <jar destfile="${jar.dir}/${jar.name}-${aoo.ver}-javadoc.jar"
+ duplicate="fail">
+ <fileset dir="${javadoc.build.dir}">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="${basedir}">
+ <include name="META-INF/*"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="jar-source" depends="prepare" if="${source.jar.enabled}">
+ <jar destfile="${jar.dir}/${source.jar.name}.jar"
+ duplicate="fail">
+ <fileset dir="${main.src.dir}">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="${basedir}">
+ <include name="META-INF/*"/>
+ </fileset>
+ </jar>
+ </target>
<extension-point name="pre-clean" depends="prepare"/>
<target name="clean" depends="pre-clean">
<delete dir="${build.base.dir}"/>
<delete file="${jar.dir}/${jar.name}.jar"/>
+ <delete file="${jar.dir}/${artifact.jar.name}.jar"/>
+ <delete file="${jar.dir}/${javadoc.jar.name}.jar"/>
+ <delete file="${jar.dir}/${source.jar.name}.jar"/>
</target>
- <target name="main" depends="test,jar"/>
+ <target name="main"
depends="test,jar,jar-javadoc,copy-artifact-jar,jar-source"/>
</project>
