Author: andyj
Date: Mon Jun 15 13:21:00 2009
New Revision: 784770
URL: http://svn.apache.org/viewvc?rev=784770&view=rev
Log:
JDO-615 Applied patches "type-2.patch" (which din't apply correctly since didn't rename the
class), and "lower-case-d-in-metadata.patch"
Added:
db/jdo/trunk/api2/src/java/javax/jdo/metadata/TypeMetadata.java
- copied, changed from r784768, db/jdo/trunk/api2/src/java/javax/jdo/metadata/ComponentMetadata.java
Removed:
db/jdo/trunk/api2/src/java/javax/jdo/metadata/ComponentMetadata.java
Modified:
db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java
db/jdo/trunk/api2/src/java/javax/jdo/metadata/ClassMetadata.java
db/jdo/trunk/api2/src/java/javax/jdo/metadata/InheritanceMetadata.java
db/jdo/trunk/api2/src/java/javax/jdo/metadata/InterfaceMetadata.java
db/jdo/trunk/api2/src/java/javax/jdo/metadata/Metadata.java
db/jdo/trunk/api2/src/java/javax/jdo/metadata/package.html
Modified: db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java?rev=784770&r1=784769&r2=784770&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java Mon Jun 15 13:21:00
2009
@@ -24,7 +24,7 @@
import javax.jdo.datastore.DataStoreCache;
import javax.jdo.listener.InstanceLifecycleListener;
-import javax.jdo.metadata.ComponentMetadata;
+import javax.jdo.metadata.TypeMetadata;
import javax.jdo.metadata.JDOMetadata;
import javax.jdo.spi.JDOPermission; // for getFetchGroups javadoc
import java.io.Serializable;
@@ -746,5 +746,5 @@
* @return The metadata
* @since 2.3
*/
- ComponentMetadata getMetadata(String className);
+ TypeMetadata getMetadata(String className);
}
Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/ClassMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/ClassMetadata.java?rev=784770&r1=784769&r2=784770&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/ClassMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/ClassMetadata.java Mon Jun 15 13:21:00 2009
@@ -22,7 +22,7 @@
* Represents a class.
* @since 2.3
*/
-public interface ClassMetadata extends ComponentMetadata {
+public interface ClassMetadata extends TypeMetadata {
/**
* Method to define the persistence modifier.
* @param mod persistence modifier
Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/InheritanceMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/InheritanceMetadata.java?rev=784770&r1=784769&r2=784770&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/InheritanceMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/InheritanceMetadata.java Mon Jun 15 13:21:00
2009
@@ -63,7 +63,7 @@
*
* @return Discriminator
*/
- DiscriminatorMetadata getDiscriminatorMetaData();
+ DiscriminatorMetadata getDiscriminatorMetadata();
/**
* Method to define the new join information
@@ -77,5 +77,5 @@
*
* @return Join information
*/
- JoinMetadata getJoinMetaData();
+ JoinMetadata getJoinMetadata();
}
\ No newline at end of file
Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/InterfaceMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/InterfaceMetadata.java?rev=784770&r1=784769&r2=784770&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/InterfaceMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/InterfaceMetadata.java Mon Jun 15 13:21:00
2009
@@ -20,6 +20,6 @@
* Represents a persistent-interface.
* @since 2.3
*/
-public interface InterfaceMetadata extends ComponentMetadata {
+public interface InterfaceMetadata extends TypeMetadata {
}
\ No newline at end of file
Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/Metadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/Metadata.java?rev=784770&r1=784769&r2=784770&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/Metadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/Metadata.java Mon Jun 15 13:21:00 2009
@@ -28,9 +28,9 @@
* @param vendor Identifier for the vendor
* @param key The extension key
* @param value Value for the extension
- * @return The ExtensionMetaData
+ * @return The ExtensionMetadata
*/
- ExtensionMetadata newExtensionMetaData(String vendor, String key, String value);
+ ExtensionMetadata newExtensionMetadata(String vendor, String key, String value);
/**
* Number of extensions on this component.
Copied: db/jdo/trunk/api2/src/java/javax/jdo/metadata/TypeMetadata.java (from r784768, db/jdo/trunk/api2/src/java/javax/jdo/metadata/ComponentMetadata.java)
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/TypeMetadata.java?p2=db/jdo/trunk/api2/src/java/javax/jdo/metadata/TypeMetadata.java&p1=db/jdo/trunk/api2/src/java/javax/jdo/metadata/ComponentMetadata.java&r1=784768&r2=784770&rev=784770&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/ComponentMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/TypeMetadata.java Mon Jun 15 13:21:00 2009
@@ -24,7 +24,7 @@
* Represents a class or interface. Extended for the specifics of those cases.
* @since 2.3
*/
-public interface ComponentMetadata extends Metadata {
+public interface TypeMetadata extends Metadata {
/**
* Accessor for the name of this component (set on construction).
*
@@ -37,7 +37,7 @@
*
* @param id identity type
*/
- ComponentMetadata setIdentityType(IdentityType id);
+ TypeMetadata setIdentityType(IdentityType id);
/**
* Accessor for the identity type to use.
@@ -51,7 +51,7 @@
*
* @param idclass Object-id class
*/
- ComponentMetadata setObjectIdClass(String idclass);
+ TypeMetadata setObjectIdClass(String idclass);
/**
* Accessor for the object-id class (if defined).
@@ -65,7 +65,7 @@
*
* @param extent Requires extent?
*/
- ComponentMetadata setRequiresExtent(boolean extent);
+ TypeMetadata setRequiresExtent(boolean extent);
/**
* Accessor for whether the component requires an extent.
@@ -79,7 +79,7 @@
*
* @param detachable Detachable?
*/
- ComponentMetadata setDetachable(boolean detachable);
+ TypeMetadata setDetachable(boolean detachable);
/**
* Accessor for whether this is detachable.
@@ -93,7 +93,7 @@
*
* @param cacheable Cacheable?
*/
- ComponentMetadata setCacheable(boolean cacheable);
+ TypeMetadata setCacheable(boolean cacheable);
/**
* Accessor for whether this is cacheable.
@@ -107,7 +107,7 @@
*
* @param flag serializeRead
*/
- ComponentMetadata setSerializeRead(boolean flag);
+ TypeMetadata setSerializeRead(boolean flag);
/**
* Accessor for the value of serializeRead for objects of this type.
@@ -121,7 +121,7 @@
*
* @param embedded Whether it is only stored embedded
*/
- ComponentMetadata setEmbeddedOnly(boolean embedded);
+ TypeMetadata setEmbeddedOnly(boolean embedded);
/**
* Accessor for whether this is embedded only.
@@ -135,7 +135,7 @@
*
* @param catalog Catalog name
*/
- ComponentMetadata setCatalog(String catalog);
+ TypeMetadata setCatalog(String catalog);
/**
* Accessor for the catalog (ORM) for this component
@@ -149,7 +149,7 @@
*
* @param schema Schema name
*/
- ComponentMetadata setSchema(String schema);
+ TypeMetadata setSchema(String schema);
/**
* Accessor for the schema (ORM) for this component
@@ -163,7 +163,7 @@
*
* @param table Table name
*/
- ComponentMetadata setTable(String table);
+ TypeMetadata setTable(String table);
/**
* Accessor for the name of the table.
Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/package.html
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/package.html?rev=784770&r1=784769&r2=784770&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/package.html (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/package.html Mon Jun 15 13:21:00 2009
@@ -17,12 +17,12 @@
<html>
<head>
-<title>MetaData package</title>
+<title>Metadata package</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body bgcolor="#FFFFFF">
- This package contains classes representing the different components of the JDO MetaData.
+ This package contains classes representing the different components of the JDO Metadata.
It mirrors the structure of the XML schema.
</body>
</html>
|