#1 Spelling fixes
Opened 7 years ago by scop. Modified 7 years ago
scop/javapackages spelling  into  master

file modified
+1 -1
@@ -261,7 +261,7 @@ 

  		return 0

  	fi

  

- 	# Strip version and extention. e.g. abc-2.1-api-1.0.4.jar -> abc-2.1-api

+ 	# Strip version and extension. e.g. abc-2.1-api-1.0.4.jar -> abc-2.1-api

  	_jar_filename=`basename $1`

  	_search_name=`basename $1`

  	_search_name=`echo $_search_name | sed -r -e s/-[[:digit:].]*\\\.jar//g | sed -r -e s/\\\.jar$//g`

file modified
+1 -1
@@ -61,7 +61,7 @@ 

  			continue

  		fi

  

- 		# Strip version and extention. e.g. abc-2.1-api-1.0.4.jar -> abc-2.1-api

+ 		# Strip version and extension. e.g. abc-2.1-api-1.0.4.jar -> abc-2.1-api

  		_jar_filename=`basename $file`

  		_search_name=`basename $file`

  		_search_name=`echo $_search_name | sed -r -e s/-[[:digit:].]*\\\.jar//g | sed -r -e s/\\\.jar$//g`

file modified
+2 -2
@@ -7,7 +7,7 @@ 

  

  Apache Ant is probably second most used Java build tool right after Apache

  Maven. The main difference between these two tools is that Ant is procedural and

- Maven is declarative. When using Ant, it is neccessary to exactly describe the

+ Maven is declarative. When using Ant, it is necessary to exactly describe the

  processes which lead to the result. It means that one needs to specify where the

  source files are, what needs to be done and when it needs to be done. On the

  other hand, Maven relies on conventions and doesn't require specifying most
@@ -155,5 +155,5 @@ 

  Details:

  

      - The publish target may be named differently. Search the `build.xml`

-       for occurences of `ivy:publish`.

+       for occurrences of `ivy:publish`.

      - `%mvn_install` will install all the published artifacts.

file modified
+1 -1
@@ -24,7 +24,7 @@ 

  The Java packaging tooling on Fedora provides automatic Requires and

  Provides generation for packages built using XMvn. The Provides are based

  on Maven artifact coordinates of artifacts that were installed by the

- currenlty being built. They are generated for each subpackage

+ currently being built. They are generated for each subpackage

  separately. They follow a general format

  `mvn(groupId:artifactId:extension:classifier:version)`, where the

  extension is omitted if it's `jar` and classifier is omitted if empty.

@@ -82,7 +82,7 @@ 

  --------

  

  `log4j` corresponds to `log4j.jar` stored in `%{_javadir}`. If the JAR

- file is stored in subdirectory under `%{_javadir}`, it's neccessary to

+ file is stored in subdirectory under `%{_javadir}`, it's necessary to

  pass `subdirectory/jarname` as an argument to `build-classpath`.

  Example:

  

@@ -281,7 +281,7 @@ 

  .Make

  While unlikely, it's still possible that you encounter a project whose

  build is managed by plain old Makefiles. They contain a list of targets

- which consist of commands (marked with tab at the begining of line) and

+ which consist of commands (marked with tab at the beginning of line) and

  are invoked by `make` _target_ or simply `make` to run the default

  target.

  

file modified
+1 -1
@@ -8,7 +8,7 @@ 

  

  In the real world the same project can appear under different names as it was

  evolving or released differently. Therefore other projects may refer to those

- alternative names instead of using the name currently prefered by upstream.

+ alternative names instead of using the name currently preferred by upstream.

  

  ===== Artifact aliases

  XMvn provides a way to attach multiple artifact coordinates to a single

file modified
+1 -1
@@ -12,7 +12,7 @@ 

  package to the new version and create new package representing the old

  version (called compat package). The compat package needs to have the

  version number (usually only the major number, unless further

- distinction is necessary) appended to the name, thus effectivelly having

+ distinction is necessary) appended to the name, thus effectively having

  different name from RPM's point of view. Such compat package needs to

  perform some additional steps to ensure that it can be installed and

  used along the non-compat one.

file modified
+1 -1
@@ -64,7 +64,7 @@ 

  %prep

  # The default location for installing JAR files is %{_javadir}/%{name}/

  # Because our original specfile put the JAR directly to %{_javadir}, we

