You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2014/02/15 20:20:34 UTC

[1/3] git commit: Minor code clean up

Repository: tapestry-5
Updated Branches:
  refs/heads/master a4fe5cedc -> 6b4e7a04c


Minor code clean up


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/7152f8dc
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/7152f8dc
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/7152f8dc

Branch: refs/heads/master
Commit: 7152f8dceb0de8a8f0e0ae66aef16534406684f0
Parents: a4fe5ce
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Sat Feb 15 14:19:39 2014 -0500
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Sat Feb 15 14:19:39 2014 -0500

----------------------------------------------------------------------
 .../java/org/apache/tapestry5/jpa/modules/JpaModule.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7152f8dc/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
index ff4be4f..acb0db9 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
@@ -1,4 +1,4 @@
-// Copyright 2011-2013 The Apache Software Foundation
+// Copyright 2011-2014 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -180,10 +180,9 @@ public class JpaModule
     public static void startupEarly(final EntityManagerManager entityManagerManager, @Symbol(JpaSymbols.EARLY_START_UP)
     final boolean earlyStartup)
     {
-        if (!earlyStartup)
-            return;
-
-        entityManagerManager.getEntityManagers();
-
+        if (earlyStartup)
+        {
+            entityManagerManager.getEntityManagers();
+        }
     }
 }


[2/3] git commit: Add missing @since javadoc tags

Posted by hl...@apache.org.
Add missing @since javadoc tags


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/20e1711f
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/20e1711f
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/20e1711f

Branch: refs/heads/master
Commit: 20e1711fdf343694d47c7f9bdcab13a6077070ba
Parents: 7152f8d
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Sat Feb 15 14:20:04 2014 -0500
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Sat Feb 15 14:20:04 2014 -0500

----------------------------------------------------------------------
 .../org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/20e1711f/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java
index e1b193f..4c3c0d0 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java
@@ -1,4 +1,4 @@
-// Copyright 2011, 2013 The Apache Software Foundation
+// Copyright 2011, 2014 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -161,11 +161,13 @@ public interface TapestryPersistenceUnitInfo extends PersistenceUnitInfo
      *
      * @param properties
      *         properties to initialize EntityManagerFactory with
+     *         @since 5.4
      */
     TapestryPersistenceUnitInfo setEntityManagerProperties(Map properties);
 
     /**
-     * @return Returns the supplied EntityManagerFactory properties. Returns null if not set
+     * @return Returns the supplied EntityManagerFactory properties. Returns null if not set.
+     * @since 5.4
      */
     Map getEntityManagerProperties();
 }


[3/3] git commit: Add missing years to copyright

Posted by hl...@apache.org.
Add missing years to copyright


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6b4e7a04
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6b4e7a04
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6b4e7a04

Branch: refs/heads/master
Commit: 6b4e7a04c7a378c1feff9279f78ed91473c2c027
Parents: 20e1711
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Sat Feb 15 14:20:24 2014 -0500
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Sat Feb 15 14:20:24 2014 -0500

----------------------------------------------------------------------
 .../jpa/EntityManagerSourceImplTest.java         | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6b4e7a04/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
index 9ccbafc..0cab6d4 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
@@ -1,4 +1,4 @@
-// Copyright 2011 The Apache Software Foundation
+// Copyright 2011-2014 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,12 +14,6 @@
 
 package org.apache.tapestry5.internal.jpa;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-import javax.persistence.spi.PersistenceUnitTransactionType;
-
 import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
 import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
 import org.apache.tapestry5.jpa.PersistenceUnitConfigurer;
@@ -28,6 +22,11 @@ import org.apache.tapestry5.test.TapestryTestCase;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.Test;
 
+import javax.persistence.EntityManager;
+import javax.persistence.spi.PersistenceUnitTransactionType;
+import java.util.HashMap;
+import java.util.Map;
+
 public class EntityManagerSourceImplTest extends TapestryTestCase
 {
     @Test
@@ -62,7 +61,7 @@ public class EntityManagerSourceImplTest extends TapestryTestCase
         PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
         {
             @SuppressWarnings(
-            { "unchecked", "rawtypes" })
+                    {"unchecked", "rawtypes"})
             public void configure(TapestryPersistenceUnitInfo unitInfo)
             {
                 Map properties = new HashMap();
@@ -79,11 +78,11 @@ public class EntityManagerSourceImplTest extends TapestryTestCase
         };
 
         Map<String, PersistenceUnitConfigurer> configurerMap = CollectionFactory
-                .<String, PersistenceUnitConfigurer> newMap();
+                .<String, PersistenceUnitConfigurer>newMap();
         configurerMap.put("defaultpropertytest", configurer);
         EntityManagerSourceImpl emSource = new EntityManagerSourceImpl(
                 LoggerFactory.getLogger(EntityManagerSourceImplTest.class), new ClasspathResource(
-                        "single-persistence-unit.xml"), null, configurerMap);
+                "single-persistence-unit.xml"), null, configurerMap);
         EntityManager em = emSource.createEntityManagerFactory("defaultpropertytest")
                 .createEntityManager();
         assertEquals(em.getProperties().get("MYKEY"), "MYVALUE");


