diff --git a/.gitignore b/.gitignore index 6c2ead5..bda22c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ classes/ +/.metadata/ diff --git a/DEVELOPERS.md b/DEVELOPERS.md new file mode 100644 index 0000000..41a103f --- /dev/null +++ b/DEVELOPERS.md @@ -0,0 +1,107 @@ +# Developers + +## Building + +Follow these steps to build the openEQUELLA BIRT plugins. + +1. Download the BIRT "All-in-One" package from https://download.eclipse.org/birt/downloads/ and unzip it into a permanent directory, i.e. this is "installing" it. Don't get the Framework or Runtime downloads; the reason being is that the version of Eclipse you develop with is likely to be a different version to the BIRT downloads (the latest build of BIRT is from 2018, using Eclipse Neon) and you don't want to rely on your development Eclipse's plugins to fill the voids of the BIRT Framework. Besides, it will also be beneficial to actually be able to design and run reports in the "All-in-One" report designer. + +2. Download and install the "Eclipse IDE for RCP and RAP Developers" from https://www.eclipse.org/downloads/packages/. It probably doesn't matter much which Eclipse package you download. E.g. "Eclipse IDE for Enterprise Java Developers" is probably another good, and more general purpose, choice. Any missing functionality can be added to Elipse via "Help->Install New Software..." menu. + +3. Launch "Eclipse IDE for RCP and RAP Developers" and create a workspace. (Wherever you like. It seems appropriate to create the workspace in the openEQUELLA-reporting-plugin directory. Note that the workspace .metadata directory is already included in the .gitignore file) + +4. In the Project Explorer window, select "Import projects..." -> "General" -> "Existing Projects into Workspace". Browse to the root of openEQUELLA-reporting-plugin repository and select that folder. Make sure all the discovered projects are selected and then click Finish. + +5. At this point, you will be seeing compilation errors (missing imports), so we need to add a "Target Platform". Go to Window->Preferences->Plug-in Development->Target Platform. You will note that it currently says "Running Platform (Active)". This means you are using the current development Eclipse's plugins as dependencies, which doesn't include the BIRT plugins. + +6. From the screen in step 5, click the "Add..." button, choose "Nothing" as the base, and click "Next". Name the Target Platform "BIRT" (or "Mr. T", whatever, it doesn't matter) and click "Add..." on the Locations tab. + +7. From the "Add Content" dialog that comes up, choose "Installation" and browse to the root of the BIRT folder (the folder that includes the eclipse.ini and executable). Click "Finish", but remain in the "New Target Definition" dialog. + +8. If we were to finish creating the Target Platform now, our plugins would mostly build, but would still be missing XStream dependencies. From the "New Target Definition" dialog, click "Add..." again, but this time choose "Software Site". Click "Add..." and an "Add Repository" dialog comes up. Enter "Orbit"\* in the Name field, and paste https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository into the Location field. Once you click "Add", wait for the list of plugins to download and display. + +9. In the "type filter text" box, enter "xstream", and tick the box next to XStream that displays in the tree below. Now click "Finish". + +10. From the "Edit Target Definition" dialog, click "Finish" again. Now click the checkbox against your newly added Target definition. Click "Apply and Close". After a short build time, your compilation errors should disappear. + +11. Right click on the "openEQUELLA Reporting Plugins" project and choose "Export..."->"Plug-in Development"->"Deployable features". Select a destination directory and click Finish. + +12. The contents of the "plugins" sub-directory of the export directory in the previous step are deployable to BIRT. Copy all of these jar files into the "dropins" directory of you BIRT designer installation. + +13. Start the BIRT designer and follow the section at the top of this document titled "Report Designers". + +\* - _Orbit is kind-of the equivalent of a Maven Central for Eclipse plugins, however they have a strict policy on what gets into the repository. Luckily for us they have an XStream plugin (this is actually just a plain XStream jar that has been modified to contain OSGI plugin information). If we needed a dependency that didn't already exist as an OSGI plugin, you'd probably have to manually create one and commit it into the openEQUELLA-reporting-plugin repository. (But there may be a better way)_ + +## Deployment + +### Signing + +#### Generating a new key: + +1. `gpg --gen-key` I used (openEQUELLA / openEQUELLA@apereo.org / mysecretpassphrase) +2. `gpg --list-keys` (Copy the long ID) +3. `gpg --keyserver http://keys.openpgp.org --send-keys [the long ID]` + +#### Using the key I already made: + +1. Probably not necessary... + +For more info, read this: +https://central.sonatype.org/pages/working-with-pgp-signatures.html + +### Maven + +Edit your Maven settings.xml file (You will need an OSSRH account: sign up to https://issues.sonatype.org, and then ask Aaron or Ian to request access for you) + +```xml + + ... + + ... + + ossrh + your-jira-id + your-jira-pwd + + + ... + +``` + +For more info, read this: +https://central.sonatype.org/pages/manual-staging-bundle-creation-and-deployment.html + +#### Plugins + +Note that before deploying each plugin binary, you: + +1. Copy the generated com.tle.reporting.\* plugins into the corresponding directory in [repo root]/deployment/plugins and rename to bin.jar +2. Update the version number in the pom.xml file in each of these directories. +3. Create a sources.jar (just zipped up raw source of the plugin) +4. Run the `deploy.bat` (or `deploy.sh`) script in the [repo root]/deployment/plugins directory (Make sure you have Maven installed and have the mvn binary on your PATH.) + On Windows, this will spawn 3 new command windows, so pay attention to whether they all succeed or not. + I haven't tested \*nix script, so help here would be appreciated. + +#### Birt Framework + +This will need to be done if you want to upgrade the version of the BIRT binaries used by the openEQUELLA server. + +1. Zip up the contents on the plugins directory of the latest BIRT framework. Rename the zip file to birt.zip and copy into [repo root]/deployment/birt-framework +2. Update the pom.xml in [repo root]/deployment/birt-framework +3. Run the `deploy.bat` (or `deploy.sh`) in that directory. Note that this might take a little while due to the size of the zip. + +### Releasing + +#### Plugins + +1. Login to https://oss.sonatype.org/ (you should already have an account you entered into your Maven settings.xml file) +2. Click on Staging Repositories on the left. +3. Click on a staging repository (Check the Contents tab on the lower panel to see if it has everything you just deployed). +4. Click on Close, and then wait a while before clicking refresh. If the gods are in your favour, and the moon is in right phase, then it will close for you. Otherwise you need to address the errors listed in the Activity tab. +5. Click on Release +6. WINNING + +## Including in openEQUELLA + +1. Update the version numbers in `build.sbt` file at [openEQUELLA rep]/Source/Plugins/Birt/org.eclipse.birt.osgi +2. Build openEQUELLA as you normally would, noting that there will be some delay between releasing your binaries on OSS and it becoming available on Maven Central. You may need to wait up to a few hours before the build process can find your binaries. diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..8dada3e --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + 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/README.md b/README.md index 25d2889..156c412 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,9 @@ # openEQUELLA Reporting Plugin -Details for this project can be found in the openEQUELLA [docs repo](https://equella.github.io/), specifically, the [reporting tutorials](https://github.com/equella/equella.github.io/tree/master/tutorials/reporting). + +## Report Designers + +For help with designing BIRT reports using these plugins, visit the [reporting tutorials](https://openequella.github.io/tutorials/reporting/index.html). + +## Developers + +See the documentation at [DEVELOPERS.md](DEVELOPERS.md) diff --git a/com.tle.reporting.common/.classpath b/com.tle.reporting.common/.classpath index 0183c91..911da3e 100644 --- a/com.tle.reporting.common/.classpath +++ b/com.tle.reporting.common/.classpath @@ -2,6 +2,6 @@ - + diff --git a/com.tle.reporting.common/.settings/org.eclipse.jdt.core.prefs b/com.tle.reporting.common/.settings/org.eclipse.jdt.core.prefs index 2ca63e6..b21f890 100644 --- a/com.tle.reporting.common/.settings/org.eclipse.jdt.core.prefs +++ b/com.tle.reporting.common/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,14 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -8,6 +17,8 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning @@ -40,6 +51,7 @@ org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -68,3 +80,5 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/com.tle.reporting.common/META-INF/MANIFEST.MF b/com.tle.reporting.common/META-INF/MANIFEST.MF index 299188e..b112e32 100644 --- a/com.tle.reporting.common/META-INF/MANIFEST.MF +++ b/com.tle.reporting.common/META-INF/MANIFEST.MF @@ -1,10 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: TLE Reporting Common +Bundle-Name: openEQUELLA Reporting Common Bundle-SymbolicName: com.tle.reporting.common -Bundle-Version: 6.3.0.20141006 -Export-Package: com.tle.reporting, +Bundle-Version: 2020.2.0.2020052901 +Export-Package: com.tle.reporting;uses:="org.eclipse.datatools.connectivity.oda", com.tle.reporting.schema -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ClassPath: . Require-Bundle: org.eclipse.datatools.connectivity.oda +Bundle-Vendor: Apereo diff --git a/com.tle.reporting.oda.connectors/.classpath b/com.tle.reporting.oda.connectors/.classpath index 95766e0..110125b 100644 --- a/com.tle.reporting.oda.connectors/.classpath +++ b/com.tle.reporting.oda.connectors/.classpath @@ -1,7 +1,7 @@ - + diff --git a/com.tle.reporting.oda.connectors/.settings/org.eclipse.jdt.core.prefs b/com.tle.reporting.oda.connectors/.settings/org.eclipse.jdt.core.prefs index 3fd7f50..ec1937b 100644 --- a/com.tle.reporting.oda.connectors/.settings/org.eclipse.jdt.core.prefs +++ b/com.tle.reporting.oda.connectors/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,12 @@ -#Wed Dec 21 16:01:56 EST 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/com.tle.reporting.oda.connectors/META-INF/MANIFEST.MF b/com.tle.reporting.oda.connectors/META-INF/MANIFEST.MF index 28c937b..4a87d1b 100644 --- a/com.tle.reporting.oda.connectors/META-INF/MANIFEST.MF +++ b/com.tle.reporting.oda.connectors/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: TLE Connectors ODA Plug-in +Bundle-Name: openEQUELLA Connectors ODA Plug-in Bundle-SymbolicName: com.tle.reporting.oda.connectors;singleton:=true -Bundle-Version: 6.3.0.20141006 +Bundle-Version: 2020.2.0.2020052901 Require-Bundle: org.eclipse.ui;resolution:=optional, org.eclipse.datatools.connectivity.oda.design.ui;resolution:=optional, org.eclipse.birt.report.engine;bundle-version="2.3.1", @@ -11,8 +11,9 @@ Require-Bundle: org.eclipse.ui;resolution:=optional, Bundle-ClassPath: . Bundle-ActivationPolicy: lazy Bundle-Activator: com.tle.reporting.oda.connectors.ui.TLEConnectorsOdaPlugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: com.tle.reporting.oda.connectors, com.tle.reporting.oda.connectors.i18n, com.tle.reporting.oda.connectors.ui, org.eclipse.birt.report.data.oda.jdbc.ui.nls +Bundle-Vendor: Apereo diff --git a/com.tle.reporting.oda/.classpath b/com.tle.reporting.oda/.classpath index 95766e0..110125b 100644 --- a/com.tle.reporting.oda/.classpath +++ b/com.tle.reporting.oda/.classpath @@ -1,7 +1,7 @@ - + diff --git a/com.tle.reporting.oda/.settings/org.eclipse.jdt.core.prefs b/com.tle.reporting.oda/.settings/org.eclipse.jdt.core.prefs index dde930c..ec1937b 100644 --- a/com.tle.reporting.oda/.settings/org.eclipse.jdt.core.prefs +++ b/com.tle.reporting.oda/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,12 @@ -#Wed Dec 21 16:01:47 EST 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/com.tle.reporting.oda/META-INF/MANIFEST.MF b/com.tle.reporting.oda/META-INF/MANIFEST.MF index 67f563c..9311fe2 100644 --- a/com.tle.reporting.oda/META-INF/MANIFEST.MF +++ b/com.tle.reporting.oda/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: TLE ODA Plug-in +Bundle-Name: openEQUELLA ODA Plug-in Bundle-SymbolicName: com.tle.reporting.oda;singleton:=true -Bundle-Version: 6.3.0.20141006 +Bundle-Version: 2020.2.0.2020052901 Require-Bundle: org.eclipse.ui;resolution:=optional, org.eclipse.datatools.connectivity.oda.design.ui;resolution:=optional, org.eclipse.jface.text;resolution:=optional, @@ -13,17 +13,48 @@ Require-Bundle: org.eclipse.ui;resolution:=optional, Bundle-ClassPath: . Bundle-ActivationPolicy: lazy Bundle-Activator: com.tle.reporting.oda.ui.TLEOdaPlugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: com.tle.reporting.oda, +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Export-Package: com.tle.reporting.oda; + uses:="com.tle.reporting, + org.apache.commons.httpclient, + org.apache.commons.httpclient.methods, + com.ibm.icu.util, + org.eclipse.datatools.connectivity.oda, + com.thoughtworks.xstream, + javax.net, + javax.net.ssl, + org.eclipse.datatools.connectivity.oda.spec", com.tle.reporting.oda.i18n, - com.tle.reporting.oda.ui, + com.tle.reporting.oda.ui; + uses:="org.osgi.framework, + org.eclipse.datatools.connectivity.oda.design, + org.eclipse.datatools.connectivity.oda.design.ui.wizards, + org.eclipse.core.runtime, + org.eclipse.jface.resource, + com.tle.reporting.oda.ui.jdbc.ui.editors, + org.eclipse.swt.widgets, + org.eclipse.jface.viewers", com.tle.reporting.oda.ui.icons, - com.tle.reporting.oda.ui.jdbc.ui.editors, - com.tle.reporting.oda.ui.jdbc.ui.model, - com.tle.reporting.oda.ui.jdbc.ui.preference, - com.tle.reporting.oda.ui.jdbc.ui.provider, - com.tle.reporting.oda.ui.jdbc.ui.util, - com.tle.reporting.oda.webservice, + com.tle.reporting.oda.ui.jdbc.ui.editors; + uses:="org.eclipse.jface.text.contentassist, + org.eclipse.datatools.connectivity.oda.design, + org.eclipse.datatools.connectivity.oda.design.ui.wizards, + org.eclipse.jface.action, + org.eclipse.jface.text.source, + org.eclipse.jface.text.presentation, + org.eclipse.jface.text, + org.eclipse.swt.widgets, + org.eclipse.datatools.connectivity.oda, + org.eclipse.jface.text.rules", + com.tle.reporting.oda.ui.jdbc.ui.model;uses:="org.eclipse.swt.graphics,org.eclipse.swt.widgets", + com.tle.reporting.oda.ui.jdbc.ui.preference;uses:="org.eclipse.ui,org.eclipse.swt.widgets,org.eclipse.jface.preference", + com.tle.reporting.oda.ui.jdbc.ui.provider;uses:="org.eclipse.datatools.connectivity.oda.design", + com.tle.reporting.oda.ui.jdbc.ui.util;uses:="org.eclipse.swt.graphics,org.eclipse.swt.widgets,org.eclipse.jface.dialogs", + com.tle.reporting.oda.webservice; + uses:="org.eclipse.datatools.connectivity.oda.design.ui.wizards, + org.eclipse.jface.preference, + org.eclipse.swt.widgets, + org.eclipse.jface.wizard", org.eclipse.birt.report.data.oda.jdbc.ui.nls Import-Package: com.thoughtworks.xstream, org.apache.commons.codec.binary;version="1.3.0", @@ -31,3 +62,4 @@ Import-Package: com.thoughtworks.xstream, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, org.apache.commons.httpclient.protocol +Bundle-Vendor: Apereo diff --git a/deployment/.gitignore b/deployment/.gitignore new file mode 100644 index 0000000..5b65eaf --- /dev/null +++ b/deployment/.gitignore @@ -0,0 +1,2 @@ +*.asc +birt.zip \ No newline at end of file diff --git a/deployment/birt-framework/bin.jar b/deployment/birt-framework/bin.jar new file mode 100644 index 0000000..efdb945 Binary files /dev/null and b/deployment/birt-framework/bin.jar differ diff --git a/deployment/birt-framework/deploy.bat b/deployment/birt-framework/deploy.bat new file mode 100644 index 0000000..3f6c266 --- /dev/null +++ b/deployment/birt-framework/deploy.bat @@ -0,0 +1 @@ +mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=ossrh -DpomFile=pom.xml -Dfile=bin.jar -Dpackaging=jar -Dfiles=birt.zip,sources.jar,../javadoc.jar -Dclassifiers=zip,sources,javadoc -Dtypes=zip,jar,jar \ No newline at end of file diff --git a/deployment/birt-framework/deploy.sh b/deployment/birt-framework/deploy.sh new file mode 100644 index 0000000..210c69d --- /dev/null +++ b/deployment/birt-framework/deploy.sh @@ -0,0 +1,2 @@ +#!/bin/sh +mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=ossrh -DpomFile=pom.xml -Dfile=bin.jar -Dpackaging=jar -Dfiles=birt.zip,sources.jar,../javadoc.jar -Dclassifiers=zip,sources,javadoc -Dtypes=zip,jar,jar \ No newline at end of file diff --git a/deployment/birt-framework/pom.xml b/deployment/birt-framework/pom.xml new file mode 100644 index 0000000..7f0b4f1 --- /dev/null +++ b/deployment/birt-framework/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + com.github.openequella + birt-framework + jar + BIRT Framework Binaries + https://github.com/openequella/openEQUELLA-reporting-plugin + 4.6.0.20160607212201 + + + EPL + http://www.eclipse.org/legal/epl/notice.php + repo + + + birt-framework + + openEQUELLA + https://github.com/openequella/ + + + https://download.eclipse.org/birt/downloads/#runtime + https://download.eclipse.org/birt/downloads/#runtime + + + + abidingotter + Aaron Holland + + + \ No newline at end of file diff --git a/deployment/birt-framework/sources.jar b/deployment/birt-framework/sources.jar new file mode 100644 index 0000000..efdb945 Binary files /dev/null and b/deployment/birt-framework/sources.jar differ diff --git a/deployment/javadoc.jar b/deployment/javadoc.jar new file mode 100644 index 0000000..efdb945 Binary files /dev/null and b/deployment/javadoc.jar differ diff --git a/deployment/plugins/.gitignore b/deployment/plugins/.gitignore new file mode 100644 index 0000000..c233f67 --- /dev/null +++ b/deployment/plugins/.gitignore @@ -0,0 +1,2 @@ +bin.jar +sources.jar \ No newline at end of file diff --git a/deployment/plugins/com.tle.reporting.common/README.md b/deployment/plugins/com.tle.reporting.common/README.md new file mode 100644 index 0000000..c0c79ee --- /dev/null +++ b/deployment/plugins/com.tle.reporting.common/README.md @@ -0,0 +1,7 @@ +# Instructions + +1. Copy the com.tle.reporting.common plugin jar into this directory and rename to bin.jar +2. Zip the source of the com.tle.reporting.common plugin and rename to sources.jar +3. Update the verion in the pom.xml file. +4. Do steps 1-3 for the other plugins. +5. Run deploy.bat (or deploy.sh) from the parent directory of this plugin. diff --git a/deployment/plugins/com.tle.reporting.common/pom.xml b/deployment/plugins/com.tle.reporting.common/pom.xml new file mode 100644 index 0000000..ac7fa75 --- /dev/null +++ b/deployment/plugins/com.tle.reporting.common/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + com.github.openequella + reporting-common + jar + openEQUELLA common BIRT plugin + https://github.com/openequella/openEQUELLA-reporting-plugin + 2020.2.0.2020052905 + + + Apache2 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + reporting-common + + openEQUELLA + https://github.com/openequella/ + + + https://github.com/openequella/openEQUELLA-reporting-plugin + scm:git@github.com:openequella/openEQUELLA-reporting-plugin.git + + + + abidingotter + Aaron Holland + + + + + github + GitHub Packages + https://maven.pkg.github.com/openequella/openEQUELLA-reporting-plugin + + + \ No newline at end of file diff --git a/deployment/plugins/com.tle.reporting.oda.connectors/README.md b/deployment/plugins/com.tle.reporting.oda.connectors/README.md new file mode 100644 index 0000000..a92e0d6 --- /dev/null +++ b/deployment/plugins/com.tle.reporting.oda.connectors/README.md @@ -0,0 +1,7 @@ +# Instructions + +1. Copy the com.tle.reporting.oda.connectors plugin jar into this directory and rename to bin.jar +2. Zip the source of the com.tle.reporting.oda.connectors plugin and rename to sources.jar +3. Update the verion in the pom.xml file. +4. Do steps 1-3 for the other plugins. +5. Run deploy.bat (or deploy.sh) from the parent directory of this plugin. diff --git a/deployment/plugins/com.tle.reporting.oda.connectors/pom.xml b/deployment/plugins/com.tle.reporting.oda.connectors/pom.xml new file mode 100644 index 0000000..9521080 --- /dev/null +++ b/deployment/plugins/com.tle.reporting.oda.connectors/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + com.github.openequella + reporting-oda-connectors + jar + openEQUELLA ODA Connectors BIRT plugin + https://github.com/openequella/openEQUELLA-reporting-plugin + 2020.2.0.2020052905 + + + Apache2 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + reporting-oda-connectors + + openEQUELLA + https://github.com/openequella/ + + + https://github.com/openequella/openEQUELLA-reporting-plugin + scm:git@github.com:openequella/openEQUELLA-reporting-plugin.git + + + + abidingotter + Aaron Holland + + + + + github + GitHub Packages + https://maven.pkg.github.com/openequella/openEQUELLA-reporting-plugin + + + \ No newline at end of file diff --git a/deployment/plugins/com.tle.reporting.oda/README.md b/deployment/plugins/com.tle.reporting.oda/README.md new file mode 100644 index 0000000..3bb1605 --- /dev/null +++ b/deployment/plugins/com.tle.reporting.oda/README.md @@ -0,0 +1,7 @@ +# Instructions + +1. Copy the com.tle.reporting.oda plugin jar into this directory and rename to bin.jar +2. Zip the source of the com.tle.reporting.oda plugin and rename to sources.jar +3. Update the verion in the pom.xml file. +4. Do steps 1-3 for the other plugins. +5. Run deploy.bat (or deploy.sh) from the parent directory of this plugin. diff --git a/deployment/plugins/com.tle.reporting.oda/pom.xml b/deployment/plugins/com.tle.reporting.oda/pom.xml new file mode 100644 index 0000000..8bbafed --- /dev/null +++ b/deployment/plugins/com.tle.reporting.oda/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + com.github.openequella + reporting-oda + jar + openEQUELLA ODA BIRT plugin + https://github.com/openequella/openEQUELLA-reporting-plugin + 2020.2.0.2020052905 + + + Apache2 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + reporting-oda + + openEQUELLA + https://github.com/openequella/ + + + https://github.com/openequella/openEQUELLA-reporting-plugin + scm:git@github.com:openequella/openEQUELLA-reporting-plugin.git + + + + abidingotter + Aaron Holland + + + + + + ossrh + Sonatype OSS + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + + \ No newline at end of file diff --git a/deployment/plugins/deploy.bat b/deployment/plugins/deploy.bat new file mode 100644 index 0000000..2d04461 --- /dev/null +++ b/deployment/plugins/deploy.bat @@ -0,0 +1,7 @@ +cd com.tle.reporting.common +start cmd.exe @cmd /k "mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=ossrh -DpomFile=pom.xml -Dfile=bin.jar -Dpackaging=jar -Dfiles=sources.jar,../../javadoc.jar -Dclassifiers=sources,javadoc -Dtypes=jar,jar" +cd ../com.tle.reporting.oda +start cmd.exe @cmd /k "mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=ossrh -DpomFile=pom.xml -Dfile=bin.jar -Dpackaging=jar -Dfiles=sources.jar,../../javadoc.jar -Dclassifiers=sources,javadoc -Dtypes=jar,jar" +cd ../com.tle.reporting.oda.connectors +start cmd.exe @cmd /k "mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=ossrh -DpomFile=pom.xml -Dfile=bin.jar -Dpackaging=jar -Dfiles=sources.jar,../../javadoc.jar -Dclassifiers=sources,javadoc -Dtypes=jar,jar" +cd .. \ No newline at end of file diff --git a/deployment/plugins/deploy.sh b/deployment/plugins/deploy.sh new file mode 100644 index 0000000..0c1f7f9 --- /dev/null +++ b/deployment/plugins/deploy.sh @@ -0,0 +1,2 @@ +#!/bin/sh +mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=ossrh -DpomFile=pom.xml -Dfile=bin.jar -Dpackaging=jar -Dfiles=sources.jar,../javadoc.jar -Dclassifiers=sources,javadoc -Dtypes=jar,jar \ No newline at end of file diff --git a/openEQUELLA Reporting Plugins/.project b/openEQUELLA Reporting Plugins/.project new file mode 100644 index 0000000..28eec24 --- /dev/null +++ b/openEQUELLA Reporting Plugins/.project @@ -0,0 +1,17 @@ + + + openEQUELLA Reporting Plugins + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/openEQUELLA Reporting Plugins/build.properties b/openEQUELLA Reporting Plugins/build.properties new file mode 100644 index 0000000..64f93a9 --- /dev/null +++ b/openEQUELLA Reporting Plugins/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/openEQUELLA Reporting Plugins/feature.xml b/openEQUELLA Reporting Plugins/feature.xml new file mode 100644 index 0000000..4494400 --- /dev/null +++ b/openEQUELLA Reporting Plugins/feature.xml @@ -0,0 +1,62 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + + + + + +