tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andygumbre...@apache.org
Subject svn commit: r1516150 [11/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...
Date Wed, 21 Aug 2013 13:09:48 GMT
Modified: tomee/tomee/trunk/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java (original)
+++ tomee/tomee/trunk/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java Wed Aug 21 13:09:35 2013
@@ -16,93 +16,91 @@
  */
 package org.superbiz.moviefun;
 
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.util.Properties;
-
-import javax.ejb.embeddable.EJBContainer;
-
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import org.apache.commons.io.FileUtils;
 import org.apache.tomee.embedded.EmbeddedTomEEContainer;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import javax.ejb.embeddable.EJBContainer;
+import java.io.File;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.Properties;
+
+import static org.junit.Assert.assertTrue;
 
 public class MoviesHtmlUnitTest {
 
-	private static EJBContainer container;
-	private static File webApp;
-	private static int port;
-
-	@BeforeClass
-	public static void start() throws IOException {
-		
-		// get a random unused port to use for http requests
-		ServerSocket server = new ServerSocket(0);
-		port = server.getLocalPort();
-		server.close();
-		
-		webApp = createWebApp();
-		Properties p = new Properties();
-		p.setProperty(EJBContainer.APP_NAME, "moviefun");
-		p.setProperty(EJBContainer.PROVIDER, "tomee-embedded"); // need web feature
-		p.setProperty(EJBContainer.MODULES, webApp.getAbsolutePath());
-		p.setProperty(EmbeddedTomEEContainer.TOMEE_EJBCONTAINER_HTTP_PORT, String.valueOf(port));
-		container = EJBContainer.createEJBContainer(p);
-	}
-
-	@AfterClass
-	public static void stop() {
-		if (container != null) {
-			container.close();
-		}
-		if (webApp != null) {
-			try {
-				FileUtils.forceDelete(webApp);
-			} catch (IOException e) {
-				FileUtils.deleteQuietly(webApp);
-			}
-		}
-	}
-
-	private static File createWebApp() throws IOException {
-		File file = new File(System.getProperty("java.io.tmpdir") + "/tomee-" + Math.random());
-		if (!file.mkdirs() && !file.exists()) {
-			throw new RuntimeException("can't create " + file.getAbsolutePath());
-		}
-
-		FileUtils.copyDirectory(new File("target/classes"), new File(file, "WEB-INF/classes"));
-	    FileUtils.copyDirectory(new File("target/test-libs"), new File(file, "WEB-INF/lib"));
-		FileUtils.copyDirectory(new File("src/main/webapp"), file);
-
-		return file;
-	}
-
-	@Test
-	public void testShouldMakeSureWebappIsWorking() throws Exception {
-		WebClient webClient = new WebClient();
-		HtmlPage page = webClient.getPage("http://localhost:" + port + "/moviefun/setup.jsp");
-
-		assertMoviesPresent(page);
-
-		page = webClient.getPage("http://localhost:" + port + "/moviefun/moviefun");
-
-		assertMoviesPresent(page);
-		webClient.closeAllWindows();
-	}
-
-	private void assertMoviesPresent(HtmlPage page) {
-		String pageAsText = page.asText();
-		assertTrue(pageAsText.contains("Wedding Crashers"));
-		assertTrue(pageAsText.contains("Starsky & Hutch"));
-		assertTrue(pageAsText.contains("Shanghai Knights"));
-		assertTrue(pageAsText.contains("I-Spy"));
-		assertTrue(pageAsText.contains("The Royal Tenenbaums"));
-	}
+    private static EJBContainer container;
+    private static File webApp;
+    private static int port;
+
+    @BeforeClass
+    public static void start() throws IOException {
+
+        // get a random unused port to use for http requests
+        ServerSocket server = new ServerSocket(0);
+        port = server.getLocalPort();
+        server.close();
+
+        webApp = createWebApp();
+        Properties p = new Properties();
+        p.setProperty(EJBContainer.APP_NAME, "moviefun");
+        p.setProperty(EJBContainer.PROVIDER, "tomee-embedded"); // need web feature
+        p.setProperty(EJBContainer.MODULES, webApp.getAbsolutePath());
+        p.setProperty(EmbeddedTomEEContainer.TOMEE_EJBCONTAINER_HTTP_PORT, String.valueOf(port));
+        container = EJBContainer.createEJBContainer(p);
+    }
+
+    @AfterClass
+    public static void stop() {
+        if (container != null) {
+            container.close();
+        }
+        if (webApp != null) {
+            try {
+                FileUtils.forceDelete(webApp);
+            } catch (IOException e) {
+                FileUtils.deleteQuietly(webApp);
+            }
+        }
+    }
+
+    private static File createWebApp() throws IOException {
+        File file = new File(System.getProperty("java.io.tmpdir") + "/tomee-" + Math.random());
+        if (!file.mkdirs() && !file.exists()) {
+            throw new RuntimeException("can't create " + file.getAbsolutePath());
+        }
+
+        FileUtils.copyDirectory(new File("target/classes"), new File(file, "WEB-INF/classes"));
+        FileUtils.copyDirectory(new File("target/test-libs"), new File(file, "WEB-INF/lib"));
+        FileUtils.copyDirectory(new File("src/main/webapp"), file);
+
+        return file;
+    }
+
+    @Test
+    public void testShouldMakeSureWebappIsWorking() throws Exception {
+        WebClient webClient = new WebClient();
+        HtmlPage page = webClient.getPage("http://localhost:" + port + "/moviefun/setup.jsp");
+
+        assertMoviesPresent(page);
+
+        page = webClient.getPage("http://localhost:" + port + "/moviefun/moviefun");
+
+        assertMoviesPresent(page);
+        webClient.closeAllWindows();
+    }
+
+    private void assertMoviesPresent(HtmlPage page) {
+        String pageAsText = page.asText();
+        assertTrue(pageAsText.contains("Wedding Crashers"));
+        assertTrue(pageAsText.contains("Starsky & Hutch"));
+        assertTrue(pageAsText.contains("Shanghai Knights"));
+        assertTrue(pageAsText.contains("I-Spy"));
+        assertTrue(pageAsText.contains("The Royal Tenenbaums"));
+    }
 }

Modified: tomee/tomee/trunk/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesTest.java (original)
+++ tomee/tomee/trunk/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesTest.java Wed Aug 21 13:09:35 2013
@@ -16,10 +16,6 @@
  */
 package org.superbiz.moviefun;
 
-import java.util.List;
-
-import javax.ejb.embeddable.EJBContainer;
-
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -27,50 +23,53 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import javax.ejb.embeddable.EJBContainer;
+import java.util.List;
+
 public class MoviesTest {
 
-	private static EJBContainer ejbContainer;
+    private static EJBContainer ejbContainer;
 
-	@BeforeClass
-	public static void setUp() throws Exception {
-		ejbContainer = EJBContainer.createEJBContainer();
-	}
-
-	@AfterClass
-	public static void tearDown() {
-		if (ejbContainer != null) {
-			ejbContainer.close();
-		}
-	}
-
-	@Before
-	@After
-	public void clean() throws Exception {
-		MoviesBean movies = (MoviesBean) ejbContainer.getContext().lookup("java:global/moviefun/MoviesBean!org.superbiz.moviefun.MoviesBean");
-		movies.clean();
-	}
-
-	@Test
-	public void testShouldAddAMovie() throws Exception {
-		MoviesBean movies = (MoviesBean) ejbContainer.getContext().lookup("java:global/moviefun/MoviesBean!org.superbiz.moviefun.MoviesBean");
-		
-		Movie movie = new Movie();
-		movie.setDirector("Michael Bay");
-		movie.setGenre("Action");
-		movie.setRating(9);
-		movie.setTitle("Bad Boys");
-		movie.setYear(1995);
-		movies.addMovie(movie);
-
-		Assert.assertEquals(1, movies.countAll());
-		List<Movie> moviesFound = movies.findRange("title", "Bad Boys", 0, 10);
-
-		Assert.assertEquals(1, moviesFound.size());
-		Assert.assertEquals("Michael Bay", moviesFound.get(0).getDirector());
-		Assert.assertEquals("Action", moviesFound.get(0).getGenre());
-		Assert.assertEquals(9, moviesFound.get(0).getRating());
-		Assert.assertEquals("Bad Boys", moviesFound.get(0).getTitle());
-		Assert.assertEquals(1995, moviesFound.get(0).getYear());
-	}
+    @BeforeClass
+    public static void setUp() throws Exception {
+        ejbContainer = EJBContainer.createEJBContainer();
+    }
+
+    @AfterClass
+    public static void tearDown() {
+        if (ejbContainer != null) {
+            ejbContainer.close();
+        }
+    }
+
+    @Before
+    @After
+    public void clean() throws Exception {
+        MoviesBean movies = (MoviesBean) ejbContainer.getContext().lookup("java:global/moviefun/MoviesBean!org.superbiz.moviefun.MoviesBean");
+        movies.clean();
+    }
+
+    @Test
+    public void testShouldAddAMovie() throws Exception {
+        MoviesBean movies = (MoviesBean) ejbContainer.getContext().lookup("java:global/moviefun/MoviesBean!org.superbiz.moviefun.MoviesBean");
+
+        Movie movie = new Movie();
+        movie.setDirector("Michael Bay");
+        movie.setGenre("Action");
+        movie.setRating(9);
+        movie.setTitle("Bad Boys");
+        movie.setYear(1995);
+        movies.addMovie(movie);
+
+        Assert.assertEquals(1, movies.countAll());
+        List<Movie> moviesFound = movies.findRange("title", "Bad Boys", 0, 10);
+
+        Assert.assertEquals(1, moviesFound.size());
+        Assert.assertEquals("Michael Bay", moviesFound.get(0).getDirector());
+        Assert.assertEquals("Action", moviesFound.get(0).getGenre());
+        Assert.assertEquals(9, moviesFound.get(0).getRating());
+        Assert.assertEquals("Bad Boys", moviesFound.get(0).getTitle());
+        Assert.assertEquals(1995, moviesFound.get(0).getYear());
+    }
 
 }
\ No newline at end of file

Modified: tomee/tomee/trunk/examples/moviefun/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/moviefun/src/test/resources/arquillian.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/moviefun/src/test/resources/arquillian.xml (original)
+++ tomee/tomee/trunk/examples/moviefun/src/test/resources/arquillian.xml Wed Aug 21 13:09:35 2013
@@ -16,18 +16,18 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<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="tomee" default="true">
-           <configuration>
-               <property name="httpPort">-1</property>
-               <property name="stopPort">-1</property>
-               <property name="tomcatVersion"></property>
-               <property name="openejbVersion">${tomee.version}</property>
-               <property name="dir">target/apache-tomee-remote</property>
-               <property name="appWorkingDir">target/arquillian-test-working-dir</property>
-           </configuration>
-       </container>
+<arquillian
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    >
+
+  <container qualifier="tomee" default="true">
+    <configuration>
+      <property name="httpPort">-1</property>
+      <property name="stopPort">-1</property>
+      <property name="tomcatVersion"></property>
+      <property name="openejbVersion">${tomee.version}</property>
+      <property name="dir">target/apache-tomee-remote</property>
+      <property name="appWorkingDir">target/arquillian-test-working-dir</property>
+    </configuration>
+  </container>
 </arquillian>
\ No newline at end of file

Modified: tomee/tomee/trunk/examples/movies-complete-meta/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/movies-complete-meta/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/movies-complete-meta/pom.xml (original)
+++ tomee/tomee/trunk/examples/movies-complete-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/movies-complete-meta/src/main/java/org/superbiz/injection/tx/Movie.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/Movie.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/Movie.java (original)
+++ tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/Movie.java Wed Aug 21 13:09:35 2013
@@ -58,5 +58,4 @@ public class Movie {
         this.year = year;
     }
 
-
 }

