openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From allee8...@apache.org
Subject svn commit: r1195104 - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations: ChildChildClass.java ChildClass.java GrandChildClass.java ParentClass.java TestJoinedMultiInheritanceHierarchy.java
Date Sun, 30 Oct 2011 03:28:05 GMT
Author: allee8285
Date: Sun Oct 30 03:28:05 2011
New Revision: 1195104

URL: http://svn.apache.org/viewvc?rev=1195104&view=rev
Log:
OPENJPA-2066 build failure due to eol style mis-match. Add eol-style=native and lf -> cr/lf
fix up.

Modified:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildChildClass.java
  (contents, props changed)
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildClass.java
  (contents, props changed)
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChildClass.java
  (contents, props changed)
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ParentClass.java
  (contents, props changed)
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedMultiInheritanceHierarchy.java
  (contents, props changed)

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildChildClass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildChildClass.java?rev=1195104&r1=1195103&r2=1195104&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildChildClass.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildChildClass.java
Sun Oct 30 03:28:05 2011
@@ -14,15 +14,12 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 package org.apache.openjpa.persistence.relations;
 
 import javax.persistence.*;
-import org.apache.openjpa.persistence.FetchAttribute;
-import org.apache.openjpa.persistence.FetchGroup;
-import org.apache.openjpa.persistence.FetchGroups;
 
 @Entity
 @Inheritance(strategy=InheritanceType.JOINED)
@@ -42,10 +39,9 @@ public class ChildChildClass extends Chi
     public void setName2(String name2) {
         this.name2 = name2;
     }
-    
+
     @Override
     public String toString() {
         return super.toString()+"\n"+"Name2: "+name2+"\n";
     }
 }
-

Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildChildClass.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildClass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildClass.java?rev=1195104&r1=1195103&r2=1195104&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildClass.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildClass.java
Sun Oct 30 03:28:05 2011
@@ -14,15 +14,12 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 package org.apache.openjpa.persistence.relations;
 
 import javax.persistence.*;
-import org.apache.openjpa.persistence.FetchAttribute;
-import org.apache.openjpa.persistence.FetchGroup;
-import org.apache.openjpa.persistence.FetchGroups;
 
 @Entity
 @Inheritance(strategy=InheritanceType.JOINED)
@@ -35,7 +32,7 @@ public class ChildClass extends ParentCl
     public ChildClass() {
         super();
     }
-    
+
     public String getName() {
         return name;
     }
@@ -62,3 +59,4 @@ public class ChildClass extends ParentCl
         return sBuf.toString();
     }
 }
+

Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildClass.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChildClass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChildClass.java?rev=1195104&r1=1195103&r2=1195104&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChildClass.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChildClass.java
Sun Oct 30 03:28:05 2011
@@ -14,26 +14,26 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 package org.apache.openjpa.persistence.relations;
 
 import javax.persistence.*;
-import org.apache.openjpa.persistence.PersistentCollection;
 
 @Entity
 @Inheritance(strategy=InheritanceType.JOINED)
 public class GrandChildClass extends ChildChildClass {
- 
+
     @Basic(fetch=FetchType.EAGER)
     private String someUnloadedField;
 
     public String getSomeUnloadedString() {
         return someUnloadedField;
     }
-    
+
     public String toString() {
         return super.toString() + "SomeUnloadedField: " + someUnloadedField + "\n";
     }
 }
+

Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChildClass.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ParentClass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ParentClass.java?rev=1195104&r1=1195103&r2=1195104&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ParentClass.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ParentClass.java
Sun Oct 30 03:28:05 2011
@@ -14,7 +14,7 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 package org.apache.openjpa.persistence.relations;
@@ -43,8 +43,9 @@ public abstract class ParentClass {
     public Set<String> getItems() {
         return items;
     }
-    
+
     public void setItems(Collection<String> items) {
         this.items.addAll(items);
     }
 }
+

Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ParentClass.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedMultiInheritanceHierarchy.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedMultiInheritanceHierarchy.java?rev=1195104&r1=1195103&r2=1195104&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedMultiInheritanceHierarchy.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedMultiInheritanceHierarchy.java
Sun Oct 30 03:28:05 2011
@@ -14,33 +14,29 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 package org.apache.openjpa.persistence.relations;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
 import java.util.Collection;
 
-import org.apache.openjpa.meta.FetchGroup;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.PersistenceException;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestJoinedMultiInheritanceHierarchy
     extends SingleEMFTestCase {
-    
+
     public void setUp() {
-        super.setUp( CLEAR_TABLES, ChildChildClass.class, ChildClass.class, 
+        super.setUp( CLEAR_TABLES, ChildChildClass.class, ChildClass.class,
                      GrandChildClass.class, ParentClass.class,
                      "openjpa.BrokerImpl", "EvictFromDataCache=true" );
     }
-    
+
     public void testCacheSqlGeneration() throws PersistenceException {
         OpenJPAEntityManager em = emf.createEntityManager();
-        
+
         em.getTransaction().begin();
         final GrandChildClass notEmpty = new GrandChildClass();
         notEmpty.setName("Not empty object");
@@ -48,19 +44,20 @@ public class TestJoinedMultiInheritanceH
         for (int i = 0; i < 5; i++) {
             itemSet.add(notEmpty.getName() + " : item n." + i);
         }
-        
+
         notEmpty.setItems(itemSet);
-        
+
         final GrandChildClass empty = new GrandChildClass();
         empty.setName("empty object");
-        
+
         em.persist(notEmpty);
         em.persist(empty);
         em.getTransaction().commit();
-        
+
         em.evictAll();
         assertTrue(empty.getItems().isEmpty());
     }
-    
+
 }
 
+

Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedMultiInheritanceHierarchy.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message