<?xml version="1.0" encoding="UTF-8"?>\r
<classpath>\r
- <classpathentry exported="true" kind="lib" path="fontbox-1.8.10.jar"/>\r
- <classpathentry exported="true" kind="lib" path="jempbox-1.8.10.jar"/>\r
- <classpathentry exported="true" kind="lib" path="xmpbox-1.8.10.jar"/>\r
- <classpathentry exported="true" kind="lib" path="pdfbox-1.8.10.jar" sourcepath="pdfbox-1.8.10-src.zip"/>\r
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>\r
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
<classpathentry kind="src" path="src"/>\r
Bundle-Vendor: Semantum Oy
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.help.base,
- org.apache.commons.logging;bundle-version="1.0.4"
+ org.apache.commons.logging;bundle-version="1.0.4",
+ org.apache.pdfbox;bundle-version="2.0.2",
+ org.apache.pdfbox.fontbox;bundle-version="2.0.2"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,
- xmpbox-1.8.10.jar,
- jempbox-1.8.10.jar,
- fontbox-1.8.10.jar,
- pdfbox-1.8.10.jar
+Bundle-ClassPath: .
output.. = bin/\r
bin.includes = META-INF/,\\r
.,\\r
- plugin.xml,\\r
- pdfbox-1.8.10.jar,\\r
- fontbox-1.8.10.jar,\\r
- jempbox-1.8.10.jar,\\r
- xmpbox-1.8.10.jar\r
+ plugin.xml\r
source.. = src/\r
package org.simantics.help.base.internal;\r
\r
import java.io.File;\r
-import java.io.FileInputStream;\r
import java.io.IOException;\r
\r
import org.apache.pdfbox.cos.COSDocument;\r
+import org.apache.pdfbox.io.RandomAccessFile;\r
import org.apache.pdfbox.pdfparser.PDFParser;\r
import org.apache.pdfbox.pdmodel.PDDocument;\r
import org.apache.pdfbox.pdmodel.PDDocumentInformation;\r
-import org.apache.pdfbox.util.PDFTextStripper;\r
+import org.apache.pdfbox.text.PDFTextStripper;\r
import org.eclipse.help.search.ISearchDocument;\r
\r
/**\r
public class PDFUtil {\r
\r
public static void stripText(File fromPdf, ISearchDocument doc) throws IOException {\r
- PDFParser parser = new PDFParser(new FileInputStream(fromPdf));\r
+ PDFParser parser = new PDFParser(new RandomAccessFile(fromPdf, "r"));\r
parser.parse();\r
\r
try (COSDocument cosDoc = parser.getDocument()) {\r
public static final TCon VEC_COMP = con(BUILTIN, "VecComp");
public static final TCon BINDING = con(BUILTIN, "Binding");
+ public static final TCon TYPE = con(BUILTIN, "Type");
+
public static final TCon DYNAMIC = con("Prelude", "Dynamic");
public static final TCon VARIANT = con(BUILTIN, "Variant");
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.simantics.scl.runtime,
org.simantics.scl.runtime.collection,
- org.simantics.scl.runtime.equations,
org.simantics.scl.runtime.exceptions,
org.simantics.scl.runtime.function,
org.simantics.scl.runtime.io,
+++ /dev/null
-effect Equation\r
- "equation"\r
- "org.simantics.scl.runtime.equations.EquationContext"\r
-\r
-importJava "org.simantics.scl.runtime.equations.EquationContext" where\r
- data EquationContext\r
-\r
- listenEquationVariable :: String -> (a -> <Equation,Proc> ()) -> <Equation,Proc> ()\r
- setEquationVariable :: String -> a -> <Equation> ()\r
- applyEquationContext :: (<Equation,Proc> a) -> EquationContext -> <Proc> a \r
- \r
-importJava "org.simantics.scl.runtime.equations.TestEquationContext" where\r
- solveEquations :: (<Equation,e> a) -> <e> [(String,String)]
\ No newline at end of file
+++ /dev/null
-package org.simantics.scl.runtime.equations;\r
-\r
-import org.simantics.scl.runtime.SCLContext;\r
-import org.simantics.scl.runtime.function.Function;\r
-import org.simantics.scl.runtime.tuple.Tuple0;\r
-\r
-public interface EquationContext {\r
- void listenEquationVariable(String variableName, Function callback);\r
- void setEquationVariable(String variableName, Object value);\r
- \r
- public static Object applyEquationContext(Function f, EquationContext equationContext) {\r
- SCLContext context = SCLContext.getCurrent();\r
- Object oldEquationContext = context.put("equation", equationContext);\r
- try {\r
- return f.apply(Tuple0.INSTANCE);\r
- } finally {\r
- context.put("equation", oldEquationContext);\r
- }\r
- }\r
-}\r
+++ /dev/null
-package org.simantics.scl.runtime.equations;\r
-\r
-import java.util.ArrayList;\r
-import java.util.Collections;\r
-import java.util.List;\r
-\r
-import org.simantics.scl.runtime.SCLContext;\r
-import org.simantics.scl.runtime.function.Function;\r
-import org.simantics.scl.runtime.tuple.Tuple0;\r
-import org.simantics.scl.runtime.tuple.Tuple2;\r
-\r
-import gnu.trove.map.hash.THashMap;\r
-import gnu.trove.procedure.TObjectObjectProcedure;\r
-\r
-public class TestEquationContext implements EquationContext {\r
-\r
- public static final boolean TRACE = true;\r
- \r
- THashMap<String, Object> values = new THashMap<String, Object>(); \r
- THashMap<String, ArrayList<Function>> listenerMap = new THashMap<String, ArrayList<Function>>(); \r
-\r
- @Override\r
- public void listenEquationVariable(String variableName, Function listener) {\r
- if(TRACE)\r
- System.out.println("listenEquationVariable(" + variableName + ", " + listener + ")");\r
- if(values.containsKey(variableName)) {\r
- Object value = values.get(variableName);\r
- if(TRACE)\r
- System.out.println(" apply " + value);\r
- listener.apply(value);\r
- }\r
- else {\r
- if(TRACE)\r
- System.out.println(" add listener");\r
- ArrayList<Function> listeners = listenerMap.get(variableName);\r
- if(listeners == null) {\r
- listeners = new ArrayList<Function>();\r
- listenerMap.put(variableName, listeners);\r
- }\r
- listeners.add(listener);\r
- }\r
- }\r
-\r
- @Override\r
- public void setEquationVariable(String variableName, Object value) {\r
- if(TRACE)\r
- System.out.println("setEquationVariable(" + variableName + ", " + value + ")");\r
- if(values.containsKey(variableName))\r
- throw new IllegalStateException("Value for " + variableName + " already defined (oldValue=" + values.get(variableName) + \r
- ", newValue=" + value + ").");\r
- values.put(variableName, value);\r
- ArrayList<Function> listeners = listenerMap.remove(variableName);\r
- SCLContext context = SCLContext.getCurrent();\r
- if(listeners != null) {\r
- Object oldEquationContex = context.put("equation", this);\r
- try {\r
- for(Function listener : listeners) {\r
- if(TRACE)\r
- System.out.println(" apply " + listener + " " + value);\r
- listener.apply(value);\r
- }\r
- } finally {\r
- context.put("equation", oldEquationContex);\r
- }\r
- }\r
- }\r
- \r
- public static List<Tuple2> solveEquations(Function f) {\r
- TestEquationContext equationContext = new TestEquationContext();\r
- SCLContext context = SCLContext.getCurrent();\r
- Object oldEquationContext = context.put("equation", equationContext);\r
- try {\r
- f.apply(Tuple0.INSTANCE);\r
- } finally {\r
- context.put("equation", oldEquationContext);\r
- }\r
- ArrayList<Tuple2> result = new ArrayList<Tuple2>(equationContext.values.size());\r
- equationContext.values.forEachEntry(new TObjectObjectProcedure<String, Object>() {\r
- @Override\r
- public boolean execute(String a, Object b) {\r
- result.add(new Tuple2(a, String.valueOf(b)));\r
- return true;\r
- }\r
- });\r
- Collections.sort(result, (t1, t2) -> {\r
- return ((String)t1.c0).compareTo((String)t2.c0);\r
- });\r
- return result;\r
- }\r
- \r
- public THashMap<String, Object> getValues() {\r
- return values;\r
- }\r
-\r
-}\r
<modules>\r
<module>com.lowagie.text.feature</module>\r
<module>org.apache.lucene4.feature</module>\r
+ <module>org.jfree.feature</module>\r
<module>org.simantics.browsing.ui.feature</module>\r
<module>org.simantics.charts.feature</module>\r
<module>org.simantics.data.feature</module>\r
--- /dev/null
+Run mvn p2:site to build the P2 repository of the external components listed in pom.xml.
\ No newline at end of file
<version>1.25.0</version>\r
\r
<properties>\r
+ <itext.version.actual>2.1.7.b1</itext.version.actual>\r
<lucene.version>4.9.0</lucene.version>\r
+ <lucene.version.actual>4.9.0.b0003</lucene.version.actual>\r
<lucene.prefix>org.apache.lucene4</lucene.prefix>\r
</properties>\r
\r
<source>true</source>\r
<instructions>\r
<Bundle-SymbolicName>${lucene.prefix}.core</Bundle-SymbolicName>\r
+ <Bundle-Version>${lucene.version.actual}</Bundle-Version>\r
+ <Export-Package>*;version="${lucene.version}"</Export-Package>\r
</instructions>\r
</artifact>\r
<artifact>\r
<source>true</source>\r
<instructions>\r
<Bundle-SymbolicName>${lucene.prefix}.queries</Bundle-SymbolicName>\r
+ <Bundle-Version>${lucene.version.actual}</Bundle-Version>\r
+ <Require-Bundle>${lucene.prefix}.core;bundle-version="${lucene.version}"</Require-Bundle>\r
+ <Export-Package>*;version="${lucene.version}"</Export-Package>\r
+ <Import-Package>!org.apache.lucene.*,*;resolution:=optional</Import-Package>\r
</instructions>\r
</artifact>\r
<artifact>\r
<source>true</source>\r
<instructions>\r
<Bundle-SymbolicName>${lucene.prefix}.sandbox</Bundle-SymbolicName>\r
+ <Bundle-Version>${lucene.version.actual}</Bundle-Version>\r
+ <Require-Bundle>${lucene.prefix}.core;bundle-version="${lucene.version}"</Require-Bundle>\r
+ <Export-Package>*;version="${lucene.version}"</Export-Package>\r
+ <Import-Package>!org.apache.lucene.*,*;resolution:=optional</Import-Package>\r
</instructions>\r
</artifact>\r
<artifact>\r
- <id>org.apache.lucene:lucene-queryparser:${lucene.version}</id>\r
+ <id>org.apache.lucene:lucene-analyzers-common:${lucene.version}</id>\r
<source>true</source>\r
<instructions>\r
- <Bundle-SymbolicName>${lucene.prefix}.queryparser</Bundle-SymbolicName>\r
+ <Bundle-SymbolicName>${lucene.prefix}.analyzers-common</Bundle-SymbolicName>\r
+ <Bundle-Version>${lucene.version.actual}</Bundle-Version>\r
+ <Require-Bundle>${lucene.prefix}.core;bundle-version="${lucene.version}"</Require-Bundle>\r
+ <Export-Package>*;version="${lucene.version}"</Export-Package>\r
+ <Import-Package>!org.apache.lucene.*,*;resolution:=optional</Import-Package>\r
</instructions>\r
</artifact>\r
<artifact>\r
- <id>org.apache.lucene:lucene-analyzers-common:${lucene.version}</id>\r
+ <id>org.apache.lucene:lucene-queryparser:${lucene.version}</id>\r
<source>true</source>\r
<instructions>\r
- <Bundle-SymbolicName>${lucene.prefix}.analyzers-common</Bundle-SymbolicName>\r
+ <Bundle-SymbolicName>${lucene.prefix}.queryparser</Bundle-SymbolicName>\r
+ <Bundle-Version>${lucene.version.actual}</Bundle-Version>\r
+ <Require-Bundle>${lucene.prefix}.core;bundle-version="${lucene.version}",${lucene.prefix}.queries;bundle-version="${lucene.version}",${lucene.prefix}.sandbox;bundle-version="${lucene.version}"</Require-Bundle>\r
+ <Export-Package>*;version="${lucene.version}"</Export-Package>\r
+ <Import-Package>!org.apache.lucene.*,*;resolution:=optional</Import-Package>\r
</instructions>\r
</artifact>\r
<artifact>\r
</artifact>\r
<artifact>\r
<id>org.eclipse.collections:eclipse-collections-api:7.1.0</id>\r
+ <override>true</override>\r
<source>true</source>\r
+ <instructions>\r
+ <Export-Package>org.eclipse.collections.*</Export-Package>\r
+ </instructions>\r
</artifact>\r
<artifact>\r
<id>org.eclipse.collections:eclipse-collections:7.1.0</id>\r
<source>true</source>\r
<instructions>\r
<Bundle-SymbolicName>com.lowagie.text</Bundle-SymbolicName>\r
+ <Bundle-Version>${itext.version.actual}</Bundle-Version>\r
</instructions>\r
</artifact>\r
<artifact>\r
<unit id="org.objectweb.asm.tree.source" version="5.0.1.v201404251740"/>\r
<unit id="org.objectweb.asm.analysis" version="5.0.1.v201505121915"/>\r
<unit id="org.objectweb.asm.tree" version="5.0.1.v201404251740"/>\r
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>\r
+<repository location="http://www.simantics.org/update/tools/orbit/downloads/drops/R20160221192158/repository/"/>\r
</location>\r
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="2.7.0.v20151015-1452"/>\r
<repository location="http://www.simantics.org/update/nebula/Q22016/release/"/>\r
</location>\r
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="org.apache.lucene4.queries" version="4.9.0"/>\r
+<unit id="org.apache.lucene4.queries" version="4.9.0.b0003"/>\r
<unit id="org.apache.commons.lang.source" version="2.6.0"/>\r
-<unit id="org.apache.lucene4.sandbox.source" version="4.9.0"/>\r
+<unit id="org.apache.lucene4.sandbox.source" version="4.9.0.b0003"/>\r
<unit id="org.antlr.runtime.source" version="3.5.2"/>\r
<unit id="org.apache.commons.compress" version="1.12.0"/>\r
<unit id="org.apache.pdfbox.source" version="2.0.2"/>\r
<unit id="org.eclipse.collections.eclipse-collections.source" version="7.1.0"/>\r
<unit id="freemarker" version="2.3.23.stable"/>\r
<unit id="com.github.virtuald.curvesapi.source" version="1.3.0"/>\r
-<unit id="org.apache.lucene4.analyzers-common" version="4.9.0"/>\r
+<unit id="org.apache.lucene4.analyzers-common" version="4.9.0.b0003"/>\r
<unit id="org.apache.commons.collections.source" version="3.2.2"/>\r
<unit id="org.apache.pdfbox.fontbox" version="2.0.2"/>\r
<unit id="org.apache.commons.compress.source" version="1.12.0"/>\r
<unit id="org.mozilla.rhino.source" version="1.7.7.1"/>\r
-<unit id="org.apache.lucene4.queries.source" version="4.9.0"/>\r
+<unit id="org.apache.lucene4.queries.source" version="4.9.0.b0003"/>\r
<unit id="freemarker.source" version="2.3.23.stable"/>\r
<unit id="jakarta-regexp" version="1.4.0"/>\r
<unit id="net.jcip.annotations.source" version="1.0.0"/>\r
<unit id="org.apache.log4j.source" version="1.2.17"/>\r
-<unit id="org.apache.lucene4.sandbox" version="4.9.0"/>\r
+<unit id="org.apache.lucene4.sandbox" version="4.9.0.b0003"/>\r
<unit id="org.apache.commons.logging.source" version="1.2.0"/>\r
<unit id="org.apache.commons.io.source" version="1.4.0"/>\r
-<unit id="org.apache.lucene4.core" version="4.9.0"/>\r
+<unit id="org.apache.lucene4.core" version="4.9.0.b0003"/>\r
<unit id="com.healthmarketscience.jackcess" version="2.1.3"/>\r
<unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>\r
<unit id="org.eclipse.collections.eclipse-collections-api" version="7.1.0"/>\r
<unit id="org.bouncycastle.bcprov-jdk14.source" version="1.38.0"/>\r
<unit id="stax.api" version="1.0.1"/>\r
<unit id="org.apache.pdfbox.fontbox.source" version="2.0.2"/>\r
-<unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0"/>\r
+<unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0.b0003"/>\r
<unit id="it.unimi.dsi.fastutil" version="7.0.12"/>\r
<unit id="net.jcip.annotations" version="1.0.0"/>\r
<unit id="org.bouncycastle.bctsp-jdk14" version="1.38.0"/>\r
<unit id="org.jfree.jchart.source" version="1.0.19"/>\r
-<unit id="org.apache.lucene4.queryparser" version="4.9.0"/>\r
+<unit id="org.apache.lucene4.queryparser" version="4.9.0.b0003"/>\r
<unit id="org.apache.poi.ooxml-schemas" version="3.14.0"/>\r
<unit id="org.bouncycastle.bcprov-jdk14" version="1.38.0"/>\r
<unit id="org.apache.poi" version="3.14.0"/>\r
<unit id="org.apache.commons.lang" version="2.6.0"/>\r
<unit id="org.jfree.jchart" version="1.0.19"/>\r
<unit id="org.apache.commons.codec.source" version="1.10.0"/>\r
-<unit id="com.lowagie.text.source" version="2.1.7"/>\r
+<unit id="com.lowagie.text.source" version="2.1.7.b1"/>\r
<unit id="org.supercsv.source" version="2.4.0"/>\r
<unit id="com.github.virtuald.curvesapi" version="1.3.0"/>\r
<unit id="org.eclipse.collections.eclipse-collections" version="7.1.0"/>\r
<unit id="org.apache.log4j" version="1.2.17"/>\r
-<unit id="com.lowagie.text" version="2.1.7"/>\r
+<unit id="com.lowagie.text" version="2.1.7.b1"/>\r
<unit id="org.apache.poi.ooxml" version="3.14.0"/>\r
<unit id="org.apache.pdfbox" version="2.0.2"/>\r
<unit id="org.bouncycastle.bcmail-jdk14" version="1.38.0"/>\r
<unit id="javax.vecmath" version="1.5.2"/>\r
<unit id="bouncycastle.bcprov-jdk14" version="138.0.0"/>\r
<unit id="org.ini4j.source" version="0.5.4"/>\r
-<unit id="org.apache.lucene4.core.source" version="4.9.0"/>\r
-<unit id="org.apache.lucene4.queryparser.source" version="4.9.0"/>\r
-<repository location="http://www.simantics.org/update/external-components/master"/>\r
+<unit id="org.apache.lucene4.core.source" version="4.9.0.b0003"/>\r
+<unit id="org.apache.lucene4.queryparser.source" version="4.9.0.b0003"/>\r
+<repository location="http://www.simantics.org/download/master/external-components"/>\r
</location>\r
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
<unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20160811-1516"/>\r
-<repository location="http://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/"/>\r
+<repository location="http://www.simantics.org/update/e4/snapshots/org.eclipse.e4.tools/latest/"/>\r
</location>\r
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
<unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201605182147"/>\r
<unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.0.0.201606011907"/>\r
<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201606011907"/>\r
<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.4.0.201606011907"/>\r
-<repository location="http://download.eclipse.org/nattable/releases/1.4.0/repository/"/>\r
+<repository location="http://www.simantics.org/update/nebula/nattable/releases/1.4.0/repository/"/>\r
</location>\r
</locations>\r
</target>\r