Skip to content

Commit

Permalink
fix spelling
Browse files Browse the repository at this point in the history
  • Loading branch information
zspitzer committed Apr 29, 2021
1 parent 2156ca4 commit 2e73ed9
Show file tree
Hide file tree
Showing 29 changed files with 74 additions and 74 deletions.
4 changes: 2 additions & 2 deletions core/src/main/cfml/context/admin/server.request.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -572,9 +572,9 @@ Error Output --->
</cfif>
</td>
</tr>
<cfset stText.application.appPathEnvVar="This can also be defined int the enviroment variables as follows">
<cfset stText.application.appPathEnvVar="This can also be defined using an environment variable as follows">
<cfset stText.application.appPathTimeout="Timeout for the Application Path Cache">
<cfset stText.application.appPathTimeoutDesc="If set to greater than 0 Lucee will cache the Path to the Application.[cfc|cfm] file to use for that time. So Lucee does not serach the Application.cfc with every request. If set to 0 the cache is disabled. ">
<cfset stText.application.appPathTimeoutDesc="If set to greater than 0 Lucee will cache the Path to the Application.[cfc|cfm] file to use for that time. So Lucee does not search the Application.cfc with every request. If set to 0 the cache is disabled. ">


<tr>
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/resource/config/server.xml
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ A flexible layout configurable with pattern string.
- pattern: This is the string which controls formatting and consists of a mix of literal content and conversion specifiers. for more details see: http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PatternLayout.html
<layout-class>:
A full class path to a Layout class available in the enviroment with an empty constructor.
A full class path to a Layout class available in the environment with an empty constructor.
for every argument defined lucee tries to call a matching setter method
Expand All @@ -421,7 +421,7 @@ Logs error to a resource (locale file, ftp, zip, ...)
- maxfilesize (default:1024*1024*10): the maxial size of a log file created
<appender-class>:
A full class path to an Appender class available in the enviroment with an empty constructor.
A full class path to an Appender class available in the environment with an empty constructor.
for every argument defined lucee tries to call a matching setter method
-->
Expand Down
2 changes: 1 addition & 1 deletion test/a_debug_build/_MongoDB.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
}

private struct function getCredentials() {
// getting the credetials from the enviroment variables
// getting the credentials from the environment variables
var mongoDB = server.getDatasource("mongoDB");
if ( structCount(mongoDB) ){
mongoDB.user=mongoDB.username;
Expand Down
12 changes: 6 additions & 6 deletions test/components/_Administrator.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
});

