Author: thn Date: 2010-12-06 15:34:08-0800 New Revision: 18894 Modified: trunk/src/argouml-core-model-euml/.classpath trunk/src/argouml-core-model-euml/ArgoUML UML2-EUML debug.launch trunk/src/argouml-core-model-euml/META-INF/MANIFEST.MF trunk/src/argouml-core-model-euml/Model all tests eUML.launch trunk/src/argouml-core-model-euml/build.properties trunk/src/argouml-core-model-euml/build.xml trunk/src/argouml-core-model-euml/pom.xml trunk/src/argouml-core-model-euml/src/manifest.mf
Log: upgrade to EMF 2.6.1 and UML2 3.1.1 libs+sources Modified: trunk/src/argouml-core-model-euml/.classpath Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/.classpath?view=diff&pathrev=18894&r1=18893&r2=18894 ============================================================================== --- trunk/src/argouml-core-model-euml/.classpath (original) +++ trunk/src/argouml-core-model-euml/.classpath 2010-12-06 15:34:08-0800 @@ -3,19 +3,19 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.common_2.5.0.v200906151043.jar" sourcepath="lib/emf/org.eclipse.emf.common.source_2.5.0.v200906151043.zip"/> - <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.ecore_2.5.0.v200906151043.jar" sourcepath="lib/emf/org.eclipse.emf.ecore.source_2.5.0.v200906151043.zip"/> - <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.ecore.change_2.5.0.v200906151043.jar"/> - <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.ecore.change.edit_2.5.0.v200906151043.jar"/> - <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.ecore.edit_2.5.0.v200906151043.jar"/> - <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.ecore.xmi_2.5.0.v200906151043.jar" sourcepath="lib/emf/org.eclipse.emf.ecore.xmi.source_2.5.0.v200906151043.zip"/> - <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.edit_2.5.0.v200906151043.jar" sourcepath="lib/emf/org.eclipse.emf.edit.source_2.5.0.v200906151043.zip"/> - <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.mapping_2.5.0.v200906151043.jar"/> - <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.mapping.ecore2xml_2.5.0.v200906151043.jar"/> - <classpathentry exported="true" kind="lib" path="lib/uml2/org.eclipse.uml2.common_1.5.0.v200905041045.jar"/> - <classpathentry exported="true" kind="lib" path="lib/uml2/org.eclipse.uml2.common.edit_1.5.0.v200905041045.jar"/> - <classpathentry exported="true" kind="lib" path="lib/uml2/org.eclipse.uml2.uml_3.0.1.v200908281330.jar" sourcepath="lib/uml2/org.eclipse.uml2.uml.source_3.0.1.v200908281330.zip"/> - <classpathentry exported="true" kind="lib" path="lib/uml2/org.eclipse.uml2.uml.edit_3.0.0.v200905041045.jar"/> - <classpathentry exported="true" kind="lib" path="lib/uml2/org.eclipse.uml2.uml.resources_3.0.0.v200906011111.jar"/> + <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.common_2.6.0.v20100914-1218.jar" sourcepath="lib/emf/org.eclipse.emf.common.source_2.6.0.v20100914-1218.zip"/> + <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.ecore_2.6.1.v20100914-1218.jar" sourcepath="lib/emf/org.eclipse.emf.ecore.source_2.6.1.v20100914-1218.zip"/> + <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.ecore.change_2.5.1.v20100907-1643.jar"/> + <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.ecore.change.edit_2.5.0.v20100521-1846.jar"/> + <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.ecore.edit_2.6.0.v20100914-1218.jar"/> + <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.ecore.xmi_2.5.0.v20100521-1846.jar" sourcepath="lib/emf/org.eclipse.emf.ecore.xmi.source_2.5.0.v20100521-1846.zip"/> + <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.edit_2.6.0.v20100914-1218.jar" sourcepath="lib/emf/org.eclipse.emf.edit.source_2.6.0.v20100914-1218.zip"/> + <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.mapping_2.6.0.v20100914-1218.jar"/> + <classpathentry exported="true" kind="lib" path="lib/emf/org.eclipse.emf.mapping.ecore2xml_2.5.0.v20100521-1847.jar"/> + <classpathentry exported="true" kind="lib" path="lib/uml2/org.eclipse.uml2.common_1.5.0.v201005031530.jar"/> + <classpathentry exported="true" kind="lib" path="lib/uml2/org.eclipse.uml2.common.edit_1.5.0.v201005031530.jar"/> + <classpathentry exported="true" kind="lib" path="lib/uml2/org.eclipse.uml2.uml_3.1.1.v201008191505.jar" sourcepath="lib/uml2/org.eclipse.uml2.uml.source_3.1.1.v201008191505.zip"/> + <classpathentry exported="true" kind="lib" path="lib/uml2/org.eclipse.uml2.uml.edit_3.1.0.v201005031530.jar"/> + <classpathentry exported="true" kind="lib" path="lib/uml2/org.eclipse.uml2.uml.resources_3.1.1.v201008191505.jar"/> <classpathentry kind="output" path="build-eclipse"/> </classpath> Modified: trunk/src/argouml-core-model-euml/ArgoUML UML2-EUML debug.launch Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/ArgoUML%20UML2-EUML%20debug.launch?view=diff&pathrev=18894&r1=18893&r2=18894 ============================================================================== --- trunk/src/argouml-core-model-euml/ArgoUML UML2-EUML debug.launch (original) +++ trunk/src/argouml-core-model-euml/ArgoUML UML2-EUML debug.launch 2010-12-06 15:34:08-0800 @@ -30,20 +30,20 @@ <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/gef-0.13.3.jar" path="3" sourceAttachmentPath="/gef/src" sourceRootPath="" type="2"/> "/> <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/ocl-argo-1.1.jar" path="3" type="2"/> "/> <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/swidgets-0.1.4.jar" path="3" sourceAttachmentPath="/swidgets/src" sourceRootPath="" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.common_2.5.0.v200906151043.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore_2.5.0.v200906151043.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.change_2.5.0.v200906151043.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.change.edit_2.5.0.v200906151043.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.edit_2.5.0.v200906151043.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.xmi_2.5.0.v200906151043.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.edit_2.5.0.v200906151043.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.mapping_2.5.0.v200906151043.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.common_1.5.0.v200905041045.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.common.edit_1.5.0.v200905041045.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml_3.0.1.v200908281330.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.edit_3.0.0.v200905041045.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.resources_3.0.0.v200906011111.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.mapping.ecore2xml_2.5.0.v200906151043.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.common_2.6.0.v20100914-1218.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore_2.6.1.v20100914-1218.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.change_2.5.1.v20100907-1643.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.change.edit_2.5.0.v20100521-1846.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.edit_2.6.0.v20100914-1218.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.xmi_2.5.0.v20100521-1846.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.edit_2.6.0.v20100914-1218.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.mapping_2.6.0.v20100914-1218.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.common_1.5.0.v201005031530.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.common.edit_1.5.0.v201005031530.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml_3.1.1.v201008191505.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.edit_3.1.0.v201005031530.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.resources_3.1.1.v201008191505.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.mapping.ecore2xml_2.5.0.v20100521-1847.jar" path="3" type="2"/> "/> <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-model-euml" type="1"/> "/> <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/toolbar-1.4.1-20071227.jar" path="3" sourceAttachmentPath="/toolbar/src" sourceRootPath="" type="2"/> "/> <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-infra" type="1"/> "/> @@ -57,5 +57,5 @@ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.argouml.application.Main"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nouml2warning"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="argouml-app"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx400M -ea -Dargouml.modules=org.argouml.state2.StateDiagramModule;org.argouml.activity2.ActivityDiagramModule;org.argouml.sequence2.SequenceDiagramModule;org.argouml.core.propertypanels.module.XmlPropertyPanelsModule -Dlog4j.configuration=org/argouml/resource/full_console.lcf -DeUML.resources=../argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.resources_3.0.0.v200906011111.jar -Dargouml.model.implementation=org.argouml.model.euml.EUMLModelImplementation"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx400M -ea -Dargouml.modules=org.argouml.state2.StateDiagramModule;org.argouml.activity2.ActivityDiagramModule;org.argouml.sequence2.SequenceDiagramModule;org.argouml.core.propertypanels.module.XmlPropertyPanelsModule -Dlog4j.configuration=org/argouml/resource/full_console.lcf -DeUML.resources=../argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.resources_3.1.1.v201008191505.jar -Dargouml.model.implementation=org.argouml.model.euml.EUMLModelImplementation"/> </launchConfiguration> Modified: trunk/src/argouml-core-model-euml/META-INF/MANIFEST.MF Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/META-INF/MANIFEST.MF?view=diff&pathrev=18894&r1=18893&r2=18894 ============================================================================== --- trunk/src/argouml-core-model-euml/META-INF/MANIFEST.MF (original) +++ trunk/src/argouml-core-model-euml/META-INF/MANIFEST.MF 2010-12-06 15:34:08-0800 @@ -78,19 +78,19 @@ org.eclipse.uml2.uml.util, profiles, schema -Bundle-ClassPath: lib/emf/org.eclipse.emf.common_2.5.0.v200906151043.jar, - lib/emf/org.eclipse.emf.ecore_2.5.0.v200906151043.jar, - lib/emf/org.eclipse.emf.ecore.change_2.5.0.v200906151043.jar, - lib/emf/org.eclipse.emf.ecore.change.edit_2.5.0.v200906151043.jar, - lib/emf/org.eclipse.emf.ecore.edit_2.5.0.v200906151043.jar, - lib/emf/org.eclipse.emf.ecore.xmi_2.5.0.v200906151043.jar, - lib/emf/org.eclipse.emf.edit_2.5.0.v200906151043.jar, - lib/emf/org.eclipse.emf.mapping_2.5.0.v200906151043.jar, - lib/emf/org.eclipse.emf.mapping.ecore2xml_2.5.0.v200906151043.jar, - lib/uml2/org.eclipse.uml2.common_1.5.0.v200905041045.jar, - lib/uml2/org.eclipse.uml2.common.edit_1.5.0.v200905041045.jar, - lib/uml2/org.eclipse.uml2.uml_3.0.1.v200908281330.jar, - lib/uml2/org.eclipse.uml2.uml.edit_3.0.0.v200905041045.jar, - lib/uml2/org.eclipse.uml2.uml.resources_3.0.0.v200906011111.jar, +Bundle-ClassPath: lib/emf/org.eclipse.emf.common_2.6.0.v20100914-1218.jar, + lib/emf/org.eclipse.emf.ecore_2.6.1.v20100914-1218.jar, + lib/emf/org.eclipse.emf.ecore.change_2.5.1.v20100907-1643.jar, + lib/emf/org.eclipse.emf.ecore.change.edit_2.5.0.v20100521-1846.jar, + lib/emf/org.eclipse.emf.ecore.edit_2.6.0.v20100914-1218.jar, + lib/emf/org.eclipse.emf.ecore.xmi_2.5.0.v20100521-1846.jar, + lib/emf/org.eclipse.emf.edit_2.6.0.v20100914-1218.jar, + lib/emf/org.eclipse.emf.mapping_2.6.0.v20100914-1218.jar, + lib/emf/org.eclipse.emf.mapping.ecore2xml_2.5.0.v20100521-1847.jar, + lib/uml2/org.eclipse.uml2.common_1.5.0.v201005031530.jar, + lib/uml2/org.eclipse.uml2.common.edit_1.5.0.v201005031530.jar, + lib/uml2/org.eclipse.uml2.uml_3.1.1.v201008191505.jar, + lib/uml2/org.eclipse.uml2.uml.edit_3.1.0.v201005031530.jar, + lib/uml2/org.eclipse.uml2.uml.resources_3.1.1.v201008191505.jar, . Eclipse-RegisterBuddy: org.argouml.core.infra, org.argouml.core.model Modified: trunk/src/argouml-core-model-euml/Model all tests eUML.launch Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/Model%20all%20tests%20eUML.launch?view=diff&pathrev=18894&r1=18893&r2=18894 ============================================================================== --- trunk/src/argouml-core-model-euml/Model all tests eUML.launch (original) +++ trunk/src/argouml-core-model-euml/Model all tests eUML.launch 2010-12-06 15:34:08-0800 @@ -23,20 +23,20 @@ <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-tools/lib/easymock12.jar" path="3" type="2"/> "/> <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-tools/apache-ant-1.7.0/lib/ant.jar" path="3" type="2"/> "/> <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-model-euml" type="1"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.common_2.5.0.v200906151043.jar" path="3" sourceAttachmentPath="/argouml-core-model-euml/lib/emf/org.eclipse.emf.common.source_2.5.0.v200906151043.zip" sourceRootPath="" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore_2.5.0.v200906151043.jar" path="3" sourceAttachmentPath="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.source_2.5.0.v200906151043.zip" sourceRootPath="" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.change_2.5.0.v200906151043.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.change.edit_2.5.0.v200906151043.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.edit_2.5.0.v200906151043.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.xmi_2.5.0.v200906151043.jar" path="3" sourceAttachmentPath="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.xmi.source_2.5.0.v200906151043.zip" sourceRootPath="" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.edit_2.5.0.v200906151043.jar" path="3" sourceAttachmentPath="/argouml-core-model-euml/lib/emf/org.eclipse.emf.edit.source_2.5.0.v200906151043.zip" sourceRootPath="" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.mapping_2.5.0.v200906151043.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.mapping.ecore2xml_2.5.0.v200906151043.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.common_1.5.0.v200905041045.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.common.edit_1.5.0.v200905041045.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml_3.0.1.v200908281330.jar" path="3" sourceAttachmentPath="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.source_3.0.1.v200908281330.zip" sourceRootPath="" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.edit_3.0.0.v200905041045.jar" path="3" type="2"/> "/> -<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.resources_3.0.0.v200906011111.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.common_2.6.0.v20100914-1218.jar" path="3" sourceAttachmentPath="/argouml-core-model-euml/lib/emf/org.eclipse.emf.common.source_2.6.0.v20100914-1218.zip" sourceRootPath="" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore_2.6.1.v20100914-1218.jar" path="3" sourceAttachmentPath="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.source_2.6.1.v20100914-1218.zip" sourceRootPath="" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.change_2.5.1.v20100907-1643.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.change.edit_2.5.0.v20100521-1846.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.edit_2.6.0.v20100914-1218.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.xmi_2.5.0.v20100521-1846.jar" path="3" sourceAttachmentPath="/argouml-core-model-euml/lib/emf/org.eclipse.emf.ecore.xmi.source_2.5.0.v20100521-1846.zip" sourceRootPath="" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.edit_2.6.0.v20100914-1218.jar" path="3" sourceAttachmentPath="/argouml-core-model-euml/lib/emf/org.eclipse.emf.edit.source_2.6.0.v20100914-1218.zip" sourceRootPath="" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.mapping_2.6.0.v20100914-1218.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/emf/org.eclipse.emf.mapping.ecore2xml_2.5.0.v20100521-1847.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.common_1.5.0.v201005031530.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.common.edit_1.5.0.v201005031530.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml_3.1.1.v201008191505.jar" path="3" sourceAttachmentPath="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.source_3.1.1.v201008191505.zip" sourceRootPath="" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.edit_3.1.0.v201005031530.jar" path="3" type="2"/> "/> +<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.resources_3.1.1.v201008191505.jar" path="3" type="2"/> "/> </listAttribute> <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.argouml.model.AllTests"/> Modified: trunk/src/argouml-core-model-euml/build.properties Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/build.properties?view=diff&pathrev=18894&r1=18893&r2=18894 ============================================================================== --- trunk/src/argouml-core-model-euml/build.properties (original) +++ trunk/src/argouml-core-model-euml/build.properties 2010-12-06 15:34:08-0800 @@ -3,18 +3,18 @@ .,\ plugin.xml,\ plugin.properties,\ - lib/emf/org.eclipse.emf.common_2.5.0.v200906151043.jar,\ - lib/emf/org.eclipse.emf.ecore_2.5.0.v200906151043.jar,\ - lib/emf/org.eclipse.emf.ecore.change_2.5.0.v200906151043.jar,\ - lib/emf/org.eclipse.emf.ecore.change.edit_2.5.0.v200906151043.jar,\ - lib/emf/org.eclipse.emf.ecore.edit_2.5.0.v200906151043.jar,\ - lib/emf/org.eclipse.emf.ecore.xmi_2.5.0.v200906151043.jar,\ - lib/emf/org.eclipse.emf.edit_2.5.0.v200906151043.jar,\ - lib/emf/org.eclipse.emf.mapping_2.5.0.v200906151043.jar,\ - lib/emf/org.eclipse.emf.mapping.ecore2xml_2.5.0.v200906151043.jar,\ - lib/uml2/org.eclipse.uml2.common_1.5.0.v200905041045.jar,\ - lib/uml2/org.eclipse.uml2.common.edit_1.5.0.v200905041045.jar,\ - lib/uml2/org.eclipse.uml2.uml_3.0.1.v200908281330.jar,\ - lib/uml2/org.eclipse.uml2.uml.edit_3.0.0.v200905041045.jar,\ - lib/uml2/org.eclipse.uml2.uml.resources_3.0.0.v200906011111.jar + lib/emf/org.eclipse.emf.common_2.6.0.v20100914-1218.jar,\ + lib/emf/org.eclipse.emf.ecore_2.6.1.v20100914-1218.jar,\ + lib/emf/org.eclipse.emf.ecore.change_2.5.1.v20100907-1643.jar,\ + lib/emf/org.eclipse.emf.ecore.change.edit_2.5.0.v20100521-1846.jar,\ + lib/emf/org.eclipse.emf.ecore.edit_2.6.0.v20100914-1218.jar,\ + lib/emf/org.eclipse.emf.ecore.xmi_2.5.0.v20100521-1846.jar,\ + lib/emf/org.eclipse.emf.edit_2.6.0.v20100914-1218.jar,\ + lib/emf/org.eclipse.emf.mapping_2.6.0.v20100914-1218.jar,\ + lib/emf/org.eclipse.emf.mapping.ecore2xml_2.5.0.v20100521-1847.jar,\ + lib/uml2/org.eclipse.uml2.common_1.5.0.v201005031530.jar,\ + lib/uml2/org.eclipse.uml2.common.edit_1.5.0.v201005031530.jar,\ + lib/uml2/org.eclipse.uml2.uml_3.1.1.v201008191505.jar,\ + lib/uml2/org.eclipse.uml2.uml.edit_3.1.0.v201005031530.jar,\ + lib/uml2/org.eclipse.uml2.uml.resources_3.1.1.v201008191505.jar source.. = src/ Modified: trunk/src/argouml-core-model-euml/build.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/build.xml?view=diff&pathrev=18894&r1=18893&r2=18894 ============================================================================== --- trunk/src/argouml-core-model-euml/build.xml (original) +++ trunk/src/argouml-core-model-euml/build.xml 2010-12-06 15:34:08-0800 @@ -38,21 +38,21 @@ <property name="result.jar" value="argouml-euml.jar"/> <path id="euml.run.classpath"> - <pathelement location="lib/emf/org.eclipse.emf.common_2.5.0.v200906151043.jar"/> - <pathelement location="lib/emf/org.eclipse.emf.ecore.change.edit_2.5.0.v200906151043.jar"/> - <pathelement location="lib/emf/org.eclipse.emf.ecore.change_2.5.0.v200906151043.jar"/> - <pathelement location="lib/emf/org.eclipse.emf.ecore.edit_2.5.0.v200906151043.jar"/> - <pathelement location="lib/emf/org.eclipse.emf.ecore.xmi_2.5.0.v200906151043.jar"/> - <pathelement location="lib/emf/org.eclipse.emf.ecore_2.5.0.v200906151043.jar"/> - <pathelement location="lib/emf/org.eclipse.emf.edit_2.5.0.v200906151043.jar"/> - <pathelement location="lib/emf/org.eclipse.emf.mapping.ecore2xml_2.5.0.v200906151043.jar"/> - <pathelement location="lib/emf/org.eclipse.emf.mapping.ecore_2.5.0.v200906151043.jar"/> - <pathelement location="lib/emf/org.eclipse.emf.mapping_2.5.0.v200906151043.jar"/> - <pathelement location="lib/uml2/org.eclipse.uml2.common.edit_1.5.0.v200905041045.jar"/> - <pathelement location="lib/uml2/org.eclipse.uml2.common_1.5.0.v200905041045.jar"/> - <pathelement location="lib/uml2/org.eclipse.uml2.uml.edit_3.0.0.v200905041045.jar"/> - <pathelement location="lib/uml2/org.eclipse.uml2.uml.resources_3.0.0.v200906011111.jar"/> - <pathelement location="lib/uml2/org.eclipse.uml2.uml_3.0.1.v200908281330.jar"/> + <pathelement location="lib/emf/org.eclipse.emf.common_2.6.0.v20100914-1218.jar"/> + <pathelement location="lib/emf/org.eclipse.emf.ecore.change.edit_2.5.0.v20100521-1846.jar"/> + <pathelement location="lib/emf/org.eclipse.emf.ecore.change_2.5.1.v20100907-1643.jar"/> + <pathelement location="lib/emf/org.eclipse.emf.ecore.edit_2.6.0.v20100914-1218.jar"/> + <pathelement location="lib/emf/org.eclipse.emf.ecore.xmi_2.5.0.v20100521-1846.jar"/> + <pathelement location="lib/emf/org.eclipse.emf.ecore_2.6.1.v20100914-1218.jar"/> + <pathelement location="lib/emf/org.eclipse.emf.edit_2.6.0.v20100914-1218.jar"/> + <pathelement location="lib/emf/org.eclipse.emf.mapping.ecore2xml_2.5.0.v20100521-1847.jar"/> + <pathelement location="lib/emf/org.eclipse.emf.mapping.ecore_2.6.0.v20100914-1218.jar"/> + <pathelement location="lib/emf/org.eclipse.emf.mapping_2.6.0.v20100914-1218.jar"/> + <pathelement location="lib/uml2/org.eclipse.uml2.common.edit_1.5.0.v201005031530.jar"/> + <pathelement location="lib/uml2/org.eclipse.uml2.common_1.5.0.v201005031530.jar"/> + <pathelement location="lib/uml2/org.eclipse.uml2.uml.edit_3.1.0.v201005031530.jar"/> + <pathelement location="lib/uml2/org.eclipse.uml2.uml.resources_3.1.1.v201008191505.jar"/> + <pathelement location="lib/uml2/org.eclipse.uml2.uml_3.1.1.v201008191505.jar"/> </path> <path id="euml.compile.classpath"> Modified: trunk/src/argouml-core-model-euml/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/pom.xml?view=diff&pathrev=18894&r1=18893&r2=18894 ============================================================================== --- trunk/src/argouml-core-model-euml/pom.xml (original) +++ trunk/src/argouml-core-model-euml/pom.xml 2010-12-06 15:34:08-0800 @@ -33,35 +33,35 @@ <dependency> <groupId>org.eclipse.uml2</groupId> <artifactId>org.eclipse.uml2.common</artifactId> - <version>1.5.0.v200905041045</version> + <version>1.5.0.v201005031530</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.uml2</groupId> <artifactId>org.eclipse.uml2.common.edit</artifactId> - <version>1.5.0.v200905041045</version> + <version>1.5.0.v201005031530</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.uml2</groupId> <artifactId>org.eclipse.uml2.uml</artifactId> - <version>3.0.1.v200908281330</version> + <version>3.1.1.v201008191505</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.uml2</groupId> <artifactId>org.eclipse.uml2.uml.edit</artifactId> - <version>3.0.0.v200905041045</version> + <version>3.1.0.v201005031530</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.uml2</groupId> <artifactId>org.eclipse.uml2.uml.resources</artifactId> - <version>3.0.0.v200906011111</version> + <version>3.1.1.v201008191505</version> <type>jar</type> <scope>compile</scope> </dependency> @@ -69,70 +69,70 @@ <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>org.eclipse.emf.common</artifactId> - <version>2.5.0.v200906151043</version> + <version>2.6.0.v20100914-1218</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>org.eclipse.emf.ecore</artifactId> - <version>2.5.0.v200906151043</version> + <version>2.6.1.v20100914-1218</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>org.eclipse.emf.ecore.change</artifactId> - <version>2.5.0.v200906151043</version> + <version>2.5.1.v20100907-1643</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>org.eclipse.emf.ecore.change.edit</artifactId> - <version>2.5.0.v200906151043</version> + <version>2.5.0.v20100521-1846</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>org.eclipse.emf.ecore.edit</artifactId> - <version>2.5.0.v200906151043</version> + <version>2.6.0.v20100914-1218</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>org.eclipse.emf.edit</artifactId> - <version>2.5.0.v200906151043</version> + <version>2.6.0.v20100914-1218</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>org.eclipse.emf.ecore.xmi</artifactId> - <version>2.5.0.v200906151043</version> + <version>2.5.0.v20100521-1846</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>org.eclipse.emf.mapping</artifactId> - <version>2.5.0.v200906151043</version> + <version>2.6.0.v20100914-1218</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>org.eclipse.emf.mapping.ecore</artifactId> - <version>2.5.0.v200906151043</version> + <version>2.6.0.v20100914-1218</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>org.eclipse.emf.mapping.ecore2xml</artifactId> - <version>2.5.0.v200906151043</version> + <version>2.5.0.v20100521-1847</version> <type>jar</type> <scope>compile</scope> </dependency> Modified: trunk/src/argouml-core-model-euml/src/manifest.mf Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/manifest.mf?view=diff&pathrev=18894&r1=18893&r2=18894 ============================================================================== --- trunk/src/argouml-core-model-euml/src/manifest.mf (original) +++ trunk/src/argouml-core-model-euml/src/manifest.mf 2010-12-06 15:34:08-0800 @@ -1,6 +1,6 @@ Manifest-Version: 2.0 Main-Class: org.argouml.application.Main -Class-Path: argouml-model.jar ocl-argo.jar gef.jar antlrall.jar log4j.jar toolbar.jar swidgets.jar commons-logging.jar ext/argouml-i18n-nb.jar ext/argouml-i18n-zh.jar argouml.jar org.eclipse.emf.common_2.5.0.v200906151043.jar org.eclipse.emf.ecore.change.edit_2.5.0.v200906151043.jar org.eclipse.emf.ecore.change_2.5.0.v200906151043.jar org.eclipse.emf.ecore.edit_2.5.0.v200906151043.jar org.eclipse.emf.ecore.xmi_2.5.0.v200906151043.jar org.eclipse.emf.ecore_2.5.0.v200906151043.jar org.eclipse.emf.edit_2.5.0.v200906151043.jar org.eclipse.emf.mapping.ecore2xml_2.5.0.v200906151043.jar org.eclipse.emf.mapping.ecore_2.5.0.v200906151043.jar org.eclipse.emf.mapping_2.5.0.v200906151043.jar org.eclipse.uml2.common.edit_1.5.0.v200905041045.jar org.eclipse.uml2.common_1.5.0.v200905041045.jar org.eclipse.uml2.uml.edit_3.0.0.v200905041045.jar org.eclipse.uml2.uml.resources_3.0.0.v200906011111.jar org.eclipse.uml2.uml_3.0.1.v200908281330.jar +Class-Path: argouml-model.jar ocl-argo.jar gef.jar antlrall.jar log4j.jar toolbar.jar swidgets.jar commons-logging.jar ext/argouml-i18n-nb.jar ext/argouml-i18n-zh.jar argouml.jar org.eclipse.emf.common_2.6.0.v20100914-1218.jar org.eclipse.emf.ecore.change.edit_2.5.0.v20100521-1846.jar org.eclipse.emf.ecore.change_2.5.1.v20100907-1643.jar org.eclipse.emf.ecore.edit_2.6.0.v20100914-1218.jar org.eclipse.emf.ecore.xmi_2.5.0.v20100521-1846.jar org.eclipse.emf.ecore_2.6.1.v20100914-1218.jar org.eclipse.emf.edit_2.6.0.v20100914-1218.jar org.eclipse.emf.mapping.ecore2xml_2.5.0.v20100521-1847.jar org.eclipse.emf.mapping.ecore_2.6.0.v20100914-1218.jar org.eclipse.emf.mapping_2.6.0.v20100914-1218.jar org.eclipse.uml2.common.edit_1.5.0.v201005031530.jar org.eclipse.uml2.common_1.5.0.v201005031530.jar org.eclipse.uml2.uml.edit_3.1.0.v201005031530.jar org.eclipse.uml2.uml.resources_3.1.1.v201008191505.jar org.eclipse.uml2.uml_3.1.1.v201008191505.jar Created-By: 1.2 (Sun Microsystems Inc.) Name: org/argouml/application/ ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2688293 To unsubscribe from this discussion, e-mail: [[email protected]].
