devgateway · brianbrix · Mar 31, 2024 · Mar 31, 2024 · Apr 2, 2024 · Apr 2, 2024
diff --git a/amp/403.jsp b/amp/403.jsp
@@ -1,9 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
 <html><head>
 <title>403 Forbidden</title>
+
 </head>
 	<body>
 		<h1>Forbidden</h1>
 		<p>You don't have permission to access this page.</p>
 	</body>
-</html>
+</html>
diff --git a/amp/Dockerfile b/amp/Dockerfile
@@ -117,13 +117,20 @@ COPY --from=compile-reampv2 /tmp/amp/TEMPLATE/reampv2/build TEMPLATE/reampv2/bui
 ARG BUILD_SOURCE
 RUN --mount=type=cache,target=/root/.m2 \
     mvn -B test war:exploded -DfailIfNoTests=false \
-      -DbuildSource=$BUILD_SOURCE \
-      -Djdbc.user=amp -Djdbc.password=amp122006 -Djdbc.db=amp -Djdbc.host=db \
-      -Djdbc.port=5432 -DdbName=postgresql -Djdbc.driverClassName=org.postgresql.Driver \
-      -Dskip.npm -Dskip.installnodenpm \
+      -DbuildSource="$BUILD_SOURCE" \
+      -Djdbc.user=amp \
+      -Djdbc.password=amp122006 \
+      -Djdbc.db=amp \
+      -Djdbc.host=db \
+      -Djdbc.port=5432 \
+      -DdbName=postgresql \
+      -Djdbc.driverClassName=org.postgresql.Driver \
+      -Dskip.npm \
+      -Dskip.installnodenpm \
     && mv target/amp exploded \
     && rm -rf target
 
+
 FROM tomcat:8.5.79-jdk8
 
 RUN apt-get update \

diff --git a/amp/TEMPLATE/ampTemplate/layout/addEditLayout.jsp b/amp/TEMPLATE/ampTemplate/layout/addEditLayout.jsp
@@ -53,7 +53,7 @@
   	<TR background="<%= digiContext %>/TEMPLATE/ampTemplate/images/bg-header.gif">
     	<TD background="<%= digiContext %>/TEMPLATE/ampTemplate/images/bg-header.gif"
     	colSpan=2 height=66>
-			<jsp:include page="../../../jsp/aim/view/teamPagesHeader.jsp"  />
+			<jsp:include page="/WEB-INF/jsp/aim/view/teamPagesHeader.jsp"  />
 		</TD>
 	</TR>
 	</TBODY>

diff --git a/amp/TEMPLATE/ampTemplate/layout/mainLayout.jsp b/amp/TEMPLATE/ampTemplate/layout/mainLayout.jsp
@@ -49,7 +49,7 @@
 	<link rel="stylesheet" href="tabs/css/bootstrap-theme.css">
 	<script type="text/javascript" src="<digi:file src="/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/dist/amp-boilerplate.js"/>"></script>
 
