Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update manifest to java 11 test #236

Merged
merged 5 commits into from
Nov 12, 2023
Merged

Update manifest to java 11 test #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13ee74d
clean emf commons, update to java 11
UrsZeidler Nov 10, 2023
ebe1de7
add fop help and update
UrsZeidler Nov 11, 2023
803125f
fix test
UrsZeidler Nov 12, 2023
2c512cf
update jenkins file move perf report
UrsZeidler Nov 11, 2023
6b071ab
use RandomAccessReadBufferedFile
UrsZeidler Nov 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 13 additions & 3 deletions build/ant/rcptt-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</path>
<property name="s-runner" refid="shr5-runner"/>
<basename property="s.launcher" file="${s-runner}"/>
<echo>found verinice.launcher: ${s.launcher}</echo>
<echo>found launcher: ${s.launcher}</echo>

<path id="shr5-starter">
<dirset dir="${aut-path}/plugins">
Expand All @@ -49,7 +49,7 @@
</path>
<property name="s-launcher" refid="shr5-starter"/>
<basename property="s.starter" file="${s-launcher}"/>
<echo>found verinice.starter: ${s.starter}</echo>
<echo>found starter: ${s.starter}</echo>

<delete file="${aut-path}/run_shr.ini" />
<echo file="${aut-path}/run_shr.ini">-startup plugins/${s.launcher}
Expand Down Expand Up @@ -78,7 +78,16 @@ ${language}
<echo>found erunner: ${erunner}</echo>
</target>


<!-- - - - - - - - - - - - - - - - - -
target: fix-junit-result-xml
- - - - - - - - - - - - - - - - - -->
<target name="fix-junit-result-xml">
<replaceregexp file="${test-results}/results.junit.xml" flags="g"
match='testcase[ \n\r\t]name="([^"]*)"'
replace='testcase classname="${language}TEST" name="\1"' />
<move verbose="true" file="${test-results}/results.junit.xml" tofile="${test-results}/results.${language}-junit.xml"/>
</target>

<target name="test" depends="init,configure-aut,configure.rcptt.runner">
<java jar="${runner-path}/plugins/${erunner}" fork="true">
<arg value="-application" />
Expand Down Expand Up @@ -119,5 +128,6 @@ ${language}
<arg value="testExecTimeout=600;execTimeout=3600;reportingIncludeIgnoredWaitDetails=true;reportingPassedTestDetails=true;runtimeEnableActivityLogs=true;q7ImageCapture=true" />

