Skip to content

Commit

Permalink
chore: Update Cascade Server references to Cascade CMS (#29)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rgriffith
rgriffith authored May 19, 2020
1 parent be36f65 commit cd78985
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/com/hannonhill/umt/service/Migrator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class Migrator
{

/**
* Re-edits each page to align the links to make them tracked by Cascade Server
* Re-edits each page to align the links to make them tracked by Cascade CMS
*/
public static void alignLinks(ProjectInformation projectInformation)
{
Expand Down
4 changes: 2 additions & 2 deletions src/com/hannonhill/umt/service/RestApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public static List<String> getSiteNames(String cascadeUrl, String username, Stri
}

/**
* Creates a page in Cascade Server based on the information provided in the projectInformation and the
* Creates a page in Cascade CMS based on the information provided in the projectInformation and the
* actual file from which the Page needs to be created.
*/
public static CascadeAssetInformation createPage(java.nio.file.Path pageFile, ProjectInformation projectInformation) throws Exception
Expand Down Expand Up @@ -174,7 +174,7 @@ else if (overwriteBehavior.equals(ProjectInformation.OVERWRITE_BEHAVIOR_OVERWRIT
}

/**
* Creates a file asset in Cascade Server with contents from the <code>filesystemFile</code> if one does
* Creates a file asset in Cascade CMS with contents from the <code>filesystemFile</code> if one does
* not exist. The path of the file is figured out using webViewUrl in linkFile.xml in current or ancestor
* folders. If file with that path already exists, it is left as it is.
*/
Expand Down
3 changes: 1 addition & 2 deletions src/com/hannonhill/umt/struts/AnalyzeInformationAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/
package com.hannonhill.umt.struts;

import java.io.File;
import java.nio.file.FileSystems;
import java.util.HashSet;

Expand All @@ -14,7 +13,7 @@

/**
* This action is responsible for analyzing the project information - the contents of the selected xml folder
* and Cascade Server's Site's contents.
* and Cascade CMS' Site's contents.
*
* @author Artur Tomusiak
* @since 1.0
Expand Down
6 changes: 3 additions & 3 deletions src/com/hannonhill/umt/struts/ProjectPropertiesAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,17 +249,17 @@ private void verifyConnectivity()
}
catch (ServiceException e)
{
addActionError("Could not locate Cascade Server with given URL.");
addActionError("Could not locate Cascade CMS with given URL.");
return;
}
catch (RemoteException e)
{
addActionError("A problem occured when connecting to Cascade Server: " + e.getMessage());
addActionError("A problem occurred when connecting to Cascade CMS: " + e.getMessage());
return;
}
catch (Exception e)
{
addActionError("An error occured when reading a site with given Site Name: " + e.getMessage());
addActionError("An error occurred when reading a site with given Site Name: " + e.getMessage());
return;
}

Expand Down
2 changes: 1 addition & 1 deletion src/com/hannonhill/umt/util/PathUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public static String convertToFullCascadeInstanceURL(String url)
}

/**
* Generates a link to the page in Cascade Server
* Generates a link to the page in Cascade CMS
*
* @param cascadePage
* @param cascadeUrl
Expand Down
2 changes: 1 addition & 1 deletion tomcat/webapps/ROOT/jsps/AssignContentType.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<body>
<div class="mt-header">
<div class="container">
<h1 class="brand">Cascade Server <span>Universal Migration Tool</span></h1>
<h1 class="brand">Cascade CMS <span>Universal Migration Tool</span></h1>
</div>
</div>
<div id="page" class="container">
Expand Down
2 changes: 1 addition & 1 deletion tomcat/webapps/ROOT/jsps/AssignFields.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<body>
<div class="mt-header">
<div class="container">
<h1 class="brand">Cascade Server <span>Universal Migration Tool</span></h1>
<h1 class="brand">Cascade CMS <span>Universal Migration Tool</span></h1>
</div>
</div>
<div id="page" class="container">
Expand Down
2 changes: 1 addition & 1 deletion tomcat/webapps/ROOT/jsps/AssignRootLevelFolders.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<body>
<div class="mt-header">
<div class="container">
<h1 class="brand">Cascade Server <span>Universal Migration Tool</span></h1>
<h1 class="brand">Cascade CMS <span>Universal Migration Tool</span></h1>
</div>
</div>
<div id="page" class="container">
Expand Down
2 changes: 1 addition & 1 deletion tomcat/webapps/ROOT/jsps/Migration.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<body>
<div class="mt-header">
<div class="container">
<h1 class="brand">Cascade Server <span>Universal Migration Tool</span></h1>
<h1 class="brand">Cascade CMS <span>Universal Migration Tool</span></h1>
</div>
</div>
<div id="page" class="container">
Expand Down
6 changes: 3 additions & 3 deletions tomcat/webapps/ROOT/jsps/MigrationSummary.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<body>
<div class="mt-header">
<div class="container">
<h1 class="brand">Cascade Server <span>Universal Migration Tool</span></h1>
<h1 class="brand">Cascade CMS <span>Universal Migration Tool</span></h1>
</div>
</div>
<div id="page" class="container">
Expand All @@ -29,9 +29,9 @@
</div>

<form action="/MigrationSummary" method="POST">
<h3>Cascade Server Information</h3>
<h3>Cascade CMS Information</h3>
<div class="row">
<div class="span3">Cascade Server URL</div>
<div class="span3">Cascade CMS URL</div>
<div class="span7"><strong><s:property value="projectInformation.url"/></strong></div>
</div>
<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion tomcat/webapps/ROOT/jsps/ProjectProperties.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<div class="control-group">
<label class="control-label" for="url">Cascade CMS URL</label>
<div class="controls">
<input class="span4" type="text" id="url" placeholder="http://" name="url" value="<s:property value="url"/>" />
<input class="span4" type="text" id="url" placeholder="https://" name="url" value="<s:property value="url"/>" />
</div>
</div>
<div class="control-group">
Expand Down
2 changes: 1 addition & 1 deletion tomcat/webapps/ROOT/jsps/UploadZip.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<body>
<div class="mt-header">
<div class="container">
<h1 class="brand">Cascade Server <span>Universal Migration Tool</span></h1>
<h1 class="brand">Cascade CMS <span>Universal Migration Tool</span></h1>
</div>
</div>
<div id="page" class="container">
Expand Down

0 comments on commit cd78985

Please sign in to comment.