[3/3] git commit: Add missing years to copyright

Posted by hl...@apache.org.
Add missing years to copyright


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6b4e7a04
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6b4e7a04
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6b4e7a04

Branch: refs/heads/master
Commit: 6b4e7a04c7a378c1feff9279f78ed91473c2c027
Parents: 20e1711
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Sat Feb 15 14:20:24 2014 -0500
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Sat Feb 15 14:20:24 2014 -0500

----------------------------------------------------------------------
 .../jpa/EntityManagerSourceImplTest.java         | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6b4e7a04/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
index 9ccbafc..0cab6d4 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
@@ -1,4 +1,4 @@
-// Copyright 2011 The Apache Software Foundation
+// Copyright 2011-2014 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,12 +14,6 @@
 
 package org.apache.tapestry5.internal.jpa;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-import javax.persistence.spi.PersistenceUnitTransactionType;
-
 import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
 import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
 import org.apache.tapestry5.jpa.PersistenceUnitConfigurer;
@@ -28,6 +22,11 @@ import org.apache.tapestry5.test.TapestryTestCase;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.Test;
 
+import javax.persistence.EntityManager;
+import javax.persistence.spi.PersistenceUnitTransactionType;
+import java.util.HashMap;
+import java.util.Map;
+
 public class EntityManagerSourceImplTest extends TapestryTestCase
 {
     @Test
@@ -62,7 +61,7 @@ public class EntityManagerSourceImplTest extends TapestryTestCase
         PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
         {
             @SuppressWarnings(
-            { "unchecked", "rawtypes" })
+                    {"unchecked", "rawtypes"})
             public void configure(TapestryPersistenceUnitInfo unitInfo)
             {
                 Map properties = new HashMap();
@@ -79,11 +78,11 @@ public class EntityManagerSourceImplTest extends TapestryTestCase
         };
 
         Map<String, PersistenceUnitConfigurer> configurerMap = CollectionFactory
-                .<String, PersistenceUnitConfigurer> newMap();
+                .<String, PersistenceUnitConfigurer>newMap();
         configurerMap.put("defaultpropertytest", configurer);
         EntityManagerSourceImpl emSource = new EntityManagerSourceImpl(
                 LoggerFactory.getLogger(EntityManagerSourceImplTest.class), new ClasspathResource(
-                        "single-persistence-unit.xml"), null, configurerMap);
+                "single-persistence-unit.xml"), null, configurerMap);
         EntityManager em = emSource.createEntityManagerFactory("defaultpropertytest")
                 .createEntityManager();
         assertEquals(em.getProperties().get("MYKEY"), "MYVALUE");


[2/3] git commit: Add missing @since javadoc tags

Posted by hl...@apache.org.
Add missing @since javadoc tags


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/20e1711f
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/20e1711f
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/20e1711f

Branch: refs/heads/master
Commit: 20e1711fdf343694d47c7f9bdcab13a6077070ba
Parents: 7152f8d
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Sat Feb 15 14:20:04 2014 -0500
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Sat Feb 15 14:20:04 2014 -0500

----------------------------------------------------------------------
 .../org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/20e1711f/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java
index e1b193f..4c3c0d0 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java
@@ -1,4 +1,4 @@
-// Copyright 2011, 2013 The Apache Software Foundation
+// Copyright 2011, 2014 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -161,11 +161,13 @@ public interface TapestryPersistenceUnitInfo extends PersistenceUnitInfo
      *
      * @param properties
      *         properties to initialize EntityManagerFactory with
+     *         @since 5.4
      */
     TapestryPersistenceUnitInfo setEntityManagerProperties(Map properties);
 
     /**
-     * @return Returns the supplied EntityManagerFactory properties. Returns null if not set
+     * @return Returns the supplied EntityManagerFactory properties. Returns null if not set.
+     * @since 5.4
      */
     Map getEntityManagerProperties();
 }