diff --git a/.gitignore b/.gitignore index f748000e0..063b49ccd 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,6 @@ hs_err_pid* releng/**/.settings/ #tycho -.polyglot.build.properties .META-INF_MANIFEST.MF -.polyglot..META-INF_MANIFEST.MF +.polyglot.* *.takari_issue_192 diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 1f6a1e868..8d6f3346f 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -17,8 +17,8 @@ - org.eclipse.tycho.extras - tycho-pomless - 2.5.0 + org.eclipse.tycho + tycho-build + 2.7.5 \ No newline at end of file diff --git a/bundles/ru.arsysop.loft.rgm.base.emf/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.base.emf/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.base.emf/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.base.emf/META-INF/MANIFEST.MF b/bundles/ru.arsysop.loft.rgm.base.emf/META-INF/MANIFEST.MF index 0c09c047b..221d88b4f 100644 --- a/bundles/ru.arsysop.loft.rgm.base.emf/META-INF/MANIFEST.MF +++ b/bundles/ru.arsysop.loft.rgm.base.emf/META-INF/MANIFEST.MF @@ -6,13 +6,9 @@ Bundle-Version: 0.2.0.qualifier Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.11.4";visibility:=reexport, - com.fasterxml.jackson.core.jackson-core;bundle-version="2.11.4";visibility:=reexport, - com.fasterxml.jackson.core.jackson-databind;bundle-version="2.11.4";visibility:=reexport, - org.eclipse.core.runtime;bundle-version="0.0.0", +Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0", org.eclipse.emf.ecore.xmi;bundle-version="0.0.0", org.eclipse.emf.edit;bundle-version="0.0.0";visibility:=reexport, - org.emfjson.jackson;bundle-version="1.3.0";visibility:=reexport, ru.arsysop.loft.rgm.seal;bundle-version="0.0.0" Bundle-ActivationPolicy: lazy Export-Package: ru.arsysop.loft.rgm.base.emf.command, diff --git a/bundles/ru.arsysop.loft.rgm.base.workbench/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.base.workbench/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.base.workbench/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.cxxdraft/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.cxxdraft/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.cxxdraft/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/ResolutionContext.java b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/ResolutionContext.java index 632021d19..ac8d878de 100644 --- a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/ResolutionContext.java +++ b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/ResolutionContext.java @@ -26,7 +26,9 @@ public interface ResolutionContext { Document document(); - String location(); + String rootLocation(); + + String resolveLocation(String suffix); ContentResolution parts(); diff --git a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/InvestigateHtmlTree.java b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/InvestigateHtmlTree.java index 8a1812e3a..8dde8bead 100644 --- a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/InvestigateHtmlTree.java +++ b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/InvestigateHtmlTree.java @@ -111,7 +111,7 @@ private void parseLocation(EObject container, SubMonitor split) throws CoreExcep .filter(Part.class::isInstance)// .map(Part.class::cast)// .map(Part::getLocation)// - .orElseGet(context::location); + .orElseGet(context::rootLocation); Structure structure = new StructureSwitch(context, revision).doSwitch(container); new PublishedHtml(location, structure).run(split); } diff --git a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/SimpleResolutionContext.java b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/SimpleResolutionContext.java index def92a673..bb233a45b 100644 --- a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/SimpleResolutionContext.java +++ b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/cxxdraft/base/SimpleResolutionContext.java @@ -48,10 +48,15 @@ public SimpleResolutionContext(String location, Document document) { } @Override - public String location() { + public String rootLocation() { return location; } + @Override + public String resolveLocation(String suffix) { + return rootLocation() + suffix; + } + @Override public Document document() { return document; diff --git a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/TocStructure.java b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/TocStructure.java index d525b7249..fe5a87a27 100644 --- a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/TocStructure.java +++ b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/TocStructure.java @@ -127,7 +127,7 @@ private void completeParagraph(TocChapter chapter, DomElement node, Consumer chapters, Co chapters.accept(chapter); Index index = factory.createIndex(); index.setId(new EncodeId().apply(chapter.getId())); - index.setLocation(context.location() + chapter.getId()); + index.setLocation(context.resolveLocation(chapter.getId())); index.setName(chapter.getName()); chapter.setPart(index); indexes.accept(index); diff --git a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/element/PickId.java b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/element/PickId.java index fe134a11f..e0080e8e3 100644 --- a/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/element/PickId.java +++ b/bundles/ru.arsysop.loft.rgm.cxxdraft/src/ru/arsysop/loft/rgm/internal/cxxdraft/element/PickId.java @@ -29,7 +29,7 @@ public PickId(ResolutionContext context) { @Override public String apply(String link) { - return link.replace(context.location(), ""); //$NON-NLS-1$ + return link.replace(context.rootLocation(), ""); //$NON-NLS-1$ } } diff --git a/bundles/ru.arsysop.loft.rgm.markup.ecore/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.markup.ecore/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.markup.ecore/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.markup.edit/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.markup.edit/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.markup.edit/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.markup.editor/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.markup.editor/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.markup.editor/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.markup.model/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.markup.model/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.markup.model/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.seal/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.seal/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.seal/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.spec.ecore/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.spec.ecore/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.spec.ecore/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.spec.edit/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.spec.edit/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.spec.edit/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.spec.editor/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.spec.editor/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.spec.editor/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.spec.workbench/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.spec.workbench/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.spec.workbench/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.spec.workspace/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.spec.workspace/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.spec.workspace/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.synopsis.ecore/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.synopsis.ecore/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.synopsis.ecore/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.synopsis.edit/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.synopsis.edit/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.synopsis.edit/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.synopsis.editor/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.synopsis.editor/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.synopsis.editor/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm.synopsis.model/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm.synopsis.model/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm.synopsis.model/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/ru.arsysop.loft.rgm/.settings/org.eclipse.core.resources.prefs b/bundles/ru.arsysop.loft.rgm/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/bundles/ru.arsysop.loft.rgm/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/features/ru.arsysop.loft.rgm.base.feature/feature.xml b/features/ru.arsysop.loft.rgm.base.feature/feature.xml index f37ff1f06..746e97355 100644 --- a/features/ru.arsysop.loft.rgm.base.feature/feature.xml +++ b/features/ru.arsysop.loft.rgm.base.feature/feature.xml @@ -48,32 +48,4 @@ version="0.0.0" unpack="false"/> - - - - - - - - diff --git a/releng/ru.arsysop.loft.rgm.parent/pom.xml b/releng/ru.arsysop.loft.rgm.parent/pom.xml index b0d1bd70c..9db6907da 100644 --- a/releng/ru.arsysop.loft.rgm.parent/pom.xml +++ b/releng/ru.arsysop.loft.rgm.parent/pom.xml @@ -37,7 +37,7 @@ ${unqualifiedVersion}.${buildQualifier} scm:git:https://github.com/arsysop/loft-rgm.git - 2.5.0 + 2.7.5 1.3.1 https://repo.eclipse.org/content/repositories/tycho-snapshots/ diff --git a/releng/ru.arsysop.loft.rgm.target/ru.arsysop.loft.rgm.target.target b/releng/ru.arsysop.loft.rgm.target/ru.arsysop.loft.rgm.target.target index d7b503071..95f15125b 100644 --- a/releng/ru.arsysop.loft.rgm.target/ru.arsysop.loft.rgm.target.target +++ b/releng/ru.arsysop.loft.rgm.target/ru.arsysop.loft.rgm.target.target @@ -15,50 +15,54 @@ # (as an individual or Legal Entity), even if aware of such consequences. # --> - - + - + - + + + + + + - + - + - + - + - + - + - + @@ -66,54 +70,24 @@ - + - + - + - + - - - - com.fasterxml.jackson.core - jackson-annotations - 2.11.4 - jar - - - - - - - com.fasterxml.jackson.core - jackson-core - 2.11.4 - jar - - - - - - - com.fasterxml.jackson.core - jackson-databind - 2.11.4 - jar - - - - + com.github.jtidy @@ -123,7 +97,7 @@ - + org.dom4j @@ -133,15 +107,5 @@ - - - - org.emfjson - emfjson-jackson - 1.3.0 - jar - - - \ No newline at end of file diff --git a/tests/ru.arsysop.loft.rgm.cxxdraft.tests/.settings/org.eclipse.core.resources.prefs b/tests/ru.arsysop.loft.rgm.cxxdraft.tests/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/tests/ru.arsysop.loft.rgm.cxxdraft.tests/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/tests/ru.arsysop.loft.rgm.cxxdraft.tests/src/ru/arsysop/loft/rgm/cxxdraft/tests/cxx14/integrity/Cxx14IntegrityTest.java b/tests/ru.arsysop.loft.rgm.cxxdraft.tests/src/ru/arsysop/loft/rgm/cxxdraft/tests/cxx14/integrity/Cxx14IntegrityTest.java index 67b2d7059..2fc4ccb7e 100644 --- a/tests/ru.arsysop.loft.rgm.cxxdraft.tests/src/ru/arsysop/loft/rgm/cxxdraft/tests/cxx14/integrity/Cxx14IntegrityTest.java +++ b/tests/ru.arsysop.loft.rgm.cxxdraft.tests/src/ru/arsysop/loft/rgm/cxxdraft/tests/cxx14/integrity/Cxx14IntegrityTest.java @@ -37,7 +37,7 @@ public abstract class Cxx14IntegrityTest { public static void performParsing() throws CoreException { document.setToc(SpecFactory.eINSTANCE.createToc()); new PublishedHtml(// - context.location(), // + context.rootLocation(), // new TocStructure(document.getToc(), context)// ).run(new NullProgressMonitor()); } diff --git a/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/META-INF/MANIFEST.MF b/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/META-INF/MANIFEST.MF index ab0b37586..774e5e70f 100644 --- a/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/META-INF/MANIFEST.MF +++ b/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 0.2.0.qualifier Require-Bundle: org.junit;bundle-version="4.13.0", ru.arsysop.loft.rgm.spec.model;bundle-version="0.0.0", ru.arsysop.loft.rgm.cxxdraft;bundle-version="0.0.0", - org.eclipse.core.runtime;bundle-version="3.23.0" + org.eclipse.core.runtime;bundle-version="0.0.0" Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/src/ru/arsysop/loft/rgm/spec/cpp14/tests/integrity/CxxIntegrityTest.java b/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/src/ru/arsysop/loft/rgm/spec/cpp14/tests/integrity/CxxIntegrityTest.java index fd3d79dd4..23ba684c4 100644 --- a/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/src/ru/arsysop/loft/rgm/spec/cpp14/tests/integrity/CxxIntegrityTest.java +++ b/tests/ru.arsysop.loft.rgm.spec.cpp14.tests/src/ru/arsysop/loft/rgm/spec/cpp14/tests/integrity/CxxIntegrityTest.java @@ -54,7 +54,7 @@ private void performParsing() throws CoreException { ResolutionContext context = new SimpleResolutionContext(URL, document); document.setToc(SpecFactory.eINSTANCE.createToc()); new PublishedHtml(// - context.location(), // + context.rootLocation(), // new TocStructure(document.getToc(), context)// ).run(new NullProgressMonitor()); document.getSections().stream() //