Menu
▾
▴
[Andromda-cvs] SF.net SVN: andromda:[15077] trunk
|
From: <bob...@us...> - 2011-05-18 21:50:50
|
Revision: 15077
http://andromda.svn.sourceforge.net/andromda/?rev=15077&view=rev
Author: bobfields
Date: 2011-05-18 21:50:43 +0000 (Wed, 18 May 2011)
Log Message:
-----------
EMF-UML22 models output correctly. Copy profiles to model directory, update after maven update.
Modified Paths:
--------------
trunk/andromda-andromdapp/projects/j2ee/maven2/pom.xml
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/META-INF/andromdapp/andromdapp.xml
trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/pom.xml.vsl
trunk/andromda-etc/mda/uml/empty-model.uml
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/pom.xml
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/pom.xml 2011-05-18 21:49:41 UTC (rev 15076)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/pom.xml 2011-05-18 21:50:43 UTC (rev 15077)
@@ -17,6 +17,16 @@
<developerConnection>scm:svn:https://andromda.svn.sourceforge.net/svnroot/andromda/trunk/andromda-andromdapp/projects/j2ee/maven2</developerConnection>
<url>http://andromda.svn.sourceforge.net/viewvc/andromda/trunk/andromda-andromdapp/projects/j2ee/maven2</url>
</scm>
+ <dependencies>
+ <!-- Must build the .uml profiles so that artifacts can be copied into this project for referencing -->
+ <dependency>
+ <groupId>org.andromda.profiles.emf.uml22</groupId>
+ <artifactId>andromda-profiles-emf-uml22</artifactId>
+ <version>${andromda.version}</version>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<build>
<resources>
<resource>
@@ -29,6 +39,77 @@
</includes>
<targetPath>templates/j2ee/maven2/mda/src/main/uml</targetPath>
</resource>
+ <!-- .uml profiles in m2repo cannot be referenced by PATHMAP when editing the starter model -->
+ <resource>
+ <directory>${project.basedir}/../../../../profiles/emf/uml22/common/target</directory>
+ <includes>
+ <include>*-${project.version}.profile.uml</include>
+ </includes>
+ <targetPath>templates/j2ee/maven2/mda/src/main/uml</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/../../../../profiles/emf/uml22/datatype/target</directory>
+ <includes>
+ <include>*-${project.version}.uml</include>
+ </includes>
+ <targetPath>templates/j2ee/maven2/mda/src/main/uml</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/../../../../profiles/emf/uml22/messaging/target</directory>
+ <includes>
+ <include>*-${project.version}.profile.uml</include>
+ </includes>
+ <targetPath>templates/j2ee/maven2/mda/src/main/uml</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/../../../../profiles/emf/uml22/meta/target</directory>
+ <includes>
+ <include>*-${project.version}.profile.uml</include>
+ </includes>
+ <targetPath>templates/j2ee/maven2/mda/src/main/uml</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/../../../../profiles/emf/uml22/persistence/target</directory>
+ <includes>
+ <include>*-${project.version}.profile.uml</include>
+ </includes>
+ <targetPath>templates/j2ee/maven2/mda/src/main/uml</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/../../../../profiles/emf/uml22/presentation/target</directory>
+ <includes>
+ <include>*-${project.version}.profile.uml</include>
+ </includes>
+ <targetPath>templates/j2ee/maven2/mda/src/main/uml</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/../../../../profiles/emf/uml22/process/target</directory>
+ <includes>
+ <include>*-${project.version}.profile.uml</include>
+ </includes>
+ <targetPath>templates/j2ee/maven2/mda/src/main/uml</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/../../../../profiles/emf/uml22/service/target</directory>
+ <includes>
+ <include>*-${project.version}.profile.uml</include>
+ </includes>
+ <targetPath>templates/j2ee/maven2/mda/src/main/uml</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/../../../../profiles/emf/uml22/webservice/target</directory>
+ <includes>
+ <include>*-${project.version}.profile.uml</include>
+ </includes>
+ <targetPath>templates/j2ee/maven2/mda/src/main/uml</targetPath>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/../../../../profiles/emf/uml22/xml/target</directory>
+ <includes>
+ <include>*-${project.version}.profile.uml</include>
+ </includes>
+ <targetPath>templates/j2ee/maven2/mda/src/main/uml</targetPath>
+ </resource>
</resources>
<plugins>
<plugin>
@@ -36,4 +117,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/META-INF/andromdapp/andromdapp.xml
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/META-INF/andromdapp/andromdapp.xml 2011-05-18 21:49:41 UTC (rev 15076)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/META-INF/andromdapp/andromdapp.xml 2011-05-18 21:50:43 UTC (rev 15077)
@@ -87,6 +87,11 @@
</conditions>
<conditions type="and">
<condition id="model" present="false"/>
+ <condition id="modelType" equal="emf-uml22"/>
+ <output patterns="andromda-*-${andromda.version}.*.uml">mda/src/main/uml/</output>
+ </conditions>
+ <conditions type="and">
+ <condition id="model" present="false"/>
<condition id="modelType" equal="rsm7"/>
<output>mda/src/main/uml/${applicationId}.emx.vsl</output>
</conditions>
Modified: trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/pom.xml.vsl
===================================================================
--- trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/pom.xml.vsl 2011-05-18 21:49:41 UTC (rev 15076)
+++ trunk/andromda-andromdapp/projects/j2ee/maven2/src/main/resources/templates/j2ee/maven2/mda/pom.xml.vsl 2011-05-18 21:50:43 UTC (rev 15077)
@@ -236,7 +236,29 @@
<build>
<sourceDirectory>${project.basedir}/src/main/uml</sourceDirectory>
<plugins>
+#if (!$cxf && $modelType.equals("emf-uml22") && $andromdaVersion.endsWith("-SNAPSHOT"))
+ <!-- Update the .uml snapshot profiles from the maven download to the local model directory (avoid PATHMAP references) -->
<plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <configuration>
+ <target>
+ <copy todir="${project.basedir}/src/main/uml" preservelastmodified="true" flatten="true" failonerror="false" verbose="true">
+ <fileset dir="${m2repo}/org/andromda/profiles/emf/uml22"
+ includes="**/${andromda.version}/andromda-*-${andromda.version}.*uml"/>
+ </copy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+#end
+ <plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-maven-plugin</artifactId>
<executions>
@@ -291,6 +313,24 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
+ <!-- $modelType $andromdaVersion $andromdaVersion.endsWith("-SNAPSHOT") -->
+#if ($modelType.equals("emf-uml22") && $andromdaVersion.endsWith("-SNAPSHOT"))
+ <!-- Update the .uml snapshot profiles from the maven download to the local model directory (avoid PATHMAP references) -->
+ <execution>
+ <phase>initialize</phase>
+ <configuration>
+ <target>
+ <copy todir="${project.basedir}/src/main/uml" preservelastmodified="true" flatten="true" failonerror="false" verbose="true">
+ <fileset dir="${settings.localRepository}/org/andromda/profiles/emf/uml22"
+ includes="**/${andromda.version}/andromda-*-${andromda.version}.*uml"/>
+ </copy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+#end
<!-- Clean the implementation code and WSDL code also, during mvn clean -->
<execution>
<id>clean</id>
Modified: trunk/andromda-etc/mda/uml/empty-model.uml
===================================================================
--- trunk/andromda-etc/mda/uml/empty-model.uml 2011-05-18 21:49:41 UTC (rev 15076)
+++ trunk/andromda-etc/mda/uml/empty-model.uml 2011-05-18 21:50:43 UTC (rev 15077)
@@ -8,7 +8,8 @@
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/JavaPrimitiveTypes.library.uml#_0"/>
</packageImport>
<packageImport xmi:id="_7tQHQExuEd60KbaIlrDIWg">
- <importedPackage xmi:type="uml:Model" href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-datatype/3.4-SNAPSHOT/andromda-datatype-3.4-SNAPSHOT.uml#eee_1045467100313_135436_1"/>
+ <!--importedPackage xmi:type="uml:Model" href="andromda-datatype-3.4-SNAPSHOT.uml#eee_1045467100313_135436_1"/-->
+ <importedPackage xmi:type="uml:Model" href="andromda-datatype-3.4-SNAPSHOT.uml#eee_1045467100313_135436_1"/>
</packageImport>
<packagedElement xmi:type="uml:Package" xmi:id="_UW5VUHBCEdyzBeV1cEAmlQ" name="PrimitiveTypes">
<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_UW5VVHBCEdyzBeV1cEAmlQ" name="BigDecimal"/>
@@ -30,44 +31,51 @@
</profileApplication>
<profileApplication xmi:id="_u18doExuEd60KbaIlrDIWg">
<eAnnotations xmi:id="_u2iTgExuEd60KbaIlrDIWg" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-common/3.4-SNAPSHOT/andromda-common-3.4-SNAPSHOT.profile.uml#_UlacSiOuEd6Yv5u3OIooDQ"/>
+ <references xmi:type="ecore:EPackage" href="andromda-common-3.4-SNAPSHOT.profile.uml#_UlacSiOuEd6Yv5u3OIooDQ"/>
+ <!--references xmi:type="ecore:EPackage" href="andromda-common-3.4-SNAPSHOT.profile.uml#_UlacSiOuEd6Yv5u3OIooDQ"/-->
</eAnnotations>
- <appliedProfile href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-common/3.4-SNAPSHOT/andromda-common-3.4-SNAPSHOT.profile.uml#_8a70287_1078771814628_224704_589"/>
+ <appliedProfile href="andromda-common-3.4-SNAPSHOT.profile.uml#_8a70287_1078771814628_224704_589"/>
</profileApplication>
<profileApplication xmi:id="_w8IuEExuEd60KbaIlrDIWg">
<eAnnotations xmi:id="_w8IuEUxuEd60KbaIlrDIWg" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-persistence/3.4-SNAPSHOT/andromda-persistence-3.4-SNAPSHOT.profile.uml#_UlaW6yOuEd6Yv5u3OIooDQ"/>
+ <references xmi:type="ecore:EPackage" href="andromda-persistence-3.4-SNAPSHOT.profile.uml#_UlaW6yOuEd6Yv5u3OIooDQ"/>
+ <!--references xmi:type="ecore:EPackage" href="andromda-persistence-3.4-SNAPSHOT.profile.uml#_UlaW6yOuEd6Yv5u3OIooDQ"/-->
</eAnnotations>
- <appliedProfile href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-persistence/3.4-SNAPSHOT/andromda-persistence-3.4-SNAPSHOT.profile.uml#_9_0_2_12ab03bf_1120853774265_65497_87"/>
+ <appliedProfile href="andromda-persistence-3.4-SNAPSHOT.profile.uml#_9_0_2_12ab03bf_1120853774265_65497_87"/>
</profileApplication>
<profileApplication xmi:id="_yyjdIExuEd60KbaIlrDIWg">
<eAnnotations xmi:id="_yyjdIUxuEd60KbaIlrDIWg" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-presentation/3.4-SNAPSHOT/andromda-presentation-3.4-SNAPSHOT.profile.uml#_UlaRsSOuEd6Yv5u3OIooDQ"/>
+ <references xmi:type="ecore:EPackage" href="andromda-presentation-3.4-SNAPSHOT.profile.uml#_UlaRsSOuEd6Yv5u3OIooDQ"/>
+ <!--references xmi:type="ecore:EPackage" href="andromda-presentation-3.4-SNAPSHOT.profile.uml#_UlaRsSOuEd6Yv5u3OIooDQ"/-->
</eAnnotations>
- <appliedProfile href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-presentation/3.4-SNAPSHOT/andromda-presentation-3.4-SNAPSHOT.profile.uml#_9_0_2_12ab03bf_1120853223187_211304_0"/>
+ <appliedProfile href="andromda-presentation-3.4-SNAPSHOT.profile.uml#_9_0_2_12ab03bf_1120853223187_211304_0"/>
</profileApplication>
<profileApplication xmi:id="_0TaL4ExuEd60KbaIlrDIWg">
<eAnnotations xmi:id="_0TaL4UxuEd60KbaIlrDIWg" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-process/3.4-SNAPSHOT/andromda-process-3.4-SNAPSHOT.profile.uml#_Ulab1COuEd6Yv5u3OIooDQ"/>
+ <references xmi:type="ecore:EPackage" href="andromda-process-3.4-SNAPSHOT.profile.uml#_Ulab1COuEd6Yv5u3OIooDQ"/>
+ <!--references xmi:type="ecore:EPackage" href="andromda-process-3.4-SNAPSHOT.profile.uml#_Ulab1COuEd6Yv5u3OIooDQ"/-->
</eAnnotations>
- <appliedProfile href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-process/3.4-SNAPSHOT/andromda-process-3.4-SNAPSHOT.profile.uml#_9_0_2_12ab03bf_1120853175671_502460_0"/>
+ <appliedProfile href="andromda-process-3.4-SNAPSHOT.profile.uml#_9_0_2_12ab03bf_1120853175671_502460_0"/>
</profileApplication>
<profileApplication xmi:id="_2CinMExuEd60KbaIlrDIWg">
<eAnnotations xmi:id="_2CinMUxuEd60KbaIlrDIWg" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-service/3.4-SNAPSHOT/andromda-service-3.4-SNAPSHOT.profile.uml#_UlaeICOuEd6Yv5u3OIooDQ"/>
+ <references xmi:type="ecore:EPackage" href="andromda-service-3.4-SNAPSHOT.profile.uml#_UlaeICOuEd6Yv5u3OIooDQ"/>
+ <!--references xmi:type="ecore:EPackage" href="andromda-service-3.4-SNAPSHOT.profile.uml#_UlaeICOuEd6Yv5u3OIooDQ"/-->
</eAnnotations>
- <appliedProfile href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-service/3.4-SNAPSHOT/andromda-service-3.4-SNAPSHOT.profile.uml#_9_0_2_12ab03bf_1120852978046_265263_0"/>
+ <appliedProfile href="andromda-service-3.4-SNAPSHOT.profile.uml#_9_0_2_12ab03bf_1120852978046_265263_0"/>
</profileApplication>
<profileApplication xmi:id="_3c2CAExuEd60KbaIlrDIWg">
<eAnnotations xmi:id="_3c2CAUxuEd60KbaIlrDIWg" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-webservice/3.4-SNAPSHOT/andromda-webservice-3.4-SNAPSHOT.profile.uml#_UlagnCOuEd6Yv5u3OIooDQ"/>
+ <references xmi:type="ecore:EPackage" href="andromda-webservice-3.4-SNAPSHOT.profile.uml#_UlagnCOuEd6Yv5u3OIooDQ"/>
+ <!--references xmi:type="ecore:EPackage" href="andromda-webservice-3.4-SNAPSHOT.profile.uml#_UlagnCOuEd6Yv5u3OIooDQ"/-->
</eAnnotations>
- <appliedProfile href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-webservice/3.4-SNAPSHOT/andromda-webservice-3.4-SNAPSHOT.profile.uml#_9_0_2_12ab03bf_1120852932765_76536_0"/>
+ <appliedProfile href="andromda-webservice-3.4-SNAPSHOT.profile.uml#_9_0_2_12ab03bf_1120852932765_76536_0"/>
</profileApplication>
<profileApplication xmi:id="_44fgoExuEd60KbaIlrDIWg">
<eAnnotations xmi:id="_44fgoUxuEd60KbaIlrDIWg" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-xml/3.4-SNAPSHOT/andromda-xml-3.4-SNAPSHOT.profile.uml#_UlaRIyOuEd6Yv5u3OIooDQ"/>
+ <references xmi:type="ecore:EPackage" href="andromda-xml-3.4-SNAPSHOT.profile.uml#_UlaRIyOuEd6Yv5u3OIooDQ"/>
+ <!--references xmi:type="ecore:EPackage" href="andromda-xml-3.4-SNAPSHOT.profile.uml#_UlaRIyOuEd6Yv5u3OIooDQ"/-->
</eAnnotations>
- <appliedProfile href="pathmap://M2_REPO/org/andromda/profiles/emf/uml22/andromda-xml/3.4-SNAPSHOT/andromda-xml-3.4-SNAPSHOT.profile.uml#_9_0_2_12ab03bf_1120852471296_986007_0"/>
+ <appliedProfile href="andromda-xml-3.4-SNAPSHOT.profile.uml#_9_0_2_12ab03bf_1120852471296_986007_0"/>
</profileApplication>
</uml:Model>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|