You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2009/07/21 18:59:00 UTC
svn commit: r796381 - in
/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence:
./ criteria/ spi/
Author: dwoods
Date: Tue Jul 21 16:59:00 2009
New Revision: 796381
URL: http://svn.apache.org/viewvc?rev=796381&view=rev
Log:
GERONIMO-4410 API updates from 20090720
Added:
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnitUtil.java (with props)
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ProviderUtil.java (with props)
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/SharedCacheMode.java (with props)
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ValidationMode.java (with props)
Removed:
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ValidationMode.java
Modified:
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManagerFactory.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CompoundSelection.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProvider.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolver.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitInfo.java
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManagerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManagerFactory.java?rev=796381&r1=796380&r2=796381&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManagerFactory.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManagerFactory.java Tue Jul 21 16:59:00 2009
@@ -34,21 +34,20 @@
public interface EntityManagerFactory {
- public EntityManager createEntityManager();
+ public EntityManager createEntityManager();
+ public EntityManager createEntityManager(Map map);
- public EntityManager createEntityManager(Map map);
+ public QueryBuilder getQueryBuilder();
+ public Metamodel getMetamodel();
- public QueryBuilder getQueryBuilder();
+ public boolean isOpen();
+ public void close();
- public Metamodel getMetamodel();
+ public Map<String, Object> getProperties();
- public boolean isOpen();
+ public Set<String> getSupportedProperties();
- public void close();
+ public Cache getCache();
- public Map<String, Object> getProperties();
-
- public Set<String> getSupportedProperties();
-
- public Cache getCache();
+ public PersistenceUnitUtil getPersistenceUnitUtil();
}
Added: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnitUtil.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnitUtil.java?rev=796381&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnitUtil.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnitUtil.java Tue Jul 21 16:59:00 2009
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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;
+
+
+public interface PersistenceUnitUtil extends PersistenceUtil {
+
+ public boolean isLoaded(Object entity, String attributeName);
+
+ public boolean isLoaded(Object entity);
+
+ public Object getIdentifier(Object entity);
+}
Propchange: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnitUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CompoundSelection.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CompoundSelection.java?rev=796381&r1=796380&r2=796381&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CompoundSelection.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CompoundSelection.java Tue Jul 21 16:59:00 2009
@@ -25,10 +25,5 @@
package javax.persistence.criteria;
-import java.util.List;
-
-public interface CompoundSelection<X> extends Selection<X> {
-
- List<Selection<?>> getSelectionItems();
-}
+public interface CompoundSelection<X> extends Selection<X> {}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java?rev=796381&r1=796380&r2=796381&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java Tue Jul 21 16:59:00 2009
@@ -52,7 +52,7 @@
CriteriaQuery<T> distinct(boolean distinct);
- Class getResultType();
+ Class<T> getResultType();
List<Order> getOrderList();
Set<ParameterExpression<?>> getParameters();
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProvider.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProvider.java?rev=796381&r1=796380&r2=796381&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProvider.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProvider.java Tue Jul 21 16:59:00 2009
@@ -35,12 +35,6 @@
public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info, Map map);
- public LoadState isLoadedWithoutReference(Object entity,
- String attributeName);
-
- public LoadState isLoadedWithReference(Object entity,
- String attributeName);
-
- public LoadState isLoaded(Object entity);
+ public ProviderUtil getProviderUtil();
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolver.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolver.java?rev=796381&r1=796380&r2=796381&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolver.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolver.java Tue Jul 21 16:59:00 2009
@@ -30,5 +30,7 @@
public interface PersistenceProviderResolver {
- List<PersistenceProvider> getPersistenceProviders();
-}
+ List<PersistenceProvider> getPersistenceProviders();
+
+ public void clearCachedProviders();
+}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitInfo.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitInfo.java?rev=796381&r1=796380&r2=796381&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitInfo.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitInfo.java Tue Jul 21 16:59:00 2009
@@ -33,40 +33,40 @@
public interface PersistenceUnitInfo {
- public String getPersistenceUnitName();
+ public String getPersistenceUnitName();
- public String getPersistenceProviderClassName();
+ public String getPersistenceProviderClassName();
- public PersistenceUnitTransactionType getTransactionType();
+ public PersistenceUnitTransactionType getTransactionType();
- public DataSource getJtaDataSource();
+ public DataSource getJtaDataSource();
- public DataSource getNonJtaDataSource();
+ public DataSource getNonJtaDataSource();
- public List<String> getMappingFileNames();
+ public List<String> getMappingFileNames();
- public List<URL> getJarFileUrls();
+ public List<URL> getJarFileUrls();
- public URL getPersistenceUnitRootUrl();
+ public URL getPersistenceUnitRootUrl();
- public List<String> getManagedClassNames();
+ public List<String> getManagedClassNames();
- public boolean excludeUnlistedClasses();
+ public boolean excludeUnlistedClasses();
- public Caching getCaching();
+ public SharedCacheMode getSharedCacheMode();
- public ValidationMode getValidationMode();
+ public ValidationMode getValidationMode();
- public Properties getProperties();
+ public Properties getProperties();
- public String PersistenceXMLSchemaVersion();
+ public String PersistenceXMLSchemaVersion();
- public ClassLoader getClassLoader();
+ public ClassLoader getClassLoader();
- public void addTransformer(ClassTransformer transformer);
+ public void addTransformer(ClassTransformer transformer);
- public ClassLoader getNewTempClassLoader();
+ public ClassLoader getNewTempClassLoader();
}
Added: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ProviderUtil.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ProviderUtil.java?rev=796381&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ProviderUtil.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ProviderUtil.java Tue Jul 21 16:59:00 2009
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.spi;
+
+
+public interface ProviderUtil {
+
+ public LoadState isLoadedWithoutReference(Object entity, String attributeName);
+
+ public LoadState isLoadedWithReference(Object entity, String attributeName);
+
+ public LoadState isLoaded(Object entity);
+}
Propchange: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ProviderUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/SharedCacheMode.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/SharedCacheMode.java?rev=796381&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/SharedCacheMode.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/SharedCacheMode.java Tue Jul 21 16:59:00 2009
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.spi;
+
+public enum SharedCacheMode {
+ ALL,
+ NONE,
+ ENABLE_SELECTIVE,
+ DISABLE_SELECTIVE,
+ UNSPECIFIED
+}
Propchange: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/SharedCacheMode.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ValidationMode.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ValidationMode.java?rev=796381&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ValidationMode.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ValidationMode.java Tue Jul 21 16:59:00 2009
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.spi;
+
+public enum ValidationMode {
+ AUTO,
+ CALLBACK,
+ NONE
+}
Propchange: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ValidationMode.java
------------------------------------------------------------------------------
svn:eol-style = native