geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r424886 - in /geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence: ./ spi/
Date Mon, 24 Jul 2006 02:50:49 GMT
Author: jgenender
Date: Sun Jul 23 19:50:48 2006
New Revision: 424886

URL: http://svn.apache.org/viewvc?rev=424886&view=rev
Log:
Updated to EJB3 spec final

Modified:
    geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/DiscriminatorColumn.java
    geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityManager.java
    geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityManagerFactory.java
    geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityTransaction.java
    geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/FlushMode.java
    geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/JoinColumn.java
    geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/LockMode.java
    geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PersistenceContext.java
    geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PersistenceException.java
    geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java
    geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/SequenceGenerator.java
    geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/spi/PersistenceProvider.java

Modified: geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/DiscriminatorColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/DiscriminatorColumn.java?rev=424886&r1=424885&r2=424886&view=diff
==============================================================================
--- geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/DiscriminatorColumn.java
(original)
+++ geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/DiscriminatorColumn.java
Sun Jul 23 19:50:48 2006
@@ -33,7 +33,7 @@
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface DiscriminatorColumn {
-    String name() default "";
+    String name() default "DTYPE";
 
     DiscriminatorType discriminatorType() default DiscriminatorType.STRING;
 

Modified: geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityManager.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityManager.java?rev=424886&r1=424885&r2=424886&view=diff
==============================================================================
--- geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityManager.java
(original)
+++ geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityManager.java
Sun Jul 23 19:50:48 2006
@@ -26,45 +26,50 @@
  * @version $Revision$ $Date$
  */
 public interface EntityManager {
-    
-    public void persist(Object entity); 
-    
-    public <T> T merge(T entity);
-    
-    public void remove(Object entity); 
-
-    public <T> T find(Class<T> entityClass, Object primaryKey); 
-    
-    public <T> T getReference(Class<T> entityClass, Object primaryKey); 
-    
-    public void flush();
-    
-    public void setFlushMode(FlushModeType flushMode);
-    
-    public FlushModeType getFlushMode(); 
-
-    // TODO: Comment this out as LockModeType is knowhere to be found in the spec
-    //public void lock(Object entity, LockModeType lockMode);
-    
-    public void refresh(Object entity); 
-    
-    public void clear();
-    
-    public boolean contains(Object entity);
-    
-    public Query createQuery(String ejbqlString);
-    
-    public Query createNamedQuery(String name); 
-    
-    public Query createNativeQuery(String sqlString);
-    
-    public Query createNativeQuery(String sqlString, Class resultClass);
-    
-    public Query createNativeQuery(String sqlString, String resultSetMapping);
-    
-    public void close();
-    
-    public boolean isOpen();
-    
-    public EntityTransaction getTransaction();
+
+	public void persist(Object entity);
+
+	public <T> T merge(T entity);
+
+	public void remove(Object entity);
+
+	public <T> T find(Class<T> entityClass, Object primaryKey);
+
+	public <T> T getReference(Class<T> entityClass, Object primaryKey);
+
+	public void flush();
+
+	public void setFlushMode(FlushModeType flushMode);
+
+	public FlushModeType getFlushMode();
+
+	// TODO: Comment this out as LockModeType is knowhere to be found in the
+	// spec
+	// public void lock(Object entity, LockModeType lockMode);
+
+	public void refresh(Object entity);
+
+	public void clear();
+
+	public boolean contains(Object entity);
+
+	public Query createQuery(String ejbqlString);
+
+	public Query createNamedQuery(String name);
+
+	public Query createNativeQuery(String sqlString);
+
+	public Query createNativeQuery(String sqlString, Class resultClass);
+
+	public Query createNativeQuery(String sqlString, String resultSetMapping);
+
+	public void close();
+
+	public boolean isOpen();
+
+	public EntityTransaction getTransaction();
+
+	public void joinTransaction();
+
+	public Object getDelegate();
 }

Modified: geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityManagerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityManagerFactory.java?rev=424886&r1=424885&r2=424886&view=diff
==============================================================================
--- geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityManagerFactory.java
(original)
+++ geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityManagerFactory.java
Sun Jul 23 19:50:48 2006
@@ -22,18 +22,18 @@
 //
 package javax.persistence;
 
+import java.util.Map;
+
 /**
  * @version $Revision$ $Date$
  */
 public interface EntityManagerFactory {
-    
-    EntityManager createEntityManager(); 
-    
-    EntityManager createEntityManager(PersistenceContextType type);
-    
-    EntityManager getEntityManager(); 
-    
-    void close(); 
 
-    public boolean isOpen();
+	EntityManager createEntityManager();
+	
+	EntityManager createEntityManager(Map map);
+
+	void close();
+
+	public boolean isOpen();
 }

Modified: geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityTransaction.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityTransaction.java?rev=424886&r1=424885&r2=424886&view=diff
==============================================================================
--- geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityTransaction.java
(original)
+++ geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/EntityTransaction.java
Sun Jul 23 19:50:48 2006
@@ -26,11 +26,16 @@
  * @version $Revision$ $Date$
  */
 public interface EntityTransaction {
-    public void begin();
+	public void begin();
+
+	public void commit();
+
+	public void rollback();
+
+	public boolean isActive();
+
+	public void setRollbackOnly();
+
+	public boolean getRollbackOnly();
 
-    public void commit();
-    
-    public void rollback();
-    
-    public boolean isActive();
 }

Modified: geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/FlushMode.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/FlushMode.java?rev=424886&r1=424885&r2=424886&view=diff
==============================================================================
--- geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/FlushMode.java
(original)
+++ geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/FlushMode.java
Sun Jul 23 19:50:48 2006
@@ -1,37 +0,0 @@
-/**
- *
- * Copyright 2006 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.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Revision$ $Date$
- */
-@Target( { ElementType.METHOD, ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface FlushMode {
-    FlushModeType value() default FlushModeType.AUTO;
-}
\ No newline at end of file

Modified: geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/JoinColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/JoinColumn.java?rev=424886&r1=424885&r2=424886&view=diff
==============================================================================
--- geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/JoinColumn.java
(original)
+++ geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/JoinColumn.java
Sun Jul 23 19:50:48 2006
@@ -31,7 +31,7 @@
 /**
  * @version $Revision$ $Date$
  */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface JoinColumn {
     String name() default "";

Modified: geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/LockMode.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/LockMode.java?rev=424886&r1=424885&r2=424886&view=diff
==============================================================================
--- geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/LockMode.java
(original)
+++ geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/LockMode.java
Sun Jul 23 19:50:48 2006
@@ -1,30 +0,0 @@
-/**
- * 
- * Copyright 2006 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. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.persistence;
-
-/**
- * @version $Revision$ $Date$
- */
-public enum LockMode {
-    READ, WRITE
-}

Modified: geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PersistenceContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PersistenceContext.java?rev=424886&r1=424885&r2=424886&view=diff
==============================================================================
--- geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PersistenceContext.java
(original)
+++ geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PersistenceContext.java
Sun Jul 23 19:50:48 2006
@@ -33,10 +33,12 @@
 @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface PersistenceContext {
-    String name() default "";
+	String name() default "";
 
-    String unitName() default "";
+	String unitName() default "";
 
-    PersistenceContextType type() default PersistenceContextType.TRANSACTION;
+	PersistenceContextType type() default PersistenceContextType.TRANSACTION;
+
+	PersistenceProperty[] properties() default {};
 }
 

Modified: geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PersistenceException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PersistenceException.java?rev=424886&r1=424885&r2=424886&view=diff
==============================================================================
--- geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PersistenceException.java
(original)
+++ geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PersistenceException.java
Sun Jul 23 19:50:48 2006
@@ -26,9 +26,7 @@
  * @version $Revision$ $Date$
  */
 public class PersistenceException extends RuntimeException {
-    /**
-     * 
-     */
+ 
     private static final long serialVersionUID = -8734504053550505412L;
 
     public PersistenceException() {

Modified: geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java?rev=424886&r1=424885&r2=424886&view=diff
==============================================================================
--- geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java
(original)
+++ geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java
Sun Jul 23 19:50:48 2006
@@ -30,7 +30,7 @@
 /**
  * @version $Revision$ $Date$
  */
-@Target({ElementType.TYPE})
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface PrimaryKeyJoinColumns {
     PrimaryKeyJoinColumn[] value();

Modified: geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/SequenceGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/SequenceGenerator.java?rev=424886&r1=424885&r2=424886&view=diff
==============================================================================
--- geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/SequenceGenerator.java
(original)
+++ geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/SequenceGenerator.java
Sun Jul 23 19:50:48 2006
@@ -37,7 +37,7 @@
 
     String sequenceName() default "";
 
-    int initialValue() default 0;
+    int initialValue() default 1;
 
     int allocationSize() default 50;
 }

Modified: geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/spi/PersistenceProvider.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/spi/PersistenceProvider.java?rev=424886&r1=424885&r2=424886&view=diff
==============================================================================
--- geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/spi/PersistenceProvider.java
(original)
+++ geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/src/main/java/javax/persistence/spi/PersistenceProvider.java
Sun Jul 23 19:50:48 2006
@@ -34,6 +34,6 @@
             Map map);
 
     public EntityManagerFactory createContainerManagerFactory(
-            PersistenceUnitInfo info);
+            PersistenceUnitInfo info, Map map);
 
 }



Mime
View raw message