You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2013/08/21 15:09:48 UTC
svn commit: r1516150 [14/16] - in /tomee/tomee/trunk: ./ arquillian/
arquillian/arquillian-common/ arquillian/arquillian-openejb-embedded-4/
arquillian/arquillian-openejb-transaction-provider/
arquillian/arquillian-tck/ arquillian/arquillian-tomee-comm...
Modified: tomee/tomee/trunk/examples/rest-jaas/src/main/tomee/conf/server.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-jaas/src/main/tomee/conf/server.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-jaas/src/main/tomee/conf/server.xml (original)
+++ tomee/tomee/trunk/examples/rest-jaas/src/main/tomee/conf/server.xml Wed Aug 21 13:09:35 2013
@@ -18,11 +18,11 @@
under the License.
-->
<Server port="8005" shutdown="SHUTDOWN">
- <Listener className="org.apache.tomee.catalina.ServerListener" />
- <Listener className="org.apache.catalina.security.SecurityListener" />
+ <Listener className="org.apache.tomee.catalina.ServerListener"/>
+ <Listener className="org.apache.catalina.security.SecurityListener"/>
<Service name="Catalina">
- <Connector port="8080" protocol="HTTP/1.1" />
+ <Connector port="8080" protocol="HTTP/1.1"/>
<Engine name="Catalina" defaultHost="localhost">
<Realm className="org.apache.catalina.realm.JAASRealm" appName="PropertiesLoginModule"
@@ -30,7 +30,7 @@
roleClassNames="org.apache.openejb.core.security.jaas.GroupPrincipal">
</Realm>
- <Host name="localhost" appBase="webapps" />
+ <Host name="localhost" appBase="webapps"/>
</Engine>
</Service>
</Server>
Modified: tomee/tomee/trunk/examples/rest-jaas/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-jaas/src/main/webapp/WEB-INF/web.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-jaas/src/main/webapp/WEB-INF/web.xml (original)
+++ tomee/tomee/trunk/examples/rest-jaas/src/main/webapp/WEB-INF/web.xml Wed Aug 21 13:09:35 2013
@@ -32,7 +32,8 @@
<url-pattern>/rest/*</url-pattern>
</web-resource-collection>
<auth-constraint>
- <role-name>*</role-name> <!-- we'll use JAAS so don't filter too much here -->
+ <role-name>*</role-name>
+ <!-- we'll use JAAS so don't filter too much here -->
</auth-constraint>
</security-constraint>
Modified: tomee/tomee/trunk/examples/rest-on-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-on-ejb/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-on-ejb/pom.xml (original)
+++ tomee/tomee/trunk/examples/rest-on-ejb/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/User.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/User.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/User.java (original)
+++ tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/User.java Wed Aug 21 13:09:35 2013
@@ -26,10 +26,11 @@ import javax.xml.bind.annotation.XmlRoot
@Entity
@NamedQueries({
- @NamedQuery(name = "user.list", query = "select u from User u")
-})
+ @NamedQuery(name = "user.list", query = "select u from User u")
+ })
@XmlRootElement(name = "user")
public class User implements Cloneable {
+
@Id
@GeneratedValue
private long id;
Modified: tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/UserService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/UserService.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/UserService.java (original)
+++ tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/UserService.java Wed Aug 21 13:09:35 2013
@@ -37,13 +37,13 @@ import java.util.List;
/**
* Outputs are copied because of the enhancement of OpenJPA.
- *
*/
@Singleton
@Lock(LockType.WRITE)
@Path("/user")
@Produces(MediaType.APPLICATION_XML)
public class UserService {
+
@PersistenceContext
private EntityManager em;
Modified: tomee/tomee/trunk/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java (original)
+++ tomee/tomee/trunk/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java Wed Aug 21 13:09:35 2013
@@ -38,6 +38,7 @@ import static junit.framework.Assert.ass
import static junit.framework.Assert.fail;
public class UserServiceTest {
+
private static Context context;
private static UserService service;
private static List<User> users = new ArrayList<User>();
@@ -65,11 +66,11 @@ public class UserServiceTest {
public void create() {
int expected = service.list(0, 100).size() + 1;
Response response = WebClient.create("http://localhost:4204/rest-on-ejb")
- .path("/user/create")
- .query("name", "dummy")
- .query("pwd", "unbreakable")
- .query("mail", "foo@bar.fr")
- .put(null);
+ .path("/user/create")
+ .query("name", "dummy")
+ .query("pwd", "unbreakable")
+ .query("mail", "foo@bar.fr")
+ .put(null);
List<User> list = service.list(0, 100);
for (User u : list) {
if (!users.contains(u)) {
@@ -93,8 +94,8 @@ public class UserServiceTest {
@Test
public void show() {
User user = WebClient.create("http://localhost:4204/rest-on-ejb")
- .path("/user/show/" + users.iterator().next().getId())
- .get(User.class);
+ .path("/user/show/" + users.iterator().next().getId())
+ .get(User.class);
assertEquals("foo", user.getFullname());
assertEquals("foopwd", user.getPassword());
assertEquals("foo@foo.com", user.getEmail());
@@ -103,24 +104,24 @@ public class UserServiceTest {
@Test
public void list() throws Exception {
String users = WebClient.create("http://localhost:4204/rest-on-ejb")
- .path("/user/list")
- .get(String.class);
+ .path("/user/list")
+ .get(String.class);
assertEquals(
- inline("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<users>" +
- " <user>" +
- " <email>foo@foo.com</email>" +
- " <fullname>foo</fullname>" +
- " <id>1</id>" +
- " <password>foopwd</password>" +
- " </user>" +
- " <user>" +
- " <email>bar@bar.com</email>" +
- " <fullname>bar</fullname>" +
- " <id>2</id>" +
- " <password>barpwd</password>" +
- " </user>" +
- "</users>"), inline(users));
+ inline("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+ "<users>" +
+ " <user>" +
+ " <email>foo@foo.com</email>" +
+ " <fullname>foo</fullname>" +
+ " <id>1</id>" +
+ " <password>foopwd</password>" +
+ " </user>" +
+ " <user>" +
+ " <email>bar@bar.com</email>" +
+ " <fullname>bar</fullname>" +
+ " <id>2</id>" +
+ " <password>barpwd</password>" +
+ " </user>" +
+ "</users>"), inline(users));
}
private static String inline(String s) {
@@ -132,11 +133,11 @@ public class UserServiceTest {
public void update() throws Exception {
User created = service.create("name", "pwd", "mail");
Response response = WebClient.create("http://localhost:4204/rest-on-ejb")
- .path("/user/update/" + created.getId())
- .query("name", "corrected")
- .query("pwd", "userpwd")
- .query("mail", "it@is.ok")
- .post(null);
+ .path("/user/update/" + created.getId())
+ .query("name", "corrected")
+ .query("pwd", "userpwd")
+ .query("mail", "it@is.ok")
+ .post(null);
JAXBContext ctx = JAXBContext.newInstance(User.class);
Unmarshaller unmarshaller = ctx.createUnmarshaller();
Propchange: tomee/tomee/trunk/examples/rest-xml-json/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/rest-xml-json/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-xml-json/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-xml-json/pom.xml (original)
+++ tomee/tomee/trunk/examples/rest-xml-json/pom.xml Wed Aug 21 13:09:35 2013
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
Modified: tomee/tomee/trunk/examples/rest-xml-json/src/main/java/org/superbiz/rest/GreetingService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-xml-json/src/main/java/org/superbiz/rest/GreetingService.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-xml-json/src/main/java/org/superbiz/rest/GreetingService.java (original)
+++ tomee/tomee/trunk/examples/rest-xml-json/src/main/java/org/superbiz/rest/GreetingService.java Wed Aug 21 13:09:35 2013
@@ -24,9 +24,10 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
@Path("/greeting")
-@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+@Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public class GreetingService {
+
@GET
public Response message() {
return new Response("Hi REST!");
Modified: tomee/tomee/trunk/examples/rest-xml-json/src/main/java/org/superbiz/rest/Request.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-xml-json/src/main/java/org/superbiz/rest/Request.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-xml-json/src/main/java/org/superbiz/rest/Request.java (original)
+++ tomee/tomee/trunk/examples/rest-xml-json/src/main/java/org/superbiz/rest/Request.java Wed Aug 21 13:09:35 2013
@@ -20,6 +20,7 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement
public class Request {
+
private String value;
public Request() {
Modified: tomee/tomee/trunk/examples/rest-xml-json/src/main/java/org/superbiz/rest/Response.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-xml-json/src/main/java/org/superbiz/rest/Response.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-xml-json/src/main/java/org/superbiz/rest/Response.java (original)
+++ tomee/tomee/trunk/examples/rest-xml-json/src/main/java/org/superbiz/rest/Response.java Wed Aug 21 13:09:35 2013
@@ -20,6 +20,7 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement
public class Response {
+
private String value;
public Response() {
Modified: tomee/tomee/trunk/examples/rest-xml-json/src/test/java/org/superbiz/rest/GreetingServiceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-xml-json/src/test/java/org/superbiz/rest/GreetingServiceTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-xml-json/src/test/java/org/superbiz/rest/GreetingServiceTest.java (original)
+++ tomee/tomee/trunk/examples/rest-xml-json/src/test/java/org/superbiz/rest/GreetingServiceTest.java Wed Aug 21 13:09:35 2013
@@ -33,6 +33,7 @@ import static org.junit.Assert.assertEqu
@EnableServices(value = "jaxrs", httpDebug = true)
@RunWith(ApplicationComposer.class)
public class GreetingServiceTest {
+
@Module
@Classes(GreetingService.class)
public WebApp app() {
@@ -42,32 +43,32 @@ public class GreetingServiceTest {
@Test
public void getXml() throws IOException {
final String message = WebClient.create("http://localhost:4204").path("/test/greeting/")
- .accept(MediaType.APPLICATION_XML_TYPE)
- .get(Response.class).getValue();
+ .accept(MediaType.APPLICATION_XML_TYPE)
+ .get(Response.class).getValue();
assertEquals("Hi REST!", message);
}
@Test
public void postXml() throws IOException {
final String message = WebClient.create("http://localhost:4204").path("/test/greeting/")
- .accept(MediaType.APPLICATION_XML_TYPE)
- .post(new Request("Hi REST!"), Response.class).getValue();
+ .accept(MediaType.APPLICATION_XML_TYPE)
+ .post(new Request("Hi REST!"), Response.class).getValue();
assertEquals("hi rest!", message);
}
@Test
public void getJson() throws IOException {
final String message = WebClient.create("http://localhost:4204").path("/test/greeting/")
- .accept(MediaType.APPLICATION_JSON_TYPE)
- .get(Response.class).getValue();
+ .accept(MediaType.APPLICATION_JSON_TYPE)
+ .get(Response.class).getValue();
assertEquals("Hi REST!", message);
}
@Test
public void postJson() throws IOException {
final String message = WebClient.create("http://localhost:4204").path("/test/greeting/")
- .accept(MediaType.APPLICATION_JSON_TYPE)
- .post(new Request("Hi REST!"), Response.class).getValue();
+ .accept(MediaType.APPLICATION_JSON_TYPE)
+ .post(new Request("Hi REST!"), Response.class).getValue();
assertEquals("hi rest!", message);
}
}
Propchange: tomee/tomee/trunk/examples/scala-basic/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/scala-basic/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/scala-basic/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/scala-basic/pom.xml (original)
+++ tomee/tomee/trunk/examples/scala-basic/pom.xml Wed Aug 21 13:09:35 2013
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
Modified: tomee/tomee/trunk/examples/scala-basic/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/scala-basic/src/main/resources/META-INF/beans.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/scala-basic/src/main/resources/META-INF/beans.xml (original)
+++ tomee/tomee/trunk/examples/scala-basic/src/main/resources/META-INF/beans.xml Wed Aug 21 13:09:35 2013
@@ -15,4 +15,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans />
+<beans/>
Propchange: tomee/tomee/trunk/examples/schedule-events/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/schedule-events/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-events/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-events/pom.xml (original)
+++ tomee/tomee/trunk/examples/schedule-events/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/schedule-events/src/test/java/org/superbiz/schedule/events/SchedulerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-events/src/test/java/org/superbiz/schedule/events/SchedulerTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-events/src/test/java/org/superbiz/schedule/events/SchedulerTest.java (original)
+++ tomee/tomee/trunk/examples/schedule-events/src/test/java/org/superbiz/schedule/events/SchedulerTest.java Wed Aug 21 13:09:35 2013
@@ -42,16 +42,15 @@ public class SchedulerTest {
public void test() throws Exception {
final ScheduleExpression schedule = new ScheduleExpression()
- .hour("*")
- .minute("*")
- .second("*/5");
+ .hour("*")
+ .minute("*")
+ .second("*/5");
scheduler.scheduleEvent(schedule, new TestEvent("five"));
Assert.assertTrue(events.await(1, TimeUnit.MINUTES));
}
-
@AccessTimeout(value = 1, unit = TimeUnit.MINUTES)
public void observe(@Observes TestEvent event) {
if ("five".equals(event.getMessage())) {
@@ -60,6 +59,7 @@ public class SchedulerTest {
}
public static class TestEvent {
+
private final String message;
public TestEvent(String message) {
Modified: tomee/tomee/trunk/examples/schedule-events/src/test/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-events/src/test/resources/META-INF/beans.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-events/src/test/resources/META-INF/beans.xml (original)
+++ tomee/tomee/trunk/examples/schedule-events/src/test/resources/META-INF/beans.xml Wed Aug 21 13:09:35 2013
@@ -19,4 +19,4 @@
-->
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd" />
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"/>
Modified: tomee/tomee/trunk/examples/schedule-expression/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-expression/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-expression/pom.xml (original)
+++ tomee/tomee/trunk/examples/schedule-expression/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/schedule-methods-meta/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-methods-meta/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-methods-meta/pom.xml (original)
+++ tomee/tomee/trunk/examples/schedule-methods-meta/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/BiAnnually.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/BiAnnually.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/BiAnnually.java (original)
+++ tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/BiAnnually.java Wed Aug 21 13:09:35 2013
@@ -27,6 +27,7 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface BiAnnually {
+
public static interface $ {
@BiAnnually
Modified: tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/BiMonthly.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/BiMonthly.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/BiMonthly.java (original)
+++ tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/BiMonthly.java Wed Aug 21 13:09:35 2013
@@ -27,6 +27,7 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface BiMonthly {
+
public static interface $ {
@BiMonthly
Modified: tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Daily.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Daily.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Daily.java (original)
+++ tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Daily.java Wed Aug 21 13:09:35 2013
@@ -27,6 +27,7 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface Daily {
+
public static interface $ {
@Daily
Modified: tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/HarvestTime.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/HarvestTime.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/HarvestTime.java (original)
+++ tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/HarvestTime.java Wed Aug 21 13:09:35 2013
@@ -28,13 +28,14 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface HarvestTime {
+
public static interface $ {
@HarvestTime
@Schedules({
- @Schedule(month = "9", dayOfMonth = "20-Last", minute = "0", hour = "8"),
- @Schedule(month = "10", dayOfMonth = "1-10", minute = "0", hour = "8")
- })
+ @Schedule(month = "9", dayOfMonth = "20-Last", minute = "0", hour = "8"),
+ @Schedule(month = "10", dayOfMonth = "1-10", minute = "0", hour = "8")
+ })
public void method();
}
}
\ No newline at end of file
Modified: tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Hourly.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Hourly.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Hourly.java (original)
+++ tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Hourly.java Wed Aug 21 13:09:35 2013
@@ -27,6 +27,7 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface Hourly {
+
public static interface $ {
@Hourly
Modified: tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Metatype.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Metatype.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Metatype.java (original)
+++ tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Metatype.java Wed Aug 21 13:09:35 2013
@@ -25,4 +25,5 @@ import java.lang.annotation.Target;
@Target(ElementType.ANNOTATION_TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface Metatype {
+
}
Modified: tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Organic.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Organic.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Organic.java (original)
+++ tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Organic.java Wed Aug 21 13:09:35 2013
@@ -31,4 +31,5 @@ import java.lang.annotation.Target;
@Singleton
@Lock(LockType.READ)
public @interface Organic {
+
}
Modified: tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/PlantingTime.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/PlantingTime.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/PlantingTime.java (original)
+++ tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/PlantingTime.java Wed Aug 21 13:09:35 2013
@@ -28,13 +28,14 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface PlantingTime {
+
public static interface $ {
@PlantingTime
@Schedules({
- @Schedule(month = "5", dayOfMonth = "20-Last", minute = "0", hour = "8"),
- @Schedule(month = "6", dayOfMonth = "1-10", minute = "0", hour = "8")
- })
+ @Schedule(month = "5", dayOfMonth = "20-Last", minute = "0", hour = "8"),
+ @Schedule(month = "6", dayOfMonth = "1-10", minute = "0", hour = "8")
+ })
public void method();
}
}
Modified: tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Secondly.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Secondly.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Secondly.java (original)
+++ tomee/tomee/trunk/examples/schedule-methods-meta/src/main/java/org/superbiz/corn/meta/api/Secondly.java Wed Aug 21 13:09:35 2013
@@ -27,6 +27,7 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface Secondly {
+
public static interface $ {
@Secondly
Modified: tomee/tomee/trunk/examples/schedule-methods/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-methods/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-methods/pom.xml (original)
+++ tomee/tomee/trunk/examples/schedule-methods/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/schedule-methods/src/main/java/org/superbiz/corn/FarmerBrown.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/schedule-methods/src/main/java/org/superbiz/corn/FarmerBrown.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/schedule-methods/src/main/java/org/superbiz/corn/FarmerBrown.java (original)
+++ tomee/tomee/trunk/examples/schedule-methods/src/main/java/org/superbiz/corn/FarmerBrown.java Wed Aug 21 13:09:35 2013
@@ -35,17 +35,17 @@ public class FarmerBrown {
private final AtomicInteger checks = new AtomicInteger();
@Schedules({
- @Schedule(month = "5", dayOfMonth = "20-Last", minute = "0", hour = "8"),
- @Schedule(month = "6", dayOfMonth = "1-10", minute = "0", hour = "8")
- })
+ @Schedule(month = "5", dayOfMonth = "20-Last", minute = "0", hour = "8"),
+ @Schedule(month = "6", dayOfMonth = "1-10", minute = "0", hour = "8")
+ })
private void plantTheCorn() {
// Dig out the planter!!!
}
@Schedules({
- @Schedule(month = "9", dayOfMonth = "20-Last", minute = "0", hour = "8"),
- @Schedule(month = "10", dayOfMonth = "1-10", minute = "0", hour = "8")
- })
+ @Schedule(month = "9", dayOfMonth = "20-Last", minute = "0", hour = "8"),
+ @Schedule(month = "10", dayOfMonth = "1-10", minute = "0", hour = "8")
+ })
private void harvestTheCorn() {
// Dig out the combine!!!
}
Propchange: tomee/tomee/trunk/examples/server-events/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/server-events/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/server-events/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/server-events/pom.xml (original)
+++ tomee/tomee/trunk/examples/server-events/pom.xml Wed Aug 21 13:09:35 2013
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<!--
Modified: tomee/tomee/trunk/examples/server-events/src/main/java/org/superbiz/event/AutoDiscoveredListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/server-events/src/main/java/org/superbiz/event/AutoDiscoveredListener.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/server-events/src/main/java/org/superbiz/event/AutoDiscoveredListener.java (original)
+++ tomee/tomee/trunk/examples/server-events/src/main/java/org/superbiz/event/AutoDiscoveredListener.java Wed Aug 21 13:09:35 2013
@@ -20,6 +20,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.observer.Observes;
public class AutoDiscoveredListener {
+
private static String appName;
public void appCreated(@Observes final AssemblerAfterApplicationCreated appCreatedEvent) {
Modified: tomee/tomee/trunk/examples/server-events/src/main/java/org/superbiz/event/MyListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/server-events/src/main/java/org/superbiz/event/MyListener.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/server-events/src/main/java/org/superbiz/event/MyListener.java (original)
+++ tomee/tomee/trunk/examples/server-events/src/main/java/org/superbiz/event/MyListener.java Wed Aug 21 13:09:35 2013
@@ -22,11 +22,12 @@ import java.util.logging.Logger;
/**
* registered as service in openejb.xml, tomee.xml, resources.xml or openejb system properties:
- *
+ * <p/>
* listener = new://Service?class-name=org.superbiz.event.MyListener
* listener.logAllEvent = true
*/
public class MyListener {
+
private static final Logger LOGGER = Logger.getLogger(MyListener.class.getName());
private static boolean logAllEvent = false; // static for testing
Modified: tomee/tomee/trunk/examples/server-events/src/test/java/org/superbiz/event/ListenerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/server-events/src/test/java/org/superbiz/event/ListenerTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/server-events/src/test/java/org/superbiz/event/ListenerTest.java (original)
+++ tomee/tomee/trunk/examples/server-events/src/test/java/org/superbiz/event/ListenerTest.java Wed Aug 21 13:09:35 2013
@@ -30,11 +30,12 @@ import static org.junit.Assert.assertTru
@RunWith(Arquillian.class)
public class ListenerTest {
+
@Deployment
public static JavaArchive jar() {
return ShrinkWrap.create(JavaArchive.class, "listener-test.jar")
- .addClasses(MyListener.class, AutoDiscoveredListener.class)
- .addAsManifestResource(new StringAsset(AutoDiscoveredListener.class.getName()), ArchivePaths.create("org.apache.openejb.extension"));
+ .addClasses(MyListener.class, AutoDiscoveredListener.class)
+ .addAsManifestResource(new StringAsset(AutoDiscoveredListener.class.getName()), ArchivePaths.create("org.apache.openejb.extension"));
}
@Test
Modified: tomee/tomee/trunk/examples/server-events/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/server-events/src/test/resources/arquillian.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/server-events/src/test/resources/arquillian.xml (original)
+++ tomee/tomee/trunk/examples/server-events/src/test/resources/arquillian.xml Wed Aug 21 13:09:35 2013
@@ -18,7 +18,7 @@
-->
<arquillian
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+ >
<container qualifier="openejb" default="true">
<configuration>
<property name="properties">
Propchange: tomee/tomee/trunk/examples/simple-cdi-interceptor/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1,3 +1,4 @@
.classpath
.project
target
+*.iml
Modified: tomee/tomee/trunk/examples/simple-cdi-interceptor/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-cdi-interceptor/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
Binary files - no diff available.
Modified: tomee/tomee/trunk/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/beans/BookShow.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/beans/BookShow.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/beans/BookShow.java (original)
+++ tomee/tomee/trunk/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/beans/BookShow.java Wed Aug 21 13:09:35 2013
@@ -26,6 +26,7 @@ import java.util.List;
@Log
@Stateful
public class BookShow implements Serializable {
+
private static final long serialVersionUID = 6350400892234496909L;
public List<String> getMoviesList() {
Modified: tomee/tomee/trunk/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/Log.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/Log.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/Log.java (original)
+++ tomee/tomee/trunk/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/Log.java Wed Aug 21 13:09:35 2013
@@ -28,4 +28,5 @@ import static java.lang.annotation.Reten
@Target({TYPE, METHOD})
@Retention(RUNTIME)
public @interface Log {
+
}
Modified: tomee/tomee/trunk/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptors/LoggingInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptors/LoggingInterceptor.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptors/LoggingInterceptor.java (original)
+++ tomee/tomee/trunk/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptors/LoggingInterceptor.java Wed Aug 21 13:09:35 2013
@@ -42,6 +42,7 @@ import java.io.Serializable;
@Interceptor
@Log
public class LoggingInterceptor implements Serializable {
+
private static final long serialVersionUID = 8139854519874743530L;
@AroundInvoke
Modified: tomee/tomee/trunk/examples/simple-cdi-interceptor/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookShowTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-cdi-interceptor/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookShowTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-cdi-interceptor/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookShowTest.java (original)
+++ tomee/tomee/trunk/examples/simple-cdi-interceptor/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookShowTest.java Wed Aug 21 13:09:35 2013
@@ -23,6 +23,7 @@ import javax.ejb.EJB;
import javax.ejb.embeddable.EJBContainer;
public class BookShowTest extends TestCase {
+
@EJB
private BookShow bookForAShowBean;
EJBContainer ejbContainer;
Modified: tomee/tomee/trunk/examples/simple-cmp2/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-cmp2/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-cmp2/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-cmp2/pom.xml Wed Aug 21 13:09:35 2013
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
Modified: tomee/tomee/trunk/examples/simple-cmp2/src/main/java/org/superbiz/cmp2/Movie.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-cmp2/src/main/java/org/superbiz/cmp2/Movie.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-cmp2/src/main/java/org/superbiz/cmp2/Movie.java (original)
+++ tomee/tomee/trunk/examples/simple-cmp2/src/main/java/org/superbiz/cmp2/Movie.java Wed Aug 21 13:09:35 2013
@@ -20,6 +20,7 @@ package org.superbiz.cmp2;
* @version $Revision$ $Date$
*/
public interface Movie extends javax.ejb.EJBLocalObject {
+
java.lang.Integer getId();
void setId(java.lang.Integer id);
Modified: tomee/tomee/trunk/examples/simple-cmp2/src/main/java/org/superbiz/cmp2/MovieBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-cmp2/src/main/java/org/superbiz/cmp2/MovieBean.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-cmp2/src/main/java/org/superbiz/cmp2/MovieBean.java (original)
+++ tomee/tomee/trunk/examples/simple-cmp2/src/main/java/org/superbiz/cmp2/MovieBean.java Wed Aug 21 13:09:35 2013
@@ -46,5 +46,4 @@ public abstract class MovieBean implemen
public abstract void setYear(int year);
-
}
Modified: tomee/tomee/trunk/examples/simple-cmp2/src/main/java/org/superbiz/cmp2/Movies.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-cmp2/src/main/java/org/superbiz/cmp2/Movies.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-cmp2/src/main/java/org/superbiz/cmp2/Movies.java (original)
+++ tomee/tomee/trunk/examples/simple-cmp2/src/main/java/org/superbiz/cmp2/Movies.java Wed Aug 21 13:09:35 2013
@@ -24,6 +24,7 @@ import java.util.Collection;
* @version $Revision$ $Date$
*/
interface Movies extends javax.ejb.EJBLocalHome {
+
Movie create(String director, String title, int year) throws CreateException;
Movie findByPrimaryKey(Integer primarykey) throws FinderException;
Propchange: tomee/tomee/trunk/examples/simple-mdb-and-cdi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/simple-mdb-and-cdi/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-mdb-and-cdi/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-mdb-and-cdi/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-mdb-and-cdi/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-mdb-and-cdi/src/main/java/org/superbiz/mdb/ChatBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-mdb-and-cdi/src/main/java/org/superbiz/mdb/ChatBean.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-mdb-and-cdi/src/main/java/org/superbiz/mdb/ChatBean.java (original)
+++ tomee/tomee/trunk/examples/simple-mdb-and-cdi/src/main/java/org/superbiz/mdb/ChatBean.java Wed Aug 21 13:09:35 2013
@@ -81,8 +81,12 @@ public class ChatBean implements Message
producer.send(message);
} finally {
// Clean up
- if (session != null) session.close();
- if (connection != null) connection.close();
+ if (session != null) {
+ session.close();
+ }
+ if (connection != null) {
+ connection.close();
+ }
}
}
}
Modified: tomee/tomee/trunk/examples/simple-mdb-and-cdi/src/main/java/org/superbiz/mdb/ChatRespondCreator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-mdb-and-cdi/src/main/java/org/superbiz/mdb/ChatRespondCreator.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-mdb-and-cdi/src/main/java/org/superbiz/mdb/ChatRespondCreator.java (original)
+++ tomee/tomee/trunk/examples/simple-mdb-and-cdi/src/main/java/org/superbiz/mdb/ChatRespondCreator.java Wed Aug 21 13:09:35 2013
@@ -18,6 +18,7 @@
package org.superbiz.mdb;
public class ChatRespondCreator {
+
public String respond(String question) {
if ("Hello World!".equals(question)) {
return "Hello, Test Case!";
Modified: tomee/tomee/trunk/examples/simple-mdb-and-cdi/src/test/java/org/superbiz/mdb/ChatBeanTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-mdb-and-cdi/src/test/java/org/superbiz/mdb/ChatBeanTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-mdb-and-cdi/src/test/java/org/superbiz/mdb/ChatBeanTest.java (original)
+++ tomee/tomee/trunk/examples/simple-mdb-and-cdi/src/test/java/org/superbiz/mdb/ChatBeanTest.java Wed Aug 21 13:09:35 2013
@@ -44,7 +44,6 @@ public class ChatBeanTest extends TestCa
public void test() throws Exception {
EJBContainer.createEJBContainer().getContext().bind("inject", this);
-
final Connection connection = connectionFactory.createConnection();
connection.start();
@@ -55,17 +54,14 @@ public class ChatBeanTest extends TestCa
final MessageConsumer answers = session.createConsumer(answerQueue);
-
sendText("Hello World!", questions, session);
assertEquals("Hello, Test Case!", receiveText(answers));
-
sendText("How are you?", questions, session);
assertEquals("I'm doing well.", receiveText(answers));
-
sendText("Still spinning?", questions, session);
assertEquals("Once every day, as usual.", receiveText(answers));
Modified: tomee/tomee/trunk/examples/simple-mdb-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-mdb-with-descriptor/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-mdb-with-descriptor/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-mdb-with-descriptor/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-mdb-with-descriptor/src/main/java/org/superbiz/mdbdesc/ChatBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-mdb-with-descriptor/src/main/java/org/superbiz/mdbdesc/ChatBean.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-mdb-with-descriptor/src/main/java/org/superbiz/mdbdesc/ChatBean.java (original)
+++ tomee/tomee/trunk/examples/simple-mdb-with-descriptor/src/main/java/org/superbiz/mdbdesc/ChatBean.java Wed Aug 21 13:09:35 2013
@@ -81,8 +81,12 @@ public class ChatBean implements Message
producer.send(message);
} finally {
// Clean up
- if (session != null) session.close();
- if (connection != null) connection.close();
+ if (session != null) {
+ session.close();
+ }
+ if (connection != null) {
+ connection.close();
+ }
}
}
}
Modified: tomee/tomee/trunk/examples/simple-mdb-with-descriptor/src/test/java/org/superbiz/mdbdesc/ChatBeanTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-mdb-with-descriptor/src/test/java/org/superbiz/mdbdesc/ChatBeanTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-mdb-with-descriptor/src/test/java/org/superbiz/mdbdesc/ChatBeanTest.java (original)
+++ tomee/tomee/trunk/examples/simple-mdb-with-descriptor/src/test/java/org/superbiz/mdbdesc/ChatBeanTest.java Wed Aug 21 13:09:35 2013
@@ -55,17 +55,14 @@ public class ChatBeanTest extends TestCa
final MessageConsumer answers = session.createConsumer(answerQueue);
-
sendText("Hello World!", questions, session);
assertEquals("Hello, Test Case!", receiveText(answers));
-
sendText("How are you?", questions, session);
assertEquals("I'm doing well.", receiveText(answers));
-
sendText("Still spinning?", questions, session);
assertEquals("Once every day, as usual.", receiveText(answers));
Modified: tomee/tomee/trunk/examples/simple-mdb/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-mdb/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-mdb/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-mdb/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-mdb/src/main/java/org/superbiz/mdb/ChatBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-mdb/src/main/java/org/superbiz/mdb/ChatBean.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-mdb/src/main/java/org/superbiz/mdb/ChatBean.java (original)
+++ tomee/tomee/trunk/examples/simple-mdb/src/main/java/org/superbiz/mdb/ChatBean.java Wed Aug 21 13:09:35 2013
@@ -86,8 +86,12 @@ public class ChatBean implements Message
producer.send(message);
} finally {
// Clean up
- if (session != null) session.close();
- if (connection != null) connection.close();
+ if (session != null) {
+ session.close();
+ }
+ if (connection != null) {
+ connection.close();
+ }
}
}
}
Modified: tomee/tomee/trunk/examples/simple-mdb/src/test/java/org/superbiz/mdb/ChatBeanTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-mdb/src/test/java/org/superbiz/mdb/ChatBeanTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-mdb/src/test/java/org/superbiz/mdb/ChatBeanTest.java (original)
+++ tomee/tomee/trunk/examples/simple-mdb/src/test/java/org/superbiz/mdb/ChatBeanTest.java Wed Aug 21 13:09:35 2013
@@ -44,7 +44,6 @@ public class ChatBeanTest extends TestCa
public void test() throws Exception {
EJBContainer.createEJBContainer().getContext().bind("inject", this);
-
final Connection connection = connectionFactory.createConnection();
connection.start();
@@ -55,17 +54,14 @@ public class ChatBeanTest extends TestCa
final MessageConsumer answers = session.createConsumer(answerQueue);
-
sendText("Hello World!", questions, session);
assertEquals("Hello, Test Case!", receiveText(answers));
-
sendText("How are you?", questions, session);
assertEquals("I'm doing well.", receiveText(answers));
-
sendText("Still spinning?", questions, session);
assertEquals("Once every day, as usual.", receiveText(answers));
Propchange: tomee/tomee/trunk/examples/simple-osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -0,0 +1 @@
+*.iml
Modified: tomee/tomee/trunk/examples/simple-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-osgi/pom.xml Wed Aug 21 13:09:35 2013
@@ -43,8 +43,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -56,7 +61,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.3.7</version>
<extensions>true</extensions>
</plugin>
</plugins>
@@ -82,7 +87,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Propchange: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-api/src/main/java/org/superbiz/osgi/calculator/CalculatorLocal.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/simple-osgi-api/src/main/java/org/superbiz/osgi/calculator/CalculatorLocal.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/simple-osgi-api/src/main/java/org/superbiz/osgi/calculator/CalculatorLocal.java (original)
+++ tomee/tomee/trunk/examples/simple-osgi/simple-osgi-api/src/main/java/org/superbiz/osgi/calculator/CalculatorLocal.java Wed Aug 21 13:09:35 2013
@@ -20,6 +20,7 @@ import javax.ejb.Local;
@Local
public interface CalculatorLocal {
+
int add(int a, int b);
int subtract(int a, int b);
Modified: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-api/src/main/java/org/superbiz/osgi/calculator/CalculatorRemote.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/simple-osgi-api/src/main/java/org/superbiz/osgi/calculator/CalculatorRemote.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/simple-osgi-api/src/main/java/org/superbiz/osgi/calculator/CalculatorRemote.java (original)
+++ tomee/tomee/trunk/examples/simple-osgi/simple-osgi-api/src/main/java/org/superbiz/osgi/calculator/CalculatorRemote.java Wed Aug 21 13:09:35 2013
@@ -20,6 +20,7 @@ import javax.ejb.Remote;
@Remote
public interface CalculatorRemote {
+
int add(int a, int b);
int subtract(int a, int b);
Propchange: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-camel-client/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Propchange: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml Wed Aug 21 13:09:35 2013
@@ -45,7 +45,7 @@
<plugin> <!-- needed otherwise it will not work at runtime -->
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.2.0</version>
+ <version>2.2.1</version>
<configuration>
<includes>org/superbiz/osgi/moviefun/Movie.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.2.0</version>
+ <version>2.2.1</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Bootstrap.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Bootstrap.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Bootstrap.java (original)
+++ tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Bootstrap.java Wed Aug 21 13:09:35 2013
@@ -25,6 +25,7 @@ import javax.ejb.Startup;
@Singleton
@Startup
public class Bootstrap {
+
@EJB
private Movies movies;
Modified: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Movie.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Movie.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Movie.java (original)
+++ tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Movie.java Wed Aug 21 13:09:35 2013
@@ -22,6 +22,7 @@ import javax.persistence.Id;
@Entity
public class Movie {
+
@Id
@GeneratedValue
private long id;
@@ -66,5 +67,4 @@ public class Movie {
this.year = year;
}
-
}
Propchange: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-local-lookup-client/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-local-lookup-client/src/main/java/org/superbiz/calculator/lookupclient/SingletonCalculatorClient.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/simple-osgi-local-lookup-client/src/main/java/org/superbiz/calculator/lookupclient/SingletonCalculatorClient.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/simple-osgi-local-lookup-client/src/main/java/org/superbiz/calculator/lookupclient/SingletonCalculatorClient.java (original)
+++ tomee/tomee/trunk/examples/simple-osgi/simple-osgi-local-lookup-client/src/main/java/org/superbiz/calculator/lookupclient/SingletonCalculatorClient.java Wed Aug 21 13:09:35 2013
@@ -31,6 +31,7 @@ import java.util.Properties;
@Singleton
@Startup
public class SingletonCalculatorClient {
+
@EJB
private CalculatorLocal calculator;
Propchange: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-remote-client/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-remote-client/src/main/java/org/superbiz/calculator/client/ClientUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/simple-osgi-remote-client/src/main/java/org/superbiz/calculator/client/ClientUtil.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/simple-osgi-remote-client/src/main/java/org/superbiz/calculator/client/ClientUtil.java (original)
+++ tomee/tomee/trunk/examples/simple-osgi/simple-osgi-remote-client/src/main/java/org/superbiz/calculator/client/ClientUtil.java Wed Aug 21 13:09:35 2013
@@ -25,6 +25,7 @@ import javax.naming.InitialContext;
import java.util.Properties;
public final class ClientUtil {
+
private ClientUtil() {
// no-op
}
Modified: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-remote-client/src/main/java/org/superbiz/calculator/client/RemoteClientActivator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/simple-osgi-remote-client/src/main/java/org/superbiz/calculator/client/RemoteClientActivator.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/simple-osgi-remote-client/src/main/java/org/superbiz/calculator/client/RemoteClientActivator.java (original)
+++ tomee/tomee/trunk/examples/simple-osgi/simple-osgi-remote-client/src/main/java/org/superbiz/calculator/client/RemoteClientActivator.java Wed Aug 21 13:09:35 2013
@@ -17,11 +17,11 @@
package org.superbiz.calculator.client;
-
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
public class RemoteClientActivator implements BundleActivator {
+
@Override
public void start(BundleContext bundleContext) throws Exception {
final ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
Modified: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-remote-client/src/main/java/org/superbiz/calculator/client/RemoteClientMain.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/simple-osgi-remote-client/src/main/java/org/superbiz/calculator/client/RemoteClientMain.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/simple-osgi-remote-client/src/main/java/org/superbiz/calculator/client/RemoteClientMain.java (original)
+++ tomee/tomee/trunk/examples/simple-osgi/simple-osgi-remote-client/src/main/java/org/superbiz/calculator/client/RemoteClientMain.java Wed Aug 21 13:09:35 2013
@@ -18,6 +18,7 @@
package org.superbiz.calculator.client;
public final class RemoteClientMain {
+
private RemoteClientMain() {
// no-op
}
Propchange: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-service-injection/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-service-injection/src/main/java/org/superbiz/osgi/injection/service/Injected.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/simple-osgi-service-injection/src/main/java/org/superbiz/osgi/injection/service/Injected.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/simple-osgi-service-injection/src/main/java/org/superbiz/osgi/injection/service/Injected.java (original)
+++ tomee/tomee/trunk/examples/simple-osgi/simple-osgi-service-injection/src/main/java/org/superbiz/osgi/injection/service/Injected.java Wed Aug 21 13:09:35 2013
@@ -27,6 +27,7 @@ import javax.inject.Inject;
@Singleton
@Startup
public class Injected {
+
@Inject
private StartLevel sl;
Propchange: tomee/tomee/trunk/examples/simple-osgi/standard-ejbd-server/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/simple-osgi/standard-ejbd-server/src/main/java/org/superbiz/StandardEjbdServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/standard-ejbd-server/src/main/java/org/superbiz/StandardEjbdServer.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/standard-ejbd-server/src/main/java/org/superbiz/StandardEjbdServer.java (original)
+++ tomee/tomee/trunk/examples/simple-osgi/standard-ejbd-server/src/main/java/org/superbiz/StandardEjbdServer.java Wed Aug 21 13:09:35 2013
@@ -26,6 +26,7 @@ import java.util.Properties;
import java.util.concurrent.CountDownLatch;
public final class StandardEjbdServer {
+
private StandardEjbdServer() {
// no-op
}
Propchange: tomee/tomee/trunk/examples/simple-rest/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/simple-rest/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-rest/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-rest/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-rest/pom.xml Wed Aug 21 13:09:35 2013
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
Modified: tomee/tomee/trunk/examples/simple-rest/src/main/java/org/superbiz/rest/GreetingService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-rest/src/main/java/org/superbiz/rest/GreetingService.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-rest/src/main/java/org/superbiz/rest/GreetingService.java (original)
+++ tomee/tomee/trunk/examples/simple-rest/src/main/java/org/superbiz/rest/GreetingService.java Wed Aug 21 13:09:35 2013
@@ -22,6 +22,7 @@ import javax.ws.rs.Path;
@Path("/greeting")
public class GreetingService {
+
@GET
public String message() {
return "Hi REST!";
Modified: tomee/tomee/trunk/examples/simple-rest/src/test/java/org/superbiz/rest/GreetingServiceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-rest/src/test/java/org/superbiz/rest/GreetingServiceTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-rest/src/test/java/org/superbiz/rest/GreetingServiceTest.java (original)
+++ tomee/tomee/trunk/examples/simple-rest/src/test/java/org/superbiz/rest/GreetingServiceTest.java Wed Aug 21 13:09:35 2013
@@ -32,6 +32,7 @@ import static org.junit.Assert.assertEqu
@EnableServices(value = "jaxrs")
@RunWith(ApplicationComposer.class)
public class GreetingServiceTest {
+
@Module
@Classes(GreetingService.class)
public WebApp app() {
Modified: tomee/tomee/trunk/examples/simple-singleton/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-singleton/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-singleton/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-singleton/pom.xml Wed Aug 21 13:09:35 2013
@@ -27,7 +27,7 @@
<version>1.1.0-SNAPSHOT</version>
<name>OpenEJB :: Examples :: Simple Singleton</name>
-<properties>
+ <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -36,7 +36,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-5 </version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryTest.java (original)
+++ tomee/tomee/trunk/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryTest.java Wed Aug 21 13:09:35 2013
@@ -16,8 +16,8 @@
*/
package org.superbiz.registry;
-import org.junit.Assert;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Test;
import javax.ejb.embeddable.EJBContainer;
@@ -59,10 +59,10 @@ public class ComponentRegistryTest {
Collection<?> collection = one.getComponents();
System.out.println(collection);
- Assert.assertEquals("Reference 'one' - ComponentRegistry contains one record",collection.size(),1);
+ Assert.assertEquals("Reference 'one' - ComponentRegistry contains one record", collection.size(), 1);
collection = two.getComponents();
- Assert.assertEquals("Reference 'two' - ComponentRegistry contains one record",collection.size(),1);
+ Assert.assertEquals("Reference 'two' - ComponentRegistry contains one record", collection.size(), 1);
}
@AfterClass
Modified: tomee/tomee/trunk/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryTest.java (original)
+++ tomee/tomee/trunk/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryTest.java Wed Aug 21 13:09:35 2013
@@ -16,8 +16,8 @@
*/
package org.superbiz.registry;
-import org.junit.Assert;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Test;
import javax.ejb.embeddable.EJBContainer;
Propchange: tomee/tomee/trunk/examples/simple-stateful-callbacks/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/simple-stateful-callbacks/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateful-callbacks/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateful-callbacks/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-stateful-callbacks/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-stateful-callbacks/src/main/java/org/superbiz/counter/ExecutionChannel.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateful-callbacks/src/main/java/org/superbiz/counter/ExecutionChannel.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateful-callbacks/src/main/java/org/superbiz/counter/ExecutionChannel.java (original)
+++ tomee/tomee/trunk/examples/simple-stateful-callbacks/src/main/java/org/superbiz/counter/ExecutionChannel.java Wed Aug 21 13:09:35 2013
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
public class ExecutionChannel {
+
private static final ExecutionChannel INSTANCE = new ExecutionChannel();
private final List<ExecutionObserver> observers = new ArrayList<ExecutionObserver>();
Modified: tomee/tomee/trunk/examples/simple-stateful-callbacks/src/test/java/org/superbiz/counter/CounterCallbacksTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateful-callbacks/src/test/java/org/superbiz/counter/CounterCallbacksTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateful-callbacks/src/test/java/org/superbiz/counter/CounterCallbacksTest.java (original)
+++ tomee/tomee/trunk/examples/simple-stateful-callbacks/src/test/java/org/superbiz/counter/CounterCallbacksTest.java Wed Aug 21 13:09:35 2013
@@ -23,9 +23,14 @@ import javax.ejb.embeddable.EJBContainer
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
public class CounterCallbacksTest implements ExecutionObserver {
+
private List<Object> received = new ArrayList<Object>();
public Context getContext() throws NamingException {
Modified: tomee/tomee/trunk/examples/simple-stateful/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateful/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateful/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-stateful/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Propchange: tomee/tomee/trunk/examples/simple-stateless-callbacks/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/simple-stateless-callbacks/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateless-callbacks/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateless-callbacks/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-stateless-callbacks/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-stateless-callbacks/src/main/java/org/superbiz/stateless/basic/ExecutionChannel.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateless-callbacks/src/main/java/org/superbiz/stateless/basic/ExecutionChannel.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateless-callbacks/src/main/java/org/superbiz/stateless/basic/ExecutionChannel.java (original)
+++ tomee/tomee/trunk/examples/simple-stateless-callbacks/src/main/java/org/superbiz/stateless/basic/ExecutionChannel.java Wed Aug 21 13:09:35 2013
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
public class ExecutionChannel {
+
private static final ExecutionChannel INSTANCE = new ExecutionChannel();
private final List<ExecutionObserver> observers = new ArrayList<ExecutionObserver>();
Modified: tomee/tomee/trunk/examples/simple-stateless-callbacks/src/test/java/org/superbiz/stateless/basic/CalculatorTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateless-callbacks/src/test/java/org/superbiz/stateless/basic/CalculatorTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateless-callbacks/src/test/java/org/superbiz/stateless/basic/CalculatorTest.java (original)
+++ tomee/tomee/trunk/examples/simple-stateless-callbacks/src/test/java/org/superbiz/stateless/basic/CalculatorTest.java Wed Aug 21 13:09:35 2013
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Properties;
public class CalculatorTest implements ExecutionObserver {
+
private static final String JNDI = "java:global/simple-stateless-callbacks/CalculatorBean";
private List<Object> received = new ArrayList<Object>();
Modified: tomee/tomee/trunk/examples/simple-stateless-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateless-with-descriptor/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateless-with-descriptor/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-stateless-with-descriptor/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/simple-stateless-with-descriptor/src/main/java/org/superbiz/calculator/CalculatorRemote.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateless-with-descriptor/src/main/java/org/superbiz/calculator/CalculatorRemote.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateless-with-descriptor/src/main/java/org/superbiz/calculator/CalculatorRemote.java (original)
+++ tomee/tomee/trunk/examples/simple-stateless-with-descriptor/src/main/java/org/superbiz/calculator/CalculatorRemote.java Wed Aug 21 13:09:35 2013
@@ -16,7 +16,6 @@
*/
package org.superbiz.calculator;
-
/**
* This is an EJB 3 remote business interface
* This interface is specified using the business-local tag in the deployment descriptor
Modified: tomee/tomee/trunk/examples/simple-stateless/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-stateless/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-stateless/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-stateless/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
<scope>provided</scope>
</dependency>
<dependency>
Propchange: tomee/tomee/trunk/examples/simple-webservice-without-interface/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/simple-webservice-without-interface/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-webservice-without-interface/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-webservice-without-interface/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-webservice-without-interface/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/simple-webservice-without-interface/src/main/java/org/superbiz/calculator/Calculator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-webservice-without-interface/src/main/java/org/superbiz/calculator/Calculator.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-webservice-without-interface/src/main/java/org/superbiz/calculator/Calculator.java (original)
+++ tomee/tomee/trunk/examples/simple-webservice-without-interface/src/main/java/org/superbiz/calculator/Calculator.java Wed Aug 21 13:09:35 2013
@@ -21,10 +21,11 @@ import javax.jws.WebService;
@Stateless
@WebService(
- portName = "CalculatorPort",
- serviceName = "CalculatorWsService",
- targetNamespace = "http://superbiz.org/wsdl")
+ portName = "CalculatorPort",
+ serviceName = "CalculatorWsService",
+ targetNamespace = "http://superbiz.org/wsdl")
public class Calculator {
+
public int sum(int add1, int add2) {
return add1 + add2;
}
Modified: tomee/tomee/trunk/examples/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java (original)
+++ tomee/tomee/trunk/examples/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java Wed Aug 21 13:09:35 2013
@@ -30,6 +30,7 @@ import java.util.Properties;
import static org.junit.Assert.assertTrue;
public class CalculatorTest {
+
private static EJBContainer container;
@BeforeClass
Modified: tomee/tomee/trunk/examples/simple-webservice/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-webservice/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-webservice/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-webservice/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/simple-webservice/src/main/java/org/superbiz/calculator/ws/Calculator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-webservice/src/main/java/org/superbiz/calculator/ws/Calculator.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-webservice/src/main/java/org/superbiz/calculator/ws/Calculator.java (original)
+++ tomee/tomee/trunk/examples/simple-webservice/src/main/java/org/superbiz/calculator/ws/Calculator.java Wed Aug 21 13:09:35 2013
@@ -21,10 +21,10 @@ import javax.jws.WebService;
@Stateless
@WebService(
- portName = "CalculatorPort",
- serviceName = "CalculatorService",
- targetNamespace = "http://superbiz.org/wsdl",
- endpointInterface = "org.superbiz.calculator.ws.CalculatorWs")
+ portName = "CalculatorPort",
+ serviceName = "CalculatorService",
+ targetNamespace = "http://superbiz.org/wsdl",
+ endpointInterface = "org.superbiz.calculator.ws.CalculatorWs")
public class Calculator implements CalculatorWs {
public int sum(int add1, int add2) {