Skip to content

Commit ae3483e

Browse files
Use only german hyphenate pattern (#1864)
* Use only german hyphenate pattern * remove fop-hyph plugin again --------- Co-authored-by: Marius Heine <[email protected]>
1 parent 4643833 commit ae3483e

File tree

10 files changed

+16
-14
lines changed

10 files changed

+16
-14
lines changed

java/bundles/org.eclipse.set.feature.export/.classpath

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3+
<classpathentry exported="true" kind="lib" path="hyph/"/>
34
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
45
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
56
<classpathentry kind="src" path="src"/>

java/bundles/org.eclipse.set.feature.export/META-INF/MANIFEST.MF

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ Import-Package: jakarta.annotation,
110110
org.osgi.service.event,
111111
org.slf4j;version="1.7.2"
112112
Bundle-ActivationPolicy: lazy
113+
Bundle-ClassPath: hyph/,
114+
.
113115
Service-Component: OSGI-INF/org.eclipse.set.feature.export.descriptions.SiteplanModelExportDescriptionService.xml,
114116
OSGI-INF/org.eclipse.set.feature.export.descriptions.TitleBoxPdfDescriptionService.xml,
115117
OSGI-INF/org.eclipse.set.feature.export.exportservice.ExportServiceImpl.xml,

java/bundles/org.eclipse.set.feature.export/build.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ bin.includes = META-INF/,\
33
.,\
44
OSGI-INF/,\
55
fop.e4xmi,\
6-
plugin.xml
6+
plugin.xml,\
7+
hyph/
78
source.. = src/,\
89
xtend-gen/
326 KB
Binary file not shown.
333 KB
Binary file not shown.
330 KB
Binary file not shown.

java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/fop/FopServiceImpl.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import java.io.IOException;
1515
import java.io.OutputStream;
1616
import java.net.URI;
17+
import java.net.URISyntaxException;
1718
import java.nio.file.Path;
1819
import java.util.Map;
1920

@@ -27,6 +28,7 @@
2728
import org.apache.fop.apps.Fop;
2829
import org.apache.fop.apps.FopFactory;
2930
import org.apache.fop.apps.FopFactoryBuilder;
31+
import org.apache.fop.apps.io.ResourceResolverFactory;
3032
import org.apache.fop.configuration.ConfigurationException;
3133
import org.apache.xmlgraphics.io.Resource;
3234
import org.apache.xmlgraphics.io.ResourceResolver;
@@ -99,12 +101,18 @@ public OutputStream getOutputStream(final URI uri) throws IOException {
99101
* a configuration exception occurred
100102
* @throws SAXException
101103
* a SAX exception occurred
104+
* @throws URISyntaxException
102105
*/
103106
@Activate
104-
public void activate()
105-
throws IOException, SAXException, ConfigurationException {
107+
public void activate() throws IOException, SAXException,
108+
ConfigurationException, URISyntaxException {
106109
final FopFactoryBuilder fopFactoryBuilder = new FopFactoryBuilder(
107110
new File(".").toURI(), proxyResourceResolver); //$NON-NLS-1$
111+
fopFactoryBuilder.setHyphenBaseResourceResolver(
112+
ResourceResolverFactory.createDefaultInternalResourceResolver(
113+
FopServiceImpl.class.getClassLoader()
114+
.getResource("hyph") //$NON-NLS-1$
115+
.toURI()));
108116
fopFactory = fopFactoryBuilder.build();
109117
fopFactory.getRendererFactory()
110118
.addDocumentHandlerMaker(

java/bundles/org.eclipse.set.feature/feature.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,10 +1422,6 @@ http://www.eclipse.org/legal/epl-v20.html
14221422
id="org.apache.commons.commons-logging"
14231423
version="0.0.0"/>
14241424

1425-
<plugin
1426-
id="maven.net.sf.offo.artifact.fop-hyph"
1427-
version="0.0.0"/>
1428-
14291425
<plugin
14301426
id="org.apache.commons.commons-collections4"
14311427
version="0.0.0"/>

java/bundles/org.eclipse.set.releng.set.product/set.product

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
<windowImages/>
2626

27+
2728
<launcher name="set">
2829
<win useIco="true">
2930
<bmp/>
@@ -52,7 +53,6 @@
5253

5354
<configurations>
5455
<plugin id="ch.qos.logback.classic" autoStart="true" startLevel="2" />
55-
<plugin id="maven.net.sf.offo.artifact.fop-hyph" autoStart="true" startLevel="4" />
5656
<plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
5757
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
5858
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="1" />

java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,6 @@
227227
</location>
228228
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Apache FOP" missingManifest="generate" type="Maven">
229229
<dependencies>
230-
<dependency>
231-
<groupId>net.sf.offo</groupId>
232-
<artifactId>fop-hyph</artifactId>
233-
<version>2.0</version>
234-
<type>jar</type>
235-
</dependency>
236230
<dependency>
237231
<groupId>org.apache.xmlgraphics</groupId>
238232
<artifactId>fop</artifactId>

0 commit comments

Comments
 (0)