Skip to content

Commit b4ad01f

Browse files
authored
Merge pull request #25731 from survivant/master
Fix typos and linguistic errors in documentation / hacktoberfest
2 parents 0adc508 + 2ed5995 commit b4ad01f

File tree

35 files changed

+98
-98
lines changed

35 files changed

+98
-98
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The Zip distributions can be found on following paths:
3939
* `mvn clean install -Pfastest -T4C` - Building all distribution artifacts as fast as possible. Excludes everything not serving this purpose. Typical time: 1.5 minutes.
4040

4141
After the build, you can run GlassFish in the following ways:
42-
* Run GlassFish server directly: Navigate to `appserver/distributions/glassfish/target/stage/glassfish7` - it's an unpacked version of GlassFish Full. Then you can run it as usual, e.g. with `bin/startserv`
42+
* Run GlassFish server directly: Navigate to `appserver/distributions/glassfish/target/stage/glassfish7` - it is an unpacked version of GlassFish Full. Then you can run it as usual, e.g. with `bin/startserv`
4343
* Run GlassFish server from a ZIP: A zip file is generated either at `appserver/distributions/glassfish/target/glassfish.zip` or in your local maven repository, e.g. at `<HOME>/.m2/repository/org/glassfish/main/distributions/glassfish/<VERSION>/glassfish-<VERSION>.zip`. Unpack it and run as usual
4444
* Run Embedded GlassFish: Find the JAR file at `appserver/extras/embedded/all/target/glassfish-embedded-all.jar` or in your local maven repository, e.g. at `<HOME>/.m2/repository/org/glassfish/main/extras/glassfish-embedded-all/<VERSION>/glassfish-embedded-all-<VERSION>.jar. Then run it with `java -jar glassfish-embedded-all.jar`
4545

@@ -53,9 +53,9 @@ Note that this applies just for tests which are executed by Maven and which use
5353

5454
### Special Profiles
5555

56-
* `staging` - In some development stages may happen that some dependencies are available just in OSSRH staging repository.
56+
* `staging` - In some development stages it may happen that some dependencies are available just in the OSSRH staging repository.
5757
Then you have to use this profile, which is not enabled by default.
58-
* `jacoco` - enables the [JaCoCo](https://www.eclemma.org/jacoco/) agent in tests, so you can import it's output to you editor, ie. Eclipse, and see the code coverage.
58+
* `jacoco` - enables the [JaCoCo](https://www.eclemma.org/jacoco/) agent in tests, so you can import its output to your editor, i.e. Eclipse, and see the code coverage.
5959
* `jacoco-merge` - merges all JaCoCo output files found in subdirectories and merges them into one. It is useful to see code which wasn't even touched by tests.
6060

6161
### Special Scripts
@@ -80,7 +80,7 @@ They are quite old and have high technical debt, but at this moment they still p
8080

8181
:warning: If the script fails, sometimes it doesn't stop the domain and you have to do that manually.
8282

83-
:warning: Some of the scripts do inplace filtering or generate other sources which remain and later affect next executions. You have to remove those changes manually.
83+
:warning: Some of the scripts do in-place filtering or generate other sources which remain and later affect subsequent executions. You have to remove those changes manually.
8484

8585
* `./runtests.sh batch_all` - Usual time: 1 minute
8686
* `./runtests.sh cdi_all` - Usual time: 6 minutes

appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/GlassfishNamingManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ private ArrayList<SimpleJndiName> listNames(SimpleJndiName name) throws NamingEx
654654
}
655655

656656
// This iterates over all names in entire component namespace,
657-
// so its a little inefficient. The alternative is to store
657+
// so it's a little inefficient. The alternative is to store
658658
// a list of bindings in each javaURLContext instance.
659659
ArrayList<SimpleJndiName> list = new ArrayList<>();
660660
final String logicalNameWithSlash;

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorTimerProxy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public void scheduleAtFixedRate(TimerTask task, Date firstTime, long period) {
209209
}
210210

211211
/**
212-
* Handle any exception occured during scheduling timer.
212+
* Handle any exception occurred during scheduling timer.
213213
*
214214
* In case of unchecked exceptions, the timer is recreated to be used
215215
* by the subsequent requests for scheduling.

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ConnectionPool.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1298,7 +1298,7 @@ protected boolean cleanupResource(ResourceHandle resource) {
12981298

12991299
@Override
13001300
public void resourceErrorOccurred(ResourceHandle resourceHandle) throws IllegalStateException {
1301-
LOG.log(FINE, "Resource error occured: {0}", resourceHandle);
1301+
LOG.log(FINE, "Resource error occurred: {0}", resourceHandle);
13021302
if (failAllConnections) {
13031303
// TODO: leakDetector is not updated and isBusy state of this resource is not updated correctly: possible bug.
13041304
// leakDetector should be updated in the doFailAllConnectionsProcessing method. The resource can be updated here.

appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ComponentValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ protected void accept(InjectionCapable injectable) {
702702
// we need to split the accept(InjectionCapable) into two parts:
703703
// one needs classloader and one doesn't. This is needed because
704704
// in the standalone war case, the classloader is not created
705-
// untill the web module is being started.
705+
// until the web module is being started.
706706

707707
protected void acceptWithCL(InjectionCapable injectable) {
708708
// If parsed from deployment descriptor, we need to determine whether

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/GlassFishToExousiaConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class GlassFishToExousiaConverter {
5151
*
5252
* <p>
5353
* Phase 1: gets a map representing the methodPermission elements exactly as they
54-
* occured for the ejb in the dd. The map is keyed by method-permission element and each method-permission is mapped to a list of
54+
* occurred for the ejb in the dd. The map is keyed by method-permission element and each method-permission is mapped to a list of
5555
* method elements representing the method elements of the method permision element. Each method element is converted to a
5656
* corresponding EJBMethodPermission and added, based on its associated method-permission, to the returned JakartaPermissions instance.
5757
*

appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1551,7 +1551,7 @@ protected void afterCompletion(EJBContextImpl ctx, int status) {
15511551
// home methods, finders and remove dont need this
15521552
if ( !containerStateManager.isRemovedEJBObject(context)
15531553
|| !containerStateManager.isRemovedEJBLocalObject(context) ) {
1554-
// Remove bean from ActiveTxCache table if its there.
1554+
// Remove bean from ActiveTxCache table if it's there.
15551555
// No need to remove it from txBeanTable because the table
15561556
// gets updated in ContainerFactoryImpl.removeContainerSync.
15571557

@@ -1575,7 +1575,7 @@ protected void afterCompletion(EJBContextImpl ctx, int status) {
15751575
} else if (containerStateManager.isNullEJBObject(context) &&
15761576
containerStateManager.isNullEJBLocalObject(context)) {
15771577
// This happens if an ejbcreate has an exception, in that case
1578-
// we remove bean from ActiveTxCache table if its there.
1578+
// we remove bean from ActiveTxCache table if it's there.
15791579
// and return it to the pool
15801580
//removeIncompleteTxEJB(context, false);
15811581

appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesDeployer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ private void validatePreservedResources(Map<String, Resources> allResources, App
864864
getResourceDeployer(resource).validatePreservedResource(oldApp, newApp, resource, oldModuleResources);
865865
}
866866
}
867-
}//else its a new module in the archive being redeployed.
867+
}//else it's a new module in the archive being redeployed.
868868
}
869869
}
870870

appserver/tests/admingui/README.md

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
#How to run the dev test cases
2-
================================
3-
#Annotation:
4-
All of the test cases can't be ran on the windows platform because
5-
the firefox can't support the JSF based on the windows platform very well.
6-
If you want to ran the tests, please check out all of the codes to the linux, ubuntu or
7-
mac platform.
8-
9-
#Preparation and Steps:
10-
1). Download the firefox and install it, On my platform, I have downloaded and installed
11-
the firefox version 19.0
12-
13-
2). Download the selenium IDE plugin and installed, On my platform, I have installed the
14-
selenium IDE 2.4.0
15-
16-
3). Checkout the the tests from the github(https://github.com/LvSongping/GLASSFISH_ADMIN_CONSOLE_DEVTESTS/tree/master/auto-test)
17-
to your hard disk.
18-
19-
4). Before ran the tests, you need to restart the glassfish domain and try to access admin console's page(http://localhost:4848/common/index.jsf)
20-
to make sure the GUI is available
21-
22-
5). Open a terminal window and access to the root directory of auto-tests, Then execute the command
23-
as "mvn test" to run all of the tests
24-
25-
6). If some of the test cases are failed, you can also rerun the error or failed test cases
26-
using the command as "mvn test -Dtest=[ClassName]#[MethodName]" to confirm related test
27-
cases.(if the failure test cases passed at the second time, we can regard the failure test
28-
case as a passed case)
29-
30-
#Note:
31-
The expected test results listed as follows:
32-
test cases number:110
33-
passed number:110
34-
failed number:0
35-
error number:0
1+
# How to run the dev test cases
2+
3+
## Annotation
4+
All of the test cases can't be run on the Windows platform because
5+
Firefox doesn't support JSF on the Windows platform very well.
6+
If you want to run the tests, please check out all of the code to the Linux, Ubuntu, or
7+
Mac platform.
8+
9+
## Preparation and Steps:
10+
1. Download Firefox and install it. On my platform, I have downloaded and installed
11+
Firefox version 19.0
12+
13+
2. Download the Selenium IDE plugin and install it. On my platform, I have installed
14+
Selenium IDE 2.4.0
15+
16+
3. Check out the tests from GitHub (https://github.com/LvSongping/GLASSFISH_ADMIN_CONSOLE_DEVTESTS/tree/master/auto-test)
17+
to your hard disk.
18+
19+
4. Before running the tests, you need to restart the GlassFish domain and try to access the admin console's page (http://localhost:4848/common/index.jsf)
20+
to make sure the GUI is available.
21+
22+
5. Open a terminal window and access the root directory of auto-tests. Then execute the command
23+
"mvn test" to run all of the tests.
24+
25+
6. If some of the test cases fail, you can also rerun the error or failed test cases
26+
using the command "mvn test -Dtest=[ClassName]#[MethodName]" to confirm related test
27+
cases. (If the failed test cases pass the second time, we can regard the failed test
28+
case as a passed case.)
29+
30+
## Note:
31+
The expected test results are as follows:
32+
- Test cases number: 110
33+
- Passed number: 110
34+
- Failed number: 0
35+
- Error number: 0
3636

appserver/tests/appserv-tests/devtests/cdi/README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
CDI developer tests README
1+
CDI Developer Tests README
22
==========================
33

4-
To checkout CDI devtests
5-
------------------------
6-
- checkout CDI developer tests using the following commands:
4+
To CheckOut CDI devtests
5+
-------------------------
6+
- Checkout CDI developer tests using the following commands:
77
svn -N co https://svn.java.net/svn/glassfish~svn/trunk/v2/appserv-tests
88
cd appserv-tests #this is the directory set later to APS_HOME
99
svn co https://svn.java.net/svn/glassfish~svn/trunk/v2/appserv-tests/config
@@ -13,7 +13,7 @@ svn -N co https://svn.java.net/svn/glassfish~svn/trunk/v2/appserv-tests/devtests
1313
cd devtests
1414
svn co https://svn.java.net/svn/glassfish~svn/trunk/v2/appserv-tests/devtests/cdi
1515

16-
Test setup
16+
Test Setup
1717
----------
1818
- set S1AS_HOME, APS_HOME as appropriate
1919
export APS_HOME=<appserv-tests> directory
@@ -23,28 +23,28 @@ $S1AS_HOME/bin/asadmin start-domain domain1
2323
- start Derby
2424
$S1AS_HOME/bin/asadmin start-database
2525

26-
To run all CDI developer tests
26+
To Run All CDI Developer Tests
2727
------------------------------
2828
- cd $APS_HOME/devtests/cdi
2929
- ant all
3030
- results can be found at APS_HOME/test_results.html
3131

3232

33-
Test setup teardown
33+
Test Setup Teardown
3434
-------------------
3535
- stop GlassFish
3636
$S1AS_HOME/bin/asadmin stop-domain domain1
3737
- asadmin stop-database
3838
$S1AS_HOME/bin/asadmin stop-database
3939

40-
To run a single CDI developer test
40+
To Run a Single CDI Developer Test
4141
----------------------------------
42-
- after performing tasks under "Test setup"
42+
- after performing tasks under "Test Setup"
4343
- cd $APS_HOME/devtests/cdi/[test-dir]
4444
- ant all
45-
- perform tasks listed under "Test setup teardown"
45+
- perform tasks listed under "Test Setup Teardown"
4646

47-
To run CDI developer test suite with Security Manager on
47+
To Run CDI Developer Test Suite with Security Manager On
4848
---------------------------------------------------------
4949
- start domain and enable security manager by
5050
asadmin create-jvm-options -Djava.security.manager

0 commit comments

Comments
 (0)