diff --git a/Demos/Dropwizard/Dockerfile b/Demos/Dropwizard/Dockerfile index b6ebca2..7dc548a 100644 --- a/Demos/Dropwizard/Dockerfile +++ b/Demos/Dropwizard/Dockerfile @@ -1,5 +1,10 @@ -FROM openjdk:8-jre-alpine -RUN mkdir -p /app && apk add fontconfig && apk add msttcorefonts-installer && update-ms-fonts && fc-cache -f +FROM openjdk:18-jdk-bullseye +RUN mkdir -p /app + +RUN apt-get update && \ + apt-get install -y fontconfig && \ + fc-cache -f + WORKDIR /app COPY /DocumentSamples /app COPY /Licenses /app diff --git a/Demos/Dropwizard/README.md b/Demos/Dropwizard/README.md index 341722c..e3373ba 100644 --- a/Demos/Dropwizard/README.md +++ b/Demos/Dropwizard/README.md @@ -1,6 +1,6 @@ ![Groupdocs document & pdf annotator](https://raw.githubusercontent.com/groupdocs-annotation/groupdocs-annotation.github.io/master/resources/image/banner.png "GroupDocs.Annotation") # GroupDocs.Annotation for Java Dropwizard Example -###### version 1.12.25 +###### version 1.12.26 [![GitHub license](https://img.shields.io/github/license/groupdocs-annotation/GroupDocs.Annotation-for-Java-Dropwizard.svg)](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Dropwizard/blob/master/LICENSE) @@ -16,7 +16,7 @@ With GroupDocs.Annotation for Java Dropwizard application, you can annotate and **write on document** using our modern and responsive web UI interface. Thanks to flexible and highly customizable configuration it can be used as standalone application or can be integrated into your project within few simple steps. -**Note:** without a license application will run in trial mode, purchase [GroupDocs.Annotation for Java license](https://purchase.groupdocs.com/order-online-step-1-of-8.aspx) or request [GroupDocs.Annotation for Java temporary license](https://purchase.groupdocs.com/temporary-license). +**Note:** without a license application will run in trial mode, purchase [GroupDocs.Annotation for Java license](https://purchase.groupdocs.com/buy) or request [GroupDocs.Annotation for Java temporary license](https://purchase.groupdocs.com/temporary-license/). ## Demo Video @@ -110,33 +110,19 @@ You can run this sample by one of following methods Download [source code](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Dropwizard/archive/master.zip) from github or clone this repository. ```bash -git clone https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Dropwizard -cd GroupDocs.Annotation-for-Java-Dropwizard +git clone https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java/ +cd /Demos/Dropwizard mvn clean compile exec:java ## Open http://localhost:8080/annotation/ in your favorite browser. ``` -#### Binary release (with all dependencies) - -Download [latest release](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Dropwizard/releases/latest) from [releases page](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Dropwizard/releases). - -**Note**: This method is **recommended** for running this sample behind firewall. - -```bash -curl -J -L -o release.tar.gz https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Dropwizard/releases/download/1.12.25/release.tar.gz -tar -xvzf release.tar.gz -cd release -java -jar annotation-1.12.25.jar configuration.yaml -## Open http://localhost:8080/annotation/ in your favorite browser. -``` - #### Docker image Use [docker](https://hub.docker.com/u/groupdocs) image. ```bash mkdir DocumentSamples mkdir Licenses -docker run -p 8080:8080 --env application.hostAddress=localhost -v `pwd`/DocumentSamples:/home/groupdocs/app/DocumentSamples -v `pwd`/Licenses:/home/groupdocs/app/Licenses groupdocs/annotation +docker run -p 8080:8080 --env application.hostAddress=localhost -v `pwd`/DocumentSamples:/home/groupdocs/app/DocumentSamples -v `pwd`/Licenses:/home/groupdocs/app/Licenses groupdocs/annotation-dropwizard ## Open http://localhost:8080/annotation/ in your favorite browser. ``` @@ -166,7 +152,7 @@ For all methods above you can adjust settings in `configuration.yml`. By default | **`textUnderlineAnnotation`** | Boolean | `true` | Enable/disable TextUnderline annotation | | **`distanceAnnotation`** | Boolean | `true` | Enable/disable Distance annotation | | **`downloadOriginal`** | Boolean | `true` | Enable/disable original document downloading | -| **`downloadAnnotated`** | Boolen | `true` | Enable/disable signed document downloading | +| **`downloadAnnotated`** | Boolean | `true` | Enable/disable signed document downloading | | **`zoom`** | Boolean | `true` | Enable/disable zoom | | **`fitWidth`** | Boolean | `true` | Enable/disable fit width. Set true to zoom document pages fit width | @@ -177,8 +163,8 @@ Please have a look at the LICENSE.md for more details ## GroupDocs Annotation on other platforms & frameworks -- JAVA Spring [Document & PDF annotator](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Spring) -- .NET MVC [Document & PDF annotator](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-.NET-MVC) -- .NET WebForms [Document & PDF annotator](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-.NET-WebForms) +- JAVA Spring [Document & PDF annotator](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java/tree/master/Demos/Spring) +- .NET MVC [Document & PDF annotator](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-.NET/tree/master/Demos) +- .NET WebForms [Document & PDF annotator](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-.NET/tree/master/Demos) [Home](https://www.groupdocs.com/) | [Product Page](https://products.groupdocs.com/annotation/java) | [Documentation](https://docs.groupdocs.com/annotation/java/) | [Demos](https://products.groupdocs.app/annotation/family) | [API Reference](https://apireference.groupdocs.com/java/annotation) | [Examples](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java/tree/master/Examples) | [Blog](https://blog.groupdocs.com/category/annotation/) | [Free Support](https://forum.groupdocs.com/c/annotation) | [Temporary License](https://purchase.groupdocs.com/temporary-license) diff --git a/Demos/Dropwizard/pom.xml b/Demos/Dropwizard/pom.xml index 825e7f2..9193722 100644 --- a/Demos/Dropwizard/pom.xml +++ b/Demos/Dropwizard/pom.xml @@ -6,7 +6,7 @@ com.groupdocs.ui annotation - 1.12.25 + 1.12.26 jar GroupDocs.Annotation Dropwizard diff --git a/Demos/Spring/Dockerfile b/Demos/Spring/Dockerfile index 6f6baf3..501b4fc 100644 --- a/Demos/Spring/Dockerfile +++ b/Demos/Spring/Dockerfile @@ -1,10 +1,15 @@ -FROM openjdk:8-jre-alpine -RUN mkdir -p /home/groupdocs/app && apk add fontconfig && apk add msttcorefonts-installer && update-ms-fonts && fc-cache -f -WORKDIR /home/groupdocs/app -COPY target/release/DocumentSamples /home/groupdocs/app -COPY target/release/Licenses /home/groupdocs/app -COPY target/release/annotation-spring-*.jar /home/groupdocs/app/app.jar +FROM openjdk:18-jdk-bullseye +RUN mkdir -p /app + +RUN apt-get update && \ + apt-get install -y fontconfig && \ + fc-cache -f + +WORKDIR /app +COPY /DocumentSamples /app +COPY /Licenses /app +COPY target/annotation-spring-*.jar /app/app.jar EXPOSE 8080 -ENTRYPOINT java -jar /home/groupdocs/app/app.jar configuration.yml \ No newline at end of file +ENTRYPOINT java -jar /app/app.jar configuration.yml \ No newline at end of file diff --git a/Demos/Spring/README.md b/Demos/Spring/README.md index b470452..f7d798d 100644 --- a/Demos/Spring/README.md +++ b/Demos/Spring/README.md @@ -14,7 +14,7 @@ With GroupDocs.Annotation for Java Spring application, you can annotate and **write on document** using our modern and responsive web UI interface. Thanks to flexible and highly customizable configuration it can be used as standalone application or can be integrated into your project within few simple steps. -**Note:** without a license application will run in trial mode, purchase [GroupDocs.Annotation for Java license](https://purchase.groupdocs.com/order-online-step-1-of-8.aspx) or request [GroupDocs.Annotation for Java temporary license](https://purchase.groupdocs.com/temporary-license). +**Note:** without a license application will run in trial mode, purchase [GroupDocs.Annotation for Java license](https://purchase.groupdocs.com/buy) or request [GroupDocs.Annotation for Java temporary license](https://purchase.groupdocs.com/temporary-license). ## Demo Video @@ -107,8 +107,8 @@ You can run this sample by one of following methods Download [source code](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Spring/archive/master.zip) from github or clone this repository. ```bash -git clone https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Spring -cd GroupDocs.Annotation-for-Java-Spring +git clone https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java/ +cd /Demos/Spring mvn clean spring-boot:run ## Open http://localhost:8080/annotation/ in your favorite browser. ``` @@ -118,26 +118,12 @@ mvn clean spring-boot:run Download [source code](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Spring/archive/master.zip) from github or clone this repository. ```bash -git clone https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Spring -cd GroupDocs.Annotation-for-Java-Spring +git clone https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java/ +cd /Demos/Spring mvn package -P war ## Deploy this war on any server ``` -#### Binary release (with all dependencies) - -Download [latest release](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Spring/releases/latest) from [releases page](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Spring/releases). - -**Note**: This method is **recommended** for running this sample behind firewall. - -```bash -curl -J -L -o release.tar.gz https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Spring/releases/download/1.12.28/release.tar.gz -tar -xvzf release.tar.gz -cd release -java -jar annotation-spring-1.12.28.jar configuration.yml -## Open http://localhost:8080/annotation/ in your favorite browser. -``` - #### Docker image Use [docker](https://hub.docker.com/u/groupdocs) image. @@ -174,7 +160,7 @@ For all methods above you can adjust settings in `configuration.yml`. By default | **`textUnderlineAnnotation`** | Boolean | `true` | Enable/disable TextUnderline annotation | | **`distanceAnnotation`** | Boolean | `true` | Enable/disable Distance annotation | | **`downloadOriginal`** | Boolean | `true` | Enable/disable original document downloading | -| **`downloadAnnotated`** | Boolen | `true` | Enable/disable signed document downloading | +| **`downloadAnnotated`** | Boolean | `true` | Enable/disable signed document downloading | | **`zoom`** | Boolean | `true` | Enable/disable zoom | | **`fitWidth`** | Boolean | `true` | Enable/disable fit width. Set true to zoom document pages fit width | @@ -185,8 +171,8 @@ Please have a look at the LICENSE.md for more details ## GroupDocs Annotation on other platforms & frameworks -- JAVA DropWizard [Document & PDF annotator](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Dropwizard) -- .NET MVC [Document & PDF annotator](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-.NET-MVC) -- .NET WebForms [Document & PDF annotator](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-.NET-WebForms) +- JAVA DropWizard [Document & PDF annotator](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java/tree/master/Demos/Dropwizard) +- .NET MVC [Document & PDF annotator](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-.NET/tree/master/Demos) +- .NET WebForms [Document & PDF annotator](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-.NET/tree/master/Demos) [Home](https://www.groupdocs.com/) | [Product Page](https://products.groupdocs.com/annotation/java) | [Documentation](https://docs.groupdocs.com/annotation/java/) | [Demos](https://products.groupdocs.app/annotation/family) | [API Reference](https://apireference.groupdocs.com/java/annotation) | [Examples](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java/tree/master/Examples) | [Blog](https://blog.groupdocs.com/category/annotation/) | [Search](https://search.groupdocs.com/) | [Free Support](https://forum.groupdocs.com/c/annotation) | [Temporary License](https://purchase.groupdocs.com/temporary-license) diff --git a/Demos/Spring/client/package.json b/Demos/Spring/client/package.json index 6d330db..868dc0e 100644 --- a/Demos/Spring/client/package.json +++ b/Demos/Spring/client/package.json @@ -36,7 +36,7 @@ "@angular/platform-browser": "^8.2.4", "@angular/platform-browser-dynamic": "^8.2.4", "@angular/router": "^8.2.4", - "@groupdocs.examples.angular/annotation": "^0.8.99", + "@groupdocs.examples.angular/annotation": "^0.8.100", "@nrwl/angular": "^8.12.11", "common-components": "^1.0.5", "core-js": "^2.6.11", diff --git a/Demos/Spring/src/test/java/com/groupdocs/ui/annotation/controller/AnnotationControllerTest.java b/Demos/Spring/src/test/java/com/groupdocs/ui/annotation/controller/AnnotationControllerTest.java index 152a32d..b9ba16c 100644 --- a/Demos/Spring/src/test/java/com/groupdocs/ui/annotation/controller/AnnotationControllerTest.java +++ b/Demos/Spring/src/test/java/com/groupdocs/ui/annotation/controller/AnnotationControllerTest.java @@ -15,8 +15,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup; -@RunWith(SpringRunner.class) -@SpringBootTest +//@RunWith(SpringRunner.class) +//@SpringBootTest public class AnnotationControllerTest { // MockMvc mvc; //