You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by se...@apache.org on 2019/12/04 01:54:25 UTC
svn commit: r1870777 - in /ctakes/trunk/ctakes-dockhand/src/main:
java/org/apache/ctakes/dockhand/build/
java/org/apache/ctakes/dockhand/gui/feature/
java/org/apache/ctakes/gui/progress/
java/org/apache/ctakes/gui/wizard/util/ resources/org/apache/ctak...
Author: seanfinan
Date: Wed Dec 4 01:54:25 2019
New Revision: 1870777
URL: http://svn.apache.org/viewvc?rev=1870777&view=rev
Log:
Refactoring, minor updates / fixes
Added:
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/binary/RunPiperGui.bat
- copied unchanged from r1870776, ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/binary/RunPipeline.bat
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/binary/RunPiperGui.sh
- copied unchanged from r1870776, ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/binary/RunPipeline.sh
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/docker/
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/docker/Dockerfile
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/docker/
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/docker/Dockerfile
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pipeline/
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pipeline/TinyRestPipeline.piper
Removed:
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/binary/RunPipeline.bat
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/binary/RunPipeline.sh
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/docker/
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/rest/
Modified:
ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/InstallHelper.java
ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/LocalInstallBuilder.java
ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/MavenHelper.java
ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/RestDockerBuilder.java
ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/gui/feature/Option.java
ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/gui/progress/NoteProgressDialog.java
ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/gui/wizard/util/DialogUtil.java
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/attribute_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/build.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/coreference_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/entity_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_coref_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_temporal_coreference_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_temporal_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/temporal_coref_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/temporal_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/token_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/attribute_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/coreference_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/entity_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_coref_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_temporal_coreference_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_temporal_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/temporal_coref_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/temporal_pom.xml
ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/token_pom.xml
Modified: ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/InstallHelper.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/InstallHelper.java?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/InstallHelper.java (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/InstallHelper.java Wed Dec 4 01:54:25 2019
@@ -27,7 +27,7 @@ public enum InstallHelper {
public File chooseInstallDir() {
- final File installDir = DialogUtil.chooseSaveDir();
+ final File installDir = DialogUtil.chooseSaveDir( "Choose Apache cTAKES Installation Directory" );
if ( installDir == null ) {
return NO_FILE;
}
Modified: ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/LocalInstallBuilder.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/LocalInstallBuilder.java?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/LocalInstallBuilder.java (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/LocalInstallBuilder.java Wed Dec 4 01:54:25 2019
@@ -3,7 +3,10 @@ package org.apache.ctakes.dockhand.build
import org.apache.ctakes.dockhand.gui.feature.GoalPom;
import org.apache.ctakes.dockhand.gui.wizard.DhWizardController;
import org.apache.ctakes.gui.wizard.util.DialogUtil;
+import org.apache.ctakes.gui.wizard.util.RunnerUtil;
+import org.apache.ctakes.gui.wizard.util.SystemUtil;
+import java.io.File;
import java.util.Collection;
@@ -19,6 +22,7 @@ final public class LocalInstallBuilder i
static private final String BINARY_DIR = "/org/apache/ctakes/dockhand/binary/";
static private final String SOURCE_URLDIR = "/org/apache/ctakes/dockhand/goal/local/";
+ static private final String INSTALL_DIRNAME = "apache-ctakes-4.0.1-SNAPSHOT";
private final DhWizardController _wizardController;
@@ -27,6 +31,11 @@ final public class LocalInstallBuilder i
}
public void run() {
+ final boolean maven = MavenHelper.getInstance().installMaven();
+ if ( !maven ) {
+ return;
+ }
+
final GoalPom goalPom = _wizardController.getGoalPom();
final Collection<String> piperCommands = _wizardController.getPiperCommands();
@@ -34,26 +43,90 @@ final public class LocalInstallBuilder i
= new BaseInstaller( INSTALL_TYPE,
SOURCE_URLDIR, goalPom.getPomFile(), piperCommands,
SOURCE_URLDIR + "pom/build.xml",
- BINARY_DIR + "RunPipeline.sh",
- BINARY_DIR + "RunPipeline.bat" );
+ BINARY_DIR + "RunPiperGui.sh",
+ BINARY_DIR + "RunPiperGui.bat" );
final boolean install = baseInstaller.install();
if ( !install ) {
return;
}
- final boolean maven = MavenHelper.getInstance().installMaven();
- if ( !maven ) {
+ final String installPath = InstallHelper.getInstance().getInstallDir().getAbsolutePath();
+ final boolean packaged
+ = MavenHelper.getInstance().packagePom( "Installing " + INSTALL_TYPE + " ...", installPath );
+ if ( !packaged ) {
return;
}
-
- final String installPath = InstallHelper.getInstance().getInstallDir().getAbsolutePath();
- final boolean finished = MavenHelper.getInstance().packagePom( installPath );
+ final boolean finished = cleanup( installPath );
if ( finished ) {
DialogUtil.showInstalledDialog( INSTALL_TYPE, installPath );
}
+
+ startGui( "Running Apache cTAKES ...<BR> RunPiperGui", installPath + "/" + INSTALL_DIRNAME );
+
+ }
+
+ static private boolean cleanup( final String installPath ) {
+ final File installDir = new File( installPath );
+ final File[] files = installDir.listFiles();
+ if ( files == null ) {
+ return false;
+ }
+ for ( File file : files ) {
+ if ( file.isFile() ) {
+ if ( !deleteFile( file ) ) {
+ return false;
+ }
+ } else if ( file.getName().equals( "target" ) ) {
+ if ( !deleteDirectory( file ) ) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ static private boolean deleteDirectory( final File directory ) {
+ final File[] files = directory.listFiles();
+ if ( files == null ) {
+ return false;
+ }
+ for ( File file : files ) {
+ if ( file.isFile() ) {
+ if ( !deleteFile( file ) ) {
+ return false;
+ }
+ } else {
+ if ( !deleteDirectory( file ) ) {
+ DialogUtil.showError( "Could not delete directory " + file.getAbsolutePath() );
+ return false;
+ }
+ }
+ }
+ return directory.delete();
+ }
+
+ static private boolean deleteFile( final File file ) {
+ if ( !file.delete() ) {
+ DialogUtil.showError( "Could not delete file " + file.getAbsolutePath() );
+ return false;
+ }
+ return true;
}
+
+ public boolean startGui( final String title, final String installDirectory ) {
+ try {
+ final SystemUtil.CommandRunner runner
+ = new SystemUtil.CommandRunner( installDirectory, "RunPiperGui" );
+ return RunnerUtil.runWithProgress( title, runner );
+ } catch ( Exception e ) {
+ DialogUtil.showError( e.getMessage() );
+ return false;
+ }
+ }
+
+
// TODO Local src/bin Installation, Local Rest WAR, Installation Docker, Rest Docker.
Modified: ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/MavenHelper.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/MavenHelper.java?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/MavenHelper.java (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/MavenHelper.java Wed Dec 4 01:54:25 2019
@@ -31,7 +31,7 @@ public enum MavenHelper {
if ( _mavenDir != null ) {
final String mavenDirPath = _mavenDir.getAbsolutePath();
if ( !mavenDirPath.endsWith( File.pathSeparator + "bin" + File.pathSeparator ) ) {
- return new File( _mavenDir, "apache-maven-3.3.1/bin" );
+ return new File( _mavenDir, "/bin" );
}
return _mavenDir;
}
@@ -67,13 +67,20 @@ public enum MavenHelper {
// }
public boolean installMaven() {
- if ( !getMavenPath().equals( FILE_NOT_FOUND ) ) {
+ if ( (_mavenDir != null && _mavenDir.isDirectory()) || !getMavenPath().equals( FILE_NOT_FOUND ) ) {
return true;
}
+ // TODO : Make this a 3 option dialog: "Maven Not Found. Want to 1) Select existing 2) Install maven 3) cancel
final boolean doInstall = DialogUtil.chooseSecondaryInstall( MAVEN_TITLE );
if ( !doInstall ) {
- DialogUtil.showCanceledDialog( MAVEN_TITLE );
- return false;
+ final File mavenDir
+ = DialogUtil.chooseExistingInstall( "Choose Existing " + MAVEN_TITLE + " Installation Directory" );
+ if ( mavenDir == null ) {
+ DialogUtil.showCanceledDialog( MAVEN_TITLE );
+ return false;
+ }
+ _mavenDir = mavenDir;
+ return true;
}
final File mavenInstallDir = MavenHelper.getInstance().chooseMavenDir();
if ( mavenInstallDir.equals( NO_FILE ) ) {
@@ -90,19 +97,19 @@ public enum MavenHelper {
DialogUtil.showError( e.getMessage() );
return false;
}
- _mavenDir = mavenInstallDir;
+ _mavenDir = new File( mavenInstallDir, "apache-maven-3.3.1" );
DialogUtil.showInstalledDialog( MAVEN_TITLE, mavenInstallDir.getAbsolutePath() );
return true;
}
public File chooseMavenDir() {
- final File mavenDir = DialogUtil.chooseSaveDir();
+ final File mavenDir
+ = DialogUtil.chooseSaveDir( "Choose new " + MAVEN_TITLE + " Installation Directory" );
if ( mavenDir == null ) {
return NO_FILE;
}
- _mavenDir = mavenDir;
- return _mavenDir;
+ return mavenDir;
}
@@ -116,15 +123,18 @@ public enum MavenHelper {
public boolean packagePom( final String pomDirectory ) {
+ return packagePom( "Running " + MAVEN_TITLE + " ...", pomDirectory );
+ }
+
+ public boolean packagePom( final String title, final String pomDirectory ) {
try {
final CommandRunner packager
- = new CommandRunner( pomDirectory, getMavenDir().getAbsolutePath() + "/mvn package" );
- final Boolean packaged = RunnerUtil.runWithProgress( "Running " + MAVEN_TITLE + " ...", packager );
+ = new CommandRunner( pomDirectory, getMavenDir().getAbsolutePath() + "/mvn clean package" );
+ return RunnerUtil.runWithProgress( title, packager );
} catch ( Exception e ) {
DialogUtil.showError( e.getMessage() );
return false;
}
- return true;
}
Modified: ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/RestDockerBuilder.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/RestDockerBuilder.java?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/RestDockerBuilder.java (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/build/RestDockerBuilder.java Wed Dec 4 01:54:25 2019
@@ -16,9 +16,9 @@ final public class RestDockerBuilder imp
static private final String INSTALL_TYPE = "Apache cTAKES Rest Docker";
- static private final String DOCKER_DIR = "/org/apache/ctakes/dockhand/docker/";
- static private final String REST_DIR = "/org/apache/ctakes/dockhand/rest/";
+ static private final String PIPER_DIR = "/org/apache/ctakes/dockhand/goal/rest/pipeline/";
static private final String SOURCE_URLDIR = "/org/apache/ctakes/dockhand/goal/rest/";
+ static private final String DOCKER_DIR = "/org/apache/ctakes/dockhand/goal/rest/docker/";
private final DhWizardController _wizardController;
@@ -35,7 +35,7 @@ final public class RestDockerBuilder imp
= new BaseInstaller( INSTALL_TYPE,
SOURCE_URLDIR, goalPom.getPomFile(), piperCommands,
DOCKER_DIR + "Dockerfile",
- REST_DIR + "TinyRestPipeline.piper" );
+ PIPER_DIR + "TinyRestPipeline.piper" );
final boolean finished = baseInstaller.install();
if ( finished ) {
Modified: ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/gui/feature/Option.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/gui/feature/Option.java?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/gui/feature/Option.java (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/dockhand/gui/feature/Option.java Wed Dec 4 01:54:25 2019
@@ -50,12 +50,12 @@ public enum Option {
TOKEN( "Tokens",
"Create Word and other Penn TreeBank Tokens.",
- "add TokenizerAnnotatorPTB" ),
+ "add TokenizerAnnotatorPTB",
+ "add ContextDependentTokenizerAnnotator" ),
ENTITY( "Entities",
"Create Named Entites based upon Dictionary Lookup.",
- "add ContextDependentTokenizerAnnotator",
"addDescription POSTagger",
"add Chunker",
"addDescription adjuster.ChunkAdjuster NP,NP 1",
Modified: ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/gui/progress/NoteProgressDialog.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/gui/progress/NoteProgressDialog.java?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/gui/progress/NoteProgressDialog.java (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/gui/progress/NoteProgressDialog.java Wed Dec 4 01:54:25 2019
@@ -63,7 +63,7 @@ public enum NoteProgressDialog {
public void setProcess( final String process ) {
createDialog();
- _processLabel.setText( "<HTML><B>" + process + "</B></HTML>" );
+ _processLabel.setText( "<HTML><H1>" + process + "</H1></HTML>" );
}
public void setProgress( final String progress ) {
Modified: ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/gui/wizard/util/DialogUtil.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/gui/wizard/util/DialogUtil.java?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/gui/wizard/util/DialogUtil.java (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/java/org/apache/ctakes/gui/wizard/util/DialogUtil.java Wed Dec 4 01:54:25 2019
@@ -21,7 +21,6 @@ final public class DialogUtil {
private DialogUtil() {
}
-
static public File chooseSaveDir() {
final Component rootPane = SwingUtilities.getRoot( DisablerPane.getInstance() );
final JFileChooser chooser = new JFileChooser();
@@ -33,6 +32,18 @@ final public class DialogUtil {
return chooser.getSelectedFile();
}
+ static public File chooseSaveDir( final String title ) {
+ final Component rootPane = SwingUtilities.getRoot( DisablerPane.getInstance() );
+ final JFileChooser chooser = new JFileChooser();
+ chooser.setDialogTitle( title );
+ chooser.setFileSelectionMode( JFileChooser.DIRECTORIES_ONLY );
+ final int decision = chooser.showSaveDialog( rootPane );
+ if ( decision != JFileChooser.APPROVE_OPTION ) {
+ return null;
+ }
+ return chooser.getSelectedFile();
+ }
+
static public boolean chooseSecondaryInstall( final String name ) {
final Component rootPane = SwingUtilities.getRoot( DisablerPane.getInstance() );
@@ -44,6 +55,19 @@ final public class DialogUtil {
}
+ static public File chooseExistingInstall( final String title ) {
+ final Component rootPane = SwingUtilities.getRoot( DisablerPane.getInstance() );
+ final JFileChooser chooser = new JFileChooser();
+ chooser.setDialogTitle( title );
+ chooser.setFileSelectionMode( JFileChooser.DIRECTORIES_ONLY );
+ final int decision = chooser.showOpenDialog( rootPane );
+ if ( decision != JFileChooser.APPROVE_OPTION ) {
+ return null;
+ }
+ return chooser.getSelectedFile();
+ }
+
+
static public void showError( final String message ) {
final String fullMessage = "<HTML>" + message + "<BR>" + "Press OK to exit.</HTML>";
final Component rootPane = SwingUtilities.getRoot( DisablerPane.getInstance() );
Added: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/docker/Dockerfile
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/docker/Dockerfile?rev=1870777&view=auto
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/docker/Dockerfile (added)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/docker/Dockerfile Wed Dec 4 01:54:25 2019
@@ -0,0 +1,21 @@
+FROM openjdk:8-alpine
+
+RUN apk update && apk add ca-certificates openssl wget unzip maven
+
+RUN mkdir -p /ctakes_src
+COPY pom.xml /ctakes_src/
+COPY DockhandPipeline.piper /ctakes_src/
+COPY log4j.xml /ctakes_src/
+COPY LICENSE /ctakes_src/
+COPY NOTICE /ctakes_src/
+# copy RunPipeline scripts
+
+WORKDIR /ctakes_src
+
+RUN mvn package
+
+WORKDIR /ctakes_src/apache-ctakes-4.0.1-SNAPSHOT
+
+# TODO -- create RunPipeline scripts
+
+CMD RunPipeline.sh
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/attribute_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/attribute_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/attribute_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/attribute_pom.xml Wed Dec 4 01:54:25 2019
@@ -83,6 +83,12 @@
<version>${ctakes.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-gui</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
</dependencies>
<repositories>
@@ -104,6 +110,32 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -117,6 +149,8 @@
<descriptor>build.xml</descriptor>
</descriptors>
<finalName>apache-ctakes-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <outputDirectory>.</outputDirectory>
</configuration>
</execution>
</executions>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/build.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/build.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/build.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/build.xml Wed Dec 4 01:54:25 2019
@@ -5,6 +5,7 @@
<formats>
<format>dir</format>
</formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
@@ -25,6 +26,8 @@
<outputDirectory/>
<includes>
<include>*.piper</include>
+ <include>*.sh</include>
+ <include>*.bat</include>
</includes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -44,10 +47,6 @@
<source>log4j.xml</source>
<outputDirectory/>
</file>
- <file>
- <source>RunPipeline.sh</source>
- <outputDirectory/>
- </file>
</files>
</assembly>
\ No newline at end of file
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/coreference_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/coreference_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/coreference_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/coreference_pom.xml Wed Dec 4 01:54:25 2019
@@ -104,6 +104,12 @@
<version>${ctakes.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-gui</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
<!-- libsvm for temporal -->
<dependency>
<groupId>org.cleartk</groupId>
@@ -117,6 +123,32 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -130,6 +162,7 @@
<descriptor>build.xml</descriptor>
</descriptors>
<finalName>apache-ctakes-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<outputDirectory>.</outputDirectory>
</configuration>
</execution>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/entity_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/entity_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/entity_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/entity_pom.xml Wed Dec 4 01:54:25 2019
@@ -38,6 +38,18 @@
<dependency>
<groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-context-tokenizer</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-chunker</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-dictionary-lookup-fast</artifactId>
<version>${ctakes.version}</version>
</dependency>
@@ -53,12 +65,44 @@
<version>${ctakes.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-gui</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
</dependencies>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -72,6 +116,7 @@
<descriptor>build.xml</descriptor>
</descriptors>
<finalName>apache-ctakes-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<outputDirectory>.</outputDirectory>
</configuration>
</execution>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_coref_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_coref_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_coref_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_coref_pom.xml Wed Dec 4 01:54:25 2019
@@ -99,12 +99,19 @@
<artifactId>ctakes-context-tokenizer</artifactId>
<version>${ctakes.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-fhir</artifactId>
<version>${ctakes.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-gui</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
<!-- libsvm for temporal -->
<dependency>
<groupId>org.cleartk</groupId>
@@ -118,6 +125,32 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -131,6 +164,7 @@
<descriptor>build.xml</descriptor>
</descriptors>
<finalName>apache-ctakes-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<outputDirectory>.</outputDirectory>
</configuration>
</execution>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_pom.xml Wed Dec 4 01:54:25 2019
@@ -88,13 +88,19 @@
<dependency>
<groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-context-tokenizer</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-fhir</artifactId>
<version>${ctakes.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
- <artifactId>ctakes-context-tokenizer</artifactId>
+ <artifactId>ctakes-gui</artifactId>
<version>${ctakes.version}</version>
</dependency>
@@ -104,6 +110,32 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -117,6 +149,7 @@
<descriptor>build.xml</descriptor>
</descriptors>
<finalName>apache-ctakes-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<outputDirectory>.</outputDirectory>
</configuration>
</execution>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_temporal_coreference_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_temporal_coreference_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_temporal_coreference_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_temporal_coreference_pom.xml Wed Dec 4 01:54:25 2019
@@ -97,6 +97,12 @@
<version>${ctakes.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-gui</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
<!-- libsvm for temporal -->
<dependency>
<groupId>org.cleartk</groupId>
@@ -110,6 +116,32 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -123,6 +155,7 @@
<descriptor>build.xml</descriptor>
</descriptors>
<finalName>apache-ctakes-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<outputDirectory>.</outputDirectory>
</configuration>
</execution>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_temporal_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_temporal_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_temporal_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/relation_temporal_pom.xml Wed Dec 4 01:54:25 2019
@@ -97,6 +97,12 @@
<version>${ctakes.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-gui</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
<!-- libsvm for temporal -->
<dependency>
<groupId>org.cleartk</groupId>
@@ -110,6 +116,32 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -123,6 +155,7 @@
<descriptor>build.xml</descriptor>
</descriptors>
<finalName>apache-ctakes-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<outputDirectory>.</outputDirectory>
</configuration>
</execution>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/temporal_coref_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/temporal_coref_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/temporal_coref_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/temporal_coref_pom.xml Wed Dec 4 01:54:25 2019
@@ -101,6 +101,12 @@
<version>${ctakes.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-gui</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
<!-- libsvm for temporal -->
<dependency>
<groupId>org.cleartk</groupId>
@@ -114,6 +120,32 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -127,6 +159,7 @@
<descriptor>build.xml</descriptor>
</descriptors>
<finalName>apache-ctakes-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<outputDirectory>.</outputDirectory>
</configuration>
</execution>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/temporal_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/temporal_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/temporal_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/temporal_pom.xml Wed Dec 4 01:54:25 2019
@@ -101,6 +101,12 @@
<version>${ctakes.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-gui</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
<!-- libsvm for temporal -->
<dependency>
<groupId>org.cleartk</groupId>
@@ -114,6 +120,32 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -127,6 +159,7 @@
<descriptor>build.xml</descriptor>
</descriptors>
<finalName>apache-ctakes-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<outputDirectory>.</outputDirectory>
</configuration>
</execution>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/token_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/token_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/token_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/local/pom/token_pom.xml Wed Dec 4 01:54:25 2019
@@ -44,10 +44,22 @@
<dependency>
<groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-context-tokenizer</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-fhir</artifactId>
<version>${ctakes.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-gui</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
</dependencies>
<build>
@@ -57,7 +69,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>bundle-project-sources</id>
+ <id>build-installation</id>
<phase>package</phase>
<goals>
<goal>single</goal>
@@ -67,6 +79,7 @@
<descriptor>build.xml</descriptor>
</descriptors>
<finalName>apache-ctakes-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<outputDirectory>.</outputDirectory>
</configuration>
</execution>
Added: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/docker/Dockerfile
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/docker/Dockerfile?rev=1870777&view=auto
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/docker/Dockerfile (added)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/docker/Dockerfile Wed Dec 4 01:54:25 2019
@@ -0,0 +1,44 @@
+FROM openjdk:8-alpine
+
+RUN apk update && apk add ca-certificates openssl wget unzip maven
+
+## Download apache-tomcat and extract:
+# RUN wget http://mirror.cc.columbia.edu/pub/software/apache/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14.zip
+# RUN unzip apache-tomcat-9.0.14.zip
+RUN wget https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14.zip \
+&& unzip apache-tomcat-9.0.14.zip && rm apache-tomcat-9.0.14.zip
+
+
+RUN mkdir -p /ctakes_src
+COPY pom.xml /ctakes_src/
+COPY TinyRestPipeline.piper /ctakes_src/
+COPY DockhandPipeline.piper /ctakes_src/
+COPY log4j.xml /ctakes_src/
+COPY LICENSE /ctakes_src/
+COPY NOTICE /ctakes_src/
+# RestServer calls TinyRestPipeline.
+
+WORKDIR /ctakes_src
+
+RUN mvn compile -DskipTests
+# Don't copy the piper file to resources until mvn compile has created the directories.
+# Then package can put it in the WAR.
+COPY TinyRestPipeline.piper /ctakes_src/ctakes-core-res/src/main/resources/org/apache/ctakes/core/pipeline/
+COPY DockhandPipeline.piper /ctakes_src/ctakes-core-res/src/main/resources/org/apache/ctakes/core/pipeline/
+
+RUN mvn package
+
+WORKDIR /
+RUN mv /ctakes_src/ctakes_tiny_rest.war /apache-tomcat-9.0.14/webapps/
+
+RUN rm -fr /ctakes_src
+
+ENV TOMCAT_HOME=/apache-tomcat-9.0.14
+
+EXPOSE 8080
+
+
+WORKDIR $TOMCAT_HOME
+RUN chmod u+x bin/*.sh
+
+CMD bin/catalina.sh run
Added: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pipeline/TinyRestPipeline.piper
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pipeline/TinyRestPipeline.piper?rev=1870777&view=auto
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pipeline/TinyRestPipeline.piper (added)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pipeline/TinyRestPipeline.piper Wed Dec 4 01:54:25 2019
@@ -0,0 +1,3 @@
+// Tiny Rest always runs a piper file with this name.
+
+load DockhandPipeline
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/attribute_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/attribute_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/attribute_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/attribute_pom.xml Wed Dec 4 01:54:25 2019
@@ -105,6 +105,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
<configuration>
@@ -114,6 +140,24 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.10</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>8080</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ <!-- mvn jetty:run -->
+ <!-- Jetty will then be running on port 8080 -->
+ <!-- https://maven.apache.org/plugins/maven-war-plugin/examples/rapid-testing-jetty6-plugin.html -->
+
</plugins>
</build>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/coreference_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/coreference_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/coreference_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/coreference_pom.xml Wed Dec 4 01:54:25 2019
@@ -119,6 +119,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
<configuration>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/entity_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/entity_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/entity_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/entity_pom.xml Wed Dec 4 01:54:25 2019
@@ -44,6 +44,18 @@
<dependency>
<groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-context-tokenizer</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-chunker</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-dictionary-lookup-fast</artifactId>
<version>${ctakes.version}</version>
</dependency>
@@ -60,6 +72,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
<configuration>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_coref_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_coref_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_coref_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_coref_pom.xml Wed Dec 4 01:54:25 2019
@@ -120,6 +120,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
<configuration>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_pom.xml Wed Dec 4 01:54:25 2019
@@ -104,6 +104,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
<configuration>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_temporal_coreference_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_temporal_coreference_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_temporal_coreference_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_temporal_coreference_pom.xml Wed Dec 4 01:54:25 2019
@@ -111,6 +111,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
<configuration>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_temporal_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_temporal_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_temporal_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/relation_temporal_pom.xml Wed Dec 4 01:54:25 2019
@@ -112,6 +112,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
<configuration>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/temporal_coref_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/temporal_coref_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/temporal_coref_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/temporal_coref_pom.xml Wed Dec 4 01:54:25 2019
@@ -115,6 +115,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
<configuration>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/temporal_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/temporal_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/temporal_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/temporal_pom.xml Wed Dec 4 01:54:25 2019
@@ -115,6 +115,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.ctakesresources</groupId>
+ <artifactId>ctakes-resources-sno_rx</artifactId>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>apache-ctakes-${project.version}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
<configuration>
Modified: ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/token_pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/token_pom.xml?rev=1870777&r1=1870776&r2=1870777&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/token_pom.xml (original)
+++ ctakes/trunk/ctakes-dockhand/src/main/resources/org/apache/ctakes/dockhand/goal/rest/pom/token_pom.xml Wed Dec 4 01:54:25 2019
@@ -48,6 +48,12 @@
<version>${ctakes.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-context-tokenizer</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+
</dependencies>
<build>