11:22 a.m.
Author: gavin.king(a)jboss.com
Date: 2010-01-08 12:22:21 -0500 (Fri, 08 Jan 2010)
New Revision: 5403
Modified:
doc/trunk/reference/en-US/ee.xml
doc/trunk/reference/en-US/gettingstarted.xml
doc/trunk/reference/en-US/ri-spi.xml
doc/trunk/reference/en-US/weldexamples.xml
Log:
lowercase ear, jar, war
Modified: doc/trunk/reference/en-US/ee.xml
===================================================================
--- doc/trunk/reference/en-US/ee.xml 2010-01-08 17:05:29 UTC (rev 5402)
+++ doc/trunk/reference/en-US/ee.xml 2010-01-08 17:22:21 UTC (rev 5403)
@@ -263,11 +263,11 @@
<title>Packaging and deployment</title>
<para>
- CDI doesn't define any special deployment archive. You can package beans in
JARs, EJB-JARs or WARs—any
+ CDI doesn't define any special deployment archive. You can package beans in
jars, ejb jars or wars—any
deployment location in the application classpath. However, the archive must be a
"bean archive". That means
each archive that contains beans <emphasis>must</emphasis> include a
file named <literal>beans.xml</literal> in
the <literal>META-INF</literal> directory of the classpath or
<literal>WEB-INF</literal> directory of the web
- root (for WAR archives). The file may be empty. Beans deployed in archives that
do not have a
+ root (for war archives). The file may be empty. Beans deployed in archives that
do not have a
<literal>beans.xml</literal> file will not be available for use in
the application.
</para>
Modified: doc/trunk/reference/en-US/gettingstarted.xml
===================================================================
--- doc/trunk/reference/en-US/gettingstarted.xml 2010-01-08 17:05:29 UTC (rev 5402)
+++ doc/trunk/reference/en-US/gettingstarted.xml 2010-01-08 17:22:21 UTC (rev 5403)
@@ -6,10 +6,10 @@
<para>
Weld comes with two starter example applications, in addition to more specialized
examples. The first,
- <literal>weld-numberguess</literal>, is a web (WAR) example containing
only non-transactional managed beans.
+ <literal>weld-numberguess</literal>, is a web (war) example containing
only non-transactional managed beans.
This example can be run on a wide range of servers, including JBoss AS, GlassFish,
Apache Tomcat, Jetty, Google
App Engine, and any compliant Java EE 6 container. The second example,
<literal>weld-translator</literal>, is
- an enterprise (EAR) example that contains session beans. This example must be run
on JBoss AS 5.2, Glassfish 3.0
+ an enterprise (ear) example that contains session beans. This example must be run
on JBoss AS 5.2, Glassfish 3.0
or any compliant Java EE 6 container.
</para>
@@ -42,10 +42,10 @@
<para>GlassFish 3.0,</para>
</listitem>
<listitem>
- <para>Apache Tomcat 6.0.x (WAR example only), or</para>
+ <para>Apache Tomcat 6.0.x (war example only), or</para>
</listitem>
<listitem>
- <para>Jetty 6.1.x (WAR example only)</para>
+ <para>Jetty 6.1.x (war example only)</para>
</listitem>
</itemizedlist>
</listitem>
@@ -63,14 +63,14 @@
<para>
In the next few sections, you'll be using the Ant command
(<literal>ant</literal>) to invoke the Ant build script
- in each example to compile, assemble and deploy the example to JBoss AS and, for
the WAR example, Apache Tomcat.
- You can also deploy the generated artifact (WAR or EAR) to any other container
that supports Java EE 6, such as
+ in each example to compile, assemble and deploy the example to JBoss AS and, for
the war example, Apache Tomcat.
+ You can also deploy the generated artifact (war or ear) to any other container
that supports Java EE 6, such as
GlassFish 3.
</para>
<para>
If you have Maven installed, you can use the Maven command
(<literal>mvn</literal>) to compile and assemble the
- standalone artifact (WAR or EAR) and, for the WAR example, run it in an embedded
container.
+ standalone artifact (war or ear) and, for the war example, run it in an embedded
container.
</para>
<para>The sections below cover the steps for deploying with both Ant and
Maven in detail. Let's start with JBoss AS.</para>
@@ -197,8 +197,8 @@
<note>
<para>
- The translator uses session beans, which are packaged in an EJB module within
an EAR. Java EE 6 will allow
- session beans to be deployed in WAR modules, but that's a topic for a
later chapter.
+ The translator uses session beans, which are packaged in an EJB module within
an ear. Java EE 6 will allow
+ session beans to be deployed in war modules, but that's a topic for a
later chapter.
</para>
</note>
@@ -488,7 +488,7 @@
<para>
To run the <literal>weld-numberguess</literal> example on Jetty,
switch to the example directory and execute
- the <literal>inplace</literal> goal of the Maven WAR plugin followed
by the <literal>run</literal> goal of
+ the <literal>inplace</literal> goal of the Maven war plugin followed
by the <literal>run</literal> goal of
the Maven Jetty plugin with the <literal>jetty</literal> profile
enabled, as follows:
</para>
@@ -506,15 +506,15 @@
Any changes to assets in <literal>src/main/webapp</literal> take
effect immediately. If a change to a webapp
configuration file is made, the application may automatically redeploy. The
redeploy behavior can be fined-tuned
in the plugin configuration. If you make a change to a classpath resource, you
need to execute a build and the
- <literal>inplace</literal> goal of the Maven WAR plugin, again with
the <literal>jetty</literal> profile enabled.
+ <literal>inplace</literal> goal of the Maven war plugin, again with
the <literal>jetty</literal> profile enabled.
</para>
<programlisting><![CDATA[$> mvn compile war:inplace
-Pjetty]]></programlisting>
<para>
- The <literal>war:inplace</literal> goal copies the compiled classes
and JARs inside <literal>src/main/webapp</literal>,
+ The <literal>war:inplace</literal> goal copies the compiled classes
and jars inside <literal>src/main/webapp</literal>,
under <literal>WEB-INF/classes</literal> and
<literal>WEB-INF/lib</literal>, respectively, mixing source and compiled
- files. However, the build does work around these temporary files by excluding
them from the packaged WAR and cleaning
+ files. However, the build does work around these temporary files by excluding
them from the packaged war and cleaning
them during the Maven clean phase.
</para>
Modified: doc/trunk/reference/en-US/ri-spi.xml
===================================================================
--- doc/trunk/reference/en-US/ri-spi.xml 2010-01-08 17:05:29 UTC (rev 5402)
+++ doc/trunk/reference/en-US/ri-spi.xml 2010-01-08 17:22:21 UTC (rev 5403)
@@ -57,7 +57,7 @@
<para>
An application is often comprised of a number of modules. For example, a Java
EE deployment may contain a
- number of EJB modules (containing business logic) and WAR modules (containing
the user interface). A
+ number of EJB modules (containing business logic) and war modules (containing
the user interface). A
container may enforce certain <emphasis>accessibility</emphasis>
rules which limit the visibility of classes
between modules. CDI allows these same rules to apply to bean and observer
method resolution. As the
accessibility rules vary between containers, Weld requires the container to
<emphasis>describe</emphasis>
@@ -335,7 +335,7 @@
<tip>
<para>
- Most Servlet contains use a classloader-per-WAR, this may provide
+ Most Servlet contains use a classloader-per-war, this may provide
a good way to identify the BDA in use for web requests.
</para>
</tip>
@@ -350,7 +350,7 @@
<term><literal>ServletServices.getBeanDeploymentArchive(ServletContext
ctx)</literal></term>
<listitem>
<para>
- Identify the WAR in use. The
<literal>ServletContext</literal> is provided for additional context.
+ Identify the war in use. The
<literal>ServletContext</literal> is provided for additional context.
</para>
</listitem>
</varlistentry>
Modified: doc/trunk/reference/en-US/weldexamples.xml
===================================================================
--- doc/trunk/reference/en-US/weldexamples.xml 2010-01-08 17:05:29 UTC (rev 5402)
+++ doc/trunk/reference/en-US/weldexamples.xml 2010-01-08 17:22:21 UTC (rev 5403)
@@ -19,7 +19,7 @@
<para>
The numberguess example is comprised of a number of beans, configuration files
and Facelets (JSF) views,
- packaged as a WAR module. Let's start by examining the configuration files.
+ packaged as a war module. Let's start by examining the configuration files.
</para>
<para>
@@ -62,7 +62,7 @@
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name>weld-jsf-numberguess-war</display-name>
- <description>Weld JSF numberguess example (WAR)</description>
+ <description>Weld JSF numberguess example (war)</description>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
@@ -370,13 +370,13 @@
<para>
A couple of modifications must be made to the numberguess artifact in order
to deploy it to Tomcat or Jetty.
First, Weld must be deployed as a Web Application library under
<literal>WEB-INF/lib</literal> since the
- servlet container does not provide the CDI services. For your convenience we
provide a single JAR suitable
+ servlet container does not provide the CDI services. For your convenience we
provide a single jar suitable
for running Weld in any servlet container (including Jetty),
<literal>weld-servlet.jar</literal>.
</para>
<tip>
<para>
- You must also include the JARs for JSF, EL, and the common annotations
+ You must also include the jars for JSF, EL, and the common annotations
(<literal>jsr250-api.jar</literal>), all of which are provided
by the Java EE platform (a Java EE
application server). Are you starting to appreciate why a Java EE platform
is worth using?
</para>
@@ -1142,19 +1142,19 @@
</para>
<para>
- The translator example is built as an EAR and contains EJBs. As a result,
it's structure is more complex than
+ The translator example is built as an ear and contains EJBs. As a result,
it's structure is more complex than
the numberguess example.
</para>
<note>
<para>
- Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a WAR, which
will make this structure much
- simpler! Still, there are other advantages of using an EAR.
+ Java EE 6, which bundles EJB 3.1, allows you to package EJBs in a war, which
will make this structure much
+ simpler! Still, there are other advantages of using an ear.
</para>
</note>
<para>
- First, let's take a look at the EAR aggregator, which is located in the
example's <literal>ear</literal> directory. Maven
+ First, let's take a look at the ear aggregator, which is located in the
example's <literal>ear</literal> directory. Maven
automatically generates the <literal>application.xml</literal> for
us from this plugin configuration:
</para>
@@ -1191,7 +1191,7 @@
http://java.sun.com/xml/ns/javaee/application_5.xsd">
<display-name>weld-jsf-translator-ear</display-name>
- <description>The Weld JSF translator example (EAR)</description>
+ <description>The Weld JSF translator example (ear)</description>
<module>
<web>
@@ -1206,7 +1206,7 @@
</tip>
<para>
- Next, lets look at the WAR, which is located in the example's
<literal>war</literal> directory. Just as in the
+ Next, lets look at the war, which is located in the example's
<literal>war</literal> directory. Just as in the
numberguess example, we have a <literal>faces-config.xml</literal>
for JSF 2.0 and a <literal>web.xml</literal>
(to activate JSF) under WEB-INF, both sourced from
<literal>src/main/webapp/WEB-INF</literal>.
</para>