From ec174f20437f5e94d3cd44360b7474af9aa6ae27 Mon Sep 17 00:00:00 2001 From: jensp Date: Thu, 2 Jun 2016 07:27:35 +0000 Subject: [PATCH] Reverting some accidental changes from revision r4129 git-svn-id: https://svn.libreccm.org/ccm/trunk@4132 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/auth/http/HTTPAuthServlet.java | 4 +-- .../arsdigita/metadata/DynamicObjectType.java | 12 ++++---- .../com/arsdigita/ui/login/UserEditForm.java | 2 +- .../src/com/arsdigita/util/ServletUtils.java | 4 +-- .../com/arsdigita/bebop/SessionStateTest.java | 2 +- .../includes/types/SciPublications/common.xsl | 4 +-- .../types/SciPublications/exportLinks.xsl | 2 +- .../london/exporter/CategoryExportTool.java | 2 +- .../includes/types/SciPublications/common.xsl | 4 +-- .../types/SciPublications/exportLinks.xsl | 2 +- .../includes/types/SciPublications/common.xsl | 4 +-- .../types/SciPublications/exportLinks.xsl | 2 +- .../cms/scipublications/Exporter.java | 4 +-- .../cms/scipublications/SciPublications.java | 4 +-- .../SciPublicationsServlet.java | 28 +++++++++---------- .../exporter/SciPublicationsExporter.java | 6 ++-- .../exporter/SciPublicationsExporters.java | 2 +- .../importer/SciPublicationsImporters.java | 2 +- .../ui/PublicationExportLinks.java | 2 +- .../simplesurvey/ui/admin/ReportPanel.java | 2 +- 20 files changed, 47 insertions(+), 47 deletions(-) diff --git a/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthServlet.java b/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthServlet.java index 1f5518a3f..0262cc6e9 100755 --- a/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthServlet.java +++ b/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthServlet.java @@ -75,12 +75,12 @@ import sun.misc.BASE64Encoder; *

* *

- * Now on the IIS server exportUsers the public key into a separate + * Now on the IIS server export the public key into a separate * file like this: *

* * 
- * keytool -exportUsers -alias ccmkey -file c:\temp\public_cert
+ * keytool -export -alias ccmkey -file c:\temp\public_cert
  *
* *

diff --git a/ccm-core/src/com/arsdigita/metadata/DynamicObjectType.java b/ccm-core/src/com/arsdigita/metadata/DynamicObjectType.java index bdde5aa00..4a078dcee 100755 --- a/ccm-core/src/com/arsdigita/metadata/DynamicObjectType.java +++ b/ccm-core/src/com/arsdigita/metadata/DynamicObjectType.java @@ -907,12 +907,12 @@ public class DynamicObjectType extends DynamicElement { * the usage is * * java com.arsdigita.persistence.metadataDyanmicObjectType - * <[import | exportUsers]> <DynamicObjectType> <FileLocation> + * <[import | export]> <DynamicObjectType> <FileLocation> * <StartupScript> <WebAppRoot> * *

*

* - * So, to exportUsers the dynamic type MyDynamicType from the database to + * So, to export the dynamic type MyDynamicType from the database to * the file system, you can type * - * java com.arsdigita.persistence.metadata.DynamicObjectType exportUsers + * java com.arsdigita.persistence.metadata.DynamicObjectType export * com.arsdigita.cms.MyDynamicType /tmp/MyDynamicType.pdl * /home/tomcat/webapps/enterprise/WEB-INF/resources/enterprise.init * /home/tomcat/webapps/enterprise @@ -955,7 +955,7 @@ public class DynamicObjectType extends DynamicElement { */ static public void main(String args[]) { String IMPORT = "import"; - String EXPORT = "exportUsers"; + String EXPORT = "export"; String usageString = "Usage: java DyanmicObjectType " + " <[" + IMPORT + " | " + EXPORT + "]> " + " "; @@ -969,7 +969,7 @@ public class DynamicObjectType extends DynamicElement { if (!(type.equalsIgnoreCase(IMPORT) || type.equalsIgnoreCase(EXPORT))) { System.err.println ("The first argument must specify whether you wish to " + - "'import' or 'exportUsers'" + Utilities.LINE_BREAK + usageString); + "'import' or 'export'" + Utilities.LINE_BREAK + usageString); } String objectType = args[1]; diff --git a/ccm-core/src/com/arsdigita/ui/login/UserEditForm.java b/ccm-core/src/com/arsdigita/ui/login/UserEditForm.java index 3f6fdce7e..acb1f7f80 100755 --- a/ccm-core/src/com/arsdigita/ui/login/UserEditForm.java +++ b/ccm-core/src/com/arsdigita/ui/login/UserEditForm.java @@ -77,7 +77,7 @@ public class UserEditForm extends UserForm addProcessListener(this); - // exportUsers return URL + // export return URL m_returnURL = new Hidden(new URLParameter (LoginHelper.RETURN_URL_PARAM_NAME)); m_returnURL.setPassIn(true); diff --git a/ccm-core/src/com/arsdigita/util/ServletUtils.java b/ccm-core/src/com/arsdigita/util/ServletUtils.java index 181b00384..4cdadcadf 100755 --- a/ccm-core/src/com/arsdigita/util/ServletUtils.java +++ b/ccm-core/src/com/arsdigita/util/ServletUtils.java @@ -44,8 +44,8 @@ public class ServletUtils { * "one"=1, "two"=2, and "three"=3, then exportURLVars(req, "one two") * will return "one=1&two=2". * @param req the HttpServletRequest - * @param vars a space-separated list of variables to exportUsers. If vars - * is null, exportUsers all available. + * @param vars a space-separated list of variables to export. If vars + * is null, export all available. */ public static final String exportURLVars(HttpServletRequest req, String vars) { diff --git a/ccm-core/test/src/com/arsdigita/bebop/SessionStateTest.java b/ccm-core/test/src/com/arsdigita/bebop/SessionStateTest.java index 415c17aa7..ac86132c3 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/SessionStateTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/SessionStateTest.java @@ -91,7 +91,7 @@ public class SessionStateTest extends TestCase { *

* then follows a control link which changes state on component 1. * verifies that new page has right state, and that control links - * don't exportUsers state directly. + * don't export state directly. *

* follows the second control link. verifies that the state on * component 1 is preserved, after already checking that the state diff --git a/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciPublications/common.xsl b/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciPublications/common.xsl index c3ccf1c6f..a0639f1ec 100644 --- a/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciPublications/common.xsl +++ b/ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciPublications/common.xsl @@ -846,7 +846,7 @@