~ubuntu-branches/ubuntu/vivid/eclipse-wtp/vivid

« back to all changes in this revision

Viewing changes to debian/patches/genmodel-customizations.patch

  • Committer: Package Import Robot
  • Author(s): Jakub Adam
  • Date: 2013-06-28 08:42:01 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20130628084201-houvqyt5uc6a3p27
Tags: 3.5.0-1
* New upstream release.
* Refreshed d/patches:
  - debian-custom-build.patch
  - regenerate-xpath2-parser.patch.
* Add patch for compatibility with rhino 1.7R4.
* Regenerate code from EMF models.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
From: Jakub Adam <jakub.adam@ktknet.cz>
 
2
Date: Fri, 30 Aug 2013 19:57:21 +0200
 
3
Subject: genmodel-customizations
 
4
 
 
5
---
 
6
 .../model/componentCore.genmodel                   |    3 +-
 
7
 .../internal/ComponentcoreFactory.java             |   92 --
 
8
 .../internal/ComponentcorePackage.java             | 1146 --------------------
 
9
 .../internal/ModuleStructuralModel.java            |    1 +
 
10
 .../componentcore/internal/StructureEdit.java      |    1 +
 
11
 .../internal/impl/ComponentResourceImpl.java       |    1 -
 
12
 .../internal/impl/ComponentTypeImpl.java           |    1 -
 
13
 .../internal/impl/ComponentcoreFactoryImpl.java    |    2 -
 
14
 .../internal/impl/ComponentcorePackageImpl.java    |    2 -
 
15
 .../internal/impl/ModuleIndexingAdapter.java       |    2 +-
 
16
 .../internal/impl/ProjectComponentsImpl.java       |    1 -
 
17
 .../componentcore/internal/impl/PropertyImpl.java  |    1 -
 
18
 .../internal/impl/ReferencedComponentImpl.java     |    1 -
 
19
 .../internal/impl/ResourceTreeNode.java            |    2 +-
 
20
 .../internal/impl/ResourceTreeRoot.java            |    3 +-
 
21
 .../internal/impl/WTPModulesInit.java              |    4 +-
 
22
 .../internal/impl/WorkbenchComponentImpl.java      |    1 -
 
23
 .../internal/resources/VirtualComponent.java       |    4 +-
 
24
 .../internal/util/ComponentcoreAdapterFactory.java |    1 -
 
25
 .../internal/util/ComponentcoreSwitch.java         |    1 -
 
26
 .../internal/util/DependencyTypeTranslator.java    |    2 +-
 
27
 .../internal/util/DeployedPathProvider.java        |    2 +-
 
28
 .../internal/util/EclipseResourceAdapter.java      |    2 +-
 
29
 .../internal/util/SourcePathProvider.java          |    2 +-
 
30
 .../internal/util/WTPModulesTranslator.java        |    2 +-
 
31
 .../resolvers/DefaultReferenceResolver.java        |    2 +-
 
32
 org.eclipse.wst.ws/RT.genmodel                     |    2 +-
 
33
 27 files changed, 19 insertions(+), 1265 deletions(-)
 
34
 delete mode 100644 org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcoreFactory.java
 
35
 delete mode 100644 org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
 
36
 
 
37
diff --git a/org.eclipse.wst.common.modulecore/model/componentCore.genmodel b/org.eclipse.wst.common.modulecore/model/componentCore.genmodel
 
38
index 2e55524..4f24970 100644
 
39
--- a/org.eclipse.wst.common.modulecore/model/componentCore.genmodel
 
40
+++ b/org.eclipse.wst.common.modulecore/model/componentCore.genmodel
 
41
@@ -4,7 +4,8 @@
 
42
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.wst.common.modulecore/modulecore-src"
 
43
     editDirectory="/org.eclipse.wst.common.modulecore.edit/src" editorDirectory="/org.eclipse.wst.common.modulecore.editor/src"
 
44
     modelPluginID="org.eclipse.wst.common.modulecore" runtimeJar="true" modelName="ComponentCore"
 
45
-    editPluginClass="componentcore.provider.ComponentCoreEditPlugin" editorPluginClass="componentcore.presentation.ComponentCoreEditorPlugin">
 
46
+    editPluginClass="componentcore.provider.ComponentCoreEditPlugin" editorPluginClass="componentcore.presentation.ComponentCoreEditorPlugin"
 
47
+    complianceLevel="6.0">
 
48
   <foreignModel>componentCore.ecore</foreignModel>
 
49
   <genPackages prefix="Componentcore" basePackage="org.eclipse.wst.common" disposableProviderFactory="true"
 
50
       interfacePackageSuffix="internal" classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util"
 
51
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcoreFactory.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcoreFactory.java
 
52
deleted file mode 100644
 
53
index 25de4f9..0000000
 
54
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcoreFactory.java
 
55
+++ /dev/null
 
56
@@ -1,92 +0,0 @@
 
57
-/**
 
58
- * <copyright>
 
59
- * </copyright>
 
60
- *
 
61
- * $Id: ComponentcoreFactory.java,v 1.2 2006/04/27 04:17:40 cbridgha Exp $
 
62
- */
 
63
-package org.eclipse.wst.common.componentcore.internal;
 
64
-
 
65
-import org.eclipse.emf.ecore.EFactory;
 
66
-import org.eclipse.wst.common.componentcore.internal.impl.ComponentcoreFactoryImpl;
 
67
-
 
68
-/**
 
69
- * <!-- begin-user-doc -->
 
70
- * The <b>Factory</b> for the model.
 
71
- * It provides a create method for each non-abstract class of the model.
 
72
- * <!-- end-user-doc -->
 
73
- * @see org.eclipse.wst.common.componentcore.internal.ComponentcorePackage
 
74
- * @generated
 
75
- */
 
76
-public interface ComponentcoreFactory extends EFactory {
 
77
-       /**
 
78
-        * The singleton instance of the factory.
 
79
-        * <!-- begin-user-doc -->
 
80
-        * <!-- end-user-doc -->
 
81
-        * @generated
 
82
-        */
 
83
-       ComponentcoreFactory eINSTANCE = ComponentcoreFactoryImpl.init();
 
84
-
 
85
-       /**
 
86
-        * Returns a new object of class '<em>Workbench Component</em>'.
 
87
-        * <!-- begin-user-doc -->
 
88
-        * <!-- end-user-doc -->
 
89
-        * @return a new object of class '<em>Workbench Component</em>'.
 
90
-        * @generated
 
91
-        */
 
92
-       WorkbenchComponent createWorkbenchComponent();
 
93
-
 
94
-       /**
 
95
-        * Returns a new object of class '<em>Component Resource</em>'.
 
96
-        * <!-- begin-user-doc -->
 
97
-        * <!-- end-user-doc -->
 
98
-        * @return a new object of class '<em>Component Resource</em>'.
 
99
-        * @generated
 
100
-        */
 
101
-       ComponentResource createComponentResource();
 
102
-
 
103
-       /**
 
104
-        * Returns a new object of class '<em>Component Type</em>'.
 
105
-        * <!-- begin-user-doc -->
 
106
-        * <!-- end-user-doc -->
 
107
-        * @return a new object of class '<em>Component Type</em>'.
 
108
-        * @generated
 
109
-        */
 
110
-       ComponentType createComponentType();
 
111
-
 
112
-       /**
 
113
-        * Returns a new object of class '<em>Property</em>'.
 
114
-        * <!-- begin-user-doc -->
 
115
-        * <!-- end-user-doc -->
 
116
-        * @return a new object of class '<em>Property</em>'.
 
117
-        * @generated
 
118
-        */
 
119
-       Property createProperty();
 
120
-
 
121
-       /**
 
122
-        * Returns a new object of class '<em>Referenced Component</em>'.
 
123
-        * <!-- begin-user-doc -->
 
124
-        * <!-- end-user-doc -->
 
125
-        * @return a new object of class '<em>Referenced Component</em>'.
 
126
-        * @generated
 
127
-        */
 
128
-       ReferencedComponent createReferencedComponent();
 
129
-
 
130
-       /**
 
131
-        * Returns a new object of class '<em>Project Components</em>'.
 
132
-        * <!-- begin-user-doc -->
 
133
-        * <!-- end-user-doc -->
 
134
-        * @return a new object of class '<em>Project Components</em>'.
 
135
-        * @generated
 
136
-        */
 
137
-       ProjectComponents createProjectComponents();
 
138
-
 
139
-       /**
 
140
-        * Returns the package supported by this factory.
 
141
-        * <!-- begin-user-doc -->
 
142
-        * <!-- end-user-doc -->
 
143
-        * @return the package supported by this factory.
 
144
-        * @generated
 
145
-        */
 
146
-       ComponentcorePackage getComponentcorePackage();
 
147
-
 
148
-} //ComponentcoreFactory
 
149
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
 
150
deleted file mode 100644
 
151
index 737cc80..0000000
 
152
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
 
153
+++ /dev/null
 
154
@@ -1,1146 +0,0 @@
 
155
-/**
 
156
- * <copyright>
 
157
- * </copyright>
 
158
- *
 
159
- * $Id: ComponentcorePackage.java,v 1.10 2011/08/10 21:40:14 rsanchez Exp $
 
160
- */
 
161
-package org.eclipse.wst.common.componentcore.internal;
 
162
-
 
163
-import org.eclipse.emf.ecore.EAttribute;
 
164
-import org.eclipse.emf.ecore.EClass;
 
165
-import org.eclipse.emf.ecore.EDataType;
 
166
-import org.eclipse.emf.ecore.EEnum;
 
167
-import org.eclipse.emf.ecore.EPackage;
 
168
-import org.eclipse.emf.ecore.EReference;
 
169
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
 
170
-
 
171
-/**
 
172
- * <!-- begin-user-doc -->
 
173
- * The <b>Package</b> for the model.
 
174
- * It contains accessors for the meta objects to represent
 
175
- * <ul>
 
176
- *   <li>each class,</li>
 
177
- *   <li>each feature of each class,</li>
 
178
- *   <li>each enum,</li>
 
179
- *   <li>and each data type</li>
 
180
- * </ul>
 
181
- * <!-- end-user-doc -->
 
182
- * @see org.eclipse.wst.common.componentcore.ComponentcoreFactory
 
183
- * @model kind="package"
 
184
- * @generated
 
185
- */
 
