You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2018/11/26 15:02:16 UTC

[1/9] tomee git commit: Corrected errors in text

Repository: tomee
Updated Branches:
  refs/heads/master e893b19b6 -> 354b14a3b


Corrected errors in text


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/372e5213
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/372e5213
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/372e5213

Branch: refs/heads/master
Commit: 372e52137e5fc0dcc54946915f66df21f11a0c58
Parents: f032a7f
Author: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Authored: Tue Nov 20 14:03:02 2018 -0600
Committer: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Committed: Tue Nov 20 14:03:02 2018 -0600

----------------------------------------------------------------------
 examples/cdi-basic/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/372e5213/examples/cdi-basic/README.md
----------------------------------------------------------------------
diff --git a/examples/cdi-basic/README.md b/examples/cdi-basic/README.md
index a103135..6518ae0 100644
--- a/examples/cdi-basic/README.md
+++ b/examples/cdi-basic/README.md
@@ -4,7 +4,7 @@ To use `@Inject`, the first thing you need is a `META-INF/beans.xml` file in the
 or jar.  This effectively turns on CDI and allows the `@Inject` references to work.
 No `META-INF/beans.xml` no injection, period.  This may seem overly strict,
 but it is not without reason.  The CDI API is a bit greedy and does consume a fair
-about of resources by design.
+amount of resources by design.
 
 When the container constructs a bean with an `@Inject` reference,
 it will first find or create the object that will be injected.  For the sake of
@@ -23,10 +23,10 @@ then the `Faculty` instance will be injected into the `Course` bean.  Finally, t
 have been created.
 
 The `CourseTest` test case drives this creation process by having `Course` injected
-into it in its `@Setup` method.  By the time our `@Test` method is invoked,
+in its `@Setup` method.  By the time our `@Test` method is invoked,
 all the real work should be done and we should be ready to go.  In the test case we do
 some basic asserts to ensure everything was constructed, all `@PostConstruct` methods
-called and everyting injected.
+were called and everyting injected.
 
 ## Faculty <small>a basic injectable pojo</small>
 


[6/9] tomee git commit: Fixed the narrative

Posted by tv...@apache.org.
Fixed the narrative


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4d1df830
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4d1df830
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4d1df830

Branch: refs/heads/master
Commit: 4d1df83058ddcc440ec3edf8c2f67246c9aa5130
Parents: c0127a2
Author: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Authored: Mon Nov 26 08:10:47 2018 -0600
Committer: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Committed: Mon Nov 26 08:10:47 2018 -0600

----------------------------------------------------------------------
 examples/cdi-request-scope/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/4d1df830/examples/cdi-request-scope/README.md
----------------------------------------------------------------------
diff --git a/examples/cdi-request-scope/README.md b/examples/cdi-request-scope/README.md
index 1b2aa49..1a05d1e 100644
--- a/examples/cdi-request-scope/README.md
+++ b/examples/cdi-request-scope/README.md
@@ -2,7 +2,7 @@ Title: CDI @RequestScoped
 
 This example show the use of `@RequestScoped` annotation for injected objects. An object
 which is defined as `@RequestScoped` is created once for every request and is shared by all the
-bean that inject it throughout a request.
+beans that inject it throughout a same request.
 
 # Example
 


[5/9] tomee git commit: Merge https://github.com/apache/tomee

Posted by tv...@apache.org.
Merge https://github.com/apache/tomee

Because my local was out of sync with origin master


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c0127a28
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c0127a28
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c0127a28

Branch: refs/heads/master
Commit: c0127a28d7d52ed7a442d266bc3f5018f5020cc8
Parents: 34673bd 4a6183a
Author: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Authored: Mon Nov 26 07:54:59 2018 -0600
Committer: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Committed: Mon Nov 26 07:54:59 2018 -0600

----------------------------------------------------------------------
 pom.xml                                                           | 2 +-
 .../main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java  | 2 +-
 .../src/main/java/org/apache/openejb/server/cxf/rs/Logs.java      | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



[3/9] tomee git commit: Fixed some text

Posted by tv...@apache.org.
Fixed some text


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0c7d0f89
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0c7d0f89
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0c7d0f89

Branch: refs/heads/master
Commit: 0c7d0f89fb8874a39501f16ff8ffd94367942e8e
Parents: e736359
Author: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Authored: Wed Nov 21 07:13:46 2018 -0600
Committer: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Committed: Wed Nov 21 07:13:46 2018 -0600

----------------------------------------------------------------------
 examples/cdi-events/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/0c7d0f89/examples/cdi-events/README.md