it(title="testUpdateDataSource", body=function( currentSpec ) {
var mySQL = getCredencials();
var mySQL = getCredentials();
if(structCount(mySQL)) {
var tmpStrt = {};
tmpStrt.name = "TestDSN";
Expand Down Expand Up @@ -263,15 +263,15 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
});

it(title="testgetDatasource()", body=function( currentSpec ) {
if(structCount(getCredencials())) {
if(structCount(getCredentials())) {
var datasource = adminWeb.getDatasource('TestDSN1');
assertEquals(isstruct(datasource) ,true);
assertEquals(datasource.name EQ 'TestDSN1', true);
}
});

it(title="checking verifyDatasource()", body=function( currentSpec ) {
if(structCount(getCredencials())) {
if(structCount(getCredentials())) {
var datasource = adminWeb.getDatasource('TestDSN1');
assertEquals(isstruct(datasource), true);
tmpStrt.name = datasource.name;
Expand All @@ -282,7 +282,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
});

it(title="testremoveDatasource()", body=function( currentSpec ) {
if(structCount(getCredencials())) {
if(structCount(getCredentials())) {
adminWeb.removeDatasource('testDSN1');
var datasource = adminWeb.getDatasources();
var ListOfDSNName = valueList(datasource.name);
Expand Down Expand Up @@ -1781,8 +1781,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
});
}

private struct function getCredencials() {
// getting the credetials from the enviroment variables
private struct function getCredentials() {
// getting the credentials from the environment variables
return server.getDatasource("mysql");
}
}
2 changes: 1 addition & 1 deletion test/datasource/MongoDB.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
}

private struct function getCredentials() {
// getting the credetials from the enviroment variables
// getting the credentials from the environment variables
return server.getDatasource("mongoDB");
}

Expand Down
2 changes: 1 addition & 1 deletion test/datasource/PostgreSQL.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
}

private struct function getCredentials() {
// getting the credentials from the enviroment variables
// getting the credentials from the environment variables
return server.getDatasource("postgres");
}
}
Expand Down
12 changes: 6 additions & 6 deletions test/datasource/_MySQL_Driver.cfc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component extends="org.lucee.cfml.test.LuceeTestCase"{
function isNotSupported() {
variables.mySql = getCredencials();
variables.mySql = getCredentials();
if(!isNull(variables.mySql)){
return false;
} else{
Expand All @@ -15,7 +15,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{


function run( testResults , testBox ) {
if(!hasCredencials()) return;
if(!hasCredentials()) return;
describe( "Checking MYSQL JDBC drivers", function() {
it( title='test with version 5.1.20',skip=isNotSupported(), body=function( currentSpec ) {
defineDatasource('com.mysql.jdbc.Driver', 'com.mysql.jdbc', '5.1.20');
Expand Down Expand Up @@ -217,12 +217,12 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
return local.qry;
}

private boolean function hasCredencials() {
return structCount(getCredencials());
private boolean function hasCredentials() {
return structCount(getCredentials());
}

private struct function getCredencials() {
// getting the credetials from the enviroment variables
private struct function getCredentials() {
// getting the credentials from the environment variables
return server.getDatasource("mysql");
}
}
2 changes: 1 addition & 1 deletion test/datasource/mongodb/Application.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
this.clientStorage = "perAppCacheMongo";

private struct function getCredentials() {
// getting the credetials from the enviroment variables
// getting the credentials from the environment variables
var mongoDB = server.getDatasource("mongoDB");
if ( structCount(mongoDB) ){
mongoDB.user=mongoDB.username;
Expand Down
4 changes: 2 additions & 2 deletions test/datasource/pgSQL/Application.cfc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component {

pgSQL = getCredencials();
pgSQL = getCredentials();

this.name = "luceetest";
this.datasources["pgSQL_DSN"] = pgSQL;
Expand All @@ -15,7 +15,7 @@ component {
}
}

private struct function getCredencials() {
private struct function getCredentials() {
return server.getDatasource("postgres");
}

Expand Down
2 changes: 1 addition & 1 deletion test/functions/CacheClear.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {


private struct function getMongoDBCredentials() {
// getting the credetials from the enviroment variables
// getting the credentials from the environment variables
return server.getDatasource("mongoDB");
}

Expand Down
6 changes: 3 additions & 3 deletions test/functions/StoreMetaData.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
//public function afterTests(){}


private struct function getCredencials() {
// getting the credetials from the enviroment variables
private struct function getCredentials() {
// getting the credentials from the environment variables
return server.getTestService("s3");
}

public function setUp(){
var s3=getCredencials();
var s3=getCredentials();
if(!isNull(s3.ACCESS_KEY_ID)) {
application action="update" s3=s3;
variables.s3Supported=true;
Expand Down
6 changes: 3 additions & 3 deletions test/functions/_StoreACL.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
//public function afterTests(){}


private struct function getCredencials() {
// getting the credetials from the enviroment variables
private struct function getCredentials() {
// getting the credentials from the environment variables
return server.getTestService("s3");
}

public function setUp(){
var s3=getCredencials();
var s3=getCredentials();
if(!isNull(s3.ACCESS_KEY_ID)) {
application action="update" s3=s3;
variables.s3Supported=true;
Expand Down
8 changes: 4 additions & 4 deletions test/general/Resources.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,8 @@ private function assertEqualPaths(string path1, string path2) {

}

private struct function getCredencials() {
// getting the credetials from the enviroment variables
private struct function getCredentials() {
// getting the credentials from the environment variables
return server.getTestService("s3");
}

Expand Down Expand Up @@ -580,15 +580,15 @@ private function assertEqualPaths(string path1, string path2) {


public void function testS3() localmode=true{
var s3=getCredencials();
var s3=getCredentials();
if(!isNull(s3.ACCESS_KEY_ID)) {
application action="update" s3=s3;
test("s3","s3:///");
}
}

public void function testS3AsMapping() localmode=true{
var s3=getCredencials();
var s3=getCredentials();
if(!isNull(s3.ACCESS_KEY_ID)) {
application action="update" s3=s3;
addMapping("/testress3","s3:///");
Expand Down
6 changes: 3 additions & 3 deletions test/jira/Jira2049.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {

//public function setUp(){}

public void function testMySql() skip="notHasMySQLCredencials"{
//if(!hasMySQLCredencials()) return;
public void function testMySql() skip="notHasMySQLCredentials"{
//if(!hasMySQLCredentials()) return;
local.uri=createURI("Jira2049/index.cfm");
local.result=_InternalRequest(uri);
assertEquals(200,result.status);
Expand Down Expand Up @@ -56,7 +56,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
return baseURI&""&calledName;
}

public boolean function notHasMySQLCredencials() {
public boolean function notHasMySQLCredentials() {
return (structCount(server.getDatasource("mysql")) eq 0);
}

Expand Down
6 changes: 3 additions & 3 deletions test/jira/Jira2903.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}

private boolean function defineDatasource(){
var pgsql=getCredencials();
var pgsql=getCredentials();
if(pgsql.count()==0) return false;
application action="update" datasource="#pgsql#";
/*
Expand All @@ -40,8 +40,8 @@
}


private struct function getCredencials() {
// getting the credetials from the enviroment variables
private struct function getCredentials() {
// getting the credentials from the environment variables
return server.getDatasource("postgres");
}

Expand Down
4 changes: 2 additions & 2 deletions test/jira/Jira3043.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
}

private string function defineDatasource(){
var mySQL=getCredencials();
var mySQL=getCredentials();
if(mySQL.count()==0) return false;
application action="update" datasource="#mySQL#";
return true;
}

private struct function getCredencials() {
private struct function getCredentials() {
return server.getDatasource("mysql");
}
}
Expand Down
4 changes: 2 additions & 2 deletions test/jira/Jira3074.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
}

private string function defineDatasource(){
var mySQL=getCredencials();
var mySQL=getCredentials();
if(mySQL.count()==0) return false;
application action="update" datasource="#mysql#";
return true;
}

private struct function getCredencials() {
private struct function getCredentials() {
return server.getDatasource("mysql");
}

Expand Down
10 changes: 5 additions & 5 deletions test/tags/FTP.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
}

public function testSFTP() {
var sftp=getSFTPCredencials();
var sftp=getSFTPCredentials();
if(!structCount(sftp)) return;
return; //disable failing test
_test(
Expand All @@ -149,7 +149,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
}

public function testFTP() {
var ftp=getFTPCredencials();
var ftp=getFTPCredentials();
if(!structCount(ftp)) return;
return; //disable failing test
_test(
Expand All @@ -162,12 +162,12 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
);
}

private struct function getFTPCredencials() {
private struct function getFTPCredentials() {
return server.getTestService("ftp");
}

private struct function getSFTPCredencials() {
// getting the credetials from the enviroment variables
private struct function getSFTPCredentials() {
// getting the credentials from the environment variables
return server.getTestService("sftp");
}
}
Expand Down
8 changes: 4 additions & 4 deletions test/tickets/LDEV0078.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {


public void function test1(){
if(!hasCredencials()) return;
if(!hasCredentials()) return;
local.uri=createURI("LDEV0078/test1.cfm");
local.result=_InternalRequest(uri);
assertEquals("true",trim(result.filecontent));
}

public void function test2(){
if(!hasCredencials()) return;
if(!hasCredentials()) return;
local.uri=createURI("LDEV0078/test2.cfm");
local.result=_InternalRequest(uri);
assertEquals("true",trim(result.filecontent));
}

public void function test3(){
if(!hasCredencials()) return;
if(!hasCredentials()) return;
local.uri=createURI("LDEV0078/test3.cfm");
local.result=_InternalRequest(uri);
assertEquals("true",trim(result.filecontent));
Expand All @@ -45,7 +45,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
return baseURI&""&calledName;
}

private boolean function hasCredencials() {
private boolean function hasCredentials() {
return structCount(server.getDatasource("mysql"));
}

Expand Down
4 changes: 2 additions & 2 deletions test/tickets/LDEV0078/Application.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ component {

this.name = Hash( GetCurrentTemplatePath() );
this.sessionManagement = false;
mySQL=getCredencials();
mySQL=getCredentials();
this.datasource = mySql;

// ORM settings
Expand Down Expand Up @@ -34,7 +34,7 @@ component {
}
}

private struct function getCredencials() {
private struct function getCredentials() {
return server.getDatasource("mysql");
}

Expand Down
Loading

0 comments on commit 2e73ed9

Please sign in to comment.