-
Notifications
You must be signed in to change notification settings - Fork 156
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4577 from inception-project/feature/4576-Allow-se…
…tting-a-document-level-annotation-when-bulk-processing #4576 - Allow setting a document-level annotation when bulk processing
- Loading branch information
Showing
23 changed files
with
582 additions
and
118 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| /.apt_generated/ | ||
| /.apt_generated_tests/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Marker file which activates the profile "wicket-module" from the parent POM. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| <!-- | ||
| Licensed to the Technische Universität Darmstadt under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The Technische Universität Darmstadt | ||
| 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. | ||
| 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 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-app</artifactId> | ||
| <version>32.0-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>inception-processing</artifactId> | ||
| <name>INCEpTION - Processing</name> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-model</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-ui-core</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-scheduling</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-ui-scheduling</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-recommendation</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-layer-docmetadata</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-api-render</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-schema-api</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-support</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-security</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-recommendation-api</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-model-vdoc</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-project-api</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-annotation-storage</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-annotation-storage-api</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.tudarmstadt.ukp.inception.app</groupId> | ||
| <artifactId>inception-documents-api</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.apache.wicket</groupId> | ||
| <artifactId>wicket-core</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.wicket</groupId> | ||
| <artifactId>wicket-spring</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.wicket</groupId> | ||
| <artifactId>wicket-request</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.agilecoders.wicket</groupId> | ||
| <artifactId>wicket-bootstrap-core</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>de.agilecoders.wicket</groupId> | ||
| <artifactId>wicket-bootstrap-extensions</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.wicketstuff</groupId> | ||
| <artifactId>wicketstuff-annotation</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.wicketstuff</groupId> | ||
| <artifactId>wicketstuff-input-events</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.danekja</groupId> | ||
| <artifactId>jdk-serializable-functional</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.springframework</groupId> | ||
| <artifactId>spring-core</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework</groupId> | ||
| <artifactId>spring-beans</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework</groupId> | ||
| <artifactId>spring-context</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-autoconfigure</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.apache.uima</groupId> | ||
| <artifactId>uimaj-core</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-api</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.apache.commons</groupId> | ||
| <artifactId>commons-lang3</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>javax.servlet</groupId> | ||
| <artifactId>javax.servlet-api</artifactId> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> |
43 changes: 43 additions & 0 deletions
43
...-processing/src/main/java/de/tudarmstadt/ukp/inception/processing/BulkProcessingPage.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| <!DOCTYPE html> | ||
| <!-- | ||
| Licensed to the Technische Universität Darmstadt under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The Technische Universität Darmstadt | ||
| 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. | ||
| 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. | ||
| --> | ||
| <html xmlns:wicket="http://wicket.apache.org"> | ||
| <head> | ||
| <wicket:head> | ||
| <style type="text/css"> | ||
| .page-content { | ||
| flex-direction: column !important; | ||
| overflow: hidden; | ||
| } | ||
| </style> | ||
| </wicket:head> | ||
| </head> | ||
| <body> | ||
| <wicket:extend> | ||
| <div class="d-flex flex-row flex-grow-1 overflow-hidden"> | ||
| <div class="d-flex flex-grow-1 flex-column scrolling"> | ||
| <div wicket:id="processingPanel" class="d-flex flex-column flex-grow-1 overflow-hidden"/> | ||
| </div> | ||
|
|
||
| <div class="d-flex flex-sidebar flex-column border-start scrolling" style="min-width: 30rem;"> | ||
| <div class="d-flex flex-grow-1 flex-column" wicket:id="runningProcesses"/> | ||
| </div> | ||
| </div> | ||
| </wicket:extend> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
...main/java/de/tudarmstadt/ukp/inception/processing/config/ProcessingAutoConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Licensed to the Technische Universität Darmstadt under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The Technische Universität Darmstadt | ||
| * 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. | ||
| * | ||
| * 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. | ||
| */ | ||
| package de.tudarmstadt.ukp.inception.processing.config; | ||
|
|
||
| import javax.servlet.ServletContext; | ||
|
|
||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; | ||
| import de.tudarmstadt.ukp.inception.processing.BulkProcessingPageMenuItem; | ||
| import de.tudarmstadt.ukp.inception.project.api.ProjectService; | ||
|
|
||
| @ConditionalOnProperty(prefix = "bulk-processing", name = "enabled", havingValue = "true", matchIfMissing = false) | ||
| @Configuration | ||
| public class ProcessingAutoConfiguration | ||
| { | ||
| @ConditionalOnWebApplication | ||
| @Bean | ||
| @ConditionalOnExpression("${websocket.enabled:true} and ${recommender.enabled:true}") | ||
| public BulkProcessingPageMenuItem bulkProcessingPageMenuItem(UserDao aUserRepo, | ||
| ProjectService aProjectService, ServletContext aServletContext) | ||
| { | ||
| return new BulkProcessingPageMenuItem(aUserRepo, aProjectService, aServletContext); | ||
| } | ||
| } |
Oops, something went wrong.