----------------------------------------------------------------------
diff --git a/examples/cdi-events/README.md b/examples/cdi-events/README.md
index 5e4801d..bfe62fc 100644
--- a/examples/cdi-events/README.md
+++ b/examples/cdi-events/README.md
@@ -26,7 +26,7 @@ The test itself (`EventTest`) simply verifies the dates were received.
 
 # Conclusion
 
-CDI let's implement very easily plugins through this event mecanism.
+CDI let's you implement very easily plugins through this event mecanism.
 
 If you go further and look at CDI plugin API you'll realize it is simply the same kind
 of events. CDI events is really the basis of CDI.


[2/9] tomee git commit: Corrected text

Posted by tv...@apache.org.
Corrected text


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e7363592
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e7363592
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e7363592

Branch: refs/heads/master
Commit: e7363592e900485bcffaff6654f311f334f8c71e
Parents: 372e521
Author: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Authored: Tue Nov 20 14:20:13 2018 -0600
Committer: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Committed: Tue Nov 20 14:20:13 2018 -0600

----------------------------------------------------------------------
 .../cdi-alternative-and-stereotypes/README.md   | 24 ++++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/e7363592/examples/cdi-alternative-and-stereotypes/README.md
----------------------------------------------------------------------
diff --git a/examples/cdi-alternative-and-stereotypes/README.md b/examples/cdi-alternative-and-stereotypes/README.md
index f6aecb4..e1c90a9 100644
--- a/examples/cdi-alternative-and-stereotypes/README.md
+++ b/examples/cdi-alternative-and-stereotypes/README.md
@@ -1,6 +1,6 @@
 # Introduction
 
-CDI is a revolution for Java EE world. This specification is the best one to avoid coupling between classes.
+CDI is a revolution for the Java EE world. This specification is the best one to avoid coupling between classes.
 
 This example simply aims to override bindings at runtime to simplify mocking work.
 
@@ -10,36 +10,36 @@ It uses two kind of mocks:
 
 The mock answer from CDI is called *alternative*.
 
-Annotating `@Alternative` a class will mean it will replace any implementation if there is no other implementation
+Annotating `@Alternative` a class will mean it will used as the implementation if there is no other implementation
 or if it is forced (through `META-INF/beans.xml`).
 
 # Code explanation
 ## main code
 
-We use an EJB `Jouney` to modelize a journey where the vehicle and the society can change. Here an EJB is used simply
+We use an EJB `Jouney` to modelize a journey where the vehicle and the society can change. Here an EJB is used
 because it simplifies the test. A jouney wraps the vehicle and society information.
 
-We define then two interfaces to inject it in the `Journey` EJB: `Vehicle` and `Society`.
+We define two interfaces to inject into the `Journey` EJB: `Vehicle` and `Society`.
 
 Finally we add an implementation for `Scociety` interface: `LowCostCompanie`.
 
-If we don't go further `Journey` object will not be able to be created because no `Vehicle` implementation is available.
+If we stop here, the `Journey` object will not be able to be created because there is no `Vehicle` implementation is available.
 
-Note: if we suppose we have a `Vehicle` implementation, the injected Society should be `LowCostCompanie`.
+Note: if we do have a `Vehicle` implementation, the injected Society should be `LowCostCompanie`.
 
 ## test code
 
 The goal here is to test our `Journey` EJB. So we have to provide a `Vehicle` implementation: `SuperCar`.
 
-We want to force the `Society` implementation (for any reason) by our test implementation: `AirOpenEJB`.
+We want to force the `Society` interface to be the `AirOpenEJB` implementation for our test.
 
 One solution could simply be to add `@Alternative` annotation on `AirOpenEJB` and activate it through
 the `META-INF/beans.xml` file.
 
 Here we want to write more explicit code. So we want to replace the `@Alternative` annotation by `@Mock` one.
 
-So we simply define an `@Mock` annotation for classes, resolvable at runtime which is a stereotype (`@Stereotype`)
-which replace `@Alternative`.
+So we define an `@Mock` annotation for classes, resolvable at runtime as a stereotype (`@Stereotype`)
+that replaces `@Alternative`.
 
 Here is the annotation:
 
@@ -51,8 +51,8 @@ Here is the annotation:
 
 Note: you can add more CDI annotations after `@Alternative` and it will get the behavior expected (the scope for instance).
 
-So now we have our `@Mock` annotation which is a stereotype able to replace `@Alternative` annotation
-we simply add this annotation to our mocks.
+So now we have our `@Mock` annotation which is a stereotype able to replace the `@Alternative` annotation when it 
+added to our mocks.
 
 If you run it now you'll have this exception:
 
