From 9dad741609777467f58a508e07139be9a086919b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 13 Jan 2022 14:52:21 +0100 Subject: [PATCH] Rename OSGi bundles --- dep/org.argeo.suite.dep.ui.rap/pom.xml | 84 +++++++++---------- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../META-INF/.gitignore | 0 .../bnd.bnd | 0 .../build.properties | 0 .../pom.xml | 4 +- .../src/org/argeo/entity/EntityConstants.java | 0 .../org/argeo/entity/EntityDefinition.java | 0 .../src/org/argeo/entity/EntityMimeType.java | 0 .../src/org/argeo/entity/EntityNames.java | 0 .../src/org/argeo/entity/EntityType.java | 0 .../src/org/argeo/entity/EntityTypes.java | 0 .../src/org/argeo/entity/JcrName.java | 0 .../src/org/argeo/entity/Term.java | 0 .../src/org/argeo/entity/TermsManager.java | 0 .../src/org/argeo/entity/Typology.java | 0 .../src/org/argeo/entity/entity.cnd | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../META-INF/.gitignore | 0 .../OSGI-INF/maintenanceService.xml | 0 .../OSGI-INF/termsManager.xml | 0 .../bnd.bnd | 1 + .../build.properties | 0 .../pom.xml | 4 +- .../src/org/argeo/docbook/Dbk4Converter.java | 0 .../src/org/argeo/docbook/DbkAttr.java | 0 .../src/org/argeo/docbook/DbkMsg.java | 0 .../src/org/argeo/docbook/DbkType.java | 0 .../src/org/argeo/docbook/DbkUtils.java | 0 .../src/org/argeo/docbook/db4-upgrade.xsl | 0 .../src/org/argeo/docbook/docbook-full.cnd | 0 .../src/org/argeo/docbook/docbook.cnd | 0 .../entity/core/JcrEntityDefinition.java | 0 .../src/org/argeo/geo/GeoJsonUtils.java | 0 .../src/org/argeo/geo/GeoToSvg.java | 0 .../src/org/argeo/suite/RankedObject.java | 0 .../src/org/argeo/suite/RankingKey.java | 0 .../src/org/argeo/suite/SuiteRole.java | 0 .../src/org/argeo/suite/SuiteUtils.java | 0 .../suite/core/CustomMaintenanceService.java | 0 .../suite/core/SuiteMaintenanceService.java | 0 .../src/org/argeo/suite/core/SuiteTerm.java | 0 .../argeo/suite/core/SuiteTermsManager.java | 0 .../org/argeo/suite/core/SuiteTypology.java | 0 .../argeo/suite/library/DocxExtractor.java | 0 .../src/org/argeo/suite/util/XPathUtils.java | 0 .../argeo/support/geonames/GeonamesAdm.java | 0 .../support/geonames/ImportGeonamesAdmin.java | 0 .../support/odk/BundleResourceOdkForm.java | 0 .../src/org/argeo/support/odk/OdkForm.java | 0 .../src/org/argeo/support/odk/OdkNames.java | 0 .../src/org/argeo/support/odk/OdkUtils.java | 0 .../org/argeo/support/odk/OrxListName.java | 0 .../argeo/support/odk/OrxManifestName.java | 0 .../src/org/argeo/support/odk/OrxType.java | 0 .../src/org/argeo/support/odk/odk.cnd | 0 .../xforms/FormSubmissionListener.java | 0 .../src/org/argeo/support/xforms/xforms.cnd | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../META-INF/.gitignore | 0 .../OSGI-INF/odkFormListServlet.xml | 0 .../OSGI-INF/odkFormServlet.xml | 0 .../OSGI-INF/odkManifestServlet.xml | 0 .../OSGI-INF/odkServletContext.xml | 0 .../OSGI-INF/odkSubmissionServlet.xml | 0 .../bnd.bnd | 0 .../build.properties | 0 .../pom.xml | 13 +-- .../odk/servlet/OdkFormListServlet.java | 0 .../support/odk/servlet/OdkFormServlet.java | 0 .../odk/servlet/OdkManifestServlet.java | 0 .../odk/servlet/OdkServletContext.java | 0 .../odk/servlet/OdkSubmissionServlet.java | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../META-INF/.gitignore | 0 .../OSGI-INF/dbk4Converter.xml | 0 .../OSGI-INF/dbkServlet.xml | 0 .../OSGI-INF/documentUiProvider.xml | 0 .../OSGI-INF/fontsServlet.xml | 0 .../OSGI-INF/htmlServletContext.xml | 0 .../OSGI-INF/l10n/bundle.properties | 0 .../OSGI-INF/wwwLayer.xml | 0 .../bnd.bnd | 1 + .../build.properties | 0 .../config/documentUiProvider.properties | 0 .../config/wwwLayer.properties | 0 org.argeo.app.servlet.publish/pom.xml | 29 +++++++ .../argeo/publishing/servlet/DbkServlet.java | 0 .../publishing/servlet/FontsServlet.java | 0 .../.gitignore | 0 .../.project | 2 +- .../META-INF/.gitignore | 0 .../OSGI-INF/cmsTheme.xml | 0 .../bnd.bnd | 0 .../build.properties | 0 .../pom.xml | 2 +- .../rap/work.css | 0 .../swt/app.css | 0 .../.gitignore | 0 .../.project | 2 +- .../META-INF/.gitignore | 0 .../OSGI-INF/cmsWebApp.xml | 0 .../bnd.bnd | 0 .../build.properties | 0 .../pom.xml | 4 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../META-INF/.gitignore | 0 .../OSGI-INF/adminLeadPane.xml | 0 .../OSGI-INF/cmsApp.xml | 0 .../OSGI-INF/dashboard.xml | 0 .../OSGI-INF/dashboardLayer.xml | 0 .../OSGI-INF/eventRecorder.xml | 0 .../OSGI-INF/footer.xml | 0 .../OSGI-INF/header.xml | 0 .../OSGI-INF/l10n/bundle.properties | 0 .../OSGI-INF/l10n/bundle_de.properties | 0 .../OSGI-INF/l10n/bundle_fr.properties | 0 .../OSGI-INF/leadPane.xml | 0 .../OSGI-INF/loginScreen.xml | 0 .../OSGI-INF/recentItems.xml | 0 .../OSGI-INF/termsEntryArea.xml | 0 .../OSGI-INF/termsLayer.xml | 0 .../bnd.bnd | 1 + .../build.properties | 0 .../config/adminLeadPane.properties | 0 .../config/cmsApp.properties | 0 .../config/dashboard.properties | 0 .../config/dashboardLayer.properties | 0 .../config/eventRecorder.properties | 0 .../config/footer.properties | 0 .../config/header.properties | 0 .../config/leadPane.properties | 0 .../config/loginScreen.properties | 0 .../config/recentItems.properties | 0 .../config/termsEntryArea.properties | 0 .../config/termsLayer.properties | 0 .../pom.xml | 14 ++-- .../argeo/docbook/ui/AbstractDbkViewer.java | 0 .../org/argeo/docbook/ui/CustomDbkEditor.java | 0 .../org/argeo/docbook/ui/DbkContextMenu.java | 0 .../org/argeo/docbook/ui/DbkImageManager.java | 0 .../src/org/argeo/docbook/ui/DbkImg.java | 0 .../org/argeo/docbook/ui/DbkSectionTitle.java | 0 .../argeo/docbook/ui/DbkTextInterpreter.java | 0 .../src/org/argeo/docbook/ui/DbkVideo.java | 0 .../org/argeo/docbook/ui/DocumentPage.java | 0 .../argeo/docbook/ui/DocumentTextEditor.java | 0 .../src/org/argeo/docbook/ui/Paragraph.java | 0 .../argeo/docbook/ui/TextEditorHeader.java | 0 .../org/argeo/docbook/ui/TextInterpreter.java | 0 .../src/org/argeo/docbook/ui/TextSection.java | 0 .../entity/ui/forms/AbstractTermsPart.java | 0 .../argeo/entity/ui/forms/MultiTermsPart.java | 0 .../argeo/entity/ui/forms/SingleTermPart.java | 0 .../argeo/library/ui/ContentEntryArea.java | 0 .../library/ui/DocumentsContextMenu.java | 0 .../library/ui/DocumentsFileComposite.java | 0 .../library/ui/DocumentsFolderComposite.java | 0 .../library/ui/DocumentsFolderUiProvider.java | 0 .../library/ui/DocumentsTreeUiProvider.java | 0 .../argeo/library/ui/DocumentsUiService.java | 0 .../org/argeo/people/ui/PeopleEntryArea.java | 0 .../org/argeo/people/ui/PersonUiProvider.java | 0 .../argeo/people/ui/SuiteUserUiProvider.java | 0 .../argeo/people/ui/SuiteUsersEntryArea.java | 0 .../publishing/ui/DocumentUiProvider.java | 0 .../argeo/publishing/ui/PublishingApp.java | 0 .../argeo/publishing/ui/PublishingStyle.java | 0 .../org/argeo/suite/ui/DefaultDashboard.java | 0 .../argeo/suite/ui/DefaultEditionLayer.java | 0 .../src/org/argeo/suite/ui/DefaultFooter.java | 0 .../src/org/argeo/suite/ui/DefaultHeader.java | 0 .../org/argeo/suite/ui/DefaultLeadPane.java | 0 .../argeo/suite/ui/DefaultLoginScreen.java | 0 .../src/org/argeo/suite/ui/EventRecorder.java | 0 .../src/org/argeo/suite/ui/RecentItems.java | 0 .../src/org/argeo/suite/ui/SuiteApp.java | 0 .../src/org/argeo/suite/ui/SuiteEvent.java | 0 .../src/org/argeo/suite/ui/SuiteIcon.java | 0 .../src/org/argeo/suite/ui/SuiteLayer.java | 0 .../src/org/argeo/suite/ui/SuiteMsg.java | 0 .../src/org/argeo/suite/ui/SuiteStyle.java | 0 .../src/org/argeo/suite/ui/SuiteUi.java | 0 .../src/org/argeo/suite/ui/SuiteUiUtils.java | 0 .../org/argeo/suite/ui/TermsEntryArea.java | 0 .../argeo/suite/ui/dialogs/NewPersonPage.java | 0 .../suite/ui/dialogs/NewPersonWizard.java | 0 .../argeo/suite/ui/dialogs/NewUserWizard.java | 0 .../widgets/AbstractConnectContextMenu.java | 0 .../ui/widgets/ConnectAbstractDropDown.java | 0 .../argeo/suite/ui/widgets/DelayedText.java | 0 .../argeo/suite/ui/widgets/TabbedArea.java | 0 .../suite/ui/widgets/TreeOrSearchArea.java | 0 .../org/argeo/support/openlayers/OLMap.java | 0 .../support/openlayers/OpenLayersMap.java | 0 .../argeo/support/openlayers/OverviewMap.java | 0 .../org/argeo/support/openlayers/map-osm.html | 0 .../src/org/argeo/support/openlayers/map.js | 0 org.argeo.entity.core/pom.xml | 2 +- org.argeo.publishing.ui/pom.xml | 38 --------- pom.xml | 28 +++---- 211 files changed, 114 insertions(+), 125 deletions(-) rename {org.argeo.entity.api => org.argeo.app.api}/.classpath (100%) rename {org.argeo.entity.api => org.argeo.app.api}/.gitignore (100%) rename {org.argeo.entity.api => org.argeo.app.api}/.project (94%) rename {org.argeo.entity.api => org.argeo.app.api}/META-INF/.gitignore (100%) rename {org.argeo.entity.api => org.argeo.app.api}/bnd.bnd (100%) rename {org.argeo.entity.api => org.argeo.app.api}/build.properties (100%) rename {org.argeo.entity.api => org.argeo.app.api}/pom.xml (90%) rename {org.argeo.entity.api => org.argeo.app.api}/src/org/argeo/entity/EntityConstants.java (100%) rename {org.argeo.entity.api => org.argeo.app.api}/src/org/argeo/entity/EntityDefinition.java (100%) rename {org.argeo.entity.api => org.argeo.app.api}/src/org/argeo/entity/EntityMimeType.java (100%) rename {org.argeo.entity.api => org.argeo.app.api}/src/org/argeo/entity/EntityNames.java (100%) rename {org.argeo.entity.api => org.argeo.app.api}/src/org/argeo/entity/EntityType.java (100%) rename {org.argeo.entity.api => org.argeo.app.api}/src/org/argeo/entity/EntityTypes.java (100%) rename {org.argeo.entity.api => org.argeo.app.api}/src/org/argeo/entity/JcrName.java (100%) rename {org.argeo.entity.api => org.argeo.app.api}/src/org/argeo/entity/Term.java (100%) rename {org.argeo.entity.api => org.argeo.app.api}/src/org/argeo/entity/TermsManager.java (100%) rename {org.argeo.entity.api => org.argeo.app.api}/src/org/argeo/entity/Typology.java (100%) rename {org.argeo.entity.api => org.argeo.app.api}/src/org/argeo/entity/entity.cnd (100%) rename {org.argeo.publishing.ui => org.argeo.app.core}/.classpath (100%) rename {org.argeo.publishing.ui => org.argeo.app.core}/.gitignore (100%) rename {org.argeo.suite.ui => org.argeo.app.core}/.project (95%) rename {org.argeo.publishing.ui => org.argeo.app.core}/META-INF/.gitignore (100%) rename {org.argeo.suite.core => org.argeo.app.core}/OSGI-INF/maintenanceService.xml (100%) rename {org.argeo.suite.core => org.argeo.app.core}/OSGI-INF/termsManager.xml (100%) rename {org.argeo.suite.core => org.argeo.app.core}/bnd.bnd (88%) rename {org.argeo.suite.core => org.argeo.app.core}/build.properties (100%) rename {org.argeo.suite.core => org.argeo.app.core}/pom.xml (91%) rename {org.argeo.publishing.ui => org.argeo.app.core}/src/org/argeo/docbook/Dbk4Converter.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.core}/src/org/argeo/docbook/DbkAttr.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.core}/src/org/argeo/docbook/DbkMsg.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.core}/src/org/argeo/docbook/DbkType.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.core}/src/org/argeo/docbook/DbkUtils.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.core}/src/org/argeo/docbook/db4-upgrade.xsl (100%) rename {org.argeo.publishing.ui => org.argeo.app.core}/src/org/argeo/docbook/docbook-full.cnd (100%) rename {org.argeo.publishing.ui => org.argeo.app.core}/src/org/argeo/docbook/docbook.cnd (100%) rename {org.argeo.entity.core => org.argeo.app.core}/src/org/argeo/entity/core/JcrEntityDefinition.java (100%) rename {org.argeo.geo.ui => org.argeo.app.core}/src/org/argeo/geo/GeoJsonUtils.java (100%) rename {org.argeo.geo.ui => org.argeo.app.core}/src/org/argeo/geo/GeoToSvg.java (100%) rename {org.argeo.suite.core => org.argeo.app.core}/src/org/argeo/suite/RankedObject.java (100%) rename {org.argeo.suite.core => org.argeo.app.core}/src/org/argeo/suite/RankingKey.java (100%) rename {org.argeo.suite.core => org.argeo.app.core}/src/org/argeo/suite/SuiteRole.java (100%) rename {org.argeo.suite.core => org.argeo.app.core}/src/org/argeo/suite/SuiteUtils.java (100%) rename {org.argeo.suite.core => org.argeo.app.core}/src/org/argeo/suite/core/CustomMaintenanceService.java (100%) rename {org.argeo.suite.core => org.argeo.app.core}/src/org/argeo/suite/core/SuiteMaintenanceService.java (100%) rename {org.argeo.suite.core => org.argeo.app.core}/src/org/argeo/suite/core/SuiteTerm.java (100%) rename {org.argeo.suite.core => org.argeo.app.core}/src/org/argeo/suite/core/SuiteTermsManager.java (100%) rename {org.argeo.suite.core => org.argeo.app.core}/src/org/argeo/suite/core/SuiteTypology.java (100%) rename {org.argeo.suite.core => org.argeo.app.core}/src/org/argeo/suite/library/DocxExtractor.java (100%) rename {org.argeo.suite.core => org.argeo.app.core}/src/org/argeo/suite/util/XPathUtils.java (100%) rename {org.argeo.support.geonames => org.argeo.app.core}/src/org/argeo/support/geonames/GeonamesAdm.java (100%) rename {org.argeo.support.geonames => org.argeo.app.core}/src/org/argeo/support/geonames/ImportGeonamesAdmin.java (100%) rename {org.argeo.support.odk => org.argeo.app.core}/src/org/argeo/support/odk/BundleResourceOdkForm.java (100%) rename {org.argeo.support.odk => org.argeo.app.core}/src/org/argeo/support/odk/OdkForm.java (100%) rename {org.argeo.support.odk => org.argeo.app.core}/src/org/argeo/support/odk/OdkNames.java (100%) rename {org.argeo.support.odk => org.argeo.app.core}/src/org/argeo/support/odk/OdkUtils.java (100%) rename {org.argeo.support.odk => org.argeo.app.core}/src/org/argeo/support/odk/OrxListName.java (100%) rename {org.argeo.support.odk => org.argeo.app.core}/src/org/argeo/support/odk/OrxManifestName.java (100%) rename {org.argeo.support.odk => org.argeo.app.core}/src/org/argeo/support/odk/OrxType.java (100%) rename {org.argeo.support.odk => org.argeo.app.core}/src/org/argeo/support/odk/odk.cnd (100%) rename {org.argeo.support.xforms => org.argeo.app.core}/src/org/argeo/support/xforms/FormSubmissionListener.java (100%) rename {org.argeo.support.xforms => org.argeo.app.core}/src/org/argeo/support/xforms/xforms.cnd (100%) rename {org.argeo.suite.core => org.argeo.app.servlet.odk}/.classpath (100%) rename {org.argeo.suite.core => org.argeo.app.servlet.odk}/.gitignore (100%) rename {org.argeo.publishing.ui => org.argeo.app.servlet.odk}/.project (94%) rename {org.argeo.suite.core => org.argeo.app.servlet.odk}/META-INF/.gitignore (100%) rename {org.argeo.support.odk => org.argeo.app.servlet.odk}/OSGI-INF/odkFormListServlet.xml (100%) rename {org.argeo.support.odk => org.argeo.app.servlet.odk}/OSGI-INF/odkFormServlet.xml (100%) rename {org.argeo.support.odk => org.argeo.app.servlet.odk}/OSGI-INF/odkManifestServlet.xml (100%) rename {org.argeo.support.odk => org.argeo.app.servlet.odk}/OSGI-INF/odkServletContext.xml (100%) rename {org.argeo.support.odk => org.argeo.app.servlet.odk}/OSGI-INF/odkSubmissionServlet.xml (100%) rename {org.argeo.support.odk => org.argeo.app.servlet.odk}/bnd.bnd (100%) rename {org.argeo.support.odk => org.argeo.app.servlet.odk}/build.properties (100%) rename {org.argeo.support.odk => org.argeo.app.servlet.odk}/pom.xml (73%) rename {org.argeo.support.odk => org.argeo.app.servlet.odk}/src/org/argeo/support/odk/servlet/OdkFormListServlet.java (100%) rename {org.argeo.support.odk => org.argeo.app.servlet.odk}/src/org/argeo/support/odk/servlet/OdkFormServlet.java (100%) rename {org.argeo.support.odk => org.argeo.app.servlet.odk}/src/org/argeo/support/odk/servlet/OdkManifestServlet.java (100%) rename {org.argeo.support.odk => org.argeo.app.servlet.odk}/src/org/argeo/support/odk/servlet/OdkServletContext.java (100%) rename {org.argeo.support.odk => org.argeo.app.servlet.odk}/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java (100%) rename {org.argeo.suite.ui => org.argeo.app.servlet.publish}/.classpath (100%) rename {org.argeo.suite.theme.default => org.argeo.app.servlet.publish}/.gitignore (100%) rename {org.argeo.support.odk => org.argeo.app.servlet.publish}/.project (94%) rename {org.argeo.suite.theme.default => org.argeo.app.servlet.publish}/META-INF/.gitignore (100%) rename {org.argeo.publishing.ui => org.argeo.app.servlet.publish}/OSGI-INF/dbk4Converter.xml (100%) rename {org.argeo.publishing.ui => org.argeo.app.servlet.publish}/OSGI-INF/dbkServlet.xml (100%) rename {org.argeo.publishing.ui => org.argeo.app.servlet.publish}/OSGI-INF/documentUiProvider.xml (100%) rename {org.argeo.publishing.ui => org.argeo.app.servlet.publish}/OSGI-INF/fontsServlet.xml (100%) rename {org.argeo.publishing.ui => org.argeo.app.servlet.publish}/OSGI-INF/htmlServletContext.xml (100%) rename {org.argeo.publishing.ui => org.argeo.app.servlet.publish}/OSGI-INF/l10n/bundle.properties (100%) rename {org.argeo.publishing.ui => org.argeo.app.servlet.publish}/OSGI-INF/wwwLayer.xml (100%) rename {org.argeo.publishing.ui => org.argeo.app.servlet.publish}/bnd.bnd (96%) rename {org.argeo.publishing.ui => org.argeo.app.servlet.publish}/build.properties (100%) rename {org.argeo.publishing.ui => org.argeo.app.servlet.publish}/config/documentUiProvider.properties (100%) rename {org.argeo.publishing.ui => org.argeo.app.servlet.publish}/config/wwwLayer.properties (100%) create mode 100644 org.argeo.app.servlet.publish/pom.xml rename {org.argeo.publishing.ui => org.argeo.app.servlet.publish}/src/org/argeo/publishing/servlet/DbkServlet.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.servlet.publish}/src/org/argeo/publishing/servlet/FontsServlet.java (100%) rename {org.argeo.suite.ui.rap => org.argeo.app.theme.default}/.gitignore (100%) rename {org.argeo.suite.theme.default => org.argeo.app.theme.default}/.project (92%) rename {org.argeo.suite.ui.rap => org.argeo.app.theme.default}/META-INF/.gitignore (100%) rename {org.argeo.suite.theme.default => org.argeo.app.theme.default}/OSGI-INF/cmsTheme.xml (100%) rename {org.argeo.suite.theme.default => org.argeo.app.theme.default}/bnd.bnd (100%) rename {org.argeo.suite.theme.default => org.argeo.app.theme.default}/build.properties (100%) rename {org.argeo.suite.theme.default => org.argeo.app.theme.default}/pom.xml (90%) rename {org.argeo.suite.theme.default => org.argeo.app.theme.default}/rap/work.css (100%) rename {org.argeo.suite.theme.default => org.argeo.app.theme.default}/swt/app.css (100%) rename {org.argeo.suite.ui => org.argeo.app.ui.rap}/.gitignore (100%) rename {org.argeo.suite.ui.rap => org.argeo.app.ui.rap}/.project (93%) rename {org.argeo.suite.ui => org.argeo.app.ui.rap}/META-INF/.gitignore (100%) rename {org.argeo.suite.ui.rap => org.argeo.app.ui.rap}/OSGI-INF/cmsWebApp.xml (100%) rename {org.argeo.suite.ui.rap => org.argeo.app.ui.rap}/bnd.bnd (100%) rename {org.argeo.suite.ui.rap => org.argeo.app.ui.rap}/build.properties (100%) rename {org.argeo.suite.ui.rap => org.argeo.app.ui.rap}/pom.xml (90%) rename {org.argeo.support.odk => org.argeo.app.ui}/.classpath (100%) rename {org.argeo.support.odk => org.argeo.app.ui}/.gitignore (100%) rename {org.argeo.suite.core => org.argeo.app.ui}/.project (95%) rename {org.argeo.support.odk => org.argeo.app.ui}/META-INF/.gitignore (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/adminLeadPane.xml (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/cmsApp.xml (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/dashboard.xml (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/dashboardLayer.xml (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/eventRecorder.xml (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/footer.xml (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/header.xml (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/l10n/bundle.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/l10n/bundle_de.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/l10n/bundle_fr.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/leadPane.xml (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/loginScreen.xml (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/recentItems.xml (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/termsEntryArea.xml (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/OSGI-INF/termsLayer.xml (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/bnd.bnd (95%) rename {org.argeo.suite.ui => org.argeo.app.ui}/build.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/config/adminLeadPane.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/config/cmsApp.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/config/dashboard.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/config/dashboardLayer.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/config/eventRecorder.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/config/footer.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/config/header.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/config/leadPane.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/config/loginScreen.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/config/recentItems.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/config/termsEntryArea.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/config/termsLayer.properties (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/pom.xml (81%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/docbook/ui/AbstractDbkViewer.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/docbook/ui/CustomDbkEditor.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/docbook/ui/DbkContextMenu.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/docbook/ui/DbkImageManager.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/docbook/ui/DbkImg.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/docbook/ui/DbkSectionTitle.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/docbook/ui/DbkTextInterpreter.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/docbook/ui/DbkVideo.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/docbook/ui/DocumentPage.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/docbook/ui/DocumentTextEditor.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/docbook/ui/Paragraph.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/docbook/ui/TextEditorHeader.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/docbook/ui/TextInterpreter.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/docbook/ui/TextSection.java (100%) rename {org.argeo.entity.ui => org.argeo.app.ui}/src/org/argeo/entity/ui/forms/AbstractTermsPart.java (100%) rename {org.argeo.entity.ui => org.argeo.app.ui}/src/org/argeo/entity/ui/forms/MultiTermsPart.java (100%) rename {org.argeo.entity.ui => org.argeo.app.ui}/src/org/argeo/entity/ui/forms/SingleTermPart.java (100%) rename {org.argeo.library.ui => org.argeo.app.ui}/src/org/argeo/library/ui/ContentEntryArea.java (100%) rename {org.argeo.library.ui => org.argeo.app.ui}/src/org/argeo/library/ui/DocumentsContextMenu.java (100%) rename {org.argeo.library.ui => org.argeo.app.ui}/src/org/argeo/library/ui/DocumentsFileComposite.java (100%) rename {org.argeo.library.ui => org.argeo.app.ui}/src/org/argeo/library/ui/DocumentsFolderComposite.java (100%) rename {org.argeo.library.ui => org.argeo.app.ui}/src/org/argeo/library/ui/DocumentsFolderUiProvider.java (100%) rename {org.argeo.library.ui => org.argeo.app.ui}/src/org/argeo/library/ui/DocumentsTreeUiProvider.java (100%) rename {org.argeo.library.ui => org.argeo.app.ui}/src/org/argeo/library/ui/DocumentsUiService.java (100%) rename {org.argeo.people.ui => org.argeo.app.ui}/src/org/argeo/people/ui/PeopleEntryArea.java (100%) rename {org.argeo.people.ui => org.argeo.app.ui}/src/org/argeo/people/ui/PersonUiProvider.java (100%) rename {org.argeo.people.ui => org.argeo.app.ui}/src/org/argeo/people/ui/SuiteUserUiProvider.java (100%) rename {org.argeo.people.ui => org.argeo.app.ui}/src/org/argeo/people/ui/SuiteUsersEntryArea.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/publishing/ui/DocumentUiProvider.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/publishing/ui/PublishingApp.java (100%) rename {org.argeo.publishing.ui => org.argeo.app.ui}/src/org/argeo/publishing/ui/PublishingStyle.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/DefaultDashboard.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/DefaultEditionLayer.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/DefaultFooter.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/DefaultHeader.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/DefaultLeadPane.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/DefaultLoginScreen.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/EventRecorder.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/RecentItems.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/SuiteApp.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/SuiteEvent.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/SuiteIcon.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/SuiteLayer.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/SuiteMsg.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/SuiteStyle.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/SuiteUi.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/SuiteUiUtils.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/TermsEntryArea.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/dialogs/NewPersonPage.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/dialogs/NewPersonWizard.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/dialogs/NewUserWizard.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/widgets/AbstractConnectContextMenu.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/widgets/ConnectAbstractDropDown.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/widgets/DelayedText.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/widgets/TabbedArea.java (100%) rename {org.argeo.suite.ui => org.argeo.app.ui}/src/org/argeo/suite/ui/widgets/TreeOrSearchArea.java (100%) rename {org.argeo.geo.ui => org.argeo.app.ui}/src/org/argeo/support/openlayers/OLMap.java (100%) rename {org.argeo.geo.ui => org.argeo.app.ui}/src/org/argeo/support/openlayers/OpenLayersMap.java (100%) rename {org.argeo.geo.ui => org.argeo.app.ui}/src/org/argeo/support/openlayers/OverviewMap.java (100%) rename {org.argeo.geo.ui => org.argeo.app.ui}/src/org/argeo/support/openlayers/map-osm.html (100%) rename {org.argeo.geo.ui => org.argeo.app.ui}/src/org/argeo/support/openlayers/map.js (100%) delete mode 100644 org.argeo.publishing.ui/pom.xml diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml index f52ecf1..b4a6e61 100644 --- a/dep/org.argeo.suite.dep.ui.rap/pom.xml +++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml @@ -28,19 +28,19 @@ org.argeo.suite - org.argeo.entity.api - 2.3-SNAPSHOT - - - org.argeo.suite - org.argeo.entity.core - 2.3-SNAPSHOT - - - org.argeo.suite - org.argeo.entity.ui + org.argeo.app.api 2.3-SNAPSHOT + + + + + + + + + + @@ -52,69 +52,69 @@ org.argeo.suite - org.argeo.suite.core + org.argeo.app.core 2.3-SNAPSHOT org.argeo.suite - org.argeo.suite.ui + org.argeo.app.ui 2.3-SNAPSHOT org.argeo.suite - org.argeo.suite.theme.default + org.argeo.app.theme.default 2.3-SNAPSHOT org.argeo.suite - org.argeo.suite.ui.rap + org.argeo.app.ui.rap 2.3-SNAPSHOT - - org.argeo.suite - org.argeo.people.ui - 2.3-SNAPSHOT - + + + + + - - org.argeo.suite - org.argeo.library.ui - 2.3-SNAPSHOT - + + + + + - - org.argeo.suite - org.argeo.geo.ui - 2.3-SNAPSHOT - + + + + + org.argeo.suite - org.argeo.publishing.ui + org.argeo.app.servlet.publish 2.3-SNAPSHOT + + + + + org.argeo.suite - org.argeo.support.xforms - 2.3-SNAPSHOT - - - org.argeo.suite - org.argeo.support.odk - 2.3-SNAPSHOT - - - org.argeo.suite - org.argeo.support.geonames + org.argeo.app.servlet.odk 2.3-SNAPSHOT + + + + + diff --git a/org.argeo.entity.api/.classpath b/org.argeo.app.api/.classpath similarity index 100% rename from org.argeo.entity.api/.classpath rename to org.argeo.app.api/.classpath diff --git a/org.argeo.entity.api/.gitignore b/org.argeo.app.api/.gitignore similarity index 100% rename from org.argeo.entity.api/.gitignore rename to org.argeo.app.api/.gitignore diff --git a/org.argeo.entity.api/.project b/org.argeo.app.api/.project similarity index 94% rename from org.argeo.entity.api/.project rename to org.argeo.app.api/.project index 1269cce..2f51e20 100644 --- a/org.argeo.entity.api/.project +++ b/org.argeo.app.api/.project @@ -1,6 +1,6 @@ - org.argeo.entity.api + org.argeo.app.api diff --git a/org.argeo.entity.api/META-INF/.gitignore b/org.argeo.app.api/META-INF/.gitignore similarity index 100% rename from org.argeo.entity.api/META-INF/.gitignore rename to org.argeo.app.api/META-INF/.gitignore diff --git a/org.argeo.entity.api/bnd.bnd b/org.argeo.app.api/bnd.bnd similarity index 100% rename from org.argeo.entity.api/bnd.bnd rename to org.argeo.app.api/bnd.bnd diff --git a/org.argeo.entity.api/build.properties b/org.argeo.app.api/build.properties similarity index 100% rename from org.argeo.entity.api/build.properties rename to org.argeo.app.api/build.properties diff --git a/org.argeo.entity.api/pom.xml b/org.argeo.app.api/pom.xml similarity index 90% rename from org.argeo.entity.api/pom.xml rename to org.argeo.app.api/pom.xml index 14eb34a..4bd6bcf 100644 --- a/org.argeo.entity.api/pom.xml +++ b/org.argeo.app.api/pom.xml @@ -7,8 +7,8 @@ 2.3-SNAPSHOT .. - org.argeo.entity.api - Entity API + org.argeo.app.api + Suite API jar diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityConstants.java b/org.argeo.app.api/src/org/argeo/entity/EntityConstants.java similarity index 100% rename from org.argeo.entity.api/src/org/argeo/entity/EntityConstants.java rename to org.argeo.app.api/src/org/argeo/entity/EntityConstants.java diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityDefinition.java b/org.argeo.app.api/src/org/argeo/entity/EntityDefinition.java similarity index 100% rename from org.argeo.entity.api/src/org/argeo/entity/EntityDefinition.java rename to org.argeo.app.api/src/org/argeo/entity/EntityDefinition.java diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityMimeType.java b/org.argeo.app.api/src/org/argeo/entity/EntityMimeType.java similarity index 100% rename from org.argeo.entity.api/src/org/argeo/entity/EntityMimeType.java rename to org.argeo.app.api/src/org/argeo/entity/EntityMimeType.java diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java b/org.argeo.app.api/src/org/argeo/entity/EntityNames.java similarity index 100% rename from org.argeo.entity.api/src/org/argeo/entity/EntityNames.java rename to org.argeo.app.api/src/org/argeo/entity/EntityNames.java diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityType.java b/org.argeo.app.api/src/org/argeo/entity/EntityType.java similarity index 100% rename from org.argeo.entity.api/src/org/argeo/entity/EntityType.java rename to org.argeo.app.api/src/org/argeo/entity/EntityType.java diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityTypes.java b/org.argeo.app.api/src/org/argeo/entity/EntityTypes.java similarity index 100% rename from org.argeo.entity.api/src/org/argeo/entity/EntityTypes.java rename to org.argeo.app.api/src/org/argeo/entity/EntityTypes.java diff --git a/org.argeo.entity.api/src/org/argeo/entity/JcrName.java b/org.argeo.app.api/src/org/argeo/entity/JcrName.java similarity index 100% rename from org.argeo.entity.api/src/org/argeo/entity/JcrName.java rename to org.argeo.app.api/src/org/argeo/entity/JcrName.java diff --git a/org.argeo.entity.api/src/org/argeo/entity/Term.java b/org.argeo.app.api/src/org/argeo/entity/Term.java similarity index 100% rename from org.argeo.entity.api/src/org/argeo/entity/Term.java rename to org.argeo.app.api/src/org/argeo/entity/Term.java diff --git a/org.argeo.entity.api/src/org/argeo/entity/TermsManager.java b/org.argeo.app.api/src/org/argeo/entity/TermsManager.java similarity index 100% rename from org.argeo.entity.api/src/org/argeo/entity/TermsManager.java rename to org.argeo.app.api/src/org/argeo/entity/TermsManager.java diff --git a/org.argeo.entity.api/src/org/argeo/entity/Typology.java b/org.argeo.app.api/src/org/argeo/entity/Typology.java similarity index 100% rename from org.argeo.entity.api/src/org/argeo/entity/Typology.java rename to org.argeo.app.api/src/org/argeo/entity/Typology.java diff --git a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd b/org.argeo.app.api/src/org/argeo/entity/entity.cnd similarity index 100% rename from org.argeo.entity.api/src/org/argeo/entity/entity.cnd rename to org.argeo.app.api/src/org/argeo/entity/entity.cnd diff --git a/org.argeo.publishing.ui/.classpath b/org.argeo.app.core/.classpath similarity index 100% rename from org.argeo.publishing.ui/.classpath rename to org.argeo.app.core/.classpath diff --git a/org.argeo.publishing.ui/.gitignore b/org.argeo.app.core/.gitignore similarity index 100% rename from org.argeo.publishing.ui/.gitignore rename to org.argeo.app.core/.gitignore diff --git a/org.argeo.suite.ui/.project b/org.argeo.app.core/.project similarity index 95% rename from org.argeo.suite.ui/.project rename to org.argeo.app.core/.project index 7146bab..b5ada14 100644 --- a/org.argeo.suite.ui/.project +++ b/org.argeo.app.core/.project @@ -1,6 +1,6 @@ - org.argeo.suite.ui + org.argeo.app.core diff --git a/org.argeo.publishing.ui/META-INF/.gitignore b/org.argeo.app.core/META-INF/.gitignore similarity index 100% rename from org.argeo.publishing.ui/META-INF/.gitignore rename to org.argeo.app.core/META-INF/.gitignore diff --git a/org.argeo.suite.core/OSGI-INF/maintenanceService.xml b/org.argeo.app.core/OSGI-INF/maintenanceService.xml similarity index 100% rename from org.argeo.suite.core/OSGI-INF/maintenanceService.xml rename to org.argeo.app.core/OSGI-INF/maintenanceService.xml diff --git a/org.argeo.suite.core/OSGI-INF/termsManager.xml b/org.argeo.app.core/OSGI-INF/termsManager.xml similarity index 100% rename from org.argeo.suite.core/OSGI-INF/termsManager.xml rename to org.argeo.app.core/OSGI-INF/termsManager.xml diff --git a/org.argeo.suite.core/bnd.bnd b/org.argeo.app.core/bnd.bnd similarity index 88% rename from org.argeo.suite.core/bnd.bnd rename to org.argeo.app.core/bnd.bnd index 8022cd2..fc27132 100644 --- a/org.argeo.suite.core/bnd.bnd +++ b/org.argeo.app.core/bnd.bnd @@ -9,5 +9,6 @@ javax.transaction,\ org.osgi.service.useradmin,\ javax.jcr.nodetype,\ javax.jcr.security,\ +com.fasterxml.jackson.core,\ org.argeo.entity,\ * \ No newline at end of file diff --git a/org.argeo.suite.core/build.properties b/org.argeo.app.core/build.properties similarity index 100% rename from org.argeo.suite.core/build.properties rename to org.argeo.app.core/build.properties diff --git a/org.argeo.suite.core/pom.xml b/org.argeo.app.core/pom.xml similarity index 91% rename from org.argeo.suite.core/pom.xml rename to org.argeo.app.core/pom.xml index 7b31537..285e873 100644 --- a/org.argeo.suite.core/pom.xml +++ b/org.argeo.app.core/pom.xml @@ -7,13 +7,13 @@ 2.3-SNAPSHOT .. - org.argeo.suite.core + org.argeo.app.core Suite Core jar org.argeo.suite - org.argeo.entity.core + org.argeo.app.api 2.3-SNAPSHOT diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/Dbk4Converter.java b/org.argeo.app.core/src/org/argeo/docbook/Dbk4Converter.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/Dbk4Converter.java rename to org.argeo.app.core/src/org/argeo/docbook/Dbk4Converter.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/DbkAttr.java b/org.argeo.app.core/src/org/argeo/docbook/DbkAttr.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/DbkAttr.java rename to org.argeo.app.core/src/org/argeo/docbook/DbkAttr.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/DbkMsg.java b/org.argeo.app.core/src/org/argeo/docbook/DbkMsg.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/DbkMsg.java rename to org.argeo.app.core/src/org/argeo/docbook/DbkMsg.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/DbkType.java b/org.argeo.app.core/src/org/argeo/docbook/DbkType.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/DbkType.java rename to org.argeo.app.core/src/org/argeo/docbook/DbkType.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java b/org.argeo.app.core/src/org/argeo/docbook/DbkUtils.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java rename to org.argeo.app.core/src/org/argeo/docbook/DbkUtils.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/db4-upgrade.xsl b/org.argeo.app.core/src/org/argeo/docbook/db4-upgrade.xsl similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/db4-upgrade.xsl rename to org.argeo.app.core/src/org/argeo/docbook/db4-upgrade.xsl diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/docbook-full.cnd b/org.argeo.app.core/src/org/argeo/docbook/docbook-full.cnd similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/docbook-full.cnd rename to org.argeo.app.core/src/org/argeo/docbook/docbook-full.cnd diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/docbook.cnd b/org.argeo.app.core/src/org/argeo/docbook/docbook.cnd similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/docbook.cnd rename to org.argeo.app.core/src/org/argeo/docbook/docbook.cnd diff --git a/org.argeo.entity.core/src/org/argeo/entity/core/JcrEntityDefinition.java b/org.argeo.app.core/src/org/argeo/entity/core/JcrEntityDefinition.java similarity index 100% rename from org.argeo.entity.core/src/org/argeo/entity/core/JcrEntityDefinition.java rename to org.argeo.app.core/src/org/argeo/entity/core/JcrEntityDefinition.java diff --git a/org.argeo.geo.ui/src/org/argeo/geo/GeoJsonUtils.java b/org.argeo.app.core/src/org/argeo/geo/GeoJsonUtils.java similarity index 100% rename from org.argeo.geo.ui/src/org/argeo/geo/GeoJsonUtils.java rename to org.argeo.app.core/src/org/argeo/geo/GeoJsonUtils.java diff --git a/org.argeo.geo.ui/src/org/argeo/geo/GeoToSvg.java b/org.argeo.app.core/src/org/argeo/geo/GeoToSvg.java similarity index 100% rename from org.argeo.geo.ui/src/org/argeo/geo/GeoToSvg.java rename to org.argeo.app.core/src/org/argeo/geo/GeoToSvg.java diff --git a/org.argeo.suite.core/src/org/argeo/suite/RankedObject.java b/org.argeo.app.core/src/org/argeo/suite/RankedObject.java similarity index 100% rename from org.argeo.suite.core/src/org/argeo/suite/RankedObject.java rename to org.argeo.app.core/src/org/argeo/suite/RankedObject.java diff --git a/org.argeo.suite.core/src/org/argeo/suite/RankingKey.java b/org.argeo.app.core/src/org/argeo/suite/RankingKey.java similarity index 100% rename from org.argeo.suite.core/src/org/argeo/suite/RankingKey.java rename to org.argeo.app.core/src/org/argeo/suite/RankingKey.java diff --git a/org.argeo.suite.core/src/org/argeo/suite/SuiteRole.java b/org.argeo.app.core/src/org/argeo/suite/SuiteRole.java similarity index 100% rename from org.argeo.suite.core/src/org/argeo/suite/SuiteRole.java rename to org.argeo.app.core/src/org/argeo/suite/SuiteRole.java diff --git a/org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java b/org.argeo.app.core/src/org/argeo/suite/SuiteUtils.java similarity index 100% rename from org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java rename to org.argeo.app.core/src/org/argeo/suite/SuiteUtils.java diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/CustomMaintenanceService.java b/org.argeo.app.core/src/org/argeo/suite/core/CustomMaintenanceService.java similarity index 100% rename from org.argeo.suite.core/src/org/argeo/suite/core/CustomMaintenanceService.java rename to org.argeo.app.core/src/org/argeo/suite/core/CustomMaintenanceService.java diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/SuiteMaintenanceService.java b/org.argeo.app.core/src/org/argeo/suite/core/SuiteMaintenanceService.java similarity index 100% rename from org.argeo.suite.core/src/org/argeo/suite/core/SuiteMaintenanceService.java rename to org.argeo.app.core/src/org/argeo/suite/core/SuiteMaintenanceService.java diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTerm.java b/org.argeo.app.core/src/org/argeo/suite/core/SuiteTerm.java similarity index 100% rename from org.argeo.suite.core/src/org/argeo/suite/core/SuiteTerm.java rename to org.argeo.app.core/src/org/argeo/suite/core/SuiteTerm.java diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTermsManager.java b/org.argeo.app.core/src/org/argeo/suite/core/SuiteTermsManager.java similarity index 100% rename from org.argeo.suite.core/src/org/argeo/suite/core/SuiteTermsManager.java rename to org.argeo.app.core/src/org/argeo/suite/core/SuiteTermsManager.java diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTypology.java b/org.argeo.app.core/src/org/argeo/suite/core/SuiteTypology.java similarity index 100% rename from org.argeo.suite.core/src/org/argeo/suite/core/SuiteTypology.java rename to org.argeo.app.core/src/org/argeo/suite/core/SuiteTypology.java diff --git a/org.argeo.suite.core/src/org/argeo/suite/library/DocxExtractor.java b/org.argeo.app.core/src/org/argeo/suite/library/DocxExtractor.java similarity index 100% rename from org.argeo.suite.core/src/org/argeo/suite/library/DocxExtractor.java rename to org.argeo.app.core/src/org/argeo/suite/library/DocxExtractor.java diff --git a/org.argeo.suite.core/src/org/argeo/suite/util/XPathUtils.java b/org.argeo.app.core/src/org/argeo/suite/util/XPathUtils.java similarity index 100% rename from org.argeo.suite.core/src/org/argeo/suite/util/XPathUtils.java rename to org.argeo.app.core/src/org/argeo/suite/util/XPathUtils.java diff --git a/org.argeo.support.geonames/src/org/argeo/support/geonames/GeonamesAdm.java b/org.argeo.app.core/src/org/argeo/support/geonames/GeonamesAdm.java similarity index 100% rename from org.argeo.support.geonames/src/org/argeo/support/geonames/GeonamesAdm.java rename to org.argeo.app.core/src/org/argeo/support/geonames/GeonamesAdm.java diff --git a/org.argeo.support.geonames/src/org/argeo/support/geonames/ImportGeonamesAdmin.java b/org.argeo.app.core/src/org/argeo/support/geonames/ImportGeonamesAdmin.java similarity index 100% rename from org.argeo.support.geonames/src/org/argeo/support/geonames/ImportGeonamesAdmin.java rename to org.argeo.app.core/src/org/argeo/support/geonames/ImportGeonamesAdmin.java diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/BundleResourceOdkForm.java b/org.argeo.app.core/src/org/argeo/support/odk/BundleResourceOdkForm.java similarity index 100% rename from org.argeo.support.odk/src/org/argeo/support/odk/BundleResourceOdkForm.java rename to org.argeo.app.core/src/org/argeo/support/odk/BundleResourceOdkForm.java diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/OdkForm.java b/org.argeo.app.core/src/org/argeo/support/odk/OdkForm.java similarity index 100% rename from org.argeo.support.odk/src/org/argeo/support/odk/OdkForm.java rename to org.argeo.app.core/src/org/argeo/support/odk/OdkForm.java diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/OdkNames.java b/org.argeo.app.core/src/org/argeo/support/odk/OdkNames.java similarity index 100% rename from org.argeo.support.odk/src/org/argeo/support/odk/OdkNames.java rename to org.argeo.app.core/src/org/argeo/support/odk/OdkNames.java diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/OdkUtils.java b/org.argeo.app.core/src/org/argeo/support/odk/OdkUtils.java similarity index 100% rename from org.argeo.support.odk/src/org/argeo/support/odk/OdkUtils.java rename to org.argeo.app.core/src/org/argeo/support/odk/OdkUtils.java diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/OrxListName.java b/org.argeo.app.core/src/org/argeo/support/odk/OrxListName.java similarity index 100% rename from org.argeo.support.odk/src/org/argeo/support/odk/OrxListName.java rename to org.argeo.app.core/src/org/argeo/support/odk/OrxListName.java diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/OrxManifestName.java b/org.argeo.app.core/src/org/argeo/support/odk/OrxManifestName.java similarity index 100% rename from org.argeo.support.odk/src/org/argeo/support/odk/OrxManifestName.java rename to org.argeo.app.core/src/org/argeo/support/odk/OrxManifestName.java diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/OrxType.java b/org.argeo.app.core/src/org/argeo/support/odk/OrxType.java similarity index 100% rename from org.argeo.support.odk/src/org/argeo/support/odk/OrxType.java rename to org.argeo.app.core/src/org/argeo/support/odk/OrxType.java diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/odk.cnd b/org.argeo.app.core/src/org/argeo/support/odk/odk.cnd similarity index 100% rename from org.argeo.support.odk/src/org/argeo/support/odk/odk.cnd rename to org.argeo.app.core/src/org/argeo/support/odk/odk.cnd diff --git a/org.argeo.support.xforms/src/org/argeo/support/xforms/FormSubmissionListener.java b/org.argeo.app.core/src/org/argeo/support/xforms/FormSubmissionListener.java similarity index 100% rename from org.argeo.support.xforms/src/org/argeo/support/xforms/FormSubmissionListener.java rename to org.argeo.app.core/src/org/argeo/support/xforms/FormSubmissionListener.java diff --git a/org.argeo.support.xforms/src/org/argeo/support/xforms/xforms.cnd b/org.argeo.app.core/src/org/argeo/support/xforms/xforms.cnd similarity index 100% rename from org.argeo.support.xforms/src/org/argeo/support/xforms/xforms.cnd rename to org.argeo.app.core/src/org/argeo/support/xforms/xforms.cnd diff --git a/org.argeo.suite.core/.classpath b/org.argeo.app.servlet.odk/.classpath similarity index 100% rename from org.argeo.suite.core/.classpath rename to org.argeo.app.servlet.odk/.classpath diff --git a/org.argeo.suite.core/.gitignore b/org.argeo.app.servlet.odk/.gitignore similarity index 100% rename from org.argeo.suite.core/.gitignore rename to org.argeo.app.servlet.odk/.gitignore diff --git a/org.argeo.publishing.ui/.project b/org.argeo.app.servlet.odk/.project similarity index 94% rename from org.argeo.publishing.ui/.project rename to org.argeo.app.servlet.odk/.project index 5e90066..d427e5d 100644 --- a/org.argeo.publishing.ui/.project +++ b/org.argeo.app.servlet.odk/.project @@ -1,6 +1,6 @@ - org.argeo.publishing.ui + org.argeo.app.servlet.odk diff --git a/org.argeo.suite.core/META-INF/.gitignore b/org.argeo.app.servlet.odk/META-INF/.gitignore similarity index 100% rename from org.argeo.suite.core/META-INF/.gitignore rename to org.argeo.app.servlet.odk/META-INF/.gitignore diff --git a/org.argeo.support.odk/OSGI-INF/odkFormListServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml similarity index 100% rename from org.argeo.support.odk/OSGI-INF/odkFormListServlet.xml rename to org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml diff --git a/org.argeo.support.odk/OSGI-INF/odkFormServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkFormServlet.xml similarity index 100% rename from org.argeo.support.odk/OSGI-INF/odkFormServlet.xml rename to org.argeo.app.servlet.odk/OSGI-INF/odkFormServlet.xml diff --git a/org.argeo.support.odk/OSGI-INF/odkManifestServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkManifestServlet.xml similarity index 100% rename from org.argeo.support.odk/OSGI-INF/odkManifestServlet.xml rename to org.argeo.app.servlet.odk/OSGI-INF/odkManifestServlet.xml diff --git a/org.argeo.support.odk/OSGI-INF/odkServletContext.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkServletContext.xml similarity index 100% rename from org.argeo.support.odk/OSGI-INF/odkServletContext.xml rename to org.argeo.app.servlet.odk/OSGI-INF/odkServletContext.xml diff --git a/org.argeo.support.odk/OSGI-INF/odkSubmissionServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml similarity index 100% rename from org.argeo.support.odk/OSGI-INF/odkSubmissionServlet.xml rename to org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml diff --git a/org.argeo.support.odk/bnd.bnd b/org.argeo.app.servlet.odk/bnd.bnd similarity index 100% rename from org.argeo.support.odk/bnd.bnd rename to org.argeo.app.servlet.odk/bnd.bnd diff --git a/org.argeo.support.odk/build.properties b/org.argeo.app.servlet.odk/build.properties similarity index 100% rename from org.argeo.support.odk/build.properties rename to org.argeo.app.servlet.odk/build.properties diff --git a/org.argeo.support.odk/pom.xml b/org.argeo.app.servlet.odk/pom.xml similarity index 73% rename from org.argeo.support.odk/pom.xml rename to org.argeo.app.servlet.odk/pom.xml index a161267..7c9b133 100644 --- a/org.argeo.support.odk/pom.xml +++ b/org.argeo.app.servlet.odk/pom.xml @@ -9,26 +9,21 @@ 2.3-SNAPSHOT .. - org.argeo.support.odk - ODK support + org.argeo.app.servlet.odk + ODK Servlets jar org.argeo.suite - org.argeo.suite.core - 2.3-SNAPSHOT - - - org.argeo.suite - org.argeo.support.xforms + org.argeo.app.core 2.3-SNAPSHOT + org.argeo.commons org.argeo.cms.servlet ${version.argeo-commons} - diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java similarity index 100% rename from org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java rename to org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java similarity index 100% rename from org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java rename to org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java similarity index 100% rename from org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java rename to org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkServletContext.java b/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkServletContext.java similarity index 100% rename from org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkServletContext.java rename to org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkServletContext.java diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java similarity index 100% rename from org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java rename to org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java diff --git a/org.argeo.suite.ui/.classpath b/org.argeo.app.servlet.publish/.classpath similarity index 100% rename from org.argeo.suite.ui/.classpath rename to org.argeo.app.servlet.publish/.classpath diff --git a/org.argeo.suite.theme.default/.gitignore b/org.argeo.app.servlet.publish/.gitignore similarity index 100% rename from org.argeo.suite.theme.default/.gitignore rename to org.argeo.app.servlet.publish/.gitignore diff --git a/org.argeo.support.odk/.project b/org.argeo.app.servlet.publish/.project similarity index 94% rename from org.argeo.support.odk/.project rename to org.argeo.app.servlet.publish/.project index ac46107..c080630 100644 --- a/org.argeo.support.odk/.project +++ b/org.argeo.app.servlet.publish/.project @@ -1,6 +1,6 @@ - org.argeo.support.odk + org.argeo.app.servlet.publish diff --git a/org.argeo.suite.theme.default/META-INF/.gitignore b/org.argeo.app.servlet.publish/META-INF/.gitignore similarity index 100% rename from org.argeo.suite.theme.default/META-INF/.gitignore rename to org.argeo.app.servlet.publish/META-INF/.gitignore diff --git a/org.argeo.publishing.ui/OSGI-INF/dbk4Converter.xml b/org.argeo.app.servlet.publish/OSGI-INF/dbk4Converter.xml similarity index 100% rename from org.argeo.publishing.ui/OSGI-INF/dbk4Converter.xml rename to org.argeo.app.servlet.publish/OSGI-INF/dbk4Converter.xml diff --git a/org.argeo.publishing.ui/OSGI-INF/dbkServlet.xml b/org.argeo.app.servlet.publish/OSGI-INF/dbkServlet.xml similarity index 100% rename from org.argeo.publishing.ui/OSGI-INF/dbkServlet.xml rename to org.argeo.app.servlet.publish/OSGI-INF/dbkServlet.xml diff --git a/org.argeo.publishing.ui/OSGI-INF/documentUiProvider.xml b/org.argeo.app.servlet.publish/OSGI-INF/documentUiProvider.xml similarity index 100% rename from org.argeo.publishing.ui/OSGI-INF/documentUiProvider.xml rename to org.argeo.app.servlet.publish/OSGI-INF/documentUiProvider.xml diff --git a/org.argeo.publishing.ui/OSGI-INF/fontsServlet.xml b/org.argeo.app.servlet.publish/OSGI-INF/fontsServlet.xml similarity index 100% rename from org.argeo.publishing.ui/OSGI-INF/fontsServlet.xml rename to org.argeo.app.servlet.publish/OSGI-INF/fontsServlet.xml diff --git a/org.argeo.publishing.ui/OSGI-INF/htmlServletContext.xml b/org.argeo.app.servlet.publish/OSGI-INF/htmlServletContext.xml similarity index 100% rename from org.argeo.publishing.ui/OSGI-INF/htmlServletContext.xml rename to org.argeo.app.servlet.publish/OSGI-INF/htmlServletContext.xml diff --git a/org.argeo.publishing.ui/OSGI-INF/l10n/bundle.properties b/org.argeo.app.servlet.publish/OSGI-INF/l10n/bundle.properties similarity index 100% rename from org.argeo.publishing.ui/OSGI-INF/l10n/bundle.properties rename to org.argeo.app.servlet.publish/OSGI-INF/l10n/bundle.properties diff --git a/org.argeo.publishing.ui/OSGI-INF/wwwLayer.xml b/org.argeo.app.servlet.publish/OSGI-INF/wwwLayer.xml similarity index 100% rename from org.argeo.publishing.ui/OSGI-INF/wwwLayer.xml rename to org.argeo.app.servlet.publish/OSGI-INF/wwwLayer.xml diff --git a/org.argeo.publishing.ui/bnd.bnd b/org.argeo.app.servlet.publish/bnd.bnd similarity index 96% rename from org.argeo.publishing.ui/bnd.bnd rename to org.argeo.app.servlet.publish/bnd.bnd index 6ee68f8..463e24b 100644 --- a/org.argeo.publishing.ui/bnd.bnd +++ b/org.argeo.app.servlet.publish/bnd.bnd @@ -8,6 +8,7 @@ org.eclipse.jface.viewers,\ org.osgi.framework,\ org.apache.xml.serializer,\ org.eclipse.rap.rwt,\ +org.argeo.entity,\ * Provide-Capability:\ diff --git a/org.argeo.publishing.ui/build.properties b/org.argeo.app.servlet.publish/build.properties similarity index 100% rename from org.argeo.publishing.ui/build.properties rename to org.argeo.app.servlet.publish/build.properties diff --git a/org.argeo.publishing.ui/config/documentUiProvider.properties b/org.argeo.app.servlet.publish/config/documentUiProvider.properties similarity index 100% rename from org.argeo.publishing.ui/config/documentUiProvider.properties rename to org.argeo.app.servlet.publish/config/documentUiProvider.properties diff --git a/org.argeo.publishing.ui/config/wwwLayer.properties b/org.argeo.app.servlet.publish/config/wwwLayer.properties similarity index 100% rename from org.argeo.publishing.ui/config/wwwLayer.properties rename to org.argeo.app.servlet.publish/config/wwwLayer.properties diff --git a/org.argeo.app.servlet.publish/pom.xml b/org.argeo.app.servlet.publish/pom.xml new file mode 100644 index 0000000..cbd91c1 --- /dev/null +++ b/org.argeo.app.servlet.publish/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + org.argeo.suite + argeo-suite + 2.3-SNAPSHOT + .. + + org.argeo.app.servlet.publish + Publishing Servlets + jar + + + org.argeo.suite + org.argeo.app.core + 2.3-SNAPSHOT + + + + + org.argeo.commons + org.argeo.cms.servlet + ${version.argeo-commons} + + + diff --git a/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java b/org.argeo.app.servlet.publish/src/org/argeo/publishing/servlet/DbkServlet.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java rename to org.argeo.app.servlet.publish/src/org/argeo/publishing/servlet/DbkServlet.java diff --git a/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/FontsServlet.java b/org.argeo.app.servlet.publish/src/org/argeo/publishing/servlet/FontsServlet.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/publishing/servlet/FontsServlet.java rename to org.argeo.app.servlet.publish/src/org/argeo/publishing/servlet/FontsServlet.java diff --git a/org.argeo.suite.ui.rap/.gitignore b/org.argeo.app.theme.default/.gitignore similarity index 100% rename from org.argeo.suite.ui.rap/.gitignore rename to org.argeo.app.theme.default/.gitignore diff --git a/org.argeo.suite.theme.default/.project b/org.argeo.app.theme.default/.project similarity index 92% rename from org.argeo.suite.theme.default/.project rename to org.argeo.app.theme.default/.project index d157155..1a71c08 100644 --- a/org.argeo.suite.theme.default/.project +++ b/org.argeo.app.theme.default/.project @@ -1,6 +1,6 @@ - org.argeo.suite.theme.default + org.argeo.app.theme.default diff --git a/org.argeo.suite.ui.rap/META-INF/.gitignore b/org.argeo.app.theme.default/META-INF/.gitignore similarity index 100% rename from org.argeo.suite.ui.rap/META-INF/.gitignore rename to org.argeo.app.theme.default/META-INF/.gitignore diff --git a/org.argeo.suite.theme.default/OSGI-INF/cmsTheme.xml b/org.argeo.app.theme.default/OSGI-INF/cmsTheme.xml similarity index 100% rename from org.argeo.suite.theme.default/OSGI-INF/cmsTheme.xml rename to org.argeo.app.theme.default/OSGI-INF/cmsTheme.xml diff --git a/org.argeo.suite.theme.default/bnd.bnd b/org.argeo.app.theme.default/bnd.bnd similarity index 100% rename from org.argeo.suite.theme.default/bnd.bnd rename to org.argeo.app.theme.default/bnd.bnd diff --git a/org.argeo.suite.theme.default/build.properties b/org.argeo.app.theme.default/build.properties similarity index 100% rename from org.argeo.suite.theme.default/build.properties rename to org.argeo.app.theme.default/build.properties diff --git a/org.argeo.suite.theme.default/pom.xml b/org.argeo.app.theme.default/pom.xml similarity index 90% rename from org.argeo.suite.theme.default/pom.xml rename to org.argeo.app.theme.default/pom.xml index f2927dc..e5afc6e 100644 --- a/org.argeo.suite.theme.default/pom.xml +++ b/org.argeo.app.theme.default/pom.xml @@ -7,7 +7,7 @@ 2.3-SNAPSHOT .. - org.argeo.suite.theme.default + org.argeo.app.theme.default Suite Default Theme jar diff --git a/org.argeo.suite.theme.default/rap/work.css b/org.argeo.app.theme.default/rap/work.css similarity index 100% rename from org.argeo.suite.theme.default/rap/work.css rename to org.argeo.app.theme.default/rap/work.css diff --git a/org.argeo.suite.theme.default/swt/app.css b/org.argeo.app.theme.default/swt/app.css similarity index 100% rename from org.argeo.suite.theme.default/swt/app.css rename to org.argeo.app.theme.default/swt/app.css diff --git a/org.argeo.suite.ui/.gitignore b/org.argeo.app.ui.rap/.gitignore similarity index 100% rename from org.argeo.suite.ui/.gitignore rename to org.argeo.app.ui.rap/.gitignore diff --git a/org.argeo.suite.ui.rap/.project b/org.argeo.app.ui.rap/.project similarity index 93% rename from org.argeo.suite.ui.rap/.project rename to org.argeo.app.ui.rap/.project index eff6bb0..51bc8dd 100644 --- a/org.argeo.suite.ui.rap/.project +++ b/org.argeo.app.ui.rap/.project @@ -1,6 +1,6 @@ - org.argeo.suite.ui.rap + org.argeo.app.ui.rap diff --git a/org.argeo.suite.ui/META-INF/.gitignore b/org.argeo.app.ui.rap/META-INF/.gitignore similarity index 100% rename from org.argeo.suite.ui/META-INF/.gitignore rename to org.argeo.app.ui.rap/META-INF/.gitignore diff --git a/org.argeo.suite.ui.rap/OSGI-INF/cmsWebApp.xml b/org.argeo.app.ui.rap/OSGI-INF/cmsWebApp.xml similarity index 100% rename from org.argeo.suite.ui.rap/OSGI-INF/cmsWebApp.xml rename to org.argeo.app.ui.rap/OSGI-INF/cmsWebApp.xml diff --git a/org.argeo.suite.ui.rap/bnd.bnd b/org.argeo.app.ui.rap/bnd.bnd similarity index 100% rename from org.argeo.suite.ui.rap/bnd.bnd rename to org.argeo.app.ui.rap/bnd.bnd diff --git a/org.argeo.suite.ui.rap/build.properties b/org.argeo.app.ui.rap/build.properties similarity index 100% rename from org.argeo.suite.ui.rap/build.properties rename to org.argeo.app.ui.rap/build.properties diff --git a/org.argeo.suite.ui.rap/pom.xml b/org.argeo.app.ui.rap/pom.xml similarity index 90% rename from org.argeo.suite.ui.rap/pom.xml rename to org.argeo.app.ui.rap/pom.xml index f1f2d83..71b11cc 100644 --- a/org.argeo.suite.ui.rap/pom.xml +++ b/org.argeo.app.ui.rap/pom.xml @@ -7,13 +7,13 @@ 2.3-SNAPSHOT .. - org.argeo.suite.ui.rap + org.argeo.app.ui.rap Suite UI RAP jar org.argeo.suite - org.argeo.suite.ui + org.argeo.app.ui 2.3-SNAPSHOT diff --git a/org.argeo.support.odk/.classpath b/org.argeo.app.ui/.classpath similarity index 100% rename from org.argeo.support.odk/.classpath rename to org.argeo.app.ui/.classpath diff --git a/org.argeo.support.odk/.gitignore b/org.argeo.app.ui/.gitignore similarity index 100% rename from org.argeo.support.odk/.gitignore rename to org.argeo.app.ui/.gitignore diff --git a/org.argeo.suite.core/.project b/org.argeo.app.ui/.project similarity index 95% rename from org.argeo.suite.core/.project rename to org.argeo.app.ui/.project index ab084af..a7893bd 100644 --- a/org.argeo.suite.core/.project +++ b/org.argeo.app.ui/.project @@ -1,6 +1,6 @@ - org.argeo.suite.core + org.argeo.app.ui diff --git a/org.argeo.support.odk/META-INF/.gitignore b/org.argeo.app.ui/META-INF/.gitignore similarity index 100% rename from org.argeo.support.odk/META-INF/.gitignore rename to org.argeo.app.ui/META-INF/.gitignore diff --git a/org.argeo.suite.ui/OSGI-INF/adminLeadPane.xml b/org.argeo.app.ui/OSGI-INF/adminLeadPane.xml similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/adminLeadPane.xml rename to org.argeo.app.ui/OSGI-INF/adminLeadPane.xml diff --git a/org.argeo.suite.ui/OSGI-INF/cmsApp.xml b/org.argeo.app.ui/OSGI-INF/cmsApp.xml similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/cmsApp.xml rename to org.argeo.app.ui/OSGI-INF/cmsApp.xml diff --git a/org.argeo.suite.ui/OSGI-INF/dashboard.xml b/org.argeo.app.ui/OSGI-INF/dashboard.xml similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/dashboard.xml rename to org.argeo.app.ui/OSGI-INF/dashboard.xml diff --git a/org.argeo.suite.ui/OSGI-INF/dashboardLayer.xml b/org.argeo.app.ui/OSGI-INF/dashboardLayer.xml similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/dashboardLayer.xml rename to org.argeo.app.ui/OSGI-INF/dashboardLayer.xml diff --git a/org.argeo.suite.ui/OSGI-INF/eventRecorder.xml b/org.argeo.app.ui/OSGI-INF/eventRecorder.xml similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/eventRecorder.xml rename to org.argeo.app.ui/OSGI-INF/eventRecorder.xml diff --git a/org.argeo.suite.ui/OSGI-INF/footer.xml b/org.argeo.app.ui/OSGI-INF/footer.xml similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/footer.xml rename to org.argeo.app.ui/OSGI-INF/footer.xml diff --git a/org.argeo.suite.ui/OSGI-INF/header.xml b/org.argeo.app.ui/OSGI-INF/header.xml similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/header.xml rename to org.argeo.app.ui/OSGI-INF/header.xml diff --git a/org.argeo.suite.ui/OSGI-INF/l10n/bundle.properties b/org.argeo.app.ui/OSGI-INF/l10n/bundle.properties similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/l10n/bundle.properties rename to org.argeo.app.ui/OSGI-INF/l10n/bundle.properties diff --git a/org.argeo.suite.ui/OSGI-INF/l10n/bundle_de.properties b/org.argeo.app.ui/OSGI-INF/l10n/bundle_de.properties similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/l10n/bundle_de.properties rename to org.argeo.app.ui/OSGI-INF/l10n/bundle_de.properties diff --git a/org.argeo.suite.ui/OSGI-INF/l10n/bundle_fr.properties b/org.argeo.app.ui/OSGI-INF/l10n/bundle_fr.properties similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/l10n/bundle_fr.properties rename to org.argeo.app.ui/OSGI-INF/l10n/bundle_fr.properties diff --git a/org.argeo.suite.ui/OSGI-INF/leadPane.xml b/org.argeo.app.ui/OSGI-INF/leadPane.xml similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/leadPane.xml rename to org.argeo.app.ui/OSGI-INF/leadPane.xml diff --git a/org.argeo.suite.ui/OSGI-INF/loginScreen.xml b/org.argeo.app.ui/OSGI-INF/loginScreen.xml similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/loginScreen.xml rename to org.argeo.app.ui/OSGI-INF/loginScreen.xml diff --git a/org.argeo.suite.ui/OSGI-INF/recentItems.xml b/org.argeo.app.ui/OSGI-INF/recentItems.xml similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/recentItems.xml rename to org.argeo.app.ui/OSGI-INF/recentItems.xml diff --git a/org.argeo.suite.ui/OSGI-INF/termsEntryArea.xml b/org.argeo.app.ui/OSGI-INF/termsEntryArea.xml similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/termsEntryArea.xml rename to org.argeo.app.ui/OSGI-INF/termsEntryArea.xml diff --git a/org.argeo.suite.ui/OSGI-INF/termsLayer.xml b/org.argeo.app.ui/OSGI-INF/termsLayer.xml similarity index 100% rename from org.argeo.suite.ui/OSGI-INF/termsLayer.xml rename to org.argeo.app.ui/OSGI-INF/termsLayer.xml diff --git a/org.argeo.suite.ui/bnd.bnd b/org.argeo.app.ui/bnd.bnd similarity index 95% rename from org.argeo.suite.ui/bnd.bnd rename to org.argeo.app.ui/bnd.bnd index 32f8bf8..4dc449b 100644 --- a/org.argeo.suite.ui/bnd.bnd +++ b/org.argeo.app.ui/bnd.bnd @@ -20,4 +20,5 @@ org.argeo.entity,\ org.eclipse.core.commands.common,\ org.eclipse.jface.window,\ org.eclipse.jface.dialogs,\ +org.eclipse.rap.rwt,\ * diff --git a/org.argeo.suite.ui/build.properties b/org.argeo.app.ui/build.properties similarity index 100% rename from org.argeo.suite.ui/build.properties rename to org.argeo.app.ui/build.properties diff --git a/org.argeo.suite.ui/config/adminLeadPane.properties b/org.argeo.app.ui/config/adminLeadPane.properties similarity index 100% rename from org.argeo.suite.ui/config/adminLeadPane.properties rename to org.argeo.app.ui/config/adminLeadPane.properties diff --git a/org.argeo.suite.ui/config/cmsApp.properties b/org.argeo.app.ui/config/cmsApp.properties similarity index 100% rename from org.argeo.suite.ui/config/cmsApp.properties rename to org.argeo.app.ui/config/cmsApp.properties diff --git a/org.argeo.suite.ui/config/dashboard.properties b/org.argeo.app.ui/config/dashboard.properties similarity index 100% rename from org.argeo.suite.ui/config/dashboard.properties rename to org.argeo.app.ui/config/dashboard.properties diff --git a/org.argeo.suite.ui/config/dashboardLayer.properties b/org.argeo.app.ui/config/dashboardLayer.properties similarity index 100% rename from org.argeo.suite.ui/config/dashboardLayer.properties rename to org.argeo.app.ui/config/dashboardLayer.properties diff --git a/org.argeo.suite.ui/config/eventRecorder.properties b/org.argeo.app.ui/config/eventRecorder.properties similarity index 100% rename from org.argeo.suite.ui/config/eventRecorder.properties rename to org.argeo.app.ui/config/eventRecorder.properties diff --git a/org.argeo.suite.ui/config/footer.properties b/org.argeo.app.ui/config/footer.properties similarity index 100% rename from org.argeo.suite.ui/config/footer.properties rename to org.argeo.app.ui/config/footer.properties diff --git a/org.argeo.suite.ui/config/header.properties b/org.argeo.app.ui/config/header.properties similarity index 100% rename from org.argeo.suite.ui/config/header.properties rename to org.argeo.app.ui/config/header.properties diff --git a/org.argeo.suite.ui/config/leadPane.properties b/org.argeo.app.ui/config/leadPane.properties similarity index 100% rename from org.argeo.suite.ui/config/leadPane.properties rename to org.argeo.app.ui/config/leadPane.properties diff --git a/org.argeo.suite.ui/config/loginScreen.properties b/org.argeo.app.ui/config/loginScreen.properties similarity index 100% rename from org.argeo.suite.ui/config/loginScreen.properties rename to org.argeo.app.ui/config/loginScreen.properties diff --git a/org.argeo.suite.ui/config/recentItems.properties b/org.argeo.app.ui/config/recentItems.properties similarity index 100% rename from org.argeo.suite.ui/config/recentItems.properties rename to org.argeo.app.ui/config/recentItems.properties diff --git a/org.argeo.suite.ui/config/termsEntryArea.properties b/org.argeo.app.ui/config/termsEntryArea.properties similarity index 100% rename from org.argeo.suite.ui/config/termsEntryArea.properties rename to org.argeo.app.ui/config/termsEntryArea.properties diff --git a/org.argeo.suite.ui/config/termsLayer.properties b/org.argeo.app.ui/config/termsLayer.properties similarity index 100% rename from org.argeo.suite.ui/config/termsLayer.properties rename to org.argeo.app.ui/config/termsLayer.properties diff --git a/org.argeo.suite.ui/pom.xml b/org.argeo.app.ui/pom.xml similarity index 81% rename from org.argeo.suite.ui/pom.xml rename to org.argeo.app.ui/pom.xml index 408fb9c..7e5ea70 100644 --- a/org.argeo.suite.ui/pom.xml +++ b/org.argeo.app.ui/pom.xml @@ -7,20 +7,20 @@ 2.3-SNAPSHOT .. - org.argeo.suite.ui + org.argeo.app.ui Suite UI jar org.argeo.suite - org.argeo.suite.core - 2.3-SNAPSHOT - - - org.argeo.suite - org.argeo.entity.ui + org.argeo.app.core 2.3-SNAPSHOT + + + + + diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java b/org.argeo.app.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java rename to org.argeo.app.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/CustomDbkEditor.java b/org.argeo.app.ui/src/org/argeo/docbook/ui/CustomDbkEditor.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/ui/CustomDbkEditor.java rename to org.argeo.app.ui/src/org/argeo/docbook/ui/CustomDbkEditor.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkContextMenu.java b/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkContextMenu.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkContextMenu.java rename to org.argeo.app.ui/src/org/argeo/docbook/ui/DbkContextMenu.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkImageManager.java b/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkImageManager.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkImageManager.java rename to org.argeo.app.ui/src/org/argeo/docbook/ui/DbkImageManager.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkImg.java b/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkImg.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkImg.java rename to org.argeo.app.ui/src/org/argeo/docbook/ui/DbkImg.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkSectionTitle.java b/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkSectionTitle.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkSectionTitle.java rename to org.argeo.app.ui/src/org/argeo/docbook/ui/DbkSectionTitle.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java b/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java rename to org.argeo.app.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkVideo.java b/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkVideo.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkVideo.java rename to org.argeo.app.ui/src/org/argeo/docbook/ui/DbkVideo.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocumentPage.java b/org.argeo.app.ui/src/org/argeo/docbook/ui/DocumentPage.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocumentPage.java rename to org.argeo.app.ui/src/org/argeo/docbook/ui/DocumentPage.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocumentTextEditor.java b/org.argeo.app.ui/src/org/argeo/docbook/ui/DocumentTextEditor.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocumentTextEditor.java rename to org.argeo.app.ui/src/org/argeo/docbook/ui/DocumentTextEditor.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/Paragraph.java b/org.argeo.app.ui/src/org/argeo/docbook/ui/Paragraph.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/ui/Paragraph.java rename to org.argeo.app.ui/src/org/argeo/docbook/ui/Paragraph.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/TextEditorHeader.java b/org.argeo.app.ui/src/org/argeo/docbook/ui/TextEditorHeader.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/ui/TextEditorHeader.java rename to org.argeo.app.ui/src/org/argeo/docbook/ui/TextEditorHeader.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/TextInterpreter.java b/org.argeo.app.ui/src/org/argeo/docbook/ui/TextInterpreter.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/ui/TextInterpreter.java rename to org.argeo.app.ui/src/org/argeo/docbook/ui/TextInterpreter.java diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/TextSection.java b/org.argeo.app.ui/src/org/argeo/docbook/ui/TextSection.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/docbook/ui/TextSection.java rename to org.argeo.app.ui/src/org/argeo/docbook/ui/TextSection.java diff --git a/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/AbstractTermsPart.java b/org.argeo.app.ui/src/org/argeo/entity/ui/forms/AbstractTermsPart.java similarity index 100% rename from org.argeo.entity.ui/src/org/argeo/entity/ui/forms/AbstractTermsPart.java rename to org.argeo.app.ui/src/org/argeo/entity/ui/forms/AbstractTermsPart.java diff --git a/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java b/org.argeo.app.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java similarity index 100% rename from org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java rename to org.argeo.app.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java diff --git a/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/SingleTermPart.java b/org.argeo.app.ui/src/org/argeo/entity/ui/forms/SingleTermPart.java similarity index 100% rename from org.argeo.entity.ui/src/org/argeo/entity/ui/forms/SingleTermPart.java rename to org.argeo.app.ui/src/org/argeo/entity/ui/forms/SingleTermPart.java diff --git a/org.argeo.library.ui/src/org/argeo/library/ui/ContentEntryArea.java b/org.argeo.app.ui/src/org/argeo/library/ui/ContentEntryArea.java similarity index 100% rename from org.argeo.library.ui/src/org/argeo/library/ui/ContentEntryArea.java rename to org.argeo.app.ui/src/org/argeo/library/ui/ContentEntryArea.java diff --git a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsContextMenu.java b/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsContextMenu.java similarity index 100% rename from org.argeo.library.ui/src/org/argeo/library/ui/DocumentsContextMenu.java rename to org.argeo.app.ui/src/org/argeo/library/ui/DocumentsContextMenu.java diff --git a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFileComposite.java b/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFileComposite.java similarity index 100% rename from org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFileComposite.java rename to org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFileComposite.java diff --git a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFolderComposite.java b/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFolderComposite.java similarity index 100% rename from org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFolderComposite.java rename to org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFolderComposite.java diff --git a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFolderUiProvider.java b/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFolderUiProvider.java similarity index 100% rename from org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFolderUiProvider.java rename to org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFolderUiProvider.java diff --git a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java b/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java similarity index 100% rename from org.argeo.library.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java rename to org.argeo.app.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java diff --git a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsUiService.java b/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsUiService.java similarity index 100% rename from org.argeo.library.ui/src/org/argeo/library/ui/DocumentsUiService.java rename to org.argeo.app.ui/src/org/argeo/library/ui/DocumentsUiService.java diff --git a/org.argeo.people.ui/src/org/argeo/people/ui/PeopleEntryArea.java b/org.argeo.app.ui/src/org/argeo/people/ui/PeopleEntryArea.java similarity index 100% rename from org.argeo.people.ui/src/org/argeo/people/ui/PeopleEntryArea.java rename to org.argeo.app.ui/src/org/argeo/people/ui/PeopleEntryArea.java diff --git a/org.argeo.people.ui/src/org/argeo/people/ui/PersonUiProvider.java b/org.argeo.app.ui/src/org/argeo/people/ui/PersonUiProvider.java similarity index 100% rename from org.argeo.people.ui/src/org/argeo/people/ui/PersonUiProvider.java rename to org.argeo.app.ui/src/org/argeo/people/ui/PersonUiProvider.java diff --git a/org.argeo.people.ui/src/org/argeo/people/ui/SuiteUserUiProvider.java b/org.argeo.app.ui/src/org/argeo/people/ui/SuiteUserUiProvider.java similarity index 100% rename from org.argeo.people.ui/src/org/argeo/people/ui/SuiteUserUiProvider.java rename to org.argeo.app.ui/src/org/argeo/people/ui/SuiteUserUiProvider.java diff --git a/org.argeo.people.ui/src/org/argeo/people/ui/SuiteUsersEntryArea.java b/org.argeo.app.ui/src/org/argeo/people/ui/SuiteUsersEntryArea.java similarity index 100% rename from org.argeo.people.ui/src/org/argeo/people/ui/SuiteUsersEntryArea.java rename to org.argeo.app.ui/src/org/argeo/people/ui/SuiteUsersEntryArea.java diff --git a/org.argeo.publishing.ui/src/org/argeo/publishing/ui/DocumentUiProvider.java b/org.argeo.app.ui/src/org/argeo/publishing/ui/DocumentUiProvider.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/publishing/ui/DocumentUiProvider.java rename to org.argeo.app.ui/src/org/argeo/publishing/ui/DocumentUiProvider.java diff --git a/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java b/org.argeo.app.ui/src/org/argeo/publishing/ui/PublishingApp.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java rename to org.argeo.app.ui/src/org/argeo/publishing/ui/PublishingApp.java diff --git a/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingStyle.java b/org.argeo.app.ui/src/org/argeo/publishing/ui/PublishingStyle.java similarity index 100% rename from org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingStyle.java rename to org.argeo.app.ui/src/org/argeo/publishing/ui/PublishingStyle.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultDashboard.java b/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultDashboard.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultDashboard.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/DefaultDashboard.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java b/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultFooter.java b/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultFooter.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultFooter.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/DefaultFooter.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultHeader.java b/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultHeader.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultHeader.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/DefaultHeader.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java b/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultLeadPane.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/DefaultLeadPane.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLoginScreen.java b/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultLoginScreen.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLoginScreen.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/DefaultLoginScreen.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/EventRecorder.java b/org.argeo.app.ui/src/org/argeo/suite/ui/EventRecorder.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/EventRecorder.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/EventRecorder.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java b/org.argeo.app.ui/src/org/argeo/suite/ui/RecentItems.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/RecentItems.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteApp.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/SuiteApp.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteEvent.java b/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteEvent.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteEvent.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/SuiteEvent.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteIcon.java b/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteIcon.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteIcon.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/SuiteIcon.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteLayer.java b/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteLayer.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteLayer.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/SuiteLayer.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteMsg.java b/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteMsg.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteMsg.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/SuiteMsg.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteStyle.java b/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteStyle.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteStyle.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/SuiteStyle.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java b/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteUi.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/SuiteUi.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java b/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteUiUtils.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/SuiteUiUtils.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/TermsEntryArea.java b/org.argeo.app.ui/src/org/argeo/suite/ui/TermsEntryArea.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/TermsEntryArea.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/TermsEntryArea.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/dialogs/NewPersonPage.java b/org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewPersonPage.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/dialogs/NewPersonPage.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewPersonPage.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/dialogs/NewPersonWizard.java b/org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewPersonWizard.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/dialogs/NewPersonWizard.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewPersonWizard.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/dialogs/NewUserWizard.java b/org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewUserWizard.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/dialogs/NewUserWizard.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewUserWizard.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/AbstractConnectContextMenu.java b/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/AbstractConnectContextMenu.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/AbstractConnectContextMenu.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/widgets/AbstractConnectContextMenu.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/ConnectAbstractDropDown.java b/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/ConnectAbstractDropDown.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/ConnectAbstractDropDown.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/widgets/ConnectAbstractDropDown.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/DelayedText.java b/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/DelayedText.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/DelayedText.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/widgets/DelayedText.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java b/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TreeOrSearchArea.java b/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/TreeOrSearchArea.java similarity index 100% rename from org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TreeOrSearchArea.java rename to org.argeo.app.ui/src/org/argeo/suite/ui/widgets/TreeOrSearchArea.java diff --git a/org.argeo.geo.ui/src/org/argeo/support/openlayers/OLMap.java b/org.argeo.app.ui/src/org/argeo/support/openlayers/OLMap.java similarity index 100% rename from org.argeo.geo.ui/src/org/argeo/support/openlayers/OLMap.java rename to org.argeo.app.ui/src/org/argeo/support/openlayers/OLMap.java diff --git a/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java b/org.argeo.app.ui/src/org/argeo/support/openlayers/OpenLayersMap.java similarity index 100% rename from org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java rename to org.argeo.app.ui/src/org/argeo/support/openlayers/OpenLayersMap.java diff --git a/org.argeo.geo.ui/src/org/argeo/support/openlayers/OverviewMap.java b/org.argeo.app.ui/src/org/argeo/support/openlayers/OverviewMap.java similarity index 100% rename from org.argeo.geo.ui/src/org/argeo/support/openlayers/OverviewMap.java rename to org.argeo.app.ui/src/org/argeo/support/openlayers/OverviewMap.java diff --git a/org.argeo.geo.ui/src/org/argeo/support/openlayers/map-osm.html b/org.argeo.app.ui/src/org/argeo/support/openlayers/map-osm.html similarity index 100% rename from org.argeo.geo.ui/src/org/argeo/support/openlayers/map-osm.html rename to org.argeo.app.ui/src/org/argeo/support/openlayers/map-osm.html diff --git a/org.argeo.geo.ui/src/org/argeo/support/openlayers/map.js b/org.argeo.app.ui/src/org/argeo/support/openlayers/map.js similarity index 100% rename from org.argeo.geo.ui/src/org/argeo/support/openlayers/map.js rename to org.argeo.app.ui/src/org/argeo/support/openlayers/map.js diff --git a/org.argeo.entity.core/pom.xml b/org.argeo.entity.core/pom.xml index eaddc32..fd0f0fd 100644 --- a/org.argeo.entity.core/pom.xml +++ b/org.argeo.entity.core/pom.xml @@ -13,7 +13,7 @@ org.argeo.suite - org.argeo.entity.api + org.argeo.app.api 2.3-SNAPSHOT diff --git a/org.argeo.publishing.ui/pom.xml b/org.argeo.publishing.ui/pom.xml deleted file mode 100644 index 6bf2359..0000000 --- a/org.argeo.publishing.ui/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - 4.0.0 - - org.argeo.suite - argeo-suite - 2.3-SNAPSHOT - .. - - org.argeo.publishing.ui - Publishing UI - jar - - - org.argeo.suite - org.argeo.suite.ui - 2.3-SNAPSHOT - - - - - org.argeo.commons.rap - org.argeo.swt.specific.rap - ${version.argeo-commons} - provided - - - - - org.argeo.tp - argeo-tp-rap-e4 - ${version.argeo-tp} - pom - provided - - - - diff --git a/pom.xml b/pom.xml index 2829432..f8f36c5 100644 --- a/pom.xml +++ b/pom.xml @@ -21,24 +21,24 @@ - org.argeo.entity.api - org.argeo.entity.core - org.argeo.entity.ui + org.argeo.app.api + + - org.argeo.suite.core - org.argeo.suite.ui - org.argeo.suite.ui.rap - org.argeo.suite.theme.default + org.argeo.app.core + org.argeo.app.ui + org.argeo.app.ui.rap + org.argeo.app.theme.default - org.argeo.people.ui - org.argeo.library.ui - org.argeo.geo.ui - org.argeo.publishing.ui - org.argeo.support.xforms - org.argeo.support.odk - org.argeo.support.geonames + + + + org.argeo.app.servlet.publish + + org.argeo.app.servlet.odk + dep -- 2.30.2