Author: shawkins Date: 2010-07-30 16:06:10 -0400 (Fri, 30 Jul 2010) New Revision: 2392 Added: trunk/engine/src/main/java/org/teiid/core/ trunk/engine/src/main/java/org/teiid/core/id/ trunk/engine/src/test/java/org/teiid/core/ trunk/engine/src/test/java/org/teiid/core/id/ trunk/engine/src/test/resources/UUIDs.txt Removed: trunk/common-core/src/main/java/org/teiid/core/id/ trunk/common-core/src/test/java/org/teiid/core/id/ trunk/common-core/src/test/resources/UUIDs.txt Modified: trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java Log: removing id framework from core, it is not needed there Modified: trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java =================================================================== --- trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java 2010-07-29 15:18:33 UTC (rev 2391) +++ trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java 2010-07-30 20:06:10 UTC (rev 2392) @@ -27,9 +27,9 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.UUID; import org.teiid.connector.DataPlugin; -import org.teiid.core.id.UUIDFactory; import org.teiid.translator.TranslatorException; import org.teiid.translator.TypeFacility; @@ -43,7 +43,6 @@ public class MetadataFactory { private Schema schema; - private UUIDFactory factory = new UUIDFactory(); private Map<String, Datatype> dataTypes; private Properties importProperties; private MetadataStore store = new MetadataStore(); @@ -66,7 +65,7 @@ } private void setUUID(AbstractMetadataRecord record) { - record.setUUID(factory.create().toString()); + record.setUUID("mmuuid:" +UUID.randomUUID()); //$NON-NLS-1$ } /** Deleted: trunk/common-core/src/test/resources/UUIDs.txt =================================================================== --- trunk/common-core/src/test/resources/UUIDs.txt 2010-07-29 15:18:33 UTC (rev 2391) +++ trunk/common-core/src/test/resources/UUIDs.txt 2010-07-30 20:06:10 UTC (rev 2392) @@ -1,39 +0,0 @@ -# Some UUIDs from old license files -mmuuid:d17fd882-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d17fd883-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d17fd884-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d17fd885-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d17fd886-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d264ba40-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d264ba41-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d264ba42-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d264ba43-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d264ba44-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d264ba45-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d264ba46-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d264ba47-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d264ba48-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d264ba49-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d264ba4a-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d264ba4b-804f-1ec7-bc2e-8e296fe7f539 -mmuuid:d264ba4c-804f-1ec7-bc2e-8e296fe7f539 - -# Some other UUIDs with different delims -mmuuid/d37fd882-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d37fd883-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d37fd884-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d37fd885-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d37fd886-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d364ba40-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d364ba41-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d364ba42-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d364ba43-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d364ba44-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d364ba45-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d364ba46-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d364ba47-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d364ba48-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d364ba49-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d364ba4a-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d364ba4b-804f-1ec7-bc2e-8e296fe7f539 -mmuuid/d364ba4c-804f-1ec7-bc2e-8e296fe7f539 Copied: trunk/engine/src/main/java/org/teiid/core/id (from rev 2390, trunk/common-core/src/main/java/org/teiid/core/id) Copied: trunk/engine/src/test/java/org/teiid/core/id (from rev 2390, trunk/common-core/src/test/java/org/teiid/core/id) Copied: trunk/engine/src/test/resources/UUIDs.txt (from rev 2390, trunk/common-core/src/test/resources/UUIDs.txt) =================================================================== --- trunk/engine/src/test/resources/UUIDs.txt (rev 0) +++ trunk/engine/src/test/resources/UUIDs.txt 2010-07-30 20:06:10 UTC (rev 2392) @@ -0,0 +1,39 @@ +# Some UUIDs from old license files +mmuuid:d17fd882-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d17fd883-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d17fd884-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d17fd885-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d17fd886-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d264ba40-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d264ba41-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d264ba42-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d264ba43-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d264ba44-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d264ba45-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d264ba46-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d264ba47-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d264ba48-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d264ba49-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d264ba4a-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d264ba4b-804f-1ec7-bc2e-8e296fe7f539 +mmuuid:d264ba4c-804f-1ec7-bc2e-8e296fe7f539 + +# Some other UUIDs with different delims +mmuuid/d37fd882-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d37fd883-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d37fd884-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d37fd885-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d37fd886-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d364ba40-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d364ba41-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d364ba42-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d364ba43-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d364ba44-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d364ba45-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d364ba46-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d364ba47-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d364ba48-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d364ba49-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d364ba4a-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d364ba4b-804f-1ec7-bc2e-8e296fe7f539 +mmuuid/d364ba4c-804f-1ec7-bc2e-8e296fe7f539