186
-public interface ComponentcorePackage extends EPackage {
 
187
-       /**
 
188
-        * The package name.
 
189
-        * <!-- begin-user-doc -->
 
190
-        * <!-- end-user-doc -->
 
191
-        * @generated
 
192
-        */
 
193
-       String eNAME = "componentcore";
 
194
-
 
195
-       /**
 
196
-        * The package namespace URI.
 
197
-        * <!-- begin-user-doc -->
 
198
-        * <!-- end-user-doc -->
 
199
-        * @generated
 
200
-        */
 
201
-       String eNS_URI = "componentcore.xmi"; //$NON-NLS-1$
 
202
-
 
203
-       /**
 
204
-        * The package namespace name.
 
205
-        * <!-- begin-user-doc -->
 
206
-        * <!-- end-user-doc -->
 
207
-        * @generated
 
208
-        */
 
209
-       String eNS_PREFIX = "org.eclipse.wst.common.componentcore"; //$NON-NLS-1$
 
210
-
 
211
-       /**
 
212
-        * The singleton instance of the package.
 
213
-        * <!-- begin-user-doc -->
 
214
-        * <!-- end-user-doc -->
 
215
-        * @generated
 
216
-        */
 
217
-       ComponentcorePackage eINSTANCE = org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl.init();
 
218
-
 
219
-       /**
 
220
-        * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.impl.WorkbenchComponentImpl <em>Workbench Component</em>}' class.
 
221
-        * <!-- begin-user-doc -->
 
222
-        * <!-- end-user-doc -->
 
223
-        * @see org.eclipse.wst.common.componentcore.internal.impl.WorkbenchComponentImpl
 
224
-        * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getWorkbenchComponent()
 
225
-        * @generated
 
226
-        */
 
227
-       int WORKBENCH_COMPONENT = 0;
 
228
-
 
229
-       /**
 
230
-        * The feature id for the '<em><b>Name</b></em>' attribute.
 
231
-        * <!-- begin-user-doc -->
 
232
-        * <!-- end-user-doc -->
 
233
-        * @generated
 
234
-        * @ordered
 
235
-        */
 
236
-       int WORKBENCH_COMPONENT__NAME = 0;
 
237
-
 
238
-       /**
 
239
-        * The feature id for the '<em><b>Resources</b></em>' containment reference list.
 
240
-        * <!-- begin-user-doc -->
 
241
-        * <!-- end-user-doc -->
 
242
-        * @generated
 
243
-        * @ordered
 
244
-        */
 
245
-       int WORKBENCH_COMPONENT__RESOURCES = 1;
 
246
-
 
247
-       /**
 
248
-        * The feature id for the '<em><b>Component Type</b></em>' containment reference.
 
249
-        * <!-- begin-user-doc -->
 
250
-        * <!-- end-user-doc -->
 
251
-        * @generated
 
252
-        * @ordered
 
253
-        */
 
254
-       int WORKBENCH_COMPONENT__COMPONENT_TYPE = 2;
 
255
-
 
256
-       /**
 
257
-        * The feature id for the '<em><b>Referenced Components</b></em>' containment reference list.
 
258
-        * <!-- begin-user-doc -->
 
259
-        * <!-- end-user-doc -->
 
260
-        * @generated
 
261
-        * @ordered
 
262
-        */
 
263
-       int WORKBENCH_COMPONENT__REFERENCED_COMPONENTS = 3;
 
264
-
 
265
-       /**
 
266
-        * The feature id for the '<em><b>Properties</b></em>' reference list.
 
267
-        * <!-- begin-user-doc -->
 
268
-        * <!-- end-user-doc -->
 
269
-        * @generated
 
270
-        * @ordered
 
271
-        */
 
272
-       int WORKBENCH_COMPONENT__PROPERTIES = 4;
 
273
-
 
274
-       /**
 
275
-        * The feature id for the '<em><b>Metadata Resources</b></em>' attribute list.
 
276
-        * <!-- begin-user-doc -->
 
277
-        * <!-- end-user-doc -->
 
278
-        * @generated
 
279
-        * @ordered
 
280
-        */
 
281
-       int WORKBENCH_COMPONENT__METADATA_RESOURCES = 5;
 
282
-
 
283
-       /**
 
284
-        * The number of structural features of the '<em>Workbench Component</em>' class.
 
285
-        * <!-- begin-user-doc -->
 
286
-        * <!-- end-user-doc -->
 
287
-        * @generated
 
288
-        * @ordered
 
289
-        */
 
290
-       int WORKBENCH_COMPONENT_FEATURE_COUNT = 6;
 
291
-
 
292
-       /**
 
293
-        * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ComponentResourceImpl <em>Component Resource</em>}' class.
 
294
-        * <!-- begin-user-doc -->
 
295
-        * <!-- end-user-doc -->
 
296
-        * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentResourceImpl
 
297
-        * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getComponentResource()
 
298
-        * @generated
 
299
-        */
 
300
-       int COMPONENT_RESOURCE = 1;
 
301
-
 
302
-       /**
 
303
-        * The feature id for the '<em><b>Source Path</b></em>' attribute.
 
304
-        * <!-- begin-user-doc -->
 
305
-        * <!-- end-user-doc -->
 
306
-        * @generated
 
307
-        * @ordered
 
308
-        */
 
309
-       int COMPONENT_RESOURCE__SOURCE_PATH = 0;
 
310
-
 
311
-       /**
 
312
-        * The feature id for the '<em><b>Runtime Path</b></em>' attribute.
 
313
-        * <!-- begin-user-doc -->
 
314
-        * <!-- end-user-doc -->
 
315
-        * @generated
 
316
-        * @ordered
 
317
-        */
 
318
-       int COMPONENT_RESOURCE__RUNTIME_PATH = 1;
 
319
-
 
320
-       /**
 
321
-        * The feature id for the '<em><b>Exclusions</b></em>' attribute list.
 
322
-        * <!-- begin-user-doc -->
 
323
-        * <!-- end-user-doc -->
 
324
-        * @generated
 
325
-        * @ordered
 
326
-        */
 
327
-       int COMPONENT_RESOURCE__EXCLUSIONS = 2;
 
328
-
 
329
-       /**
 
330
-        * The feature id for the '<em><b>Component</b></em>' container reference.
 
331
-        * <!-- begin-user-doc -->
 
332
-        * <!-- end-user-doc -->
 
333
-        * @generated
 
334
-        * @ordered
 
335
-        */
 
336
-       int COMPONENT_RESOURCE__COMPONENT = 3;
 
337
-
 
338
-       /**
 
339
-        * The feature id for the '<em><b>Resource Type</b></em>' attribute.
 
340
-        * <!-- begin-user-doc -->
 
341
-        * <!-- end-user-doc -->
 
342
-        * @generated
 
343
-        * @ordered
 
344
-        */
 
345
-       int COMPONENT_RESOURCE__RESOURCE_TYPE = 4;
 
346
-
 
347
-       /**
 
348
-        * The feature id for the '<em><b>Tag</b></em>' attribute.
 
349
-        * <!-- begin-user-doc -->
 
350
-        * <!-- end-user-doc -->
 
351
-        * @generated
 
352
-        * @ordered
 
353
-        */
 
354
-       int COMPONENT_RESOURCE__TAG = 5;
 
355
-
 
356
-       /**
 
357
-        * The number of structural features of the '<em>Component Resource</em>' class.
 
358
-        * <!-- begin-user-doc -->
 
359
-        * <!-- end-user-doc -->
 
360
-        * @generated
 
361
-        * @ordered
 
362
-        */
 
363
-       int COMPONENT_RESOURCE_FEATURE_COUNT = 6;
 
364
-
 
365
-       /**
 
366
-        * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ComponentTypeImpl <em>Component Type</em>}' class.
 
367
-        * <!-- begin-user-doc -->
 
368
-        * <!-- end-user-doc -->
 
369
-        * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentTypeImpl
 
370
-        * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getComponentType()
 
371
-        * @generated
 
372
-        */
 
373
-       int COMPONENT_TYPE = 2;
 
374
-
 
375
-       /**
 
376
-        * The feature id for the '<em><b>Component Type Id</b></em>' attribute.
 
377
-        * <!-- begin-user-doc -->
 
378
-        * <!-- end-user-doc -->
 
379
-        * @generated
 
380
-        * @ordered
 
381
-        */
 
382
-       int COMPONENT_TYPE__COMPONENT_TYPE_ID = 0;
 
383
-
 
384
-       /**
 
385
-        * The feature id for the '<em><b>Version</b></em>' attribute.
 
386
-        * <!-- begin-user-doc -->
 
387
-        * <!-- end-user-doc -->
 
388
-        * @generated
 
389
-        * @ordered
 
390
-        */
 
391
-       int COMPONENT_TYPE__VERSION = 1;
 
392
-
 
393
-       /**
 
394
-        * The feature id for the '<em><b>Properties</b></em>' reference list.
 
395
-        * <!-- begin-user-doc -->
 
396
-        * <!-- end-user-doc -->
 
397
-        * @generated
 
398
-        * @ordered
 
399
-        */
 
400
-       int COMPONENT_TYPE__PROPERTIES = 2;
 
401
-
 
402
-       /**
 
403
-        * The feature id for the '<em><b>Metadata Resources</b></em>' attribute list.
 
404
-        * <!-- begin-user-doc -->
 
405
-        * <!-- end-user-doc -->
 
406
-        * @generated
 
407
-        * @ordered
 
408
-        */
 
409
-       int COMPONENT_TYPE__METADATA_RESOURCES = 3;
 
410
-
 
411
-       /**
 
412
-        * The number of structural features of the '<em>Component Type</em>' class.
 
413
-        * <!-- begin-user-doc -->
 
414
-        * <!-- end-user-doc -->
 
415
-        * @generated
 
416
-        * @ordered
 
417
-        */
 
418
-       int COMPONENT_TYPE_FEATURE_COUNT = 4;
 
419
-
 
420
-       /**
 
421
-        * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.impl.PropertyImpl <em>Property</em>}' class.
 
422
-        * <!-- begin-user-doc -->
 
423
-        * <!-- end-user-doc -->
 
424
-        * @see org.eclipse.wst.common.componentcore.internal.impl.PropertyImpl
 
425
-        * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getProperty()
 
426
-        * @generated
 
427
-        */
 
428
-       int PROPERTY = 3;
 
429
-
 
430
-       /**
 
431
-        * The feature id for the '<em><b>Name</b></em>' attribute.
 
432
-        * <!-- begin-user-doc -->
 
433
-        * <!-- end-user-doc -->
 
434
-        * @generated
 
435
-        * @ordered
 
436
-        */
 
437
-       int PROPERTY__NAME = 0;
 
438
-
 
439
-       /**
 
440
-        * The feature id for the '<em><b>Value</b></em>' attribute.
 
441
-        * <!-- begin-user-doc -->
 
442
-        * <!-- end-user-doc -->
 
443
-        * @generated
 
444
-        * @ordered
 
445
-        */
 
446
-       int PROPERTY__VALUE = 1;
 
447
-
 
448
-       /**
 
449
-        * The number of structural features of the '<em>Property</em>' class.
 
450
-        * <!-- begin-user-doc -->
 
451
-        * <!-- end-user-doc -->
 
452
-        * @generated
 
453
-        * @ordered
 
454
-        */
 
455
-       int PROPERTY_FEATURE_COUNT = 2;
 
456
-
 
457
-       /**
 
458
-        * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ReferencedComponentImpl <em>Referenced Component</em>}' class.
 
459
-        * <!-- begin-user-doc -->
 
460
-        * <!-- end-user-doc -->
 
461
-        * @see org.eclipse.wst.common.componentcore.internal.impl.ReferencedComponentImpl
 
462
-        * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getReferencedComponent()
 
463
-        * @generated
 
464
-        */
 
465
-       int REFERENCED_COMPONENT = 4;
 
466
-
 
467
-       /**
 
468
-        * The feature id for the '<em><b>Handle</b></em>' attribute.
 
469
-        * <!-- begin-user-doc -->
 
470
-        * <!-- end-user-doc -->
 
471
-        * @generated
 
472
-        * @ordered
 
473
-        */
 
474
-       int REFERENCED_COMPONENT__HANDLE = 0;
 
475
-
 
476
-       /**
 
477
-        * The feature id for the '<em><b>Runtime Path</b></em>' attribute.
 
478
-        * <!-- begin-user-doc -->
 
479
-        * <!-- end-user-doc -->
 
480
-        * @generated
 
481
-        * @ordered
 
482
-        */
 
483
-       int REFERENCED_COMPONENT__RUNTIME_PATH = 1;
 
484
-
 
485
-       /**
 
486
-        * The feature id for the '<em><b>Dependency Type</b></em>' attribute.
 
487
-        * <!-- begin-user-doc -->
 
488
-        * <!-- end-user-doc -->
 
489
-        * @generated
 
490
-        * @ordered
 
491
-        */
 
492
-       int REFERENCED_COMPONENT__DEPENDENCY_TYPE = 2;
 
493
-
 
494
-       /**
 
495
-        * The feature id for the '<em><b>Dependent Object</b></em>' reference.
 
496
-        * <!-- begin-user-doc -->
 
497
-        * <!-- end-user-doc -->
 
498
-        * @generated
 
499
-        * @ordered
 
500
-        */
 
501
-       int REFERENCED_COMPONENT__DEPENDENT_OBJECT = 3;
 
502
-
 
503
-       /**
 
504
-        * The feature id for the '<em><b>Archive Name</b></em>' attribute.
 
505
-        * <!-- begin-user-doc -->
 
506
-        * <!-- end-user-doc -->
 
507
-        * @generated
 
508
-        * @ordered
 
509
-        */
 
510
-       int REFERENCED_COMPONENT__ARCHIVE_NAME = 4;
 
511
-
 
512
-       /**
 
513
-        * The number of structural features of the '<em>Referenced Component</em>' class.
 
514
-        * <!-- begin-user-doc -->
 
515
-        * <!-- end-user-doc -->
 
516
-        * @generated
 
517
-        * @ordered
 
518
-        */
 
519
-       int REFERENCED_COMPONENT_FEATURE_COUNT = 5;
 
520
-
 
521
-       /**
 
522
-        * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ProjectComponentsImpl <em>Project Components</em>}' class.
 
523
-        * <!-- begin-user-doc -->
 
524
-        * <!-- end-user-doc -->
 
525
-        * @see org.eclipse.wst.common.componentcore.internal.impl.ProjectComponentsImpl
 
526
-        * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getProjectComponents()
 
527
-        * @generated
 
528
-        */
 
529
-       int PROJECT_COMPONENTS = 5;
 
530
-
 
531
-       /**
 
532
-        * The feature id for the '<em><b>Project Name</b></em>' attribute.
 
533
-        * <!-- begin-user-doc -->
 
534
-        * <!-- end-user-doc -->
 
535
-        * @generated
 
536
-        * @ordered
 
537
-        */
 
538
-       int PROJECT_COMPONENTS__PROJECT_NAME = 0;
 
539
-
 
540
-       /**
 
541
-        * The feature id for the '<em><b>Components</b></em>' containment reference list.
 
542
-        * <!-- begin-user-doc -->
 
543
-        * <!-- end-user-doc -->
 
544
-        * @generated
 
545
-        * @ordered
 
546
-        */
 
547
-       int PROJECT_COMPONENTS__COMPONENTS = 1;
 
548
-
 
549
-       /**
 
550
-        * The feature id for the '<em><b>Version</b></em>' attribute.
 
551
-        * <!-- begin-user-doc -->
 
552
-        * <!-- end-user-doc -->
 
553
-        * @generated
 
554
-        * @ordered
 
555
-        */
 
556
-       int PROJECT_COMPONENTS__VERSION = 2;
 
557
-
 
558
-       /**
 
559
-        * The number of structural features of the '<em>Project Components</em>' class.
 
560
-        * <!-- begin-user-doc -->
 
561
-        * <!-- end-user-doc -->
 
562
-        * @generated
 
563
-        * @ordered
 
564
-        */
 
565
-       int PROJECT_COMPONENTS_FEATURE_COUNT = 3;
 
566
-
 
567
-       /**
 
568
-        * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.DependencyType <em>Dependency Type</em>}' enum.
 
569
-        * <!-- begin-user-doc -->
 
570
-        * <!-- end-user-doc -->
 
571
-        * @see org.eclipse.wst.common.componentcore.internal.DependencyType
 
572
-        * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getDependencyType()
 
573
-        * @generated
 
574
-        */
 
575
-       int DEPENDENCY_TYPE = 6;
 
576
-
 
577
-       /**
 
578
-        * The meta object id for the '<em>IPath</em>' data type.
 
579
-        * <!-- begin-user-doc -->
 
580
-        * <!-- end-user-doc -->
 
581
-        * @see org.eclipse.core.runtime.IPath
 
582
-        * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getIPath()
 
583
-        * @generated
 
584
-        */
 
585
-       int IPATH = 7;
 
586
-
 
587
-       /**
 
588
-        * The meta object id for the '<em>URI</em>' data type.
 
589
-        * <!-- begin-user-doc -->
 
590
-        * <!-- end-user-doc -->
 
591
-        * @see org.eclipse.emf.common.util.URI
 
592
-        * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getURI()
 
593
-        * @generated
 
594
-        */
 
595
-       int URI = 8;
 
596
-
 
597
-
 
598
-       /**
 
599
-        * Returns the meta object for class '{@link org.eclipse.wst.common.componentcore.internal.WorkbenchComponent <em>Workbench Component</em>}'.
 
600
-        * <!-- begin-user-doc -->
 
601
-        * <!-- end-user-doc -->
 
602
-        * @return the meta object for class '<em>Workbench Component</em>'.
 
603
-        * @see org.eclipse.wst.common.componentcore.internal.WorkbenchComponent
 
604
-        * @generated
 
605
-        */
 
606
-       EClass getWorkbenchComponent();
 
607
-
 
608
-       /**
 
609
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getName <em>Name</em>}'.
 
610
-        * <!-- begin-user-doc -->
 
611
-        * <!-- end-user-doc -->
 
612
-        * @return the meta object for the attribute '<em>Name</em>'.
 
613
-        * @see org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getName()
 
614
-        * @see #getWorkbenchComponent()
 
615
-        * @generated
 
616
-        */
 
617
-       EAttribute getWorkbenchComponent_Name();
 
618
-
 
619
-       /**
 
620
-        * Returns the meta object for the containment reference list '{@link org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getResources <em>Resources</em>}'.
 
621
-        * <!-- begin-user-doc -->
 
622
-        * <!-- end-user-doc -->
 
623
-        * @return the meta object for the containment reference list '<em>Resources</em>'.
 
624
-        * @see org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getResources()
 
625
-        * @see #getWorkbenchComponent()
 
626
-        * @generated
 
627
-        */
 
628
-       EReference getWorkbenchComponent_Resources();
 
629
-
 
630
-       /**
 
631
-        * Returns the meta object for the containment reference '{@link org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getComponentType <em>Component Type</em>}'.
 
632
-        * <!-- begin-user-doc -->
 
633
-        * <!-- end-user-doc -->
 
634
-        * @return the meta object for the containment reference '<em>Component Type</em>'.
 
635
-        * @see org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getComponentType()
 
636
-        * @see #getWorkbenchComponent()
 
637
-        * @generated
 
638
-        */
 
639
-       EReference getWorkbenchComponent_ComponentType();
 
640
-
 
641
-       /**
 
642
-        * Returns the meta object for the containment reference list '{@link org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getReferencedComponents <em>Referenced Components</em>}'.
 
643
-        * <!-- begin-user-doc -->
 
644
-        * <!-- end-user-doc -->
 
645
-        * @return the meta object for the containment reference list '<em>Referenced Components</em>'.
 
646
-        * @see org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getReferencedComponents()
 
647
-        * @see #getWorkbenchComponent()
 
648
-        * @generated
 
649
-        */
 
650
-       EReference getWorkbenchComponent_ReferencedComponents();
 
651
-
 
652
-       /**
 
653
-        * Returns the meta object for the reference list '{@link org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getProperties <em>Properties</em>}'.
 
654
-        * <!-- begin-user-doc -->
 
655
-        * <!-- end-user-doc -->
 
656
-        * @return the meta object for the reference list '<em>Properties</em>'.
 
657
-        * @see org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getProperties()
 
658
-        * @see #getWorkbenchComponent()
 
659
-        * @generated
 
660
-        */
 
661
-       EReference getWorkbenchComponent_Properties();
 
662
-
 
663
-       /**
 
664
-        * Returns the meta object for the attribute list '{@link org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getMetadataResources <em>Metadata Resources</em>}'.
 
665
-        * <!-- begin-user-doc -->
 
666
-        * <!-- end-user-doc -->
 
667
-        * @return the meta object for the attribute list '<em>Metadata Resources</em>'.
 
668
-        * @see org.eclipse.wst.common.componentcore.internal.WorkbenchComponent#getMetadataResources()
 
669
-        * @see #getWorkbenchComponent()
 
670
-        * @generated
 
671
-        */
 
672
-       EAttribute getWorkbenchComponent_MetadataResources();
 
673
-
 
674
-       /**
 
675
-        * Returns the meta object for class '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource <em>Component Resource</em>}'.
 
676
-        * <!-- begin-user-doc -->
 
677
-        * <!-- end-user-doc -->
 
678
-        * @return the meta object for class '<em>Component Resource</em>'.
 
679
-        * @see org.eclipse.wst.common.componentcore.internal.ComponentResource
 
680
-        * @generated
 
681
-        */
 
682
-       EClass getComponentResource();
 
683
-
 
684
-       /**
 
685
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getSourcePath <em>Source Path</em>}'.
 
686
-        * <!-- begin-user-doc -->
 
687
-        * <!-- end-user-doc -->
 
688
-        * @return the meta object for the attribute '<em>Source Path</em>'.
 
689
-        * @see org.eclipse.wst.common.componentcore.internal.ComponentResource#getSourcePath()
 
690
-        * @see #getComponentResource()
 
691
-        * @generated
 
692
-        */
 
693
-       EAttribute getComponentResource_SourcePath();
 
694
-
 
695
-       /**
 
696
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getRuntimePath <em>Runtime Path</em>}'.
 
697
-        * <!-- begin-user-doc -->
 
698
-        * <!-- end-user-doc -->
 
699
-        * @return the meta object for the attribute '<em>Runtime Path</em>'.
 
700
-        * @see org.eclipse.wst.common.componentcore.internal.ComponentResource#getRuntimePath()
 
701
-        * @see #getComponentResource()
 
702
-        * @generated
 
703
-        */
 
704
-       EAttribute getComponentResource_RuntimePath();
 
705
-
 
706
-       /**
 
707
-        * Returns the meta object for the attribute list '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getExclusions <em>Exclusions</em>}'.
 
708
-        * <!-- begin-user-doc -->
 
709
-        * <!-- end-user-doc -->
 
710
-        * @return the meta object for the attribute list '<em>Exclusions</em>'.
 
711
-        * @see org.eclipse.wst.common.componentcore.internal.ComponentResource#getExclusions()
 
712
-        * @see #getComponentResource()
 
713
-        * @generated
 
714
-        */
 
715
-       EAttribute getComponentResource_Exclusions();
 
716
-
 
717
-       /**
 
718
-        * Returns the meta object for the container reference '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getComponent <em>Component</em>}'.
 
719
-        * <!-- begin-user-doc -->
 
720
-        * <!-- end-user-doc -->
 
721
-        * @return the meta object for the container reference '<em>Component</em>'.
 
722
-        * @see org.eclipse.wst.common.componentcore.internal.ComponentResource#getComponent()
 
723
-        * @see #getComponentResource()
 
724
-        * @generated
 
725
-        */
 
726
-       EReference getComponentResource_Component();
 
727
-
 
728
-       /**
 
729
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getResourceType <em>Resource Type</em>}'.
 
730
-        * <!-- begin-user-doc -->
 
731
-        * <!-- end-user-doc -->
 
732
-        * @return the meta object for the attribute '<em>Resource Type</em>'.
 
733
-        * @see org.eclipse.wst.common.componentcore.internal.ComponentResource#getResourceType()
 
734
-        * @see #getComponentResource()
 
735
-        * @generated
 
736
-        */
 
737
-       EAttribute getComponentResource_ResourceType();
 
738
-
 
739
-       /**
 
740
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getTag <em>Tag</em>}'.
 
741
-        * <!-- begin-user-doc -->
 
742
-        * <!-- end-user-doc -->
 
743
-        * @return the meta object for the attribute '<em>Tag</em>'.
 
744
-        * @see org.eclipse.wst.common.componentcore.internal.ComponentResource#getTag()
 
745
-        * @see #getComponentResource()
 
746
-        * @generated
 
747
-        */
 
748
-       EAttribute getComponentResource_Tag();
 
749
-
 
750
-       /**
 
751
-        * Returns the meta object for class '{@link org.eclipse.wst.common.componentcore.internal.ComponentType <em>Component Type</em>}'.
 
752
-        * <!-- begin-user-doc -->
 
753
-        * <!-- end-user-doc -->
 
754
-        * @return the meta object for class '<em>Component Type</em>'.
 
755
-        * @see org.eclipse.wst.common.componentcore.internal.ComponentType
 
756
-        * @generated
 
757
-        */
 
758
-       EClass getComponentType();
 
759
-
 
760
-       /**
 
761
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ComponentType#getComponentTypeId <em>Component Type Id</em>}'.
 
762
-        * <!-- begin-user-doc -->
 
763
-        * <!-- end-user-doc -->
 
764
-        * @return the meta object for the attribute '<em>Component Type Id</em>'.
 
765
-        * @see org.eclipse.wst.common.componentcore.internal.ComponentType#getComponentTypeId()
 
766
-        * @see #getComponentType()
 
767
-        * @generated
 
768
-        */
 
769
-       EAttribute getComponentType_ComponentTypeId();
 
770
-
 
771
-       /**
 
772
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ComponentType#getVersion <em>Version</em>}'.
 
773
-        * <!-- begin-user-doc -->
 
774
-        * <!-- end-user-doc -->
 
775
-        * @return the meta object for the attribute '<em>Version</em>'.
 
776
-        * @see org.eclipse.wst.common.componentcore.internal.ComponentType#getVersion()
 
777
-        * @see #getComponentType()
 
778
-        * @generated
 
779
-        */
 
780
-       EAttribute getComponentType_Version();
 
781
-
 
782
-       /**
 
783
-        * Returns the meta object for the reference list '{@link org.eclipse.wst.common.componentcore.internal.ComponentType#getProperties <em>Properties</em>}'.
 
784
-        * <!-- begin-user-doc -->
 
785
-        * <!-- end-user-doc -->
 
786
-        * @return the meta object for the reference list '<em>Properties</em>'.
 
787
-        * @see org.eclipse.wst.common.componentcore.internal.ComponentType#getProperties()
 
788
-        * @see #getComponentType()
 
789
-        * @generated
 
790
-        */
 
791
-       EReference getComponentType_Properties();
 
792
-
 
793
-       /**
 
794
-        * Returns the meta object for the attribute list '{@link org.eclipse.wst.common.componentcore.internal.ComponentType#getMetadataResources <em>Metadata Resources</em>}'.
 
795
-        * <!-- begin-user-doc -->
 
796
-        * <!-- end-user-doc -->
 
797
-        * @return the meta object for the attribute list '<em>Metadata Resources</em>'.
 
798
-        * @see org.eclipse.wst.common.componentcore.internal.ComponentType#getMetadataResources()
 
799
-        * @see #getComponentType()
 
800
-        * @generated
 
801
-        */
 
802
-       EAttribute getComponentType_MetadataResources();
 
803
-
 
804
-       /**
 
805
-        * Returns the meta object for class '{@link org.eclipse.wst.common.componentcore.internal.Property <em>Property</em>}'.
 
806
-        * <!-- begin-user-doc -->
 
807
-        * <!-- end-user-doc -->
 
808
-        * @return the meta object for class '<em>Property</em>'.
 
809
-        * @see org.eclipse.wst.common.componentcore.internal.Property
 
810
-        * @generated
 
811
-        */
 
812
-       EClass getProperty();
 
813
-
 
814
-       /**
 
815
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.Property#getName <em>Name</em>}'.
 
816
-        * <!-- begin-user-doc -->
 
817
-        * <!-- end-user-doc -->
 
818
-        * @return the meta object for the attribute '<em>Name</em>'.
 
819
-        * @see org.eclipse.wst.common.componentcore.internal.Property#getName()
 
820
-        * @see #getProperty()
 
821
-        * @generated
 
822
-        */
 
823
-       EAttribute getProperty_Name();
 
824
-
 
825
-       /**
 
826
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.Property#getValue <em>Value</em>}'.
 
827
-        * <!-- begin-user-doc -->
 
828
-        * <!-- end-user-doc -->
 
829
-        * @return the meta object for the attribute '<em>Value</em>'.
 
830
-        * @see org.eclipse.wst.common.componentcore.internal.Property#getValue()
 
831
-        * @see #getProperty()
 
832
-        * @generated
 
833
-        */
 
834
-       EAttribute getProperty_Value();
 
835
-
 
836
-       /**
 
837
-        * Returns the meta object for class '{@link org.eclipse.wst.common.componentcore.internal.ReferencedComponent <em>Referenced Component</em>}'.
 
838
-        * <!-- begin-user-doc -->
 
839
-        * <!-- end-user-doc -->
 
840
-        * @return the meta object for class '<em>Referenced Component</em>'.
 
841
-        * @see org.eclipse.wst.common.componentcore.internal.ReferencedComponent
 
842
-        * @generated
 
843
-        */
 
844
-       EClass getReferencedComponent();
 
845
-
 
846
-       /**
 
847
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getHandle <em>Handle</em>}'.
 
848
-        * <!-- begin-user-doc -->
 
849
-        * <!-- end-user-doc -->
 
850
-        * @return the meta object for the attribute '<em>Handle</em>'.
 
851
-        * @see org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getHandle()
 
852
-        * @see #getReferencedComponent()
 
853
-        * @generated
 
854
-        */
 
855
-       EAttribute getReferencedComponent_Handle();
 
856
-
 
857
-       /**
 
858
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getRuntimePath <em>Runtime Path</em>}'.
 
859
-        * <!-- begin-user-doc -->
 
860
-        * <!-- end-user-doc -->
 
861
-        * @return the meta object for the attribute '<em>Runtime Path</em>'.
 
862
-        * @see org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getRuntimePath()
 
863
-        * @see #getReferencedComponent()
 
864
-        * @generated
 
865
-        */
 
866
-       EAttribute getReferencedComponent_RuntimePath();
 
867
-
 
868
-       /**
 
869
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getDependencyType <em>Dependency Type</em>}'.
 
870
-        * <!-- begin-user-doc -->
 
871
-        * <!-- end-user-doc -->
 
872
-        * @return the meta object for the attribute '<em>Dependency Type</em>'.
 
873
-        * @see org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getDependencyType()
 
874
-        * @see #getReferencedComponent()
 
875
-        * @generated
 
876
-        */
 
877
-       EAttribute getReferencedComponent_DependencyType();
 
878
-
 
879
-       /**
 
880
-        * Returns the meta object for the reference '{@link org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getDependentObject <em>Dependent Object</em>}'.
 
881
-        * <!-- begin-user-doc -->
 
882
-        * <!-- end-user-doc -->
 
883
-        * @return the meta object for the reference '<em>Dependent Object</em>'.
 
884
-        * @see org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getDependentObject()
 
885
-        * @see #getReferencedComponent()
 
886
-        * @generated
 
887
-        */
 
888
-       EReference getReferencedComponent_DependentObject();
 
889
-
 
890
-       /**
 
891
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getArchiveName <em>Archive Name</em>}'.
 
892
-        * <!-- begin-user-doc -->
 
893
-        * <!-- end-user-doc -->
 
894
-        * @return the meta object for the attribute '<em>Archive Name</em>'.
 
895
-        * @see org.eclipse.wst.common.componentcore.internal.ReferencedComponent#getArchiveName()
 
896
-        * @see #getReferencedComponent()
 
897
-        * @generated
 
898
-        */
 
899
-       EAttribute getReferencedComponent_ArchiveName();
 
900
-
 
901
-       /**
 
902
-        * Returns the meta object for class '{@link org.eclipse.wst.common.componentcore.internal.ProjectComponents <em>Project Components</em>}'.
 
903
-        * <!-- begin-user-doc -->
 
904
-        * <!-- end-user-doc -->
 
905
-        * @return the meta object for class '<em>Project Components</em>'.
 
906
-        * @see org.eclipse.wst.common.componentcore.internal.ProjectComponents
 
907
-        * @generated
 
908
-        */
 
909
-       EClass getProjectComponents();
 
910
-
 
911
-       /**
 
912
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ProjectComponents#getProjectName <em>Project Name</em>}'.
 
913
-        * <!-- begin-user-doc -->
 
914
-        * <!-- end-user-doc -->
 
915
-        * @return the meta object for the attribute '<em>Project Name</em>'.
 
916
-        * @see org.eclipse.wst.common.componentcore.internal.ProjectComponents#getProjectName()
 
917
-        * @see #getProjectComponents()
 
918
-        * @generated
 
919
-        */
 
920
-       EAttribute getProjectComponents_ProjectName();
 
921
-
 
922
-       /**
 
923
-        * Returns the meta object for the containment reference list '{@link org.eclipse.wst.common.componentcore.internal.ProjectComponents#getComponents <em>Components</em>}'.
 
924
-        * <!-- begin-user-doc -->
 
925
-        * <!-- end-user-doc -->
 
926
-        * @return the meta object for the containment reference list '<em>Components</em>'.
 
927
-        * @see org.eclipse.wst.common.componentcore.internal.ProjectComponents#getComponents()
 
928
-        * @see #getProjectComponents()
 
929
-        * @generated
 
930
-        */
 
931
-       EReference getProjectComponents_Components();
 
932
-
 
933
-       /**
 
934
-        * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ProjectComponents#getVersion <em>Version</em>}'.
 
935
-        * <!-- begin-user-doc -->
 
936
-        * <!-- end-user-doc -->
 
937
-        * @return the meta object for the attribute '<em>Version</em>'.
 
938
-        * @see org.eclipse.wst.common.componentcore.internal.ProjectComponents#getVersion()
 
939
-        * @see #getProjectComponents()
 
940
-        * @generated
 
941
-        */
 
942
-       EAttribute getProjectComponents_Version();
 
943
-
 
944
-       /**
 
945
-        * Returns the meta object for enum '{@link org.eclipse.wst.common.componentcore.internal.DependencyType <em>Dependency Type</em>}'.
 
946
-        * <!-- begin-user-doc -->
 
947
-        * <!-- end-user-doc -->
 
948
-        * @return the meta object for enum '<em>Dependency Type</em>'.
 
949
-        * @see org.eclipse.wst.common.componentcore.internal.DependencyType
 
950
-        * @generated
 
951
-        */
 
952
-       EEnum getDependencyType();
 
953
-
 
954
-       /**
 
955
-        * Returns the meta object for data type '{@link org.eclipse.core.runtime.IPath <em>IPath</em>}'.
 
956
-        * <!-- begin-user-doc -->
 
957
-        * <!-- end-user-doc -->
 
958
-        * @return the meta object for data type '<em>IPath</em>'.
 
959
-        * @see org.eclipse.core.runtime.IPath
 
960
-        * @model instanceClass="org.eclipse.core.runtime.IPath"
 
961
-        *        annotation="keywords datatype='null'"
 
962
-        * @generated
 
963
-        */
 
964
-       EDataType getIPath();
 
965
-
 
966
-       /**
 
967
-        * Returns the meta object for data type '{@link org.eclipse.emf.common.util.URI <em>URI</em>}'.
 
968
-        * <!-- begin-user-doc -->
 
969
-        * <!-- end-user-doc -->
 
970
-        * @return the meta object for data type '<em>URI</em>'.
 
971
-        * @see org.eclipse.emf.common.util.URI
 
972
-        * @model instanceClass="org.eclipse.emf.common.util.URI"
 
973
-        *        annotation="keywords datatype='null'"
 
974
-        * @generated
 
975
-        */
 
976
-       EDataType getURI();
 
977
-
 
978
-       /**
 
979
-        * Returns the factory that creates the instances of the model.
 
980
-        * <!-- begin-user-doc -->
 
981
-        * <!-- end-user-doc -->
 
982
-        * @return the factory that creates the instances of the model.
 
983
-        * @generated
 
984
-        */
 
985
-       ComponentcoreFactory getComponentcoreFactory();
 
986
-
 
987
-       /**
 
988
-        * <!-- begin-user-doc -->
 
989
-        * Defines literals for the meta objects that represent
 
990
-        * <ul>
 
991
-        *   <li>each class,</li>
 
992
-        *   <li>each feature of each class,</li>
 
993
-        *   <li>each enum,</li>
 
994
-        *   <li>and each data type</li>
 
995
-        * </ul>
 
996
-        * <!-- end-user-doc -->
 
997
-        * @generated
 
998
-        */
 
999
-       interface Literals {
 
1000
-               /**
 
1001
-                * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.impl.WorkbenchComponentImpl <em>Workbench Component</em>}' class.
 
1002
-                * <!-- begin-user-doc -->
 
1003
-                * <!-- end-user-doc -->
 
1004
-                * @see org.eclipse.wst.common.componentcore.internal.impl.WorkbenchComponentImpl
 
1005
-                * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getWorkbenchComponent()
 
1006
-                * @generated
 
1007
-                */
 
1008
-               EClass WORKBENCH_COMPONENT = eINSTANCE.getWorkbenchComponent();
 
1009
-
 
1010
-               /**
 
1011
-                * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 
1012
-                * <!-- begin-user-doc -->
 
1013
-                * <!-- end-user-doc -->
 
1014
-                * @generated
 
1015
-                */
 
1016
-               EAttribute WORKBENCH_COMPONENT__NAME = eINSTANCE.getWorkbenchComponent_Name();
 
1017
-
 
1018
-               /**
 
1019
-                * The meta object literal for the '<em><b>Resources</b></em>' containment reference list feature.
 
1020
-                * <!-- begin-user-doc -->
 
1021
-                * <!-- end-user-doc -->
 
1022
-                * @generated
 
1023
-                */
 
1024
-               EReference WORKBENCH_COMPONENT__RESOURCES = eINSTANCE.getWorkbenchComponent_Resources();
 
1025
-
 
1026
-               /**
 
1027
-                * The meta object literal for the '<em><b>Component Type</b></em>' containment reference feature.
 
1028
-                * <!-- begin-user-doc -->
 
1029
-                * <!-- end-user-doc -->
 
1030
-                * @generated
 
1031
-                */
 
1032
-               EReference WORKBENCH_COMPONENT__COMPONENT_TYPE = eINSTANCE.getWorkbenchComponent_ComponentType();
 
1033
-
 
1034
-               /**
 
1035
-                * The meta object literal for the '<em><b>Referenced Components</b></em>' containment reference list feature.
 
1036
-                * <!-- begin-user-doc -->
 
1037
-                * <!-- end-user-doc -->
 
1038
-                * @generated
 
1039
-                */
 
1040
-               EReference WORKBENCH_COMPONENT__REFERENCED_COMPONENTS = eINSTANCE.getWorkbenchComponent_ReferencedComponents();
 
1041
-
 
1042
-               /**
 
1043
-                * The meta object literal for the '<em><b>Properties</b></em>' reference list feature.
 
1044
-                * <!-- begin-user-doc -->
 
1045
-                * <!-- end-user-doc -->
 
1046
-                * @generated
 
1047
-                */
 
1048
-               EReference WORKBENCH_COMPONENT__PROPERTIES = eINSTANCE.getWorkbenchComponent_Properties();
 
1049
-
 
1050
-               /**
 
1051
-                * The meta object literal for the '<em><b>Metadata Resources</b></em>' attribute list feature.
 
1052
-                * <!-- begin-user-doc -->
 
1053
-                * <!-- end-user-doc -->
 
1054
-                * @generated
 
1055
-                */
 
1056
-               EAttribute WORKBENCH_COMPONENT__METADATA_RESOURCES = eINSTANCE.getWorkbenchComponent_MetadataResources();
 
1057
-
 
1058
-               /**
 
1059
-                * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ComponentResourceImpl <em>Component Resource</em>}' class.
 
1060
-                * <!-- begin-user-doc -->
 
1061
-                * <!-- end-user-doc -->
 
1062
-                * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentResourceImpl
 
1063
-                * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getComponentResource()
 
1064
-                * @generated
 
1065
-                */
 
1066
-               EClass COMPONENT_RESOURCE = eINSTANCE.getComponentResource();
 
1067
-
 
1068
-               /**
 
1069
-                * The meta object literal for the '<em><b>Source Path</b></em>' attribute feature.
 
1070
-                * <!-- begin-user-doc -->
 
1071
-                * <!-- end-user-doc -->
 
1072
-                * @generated
 
1073
-                */
 
1074
-               EAttribute COMPONENT_RESOURCE__SOURCE_PATH = eINSTANCE.getComponentResource_SourcePath();
 
1075
-
 
1076
-               /**
 
1077
-                * The meta object literal for the '<em><b>Runtime Path</b></em>' attribute feature.
 
1078
-                * <!-- begin-user-doc -->
 
1079
-                * <!-- end-user-doc -->
 
1080
-                * @generated
 
1081
-                */
 
1082
-               EAttribute COMPONENT_RESOURCE__RUNTIME_PATH = eINSTANCE.getComponentResource_RuntimePath();
 
1083
-
 
1084
-               /**
 
1085
-                * The meta object literal for the '<em><b>Exclusions</b></em>' attribute list feature.
 
1086
-                * <!-- begin-user-doc -->
 
1087
-                * <!-- end-user-doc -->
 
1088
-                * @generated
 
1089
-                */
 
1090
-               EAttribute COMPONENT_RESOURCE__EXCLUSIONS = eINSTANCE.getComponentResource_Exclusions();
 
1091
-
 
1092
-               /**
 
1093
-                * The meta object literal for the '<em><b>Component</b></em>' container reference feature.
 
1094
-                * <!-- begin-user-doc -->
 
1095
-                * <!-- end-user-doc -->
 
1096
-                * @generated
 
1097
-                */
 
1098
-               EReference COMPONENT_RESOURCE__COMPONENT = eINSTANCE.getComponentResource_Component();
 
1099
-
 
1100
-               /**
 
1101
-                * The meta object literal for the '<em><b>Resource Type</b></em>' attribute feature.
 
1102
-                * <!-- begin-user-doc -->
 
1103
-                * <!-- end-user-doc -->
 
1104
-                * @generated
 
1105
-                */
 
1106
-               EAttribute COMPONENT_RESOURCE__RESOURCE_TYPE = eINSTANCE.getComponentResource_ResourceType();
 
1107
-
 
1108
-               /**
 
1109
-                * The meta object literal for the '<em><b>Tag</b></em>' attribute feature.
 
1110
-                * <!-- begin-user-doc -->
 
1111
-                * <!-- end-user-doc -->
 
1112
-                * @generated
 
1113
-                */
 
1114
-               EAttribute COMPONENT_RESOURCE__TAG = eINSTANCE.getComponentResource_Tag();
 
1115
-
 
1116
-               /**
 
1117
-                * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ComponentTypeImpl <em>Component Type</em>}' class.
 
1118
-                * <!-- begin-user-doc -->
 
1119
-                * <!-- end-user-doc -->
 
1120
-                * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentTypeImpl
 
1121
-                * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getComponentType()
 
1122
-                * @generated
 
1123
-                */
 
1124
-               EClass COMPONENT_TYPE = eINSTANCE.getComponentType();
 
1125
-
 
1126
-               /**
 
1127
-                * The meta object literal for the '<em><b>Component Type Id</b></em>' attribute feature.
 
1128
-                * <!-- begin-user-doc -->
 
1129
-                * <!-- end-user-doc -->
 
1130
-                * @generated
 
1131
-                */
 
1132
-               EAttribute COMPONENT_TYPE__COMPONENT_TYPE_ID = eINSTANCE.getComponentType_ComponentTypeId();
 
1133
-
 
1134
-               /**
 
1135
-                * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
 
1136
-                * <!-- begin-user-doc -->
 
1137
-                * <!-- end-user-doc -->
 
1138
-                * @generated
 
1139
-                */
 
1140
-               EAttribute COMPONENT_TYPE__VERSION = eINSTANCE.getComponentType_Version();
 
1141
-
 
1142
-               /**
 
1143
-                * The meta object literal for the '<em><b>Properties</b></em>' reference list feature.
 
1144
-                * <!-- begin-user-doc -->
 
1145
-                * <!-- end-user-doc -->
 
1146
-                * @generated
 
1147
-                */
 
1148
-               EReference COMPONENT_TYPE__PROPERTIES = eINSTANCE.getComponentType_Properties();
 
1149
-
 
1150
-               /**
 
1151
-                * The meta object literal for the '<em><b>Metadata Resources</b></em>' attribute list feature.
 
1152
-                * <!-- begin-user-doc -->
 
1153
-                * <!-- end-user-doc -->
 
1154
-                * @generated
 
1155
-                */
 
1156
-               EAttribute COMPONENT_TYPE__METADATA_RESOURCES = eINSTANCE.getComponentType_MetadataResources();
 
1157
-
 
1158
-               /**
 
1159
-                * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.impl.PropertyImpl <em>Property</em>}' class.
 
1160
-                * <!-- begin-user-doc -->
 
1161
-                * <!-- end-user-doc -->
 
1162
-                * @see org.eclipse.wst.common.componentcore.internal.impl.PropertyImpl
 
1163
-                * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getProperty()
 
1164
-                * @generated
 
1165
-                */
 
1166
-               EClass PROPERTY = eINSTANCE.getProperty();
 
1167
-
 
1168
-               /**
 
1169
-                * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 
1170
-                * <!-- begin-user-doc -->
 
1171
-                * <!-- end-user-doc -->
 
1172
-                * @generated
 
1173
-                */
 
1174
-               EAttribute PROPERTY__NAME = eINSTANCE.getProperty_Name();
 
1175
-
 
1176
-               /**
 
1177
-                * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
 
1178
-                * <!-- begin-user-doc -->
 
1179
-                * <!-- end-user-doc -->
 
1180
-                * @generated
 
1181
-                */
 
1182
-               EAttribute PROPERTY__VALUE = eINSTANCE.getProperty_Value();
 
1183
-
 
1184
-               /**
 
1185
-                * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ReferencedComponentImpl <em>Referenced Component</em>}' class.
 
1186
-                * <!-- begin-user-doc -->
 
1187
-                * <!-- end-user-doc -->
 
1188
-                * @see org.eclipse.wst.common.componentcore.internal.impl.ReferencedComponentImpl
 
1189
-                * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getReferencedComponent()
 
1190
-                * @generated
 
1191
-                */
 
1192
-               EClass REFERENCED_COMPONENT = eINSTANCE.getReferencedComponent();
 
1193
-
 
1194
-               /**
 
1195
-                * The meta object literal for the '<em><b>Handle</b></em>' attribute feature.
 
1196
-                * <!-- begin-user-doc -->
 
1197
-                * <!-- end-user-doc -->
 
1198
-                * @generated
 
1199
-                */
 
1200
-               EAttribute REFERENCED_COMPONENT__HANDLE = eINSTANCE.getReferencedComponent_Handle();
 
1201
-
 
1202
-               /**
 
1203
-                * The meta object literal for the '<em><b>Runtime Path</b></em>' attribute feature.
 
1204
-                * <!-- begin-user-doc -->
 
1205
-                * <!-- end-user-doc -->
 
1206
-                * @generated
 
1207
-                */
 
1208
-               EAttribute REFERENCED_COMPONENT__RUNTIME_PATH = eINSTANCE.getReferencedComponent_RuntimePath();
 
1209
-
 
1210
-               /**
 
1211
-                * The meta object literal for the '<em><b>Dependency Type</b></em>' attribute feature.
 
1212
-                * <!-- begin-user-doc -->
 
1213
-                * <!-- end-user-doc -->
 
1214
-                * @generated
 
1215
-                */
 
1216
-               EAttribute REFERENCED_COMPONENT__DEPENDENCY_TYPE = eINSTANCE.getReferencedComponent_DependencyType();
 
1217
-
 
1218
-               /**
 
1219
-                * The meta object literal for the '<em><b>Dependent Object</b></em>' reference feature.
 
1220
-                * <!-- begin-user-doc -->
 
1221
-                * <!-- end-user-doc -->
 
1222
-                * @generated
 
1223
-                */
 
1224
-               EReference REFERENCED_COMPONENT__DEPENDENT_OBJECT = eINSTANCE.getReferencedComponent_DependentObject();
 
1225
-
 
1226
-               /**
 
1227
-                * The meta object literal for the '<em><b>Archive Name</b></em>' attribute feature.
 
1228
-                * <!-- begin-user-doc -->
 
1229
-                * <!-- end-user-doc -->
 
1230
-                * @generated
 
1231
-                */
 
1232
-               EAttribute REFERENCED_COMPONENT__ARCHIVE_NAME = eINSTANCE.getReferencedComponent_ArchiveName();
 
1233
-
 
1234
-               /**
 
1235
-                * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ProjectComponentsImpl <em>Project Components</em>}' class.
 
1236
-                * <!-- begin-user-doc -->
 
1237
-                * <!-- end-user-doc -->
 
1238
-                * @see org.eclipse.wst.common.componentcore.internal.impl.ProjectComponentsImpl
 
1239
-                * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getProjectComponents()
 
1240
-                * @generated
 
1241
-                */
 
1242
-               EClass PROJECT_COMPONENTS = eINSTANCE.getProjectComponents();
 
1243
-
 
1244
-               /**
 
1245
-                * The meta object literal for the '<em><b>Project Name</b></em>' attribute feature.
 
1246
-                * <!-- begin-user-doc -->
 
1247
-                * <!-- end-user-doc -->
 
1248
-                * @generated
 
1249
-                */
 
1250
-               EAttribute PROJECT_COMPONENTS__PROJECT_NAME = eINSTANCE.getProjectComponents_ProjectName();
 
1251
-
 
1252
-               /**
 
1253
-                * The meta object literal for the '<em><b>Components</b></em>' containment reference list feature.
 
1254
-                * <!-- begin-user-doc -->
 
1255
-                * <!-- end-user-doc -->
 
1256
-                * @generated
 
1257
-                */
 
1258
-               EReference PROJECT_COMPONENTS__COMPONENTS = eINSTANCE.getProjectComponents_Components();
 
1259
-
 
1260
-               /**
 
1261
-                * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
 
1262
-                * <!-- begin-user-doc -->
 
1263
-                * <!-- end-user-doc -->
 
1264
-                * @generated
 
1265
-                */
 
1266
-               EAttribute PROJECT_COMPONENTS__VERSION = eINSTANCE.getProjectComponents_Version();
 
1267
-
 
1268
-               /**
 
1269
-                * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.DependencyType <em>Dependency Type</em>}' enum.
 
1270
-                * <!-- begin-user-doc -->
 
1271
-                * <!-- end-user-doc -->
 
1272
-                * @see org.eclipse.wst.common.componentcore.internal.DependencyType
 
1273
-                * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getDependencyType()
 
1274
-                * @generated
 
1275
-                */
 
1276
-               EEnum DEPENDENCY_TYPE = eINSTANCE.getDependencyType();
 
1277
-
 
1278
-               /**
 
1279
-                * The meta object literal for the '<em>IPath</em>' data type.
 
1280
-                * <!-- begin-user-doc -->
 
1281
-                * <!-- end-user-doc -->
 
1282
-                * @see org.eclipse.core.runtime.IPath
 
1283
-                * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getIPath()
 
1284
-                * @generated
 
1285
-                */
 
1286
-               EDataType IPATH = eINSTANCE.getIPath();
 
1287
-
 
1288
-               /**
 
1289
-                * The meta object literal for the '<em>URI</em>' data type.
 
1290
-                * <!-- begin-user-doc -->
 
1291
-                * <!-- end-user-doc -->
 
1292
-                * @see org.eclipse.emf.common.util.URI
 
1293
-                * @see org.eclipse.wst.common.componentcore.internal.impl.ComponentcorePackageImpl#getURI()
 
1294
-                * @generated
 
1295
-                */
 
1296
-               EDataType URI = eINSTANCE.getURI();
 
1297
-
 
1298
-       }
 
1299
-
 
1300
-} //ComponentcorePackage
 
1301
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
 
1302
index c120a83..ba92063 100644
 
1303
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
 
1304
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
 
1305
@@ -38,6 +38,7 @@ import org.eclipse.emf.common.util.URI;
 
1306
 import org.eclipse.emf.ecore.EObject;
 
1307
 import org.eclipse.emf.ecore.resource.Resource;
 
1308
 import org.eclipse.emf.ecore.xmi.XMIResource;
 
1309
+import org.eclipse.wst.common.componentcore.ComponentcorePackage;
 
1310
 import org.eclipse.wst.common.componentcore.internal.impl.ResourceTreeNode;
 
1311
 import org.eclipse.wst.common.componentcore.internal.impl.ResourceTreeRoot;
 
1312
 import org.eclipse.wst.common.componentcore.internal.impl.WTPModulesResource;
 
1313
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
 
1314
index 9e0ac3f..fbc763a 100644
 
1315
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
 
1316
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
 
1317
@@ -34,6 +34,7 @@ import org.eclipse.emf.common.util.EList;
 
1318
 import org.eclipse.emf.common.util.URI;
 
1319
 import org.eclipse.jem.util.UIContextDetermination;
 
1320
 import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
 
1321
+import org.eclipse.wst.common.componentcore.ComponentcoreFactory;
 
1322
 import org.eclipse.wst.common.componentcore.IEditModelHandler;
 
