Merge into master
Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/073190bd Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/073190bd Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/073190bd Branch: refs/heads/master Commit: 073190bd7cb948ce1faf5df7dae61eb8257416ce Parents: 778d05e 63ffc9e Author: Lewis John McGibbney <[email protected]> Authored: Fri Feb 23 09:23:10 2018 -0800 Committer: Lewis John McGibbney <[email protected]> Committed: Fri Feb 23 09:23:10 2018 -0800 ---------------------------------------------------------------------- .../apache/any23/extractor/ExtractorGroup.java | 1 + .../apache/any23/plugin/Any23PluginManager.java | 23 +-- core/src/main/java/org/apache/any23/Any23.java | 8 +- .../any23/extractor/ExtractorRegistryImpl.java | 11 +- openie/pom.xml | 152 ----------------- .../any23/extractor/openie/OpenIEExtractor.java | 130 --------------- .../openie/OpenIEExtractorFactory.java | 52 ------ .../org.apache.any23.extractor.ExtractorFactory | 1 - .../any23/openie/OpenIEExtractorTest.java | 88 ---------- .../htmlscraper/HTMLScraperExtractor.java | 12 +- plugins/integration-test/pom.xml | 5 + .../java/org/apache/any23/plugin/PluginIT.java | 11 +- plugins/openie/pom.xml | 165 +++++++++++++++++++ .../extractor/openie/OpenIEExtractor.java | 137 +++++++++++++++ .../openie/OpenIEExtractorFactory.java | 52 ++++++ .../org.apache.any23.extractor.ExtractorFactory | 1 + .../any23/openie/OpenIEExtractorTest.java | 88 ++++++++++ pom.xml | 6 +- service/README.md | 49 ++++++ service/README.txt | 50 ------ service/pom.xml | 84 +++++++++- .../java/org/apache/any23/servlet/Servlet.java | 48 +++++- service/src/main/resources/form.html | 59 ++++++- .../main/webapp/resources/js/bootstrap-modal.js | 22 ++- src/site/apt/any23-plugins.apt | 9 +- 25 files changed, 734 insertions(+), 530 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/073190bd/plugins/integration-test/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/073190bd/plugins/openie/pom.xml ---------------------------------------------------------------------- diff --cc plugins/openie/pom.xml index 0000000,0f34ad5..64c6806 mode 000000,100644..100644 --- a/plugins/openie/pom.xml +++ b/plugins/openie/pom.xml @@@ -1,0 -1,165 +1,165 @@@ + <?xml version="1.0" encoding="UTF-8"?> + <!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.any23</groupId> + <artifactId>apache-any23</artifactId> - <version>2.3-SNAPSHOT</version> ++ <version>2.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <groupId>org.apache.any23.plugins</groupId> + <artifactId>apache-any23-openie</artifactId> + + <name>Apache Any23 :: Plugins :: OpenIE</name> + <description>Open Information Extraction module.</description> + + <repositories> + <repository> + <snapshots> + <enabled>false</enabled> + </snapshots> + <id>bintray-allenai-maven</id> + <name>bintray</name> + <url>http://allenai.bintray.com/maven</url> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <snapshots> + <enabled>false</enabled> + </snapshots> + <id>bintray-allenai-maven</id> + <name>bintray-plugins</name> + <url>http://allenai.bintray.com/maven</url> + </pluginRepository> + </pluginRepositories> + + <dependencies> + <dependency> + <groupId>org.apache.any23</groupId> + <artifactId>apache-any23-core</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.any23</groupId> + <artifactId>apache-any23-test-resources</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.allenai.openie</groupId> + <artifactId>openie_2.11</artifactId> + <version>${openie_2.11.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.allenai.openie</groupId> + <artifactId>openie_2.11</artifactId> + <version>${openie_2.11.version}</version> + <scope>compile</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>edu.washington.cs.knowitall</groupId> + <artifactId>openregex</artifactId> + <version>${openregex.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + <!-- Generates the distribution package --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>${maven-assembly-plugin.version}</version> + <executions> + <execution> + <id>assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>true</attach> + <skipAssembly>true</skipAssembly> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + + <profiles> + <profile> + <id>release</id> + <build> + <resources> + <resource> + <directory>${basedir}/../</directory> + <targetPath>${project.build.directory}/apidocs/META-INF</targetPath> + <includes> + <include>LICENSE.txt</include> + <include>NOTICE.txt</include> + </includes> + </resource> + </resources> + </build> + </profile> + + </profiles> + + </project> http://git-wip-us.apache.org/repos/asf/any23/blob/073190bd/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/073190bd/service/pom.xml ----------------------------------------------------------------------
