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 [4/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-commo...
Modified: tomee/tomee/trunk/examples/ear-testing/business-logic/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ear-testing/business-logic/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ear-testing/business-logic/pom.xml (original)
+++ tomee/tomee/trunk/examples/ear-testing/business-logic/pom.xml Wed Aug 21 13:09:35 2013
@@ -61,7 +61,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/ear-testing/business-logic/src/main/java/org/superbiz/logic/Movies.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ear-testing/business-logic/src/main/java/org/superbiz/logic/Movies.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ear-testing/business-logic/src/main/java/org/superbiz/logic/Movies.java (original)
+++ tomee/tomee/trunk/examples/ear-testing/business-logic/src/main/java/org/superbiz/logic/Movies.java Wed Aug 21 13:09:35 2013
@@ -24,6 +24,7 @@ import java.util.List;
* @version $Revision: 607077 $ $Date: 2007-12-27 06:55:23 -0800 (Thu, 27 Dec 2007) $
*/
public interface Movies {
+
void addMovie(Movie movie) throws Exception;
void deleteMovie(Movie movie) throws Exception;
Modified: tomee/tomee/trunk/examples/ear-testing/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ear-testing/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ear-testing/pom.xml (original)
+++ tomee/tomee/trunk/examples/ear-testing/pom.xml Wed Aug 21 13:09:35 2013
@@ -67,7 +67,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/ejb-examples/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/pom.xml (original)
+++ tomee/tomee/trunk/examples/ejb-examples/pom.xml Wed Aug 21 13:09:35 2013
@@ -77,7 +77,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/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJB.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJB.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJB.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJB.java Wed Aug 21 13:09:35 2013
@@ -25,6 +25,7 @@ import javax.sql.DataSource;
@Stateless
@LocalBean
public class AnnotatedEJB implements AnnotatedEJBLocal, AnnotatedEJBRemote {
+
@Resource
private DataSource ds;
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBLocal.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBLocal.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBLocal.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBLocal.java Wed Aug 21 13:09:35 2013
@@ -22,6 +22,7 @@ import javax.sql.DataSource;
@Local
public interface AnnotatedEJBLocal {
+
String getName();
void setName(String name);
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBRemote.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBRemote.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBRemote.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedEJBRemote.java Wed Aug 21 13:09:35 2013
@@ -21,6 +21,7 @@ import javax.ejb.Remote;
@Remote
public interface AnnotatedEJBRemote {
+
String getName();
void setName(String name);
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedServlet.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedServlet.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/AnnotatedServlet.java Wed Aug 21 13:09:35 2013
@@ -30,6 +30,7 @@ import javax.sql.DataSource;
import java.io.IOException;
public class AnnotatedServlet extends HttpServlet {
+
@EJB
private AnnotatedEJBLocal localEJB;
@@ -42,7 +43,6 @@ public class AnnotatedServlet extends Ht
@Resource
private DataSource ds;
-
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.setContentType("text/plain");
ServletOutputStream out = response.getOutputStream();
@@ -73,7 +73,6 @@ public class AnnotatedServlet extends Ht
out.println("JNDI=" + lookupField("remoteEJB"));
out.println();
-
out.println("DataSource");
out.println("@Resource=" + ds);
out.println("JNDI=" + lookupField("ds"));
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/ClientHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/ClientHandler.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/ClientHandler.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/ClientHandler.java Wed Aug 21 13:09:35 2013
@@ -21,6 +21,7 @@ import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.MessageContext;
public class ClientHandler implements Handler {
+
public boolean handleMessage(MessageContext messageContext) {
WebserviceServlet.write(" ClientHandler handleMessage");
return true;
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjb.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjb.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjb.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjb.java Wed Aug 21 13:09:35 2013
@@ -21,5 +21,6 @@ import javax.jws.WebService;
@WebService(targetNamespace = "http://examples.org/wsdl")
public interface HelloEjb {
+
String hello(String name);
}
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjbService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjbService.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjbService.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloEjbService.java Wed Aug 21 13:09:35 2013
@@ -22,17 +22,20 @@ import javax.jws.HandlerChain;
import javax.jws.WebService;
@WebService(
- portName = "HelloEjbPort",
- serviceName = "HelloEjbService",
- targetNamespace = "http://examples.org/wsdl",
- endpointInterface = "org.superbiz.servlet.HelloEjb"
+ portName = "HelloEjbPort",
+ serviceName = "HelloEjbService",
+ targetNamespace = "http://examples.org/wsdl",
+ endpointInterface = "org.superbiz.servlet.HelloEjb"
)
@HandlerChain(file = "server-handlers.xml")
@Stateless
public class HelloEjbService implements HelloEjb {
+
public String hello(String name) {
WebserviceServlet.write(" HelloEjbService hello(" + name + ")");
- if (name == null) name = "World";
+ if (name == null) {
+ name = "World";
+ }
return "Hello " + name + " from EJB Webservice!";
}
}
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojo.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojo.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojo.java Wed Aug 21 13:09:35 2013
@@ -21,5 +21,6 @@ import javax.jws.WebService;
@WebService(targetNamespace = "http://examples.org/wsdl")
public interface HelloPojo {
+
String hello(String name);
}
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojoService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojoService.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojoService.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/HelloPojoService.java Wed Aug 21 13:09:35 2013
@@ -21,16 +21,19 @@ import javax.jws.HandlerChain;
import javax.jws.WebService;
@WebService(
- portName = "HelloPojoPort",
- serviceName = "HelloPojoService",
- targetNamespace = "http://examples.org/wsdl",
- endpointInterface = "org.superbiz.servlet.HelloPojo"
+ portName = "HelloPojoPort",
+ serviceName = "HelloPojoService",
+ targetNamespace = "http://examples.org/wsdl",
+ endpointInterface = "org.superbiz.servlet.HelloPojo"
)
@HandlerChain(file = "server-handlers.xml")
public class HelloPojoService implements HelloPojo {
+
public String hello(String name) {
WebserviceServlet.write(" HelloPojoService hello(" + name + ")");
- if (name == null) name = "World";
+ if (name == null) {
+ name = "World";
+ }
return "Hello " + name + " from Pojo Webservice!";
}
}
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/JndiServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/JndiServlet.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/JndiServlet.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/JndiServlet.java Wed Aug 21 13:09:35 2013
@@ -32,6 +32,7 @@ import java.util.Map;
import java.util.TreeMap;
public class JndiServlet extends HttpServlet {
+
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.setContentType("text/plain");
ServletOutputStream out = response.getOutputStream();
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaBean.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaBean.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaBean.java Wed Aug 21 13:09:35 2013
@@ -25,6 +25,7 @@ import javax.persistence.Id;
@Entity
public class JpaBean {
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@@ -45,7 +46,6 @@ public class JpaBean {
this.name = name;
}
-
public String toString() {
return "[JpaBean id=" + id + ", name=" + name + "]";
}
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaServlet.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaServlet.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/JpaServlet.java Wed Aug 21 13:09:35 2013
@@ -30,10 +30,10 @@ import javax.servlet.http.HttpServletRes
import java.io.IOException;
public class JpaServlet extends HttpServlet {
+
@PersistenceUnit(name = "jpa-example")
private EntityManagerFactory emf;
-
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.setContentType("text/plain");
ServletOutputStream out = response.getOutputStream();
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/ResourceBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/ResourceBean.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/ResourceBean.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/ResourceBean.java Wed Aug 21 13:09:35 2013
@@ -18,6 +18,7 @@
package org.superbiz.servlet;
public class ResourceBean {
+
private String value;
public String getValue() {
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/RunAsServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/RunAsServlet.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/RunAsServlet.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/RunAsServlet.java Wed Aug 21 13:09:35 2013
@@ -28,6 +28,7 @@ import java.io.IOException;
import java.security.Principal;
public class RunAsServlet extends HttpServlet {
+
@EJB
private SecureEJBLocal secureEJBLocal;
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJB.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJB.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJB.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJB.java Wed Aug 21 13:09:35 2013
@@ -28,6 +28,7 @@ import java.security.Principal;
@Stateless
@DeclareRoles({"user", "manager", "fake"})
public class SecureEJB implements SecureEJBLocal {
+
@Resource
private SessionContext context;
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJBLocal.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJBLocal.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJBLocal.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureEJBLocal.java Wed Aug 21 13:09:35 2013
@@ -22,6 +22,7 @@ import java.security.Principal;
@Local
public interface SecureEJBLocal {
+
Principal getCallerPrincipal();
boolean isCallerInRole(String role);
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureServlet.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureServlet.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/SecureServlet.java Wed Aug 21 13:09:35 2013
@@ -28,6 +28,7 @@ import java.io.IOException;
import java.security.Principal;
public class SecureServlet extends HttpServlet {
+
@EJB
private SecureEJBLocal secureEJBLocal;
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/ServerHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/ServerHandler.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/ServerHandler.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/ServerHandler.java Wed Aug 21 13:09:35 2013
@@ -21,6 +21,7 @@ import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.MessageContext;
public class ServerHandler implements Handler {
+
public boolean handleMessage(MessageContext messageContext) {
WebserviceServlet.write(" ServerHandler handleMessage");
return true;
Modified: tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/WebserviceClient.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/WebserviceClient.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/WebserviceClient.java (original)
+++ tomee/tomee/trunk/examples/ejb-examples/src/main/java/org/superbiz/servlet/WebserviceClient.java Wed Aug 21 13:09:35 2013
@@ -22,6 +22,7 @@ import java.io.PrintStream;
import java.net.URL;
public class WebserviceClient {
+
/**
* Unfortunately, to run this example with CXF you need to have a HUGE class path. This
* is just what is required to run CXF:
Modified: tomee/tomee/trunk/examples/ejb-webservice/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-webservice/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-webservice/pom.xml (original)
+++ tomee/tomee/trunk/examples/ejb-webservice/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>
<dependency>
Modified: tomee/tomee/trunk/examples/ejb-webservice/src/main/java/org/superbiz/ws/Calculator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-webservice/src/main/java/org/superbiz/ws/Calculator.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-webservice/src/main/java/org/superbiz/ws/Calculator.java (original)
+++ tomee/tomee/trunk/examples/ejb-webservice/src/main/java/org/superbiz/ws/Calculator.java Wed Aug 21 13:09:35 2013
@@ -21,9 +21,10 @@ import javax.jws.WebService;
@Stateless
@WebService(portName = "CalculatorPort",
- serviceName = "CalculatorWebService",
- targetNamespace = "http://superbiz.org/wsdl")
+ serviceName = "CalculatorWebService",
+ targetNamespace = "http://superbiz.org/wsdl")
public class Calculator {
+
public int sum(int add1, int add2) {
return add1 + add2;
}
Propchange: tomee/tomee/trunk/examples/groovy-cdi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,3 @@
target
+*.iml
+.idea
Modified: tomee/tomee/trunk/examples/groovy-cdi/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/groovy-cdi/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/groovy-cdi/pom.xml (original)
+++ tomee/tomee/trunk/examples/groovy-cdi/pom.xml Wed Aug 21 13:09:35 2013
@@ -28,6 +28,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <version.arquillian.container>1.0.3.Final</version.arquillian.container>
</properties>
<build>
@@ -35,8 +36,8 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
<configuration>
<compilerId>groovy-eclipse-compiler</compilerId>
<source>1.6</source>
@@ -46,13 +47,18 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.7.0-01</version>
+ <version>2.8.0-01</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-eclipse-batch</artifactId>
+ <version>2.1.5-03</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>org.eclipse.core.contenttype</artifactId>
+ <version>3.4.100.v20100505-1235</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.contenttype</artifactId>
- <version>3.4.100.v20100505-1235</version>
- </dependency>
</dependencies>
</plugin>
</plugins>
@@ -70,18 +76,18 @@
<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>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>2.1.0</version>
+ <version>2.1.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/groovy-cdi/src/main/java/org/superbiz/groovy/Hello.groovy
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/groovy-cdi/src/main/java/org/superbiz/groovy/Hello.groovy?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/groovy-cdi/src/main/java/org/superbiz/groovy/Hello.groovy (original)
+++ tomee/tomee/trunk/examples/groovy-cdi/src/main/java/org/superbiz/groovy/Hello.groovy Wed Aug 21 13:09:35 2013
@@ -17,6 +17,7 @@
package org.superbiz.groovy
class Hello {
+
def hi() {
"hi"
}
Modified: tomee/tomee/trunk/examples/groovy-cdi/src/test/java/org/superbiz/groovy/HelloTest.groovy
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/groovy-cdi/src/test/java/org/superbiz/groovy/HelloTest.groovy?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/groovy-cdi/src/test/java/org/superbiz/groovy/HelloTest.groovy (original)
+++ tomee/tomee/trunk/examples/groovy-cdi/src/test/java/org/superbiz/groovy/HelloTest.groovy Wed Aug 21 13:09:35 2013
@@ -16,31 +16,33 @@
*/
package org.superbiz.groovy
-import org.junit.runner.RunWith
-import org.jboss.arquillian.junit.Arquillian
+import org.apache.ziplock.JarLocation
import org.jboss.arquillian.container.test.api.Deployment
-import org.jboss.shrinkwrap.api.spec.WebArchive
+import org.jboss.arquillian.junit.Arquillian
+import org.jboss.shrinkwrap.api.ArchivePaths
import org.jboss.shrinkwrap.api.ShrinkWrap
-import org.apache.ziplock.JarLocation
-import javax.inject.Inject
+import org.jboss.shrinkwrap.api.asset.EmptyAsset
+import org.jboss.shrinkwrap.api.spec.WebArchive
import org.junit.Test
+import org.junit.runner.RunWith
+
+import javax.inject.Inject
import static org.junit.Assert.assertEquals
import static org.junit.Assert.assertNotNull
-import org.jboss.shrinkwrap.api.asset.EmptyAsset
-import org.jboss.shrinkwrap.api.ArchivePaths
@RunWith(Arquillian.class)
class HelloTest {
+
@Inject
private Hello hello
@Deployment
static WebArchive war() {
ShrinkWrap.create(WebArchive.class)
- .addAsLibraries(JarLocation.jarLocation(GroovyObject.class))
- .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
- .addClasses(Hello.class)
+ .addAsLibraries(JarLocation.jarLocation(GroovyObject.class))
+ .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
+ .addClasses(Hello.class)
}
@Test
Propchange: tomee/tomee/trunk/examples/groovy-jpa/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/groovy-jpa/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/groovy-jpa/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/groovy-jpa/pom.xml (original)
+++ tomee/tomee/trunk/examples/groovy-jpa/pom.xml Wed Aug 21 13:09:35 2013
@@ -37,7 +37,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<compilerId>groovy-eclipse-compiler</compilerId>
@@ -49,12 +49,12 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
<version>2.7.0-01</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.contenttype</artifactId>
- <version>3.4.100.v20100505-1235</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>org.eclipse.core.contenttype</artifactId>
+ <version>3.4.100.v20100505-1235</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>
@@ -72,7 +72,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/groovy-jpa/src/main/groovy/org/superbiz/groovy/Person.groovy
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/groovy-jpa/src/main/groovy/org/superbiz/groovy/Person.groovy?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/groovy-jpa/src/main/groovy/org/superbiz/groovy/Person.groovy (original)
+++ tomee/tomee/trunk/examples/groovy-jpa/src/main/groovy/org/superbiz/groovy/Person.groovy Wed Aug 21 13:09:35 2013
@@ -17,11 +17,13 @@
package org.superbiz.groovy
import javax.persistence.Entity
-import javax.persistence.Id
import javax.persistence.GeneratedValue
+import javax.persistence.Id
@Entity
class Person {
- @Id @GeneratedValue long id
+
+ @Id
+ @GeneratedValue long id
String name
}
Modified: tomee/tomee/trunk/examples/groovy-jpa/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/groovy-jpa/src/main/resources/META-INF/persistence.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/groovy-jpa/src/main/resources/META-INF/persistence.xml (original)
+++ tomee/tomee/trunk/examples/groovy-jpa/src/main/resources/META-INF/persistence.xml Wed Aug 21 13:09:35 2013
@@ -26,10 +26,10 @@
<class>org.superbiz.groovy.Person</class>
<properties>
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
- <property name="javax.persistence.jdbc.password" value="" />
- <property name="javax.persistence.jdbc.user" value="sa" />
- <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" />
- <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:mem:groovy" />
+ <property name="javax.persistence.jdbc.password" value=""/>
+ <property name="javax.persistence.jdbc.user" value="sa"/>
+ <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
+ <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:mem:groovy"/>
</properties>
</persistence-unit>
</persistence>
Modified: tomee/tomee/trunk/examples/groovy-jpa/src/test/groovy/org/superbiz/groovy/GroovyJPATest.groovy
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/groovy-jpa/src/test/groovy/org/superbiz/groovy/GroovyJPATest.groovy?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/groovy-jpa/src/test/groovy/org/superbiz/groovy/GroovyJPATest.groovy (original)
+++ tomee/tomee/trunk/examples/groovy-jpa/src/test/groovy/org/superbiz/groovy/GroovyJPATest.groovy Wed Aug 21 13:09:35 2013
@@ -21,33 +21,30 @@ import org.jboss.arquillian.container.te
import org.jboss.arquillian.junit.Arquillian
import org.jboss.shrinkwrap.api.ArchivePaths
import org.jboss.shrinkwrap.api.ShrinkWrap
+import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset
import org.jboss.shrinkwrap.api.spec.WebArchive
import org.junit.Test
import org.junit.runner.RunWith
-import static org.junit.Assert.assertEquals
-import static org.junit.Assert.assertNotNull
-
-import static org.junit.Assert.assertThat
-import static org.hamcrest.CoreMatchers.is
-import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset
-import javax.persistence.PersistenceUnit
+import javax.persistence.EntityManager
import javax.persistence.EntityManagerFactory
+import javax.persistence.PersistenceUnit
+import static org.junit.Assert.assertEquals
import static org.junit.Assert.assertNotNull
-import javax.persistence.EntityManager
@RunWith(Arquillian.class)
class GroovyJPATest {
+
@PersistenceUnit
private EntityManagerFactory emf
@Deployment
static WebArchive war() {
ShrinkWrap.create(WebArchive.class)
- .addAsLibraries(JarLocation.jarLocation(GroovyObject.class))
- .addAsWebInfResource(new ClassLoaderAsset("META-INF/persistence.xml"), ArchivePaths.create("persistence.xml"))
- .addClasses(Person.class)
+ .addAsLibraries(JarLocation.jarLocation(GroovyObject.class))
+ .addAsWebInfResource(new ClassLoaderAsset("META-INF/persistence.xml"), ArchivePaths.create("persistence.xml"))
+ .addClasses(Person.class)
}
@Test
Propchange: tomee/tomee/trunk/examples/groovy-spock/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1,2 +1,3 @@
*.iml
target
+.idea
Modified: tomee/tomee/trunk/examples/groovy-spock/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/groovy-spock/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/groovy-spock/pom.xml (original)
+++ tomee/tomee/trunk/examples/groovy-spock/pom.xml Wed Aug 21 13:09:35 2013
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<compilerId>groovy-eclipse-compiler</compilerId>
@@ -47,17 +47,17 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
<version>2.7.0-01</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.contenttype</artifactId>
- <version>3.4.100.v20100505-1235</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>org.eclipse.core.contenttype</artifactId>
+ <version>3.4.100.v20100505-1235</version>
+ </dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
<configuration>
<includes> <!-- we could have used *Test.java as by default but it is more consistent -->
@@ -98,13 +98,14 @@
<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>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>2.1.0</version> <!-- spock doesn't work with 2.0.0-rc-4 -->
+ <version>2.1.0</version>
+ <!-- spock doesn't work with 2.0.0-rc-4 -->
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/groovy-spock/src/main/java/org/superbiz/groovy/Hello.groovy
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/groovy-spock/src/main/java/org/superbiz/groovy/Hello.groovy?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/groovy-spock/src/main/java/org/superbiz/groovy/Hello.groovy (original)
+++ tomee/tomee/trunk/examples/groovy-spock/src/main/java/org/superbiz/groovy/Hello.groovy Wed Aug 21 13:09:35 2013
@@ -17,6 +17,7 @@
package org.superbiz.groovy
class Hello {
+
def hi() {
"hi"
}
Modified: tomee/tomee/trunk/examples/helloworld-weblogic/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/helloworld-weblogic/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/helloworld-weblogic/pom.xml (original)
+++ tomee/tomee/trunk/examples/helloworld-weblogic/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/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloEjbLocalHome.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloEjbLocalHome.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloEjbLocalHome.java (original)
+++ tomee/tomee/trunk/examples/helloworld-weblogic/src/main/java/org/superbiz/hello/HelloEjbLocalHome.java Wed Aug 21 13:09:35 2013
@@ -23,5 +23,6 @@ import javax.ejb.EJBLocalHome;
* @version $Revision$ $Date$
*/
public interface HelloEjbLocalHome extends EJBLocalHome {
+
HelloEjbLocal create() throws CreateException;
}
Modified: tomee/tomee/trunk/examples/injection-of-connectionfactory/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/injection-of-connectionfactory/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/injection-of-connectionfactory/pom.xml (original)
+++ tomee/tomee/trunk/examples/injection-of-connectionfactory/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/injection-of-connectionfactory/src/main/java/org/superbiz/injection/jms/Messages.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/injection-of-connectionfactory/src/main/java/org/superbiz/injection/jms/Messages.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/injection-of-connectionfactory/src/main/java/org/superbiz/injection/jms/Messages.java (original)
+++ tomee/tomee/trunk/examples/injection-of-connectionfactory/src/main/java/org/superbiz/injection/jms/Messages.java Wed Aug 21 13:09:35 2013
@@ -38,7 +38,6 @@ public class Messages {
@Resource
private Queue chatQueue;
-
public void sendMessage(String text) throws JMSException {
Connection connection = null;
@@ -62,8 +61,12 @@ public class Messages {
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();
+ }
}
}
@@ -87,9 +90,15 @@ public class Messages {
return message.getText();
} finally {
- if (consumer != null) consumer.close();
- if (session != null) session.close();
- if (connection != null) connection.close();
+ if (consumer != null) {
+ consumer.close();
+ }
+ if (session != null) {
+ session.close();
+ }
+ if (connection != null) {
+ connection.close();
+ }
}
}
Modified: tomee/tomee/trunk/examples/injection-of-datasource/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/injection-of-datasource/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/injection-of-datasource/pom.xml (original)
+++ tomee/tomee/trunk/examples/injection-of-datasource/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/injection-of-datasource/src/main/java/org/superbiz/injection/Movie.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/injection-of-datasource/src/main/java/org/superbiz/injection/Movie.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/injection-of-datasource/src/main/java/org/superbiz/injection/Movie.java (original)
+++ tomee/tomee/trunk/examples/injection-of-datasource/src/main/java/org/superbiz/injection/Movie.java Wed Aug 21 13:09:35 2013
@@ -20,6 +20,7 @@ package org.superbiz.injection;
* @version $Revision$ $Date$
*/
public class Movie {
+
private String director;
private String title;
private int year;
@@ -57,5 +58,4 @@ public class Movie {
this.year = year;
}
-
}
Modified: tomee/tomee/trunk/examples/injection-of-ejbs/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/injection-of-ejbs/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/injection-of-ejbs/pom.xml (original)
+++ tomee/tomee/trunk/examples/injection-of-ejbs/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/injection-of-entitymanager/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/injection-of-entitymanager/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/injection-of-entitymanager/pom.xml (original)
+++ tomee/tomee/trunk/examples/injection-of-entitymanager/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/injection-of-entitymanager/src/main/java/org/superbiz/injection/jpa/Movie.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/injection-of-entitymanager/src/main/java/org/superbiz/injection/jpa/Movie.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/injection-of-entitymanager/src/main/java/org/superbiz/injection/jpa/Movie.java (original)
+++ tomee/tomee/trunk/examples/injection-of-entitymanager/src/main/java/org/superbiz/injection/jpa/Movie.java Wed Aug 21 13:09:35 2013
@@ -24,7 +24,8 @@ import javax.persistence.Id;
@Entity
public class Movie {
- @Id @GeneratedValue
+ @Id
+ @GeneratedValue
private long id;
private String director;
Modified: tomee/tomee/trunk/examples/injection-of-env-entry/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/injection-of-env-entry/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/injection-of-env-entry/pom.xml (original)
+++ tomee/tomee/trunk/examples/injection-of-env-entry/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/injection-of-env-entry/src/main/java/org/superbiz/injection/enventry/Widget.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/injection-of-env-entry/src/main/java/org/superbiz/injection/enventry/Widget.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/injection-of-env-entry/src/main/java/org/superbiz/injection/enventry/Widget.java (original)
+++ tomee/tomee/trunk/examples/injection-of-env-entry/src/main/java/org/superbiz/injection/enventry/Widget.java Wed Aug 21 13:09:35 2013
@@ -23,4 +23,5 @@ package org.superbiz.injection.enventry;
* @version $Revision$ $Date$
*/
public class Widget {
+
}
Modified: tomee/tomee/trunk/examples/injection-of-env-entry/src/test/java/org/superbiz/injection/enventry/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/injection-of-env-entry/src/test/java/org/superbiz/injection/enventry/ConfigurationTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/injection-of-env-entry/src/test/java/org/superbiz/injection/enventry/ConfigurationTest.java (original)
+++ tomee/tomee/trunk/examples/injection-of-env-entry/src/test/java/org/superbiz/injection/enventry/ConfigurationTest.java Wed Aug 21 13:09:35 2013
@@ -25,7 +25,6 @@ import java.util.Date;
//START SNIPPET: code
public class ConfigurationTest extends TestCase {
-
public void test() throws Exception {
final Context context = EJBContainer.createEJBContainer().getContext();
Modified: tomee/tomee/trunk/examples/interceptors/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/interceptors/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/interceptors/pom.xml (original)
+++ tomee/tomee/trunk/examples/interceptors/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/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyIntf.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyIntf.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyIntf.java (original)
+++ tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyIntf.java Wed Aug 21 13:09:35 2013
@@ -20,5 +20,6 @@ import java.io.Serializable;
import java.util.List;
public interface MethodLevelInterceptorOnlyIntf<T extends Serializable> {
+
public List<T> makePersistent(T entity);
}
Modified: tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedLocal.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedLocal.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedLocal.java (original)
+++ tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/SecondStatelessInterceptedLocal.java Wed Aug 21 13:09:35 2013
@@ -22,5 +22,6 @@ import java.util.List;
* @version $Rev$ $Date$
*/
public interface SecondStatelessInterceptedLocal {
+
List<String> methodWithDefaultInterceptorsExcluded();
}
Modified: tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBean.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBean.java (original)
+++ tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBean.java Wed Aug 21 13:09:35 2013
@@ -48,7 +48,6 @@ public class ThirdSLSBean implements Thi
return list;
}
-
@AroundInvoke
protected Object beanClassBusinessMethodInterceptor(InvocationContext ic) throws Exception {
return Utils.addClassSimpleName(ic, this.getClass().getSimpleName());
Modified: tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBeanLocal.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBeanLocal.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBeanLocal.java (original)
+++ tomee/tomee/trunk/examples/interceptors/src/main/java/org/superbiz/interceptors/ThirdSLSBeanLocal.java Wed Aug 21 13:09:35 2013
@@ -22,6 +22,7 @@ import java.util.List;
* @version $Rev$ $Date$
*/
public interface ThirdSLSBeanLocal {
+
List<String> businessMethod();
List<String> anotherBusinessMethod();
Modified: tomee/tomee/trunk/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java (original)
+++ tomee/tomee/trunk/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java Wed Aug 21 13:09:35 2013
@@ -30,6 +30,7 @@ import java.util.Properties;
* @version $Rev$ $Date$
*/
public class MethodLevelInterceptorOnlyTest extends TestCase {
+
private InitialContext initCtx;
@Before
Modified: tomee/tomee/trunk/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java (original)
+++ tomee/tomee/trunk/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java Wed Aug 21 13:09:35 2013
@@ -45,7 +45,7 @@ public class SecondStatelessInterceptedT
@Test
public void testMethodWithDefaultInterceptorsExcluded() throws Exception {
SecondStatelessInterceptedLocal bean =
- (SecondStatelessInterceptedLocal) initCtx.lookup("SecondStatelessInterceptedBeanLocal");
+ (SecondStatelessInterceptedLocal) initCtx.lookup("SecondStatelessInterceptedBeanLocal");
assert bean != null;
Modified: tomee/tomee/trunk/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java (original)
+++ tomee/tomee/trunk/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java Wed Aug 21 13:09:35 2013
@@ -30,6 +30,7 @@ import java.util.Properties;
* @version $Rev$ $Date$
*/
public class ThirdSLSBeanTest extends TestCase {
+
private InitialContext initCtx;
@Before
Modified: tomee/tomee/trunk/examples/jpa-eclipselink/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jpa-eclipselink/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jpa-eclipselink/pom.xml (original)
+++ tomee/tomee/trunk/examples/jpa-eclipselink/pom.xml Wed Aug 21 13:09:35 2013
@@ -60,7 +60,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/jpa-eclipselink/src/main/java/org/superbiz/eclipselink/Movie.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jpa-eclipselink/src/main/java/org/superbiz/eclipselink/Movie.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jpa-eclipselink/src/main/java/org/superbiz/eclipselink/Movie.java (original)
+++ tomee/tomee/trunk/examples/jpa-eclipselink/src/main/java/org/superbiz/eclipselink/Movie.java Wed Aug 21 13:09:35 2013
@@ -65,5 +65,4 @@ public class Movie {
this.year = year;
}
-
}
Propchange: tomee/tomee/trunk/examples/jpa-enumerated/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/jpa-enumerated/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jpa-enumerated/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jpa-enumerated/pom.xml (original)
+++ tomee/tomee/trunk/examples/jpa-enumerated/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/jpa-enumerated/src/test/java/org/superbiz/jpa/enums/MoviesTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jpa-enumerated/src/test/java/org/superbiz/jpa/enums/MoviesTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jpa-enumerated/src/test/java/org/superbiz/jpa/enums/MoviesTest.java (original)
+++ tomee/tomee/trunk/examples/jpa-enumerated/src/test/java/org/superbiz/jpa/enums/MoviesTest.java Wed Aug 21 13:09:35 2013
@@ -17,9 +17,6 @@
package org.superbiz.jpa.enums;
import junit.framework.TestCase;
-import org.superbiz.jpa.enums.Movie;
-import org.superbiz.jpa.enums.Movies;
-import org.superbiz.jpa.enums.Rating;
import javax.ejb.embeddable.EJBContainer;
import javax.naming.Context;
Modified: tomee/tomee/trunk/examples/jpa-hibernate/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jpa-hibernate/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jpa-hibernate/pom.xml (original)
+++ tomee/tomee/trunk/examples/jpa-hibernate/pom.xml Wed Aug 21 13:09:35 2013
@@ -68,7 +68,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/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movie.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movie.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movie.java (original)
+++ tomee/tomee/trunk/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movie.java Wed Aug 21 13:09:35 2013
@@ -65,5 +65,4 @@ public class Movie {
this.year = year;
}
-
}
Propchange: tomee/tomee/trunk/examples/jsf-cdi-and-ejb/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/jsf-cdi-and-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-cdi-and-ejb/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-cdi-and-ejb/pom.xml (original)
+++ tomee/tomee/trunk/examples/jsf-cdi-and-ejb/pom.xml Wed Aug 21 13:09:35 2013
@@ -110,7 +110,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>
</dependencies>
Modified: tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java (original)
+++ tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java Wed Aug 21 13:09:35 2013
@@ -19,7 +19,6 @@ package org.superbiz.jsf;
import javax.ejb.Stateless;
-
@Stateless
public class Calculator {
Modified: tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/java/org/superbiz/jsf/CalculatorBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/java/org/superbiz/jsf/CalculatorBean.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/java/org/superbiz/jsf/CalculatorBean.java (original)
+++ tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/java/org/superbiz/jsf/CalculatorBean.java Wed Aug 21 13:09:35 2013
@@ -25,6 +25,7 @@ import javax.inject.Named;
@RequestScoped
@Named
public class CalculatorBean {
+
@Inject
Calculator calculator;
private double x;
Modified: tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/WEB-INF/beans.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/WEB-INF/beans.xml (original)
+++ tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/WEB-INF/beans.xml Wed Aug 21 13:09:35 2013
@@ -18,7 +18,7 @@
under the License.
-->
<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
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
</beans>
\ No newline at end of file
Modified: tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/WEB-INF/web.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/WEB-INF/web.xml (original)
+++ tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/WEB-INF/web.xml Wed Aug 21 13:09:35 2013
@@ -20,7 +20,6 @@
-->
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
Modified: tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/calculator.xhtml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/calculator.xhtml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/calculator.xhtml (original)
+++ tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/calculator.xhtml Wed Aug 21 13:09:35 2013
@@ -20,23 +20,23 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">
<h:body bgcolor="white">
- <f:view>
- <h:form>
- <h:panelGrid columns="2">
- <h:outputText value='Enter first number'/>
- <h:inputText value='#{calculatorBean.x}'/>
- <h:outputText value='Enter second number'/>
- <h:inputText value='#{calculatorBean.y}'/>
- <h:commandButton action="#{calculatorBean.add}" value="Add"/>
- </h:panelGrid>
- </h:form>
- </f:view>
+ <f:view>
+ <h:form>
+ <h:panelGrid columns="2">
+ <h:outputText value='Enter first number'/>
+ <h:inputText value='#{calculatorBean.x}'/>
+ <h:outputText value='Enter second number'/>
+ <h:inputText value='#{calculatorBean.y}'/>
+ <h:commandButton action="#{calculatorBean.add}" value="Add"/>
+ </h:panelGrid>
+ </h:form>
+ </f:view>
</h:body>
</html>
Modified: tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/index.jsp?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/index.jsp (original)
+++ tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/index.jsp Wed Aug 21 13:09:35 2013
@@ -18,5 +18,5 @@
-->
<%@ page session="false" %>
<%
- response.sendRedirect("calculator.jsf");
+ response.sendRedirect("calculator.jsf");
%>
\ No newline at end of file
Modified: tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/result.xhtml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/result.xhtml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/result.xhtml (original)
+++ tomee/tomee/trunk/examples/jsf-cdi-and-ejb/src/main/webapp/result.xhtml Wed Aug 21 13:09:35 2013
@@ -20,19 +20,19 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">
<h:body>
-<f:view>
+ <f:view>
<h:form id="mainForm">
- <h2>Result of adding #{calculatorBean.x} and #{calculatorBean.y} is #{calculatorBean.result }</h2>
- <h:commandLink action="back">
- <h:outputText value="Home"/>
- </h:commandLink>
+ <h2>Result of adding #{calculatorBean.x} and #{calculatorBean.y} is #{calculatorBean.result }</h2>
+ <h:commandLink action="back">
+ <h:outputText value="Home"/>
+ </h:commandLink>
</h:form>
-</f:view>
+ </f:view>
</h:body>
</html>
\ No newline at end of file
Modified: tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/pom.xml (original)
+++ tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/pom.xml Wed Aug 21 13:09:35 2013
@@ -33,7 +33,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>
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</plugin>
</plugins>
</build>
@@ -106,7 +106,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>
</dependencies>
Modified: tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java (original)
+++ tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/Calculator.java Wed Aug 21 13:09:35 2013
@@ -21,5 +21,6 @@ import javax.ejb.Remote;
@Remote
public interface Calculator {
+
public double add(double x, double y);
}
Modified: tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/CalculatorBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/CalculatorBean.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/CalculatorBean.java (original)
+++ tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/java/org/superbiz/jsf/CalculatorBean.java Wed Aug 21 13:09:35 2013
@@ -23,6 +23,7 @@ import javax.faces.bean.ManagedBean;
@ManagedBean
public class CalculatorBean {
+
@EJB
Calculator calculator;
private double x;
Modified: tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/WEB-INF/web.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/WEB-INF/web.xml (original)
+++ tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/WEB-INF/web.xml Wed Aug 21 13:09:35 2013
@@ -20,7 +20,6 @@
-->
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
Modified: tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/calculator.xhtml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/calculator.xhtml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/calculator.xhtml (original)
+++ tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/calculator.xhtml Wed Aug 21 13:09:35 2013
@@ -20,23 +20,23 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">
<h:body bgcolor="white">
- <f:view>
- <h:form>
- <h:panelGrid columns="2">
- <h:outputText value='Enter first number'/>
- <h:inputText value='#{calculatorBean.x}'/>
- <h:outputText value='Enter second number'/>
- <h:inputText value='#{calculatorBean.y}'/>
- <h:commandButton action="#{calculatorBean.add}" value="Add"/>
- </h:panelGrid>
- </h:form>
- </f:view>
+ <f:view>
+ <h:form>
+ <h:panelGrid columns="2">
+ <h:outputText value='Enter first number'/>
+ <h:inputText value='#{calculatorBean.x}'/>
+ <h:outputText value='Enter second number'/>
+ <h:inputText value='#{calculatorBean.y}'/>
+ <h:commandButton action="#{calculatorBean.add}" value="Add"/>
+ </h:panelGrid>
+ </h:form>
+ </f:view>
</h:body>
</html>
Modified: tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/index.jsp?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/index.jsp (original)
+++ tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/index.jsp Wed Aug 21 13:09:35 2013
@@ -18,5 +18,5 @@
-->
<%@ page session="false" %>
<%
- response.sendRedirect("calculator.jsf");
+ response.sendRedirect("calculator.jsf");
%>
\ No newline at end of file
Modified: tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/result.xhtml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/result.xhtml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/result.xhtml (original)
+++ tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/src/main/webapp/result.xhtml Wed Aug 21 13:09:35 2013
@@ -20,19 +20,19 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">
<h:body>
-<f:view>
+ <f:view>
<h:form id="mainForm">
- <h2>Result of adding #{calculatorBean.x} and #{calculatorBean.y} is #{calculatorBean.result }</h2>
- <h:commandLink action="back">
- <h:outputText value="Home"/>
- </h:commandLink>
+ <h2>Result of adding #{calculatorBean.x} and #{calculatorBean.y} is #{calculatorBean.result }</h2>
+ <h:commandLink action="back">
+ <h:outputText value="Home"/>
+ </h:commandLink>
</h:form>
-</f:view>
+ </f:view>
</h:body>
</html>
\ No newline at end of file
Modified: tomee/tomee/trunk/examples/lookup-of-ejbs-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/lookup-of-ejbs-with-descriptor/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/lookup-of-ejbs-with-descriptor/pom.xml (original)
+++ tomee/tomee/trunk/examples/lookup-of-ejbs-with-descriptor/pom.xml Wed Aug 21 13:09:35 2013
@@ -57,7 +57,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/lookup-of-ejbs/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/lookup-of-ejbs/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/lookup-of-ejbs/pom.xml (original)
+++ tomee/tomee/trunk/examples/lookup-of-ejbs/pom.xml Wed Aug 21 13:09:35 2013
@@ -57,7 +57,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/mbean-auto-registration/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/mbean-auto-registration/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/mbean-auto-registration/pom.xml (original)
+++ tomee/tomee/trunk/examples/mbean-auto-registration/pom.xml Wed Aug 21 13:09:35 2013
@@ -51,7 +51,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/mbean-auto-registration/src/main/java/org/superbiz/mbean/GuessHowManyMBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/mbean-auto-registration/src/main/java/org/superbiz/mbean/GuessHowManyMBean.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/mbean-auto-registration/src/main/java/org/superbiz/mbean/GuessHowManyMBean.java (original)
+++ tomee/tomee/trunk/examples/mbean-auto-registration/src/main/java/org/superbiz/mbean/GuessHowManyMBean.java Wed Aug 21 13:09:35 2013
@@ -24,6 +24,7 @@ import javax.management.ManagedOperation
@MBean
@Description("play with me to guess a number")
public class GuessHowManyMBean {
+
private int value = 0;
@ManagedAttribute
Modified: tomee/tomee/trunk/examples/mbean-auto-registration/src/test/java/org/superbiz/mbean/GuessHowManyMBeanTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/mbean-auto-registration/src/test/java/org/superbiz/mbean/GuessHowManyMBeanTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/mbean-auto-registration/src/test/java/org/superbiz/mbean/GuessHowManyMBeanTest.java (original)
+++ tomee/tomee/trunk/examples/mbean-auto-registration/src/test/java/org/superbiz/mbean/GuessHowManyMBeanTest.java Wed Aug 21 13:09:35 2013
@@ -29,6 +29,7 @@ import java.util.Properties;
import static junit.framework.Assert.assertEquals;
public class GuessHowManyMBeanTest {
+
private static final String OBJECT_NAME = "openejb.user.mbeans:group=org.superbiz.mbean,application=mbean-auto-registration,name=GuessHowManyMBean";
@Test
Propchange: tomee/tomee/trunk/examples/moviefun/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml