From: Chris M. <cm...@us...> - 2006-08-29 02:44:13
|
User: cmicali Date: 06/08/28 19:44:12 Modified: distribution pom.xml distribution/src/antrun copy-m2-m1.xml Log: - Updated distribution model to work with andromda-plugins Revision Changes Path 1.2 +0 -99 plugins/distribution/pom.xml Index: pom.xml =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/distribution/pom.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- pom.xml 23 Aug 2006 21:39:44 -0000 1.1 +++ pom.xml 29 Aug 2006 02:44:12 -0000 1.2 @@ -13,104 +13,11 @@ <description>Provides the assembly of the AndroMDA Plugin distribution</description> <dependencies> <!-- Add dependencies here to ensure they're built before the distribution itself --> - <dependency> - </dependency> </dependencies> <build> <plugins> - <!--plugin> - <groupId>org.andromda.maven.plugins</groupId> - <artifactId>andromda-distribution-plugin</artifactId> - <version>${pom.version}</version> - <executions> - <execution> - <id>binary</id> - <goals> - <goal>assemble</goal> - </goals> - <configuration> - <name>andromda-bin-${pom.version}</name> - <artifactDirectory>andromda</artifactDirectory> - <dependencyDirectory>lib</dependencyDirectory> - <projectIncludes> - <include>**/pom.xml</include> - </projectIncludes> - <projectExcludes> - <exclude>distribution/**</exclude> - </projectExcludes> - <artifactExcludes> - <artifact> - <groupId>org\.andromda\.samples.*</groupId> - </artifact> - <artifact> - <groupId>org\.andromda\.bootstrap.*</groupId> - </artifact> - </artifactExcludes> - <locations> - <location> - <path>${pom.basedir}/../samples</path> - <excludes> - <exlude>conf/**</exlude> - <exclude>**/target/**</exclude> - <exclude>**/CVS/**</exclude> - <exclude>**/.cvsignore</exclude> - <exclude>*</exclude> - <exclude>**/*.log</exclude> - </excludes> - <outputPath>samples/</outputPath> - </location> - <location> - <path>${pom.basedir}/../maven/2/andromdapp/target/plugin-install</path> - <includes> - <include>**/*.xml</include> - </includes> - <outputPath>andromda/</outputPath> - </location> - <location> - <path>${pom.basedir}/../ant/andromda/src/ant/build.xml.vsl</path> - <outputPath>andromda/org/andromda/ant/build.xml</outputPath> - </location> - </locations> - </configuration> - </execution> - <execution> - <id>source</id> - <goals> - <goal>assemble</goal> - </goals> - <configuration> - <name>andromda-src-${pom.version}</name> - <locations> - <location> - <path>${pom.basedir}/../</path> - <excludes> - <exclude>**/target/**</exclude> - <exclude>**/CVS/**</exclude> - <exclude>**/.cvsignore</exclude> - <exclude>**/*.log</exclude> - </excludes> - </location> - </locations> - </configuration> - </execution> - </executions> - </plugin--> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <!-- set property, do something like this in ~/.m2/settings.xml - <profiles> - <profile> - <id>andromda</id> - <properties> - <maven1Repository>/var/maven/repository</maven1Repository> - <websiteDir>/var/www/andromda</websiteDir> - </properties> - </profile> - </profiles> - <activeProfiles> - <activeProfile>andromda</activeProfile> - </activeProfiles> - --> <executions> <execution> <phase>install</phase> @@ -122,12 +29,6 @@ <property name="maven1.repository" value="${maven1Repository}"/> <property name="maven2.repository" value="${settings.localRepository}"/> </ant> - <ant dir="src/antrun" antfile="copy-2-website.xml"> - <property name="website.dir" value="${websiteDir}"/> - <property name="maven1.repository" value="${maven1Repository}"/> - <property name="maven2.repository" value="${settings.localRepository}"/> - <property name="distribution.output.directory" value="${project.build.directory}"/> - </ant> <echo message="Copy and install of m2 to m1 artifacts done."/> </tasks> </configuration> 1.2 +0 -10 plugins/distribution/src/antrun/copy-m2-m1.xml Index: copy-m2-m1.xml =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/distribution/src/antrun/copy-m2-m1.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- copy-m2-m1.xml 23 Aug 2006 21:39:44 -0000 1.1 +++ copy-m2-m1.xml 29 Aug 2006 02:44:12 -0000 1.2 @@ -27,20 +27,10 @@ from ${maven2.repository}/org/andromda to ${maven1.repository}/andromda </echo> - <copy todir="${maven1.repository}/andromda/uml2" flatten="true" preservelastmodified="true"> - <fileset dir="${maven2.repository}/org/andromda"> - <include name="**/*.uml2"/> - </fileset> - </copy> <copy todir="${maven1.repository}/andromda/jars" flatten="true" preservelastmodified="true"> <fileset dir="${maven2.repository}/org/andromda"> <include name="**/*.jar"/> </fileset> </copy> - <copy todir="${maven1.repository}/andromda/xml.zips" flatten="true" preservelastmodified="true"> - <fileset dir="${maven2.repository}/org/andromda/profiles/uml14"> - <include name="**/*.xml.zip"/> - </fileset> - </copy> </target> </project> \ No newline at end of file |