</java>
<antcall target="fix-junit-result-xml"/>
</target>
</project>
5 changes: 3 additions & 2 deletions build/docker/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ pipeline {
*/
run_rcptt('en','*.test', 'de;doc', 'en_all')
run_rcptt('de','*.test', 'en;doc', 'de_all')
perfReport filterRegex: '', showTrendGraphs: true, sourceDataFiles: 'build/**/*junit.xml'

// perfReport filterRegex: '', sourceDataFiles: 'build/results_'+language+'/results.junit.xml'
}//end of steps
}//end of stage
Expand Down Expand Up @@ -91,14 +93,13 @@ def run_rcptt(String language,String testList, String skipTags, String reportNam

mv build/results build/results_${language}
"""
junit 'build/results_'+language+'/results.junit.xml'
junit 'build/results_'+language+'/results.'+language+'-junit.xml'

}//with env
}// with ant
// some block
}
archiveArtifacts artifacts: 'build/results*/**/*.*', followSymlinks: false
perfReport filterRegex: '', showTrendGraphs: true, sourceDataFiles: 'build/**/results*.xml'
publishHTML([allowMissing: false,
alwaysLinkToLastBuild: false,
keepAll: false,
Expand Down
2 changes: 1 addition & 1 deletion build/launchconfig/clean.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/build}/../"/>
</launchConfiguration>
1 change: 1 addition & 0 deletions de.urszeidler.emf.commons.ui/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
2 changes: 0 additions & 2 deletions de.urszeidler.emf.commons.ui/bin/.gitignore
View file
Open in desktop

This file was deleted.

Binary file removed de.urszeidler.emf.commons.ui/bin/org/eclipse/wb/swt/ResourceManager$1.class
View file
Open in desktop
Binary file not shown.
Binary file removed ...eidler.emf.commons.ui/bin/org/eclipse/wb/swt/ResourceManager$PluginResourceProvider.class
View file
Open in desktop
Binary file not shown.
Binary file removed de.urszeidler.emf.commons.ui/bin/org/eclipse/wb/swt/ResourceManager.class
View file
Open in desktop
Binary file not shown.
Binary file removed de.urszeidler.emf.commons.ui/bin/org/eclipse/wb/swt/SWTResourceManager.class
View file
Open in desktop
Binary file not shown.
39 changes: 39 additions & 0 deletions de.urszeidler.fop.help/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/fop-2.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/fop-core-2.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/fop-events-2.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/fop-util-2.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-codec-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-constants-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-css-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-dom-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-ext-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-extension-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-i18n-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-parser-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-script-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-shared-resources-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-util-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-io-2.11.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/fontbox-2.0.27.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-2.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/pdfbox-app-3.0.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions de.urszeidler.fop.help/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
28 changes: 28 additions & 0 deletions de.urszeidler.fop.help/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>de.urszeidler.fop.help</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
15 changes: 15 additions & 0 deletions de.urszeidler.fop.help/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=11
55 changes: 55 additions & 0 deletions de.urszeidler.fop.help/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Automatic-Module-Name: de.urszeidler.fop.help
Bundle-Name: Help
Bundle-SymbolicName: de.urszeidler.fop.help
Bundle-Version: 1.0.0.qualifier
Export-Package: org.apache.batik.transcoder,
org.apache.fop,
org.apache.fop.apps,
org.apache.fop.svg,
org.apache.pdfbox,
org.apache.pdfbox.cos,
org.apache.pdfbox.io,
org.apache.pdfbox.multipdf,
org.apache.pdfbox.pdmodel,
org.apache.pdfbox.pdmodel.common,
org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline,
org.apache.pdfbox.text
Bundle-Activator: de.urszeidler.fop.help.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.w3c.dom.svg;bundle-version="1.1.0",
org.w3c.dom.smil;bundle-version="1.0.1",
org.w3c.css.sac;bundle-version="1.3.1"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
lib/pdfbox-app-3.0.0.jar,
lib/batik-anim-1.17.jar,
lib/batik-awt-util-1.17.jar,
lib/batik-bridge-1.17.jar,
lib/batik-codec-1.17.jar,
lib/batik-constants-1.17.jar,
lib/batik-css-1.17.jar,
lib/batik-dom-1.17.jar,
lib/batik-ext-1.17.jar,
lib/batik-extension-1.17.jar,
lib/batik-gvt-1.17.jar,
lib/batik-i18n-1.17.jar,
lib/batik-parser-1.17.jar,
lib/batik-script-1.17.jar,
lib/batik-shared-resources-1.17.jar,
lib/batik-svg-dom-1.17.jar,
lib/batik-svggen-1.17.jar,
lib/batik-transcoder-1.17.jar,
lib/batik-util-1.17.jar,
lib/batik-xml-1.17.jar,
lib/commons-io-2.11.0.jar,
lib/commons-logging-1.0.4.jar,
lib/fontbox-2.0.27.jar,
lib/xmlgraphics-commons-2.9.jar,
lib/fop-2.9.jar,
lib/fop-core-2.9.jar,
lib/fop-events-2.9.jar,
lib/fop-util-2.9.jar
32 changes: 32 additions & 0 deletions de.urszeidler.fop.help/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
lib/pdfbox-app-3.0.0.jar,\
lib/batik-anim-1.17.jar,\
lib/batik-awt-util-1.17.jar,\
lib/batik-bridge-1.17.jar,\
lib/batik-codec-1.17.jar,\
lib/batik-constants-1.17.jar,\
lib/batik-css-1.17.jar,\
lib/batik-dom-1.17.jar,\
lib/batik-ext-1.17.jar,\
lib/batik-extension-1.17.jar,\
lib/batik-gvt-1.17.jar,\
lib/batik-i18n-1.17.jar,\
lib/batik-parser-1.17.jar,\
lib/batik-script-1.17.jar,\
lib/batik-shared-resources-1.17.jar,\
lib/batik-svg-dom-1.17.jar,\
lib/batik-svggen-1.17.jar,\
lib/batik-transcoder-1.17.jar,\
lib/batik-util-1.17.jar,\
lib/batik-xml-1.17.jar,\
lib/commons-io-2.11.0.jar,\
lib/commons-logging-1.0.4.jar,\
lib/fontbox-2.0.27.jar,\
lib/xmlgraphics-commons-2.9.jar,\
lib/fop-2.9.jar,\
lib/fop-core-2.9.jar,\
lib/fop-events-2.9.jar,\
lib/fop-util-2.9.jar
Binary file added de.urszeidler.fop.help/lib/batik-anim-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-awt-util-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-bridge-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-codec-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-constants-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-css-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-dom-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-ext-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-extension-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-gvt-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-i18n-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-parser-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-script-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-shared-resources-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-svg-dom-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-svggen-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-transcoder-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-util-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/batik-xml-1.17.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/commons-io-2.11.0.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/commons-logging-1.0.4.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/fontbox-2.0.27.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/fop-2.9.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/fop-core-2.9.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/fop-events-2.9.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/fop-util-2.9.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/pdfbox-app-3.0.0.jar
View file
Open in desktop
Binary file not shown.
Binary file added de.urszeidler.fop.help/lib/xmlgraphics-commons-2.9.jar
View file
Open in desktop
Binary file not shown.
50 changes: 50 additions & 0 deletions de.urszeidler.fop.help/src/de/urszeidler/fop/help/Activator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package de.urszeidler.fop.help;

import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;

/**
* The activator class controls the plug-in life cycle
*/
public class Activator extends AbstractUIPlugin {

// The plug-in ID
public static final String PLUGIN_ID = "de.urszeidler.fop.help"; //$NON-NLS-1$

// The shared instance
private static Activator plugin;

/**
* The constructor
*/
public Activator() {
}

/*
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}

/*
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
}

/**
* Returns the shared instance
*
* @return the shared instance
*/
public static Activator getDefault() {
return plugin;
}

}
12 changes: 10 additions & 2 deletions de.urszeidler.shr5.acceleo/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="nonaccessible" pattern="java.xml*"/>
</accessrules>
</classpathentry>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
10 changes: 10 additions & 0 deletions de.urszeidler.shr5.acceleo/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=11
10 changes: 7 additions & 3 deletions de.urszeidler.shr5.acceleo/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,19 @@ Require-Bundle: org.eclipse.core.runtime,
org.apache.commons.codec;bundle-version="1.6.0",
de.urszeidler.shr5.scripting.edit,
de.urszeidler.shr5.ecp,
de.urszeidler.fop.help;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
org.apache.xmlgraphics;bundle-version="2.7.0"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
Export-Package: de.urszeidler.shr5.acceleo,
de.urszeidler.shr5.acceleo.common,
de.urszeidler.shr5.acceleo.main,
de.urszeidler.shr5.acceleo.sheets,
de.urszeidler.shr5.acceleo.util
Import-Package: org.apache.batik.transcoder,
org.apache.fop,
org.apache.fop.apps,
org.apache.fop.svg,
org.apache.pdfbox.multipdf
Automatic-Module-Name: de.urszeidler.shr5.acceleo
Import-Package: org.apache.batik.transcoder;resolution:=optional

2 changes: 1 addition & 1 deletion ...szeidler.shr5.acceleo/src/de/urszeidler/shr5/acceleo/sheets/AbstractSvg2PdfGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void doGenerate(Monitor monitor) throws IOException {
}
monitor.subTask("merging ...");
pdfMergerUtility.setDestinationFileName(getFilename());
pdfMergerUtility.mergeDocuments();
pdfMergerUtility.mergeDocuments(null);
} catch (TranscoderException e) {
Activator.logError("Error while storing as pdf", e);
}finally{
Expand Down
8 changes: 8 additions & 0 deletions de.urszeidler.shr5.ecp/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
4 changes: 1 addition & 3 deletions ...rszeidler.shr5.ecp/src/de/urszeidler/shr5/ecp/editor/actions/CreateTOCFromSourcebook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.common.COSArrayList;
import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
import org.eclipse.core.runtime.IProgressMonitor;
Expand Down Expand Up @@ -122,7 +120,7 @@ protected IStatus doAction(IProgressMonitor monitor, File docFile, IPreferenceSt
SourceLink link = Shr5Factory.eINSTANCE.createSourceLink();
link.setSrcBook(srcBook);
try {
PDDocument pdDocument = PDDocument.load(docFile);
PDDocument pdDocument = org.apache.pdfbox.Loader.loadPDF(docFile);
if (pdDocument.isEncrypted()) {
//pdDocument..decrypt("");
pdDocument.setAllSecurityToBeRemoved(true);
Expand Down
Loading