Modified: tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Add.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Add.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Add.java (original)
+++ tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Add.java Wed Aug 21 13:09:35 2013
@@ -32,6 +32,7 @@ import java.lang.annotation.Target;
 @Target(ElementType.METHOD)
 
 public @interface Add {
+
     public interface $ {
 
         @Add

Modified: tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Delete.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Delete.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Delete.java (original)
+++ tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Delete.java Wed Aug 21 13:09:35 2013
@@ -32,6 +32,7 @@ import java.lang.annotation.Target;
 @Target(ElementType.METHOD)
 
 public @interface Delete {
+
     public interface $ {
 
         @Delete

Modified: tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Metatype.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Metatype.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Metatype.java (original)
+++ tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Metatype.java Wed Aug 21 13:09:35 2013
@@ -25,4 +25,5 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.ANNOTATION_TYPE)
 public @interface Metatype {
+
 }

Modified: tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/MovieUnit.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/MovieUnit.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/MovieUnit.java (original)
+++ tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/MovieUnit.java Wed Aug 21 13:09:35 2013
@@ -23,11 +23,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 @Metatype
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 
 @PersistenceContext(name = "movie-unit", unitName = "movie-unit", type = PersistenceContextType.EXTENDED)
 public @interface MovieUnit {
+
 }

Modified: tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Read.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Read.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Read.java (original)
+++ tomee/tomee/trunk/examples/movies-complete-meta/src/main/java/org/superbiz/injection/tx/api/Read.java Wed Aug 21 13:09:35 2013
@@ -29,6 +29,7 @@ import java.lang.annotation.Target;
 @Target(ElementType.METHOD)
 
 public @interface Read {
+
     public interface $ {
 
         @Read

Modified: tomee/tomee/trunk/examples/movies-complete-meta/src/test/java/org/superbiz/injection/tx/MoviesTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/movies-complete-meta/src/test/java/org/superbiz/injection/tx/MoviesTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/movies-complete-meta/src/test/java/org/superbiz/injection/tx/MoviesTest.java (original)
+++ tomee/tomee/trunk/examples/movies-complete-meta/src/test/java/org/superbiz/injection/tx/MoviesTest.java Wed Aug 21 13:09:35 2013
@@ -32,7 +32,7 @@ import static javax.ejb.TransactionAttri
 
 /**
  * See the transaction-rollback example as it does the same thing
- * via UserTransaction and shows more techniques for rollback 
+ * via UserTransaction and shows more techniques for rollback
  */
 //START SNIPPET: code
 public class MoviesTest extends TestCase {
@@ -94,8 +94,8 @@ public class MoviesTest extends TestCase
         }
     }
 
-
     public static interface Caller {
+
         public <V> V call(Callable<V> callable) throws Exception;
     }
 

Modified: tomee/tomee/trunk/examples/movies-complete/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/movies-complete/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/movies-complete/pom.xml (original)
+++ tomee/tomee/trunk/examples/movies-complete/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/movies-complete/src/main/java/org/superbiz/injection/tx/Movie.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/movies-complete/src/main/java/org/superbiz/injection/tx/Movie.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/movies-complete/src/main/java/org/superbiz/injection/tx/Movie.java (original)
+++ tomee/tomee/trunk/examples/movies-complete/src/main/java/org/superbiz/injection/tx/Movie.java Wed Aug 21 13:09:35 2013
@@ -58,5 +58,4 @@ public class Movie {
         this.year = year;
     }
 
-
 }

Modified: tomee/tomee/trunk/examples/movies-complete/src/test/java/org/superbiz/injection/tx/MoviesTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/movies-complete/src/test/java/org/superbiz/injection/tx/MoviesTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/movies-complete/src/test/java/org/superbiz/injection/tx/MoviesTest.java (original)
+++ tomee/tomee/trunk/examples/movies-complete/src/test/java/org/superbiz/injection/tx/MoviesTest.java Wed Aug 21 13:09:35 2013
@@ -32,7 +32,7 @@ import static javax.ejb.TransactionAttri
 
 /**
  * See the transaction-rollback example as it does the same thing
- * via UserTransaction and shows more techniques for rollback 
+ * via UserTransaction and shows more techniques for rollback
  */
 //START SNIPPET: code
 public class MoviesTest extends TestCase {
@@ -94,8 +94,8 @@ public class MoviesTest extends TestCase
         }
     }
 
-
     public static interface Caller {
+
         public <V> V call(Callable<V> callable) throws Exception;
     }
 

Propchange: tomee/tomee/trunk/examples/multi-jpa-provider-testing/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
 target
+*.iml

Modified: tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml (original)
+++ tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml Wed Aug 21 13:09:35 2013
@@ -20,142 +20,142 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.superbiz</groupId>
-    <artifactId>multi-jpa-provider-testing</artifactId>
-    <packaging>jar</packaging>
-    <version>1.1.0-SNAPSHOT</version>
-    <name>OpenEJB :: Examples :: Multiple JPA providers</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.5.1</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-
-            <plugin> <!-- run tests twice, once with openjpa and once with hibernate -->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.13</version>
-                <executions>
-                    <execution>
-                        <id>test-hibernate</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${maven.test.skip}</skip>
-                            <systemPropertyVariables>
-                                <javax.persistence.provider>org.hibernate.ejb.HibernatePersistence</javax.persistence.provider>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>test-openjpa</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${maven.test.skip}</skip>
-                            <systemPropertyVariables>
-                                <javax.persistence.provider>org.apache.openjpa.persistence.PersistenceProviderImpl</javax.persistence.provider>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                </executions>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>apache-m2-snapshot</id>
-            <name>Apache Snapshot Repository</name>
-            <url>http://repository.apache.org/snapshots</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>6.0-4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.10</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>arquillian-openejb-embedded-4</artifactId>
-            <version>4.6.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-            <version>2.0.0-alpha-5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-spi</artifactId>
-            <version>1.1.1-alpha-2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!--
-          don't be shy and put all JPA provider in the classpath
-          otherwise arquillian has some difficulties in embedded mode to find your classes
-        -->
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa</artifactId>
-            <version>2.2.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency> <!-- just a facade pom which will bring hibernate for us -->
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-core-hibernate</artifactId>
-            <version>4.6.0-SNAPSHOT</version>
-            <scope>test</scope>
-            <type>pom</type>
-        </dependency>
-    </dependencies>
-
-    <!-- This section allows you to configure where to publish libraries for
-   sharing. It is not required and may be deleted. For more information see:
-   http://maven.apache.org/plugins/maven-deploy-plugin/ -->
-    <distributionManagement>
-        <repository>
-            <id>localhost</id>
-            <url>file://${basedir}/target/repo/</url>
-        </repository>
-        <snapshotRepository>
-            <id>localhost</id>
-            <url>file://${basedir}/target/snapshot-repo/</url>
-        </snapshotRepository>
-    </distributionManagement>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.superbiz</groupId>
+  <artifactId>multi-jpa-provider-testing</artifactId>
+  <packaging>jar</packaging>
+  <version>1.1.0-SNAPSHOT</version>
+  <name>OpenEJB :: Examples :: Multiple JPA providers</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <build>
+    <defaultGoal>install</defaultGoal>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+
+      <plugin> <!-- run tests twice, once with openjpa and once with hibernate -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.13</version>
+        <executions>
+          <execution>
+            <id>test-hibernate</id>
+            <phase>test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <skip>${maven.test.skip}</skip>
+              <systemPropertyVariables>
+                <javax.persistence.provider>org.hibernate.ejb.HibernatePersistence</javax.persistence.provider>
+              </systemPropertyVariables>
+            </configuration>
+          </execution>
+          <execution>
+            <id>test-openjpa</id>
+            <phase>test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <skip>${maven.test.skip}</skip>
+              <systemPropertyVariables>
+                <javax.persistence.provider>org.apache.openjpa.persistence.PersistenceProviderImpl</javax.persistence.provider>
+              </systemPropertyVariables>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <repositories>
+    <repository>
+      <id>apache-m2-snapshot</id>
+      <name>Apache Snapshot Repository</name>
+      <url>http://repository.apache.org/snapshots</url>
+    </repository>
+  </repositories>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>javaee-api</artifactId>
+      <version>6.0-5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.10</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>arquillian-openejb-embedded-4</artifactId>
+      <version>4.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.shrinkwrap.resolver</groupId>
+      <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+      <version>2.0.0-alpha-5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.shrinkwrap</groupId>
+      <artifactId>shrinkwrap-spi</artifactId>
+      <version>1.1.1-alpha-2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <!--
+      don't be shy and put all JPA provider in the classpath
+      otherwise arquillian has some difficulties in embedded mode to find your classes
+    -->
+    <dependency>
+      <groupId>org.apache.openjpa</groupId>
+      <artifactId>openjpa</artifactId>
+      <version>2.2.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency> <!-- just a facade pom which will bring hibernate for us -->
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>openejb-core-hibernate</artifactId>
+      <version>4.6.0-SNAPSHOT</version>
+      <scope>test</scope>
+      <type>pom</type>
+    </dependency>
+  </dependencies>
+
+  <!-- This section allows you to configure where to publish libraries for
+ sharing. It is not required and may be deleted. For more information see:
+ http://maven.apache.org/plugins/maven-deploy-plugin/ -->
+  <distributionManagement>
+    <repository>
+      <id>localhost</id>
+      <url>file://${basedir}/target/repo/</url>
+    </repository>
+    <snapshotRepository>
+      <id>localhost</id>
+      <url>file://${basedir}/target/snapshot-repo/</url>
+    </snapshotRepository>
+  </distributionManagement>
 
 </project>

Modified: tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/main/java/org/superbiz/model/Person.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/main/java/org/superbiz/model/Person.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/main/java/org/superbiz/model/Person.java (original)
+++ tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/main/java/org/superbiz/model/Person.java Wed Aug 21 13:09:35 2013
@@ -22,6 +22,7 @@ import javax.persistence.Id;
 
 @Entity
 public class Person {
+
     @Id
     @GeneratedValue
     private long id;

Modified: tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/JPATest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/JPATest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/JPATest.java (original)
+++ tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/JPATest.java Wed Aug 21 13:09:35 2013
@@ -35,11 +35,12 @@ import static org.junit.Assert.assertNot
 
 @RunWith(Arquillian.class)
 public class JPATest {
+
     @Deployment
     public static WebArchive war() {
         return ShrinkWrap.create(WebArchive.class)
-                .addClass(Person.class)
-                .addAsWebInfResource(new ClassLoaderAsset("META-INF/persistence.xml"), ArchivePaths.create("persistence.xml"));
+                         .addClass(Person.class)
+                         .addAsWebInfResource(new ClassLoaderAsset("META-INF/persistence.xml"), ArchivePaths.create("persistence.xml"));
     }
 
     @PersistenceContext

Modified: tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/jpa/HibernateEnricher.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/jpa/HibernateEnricher.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/jpa/HibernateEnricher.java (original)
+++ tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/jpa/HibernateEnricher.java Wed Aug 21 13:09:35 2013
@@ -21,6 +21,7 @@ import org.jboss.shrinkwrap.api.Archive;
 import org.superbiz.enricher.maven.Enrichers;
 
 public class HibernateEnricher implements AuxiliaryArchiveProcessor {
+
     @Override
     public void process(final Archive<?> auxiliaryArchive) {
         Enrichers.wrap(auxiliaryArchive).addAsLibraries(Enrichers.resolve("src/test/resources/hibernate-pom.xml"));

Modified: tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/jpa/JPAEnrichers.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/jpa/JPAEnrichers.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/jpa/JPAEnrichers.java (original)
+++ tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/jpa/JPAEnrichers.java Wed Aug 21 13:09:35 2013
@@ -22,6 +22,7 @@ import org.jboss.shrinkwrap.api.spec.Web
 // in embedded mode simply put all provider in appclassloader
 // otherwise arquillian will be fooled by src/main/java
 public final class JPAEnrichers {
+
     private JPAEnrichers() {
         // no-op
     }

Modified: tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/jpa/OpenJPAEnricher.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/jpa/OpenJPAEnricher.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/jpa/OpenJPAEnricher.java (original)
+++ tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/jpa/OpenJPAEnricher.java Wed Aug 21 13:09:35 2013
@@ -21,6 +21,7 @@ import org.jboss.shrinkwrap.api.Archive;
 import org.superbiz.enricher.maven.Enrichers;
 
 public class OpenJPAEnricher implements AuxiliaryArchiveProcessor {
+
     @Override
     public void process(final Archive<?> auxiliaryArchive) {
         Enrichers.wrap(auxiliaryArchive).addAsLibraries(Enrichers.resolve("src/test/resources/openjpa-pom.xml"));

Modified: tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/maven/Enrichers.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/maven/Enrichers.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/maven/Enrichers.java (original)
+++ tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/maven/Enrichers.java Wed Aug 21 13:09:35 2013
@@ -21,7 +21,6 @@ import org.jboss.shrinkwrap.api.containe
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.jboss.shrinkwrap.resolver.api.maven.ScopeType;
 import org.jboss.shrinkwrap.resolver.api.maven.strategy.AcceptScopesStrategy;
-import org.jboss.shrinkwrap.resolver.api.maven.strategy.TransitiveStrategy;
 
 import javax.enterprise.inject.ResolutionException;
 import java.io.File;
@@ -29,6 +28,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public final class Enrichers {
+
     private static final Map<String, File[]> CACHE = new HashMap<String, File[]>();
 
     private Enrichers() {
@@ -41,15 +41,15 @@ public final class Enrichers {
 
                 // try offline first since it is generally faster
                 CACHE.put(pom, Maven.resolver()
-                        .offline(true)
-                        .loadPomFromFile(pom)
-                        .importRuntimeAndTestDependencies(new AcceptScopesStrategy(ScopeType.COMPILE))
-                        .asFile());
+                                    .offline(true)
+                                    .loadPomFromFile(pom)
+                                    .importRuntimeAndTestDependencies(new AcceptScopesStrategy(ScopeType.COMPILE))
+                                    .asFile());
             } catch (ResolutionException re) { // try on central
                 CACHE.put(pom, Maven.resolver()
-                        .loadPomFromFile(pom)
-                        .importRuntimeAndTestDependencies(new AcceptScopesStrategy(ScopeType.COMPILE))
-                        .asFile());
+                                    .loadPomFromFile(pom)
+                                    .importRuntimeAndTestDependencies(new AcceptScopesStrategy(ScopeType.COMPILE))
+                                    .asFile());
             }
         }
         return CACHE.get(pom);

Modified: tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/resources/arquillian.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multi-jpa-provider-testing/src/test/resources/arquillian.xml (original)
+++ tomee/tomee/trunk/examples/multi-jpa-provider-testing/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/multiple-arquillian-adapters/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
 target
+*.iml

Modified: tomee/tomee/trunk/examples/multiple-arquillian-adapters/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-arquillian-adapters/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-arquillian-adapters/pom.xml (original)
+++ tomee/tomee/trunk/examples/multiple-arquillian-adapters/pom.xml Wed Aug 21 13:09:35 2013
@@ -139,7 +139,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/multiple-arquillian-adapters/src/main/java/org/superbiz/SomeEJB.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/main/java/org/superbiz/SomeEJB.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/main/java/org/superbiz/SomeEJB.java (original)
+++ tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/main/java/org/superbiz/SomeEJB.java Wed Aug 21 13:09:35 2013
@@ -17,10 +17,10 @@
 package org.superbiz;
 
 import javax.ejb.Stateless;
-import javax.jws.WebService;
 
 @Stateless
 public class SomeEJB {
+
     public String ok() {
         return "ejb";
     }

Modified: tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/main/java/org/superbiz/SomeRest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/main/java/org/superbiz/SomeRest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/main/java/org/superbiz/SomeRest.java (original)
+++ tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/main/java/org/superbiz/SomeRest.java Wed Aug 21 13:09:35 2013
@@ -23,6 +23,7 @@ import javax.ws.rs.Path;
 @Path("/rest")
 @Stateless
 public class SomeRest {
+
     @GET
     @Path("/ok")
     public String ok() {

Modified: tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/remote/EmbeddedRemote.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/remote/EmbeddedRemote.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/remote/EmbeddedRemote.java (original)
+++ tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/remote/EmbeddedRemote.java Wed Aug 21 13:09:35 2013
@@ -17,4 +17,5 @@
 package org.superbiz.embedded.remote;
 
 public interface EmbeddedRemote {
+
 }

Modified: tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/remote/OpenEJBEmbeddedRemoteTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/remote/OpenEJBEmbeddedRemoteTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/remote/OpenEJBEmbeddedRemoteTest.java (original)
+++ tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/remote/OpenEJBEmbeddedRemoteTest.java Wed Aug 21 13:09:35 2013
@@ -16,8 +16,6 @@
  */
 package org.superbiz.embedded.remote;
 
-import java.io.IOException;
-import java.net.URL;
 import org.apache.ziplock.IO;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -28,11 +26,15 @@ import org.junit.experimental.categories
 import org.junit.runner.RunWith;
 import org.superbiz.SomeRest;
 
+import java.io.IOException;
+import java.net.URL;
+
 import static org.junit.Assert.assertEquals;
 
 @Category(EmbeddedRemote.class)
 @RunWith(Arquillian.class)
 public class OpenEJBEmbeddedRemoteTest {
+
     @Deployment
     public static JavaArchive jar() {
         return ShrinkWrap.create(JavaArchive.class, "my-webapp.jar").addClass(SomeRest.class);

Modified: tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/standalone/Embedded.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/standalone/Embedded.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/standalone/Embedded.java (original)
+++ tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/standalone/Embedded.java Wed Aug 21 13:09:35 2013
@@ -17,4 +17,5 @@
 package org.superbiz.embedded.standalone;
 
 public interface Embedded {
+
 }

Modified: tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/standalone/OpenEJBEmbeddedTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/standalone/OpenEJBEmbeddedTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/standalone/OpenEJBEmbeddedTest.java (original)
+++ tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/embedded/standalone/OpenEJBEmbeddedTest.java Wed Aug 21 13:09:35 2013
@@ -16,7 +16,6 @@
  */
 package org.superbiz.embedded.standalone;
 
-import javax.ejb.EJB;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -26,12 +25,15 @@ import org.junit.experimental.categories
 import org.junit.runner.RunWith;
 import org.superbiz.SomeEJB;
 
+import javax.ejb.EJB;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 @Category(Embedded.class)
 @RunWith(Arquillian.class)
 public class OpenEJBEmbeddedTest {
+
     @EJB
     private SomeEJB ejb;
 

Modified: tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/embedded/TomEEEmbedded.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/embedded/TomEEEmbedded.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/embedded/TomEEEmbedded.java (original)
+++ tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/embedded/TomEEEmbedded.java Wed Aug 21 13:09:35 2013
@@ -17,4 +17,5 @@
 package org.superbiz.tomee.embedded;
 
 public interface TomEEEmbedded {
+
 }

Modified: tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/embedded/TomEEEmbeddedTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/embedded/TomEEEmbeddedTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/embedded/TomEEEmbeddedTest.java (original)
+++ tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/embedded/TomEEEmbeddedTest.java Wed Aug 21 13:09:35 2013
@@ -16,7 +16,6 @@
  */
 package org.superbiz.tomee.embedded;
 
-import javax.ejb.EJB;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -26,12 +25,15 @@ import org.junit.experimental.categories
 import org.junit.runner.RunWith;
 import org.superbiz.SomeEJB;
 
+import javax.ejb.EJB;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 @Category(TomEEEmbedded.class)
 @RunWith(Arquillian.class)
 public class TomEEEmbeddedTest {
+
     @EJB
     private SomeEJB ejb;
 

Modified: tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/remote/TomEERemote.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/remote/TomEERemote.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/remote/TomEERemote.java (original)
+++ tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/remote/TomEERemote.java Wed Aug 21 13:09:35 2013
@@ -17,4 +17,5 @@
 package org.superbiz.tomee.remote;
 
 public interface TomEERemote {
+
 }

Modified: tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/remote/TomEERemoteTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/remote/TomEERemoteTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/remote/TomEERemoteTest.java (original)
+++ tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/java/org/superbiz/tomee/remote/TomEERemoteTest.java Wed Aug 21 13:09:35 2013
@@ -16,7 +16,6 @@
  */
 package org.superbiz.tomee.remote;
 
-import javax.ejb.EJB;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -26,12 +25,15 @@ import org.junit.experimental.categories
 import org.junit.runner.RunWith;
 import org.superbiz.SomeEJB;
 
+import javax.ejb.EJB;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 @Category(TomEERemote.class)
 @RunWith(Arquillian.class)
 public class TomEERemoteTest {
+
     @EJB
     private SomeEJB ejb;
 

Modified: tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/resources/arquillian.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/resources/arquillian.xml (original)
+++ tomee/tomee/trunk/examples/multiple-arquillian-adapters/src/test/resources/arquillian.xml Wed Aug 21 13:09:35 2013
@@ -17,7 +17,7 @@
     limitations under the License.
 -->
 <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="embedded">
     <configuration>
       <property name="properties">

Propchange: tomee/tomee/trunk/examples/multiple-tomee-arquillian/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
 target
+*.iml

Modified: tomee/tomee/trunk/examples/multiple-tomee-arquillian/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-tomee-arquillian/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-tomee-arquillian/pom.xml (original)
+++ tomee/tomee/trunk/examples/multiple-tomee-arquillian/pom.xml Wed Aug 21 13:09:35 2013
@@ -70,7 +70,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/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETest.java (original)
+++ tomee/tomee/trunk/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETest.java Wed Aug 21 13:09:35 2013
@@ -16,12 +16,9 @@
  */
 package org.superbiz.tomee.arquillian.multiple;
 
-import java.io.IOException;
-import java.net.URL;
 import org.apache.ziplock.IO;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.OperateOnDeployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.container.test.api.TargetsContainer;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
@@ -31,22 +28,26 @@ import org.jboss.shrinkwrap.api.spec.Web
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.IOException;
+import java.net.URL;
+
 import static org.junit.Assert.assertEquals;
 
 @RunWith(Arquillian.class)
 public class MultipleTomEETest {
+
     @Deployment(name = "war1", testable = false)
     @TargetsContainer("tomee-1")
     public static WebArchive createDep1() {
         return ShrinkWrap.create(WebArchive.class, "application1.war")
-                .addAsWebResource(new StringAsset("Hello from TomEE 1"), "index.html");
+                         .addAsWebResource(new StringAsset("Hello from TomEE 1"), "index.html");
     }
 
     @Deployment(name = "war2", testable = false)
     @TargetsContainer("tomee-2")
     public static WebArchive createDep2() {
         return ShrinkWrap.create(WebArchive.class, "application2.war")
-                .addAsWebResource(new StringAsset("Hello from TomEE 2"), "index.html");
+                         .addAsWebResource(new StringAsset("Hello from TomEE 2"), "index.html");
     }
 
     @Test

Modified: tomee/tomee/trunk/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml (original)
+++ tomee/tomee/trunk/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml Wed Aug 21 13:09:35 2013
@@ -16,7 +16,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<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">
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <group qualifier="tomee-cluster">
     <container qualifier="tomee-1">
       <configuration>

Propchange: tomee/tomee/trunk/examples/myfaces-codi-demo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -0,0 +1,2 @@
+*.iml
+target

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/pom.xml (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/pom.xml Wed Aug 21 13:09:35 2013
@@ -10,122 +10,122 @@
 	language governing permissions and limitations under the License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.superbiz</groupId>
-    <artifactId>myfaces-stack001</artifactId>
-
-    <name>OpenEJB :: Examples :: JSF2/CDI/BV/JPA/CODI</name>
-    <version>1.0-SNAPSHOT</version>
-
-    <packaging>war</packaging>
-
-    <properties>
-        <myfaces2.version>2.1.11</myfaces2.version>
-        <myfaces.codi.version>1.0.5</myfaces.codi.version>
-        <extval.version>2.0.7</extval.version>
-    </properties>
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.openejb.maven</groupId>
-                <artifactId>tomee-maven-plugin</artifactId>
-                <version>1.6.0-SNAPSHOT</version>
-            </plugin>
-        </plugins>
-    </build>
-    <repositories>
-        <repository>
-            <id>prime-repo</id>
-            <name>Prime Technology Maven Repository</name>
-            <url>http://repository.primefaces.org/</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>6.0-4</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId>
-            <artifactId>myfaces-extcdi-bundle-jsf20</artifactId>
-            <version>${myfaces.codi.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.validator</groupId>
-            <artifactId>myfaces-extval-core</artifactId>
-            <version>${extval.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
-            <artifactId>myfaces-extval-property-validation</artifactId>
-            <version>${extval.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.persistence</groupId>
-                    <artifactId>persistence-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
-            <artifactId>myfaces-extval-bean-validation</artifactId>
-            <version>${extval.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>${myfaces2.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- 3rd party libs -->
-        <dependency>
-            <groupId>org.primefaces</groupId>
-            <artifactId>primefaces</artifactId>
-            <version>2.2</version>
-        </dependency>
-    </dependencies>
-
-    <!--
-    This section allows you to configure where to publish libraries for sharing.
-    It is not required and may be deleted.  For more information see:
-    http://maven.apache.org/plugins/maven-deploy-plugin/
-    -->
-    <distributionManagement>
-        <repository>
-            <id>localhost</id>
-            <url>file://${basedir}/target/repo/</url>
-        </repository>
-        <snapshotRepository>
-            <id>localhost</id>
-            <url>file://${basedir}/target/snapshot-repo/</url>
-        </snapshotRepository>
-    </distributionManagement>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.superbiz</groupId>
+  <artifactId>myfaces-stack001</artifactId>
+
+  <name>OpenEJB :: Examples :: JSF2/CDI/BV/JPA/CODI</name>
+  <version>1.0-SNAPSHOT</version>
+
+  <packaging>war</packaging>
+
+  <properties>
+    <myfaces2.version>2.1.11</myfaces2.version>
+    <myfaces.codi.version>1.0.5</myfaces.codi.version>
+    <extval.version>2.0.7</extval.version>
+  </properties>
+
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.0</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.openejb.maven</groupId>
+        <artifactId>tomee-maven-plugin</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+    <repository>
+      <id>prime-repo</id>
+      <name>Prime Technology Maven Repository</name>
+      <url>http://repository.primefaces.org/</url>
+      <layout>default</layout>
+    </repository>
+  </repositories>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>javaee-api</artifactId>
+      <version>6.0-5</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId>
+      <artifactId>myfaces-extcdi-bundle-jsf20</artifactId>
+      <version>${myfaces.codi.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.myfaces.extensions.validator</groupId>
+      <artifactId>myfaces-extval-core</artifactId>
+      <version>${extval.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
+      <artifactId>myfaces-extval-property-validation</artifactId>
+      <version>${extval.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.persistence</groupId>
+          <artifactId>persistence-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
+      <artifactId>myfaces-extval-bean-validation</artifactId>
+      <version>${extval.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.validation</groupId>
+          <artifactId>validation-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-api</artifactId>
+      <version>${myfaces2.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- 3rd party libs -->
+    <dependency>
+      <groupId>org.primefaces</groupId>
+      <artifactId>primefaces</artifactId>
+      <version>2.2</version>
+    </dependency>
+  </dependencies>
+
+  <!--
+  This section allows you to configure where to publish libraries for sharing.
+  It is not required and may be deleted.  For more information see:
+  http://maven.apache.org/plugins/maven-deploy-plugin/
+  -->
+  <distributionManagement>
+    <repository>
+      <id>localhost</id>
+      <url>file://${basedir}/target/repo/</url>
+    </repository>
+    <snapshotRepository>
+      <id>localhost</id>
+      <url>file://${basedir}/target/snapshot-repo/</url>
+    </snapshotRepository>
+  </distributionManagement>
 
 </project>
 

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/CustomJsfModuleConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/CustomJsfModuleConfig.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/CustomJsfModuleConfig.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/CustomJsfModuleConfig.java Wed Aug 21 13:09:35 2013
@@ -23,13 +23,12 @@ import org.apache.myfaces.extensions.cdi
 import javax.enterprise.inject.Specializes;
 
 @Specializes
-public class CustomJsfModuleConfig extends JsfModuleConfig
-{
+public class CustomJsfModuleConfig extends JsfModuleConfig {
+
     private static final long serialVersionUID = 1682809983274206270L;
 
     @Override
-    public boolean isInvalidValueAwareMessageInterpolatorEnabled()
-    {
+    public boolean isInvalidValueAwareMessageInterpolatorEnabled() {
         return false;
     }
 }

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/CustomProjectStage.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/CustomProjectStage.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/CustomProjectStage.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/CustomProjectStage.java Wed Aug 21 13:09:35 2013
@@ -21,10 +21,10 @@ package org.superbiz.myfaces;
 import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
 import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStageHolder;
 
-public class CustomProjectStage implements ProjectStageHolder
-{
-    public static final class Debugging extends ProjectStage
-    {
+public class CustomProjectStage implements ProjectStageHolder {
+
+    public static final class Debugging extends ProjectStage {
+
         private static final long serialVersionUID = -8626602281649294170L;
     }
 

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/DebugPhaseListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/DebugPhaseListener.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/DebugPhaseListener.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/DebugPhaseListener.java Wed Aug 21 13:09:35 2013
@@ -33,25 +33,22 @@ import javax.inject.Inject;
 
 @Advanced
 @JsfPhaseListener
-public class DebugPhaseListener implements PhaseListener
-{
+public class DebugPhaseListener implements PhaseListener {
+
     private static final long serialVersionUID = 5899542118538949019L;
 
     @Inject
     private Logger logger;
 
-    public void beforePhase(PhaseEvent phaseEvent)
-    {
+    public void beforePhase(PhaseEvent phaseEvent) {
         this.logger.info("before " + phaseEvent.getPhaseId());
     }
 
-    public void afterPhase(PhaseEvent phaseEvent)
-    {
+    public void afterPhase(PhaseEvent phaseEvent) {
         this.logger.info("after " + phaseEvent.getPhaseId());
     }
 
-    public PhaseId getPhaseId()
-    {
+    public PhaseId getPhaseId() {
         return PhaseId.ANY_PHASE;
     }
 }

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/AbstractDomainObject.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/AbstractDomainObject.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/AbstractDomainObject.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/AbstractDomainObject.java Wed Aug 21 13:09:35 2013
@@ -18,12 +18,15 @@
  */
 package org.superbiz.myfaces.domain;
 
-import javax.persistence.*;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
 import java.io.Serializable;
 
 @MappedSuperclass
-public abstract class AbstractDomainObject implements Serializable
-{
+public abstract class AbstractDomainObject implements Serializable {
+
     @Id
     @GeneratedValue
     private Long id;
@@ -31,13 +34,11 @@ public abstract class AbstractDomainObje
     @Version
     private Long version;
 
-    public boolean isTransient()
-    {
+    public boolean isTransient() {
         return this.version == null;
     }
 
-    public Long getId()
-    {
+    public Long getId() {
         return id;
     }
 }

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/Comment.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/Comment.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/Comment.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/Comment.java Wed Aug 21 13:09:35 2013
@@ -23,8 +23,8 @@ import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 
 @Entity
-public class Comment extends AbstractDomainObject
-{
+public class Comment extends AbstractDomainObject {
+
     private static final long serialVersionUID = -5718296682587279635L;
 
     @Column(length = 2048)
@@ -33,8 +33,7 @@ public class Comment extends AbstractDom
     @ManyToOne(optional = false)
     private Feedback feedback;
 
-    void setFeedback(Feedback feedback)
-    {
+    void setFeedback(Feedback feedback) {
         this.feedback = feedback;
     }
 
@@ -42,17 +41,14 @@ public class Comment extends AbstractDom
      * generated
      */
 
-    public Comment()
-    {
+    public Comment() {
     }
 
-    public String getDescription()
-    {
+    public String getDescription() {
         return description;
     }
 
-    public void setDescription(String description)
-    {
+    public void setDescription(String description) {
         this.description = description;
     }
 }

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/Feedback.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/Feedback.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/Feedback.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/Feedback.java Wed Aug 21 13:09:35 2013
@@ -26,8 +26,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Entity
-public class Feedback extends AbstractDomainObject
-{
+public class Feedback extends AbstractDomainObject {
+
     private static final long serialVersionUID = -431924785266663236L;
 
     @Column(nullable = false, length = 32)
@@ -39,8 +39,7 @@ public class Feedback extends AbstractDo
     @OneToMany(mappedBy = "feedback", cascade = CascadeType.ALL)
     private List<Comment> comments = new ArrayList<Comment>();
 
-    public void addComment(Comment comment)
-    {
+    public void addComment(Comment comment) {
         comment.setFeedback(this);
         this.comments.add(comment);
     }
@@ -49,28 +48,23 @@ public class Feedback extends AbstractDo
      * generated
      */
 
-    public List<Comment> getComments()
-    {
+    public List<Comment> getComments() {
         return comments;
     }
 
-    public String getTopic()
-    {
+    public String getTopic() {
         return topic;
     }
 
-    public String getDescription()
-    {
+    public String getDescription() {
         return description;
     }
 
-    public void setTopic(String topic)
-    {
+    public void setTopic(String topic) {
         this.topic = topic;
     }
 
-    public void setDescription(String description)
-    {
+    public void setDescription(String description) {
         this.description = description;
     }
 }

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/User.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/User.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/User.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/User.java Wed Aug 21 13:09:35 2013
@@ -18,7 +18,11 @@
  */
 package org.superbiz.myfaces.domain;
 
-import org.superbiz.myfaces.domain.validation.*;
+import org.superbiz.myfaces.domain.validation.DifferentName;
+import org.superbiz.myfaces.domain.validation.Name;
+import org.superbiz.myfaces.domain.validation.Partial;
+import org.superbiz.myfaces.domain.validation.UniqueUserName;
+import org.superbiz.myfaces.domain.validation.UserName;
 
 import javax.enterprise.inject.Typed;
 import javax.persistence.Column;
@@ -33,8 +37,8 @@ import javax.validation.constraints.Size
 @NamedQuery(name = "findUserByName", query = "select u from User u where u.userName = :currentUser")
 @DifferentName(groups = Partial.class)
 @Typed()
-public class User extends AbstractDomainObject
-{
+public class User extends AbstractDomainObject {
+
     private static final long serialVersionUID = 3810638653455000233L;
 
     @UserName(groups = UniqueUserName.class)
@@ -57,54 +61,44 @@ public class User extends AbstractDomain
      * generated
      */
 
-    public User()
-    {
+    public User() {
     }
 
-    public User(String userName, String firstName, String lastName)
-    {
+    public User(String userName, String firstName, String lastName) {
         this.userName = userName;
         this.firstName = firstName;
         this.lastName = lastName;
     }
 
-    public String getUserName()
-    {
+    public String getUserName() {
         return userName;
     }
 
-    public void setUserName(String userName)
-    {
+    public void setUserName(String userName) {
         this.userName = userName;
     }
 
-    public String getFirstName()
-    {
+    public String getFirstName() {
         return firstName;
     }
 
-    public void setFirstName(String firstName)
-    {
+    public void setFirstName(String firstName) {
         this.firstName = firstName;
     }
 
-    public String getLastName()
-    {
+    public String getLastName() {
         return lastName;
     }
 
-    public void setLastName(String lastName)
-    {
+    public void setLastName(String lastName) {
         this.lastName = lastName;
     }
 
-    public String getPassword()
-    {
+    public String getPassword() {
         return password;
     }
 
-    public void setPassword(String password)
-    {
+    public void setPassword(String password) {
         this.password = password;
     }
 }

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/DifferentName.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/DifferentName.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/DifferentName.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/DifferentName.java Wed Aug 21 13:09:35 2013
@@ -29,8 +29,8 @@ import static java.lang.annotation.Reten
 @Constraint(validatedBy = DifferentNameValidator.class)
 @Target(TYPE)
 @Retention(RUNTIME)
-public @interface DifferentName
-{
+public @interface DifferentName {
+
     String message() default "invalid name";
 
     Class<?>[] groups() default {};

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/DifferentNameValidator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/DifferentNameValidator.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/DifferentNameValidator.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/DifferentNameValidator.java Wed Aug 21 13:09:35 2013
@@ -23,14 +23,12 @@ import org.superbiz.myfaces.domain.User;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
-public class DifferentNameValidator implements ConstraintValidator<DifferentName, User>
-{
-    public void initialize(DifferentName differentName)
-    {
+public class DifferentNameValidator implements ConstraintValidator<DifferentName, User> {
+
+    public void initialize(DifferentName differentName) {
     }
 
-    public boolean isValid(User person, ConstraintValidatorContext constraintValidatorContext)
-    {
+    public boolean isValid(User person, ConstraintValidatorContext constraintValidatorContext) {
         return person == null || !(person.getFirstName() != null && person.getFirstName().equals(person.getLastName()));
     }
 }

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/Full.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/Full.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/Full.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/Full.java Wed Aug 21 13:09:35 2013
@@ -22,6 +22,6 @@ import javax.validation.GroupSequence;
 import javax.validation.groups.Default;
 
 @GroupSequence({Default.class, UniqueUserName.class})
-public interface Full
-{
+public interface Full {
+
 }

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/Name.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/Name.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/Name.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/Name.java Wed Aug 21 13:09:35 2013
@@ -26,9 +26,9 @@ import javax.validation.constraints.Size
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Size(min = 2, max = 20)
@@ -39,8 +39,8 @@ import static java.lang.annotation.Reten
 
 @Target({METHOD, FIELD, ANNOTATION_TYPE})
 @Retention(RUNTIME)
-public @interface Name
-{
+public @interface Name {
+
     public abstract String message() default "invalid name";
 
     public abstract Class<?>[] groups() default {};

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/Partial.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/Partial.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/Partial.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/Partial.java Wed Aug 21 13:09:35 2013
@@ -18,6 +18,6 @@
  */
 package org.superbiz.myfaces.domain.validation;
 
-public interface Partial
-{
+public interface Partial {
+
 }
\ No newline at end of file

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/UniqueUserName.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/UniqueUserName.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/UniqueUserName.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/UniqueUserName.java Wed Aug 21 13:09:35 2013
@@ -18,6 +18,6 @@
  */
 package org.superbiz.myfaces.domain.validation;
 
-public interface UniqueUserName
-{
+public interface UniqueUserName {
+
 }
\ No newline at end of file

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/UniqueUserNameValidator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/UniqueUserNameValidator.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/UniqueUserNameValidator.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/UniqueUserNameValidator.java Wed Aug 21 13:09:35 2013
@@ -28,17 +28,15 @@ import javax.validation.ConstraintValida
 
 @Advanced
 @ApplicationScoped
-public class UniqueUserNameValidator implements ConstraintValidator<UserName, String>
-{
+public class UniqueUserNameValidator implements ConstraintValidator<UserName, String> {
+
     @Inject
     private UserRepository userRepository;
 
-    public void initialize(UserName differentName)
-    {
+    public void initialize(UserName differentName) {
     }
 
-    public boolean isValid(String userName, ConstraintValidatorContext constraintValidatorContext)
-    {
+    public boolean isValid(String userName, ConstraintValidatorContext constraintValidatorContext) {
         return this.userRepository.loadUser(userName) == null;
     }
 }

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/UserName.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/UserName.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/UserName.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/domain/validation/UserName.java Wed Aug 21 13:09:35 2013
@@ -35,8 +35,8 @@ import static java.lang.annotation.Reten
 @Constraint(validatedBy = UniqueUserNameValidator.class)
 @Target(FIELD)
 @Retention(RUNTIME)
-public @interface UserName
-{
+public @interface UserName {
+
     String message() default "user-name exists already";
 
     Class<?>[] groups() default {};

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/repository/FeedbackRepository.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/repository/FeedbackRepository.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/repository/FeedbackRepository.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/repository/FeedbackRepository.java Wed Aug 21 13:09:35 2013
@@ -20,6 +20,6 @@ package org.superbiz.myfaces.repository;
 
 import org.superbiz.myfaces.domain.Feedback;
 
-public interface FeedbackRepository extends GenericRepository<Feedback>
-{
+public interface FeedbackRepository extends GenericRepository<Feedback> {
+
 }

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/repository/GenericRepository.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/repository/GenericRepository.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/repository/GenericRepository.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/repository/GenericRepository.java Wed Aug 21 13:09:35 2013
@@ -23,8 +23,8 @@ import org.superbiz.myfaces.domain.Abstr
 import java.io.Serializable;
 import java.util.List;
 
-public interface GenericRepository<T extends AbstractDomainObject> extends Serializable
-{
+public interface GenericRepository<T extends AbstractDomainObject> extends Serializable {
+
     void save(T entity);
 
     void remove(T entity);

Modified: tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/repository/Repository.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/repository/Repository.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/repository/Repository.java (original)
+++ tomee/tomee/trunk/examples/myfaces-codi-demo/src/main/java/org/superbiz/myfaces/repository/Repository.java Wed Aug 21 13:09:35 2013
@@ -37,6 +37,6 @@ import static java.lang.annotation.Reten
 
 @RequestScoped
 @Transactional
-public @interface Repository
-{
+public @interface Repository {
+
 }



Mime
View raw message