diff --git a/.gitmodules b/.gitmodules index 47135e73d6e..6dd784f502f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate"] path = amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate - url = git@github.com:devgateway/amp-boilerplate.git + url = https://github.com/devgateway/amp-boilerplate.git [submodule "amp/TEMPLATE/ampTemplate/node_modules/amp-translate"] path = amp/TEMPLATE/ampTemplate/node_modules/amp-translate - url = git@github.com:devgateway/amp-translate.git + url = https://github.com/devgateway/amp-translate.git [submodule "amp/TEMPLATE/ampTemplate/node_modules/amp-filter"] path = amp/TEMPLATE/ampTemplate/node_modules/amp-filter - url = git@github.com:devgateway/amp-filter.git + url = https://github.com/devgateway/amp-filter.git diff --git a/amp/TEMPLATE/ampTemplate/amp-settings/package-lock.json b/amp/TEMPLATE/ampTemplate/amp-settings/package-lock.json index a8326baf306..1182d02f628 100644 --- a/amp/TEMPLATE/ampTemplate/amp-settings/package-lock.json +++ b/amp/TEMPLATE/ampTemplate/amp-settings/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.2", "license": "ISC", "dependencies": { - "amp-translate": "github:devgateway/amp-translate" + "amp-translate": "git+https://github.com/devgateway/amp-translate.git" }, "devDependencies": { "backbone": "1.1.2", @@ -90,7 +90,7 @@ }, "node_modules/amp-translate": { "version": "0.0.1", - "resolved": "git+ssh://git@github.com/devgateway/amp-translate.git#c169447fb1cfd728259830ac5564d6dbf31a5380", + "resolved": "git+https://github.com/devgateway/amp-translate.git#c169447fb1cfd728259830ac5564d6dbf31a5380", "dependencies": { "backbone": "1.1.2", "jquery": "2.1.1", @@ -8107,8 +8107,8 @@ "optional": true }, "amp-translate": { - "version": "git+ssh://git@github.com/devgateway/amp-translate.git#c169447fb1cfd728259830ac5564d6dbf31a5380", - "from": "amp-translate@github:devgateway/amp-translate", + "version": "git+https://github.com/devgateway/amp-translate.git#c169447fb1cfd728259830ac5564d6dbf31a5380", + "from": "amp-translate@git+https://github.com/devgateway/amp-translate.git", "requires": { "backbone": "1.1.2", "jquery": "2.1.1", diff --git a/amp/TEMPLATE/ampTemplate/amp-settings/package.json b/amp/TEMPLATE/ampTemplate/amp-settings/package.json index 972d02ef00f..238efd6bae4 100644 --- a/amp/TEMPLATE/ampTemplate/amp-settings/package.json +++ b/amp/TEMPLATE/ampTemplate/amp-settings/package.json @@ -57,6 +57,6 @@ "tag": "latest" }, "dependencies": { - "amp-translate": "https://github.com/devgateway/amp-translate.git" + "amp-translate": "git+https://github.com/devgateway/amp-translate.git" } } diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/package-lock.json b/amp/TEMPLATE/ampTemplate/dashboard/dev/package-lock.json index 317b40f8a69..ac1b6203a1f 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/package-lock.json +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/package-lock.json @@ -14,7 +14,7 @@ "bootstrap": "~3.4.1", "d3": "=3.5.12", "jquery": "~2.1.1", - "nvd3": "git://github.com/novus/nvd3.git#v1.7.1", + "nvd3": "git+https://github.com/novus/nvd3.git#v1.7.1", "underscore": "=1.7.0" }, "devDependencies": { @@ -7671,7 +7671,7 @@ }, "node_modules/nvd3": { "version": "1.7.1", - "resolved": "git+ssh://git@github.com/novus/nvd3.git#679fe2ff96c194e442970cb9959ebccd79f6bd43" + "resolved": "git+https://github.com/novus/nvd3.git#679fe2ff96c194e442970cb9959ebccd79f6bd43" }, "node_modules/object-copy": { "version": "0.1.0", @@ -17632,8 +17632,8 @@ "dev": true }, "nvd3": { - "version": "git+ssh://git@github.com/novus/nvd3.git#679fe2ff96c194e442970cb9959ebccd79f6bd43", - "from": "nvd3@git://github.com/novus/nvd3.git#v1.7.1" + "version": "git+https://github.com/novus/nvd3.git#679fe2ff96c194e442970cb9959ebccd79f6bd43", + "from": "nvd3@git+https://github.com/novus/nvd3.git#v1.7.1" }, "object-copy": { "version": "0.1.0", diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json b/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json index bd121a4aa34..d4436f352d4 100644 --- a/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json +++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json @@ -45,7 +45,7 @@ "bootstrap": "~3.4.1", "d3": "=3.5.12", "jquery": "~2.1.1", - "nvd3": "git://github.com/novus/nvd3.git#v1.7.1", + "nvd3": "git+https://github.com/novus/nvd3.git#v1.7.1", "underscore": "=1.7.0" }, "browserslist": [ diff --git a/amp/TEMPLATE/reamp/package-lock.json b/amp/TEMPLATE/reamp/package-lock.json index e0c9f36b9ed..6764fe72868 100644 --- a/amp/TEMPLATE/reamp/package-lock.json +++ b/amp/TEMPLATE/reamp/package-lock.json @@ -22,7 +22,7 @@ "uglifyjs-webpack-plugin": "^1.3.0" }, "devDependencies": { - "amp-ui": "github:devgateway/amp-ui#fix/AMP-31133/Indicator-values-display-fixes", + "amp-ui": "git+https://github.com/devgateway/amp-ui.git#fix/AMP-31133/Indicator-values-display-fixes", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", @@ -72,11 +72,11 @@ "license": "MIT", "dependencies": { "docx": "^4.7.1", - "file-saver": "github:devgateway/FileSaver.js", + "file-saver": "git+https://github.com/devgateway/FileSaver.js.git", "fs": "0.0.1-security", "he": "^1.2.0", "moment": "^2.18.1", - "react-router-hash-link": "git://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3" + "react-router-hash-link": "git+https://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3" }, "devDependencies": { "@svgr/rollup": "^2.4.1", @@ -101,7 +101,7 @@ "eslint-plugin-promise": "^4.0.0", "eslint-plugin-react": "^7.10.0", "eslint-plugin-standard": "^3.1.0", - "file-saver": "git+ssh://github.com/devgateway/FileSaver.js", + "file-saver": "git+https://github.com/devgateway/FileSaver.js.git", "fs": "0.0.1-security", "gh-pages": "^1.2.0", "numeral": "^2.0.6", @@ -309,16 +309,16 @@ }, "node_modules/amp-ui": { "version": "2.1.1", - "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#b033cf93099abd3fd308a1d3080f95ac9ddbb5fd", + "resolved": "git+https://github.com/devgateway/amp-ui.git#b033cf93099abd3fd308a1d3080f95ac9ddbb5fd", "dev": true, "license": "MIT", "dependencies": { "docx": "^4.7.1", - "file-saver": "github:devgateway/FileSaver.js", + "file-saver": "git+https://github.com/devgateway/FileSaver.js.git", "fs": "0.0.1-security", "he": "^1.2.0", "moment": "^2.18.1", - "react-router-hash-link": "git://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3" + "react-router-hash-link": "git+https://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3" }, "engines": { "node": ">=16", @@ -3127,7 +3127,7 @@ }, "node_modules/file-saver": { "version": "2.0.2", - "resolved": "git+ssh://git@github.com/devgateway/FileSaver.js.git#20b5a235d8ca3b174b8c5f51dfdff11f9a00cccb", + "resolved": "git+https://github.com/devgateway/FileSaver.js.git#20b5a235d8ca3b174b8c5f51dfdff11f9a00cccb", "dev": true, "license": "MIT" }, @@ -6799,7 +6799,7 @@ }, "node_modules/react-router-hash-link": { "name": "react-router-hash-link-v2/3", - "resolved": "git+ssh://git@github.com/rafgraph/react-router-hash-link.git#eb264491c6289cca534a368046a37d9aa3cbc7f7", + "resolved": "git+https://github.com/rafgraph/react-router-hash-link.git#eb264491c6289cca534a368046a37d9aa3cbc7f7", "dev": true, "license": "MIT", "dependencies": { @@ -9493,16 +9493,16 @@ "dev": true }, "amp-ui": { - "version": "git+ssh://git@github.com/devgateway/amp-ui.git#b033cf93099abd3fd308a1d3080f95ac9ddbb5fd", + "version": "git+https://github.com/devgateway/amp-ui.git#b033cf93099abd3fd308a1d3080f95ac9ddbb5fd", "dev": true, - "from": "amp-ui@github:devgateway/amp-ui#fix/AMP-31133/Indicator-values-display-fixes", + "from": "amp-ui@git+https://github.com/devgateway/amp-ui.git#fix/AMP-31133/Indicator-values-display-fixes", "requires": { "docx": "^4.7.1", - "file-saver": "github:devgateway/FileSaver.js", + "file-saver": "git+https://github.com/devgateway/FileSaver.js.git", "fs": "0.0.1-security", "he": "^1.2.0", "moment": "^2.18.1", - "react-router-hash-link": "git://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3" + "react-router-hash-link": "git+https://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3" } }, "ansi-regex": { @@ -11939,9 +11939,9 @@ } }, "file-saver": { - "version": "git+ssh://git@github.com/devgateway/FileSaver.js.git#20b5a235d8ca3b174b8c5f51dfdff11f9a00cccb", + "version": "git+https://github.com/devgateway/FileSaver.js.git#20b5a235d8ca3b174b8c5f51dfdff11f9a00cccb", "dev": true, - "from": "file-saver@github:devgateway/FileSaver.js" + "from": "file-saver@git+https://github.com/devgateway/FileSaver.js.git" }, "filename-regex": { "version": "2.0.1", @@ -14958,9 +14958,9 @@ } }, "react-router-hash-link": { - "version": "git+ssh://git@github.com/rafgraph/react-router-hash-link.git#eb264491c6289cca534a368046a37d9aa3cbc7f7", + "version": "git+https://github.com/rafgraph/react-router-hash-link.git#eb264491c6289cca534a368046a37d9aa3cbc7f7", "dev": true, - "from": "react-router-hash-link@git://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3", + "from": "react-router-hash-link@git+https://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3", "requires": { "object-assign": "^4.1.0", "react": "^15.4.1", diff --git a/amp/TEMPLATE/reamp/package.json b/amp/TEMPLATE/reamp/package.json index fceef280486..d3d8e67d4c9 100644 --- a/amp/TEMPLATE/reamp/package.json +++ b/amp/TEMPLATE/reamp/package.json @@ -23,7 +23,7 @@ "author": "Alexei Savca", "license": "inherit", "devDependencies": { - "amp-ui": "github:devgateway/amp-ui#fix/AMP-31133/Indicator-values-display-fixes", + "amp-ui": "git+https://github.com/devgateway/amp-ui.git#fix/AMP-31133/Indicator-values-display-fixes", "babel-core": "^6.26.3", "babel-jest": "^6.0.1", "babel-loader": "^6.3.2", diff --git a/amp/TEMPLATE/reampv2/package-lock.json b/amp/TEMPLATE/reampv2/package-lock.json index a603284860d..93f119906bf 100644 --- a/amp/TEMPLATE/reampv2/package-lock.json +++ b/amp/TEMPLATE/reampv2/package-lock.json @@ -2268,14 +2268,14 @@ }, "node_modules/@devgateway/amp-boilerplate": { "version": "0.1.3", - "resolved": "git+ssh://git@github.com/devgateway/amp-boilerplate.git#9f5127d3f53a16deb8f4f683a96ad45119646684", + "resolved": "git+https://github.com/devgateway/amp-boilerplate.git#9f5127d3f53a16deb8f4f683a96ad45119646684", "dependencies": { "amp-translate": "^0.0.1" } }, "node_modules/@devgateway/amp-filter": { "version": "0.2.2", - "resolved": "git+ssh://git@github.com/devgateway/amp-filter.git#66495a9cb30768433add424d842662dadf51e17f", + "resolved": "git+https://github.com/devgateway/amp-filter.git#66495a9cb30768433add424d842662dadf51e17f", "license": "none", "dependencies": { "amp-translate": "^0.0.1" @@ -2283,10 +2283,10 @@ }, "node_modules/@devgateway/amp-settings": { "version": "0.1.2", - "resolved": "git+ssh://git@github.com/devgateway/amp-settings.git#9f6e9ce846a64d25e412cd45e45c5deed2f56432", + "resolved": "git+https://github.com/devgateway/amp-settings.git#9f6e9ce846a64d25e412cd45e45c5deed2f56432", "license": "ISC", "dependencies": { - "amp-translate": "github:devgateway/amp-translate" + "amp-translate": "git+https://github.com/devgateway/amp-translate.git" } }, "node_modules/@emotion/babel-plugin": { @@ -8601,7 +8601,7 @@ }, "node_modules/amp-translate": { "version": "0.0.1", - "resolved": "git+ssh://git@github.com/devgateway/amp-translate.git#829eff1e75d978d1db4494f9a89b64aa1c420365", + "resolved": "git+https://github.com/devgateway/amp-translate.git#829eff1e75d978d1db4494f9a89b64aa1c420365", "dependencies": { "backbone": "1.1.2", "jquery": "2.1.1", @@ -35043,7 +35043,7 @@ "name": "ampoffiline", "version": "1.0.0", "dependencies": { - "@devgateway/amp-boilerplate": "github:devgateway/amp-boilerplate", + "@devgateway/amp-boilerplate": "git+https://github.com/devgateway/amp-boilerplate.git", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", @@ -35205,7 +35205,7 @@ "version": "1.0.0", "dependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.21.11", - "@devgateway/amp-boilerplate": "github:devgateway/amp-boilerplate", + "@devgateway/amp-boilerplate": "git+https://github.com/devgateway/amp-boilerplate.git", "@reduxjs/toolkit": "^1.9.5", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", @@ -35416,9 +35416,9 @@ "name": "reampv2", "version": "1.0.1", "dependencies": { - "@devgateway/amp-boilerplate": "github:devgateway/amp-boilerplate", - "@devgateway/amp-filter": "github:devgateway/amp-filter", - "@devgateway/amp-settings": "github:devgateway/amp-settings", + "@devgateway/amp-boilerplate": "git+https://github.com/devgateway/amp-boilerplate.git", + "@devgateway/amp-filter": "git+https://github.com/devgateway/amp-filter.git", + "@devgateway/amp-settings": "git+https://github.com/devgateway/amp-settings.git", "@fortawesome/fontawesome-svg-core": "^1.2.30", "@fortawesome/free-solid-svg-icons": "^5.14.0", "@fortawesome/react-fontawesome": "^0.1.11", @@ -36979,7 +36979,7 @@ "packages/user-manager": { "version": "1.0.0", "dependencies": { - "@devgateway/amp-boilerplate": "github:devgateway/amp-boilerplate", + "@devgateway/amp-boilerplate": "git+https://github.com/devgateway/amp-boilerplate.git", "@reduxjs/toolkit": "^1.9.5", "@testing-library/jest-dom": "^6.1.2", "@testing-library/react": "^14.0.0", diff --git a/amp/TEMPLATE/reampv2/packages/ampoffline/package.json b/amp/TEMPLATE/reampv2/packages/ampoffline/package.json index b19deb99960..ab400bc3d76 100755 --- a/amp/TEMPLATE/reampv2/packages/ampoffline/package.json +++ b/amp/TEMPLATE/reampv2/packages/ampoffline/package.json @@ -4,7 +4,7 @@ "private": true, "proxy": "http://localhost:8080", "dependencies": { - "@devgateway/amp-boilerplate": "github:devgateway/amp-boilerplate", + "@devgateway/amp-boilerplate": "git+https://github.com/devgateway/amp-boilerplate.git", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", diff --git a/amp/TEMPLATE/reampv2/packages/container/package.json b/amp/TEMPLATE/reampv2/packages/container/package.json index bae4d064af4..ecb17a6303f 100755 --- a/amp/TEMPLATE/reampv2/packages/container/package.json +++ b/amp/TEMPLATE/reampv2/packages/container/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.21.11", - "@devgateway/amp-boilerplate": "github:devgateway/amp-boilerplate", + "@devgateway/amp-boilerplate": "git+https://github.com/devgateway/amp-boilerplate.git", "@reduxjs/toolkit": "^1.9.5", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.0.0", diff --git a/amp/TEMPLATE/reampv2/packages/reampv2-app/package.json b/amp/TEMPLATE/reampv2/packages/reampv2-app/package.json index 268761e6f91..d6be7060d9c 100755 --- a/amp/TEMPLATE/reampv2/packages/reampv2-app/package.json +++ b/amp/TEMPLATE/reampv2/packages/reampv2-app/package.json @@ -4,9 +4,9 @@ "private": true, "proxy": "http://localhost:8080", "dependencies": { - "@devgateway/amp-boilerplate": "github:devgateway/amp-boilerplate", - "@devgateway/amp-filter": "github:devgateway/amp-filter", - "@devgateway/amp-settings": "github:devgateway/amp-settings", + "@devgateway/amp-boilerplate": "git+https://github.com/devgateway/amp-boilerplate.git", + "@devgateway/amp-filter": "git+https://github.com/devgateway/amp-filter.git", + "@devgateway/amp-settings": "git+https://github.com/devgateway/amp-settings.git", "@fortawesome/fontawesome-svg-core": "^1.2.30", "@fortawesome/free-solid-svg-icons": "^5.14.0", "@fortawesome/react-fontawesome": "^0.1.11", diff --git a/amp/TEMPLATE/reampv2/packages/user-manager/package.json b/amp/TEMPLATE/reampv2/packages/user-manager/package.json index a2c718488ab..d0909be01a4 100644 --- a/amp/TEMPLATE/reampv2/packages/user-manager/package.json +++ b/amp/TEMPLATE/reampv2/packages/user-manager/package.json @@ -22,7 +22,7 @@ ] }, "dependencies": { - "@devgateway/amp-boilerplate": "github:devgateway/amp-boilerplate", + "@devgateway/amp-boilerplate": "git+https://github.com/devgateway/amp-boilerplate.git", "@reduxjs/toolkit": "^1.9.5", "@testing-library/jest-dom": "^6.1.2", "@testing-library/react": "^14.0.0", diff --git a/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/TemplateViewConfigImpl.java b/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/TemplateViewConfigImpl.java index 57a6fd6048e..a7f4b2539b3 100644 --- a/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/TemplateViewConfigImpl.java +++ b/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/TemplateViewConfigImpl.java @@ -22,24 +22,6 @@ package org.digijava.kernel.viewmanager.reposimpl; -/* -* DefaultViewConfigImpl.java -* @Author Mikheil Kapanadze mikheil@digijava.org -* Created: Apr 13, 2004 -* CVS-ID: $Id: TemplateViewConfigImpl.java,v 1.1 2008-07-16 09:19:38 ktha Exp $ -* -* This file is part of DiGi project (www.digijava.org). -* DiGi is a multi-site portal system written in Java/J2EE. -* -* Confidential and Proprietary, Subject to the Non-Disclosure -* Agreement, Version 2.0, between the Development Gateway -* Foundation, Inc and the Recipient -- Copyright 2001-2004 Development -* Gateway Foundation, Inc. -* -* Unauthorized Disclosure Prohibited. -* -*************************************************************************/ - import org.digijava.kernel.viewmanager.ViewConfigException; import javax.servlet.ServletContext; diff --git a/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/ViewConfigImpl.java b/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/ViewConfigImpl.java index a1e3416f4bd..39f6248c6da 100644 --- a/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/ViewConfigImpl.java +++ b/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/ViewConfigImpl.java @@ -22,24 +22,6 @@ package org.digijava.kernel.viewmanager.reposimpl; -/* -* DefaultViewConfigImpl.java -* @Author Mikheil Kapanadze mikheil@digijava.org -* Created: Apr 08, 2004 -* CVS-ID: $Id: ViewConfigImpl.java,v 1.1 2008-07-16 09:19:38 ktha Exp $ -* -* This file is part of DiGi project (www.digijava.org). -* DiGi is a multi-site portal system written in Java/J2EE. -* -* Confidential and Proprietary, Subject to the Non-Disclosure -* Agreement, Version 2.0, between the Development Gateway -* Foundation, Inc and the Recipient -- Copyright 2001-2004 Development -* Gateway Foundation, Inc. -* -* Unauthorized Disclosure Prohibited. -* -*************************************************************************/ - import org.apache.log4j.Logger; import org.digijava.kernel.request.Site; import org.digijava.kernel.siteconfig.*; diff --git a/amp/src/main/java/org/digijava/module/common/action/PaginationAction.java b/amp/src/main/java/org/digijava/module/common/action/PaginationAction.java index c060d093a2a..b16d8df4280 100644 --- a/amp/src/main/java/org/digijava/module/common/action/PaginationAction.java +++ b/amp/src/main/java/org/digijava/module/common/action/PaginationAction.java @@ -1,20 +1,3 @@ -/* - * PaginationAction.java - * @Author Lasha Dolidze lasha@digijava.org - * Created: Nov 17, 2003 - * CVS-ID: $Id$ - * - * This file is part of DiGi project (www.digijava.org). - * DiGi is a multi-site portal system written in Java/J2EE. - * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. - * - * Unauthorized Disclosure Prohibited. - * - *************************************************************************/ package org.digijava.module.common.action; import org.apache.log4j.Logger; diff --git a/amp/src/main/java/org/digijava/module/common/action/PaginationForm.java b/amp/src/main/java/org/digijava/module/common/action/PaginationForm.java index ee13a13d559..e24bfd56c48 100644 --- a/amp/src/main/java/org/digijava/module/common/action/PaginationForm.java +++ b/amp/src/main/java/org/digijava/module/common/action/PaginationForm.java @@ -1,20 +1,3 @@ -/* - * PaginationForm.java - * @Author Lasha Dolidze lasha@digijava.org - * Created: Nov 17, 2003 - * CVS-ID: $Id$ - * - * This file is part of DiGi project (www.digijava.org). - * DiGi is a multi-site portal system written in Java/J2EE. - * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. - * - * Unauthorized Disclosure Prohibited. - * - *************************************************************************/ package org.digijava.module.common.action; import org.apache.struts.action.ActionErrors; diff --git a/amp/src/main/java/org/digijava/module/common/dbentity/ItemStatus.java b/amp/src/main/java/org/digijava/module/common/dbentity/ItemStatus.java index 8367e529147..99120e42b2c 100644 --- a/amp/src/main/java/org/digijava/module/common/dbentity/ItemStatus.java +++ b/amp/src/main/java/org/digijava/module/common/dbentity/ItemStatus.java @@ -1,21 +1,3 @@ -/* -* ItemStatus.java -* @Author Lasha Dolidze lasha@digijava.org -* Created: -* CVS-ID: $Id$ -* -* This file is part of DiGi project (www.digijava.org). -* DiGi is a multi-site portal system written in Java/J2EE. -* -* Confidential and Proprietary, Subject to the Non-Disclosure -* Agreement, Version 1.0, between the Development Gateway -* Foundation, Inc and the Recipient -- Copyright 2001-2004 Development -* Gateway Foundation, Inc. -* -* Unauthorized Disclosure Prohibited. -* -*************************************************************************/ - package org.digijava.module.common.dbentity; /** diff --git a/amp/src/main/java/org/digijava/module/common/dbentity/ModuleTeaser.java b/amp/src/main/java/org/digijava/module/common/dbentity/ModuleTeaser.java index 5a207df0f67..d1e30dc1347 100644 --- a/amp/src/main/java/org/digijava/module/common/dbentity/ModuleTeaser.java +++ b/amp/src/main/java/org/digijava/module/common/dbentity/ModuleTeaser.java @@ -1,21 +1,3 @@ -/* -* ModuleTeaser.java -* @Author Lasha Dolidze lasha@digijava.org -* Created: -* CVS-ID: $Id$ -* -* This file is part of DiGi project (www.digijava.org). -* DiGi is a multi-site portal system written in Java/J2EE. -* -* Confidential and Proprietary, Subject to the Non-Disclosure -* Agreement, Version 1.0, between the Development Gateway -* Foundation, Inc and the Recipient -- Copyright 2001-2004 Development -* Gateway Foundation, Inc. -* -* Unauthorized Disclosure Prohibited. -* -*************************************************************************/ - package org.digijava.module.common.dbentity; /** diff --git a/amp/src/main/java/org/digijava/module/common/exception/BBCodeException.java b/amp/src/main/java/org/digijava/module/common/exception/BBCodeException.java index 4d5eac203c9..ce1ad4a31ab 100644 --- a/amp/src/main/java/org/digijava/module/common/exception/BBCodeException.java +++ b/amp/src/main/java/org/digijava/module/common/exception/BBCodeException.java @@ -1,21 +1,3 @@ -/* - * BBCodeException.java - * @Author Maka Kharalashvili maka@digijava.org - * Created: Oct 20, 2003 - * CVS-ID: $Id$ - * - * This file is part of DiGi project (www.digijava.org). - * DiGi is a multi-site portal system written in Java/J2EE. - * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. - * - * Unauthorized Disclosure Prohibited. - * - *************************************************************************/ - package org.digijava.module.common.exception; import org.digijava.kernel.exception.DgException; diff --git a/amp/src/main/java/org/digijava/module/common/util/BBCodeParser.java b/amp/src/main/java/org/digijava/module/common/util/BBCodeParser.java index 286afe0b83c..3f8a774857c 100644 --- a/amp/src/main/java/org/digijava/module/common/util/BBCodeParser.java +++ b/amp/src/main/java/org/digijava/module/common/util/BBCodeParser.java @@ -1,21 +1,3 @@ -/* - * BBCodeParser.java - * @Author Maka Kharalashvili maka@digijava.org - * Created: Oct 20, 2003 - * CVS-ID: $Id$ - * - * This file is part of DiGi project (www.digijava.org). - * DiGi is a multi-site portal system written in Java/J2EE. - * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. - * - * Unauthorized Disclosure Prohibited. - * - *************************************************************************/ - package org.digijava.module.common.util; import org.apache.log4j.Logger; diff --git a/amp/src/main/java/org/digijava/module/common/util/DateTimeUtil.java b/amp/src/main/java/org/digijava/module/common/util/DateTimeUtil.java index 51607887d5f..e8e0287fa73 100644 --- a/amp/src/main/java/org/digijava/module/common/util/DateTimeUtil.java +++ b/amp/src/main/java/org/digijava/module/common/util/DateTimeUtil.java @@ -1,20 +1,3 @@ -/* - * DateTimeUtil.java - * @Author Lasha Dolidze lasha@digijava.org - * Created: Oct 20, 2003 - * CVS-ID: $Id$ - * - * This file is part of DiGi project (www.digijava.org). - * DiGi is a multi-site portal system written in Java/J2EE. - * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. - * - * Unauthorized Disclosure Prohibited. - * - *************************************************************************/ package org.digijava.module.common.util; import org.digijava.kernel.ampapi.endpoints.common.EPConstants; diff --git a/amp/src/main/java/org/digijava/module/common/util/ModuleEmailManager.java b/amp/src/main/java/org/digijava/module/common/util/ModuleEmailManager.java index 966c5a6ed34..89c75e60518 100644 --- a/amp/src/main/java/org/digijava/module/common/util/ModuleEmailManager.java +++ b/amp/src/main/java/org/digijava/module/common/util/ModuleEmailManager.java @@ -1,21 +1,3 @@ -/* - * ModuleEmailManager.java - * @Author Maka Kharalashvili maka@digijava.org - * Created: Apr 21, 2004 - * CVS-ID: $Id$ - * - * This file is part of DiGi project (www.digijava.org). - * DiGi is a multi-site portal system written in Java/J2EE. - * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. - * - * Unauthorized Disclosure Prohibited. - * - *************************************************************************/ - package org.digijava.module.common.util; import org.apache.log4j.Logger; diff --git a/amp/src/main/java/org/digijava/module/common/util/ModuleUtil.java b/amp/src/main/java/org/digijava/module/common/util/ModuleUtil.java index 83a00f09e56..9e658281451 100644 --- a/amp/src/main/java/org/digijava/module/common/util/ModuleUtil.java +++ b/amp/src/main/java/org/digijava/module/common/util/ModuleUtil.java @@ -1,20 +1,3 @@ -/* - * ModuleUtil.java - * @Author Lasha Dolidze lasha@digijava.org - * Created: Oct 20, 2003 - * CVS-ID: $Id$ - * - * This file is part of DiGi project (www.digijava.org). - * DiGi is a multi-site portal system written in Java/J2EE. - * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. - * - * Unauthorized Disclosure Prohibited. - * - *************************************************************************/ package org.digijava.module.common.util; import java.util.StringTokenizer; diff --git a/amp/src/main/java/org/digijava/module/editor/taglib/EditTag.java b/amp/src/main/java/org/digijava/module/editor/taglib/EditTag.java index 31410958bd5..eb66bae8f12 100644 --- a/amp/src/main/java/org/digijava/module/editor/taglib/EditTag.java +++ b/amp/src/main/java/org/digijava/module/editor/taglib/EditTag.java @@ -1,21 +1,3 @@ -/* - * EditTag.java - * @Author Maka Kharalashvili maka@digijava.org - * Created: Dec 17, 2003 - * CVS-ID: $Id$ - * - * This file is part of DiGi project (www.digijava.org). - * DiGi is a multi-site portal system written in Java/J2EE. - * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. - * - * Unauthorized Disclosure Prohibited. - * - *************************************************************************/ - package org.digijava.module.editor.taglib; import org.apache.log4j.Logger; diff --git a/amp/src/main/java/org/digijava/module/um/form/AddUserForm.java b/amp/src/main/java/org/digijava/module/um/form/AddUserForm.java index 62caa8d9ea2..7c9075fd681 100644 --- a/amp/src/main/java/org/digijava/module/um/form/AddUserForm.java +++ b/amp/src/main/java/org/digijava/module/um/form/AddUserForm.java @@ -1,24 +1,5 @@ package org.digijava.module.um.form; -/* - * UserRegisterForm.java - * @Author Lasha Dolidze lasha@digijava.org - * Created: - * CVS-ID: $Id: AddUserForm.java,v 1.2 2008-11-26 01:25:52 msotero Exp $ - * - * This file is part of DiGi project (www.digijava.org). - * DiGi is a multi-site portal system written in Java/J2EE. - * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. - * - * Unauthorized Disclosure Prohibited. - * - *************************************************************************/ - - import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; import org.apache.struts.validator.ValidatorForm; diff --git a/amp/src/main/java/org/digijava/module/um/form/UserRegisterForm.java b/amp/src/main/java/org/digijava/module/um/form/UserRegisterForm.java index 7ab0717ac44..ea05d079d6e 100644 --- a/amp/src/main/java/org/digijava/module/um/form/UserRegisterForm.java +++ b/amp/src/main/java/org/digijava/module/um/form/UserRegisterForm.java @@ -1,21 +1,3 @@ -/* - * UserRegisterForm.java - * @Author Lasha Dolidze lasha@digijava.org - * Created: - * CVS-ID: $Id$ - * - * This file is part of DiGi project (www.digijava.org). - * DiGi is a multi-site portal system written in Java/J2EE. - * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. - * - * Unauthorized Disclosure Prohibited. - * - *************************************************************************/ - package org.digijava.module.um.form; import org.apache.struts.action.ActionErrors; diff --git a/amp/src/main/java/org/digijava/module/um/util/DbUtil.java b/amp/src/main/java/org/digijava/module/um/util/DbUtil.java index c0b355e72b6..7c8952a35f2 100644 --- a/amp/src/main/java/org/digijava/module/um/util/DbUtil.java +++ b/amp/src/main/java/org/digijava/module/um/util/DbUtil.java @@ -1,20 +1,3 @@ -/* - * DbUtil.java - * @Author Lasha Dolidze lasha@digijava.org - * Created: - * CVS-ID: $Id$ - * - * This file is part of DiGi project (www.digijava.org). - * DiGi is a multi-site portal system written in Java/J2EE. - * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. - * - * Unauthorized Disclosure Prohibited. - * - *************************************************************************/ package org.digijava.module.um.util; import org.apache.log4j.Logger;