You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2014/07/20 08:03:31 UTC
[5/5] git commit: METAMODEL-69: Fixed.
METAMODEL-69: Fixed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/a395c5f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/a395c5f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/a395c5f8
Branch: refs/heads/master
Commit: a395c5f8023700c2ef47fbb542dd3bf8b88a6ee3
Parents: 39c4a39
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sun Jul 20 08:01:45 2014 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sun Jul 20 08:01:45 2014 +0200
----------------------------------------------------------------------
.../LegacyDeserializationObjectInputStream.java | 6 +++---
...egacyDeserializationObjectInputStreamTest.java | 18 +++++++++---------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/a395c5f8/core/src/main/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStream.java b/core/src/main/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStream.java
index 3e492b8..993bd89 100644
--- a/core/src/main/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStream.java
+++ b/core/src/main/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStream.java
@@ -47,7 +47,7 @@ import org.apache.metamodel.schema.SuperColumnType;
* A specialized {@link ObjectInputStream} for MetaModel which can be used or
* extended if it is needed to deserialize legacy MetaModel objects. This is
* needed since the namespace of MetaModel was changed from
- * org.eobjects.metamodel to org.apache.metamodel.
+ * org.apache.metamodel to org.apache.metamodel.
*/
public class LegacyDeserializationObjectInputStream extends ObjectInputStream {
@@ -226,7 +226,7 @@ public class LegacyDeserializationObjectInputStream extends ObjectInputStream {
}
}
- private static final String OLD_CLASS_NAME_COLUMN_TYPE = "org.eobjects.metamodel.schema.ColumnType";
+ private static final String OLD_CLASS_NAME_COLUMN_TYPE = "org.apache.metamodel.schema.ColumnType";
public LegacyDeserializationObjectInputStream(InputStream in) throws IOException, SecurityException {
super(in);
@@ -235,7 +235,7 @@ public class LegacyDeserializationObjectInputStream extends ObjectInputStream {
@Override
protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
final String className = desc.getName();
- if (className.startsWith("org.eobjects.metamodel") || className.startsWith("[Lorg.eobjects.metamodel")) {
+ if (className.startsWith("org.apache.metamodel") || className.startsWith("[Lorg.apache.metamodel")) {
final String newClassName;
if (OLD_CLASS_NAME_COLUMN_TYPE.equals(className)) {
// since ColumnType was changed from enum to interface, there's
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/a395c5f8/core/src/test/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStreamTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStreamTest.java b/core/src/test/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStreamTest.java
index da26df6..0557cf9 100644
--- a/core/src/test/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStreamTest.java
+++ b/core/src/test/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStreamTest.java
@@ -35,23 +35,23 @@ public class LegacyDeserializationObjectInputStreamTest extends TestCase {
// create the example serialized object
{
- final org.eobjects.metamodel.schema.MutableSchema schema = new org.eobjects.metamodel.schema.MutableSchema(
+ final org.apache.metamodel.schema.MutableSchema schema = new org.apache.metamodel.schema.MutableSchema(
"myschema");
- final org.eobjects.metamodel.schema.MutableTable table = new org.eobjects.metamodel.schema.MutableTable(
- "mytable", org.eobjects.metamodel.schema.TableType.TABLE, schema);
+ final org.apache.metamodel.schema.MutableTable table = new org.apache.metamodel.schema.MutableTable(
+ "mytable", org.apache.metamodel.schema.TableType.TABLE, schema);
schema.addTable(table);
- table.addColumn(new org.eobjects.metamodel.schema.MutableColumn("mycol1",
- org.eobjects.metamodel.schema.ColumnType.INTEGER, table, 0, 16, "int", false, "my remark 1", false,
+ table.addColumn(new org.apache.metamodel.schema.MutableColumn("mycol1",
+ org.apache.metamodel.schema.ColumnType.INTEGER, table, 0, 16, "int", false, "my remark 1", false,
"\""));
- table.addColumn(new org.eobjects.metamodel.schema.MutableColumn("mycol1",
- org.eobjects.metamodel.schema.ColumnType.VARCHAR, table, 1, 255, "text", true, "my remark 2", true,
+ table.addColumn(new org.apache.metamodel.schema.MutableColumn("mycol1",
+ org.apache.metamodel.schema.ColumnType.VARCHAR, table, 1, 255, "text", true, "my remark 2", true,
null));
- final org.eobjects.metamodel.query.Query q = new org.eobjects.metamodel.query.Query();
+ final org.apache.metamodel.query.Query q = new org.apache.metamodel.query.Query();
q.from(table);
q.select(table.getColumn(0));
- q.where(table.getColumn(1), org.eobjects.metamodel.query.OperatorType.EQUALS_TO, "foo");
+ q.where(table.getColumn(1), org.apache.metamodel.query.OperatorType.EQUALS_TO, "foo");
final FileOutputStream out = new FileOutputStream(filename);
try {