Merge pull request #2 from diging/develop

Prepare release
diging · Oct 17, 2022 · 4c3cf7c · 4c3cf7c
2 parents b747bb5 + d91a6a2
commit 4c3cf7c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/giles-eco-imogen/pom.xml b/giles-eco-imogen/pom.xml
@@ -200,12 +200,12 @@
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox</artifactId>
-            <version>2.0.23</version>
+            <version>3.0.0-RC1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox-tools</artifactId>
-            <version>2.0.23</version>
+            <version>3.0.0-RC1</version>
         </dependency>
         <dependency>
             <groupId>com.github.jai-imageio</groupId>
@@ -343,17 +343,18 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <url>${tomcat.deploy.path}</url>
+                    <server>${tomcat.server.id}</server>
+                    <path>/${tomcat.app.name}</path>
+                </configuration>
+            </plugin>
         </plugins>
-        <plugin>
-            <groupId>org.apache.tomcat.maven</groupId>
-            <artifactId>tomcat7-maven-plugin</artifactId>
-            <version>2.2</version>
-            <configuration>
-                <url>${tomcat.deploy.path}</url>
-                <server>${tomcat.server.id}</server>
-                <path>/${tomcat.app.name}</path>
-            </configuration>
-        </plugin>
+
     </build>
 
 </project>
diff --git a/...n/java/edu/asu/diging/gilesecosystem/imogen/core/service/impl/ImageExtractionManager.java b/...n/java/edu/asu/diging/gilesecosystem/imogen/core/service/impl/ImageExtractionManager.java
@@ -9,6 +9,7 @@
 
 import javax.annotation.PostConstruct;
 
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -67,7 +68,7 @@ public void init() {
          * slow performance in color operations. Solution: disable LittleCMS in favour
          * of the old KCMS (Kodak Color Management System)"
          */
-        System.setProperty("sun.java2d.cmm", "sun.java2d.cmm.kcms.KcmsServiceProvider");
+        //System.setProperty("sun.java2d.cmm", "sun.java2d.cmm.kcms.KcmsServiceProvider");
 
         requestFactory.config(CompletionNotificationRequest.class);
     }
@@ -86,8 +87,7 @@ public void extractImages(ICompletedStorageRequest request) {
         PDDocument pdfDocument = null;
         RequestStatus status = RequestStatus.COMPLETE;
         try {
-            pdfDocument = PDDocument.load(new ByteArrayInputStream(downloadFile(request.getDownloadUrl())),
-                    MemoryUsageSetting.setupTempFileOnly());
+            pdfDocument = Loader.loadPDF(new ByteArrayInputStream(downloadFile(request.getDownloadUrl())));
         } catch (IOException e) {
             messageHandler.handleMessage("Could not extract text.", e, MessageType.ERROR);
             status = RequestStatus.FAILED;

diff --git a/giles-eco-imogen/src/main/resources/log4j.xml b/giles-eco-imogen/src/main/resources/log4j.xml
@@ -11,7 +11,7 @@
     </appender>
 
     <!-- Application Loggers -->
-    <logger name="edu.asu.template">
+    <logger name="edu.asu.diging">
         <level value="${log.level}" />
     </logger>