Merge pull request #5492 from wseyler/master-merge-scheduler-plugin

[BACKLOG-39033] - Master merge into scheduler plugin

api/src/main/java/javax/ws/rs/core/NoContentException.java

@@ -0,0 +1,70 @@
+/*! ******************************************************************************
+ *
+ * Pentaho Data Integration
+ *
+ * Copyright (C) 2024 by Hitachi Vantara : http://www.pentaho.com
+ *
+ *******************************************************************************
+ *
+ * Licensed 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.
+ *
+ ******************************************************************************/
+
+package javax.ws.rs.core;
+
+import java.io.IOException;
+
+/**
+ * An I/O exception thrown by {@link javax.ws.rs.ext.MessageBodyReader} implementations
+ * when reading a zero-length message content to indicate that the message body reader
+ * is not able to produce an instance representing an zero-length message content.
+ * <p>
+ * This exception, when thrown while reading a server request entity, is automatically
+ * translated by JAX-RS server runtime into a {@link javax.ws.rs.BadRequestException}
+ * wrapping the original {@code NoContentException} and rethrown for a standard processing by
+ * the registered {@link javax.ws.rs.ext.ExceptionMapper exception mappers}.
+ * </p>
+ */
+public class NoContentException extends IOException {
+    private static final long serialVersionUID = -3082577759787473245L;
+
+    /**
+     * Construct a new {@code NoContentException} instance.
+     *
+     * @param message the detail message (which is saved for later retrieval
+     *                by the {@link #getMessage()} method).
+     */
+    public NoContentException(String message) {
+        super(message);
+    }
+
+    /**
+     * Construct a new {@code NoContentException} instance.
+     *
+     * @param message the detail message (which is saved for later retrieval
+     *                by the {@link #getMessage()} method).
+     * @param cause   the underlying cause of the exception.
+     */
+    public NoContentException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Construct a new {@code NoContentException} instance.
+     *
+     * @param cause the underlying cause of the exception.
+     */
+    public NoContentException(Throwable cause) {
+        super(cause);
+    }
+}

assemblies/pentaho-solutions/pom.xml

@@ -553,6 +553,13 @@
                   <type>zip</type>
                   <outputDirectory>${prepared.kettle.plugins.directory}</outputDirectory>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.pentaho.di.plugins</groupId>
+                  <artifactId>sftpput-plugin</artifactId>
+                  <version>${project.version}</version>
+                  <type>zip</type>
+                  <outputDirectory>${prepared.kettle.plugins.directory}</outputDirectory>
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.pentaho.di.plugins</groupId>
                   <artifactId>put-file-sftp-plugins</artifactId>
@@ -567,6 +574,13 @@
                   <type>zip</type>
                   <outputDirectory>${prepared.kettle.plugins.directory}</outputDirectory>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.pentaho.di.plugins</groupId>
+                  <artifactId>msg-box-info-plugins</artifactId>
+                  <version>${project.version}</version>
+                  <type>zip</type>
+                  <outputDirectory>${prepared.kettle.plugins.directory}</outputDirectory>
+                </artifactItem>
               </artifactItems>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>

assemblies/pentaho-solutions/src/main/resources/pentaho-solutions/system/default-plugin/resources/messages/messages_CN.properties

@@ -0,0 +1,6 @@
+analysisView=\u5206\u6790\u6aa2\u8996 (\u820a\u7248)
+opened=\u5df2\u958b\u555f
+schedules=\u6392\u7a0b
+admin=\u7cfb\u7d71\u7ba1\u7406
+home=\u9996\u9801
+browse=\u700f\u89bd\u6a94\u6848

assemblies/pentaho-solutions/src/main/resources/pentaho-solutions/system/default-plugin/resources/messages/messages_supported_languages.properties

@@ -11,3 +11,4 @@ de=Deutsch
 ja=\u65E5\u672C\u8A9E
 en=English
 zh_CN=\u7b80\u4f53\u4e2d\u6587
+CN=\u7E41\u4F53\u4E2D\u6587

assemblies/pentaho-solutions/src/main/resources/pentaho-solutions/system/pentahoServices.spring.xml

@@ -128,8 +128,6 @@
   </bean>
   <bean class="org.pentaho.platform.web.http.api.resources.EmailResource" scope="request"/>
   <bean class="org.pentaho.platform.web.http.api.resources.SessionResource" scope="request"/>
-<!--  <bean class="org.pentaho.platform.web.http.api.resources.SchedulerResource" scope="request"/>-->
-<!--  <bean class="org.pentaho.platform.web.http.api.resources.BlockoutResource" scope="request"/>-->
   <bean class="org.pentaho.platform.web.http.api.resources.RepositoryResource" scope="request">
     <property name="whitelist" ref="RepositoryDownloadWhitelist"/>
   </bean>

assemblies/pentaho-solutions/src/main/resources/pentaho-solutions/system/test-plugin-perspective/resources/messages/messages_CN.properties

@@ -0,0 +1,8 @@
+testPerspective=\u6e2c\u8a66\u6aa2\u8996\u65b9\u584a
+defaultPerspectiveTestToolbarButton=\u6e2c\u8a66\u6aa2\u8996\u65b9\u584a\u5de5\u5177\u5217\u6309\u9215
+defaultPerspectiveTestMenuItem=\u6e2c\u8a66\u6aa2\u8996\u65b9\u584a\u529f\u80fd\u8868\u9805\u76ee
+test=\u6e2c\u8a66
+testItem=\u6e2c\u8a66\u9805\u76ee
+stickyMenuItem=\u81ea\u9ecf\u529f\u80fd\u8868\u9805\u76ee
+sticky=\u81ea\u9ecf
+stickyButton=\u81ea\u9ecf\u6309\u9215

assemblies/pentaho-war/pom.xml

@@ -735,9 +735,9 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>com.lowagie</groupId>
-      <artifactId>itext</artifactId>
-      <version>${itext.version}</version>
+      <groupId>com.github.librepdf</groupId>
+      <artifactId>openpdf</artifactId>
+      <version>${openpdf.version}</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>