@@ -81,7 +81,7 @@ which simply means two implementations are available for the same injection poin
 With CDI it is really easy to define annotations with a strong meaning. You can define business annotations
 or simply technical annotations to simplify your code (as we did with the mock annotation).
 
-Note: if for instance you used qualifiers to inject societies you could have put all these qualifiers on
+Note: if you used qualifiers to inject `Scociety` objects you could have put all these qualifiers on
 the mock class or defined a `@SocietyMock` annotation to be able to inject the same implementation for
 all qualifiers in your tests.
 


[4/9] tomee git commit: Some text fixed to read better

Posted by tv...@apache.org.
Some text fixed to read better


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/34673bd5
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/34673bd5
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/34673bd5

Branch: refs/heads/master
Commit: 34673bd57ae09006bcfef5e835ab52d4c612265e
Parents: 0c7d0f8
Author: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Authored: Wed Nov 21 07:14:41 2018 -0600
Committer: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Committed: Wed Nov 21 07:14:41 2018 -0600

----------------------------------------------------------------------
 examples/cdi-interceptors/README.md | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/34673bd5/examples/cdi-interceptors/README.md
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/README.md b/examples/cdi-interceptors/README.md
index 31325d8..1263915 100644
--- a/examples/cdi-interceptors/README.md
+++ b/examples/cdi-interceptors/README.md
@@ -82,24 +82,21 @@ Lets quickly put up a `beans.xml` file like the following in `src/main/resources
     </beans>
 
 
-By default, a bean archive has no enabled interceptors bound via interceptor
-bindings. An interceptor must be explicitly enabled by listing its class
+By default, a bean archive has no enabled interceptors; an interceptor must be explicitly enabled by listing its class
 in the `beans.xml`.
 
-Those lines in `beans.xml` not only "enable" the interceptors, but also define the "order of execution" of the interceptors.
-
-The order in with a method is annotated has no real significance.
+The order of the interceptor annotations has no real significance.
 Eg:
 
     @TimeRestrict
     @Log
     void cMethod(){}
 
-Here the `BookForAShowLoggingInterceptor` would be applied first and then `TimeBasedRestrictingInterceptor`
+It is the `interceptor` elements in `beans.xml` that not only "enable" the interceptors, but also define the "order of execution" of the interceptors. In this case the `BookForAShowLoggingInterceptor` would be applied first and then `TimeBasedRestrictingInterceptor`
 
-So now you know that the order is only determined by the order of definition in `beans.xml`. Interceptors which occur earlier in the list are called first.
+So now you know that the order is only determined by the order within the `interceptors` element within the `beans.xml`. The rule is simple, interceptors which occur earlier in the list are called first.
 
-Also note that a method can be marked for interception by multiple interceptors by applying multiple annotations as above.
+Also note that a method can be marked for interception using multiple interceptors by applying multiple annotations as above.
 
 This brings us to another question. In the above case there were two interceptors applied together. What if I would require about 4 such interceptors that would go along.... Having to annotate so much makes the code a little clumsy?
 


[9/9] tomee git commit: Merge branch 'master' of https://github.com/monsonhaefel/tomee

Posted by tv...@apache.org.
Merge branch 'master' of https://github.com/monsonhaefel/tomee


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/354b14a3
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/354b14a3
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/354b14a3

Branch: refs/heads/master
Commit: 354b14a3b93a5d87302713fd968d7767a288c984
Parents: e893b19 4460f83
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Mon Nov 26 10:01:28 2018 -0500
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Mon Nov 26 10:01:28 2018 -0500

----------------------------------------------------------------------
 .../cdi-alternative-and-stereotypes/README.md   | 24 ++++++++++----------
 examples/cdi-basic/README.md                    |  6 ++---
 examples/cdi-events/README.md                   |  2 +-
 examples/cdi-interceptors/README.md             | 13 ++++-------
 examples/cdi-produces-disposes/README.md        | 15 +++++++++++-
 examples/cdi-produces-disposes/README.txt       | 18 ---------------
 examples/cdi-produces-field/README.md           | 11 +++++++++
 examples/cdi-request-scope/README.md            |  2 +-
 8 files changed, 47 insertions(+), 44 deletions(-)
----------------------------------------------------------------------



[8/9] tomee git commit: Added more text to introduction explaining the producers. This text is cribbed from the cdi-produces-disposes exampmle.

Posted by tv...@apache.org.
Added more text to introduction explaining the producers.  This text is cribbed from the cdi-produces-disposes  exampmle.


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4460f837
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4460f837
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4460f837

Branch: refs/heads/master
Commit: 4460f837d044ebb9bd5cac3bb83d93d6b3fe6750
Parents: 34a3f23
Author: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Authored: Mon Nov 26 08:33:21 2018 -0600
Committer: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Committed: Mon Nov 26 08:33:21 2018 -0600

----------------------------------------------------------------------
 examples/cdi-produces-field/README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/4460f837/examples/cdi-produces-field/README.md
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-field/README.md b/examples/cdi-produces-field/README.md
index 60f0387..cbf32bc 100644
--- a/examples/cdi-produces-field/README.md
+++ b/examples/cdi-produces-field/README.md
@@ -5,6 +5,17 @@ This example shows the usage of the @Produces annotation. @Produces is a CDI mec
 a producer field can be used. A producer field can be used instead of a simple getter method. It could be used to
 inject resources, such as persistence contexts. One caveat to using producer fields over producer
  methods is that a @Disposes method cannot be used in conjunction with @Produces field.
+ 
+For the purposes of this example, the type is hard-coded to a specific value.
+A Logger implementation shall contain a list of LogHandlers. We shall have three implementations of the LogHandler interface.
+
+  * A DatabaseHandler
+  * A FileHandler
+  * A ConsoleHandler
+
+The DatabaseHandler would seemingly write the logs to a database. The FileHandler would write the same logs to a file.
+The ConsoleHandler would just print the logs to a console (Standard out). This example is just an illustration of how
+the concepts within CDI work and is not intended to provide a logging framework design/implementation.
 
 ## ConsoleHandler
 


[7/9] tomee git commit: Moved text from txt to md and deleted txt version.

Posted by tv...@apache.org.
Moved text from txt to md and deleted txt version.


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/34a3f23e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/34a3f23e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/34a3f23e

Branch: refs/heads/master
Commit: 34a3f23e2322f851a88aae5e08ae094ea69cf9f2
Parents: 4d1df83
Author: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Authored: Mon Nov 26 08:28:33 2018 -0600
Committer: Richard Monson-Haefel <Ri...@Uncommon-Design.com>
Committed: Mon Nov 26 08:28:33 2018 -0600

----------------------------------------------------------------------
 examples/cdi-produces-disposes/README.md  | 15 ++++++++++++++-
 examples/cdi-produces-disposes/README.txt | 18 ------------------
 2 files changed, 14 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/34a3f23e/examples/cdi-produces-disposes/README.md
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-disposes/README.md b/examples/cdi-produces-disposes/README.md
index 70ffb65..1d4572a 100644
--- a/examples/cdi-produces-disposes/README.md
+++ b/examples/cdi-produces-disposes/README.md
@@ -1,6 +1,19 @@
 Title: CDI Produces Disposes
 
-*Help us document this example! Click the blue pencil icon in the upper right to edit this page.*
+
+This example shows how the @Produces and @Disposes annotations work. A LogFactory creates an instance of the LogHandler
+depending on a "type" attribute. For the purposes of this example, the type is hard-coded to a specific value.
+A Logger implementation shall contain a list of LogHandlers. We shall have three implementations of the LogHandler interface.
+
+  * A DatabaseHandler
+  * A FileHandler
+  * A ConsoleHandler
+
+The DatabaseHandler would seemingly write the logs to a database. The FileHandler would write the same logs to a file.
+The ConsoleHandler would just print the logs to a console (Standard out). This example is just an illustration of how
+the concepts within CDI work and is not intended to provide a logging framework design/implementation.
+
+*Help us finish documenting this example! Click the blue pencil icon in the upper right to edit this page.*
 
 ## ConsoleHandler
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/34a3f23e/examples/cdi-produces-disposes/README.txt
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-disposes/README.txt b/examples/cdi-produces-disposes/README.txt
deleted file mode 100644
index bca92da..0000000
--- a/examples/cdi-produces-disposes/README.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-This example shows how to use the concept of CDI in a simple POJO context
-
-This functionality is often referred as dependency injection (see
-http://www.martinfowler.com/articles/injection.html), and has been recently introduced in
-Java EE 5.
-
-This example shows how the @Produces and @Disposes annotations work. A LogFactory creates an instance of the LogHandler
-depending on a "type" attribute. For the purposes of this example, the type is hard-coded to a specific value.
-A Logger implementation shall contain a list of LogHandlers. We shall have three implementations of the LogHandler interface.
-
-  * A DatabaseHandler
-  * A FileHandler
-  * A ConsoleHandler
-
-The DatabaseHandler would seemingly write the logs to a database. The FileHandler would write the same logs to a file.
-The ConsoleHandler would just print the logs to a console (Standard out). This example is just an illustration of how
-the concepts within CDI work and is not intended to provide a logging framework design/implementation.
-