Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dav support #47

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ public synchronized void init() {
try {
cMapInputStream.close();
} catch (IOException e) {
logger.log(Level.FINE, "Error clossing cmap stream", e);
logger.log(Level.FINE, "Error closing cmap stream", e);
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<jbig2.version>3.0.4</jbig2.version>
<font-box.version>2.0.27</font-box.version>
<junit.bom.version>5.9.3</junit.bom.version>
<commons-logging.version>1.2</commons-logging.version>
</properties>

<licenses>
Expand Down Expand Up @@ -167,6 +168,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<configuration>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
6 changes: 5 additions & 1 deletion viewer/viewer-awt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ dependencies {
implementation 'org.bouncycastle:bcprov-jdk15on:' + "${BOUNCY_VERSION}"
implementation 'org.bouncycastle:bcprov-ext-jdk15on:' + "${BOUNCY_VERSION}"
implementation 'org.bouncycastle:bcpkix-jdk15on:' + "${BOUNCY_VERSION}"
compile 'com.github.lookfirst:sardine:5.12'
compile 'org.apache.tika:tika-core:1.23'
compile 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.3'
compile 'org.glassfish.jaxb:jaxb-runtime:2.3.3'
}

// generatePomFileForViewerJarPublication
Expand Down Expand Up @@ -101,4 +105,4 @@ task javadocJar(type: Jar, dependsOn: 'javadoc') {
artifacts {
archives sourcesJar
archives javadocJar
}
}
134 changes: 78 additions & 56 deletions viewer/viewer-awt/pom.xml
Original file line number Diff line number Diff line change
@@ -1,56 +1,78 @@
<?xml version="1.0"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.github.pcorless.icepdf</groupId>
<artifactId>viewer</artifactId>
<version>7.2.0-SNAPSHOT</version>
</parent>
<artifactId>icepdf-viewer</artifactId>
<packaging>jar</packaging>
<name>ICEpdf :: Viewer : Swing/AWT Viewer RI</name>
<description>
ICEpdf Java Swing/AWT reference implementation.
</description>

<dependencies>
<dependency>
<groupId>com.github.pcorless.icepdf</groupId>
<artifactId>icepdf-core</artifactId>
</dependency>
</dependencies>

<profiles>
<profile>
<id>assembly</id>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>org.icepdf.ri.viewer.Launcher</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<!-- this is used for inheritance merges -->
<phase>package</phase>
<!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
<?xml version="1.0"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.github.pcorless.icepdf</groupId>
<artifactId>viewer</artifactId>
<version>7.2.0-SNAPSHOT</version>
</parent>
<artifactId>icepdf-viewer</artifactId>
<packaging>jar</packaging>
<name>ICEpdf :: Viewer : Swing/AWT Viewer RI</name>
<description>
ICEpdf Java Swing/AWT reference implementation.
</description>

<dependencies>
<dependency>
<groupId>com.github.pcorless.icepdf</groupId>
<artifactId>icepdf-core</artifactId>
</dependency>
<dependency>
<groupId>com.github.lookfirst</groupId>
<artifactId>sardine</artifactId>
<version>5.12</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>1.23</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.3</version>
</dependency>
</dependencies>

<profiles>
<profile>
<id>assembly</id>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>org.icepdf.ri.viewer.Launcher</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<!-- this is used for inheritance merges -->
<phase>package</phase>
<!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>


</project>
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public class KeyEventConstants {
public static final int MODIFIER_OPEN_FILE = MENU_SHORTCUT_KEY_MASK;
public static final int KEY_CODE_OPEN_URL = KeyEvent.VK_U;
public static final int MODIFIER_OPEN_URL = MENU_SHORTCUT_KEY_MASK;
public static final int KEY_CODE_OPEN_DAV = KEY_CODE_OPEN_URL;
public static final int MODIFIER_OPEN_DAV = MENU_SHORTCUT_KEY_MASK | InputEvent.ALT_MASK;
public static final int KEY_CODE_CLOSE = KeyEvent.VK_W;
public static final int MODIFIER_CLOSE = MENU_SHORTCUT_KEY_MASK;
public static final int KEY_CODE_SAVE = KeyEvent.VK_S;
Expand Down
Loading