-<% if(org.digijava.kernel.util.SiteUtils.isEffectiveLangRTL() == true) {%>
+<% if(org.digijava.kernel.util.SiteUtils.isEffectiveLangRTL()) {%>
      <link rel="stylesheet" type="text/css" href="/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/css/boilerplate-rtl.css">
 	 <link rel="stylesheet" type="text/css" href="/TEMPLATE/ampTemplate/css_2/amp-rtl.css">
 <% } %>

diff --git a/amp/TEMPLATE/ampTemplate/layout/tabLayout.jsp b/amp/TEMPLATE/ampTemplate/layout/tabLayout.jsp
@@ -102,7 +102,7 @@
 
 				<TD width="100%" vAlign="top" align="left">
 
-					<jsp:include page="../../../jsp/aim/view/teamPagesHeader.jsp"  />
+					<jsp:include page="../../../src/main/webapp/WEB-INF/jsp/aim/view/teamPagesHeader.jsp"  />
 
 				</TD>
 

diff --git a/amp/TEMPLATE/ampTemplate/saikuui_reports/amp_notes.txt b/amp/TEMPLATE/ampTemplate/saikuui_reports/amp_notes.txt
@@ -8,7 +8,7 @@ Feature: Executing MDX queries coming from AMP
 Modified files:
 saiku/routers/QueryRouter.js
 saiku/Settings.js
-saiku/jsp.js
+saiku/Repository.js
 
 
 Feature: Deactivated Global Toolbar

diff --git a/amp/TEMPLATE/ampTemplate/saikuui_reports/index_reports.html b/amp/TEMPLATE/ampTemplate/saikuui_reports/index_reports.html
@@ -127,13 +127,13 @@
 <script type="text/javascript" src="js/saiku/render/SaikuRenderer.js"></script>
 <script type="text/javascript" src="js/saiku/render/SaikuTableRenderer.js"></script>
 <script type="text/javascript" src="js/saiku/render/AMPTableRenderer.js"></script>
+<script type="text/javascript" src="js/saiku/models/Repository.js"></script>
 <script type="text/javascript" src="js/saiku/models/Dimension.js"></script>
 <script type="text/javascript" src="js/saiku/views/QueryToolbar.js"></script>
 <script type="text/javascript" src="js/saiku/views/WorkspaceToolbar.js"></script>
 <script type="text/javascript" src="js/saiku/views/Table.js"></script>
 <script type="text/javascript" src="js/saiku/views/Workspace.js"></script>
 <script type="text/javascript" src="js/saiku/views/Tab.js"></script>
-<script type="text/javascript" src="js/saiku/models/jsp.js"></script>
 <script type="text/javascript" src="js/saiku/models/Result.js"></script>
 <script type="text/javascript" src="js/saiku/plugins/AMPFilters/FilterUtils.js"></script>
 <script type="text/javascript" src="js/saiku/plugins/AMPDirection/plugin.js"></script>

diff --git a/amp/TEMPLATE/ampTemplate/saikuui_reports/js/saiku/models/Repository.js b/amp/TEMPLATE/ampTemplate/saikuui_reports/js/saiku/models/Repository.js
@@ -1,4 +1,4 @@
-/*  
+/*
  *   Copyright 2012 OSBI Ltd
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,12 +13,12 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
- 
+
 /**
  * Repository query
  */
 var RepositoryUrl = "api/jsp";
-var repoPathUrl = function() {   
+var repoPathUrl = function() {
     return  RepositoryUrl;
 }
 
@@ -52,21 +52,21 @@ var RepositoryZipExport = Backbone.Model.extend( {
     }
 } );
 
-var SavedQuery = Backbone.Model.extend({
+ var SavedQuery = Backbone.Model.extend({
 
     parse: function(response) {
     	Saiku.logger.log("SavedQuery.parse");
         //console.log("response: " + response);
         //this.xml = response;
     },
-    
+
     url: function() {
     	Saiku.logger.log("SavedQuery.url");
         var u = repoPathUrl() + "/resource";
         return u;
 
     },
-    
+
     move_query_to_workspace: function(model, response) {
     	Saiku.logger.log("SavedQuery.move_query_to_workspace");
         var file = response;
@@ -78,24 +78,24 @@ var SavedQuery = Backbone.Model.extend({
                 var Re2 = new RegExp("\\$\\{" + variable.toLowerCase() + "\\}","g");
                 file = file.replace(Re,Settings[key]);
                 file = file.replace(Re2,Settings[key]);
-                
+
             }
         }
-        var query = new Query({ 
+        var query = new Query({
             xml: file,
             formatter: Settings.CELLSET_FORMATTER
         },{
             name: filename
         });
-        
+
         var tab = Saiku.tabs.add(new Workspace({ query: query }));
     },
     move_query_to_workspace_json: function(model, response) {
     	Saiku.logger.log("SavedQuery.move_query_to_workspace_json");
         var json = JSON.stringify(response);
         var filename = model.get('file');
-        
-        var query = new Query({ 
+
+        var query = new Query({
             json: json,
             formatter: Settings.CELLSET_FORMATTER,
             report_id: model.get('report_id'),
@@ -113,7 +113,7 @@ var SavedQuery = Backbone.Model.extend({
         },{
             name: filename
         });
-                
+
         query.set('name', filename);
         var tab = Saiku.tabs.add(new Workspace({ query: query }));
     }
@@ -124,21 +124,21 @@ var SavedQuery = Backbone.Model.extend({
  */
 var Repository = Backbone.Collection.extend({
     model: SavedQuery,
-    
+
     initialize: function(args, options) {
     	Saiku.logger.log("Repository.initialize");
         if (options && options.dialog) {
             this.dialog = options.dialog;
         }
     },
-    
+
     parse: function(response) {
     	Saiku.logger.log("Repository.parse");
         if (this.dialog) {
             this.dialog.populate(response);
         }
     },
-    
+
     url: function() {
     	Saiku.logger.log("Repository.url");
         var segment = repoPathUrl() + "?type=saiku";

diff --git a/amp/TEMPLATE/ampTemplate/saikuui_reports/js/saiku/routers/QueryRouter.js b/amp/TEMPLATE/ampTemplate/saikuui_reports/js/saiku/routers/QueryRouter.js
@@ -1,4 +1,4 @@
-/*  
+/*
  *   Copyright 2012 OSBI Ltd
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +14,7 @@
  *   limitations under the License.
  */
 
+
 /**
  * Router for opening query when session is initialized
  */
@@ -31,8 +32,8 @@ var QueryRouter = Backbone.Router.extend({
     },
     run_report: function(report_token) {
     	Saiku.logger.log("QueryRouter.run_report");
-    	$.getJSON(Settings.AMP_PATH + "/run/" + report_token, process_spec);	
-    },    
+    	$.getJSON(Settings.AMP_PATH + "/run/" + report_token, process_spec);
+    },
     open_report: function(report_id) {
         Saiku.logger.log("QueryRouter.open_report");
         if (Saiku.originalReportMetadata) {
@@ -42,7 +43,7 @@ var QueryRouter = Backbone.Router.extend({
         }
     },
     open_query: function(query_name) {
-    	Saiku.logger.log("QueryRouter.open_query");        
+    	Saiku.logger.log("QueryRouter.open_query");
     },
     open_query_repository: function( ) {
     	Saiku.logger.log("QueryRouter.open_query_repository");
@@ -65,7 +66,7 @@ var process_spec = function(data) {
 
 	templateQuery.reportSpec = data.reportSpec;
 	Settings.RESULTS_PER_PAGE = data.reportMetadata.recordsPerPage;
-	 
+
 	var report_type = data.reportMetadata.reportType;
 	var report_fieldname = (report_type === "IN_MEMORY") ? "report_token" : "report_id";
 	var report_identifier = data.reportMetadata.reportIdentifier;
@@ -102,8 +103,8 @@ var templateQuery = {
    },
    "plugins":{
 
-   },   
+   },
    "metadata":{
 
    }
-};
+};
diff --git a/amp/TEMPLATE/ampTemplate/saikuui_reports/test.html b/amp/TEMPLATE/ampTemplate/saikuui_reports/test.html
@@ -37,7 +37,7 @@
     <script type="text/javascript" src="js/saiku/views/OpenQuery.js"></script>
     <script type="text/javascript" src="js/saiku/views/SaveQuery.js"></script>
     <script type="text/javascript" src="js/saiku/views/Tab.js"></script>
-    <script type="text/javascript" src="js/saiku/models/jsp.js"></script>
+    <script type="text/javascript" src="js/saiku/models/Repository.js"></script>
     <script type="text/javascript" src="js/saiku/models/Properties.js"></script>
     <script type="text/javascript" src="js/saiku/models/Result.js"></script>
     <script type="text/javascript" src="js/saiku/models/QueryAction.js"></script>

diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/containers/APDocumentPage.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/containers/APDocumentPage.jsx
@@ -2,7 +2,8 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import { APDocument } from 'amp-ui';
 import * as ResourceAction from '../actions/ResourceAction';
-import RepositoryManager from '../utils/jspManager';
+import RepositoryManager from "amp/modules/activity/preview/utils/RepositoryManager";
+// import RepositoryManager from '../utils/jspManager';
 
 const mapStateToProps = (state) => {
     return {

diff --git a/amp/pom.xml b/amp/pom.xml
@@ -12,7 +12,7 @@
         <springSecurityVersion>5.6.11</springSecurityVersion>
         <springVersion>5.3.28</springVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jackrabbit.version>2.16.2</jackrabbit.version>
+        <jackrabbit.version>2.19.6</jackrabbit.version>
         <lucene.version>3.6.2</lucene.version>
         <jersey.version>1.19</jersey.version>
         <jackson.version>2.14.2</jackson.version>
@@ -31,12 +31,12 @@
         <metainf>${project.basedir}/META-INF</metainf>
         <classes>${project.basedir}/src/main/webapp/WEB-INF/classes</classes>
         <src>${project.basedir}/src</src>
-        <test>${project.basedir}/test</test>
+        <test>${project.basedir}/src/test</test>
         <etc>${project.basedir}/etc</etc>
         <deployConfigs>deployConfigs</deployConfigs>
-        <repository>${project.basedir}/jsp</repository>
-        <jackrabbit>${project.basedir}/jackrabbit</jackrabbit>
-        <ampTest>${project.basedir}/src/main/webapp/WEB-INF/amp-test</ampTest>
+        <repository>${project.basedir}/src/main/webapp/WEB-INF/jsp</repository>
+        <jackrabbit>${project.basedir}/src/main/webapp/WEB-INF/jackrabbit</jackrabbit>
+        <ampTest>${project.basedir}/src/test</ampTest>
         <ampSelenium>${project.basedir}/src/main/webapp/WEB-INF/amp-selenium-test</ampSelenium>
 
         <!-- Uncomment and update the following line if needed -->
@@ -472,8 +472,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-api</artifactId>
-            <version>${jackrabbit.version}</version>
+            <artifactId>oak-jackrabbit-api</artifactId>
+            <version>1.20.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
@@ -2123,14 +2123,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M2</version>
+                <version>3.0.0-M5</version>
+
                 <configuration>
                     <testSourceDirectory>${project.build.testSourceDirectory}</testSourceDirectory>
                     <includes>
-                        <include>**/Test*.java</include>
-                        <include>**/*Test.java</include>
-                        <include>**/*Testcases.java</include>
-                        <include>**/*Test*.java</include>
+<!--                        <include>**/Test*.java</include>-->
+<!--                        <include>**/*Test.java</include>-->
+<!--                        <include>**/*Testcases.java</include>-->
+<!--                        <include>**/*Test*.java</include>-->
+                        <include>**/*</include>
+
                     </includes>
                     <excludes>
                         <!--suites are running tests twice-->
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,7 +102,7 @@ @@
     				<TD width="100%" vAlign="top" align="left">
-    					<jsp:include page="../../../jsp/aim/view/teamPagesHeader.jsp"  />
+    					<jsp:include page="../../../src/main/webapp/WEB-INF/jsp/aim/view/teamPagesHeader.jsp"  />
     				</TD>
@@ Expand Down @@