- # want to override this behavior. The folowing call tells XMvn to

+ # want to override this behavior. The following call tells XMvn to

  # install the groupId:artifactId artifact as %{_javadir}/%{name}.jar

  %mvn_file groupId:artifactId %{name}

  

@@ -140,7 +140,7 @@ 

  

  See <<mvn_alias,Additional Mappings>> for more information on `%mvn_alias`.

  

- Rebuild the pacakge and check `rpm -qp --provides` output again:

+ Rebuild the package and check `rpm -qp --provides` output again:

  

  [source,shell]

  ------

file modified
+2 -2
@@ -177,7 +177,7 @@ 

      # try to find it from java command

  

      # try javac first, or we might get the location of the jre instead - djw

-     # if JRE is prefered then don't try javac - mizdebsk

+     # if JRE is preferred then don't try javac - mizdebsk

      case "${_prefer_jre}" in

  	1|[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee])

  	    cmds=java
@@ -384,7 +384,7 @@ 

  }

  

  

- # Finds a specific extention (jar or directory)

+ # Finds a specific extension (jar or directory)

  find_jar()

  {

      local IFS=:

file modified
+10 -10
@@ -38,7 +38,7 @@ 

  # This macro causes given artifact(s) to be installed in given subpackage.

  #

  # GId, aId and ver can contain wildcards and alternatives, which allows

- # multiple artifacts to be matched. If any of gId, aId or ver is omited

+ # multiple artifacts to be matched. If any of gId, aId or ver is omitted

  # then any value will match the respective part. In particular a bare :

  # symbol will match any artifact.

  #
@@ -57,7 +57,7 @@ 

  # resolve any of aliases will result in resolving the original artifact.

  #

  # GId, aId and ver can contain wildcards and alternatives, which allows

- # multiple artifacts to be matched. If any of gId, aId or ver is omited

+ # multiple artifacts to be matched. If any of gId, aId or ver is omitted

  # then any value will match the respective part. In particular a bare :

  # symbol will match any artifact.

  #
@@ -72,7 +72,7 @@ 

  # Usage: %mvn_file [gId]:[aId[:ver]] <file1> [file2 ...]

  #

  # GId, aId and ver can contain wildcards and alternatives, which allows

- # multiple artifacts to be matched. If any of gId, aId or ver is omited

+ # multiple artifacts to be matched. If any of gId, aId or ver is omitted

  # then any value will match the respective part. In particular a bare :

  # symbol will match any artifact.

  #
@@ -87,7 +87,7 @@ 

  # Usage: %mvn_compat_version [gId]:[aId[:ver]] <version1> [version2 ...]

  #

  # GId, aId and ver can contain wildcards and alternatives, which allows

- # multiple artifacts to be matched. If any of gId, aId or ver is omited

+ # multiple artifacts to be matched. If any of gId, aId or ver is omitted

  # then any value will match the respective part. In particular a bare :

  # symbol will match any artifact.

  #
@@ -247,7 +247,7 @@ 

  # Maven artifact.

  #

  # groupId and artifactId are identifiers of Maven group and artifact of the

- # module on which dependency is to be removed. If they are ommited then all

+ # module on which dependency is to be removed. If they are omitted then all

  # identifiers are matched.

  #

  # POM location can be either a full path to the POM file, or a path to the
@@ -266,7 +266,7 @@ 

  # Maven plugin.

  #

  # groupId and artifactId are identifiers of Maven group and artifact of the

- # plugin which invocation is to be removed. If they are ommited then all

+ # plugin which invocation is to be removed. If they are omitted then all

  # identifiers are matched.

  #

  # POM location can be either a full path to the POM file, or a path to the
@@ -285,7 +285,7 @@ 

  # project module.

  #

  # Module name is the exact name of the module to be disabled. It must not be

- # ommited.

+ # omitted.

  #

  # POM location can be either a full path to the POM file, or a path to the

  # directory containing pom.xml. If POM location is not given then pom.xml from
@@ -450,7 +450,7 @@ 

  # current working directory is used.

  #

  # Extra XML is additional XML code to be added into the <dependency> node. This

- # parameter can be ommited, in which case no extra XML is appended.

+ # parameter can be omitted, in which case no extra XML is appended.

  #

  %pom_add_dep()        %{expand: %{__pom_call}add_dep        %*

  }
@@ -467,7 +467,7 @@ 

  # groupId and artifactId.

  #

  # groupId and artifactId are identifiers of Maven plugin artifact of which

- # invocation is to be added. groupId may be ommited, in which case value of

+ # invocation is to be added. groupId may be omitted, in which case value of

  # "org.apache.maven.plugins" is used as default. artifactId must be

  # specified. If version is not specified then default value of "any" is used.

  #
@@ -476,7 +476,7 @@ 

  # current working directory is used.

  #

  # Extra XML is additional XML code to be added into the <plugin> node. This

- # parameter can be ommited, in which case no extra XML is appended.

+ # parameter can be omitted, in which case no extra XML is appended.

  #

  %pom_add_plugin()     %{expand: %{__pom_call}add_plugin     %*

  }

file modified
+1 -1
@@ -47,7 +47,7 @@ 

  processed. You can specify more file locations which will be processed.

  

  Extra XML is additional XML code to be added into the *<dependency>*

- node. This parameter can be ommited, in which case no extra XML is

+ node. This parameter can be omitted, in which case no extra XML is

  appended.

  

  EXAMPLES

file modified
+2 -2
@@ -19,7 +19,7 @@ 

  given groupId and artifactId.

  

  groupId and artifactId are identifiers of Maven plugin artifact of

- which invocation is to be added.  groupId may be ommited, in which

+ which invocation is to be added.  groupId may be omitted, in which

  case value of "org.apache.maven.plugins" is used as default.

  artifactId must be specified.  If version is not specified then

  default value of "any" is used.
@@ -30,7 +30,7 @@ 

  file locations which will be processed.

  

  Extra XML is additional XML code to be added into the *<plugin>* node.

- This parameter can be ommited, in which case no extra XML is appended.

+ This parameter can be omitted, in which case no extra XML is appended.

  

  EXAMPLES

  --------

file modified
+1 -1
@@ -45,7 +45,7 @@ 

  processed. You can specify more file locations which will be processed.

  

  Extra XML is additional XML code to be added into the *<dependency>*

- node. This parameter can be ommited, in which case no extra XML is

+ node. This parameter can be omitted, in which case no extra XML is

  appended.

  

  EXAMPLES

file modified
+1 -1
@@ -18,7 +18,7 @@ 

  given project module.

  

  Module name is the exact name of the module to be disabled. It must

- not be ommited.

+ not be omitted.

  

  POM location can be either a full path to the POM file, or a path to

  the directory containing *pom.xml*.  If POM location is not given then

file modified
+2 -2
@@ -35,7 +35,7 @@ 

  given Maven artifact.

  

  groupId and artifactId are identifiers of Maven group and artifact of

- the module on which dependency is to be removed.  If they are ommited

+ the module on which dependency is to be removed.  If they are omitted

  then all identifiers are matched.

  

  When modifying Ivy modules, the org and name correspond to the Maven
@@ -47,7 +47,7 @@ 

  used. When both *pom.xml* and *ivy.xml* are present, *pom.xml* is

  processed. You can specify more file locations. If the dependency is not

  found in all of given files, the command raises an error. This can be

- overriden with the `-f` option.

+ overridden with the `-f` option.

  

  

  EXAMPLES

file modified
+1 -1
@@ -30,7 +30,7 @@ 

  given Maven plugin.

  

  groupId and artifactId are identifiers of Maven group and artifact of

- the plugin which invocation is to be removed.  If they are ommited

+ the plugin which invocation is to be removed.  If they are omitted

  then all identifiers are matched.

  

  POM location can be either a full path to the POM file, or a path to

file modified
+2 -2
@@ -16,7 +16,7 @@ 

  -----------

  

  *shade-jar* utility is means for changing JAR file namespaces.

- Basically it replaces all occurences of given pattern with a given

+ Basically it replaces all occurrences of given pattern with a given

  replacement.  The replacament is performed on class file names and

  inside the class files themselves.  This is commonly known as

  _shading_.
@@ -25,7 +25,7 @@ 

  --------

  *shade-jar org.apache.log4j com.example.shaded.log4j

  /usr/share/java/log4j.jar lib/shaded-log4j.jar* will replace all

- occurences of *org.apache.log4j* in JAR file

+ occurrences of *org.apache.log4j* in JAR file

  */usr/share/java/log4j.jar* with *com.example.shaded.log4j* and store

  the resulting JAR in *lib/shaded-log4j.jar*.