LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reverting some accidental changes from revision r4129 

git-svn-id: https://svn.libreccm.org/ccm/trunk@4132 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2016-06-02 07:27:35 +00:00
parent 46c4cc82d0
commit ec174f2043
20 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthServlet.java
View File

@ -75,12 +75,12 @@ import sun.misc.BASE64Encoder;
* </p> * </p>
* *
* <p> * <p>
* 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: * file like this:
* </p> * </p>
* *
* <pre> * <pre>
* keytool -exportUsers -alias ccmkey -file c:\temp\public_cert * keytool -export -alias ccmkey -file c:\temp\public_cert
* </pre> * </pre>
* *
* <p> * <p>

12
ccm-core/src/com/arsdigita/metadata/DynamicObjectType.java
View File

@ -907,12 +907,12 @@ public class DynamicObjectType extends DynamicElement {
* the usage is * the usage is
* <code> * <code>
* java com.arsdigita.persistence.metadataDyanmicObjectType * java com.arsdigita.persistence.metadataDyanmicObjectType
* &lt;[import | exportUsers]&gt; &lt;DynamicObjectType&gt; &lt;FileLocation&gt; * &lt;[import | export]&gt; &lt;DynamicObjectType&gt; &lt;FileLocation&gt;
* &lt;StartupScript&gt; &lt;WebAppRoot&gt; * &lt;StartupScript&gt; &lt;WebAppRoot&gt;
* </code> * </code>
* <p> * <p>
* <ul> * <ul>
* <li>The first item, "import" or "exportUsers" tells the method whether * <li>The first item, "import" or "export" tells the method whether
* you are loading a file into the database or you want to print * you are loading a file into the database or you want to print
* a file in the database into the file system.</li> * a file in the database into the file system.</li>
* *
@ -940,10 +940,10 @@ public class DynamicObjectType extends DynamicElement {
* </li> * </li>
* </ul> * </ul>
* *
* 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 * the file system, you can type
* <code> * <code>
* java com.arsdigita.persistence.metadata.DynamicObjectType exportUsers * java com.arsdigita.persistence.metadata.DynamicObjectType export
* com.arsdigita.cms.MyDynamicType /tmp/MyDynamicType.pdl * com.arsdigita.cms.MyDynamicType /tmp/MyDynamicType.pdl
* /home/tomcat/webapps/enterprise/WEB-INF/resources/enterprise.init * /home/tomcat/webapps/enterprise/WEB-INF/resources/enterprise.init
* /home/tomcat/webapps/enterprise * /home/tomcat/webapps/enterprise
@ -955,7 +955,7 @@ public class DynamicObjectType extends DynamicElement {
*/ */
static public void main(String args[]) { static public void main(String args[]) {
String IMPORT = "import"; String IMPORT = "import";
String EXPORT = "exportUsers"; String EXPORT = "export";
String usageString = "Usage: java DyanmicObjectType " + String usageString = "Usage: java DyanmicObjectType " +
" <[" + IMPORT + " | " + EXPORT + "]> <DynamicObjectType> " + " <[" + IMPORT + " | " + EXPORT + "]> <DynamicObjectType> " +
"<FileLocation> <StartupScript> <WebAppRoot>"; "<FileLocation> <StartupScript> <WebAppRoot>";
@ -969,7 +969,7 @@ public class DynamicObjectType extends DynamicElement {
if (!(type.equalsIgnoreCase(IMPORT) || type.equalsIgnoreCase(EXPORT))) { if (!(type.equalsIgnoreCase(IMPORT) || type.equalsIgnoreCase(EXPORT))) {
System.err.println System.err.println
("The first argument must specify whether you wish to " + ("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]; String objectType = args[1];

2
ccm-core/src/com/arsdigita/ui/login/UserEditForm.java
View File

@ -77,7 +77,7 @@ public class UserEditForm extends UserForm
addProcessListener(this); addProcessListener(this);
// exportUsers return URL // export return URL
m_returnURL = new Hidden(new URLParameter m_returnURL = new Hidden(new URLParameter
(LoginHelper.RETURN_URL_PARAM_NAME)); (LoginHelper.RETURN_URL_PARAM_NAME));
m_returnURL.setPassIn(true); m_returnURL.setPassIn(true);

4
ccm-core/src/com/arsdigita/util/ServletUtils.java
View File

@ -44,8 +44,8 @@ public class ServletUtils {
* "one"=1, "two"=2, and "three"=3, then exportURLVars(req, "one two") * "one"=1, "two"=2, and "three"=3, then exportURLVars(req, "one two")
* will return "one=1&two=2". * will return "one=1&two=2".
* @param req the HttpServletRequest * @param req the HttpServletRequest
* @param vars a space-separated list of variables to exportUsers. If vars * @param vars a space-separated list of variables to export. If vars
* is null, exportUsers all available. * is null, export all available.
*/ */
public static final String exportURLVars(HttpServletRequest req, public static final String exportURLVars(HttpServletRequest req,
String vars) { String vars) {

2
ccm-core/test/src/com/arsdigita/bebop/SessionStateTest.java
View File

@ -91,7 +91,7 @@ public class SessionStateTest extends TestCase {
* <p> * <p>
* then follows a control link which changes state on component 1. * then follows a control link which changes state on component 1.
* verifies that new page has right state, and that control links * verifies that new page has right state, and that control links
* don't exportUsers state directly. * don't export state directly.
* <p> * <p>
* follows the second control link. verifies that the state on * follows the second control link. verifies that the state on
* component 1 is preserved, after already checking that the state * component 1 is preserved, after already checking that the state

4
ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciPublications/common.xsl
View File

@ -846,7 +846,7 @@
<ul class="publicationDownloads"> <ul class="publicationDownloads">
<li> <li>
<a> <a>
<xsl:attribute name="href">/ccm/scipublications/exportUsers/?format=bibtex&amp;publication=<xsl:value-of select="./masterVersion/id"/></xsl:attribute> <xsl:attribute name="href">/ccm/scipublications/export/?format=bibtex&amp;publication=<xsl:value-of select="./masterVersion/id"/></xsl:attribute>
<xsl:attribute name="title"> <xsl:attribute name="title">
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciPublications'"/> <xsl:with-param name="module" select="'SciPublications'"/>
@ -861,7 +861,7 @@
</li> </li>
<li> <li>
<a> <a>
<xsl:attribute name="href">/ccm/scipublications/exportUsers/?format=ris&amp;publication=<xsl:value-of select="./masterVersion/id"/></xsl:attribute> <xsl:attribute name="href">/ccm/scipublications/export/?format=ris&amp;publication=<xsl:value-of select="./masterVersion/id"/></xsl:attribute>
<xsl:attribute name="title"> <xsl:attribute name="title">
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciPublications'"/> <xsl:with-param name="module" select="'SciPublications'"/>

2
ccm-ldn-aplaws/web/themes/mandalay/user/includes/types/SciPublications/exportLinks.xsl
View File

@ -20,7 +20,7 @@
along with Mandalay. If not, see <http://www.gnu.org/licenses/>. along with Mandalay. If not, see <http://www.gnu.org/licenses/>.
--> -->
<!-- Generation of the exportUsers links for publications --> <!-- Generation of the export links for publications -->
<xsl:stylesheet <xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

2
ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExportTool.java
View File

@ -40,7 +40,7 @@ public class CategoryExportTool extends Program {
public CategoryExportTool() { public CategoryExportTool() {
super("Category Export Tool", super("Category Export Tool",
"1.0.1", "1.0.1",
"[app URL] [context] [exportUsers dir] [key] [url] [title] [version]"); "[app URL] [context] [export dir] [key] [url] [title] [version]");
getOptions().addOption getOptions().addOption
(OptionBuilder (OptionBuilder
.hasArg(false) .hasArg(false)

4
ccm-sci-bundle/web/themes/mandalay-yaml/user/includes/types/SciPublications/common.xsl
View File

@ -807,7 +807,7 @@
<ul class="publicationDownloads"> <ul class="publicationDownloads">
<li> <li>
<a> <a>
<xsl:attribute name="href">/ccm/scipublications/exportUsers/?format=bibtex&amp;publication=<xsl:value-of select="./masterVersion/id"/></xsl:attribute> <xsl:attribute name="href">/ccm/scipublications/export/?format=bibtex&amp;publication=<xsl:value-of select="./masterVersion/id"/></xsl:attribute>
<xsl:attribute name="title"> <xsl:attribute name="title">
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciPublications'"/> <xsl:with-param name="module" select="'SciPublications'"/>
@ -822,7 +822,7 @@
</li> </li>
<li> <li>
<a> <a>
<xsl:attribute name="href">/ccm/scipublications/exportUsers/?format=ris&amp;publication=<xsl:value-of select="./masterVersion/id"/></xsl:attribute> <xsl:attribute name="href">/ccm/scipublications/export/?format=ris&amp;publication=<xsl:value-of select="./masterVersion/id"/></xsl:attribute>
<xsl:attribute name="title"> <xsl:attribute name="title">
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciPublications'"/> <xsl:with-param name="module" select="'SciPublications'"/>

2
ccm-sci-bundle/web/themes/mandalay-yaml/user/includes/types/SciPublications/exportLinks.xsl
View File

@ -20,7 +20,7 @@
along with Mandalay. If not, see <http://www.gnu.org/licenses/>. along with Mandalay. If not, see <http://www.gnu.org/licenses/>.
--> -->
<!-- Generation of the exportUsers links for publications --> <!-- Generation of the export links for publications -->
<xsl:stylesheet <xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

4
ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/common.xsl
View File

@ -846,7 +846,7 @@
<ul class="publicationDownloads"> <ul class="publicationDownloads">
<li> <li>
<a> <a>
<xsl:attribute name="href">/ccm/scipublications/exportUsers/?format=bibtex&amp;publication=<xsl:value-of select="./masterVersion/id"/></xsl:attribute> <xsl:attribute name="href">/ccm/scipublications/export/?format=bibtex&amp;publication=<xsl:value-of select="./masterVersion/id"/></xsl:attribute>
<xsl:attribute name="title"> <xsl:attribute name="title">
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciPublications'"/> <xsl:with-param name="module" select="'SciPublications'"/>
@ -861,7 +861,7 @@
</li> </li>
<li> <li>
<a> <a>
<xsl:attribute name="href">/ccm/scipublications/exportUsers/?format=ris&amp;publication=<xsl:value-of select="./masterVersion/id"/></xsl:attribute> <xsl:attribute name="href">/ccm/scipublications/export/?format=ris&amp;publication=<xsl:value-of select="./masterVersion/id"/></xsl:attribute>
<xsl:attribute name="title"> <xsl:attribute name="title">
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciPublications'"/> <xsl:with-param name="module" select="'SciPublications'"/>

2
ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/exportLinks.xsl
View File

@ -20,7 +20,7 @@
along with Mandalay. If not, see <http://www.gnu.org/licenses/>. along with Mandalay. If not, see <http://www.gnu.org/licenses/>.
--> -->
<!-- Generation of the exportUsers links for publications --> <!-- Generation of the export links for publications -->
<xsl:stylesheet <xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

4
ccm-sci-publications/src/com/arsdigita/cms/scipublications/Exporter.java
View File

@ -125,10 +125,10 @@ class Exporter {
//Get the exporter for the specified format. //Get the exporter for the specified format.
exporter = SciPublicationsExporters.getInstance().getExporterForFormat(format); exporter = SciPublicationsExporters.getInstance().getExporterForFormat(format);
if (exporter == null) { if (exporter == null) {
LOGGER.warn(String.format("The requested exportUsers format '%s' is not supported yet.", LOGGER.warn(String.format("The requested export format '%s' is not supported yet.",
format)); format));
response.sendError(HttpServletResponse.SC_BAD_REQUEST, response.sendError(HttpServletResponse.SC_BAD_REQUEST,
String.format("The requested exportUsers format '%s' is not supported yet.", String.format("The requested export format '%s' is not supported yet.",
format)); format));
return; return;
} }

4
ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublications.java
View File

@ -29,8 +29,8 @@ import java.math.BigDecimal;
* the SciPublications module. The application will be mounted at * the SciPublications module. The application will be mounted at
* <code>/ccm/scipubliations/</code>. The functions are accessed using * <code>/ccm/scipubliations/</code>. The functions are accessed using
* an additional URL fragment. For example, if you want to access the * an additional URL fragment. For example, if you want to access the
* exportUsers function, you will use the URL * export function, you will use the URL
* <code>/ccm/scipublications/exportUsers/</code>. * <code>/ccm/scipublications/export/</code>.
* *
* @author Jens Pelzetter * @author Jens Pelzetter
*/ */

28
ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsServlet.java
View File

@ -57,12 +57,12 @@ import org.apache.log4j.Logger;
* <p> The * <p> The
* <code>SciPublicationsServlet</code> processes the * <code>SciPublicationsServlet</code> processes the
* {@link HttpServletRequest} and calls the requested actions. The available * {@link HttpServletRequest} and calls the requested actions. The available
* actions are: </p> <dl> <dt><code>exportUsers</code></dt> <dd> <p> The * actions are: </p> <dl> <dt><code>export</code></dt> <dd> <p> The
* <code>exportUsers</code> action exports content items of the type * <code>export</code> action exports content items of the type
* {@link Publication} in several formats, like <em>BibTeX</em> or <em>RIS</em>. * {@link Publication} in several formats, like <em>BibTeX</em> or <em>RIS</em>.
* The exportUsers action has the following query parameters: </p> <dl> <dt><code>format</code></dt> * The export action has the following query parameters: </p> <dl> <dt><code>format</code></dt>
* <dd>Specifies the format which is used to exportUsers the publications.</dd> <dt><code>publication</code></dt> * <dd>Specifies the format which is used to export the publications.</dd> <dt><code>publication</code></dt>
* <dd>Specifies the publication(s) to exportUsers using the ID(s) of the * <dd>Specifies the publication(s) to export using the ID(s) of the
* publications. This parameter can occur more than one time. In this case, all * publications. This parameter can occur more than one time. In this case, all
* publications specified by the parameters will be exported as a single file in * publications specified by the parameters will be exported as a single file in
* specified format</dd> <dt><code>category</code></dt> <dd>Specifies a category * specified format</dd> <dt><code>category</code></dt> <dd>Specifies a category
@ -140,7 +140,7 @@ public class SciPublicationsServlet extends BaseApplicationServlet {
final Document document = page.buildDocument(request, response); final Document document = page.buildDocument(request, response);
final PresentationManager presenter = Templating.getPresentationManager(); final PresentationManager presenter = Templating.getPresentationManager();
presenter.servePage(document, request, response); presenter.servePage(document, request, response);
} else if ("exportUsers".equals(path)) { } else if ("export".equals(path)) {
LOGGER.debug("Export a publication"); LOGGER.debug("Export a publication");
Map<String, String[]> parameters; Map<String, String[]> parameters;
@ -220,10 +220,10 @@ public class SciPublicationsServlet extends BaseApplicationServlet {
//Get the exporter for the specified format. //Get the exporter for the specified format.
exporter = SciPublicationsExporters.getInstance().getExporterForFormat(format); exporter = SciPublicationsExporters.getInstance().getExporterForFormat(format);
if (exporter == null) { if (exporter == null) {
LOGGER.warn(String.format("The requested exportUsers format '%s' is not supported yet.", LOGGER.warn(String.format("The requested export format '%s' is not supported yet.",
format)); format));
response.sendError(HttpServletResponse.SC_BAD_REQUEST, response.sendError(HttpServletResponse.SC_BAD_REQUEST,
String.format("The requested exportUsers format '%s' is not supported yet.", String.format("The requested export format '%s' is not supported yet.",
format)); format));
return; return;
} }
@ -313,7 +313,7 @@ public class SciPublicationsServlet extends BaseApplicationServlet {
return; return;
} }
//Retrieve the ids of the publication(s) to exportUsers from the //Retrieve the ids of the publication(s) to export from the
//request. //request.
BigDecimal publicationId; BigDecimal publicationId;
publicationIds = new ArrayList<BigDecimal>(); publicationIds = new ArrayList<BigDecimal>();
@ -466,9 +466,9 @@ public class SciPublicationsServlet extends BaseApplicationServlet {
// + "term id. Neither was found in the query parameters." // + "term id. Neither was found in the query parameters."
// + "Responding with BAD_REQUEST status."); // + "Responding with BAD_REQUEST status.");
// response.sendError(HttpServletResponse.SC_BAD_REQUEST, // response.sendError(HttpServletResponse.SC_BAD_REQUEST,
// "The exportUsers action needs either a publication id or " // "The export action needs either a publication id or "
// + "a term id. Neither was found in the query parameters."); // + "a term id. Neither was found in the query parameters.");
//Otherwise, exportUsers all publications //Otherwise, export all publications
final DataCollection publications = SessionManager.getSession().retrieve( final DataCollection publications = SessionManager.getSession().retrieve(
Publication.BASE_DATA_OBJECT_TYPE); Publication.BASE_DATA_OBJECT_TYPE);
@ -526,7 +526,7 @@ public class SciPublicationsServlet extends BaseApplicationServlet {
* Helper method for exporting publications specified by a list of IDs. * Helper method for exporting publications specified by a list of IDs.
* *
* @param format The format to use. * @param format The format to use.
* @param publicationIds The IDs of the publications to exportUsers * @param publicationIds The IDs of the publications to export
* @param response The {@link HttpServletResponse} to use * @param response The {@link HttpServletResponse} to use
* @throws IOException Thrown by some methods called by this method. * @throws IOException Thrown by some methods called by this method.
*/ */
@ -543,11 +543,11 @@ public class SciPublicationsServlet extends BaseApplicationServlet {
if (exporter == null) { if (exporter == null) {
LOGGER.warn(String.format( LOGGER.warn(String.format(
"The requested exportUsers format '%s' is not supported yet.", "The requested export format '%s' is not supported yet.",
format)); format));
response.sendError(HttpServletResponse.SC_BAD_REQUEST, response.sendError(HttpServletResponse.SC_BAD_REQUEST,
String.format( String.format(
"The requested exportUsers format '%s' is not supported yet.", "The requested export format '%s' is not supported yet.",
format)); format));

6
ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/SciPublicationsExporter.java
View File

@ -31,15 +31,15 @@ public interface SciPublicationsExporter {
/** /**
* *
* @return A description of the exportUsers format provided by this exporter. * @return A description of the export format provided by this exporter.
*/ */
PublicationFormat getSupportedFormat(); PublicationFormat getSupportedFormat();
/** /**
* Exports an publication to the format provided by this exporter. * Exports an publication to the format provided by this exporter.
* *
* @param publication The publication to exportUsers. * @param publication The publication to export.
* @return The data of the publication in the provided exportUsers format. * @return The data of the publication in the provided export format.
*/ */
String exportPublication(Publication publication); String exportPublication(Publication publication);

2
ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/SciPublicationsExporters.java
View File

@ -94,7 +94,7 @@ public final class SciPublicationsExporters {
/** /**
* *
* @return A list of all supported exportUsers formats. * @return A list of all supported export formats.
*/ */
public List<PublicationFormat> getSupportedFormats() { public List<PublicationFormat> getSupportedFormats() {
List<PublicationFormat> supportedFormats; List<PublicationFormat> supportedFormats;

2
ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/SciPublicationsImporters.java
View File

@ -59,7 +59,7 @@ public class SciPublicationsImporters {
/** /**
* *
* @return A list of all supported exportUsers formats. * @return A list of all supported export formats.
*/ */
public List<PublicationFormat> getSupportedFormats() { public List<PublicationFormat> getSupportedFormats() {
List<PublicationFormat> supportedFormats; List<PublicationFormat> supportedFormats;

2
ccm-sci-publicationsexportlinks/src/com/arsdigita/cms/scipublications/ui/PublicationExportLinks.java
View File

@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
/** /**
* This component creates exportUsers links for all publications in a category. The exportUsers works with the descendCategories * This component creates export links for all publications in a category. The export works with the descendCategories
* parameter set to true and false. Filters from a {@link CustomizableObjectList} are also supported. To add the * parameter set to true and false. Filters from a {@link CustomizableObjectList} are also supported. To add the
* component add the following to your JSP template: * component add the following to your JSP template:
* *

2
ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/ReportPanel.java
View File

@ -118,7 +118,7 @@ public class ReportPanel extends SimpleContainer {
// Export to CSV // Export to CSV
Label exportLabel = new Label(GlobalizationUtil.globalize("simplesurvey.ui.admin.export_response_data")); Label exportLabel = new Label(GlobalizationUtil.globalize("simplesurvey.ui.admin.export_response_data"));
Link exportLink = new Link("Export to CSV file", Link exportLink = new Link("Export to CSV file",
"exportUsers.jsp"); "export.jsp");
try { try {
exportLink.addPrintListener(new PrintListener() { exportLink.addPrintListener(new PrintListener() {
public void prepare(PrintEvent event) { public void prepare(PrintEvent event) {