1323
 import org.eclipse.wst.common.componentcore.ModuleCoreNature;
 
1324
 import org.eclipse.wst.common.componentcore.UnresolveableURIException;
 
1325
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java
 
1326
index e076bc4..069c3b9 100644
 
1327
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java
 
1328
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java
 
1329
@@ -21,7 +21,6 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
 
1330
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 
1331
 import org.eclipse.emf.ecore.util.EcoreUtil;
 
1332
 import org.eclipse.wst.common.componentcore.internal.ComponentResource;
 
1333
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1334
 import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
 
1335
 import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil.ESynchronizedAdapterList;
 
1336
 
 
1337
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentTypeImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentTypeImpl.java
 
1338
index b0c2f21..2b33b2b 100644
 
1339
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentTypeImpl.java
 
1340
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentTypeImpl.java
 
1341
@@ -18,7 +18,6 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
 
1342
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 
1343
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 
1344
 import org.eclipse.wst.common.componentcore.internal.ComponentType;
 
1345
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1346
 import org.eclipse.wst.common.componentcore.internal.Property;
 
1347
 
 
1348
 /**
 
1349
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcoreFactoryImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcoreFactoryImpl.java
 
1350
index 0bcab20..23c98d5 100644
 
1351
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcoreFactoryImpl.java
 
1352
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcoreFactoryImpl.java
 
1353
@@ -16,8 +16,6 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
1354
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
1355
 import org.eclipse.wst.common.componentcore.internal.ComponentResource;
 
1356
 import org.eclipse.wst.common.componentcore.internal.ComponentType;
 
1357
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
 
1358
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1359
 import org.eclipse.wst.common.componentcore.internal.DependencyType;
 
1360
 import org.eclipse.wst.common.componentcore.internal.ProjectComponents;
 
1361
 import org.eclipse.wst.common.componentcore.internal.Property;
 
1362
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java
 
1363
index cb71b6a..1137c5a 100644
 
1364
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java
 
1365
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java
 
1366
@@ -16,8 +16,6 @@ import org.eclipse.emf.ecore.EReference;
 
1367
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
1368
 import org.eclipse.wst.common.componentcore.internal.ComponentResource;
 
1369
 import org.eclipse.wst.common.componentcore.internal.ComponentType;
 
1370
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
 
1371
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1372
 import org.eclipse.wst.common.componentcore.internal.DependencyType;
 
1373
 import org.eclipse.wst.common.componentcore.internal.ProjectComponents;
 
1374
 import org.eclipse.wst.common.componentcore.internal.Property;
 
1375
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleIndexingAdapter.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleIndexingAdapter.java
 
1376
index 039799d..206cbb1 100644
 
1377
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleIndexingAdapter.java
 
1378
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleIndexingAdapter.java
 
1379
@@ -13,7 +13,7 @@ package org.eclipse.wst.common.componentcore.internal.impl;
 
1380
 import org.eclipse.emf.common.notify.Notification;
 
1381
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
 
1382
 import org.eclipse.emf.ecore.EObject;
 
1383
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1384
+import org.eclipse.wst.common.componentcore.ComponentcorePackage;
 
1385
 import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
 
1386
 
 
1387
 public class ModuleIndexingAdapter extends AdapterImpl {
 
1388
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ProjectComponentsImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ProjectComponentsImpl.java
 
1389
index e0645d7..d391ba0 100644
 
1390
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ProjectComponentsImpl.java
 
1391
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ProjectComponentsImpl.java
 
1392
@@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
 
1393
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 
1394
 import org.eclipse.emf.ecore.util.EcoreUtil;
 
1395
 import org.eclipse.emf.ecore.util.InternalEList;
 
1396
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1397
 import org.eclipse.wst.common.componentcore.internal.ProjectComponents;
 
1398
 import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
 
1399
 
 
1400
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PropertyImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PropertyImpl.java
 
1401
index eae8a93..0c77c7d 100644
 
1402
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PropertyImpl.java
 
1403
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PropertyImpl.java
 
1404
@@ -11,7 +11,6 @@ import org.eclipse.emf.ecore.EClass;
 
1405
 import org.eclipse.emf.ecore.EStructuralFeature;
 
1406
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
1407
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
1408
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1409
 import org.eclipse.wst.common.componentcore.internal.Property;
 
1410
 
 
1411
 /**
 
1412
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentImpl.java
 
1413
index f17b3dc..74da1a9 100644
 
1414
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentImpl.java
 
1415
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentImpl.java
 
1416
@@ -16,7 +16,6 @@ import org.eclipse.emf.ecore.InternalEObject;
 
1417
 
 
1418
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
1419
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
1420
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1421
 import org.eclipse.wst.common.componentcore.internal.DependencyType;
 
1422
 import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
 
1423
 
 
1424
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeNode.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeNode.java
 
1425
index d2a956e..1cf96d8 100644
 
1426
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeNode.java
 
1427
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeNode.java
 
1428
@@ -22,7 +22,7 @@ import org.eclipse.core.resources.IContainer;
 
1429
 import org.eclipse.core.resources.IResource;
 
1430
 import org.eclipse.core.runtime.IPath;
 
1431
 import org.eclipse.wst.common.componentcore.internal.ComponentResource;
 
1432
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1433
+import org.eclipse.wst.common.componentcore.ComponentcorePackage;
 
1434
 import org.eclipse.wst.common.componentcore.internal.StructureEdit;
 
1435
 import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
 
1436
 import org.eclipse.wst.common.componentcore.internal.util.IPathProvider;
 
1437
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeRoot.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeRoot.java
 
1438
index 15e61a4..30f86b8 100644
 
1439
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeRoot.java
 
1440
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeRoot.java
 
1441
@@ -20,7 +20,8 @@ import org.eclipse.emf.common.notify.impl.AdapterImpl;
 
1442
 import org.eclipse.emf.common.util.URI;
 
1443
 import org.eclipse.wst.common.componentcore.UnresolveableURIException;
 
1444
 import org.eclipse.wst.common.componentcore.internal.ComponentResource;
 
1445
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1446
+import org.eclipse.wst.common.componentcore.ComponentcorePackage;
 
1447
+import org.eclipse.wst.common.componentcore.internal.ComponentResource;
 
1448
 import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
 
1449
 import org.eclipse.wst.common.componentcore.internal.util.IPathProvider;
 
1450
 import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
 
1451
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPModulesInit.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPModulesInit.java
 
1452
index 08f357d..e6d816d 100644
 
1453
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPModulesInit.java
 
1454
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPModulesInit.java
 
1455
@@ -12,8 +12,8 @@ package org.eclipse.wst.common.componentcore.internal.impl;
 
1456
 
 
1457
 import org.eclipse.emf.ecore.EFactory;
 
1458
 import org.eclipse.emf.ecore.EPackage;
 
1459
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
 
1460
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1461
+import org.eclipse.wst.common.componentcore.ComponentcoreFactory;
 
1462
+import org.eclipse.wst.common.componentcore.ComponentcorePackage;
 
1463
 import org.eclipse.wst.common.internal.emf.resource.EMF2DOMRendererFactory;
 
1464
 import org.eclipse.wst.common.internal.emf.utilities.DOMUtilities;
 
1465
 import org.eclipse.wst.common.internal.emf.utilities.EncoderDecoderRegistry;
 
1466
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
 
1467
index 5e65bab..6f56f43 100644
 
1468
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
 
1469
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
 
1470
@@ -35,7 +35,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
1471
 import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
 
1472
 import org.eclipse.wst.common.componentcore.internal.ComponentResource;
 
1473
 import org.eclipse.wst.common.componentcore.internal.ComponentType;
 
1474
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1475
 import org.eclipse.wst.common.componentcore.internal.Property;
 
1476
 import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
 
1477
 import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
 
1478
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
 
1479
index 6a3ea0f..1d83000 100644
 
1480
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
 
1481
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
 
1482
@@ -34,8 +34,8 @@ import org.eclipse.emf.ecore.resource.Resource;
 
1483
 import org.eclipse.wst.common.componentcore.ComponentCore;
 
1484
 import org.eclipse.wst.common.componentcore.ModuleCoreNature;
 
1485
 import org.eclipse.wst.common.componentcore.UnresolveableURIException;
 
1486
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
 
1487
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1488
+import org.eclipse.wst.common.componentcore.ComponentcoreFactory;
 
1489
+import org.eclipse.wst.common.componentcore.ComponentcorePackage;
 
1490
 import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
 
1491
 import org.eclipse.wst.common.componentcore.internal.Property;
 
1492
 import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
 
1493
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreAdapterFactory.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreAdapterFactory.java
 
1494
index 39b9c64..917f6a8 100644
 
1495
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreAdapterFactory.java
 
1496
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreAdapterFactory.java
 
1497
@@ -12,7 +12,6 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
1498
 import org.eclipse.emf.ecore.EObject;
 
1499
 import org.eclipse.wst.common.componentcore.internal.ComponentResource;
 
1500
 import org.eclipse.wst.common.componentcore.internal.ComponentType;
 
1501
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1502
 import org.eclipse.wst.common.componentcore.internal.ProjectComponents;
 
1503
 import org.eclipse.wst.common.componentcore.internal.Property;
 
1504
 import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
 
1505
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java
 
1506
index 74a7b67..97016b7 100644
 
1507
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java
 
1508
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java
 
1509
@@ -12,7 +12,6 @@ import org.eclipse.emf.ecore.EClass;
 
1510
 import org.eclipse.emf.ecore.EObject;
 
1511
 import org.eclipse.wst.common.componentcore.internal.ComponentResource;
 
1512
 import org.eclipse.wst.common.componentcore.internal.ComponentType;
 
1513
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1514
 import org.eclipse.wst.common.componentcore.internal.ProjectComponents;
 
1515
 import org.eclipse.wst.common.componentcore.internal.Property;
 
1516
 import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
 
1517
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DependencyTypeTranslator.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DependencyTypeTranslator.java
 
1518
index 2a9127c..cbc52ad 100644
 
1519
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DependencyTypeTranslator.java
 
1520
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DependencyTypeTranslator.java
 
1521
@@ -17,7 +17,7 @@
 
1522
 package org.eclipse.wst.common.componentcore.internal.util;
 
1523
 
 
1524
 import org.eclipse.emf.ecore.EObject;
 
1525
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1526
+import org.eclipse.wst.common.componentcore.ComponentcorePackage;
 
1527
 import org.eclipse.wst.common.componentcore.internal.DependencyType;
 
1528
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
1529
 
 
1530
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DeployedPathProvider.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DeployedPathProvider.java
 
1531
index 58a071e..7720ffd 100644
 
1532
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DeployedPathProvider.java
 
1533
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/DeployedPathProvider.java
 
1534
@@ -13,7 +13,7 @@ package org.eclipse.wst.common.componentcore.internal.util;
 
1535
 import org.eclipse.core.runtime.IPath;
 
1536
 import org.eclipse.emf.ecore.EStructuralFeature;
 
1537
 import org.eclipse.wst.common.componentcore.internal.ComponentResource;
 
1538
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1539
+import org.eclipse.wst.common.componentcore.ComponentcorePackage;
 
1540
 
 
1541
 public class DeployedPathProvider implements IPathProvider {
 
1542
        
 
1543
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/EclipseResourceAdapter.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/EclipseResourceAdapter.java
 
1544
index 3f6af3b..af2e69e 100644
 
1545
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/EclipseResourceAdapter.java
 
1546
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/EclipseResourceAdapter.java
 
1547
@@ -18,7 +18,7 @@ import org.eclipse.emf.common.notify.Adapter;
 
1548
 import org.eclipse.emf.common.notify.Notification;
 
1549
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
 
1550
 import org.eclipse.wst.common.componentcore.internal.ComponentResource;
 
1551
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1552
+import org.eclipse.wst.common.componentcore.ComponentcorePackage;
 
1553
 import org.eclipse.wst.common.componentcore.internal.StructureEdit;
 
1554
 
 
1555
 public class EclipseResourceAdapter extends AdapterImpl implements Adapter {
 
1556
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/SourcePathProvider.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/SourcePathProvider.java
 
1557
index 1bce206..0e82f28 100644
 
1558
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/SourcePathProvider.java
 
1559
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/SourcePathProvider.java
 
1560
@@ -13,7 +13,7 @@ package org.eclipse.wst.common.componentcore.internal.util;
 
1561
 import org.eclipse.core.runtime.IPath;
 
1562
 import org.eclipse.emf.ecore.EStructuralFeature;
 
1563
 import org.eclipse.wst.common.componentcore.internal.ComponentResource;
 
1564
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1565
+import org.eclipse.wst.common.componentcore.ComponentcorePackage;
 
1566
 
 
1567
 public class SourcePathProvider implements IPathProvider {
 
1568
        
 
1569
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesTranslator.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesTranslator.java
 
1570
index 47fa640..55d9ea4 100644
 
1571
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesTranslator.java
 
1572
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesTranslator.java
 
1573
@@ -11,7 +11,7 @@
 
1574
 package org.eclipse.wst.common.componentcore.internal.util;
 
1575
 
 
1576
 import org.eclipse.emf.ecore.EStructuralFeature;
 
1577
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1578
+import org.eclipse.wst.common.componentcore.ComponentcorePackage;
 
1579
 import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
 
1580
 import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
 
1581
 import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
 
1582
diff --git a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/DefaultReferenceResolver.java b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/DefaultReferenceResolver.java
 
1583
index e8fcd73..5d3ac5b 100644
 
1584
--- a/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/DefaultReferenceResolver.java
 
1585
+++ b/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resolvers/DefaultReferenceResolver.java
 
1586
@@ -5,7 +5,7 @@ import org.eclipse.core.runtime.IPath;
 
1587
 import org.eclipse.emf.common.util.URI;
 
1588
 import org.eclipse.wst.common.componentcore.ComponentCore;
 
1589
 import org.eclipse.wst.common.componentcore.UnresolveableURIException;
 
1590
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 
1591
+import org.eclipse.wst.common.componentcore.ComponentcorePackage;
 
1592
 import org.eclipse.wst.common.componentcore.internal.DependencyType;
 
1593
 import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
 
1594
 import org.eclipse.wst.common.componentcore.internal.StructureEdit;
 
1595
diff --git a/org.eclipse.wst.ws/RT.genmodel b/org.eclipse.wst.ws/RT.genmodel
 
1596
index 9aaa4f1..6d0c9ff 100644
 
1597
--- a/org.eclipse.wst.ws/RT.genmodel
 
1598
+++ b/org.eclipse.wst.ws/RT.genmodel
 
1599
@@ -1,7 +1,7 @@
 
1600
 <?xml version="1.0" encoding="UTF-8"?>
 
1601
 <genmodel:GenModel xmi:version="2.0"
 
1602
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
 
1603
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/RegistryModel2/src"
 
1604
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.wst.ws/src"
 
1605
     editDirectory="/RegistryModel2.edit/src" editorDirectory="/RegistryModel2.editor/src"
 
1606
     modelPluginID="RegistryModel2" runtimeJar="true" modelName="RT" editPluginClass="org.eclipse.wst.ws.internal.model.v10.rtindex.provider.RTEditPlugin"
 
1607
     editorPluginClass="org.eclipse.wst.ws.internal.model.v10.rtindex.presentation.RTEditorPlugin"