Author: thilinab Date: Mon May 18 13:33:21 2009 New Revision: 36090 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=36090
Log: Reordered the sequence of plugins. Modified: trunk/solutions/identity/modules/distribution/pom.xml Modified: trunk/solutions/identity/modules/distribution/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/solutions/identity/modules/distribution/pom.xml?rev=36090&r1=36089&r2=36090&view=diff ============================================================================== --- trunk/solutions/identity/modules/distribution/pom.xml (original) +++ trunk/solutions/identity/modules/distribution/pom.xml Mon May 18 13:33:21 2009 @@ -239,11 +239,11 @@ <artifactId>org.wso2.carbon.xkms</artifactId> <version>${carbon.version}</version> <exclusions> - <exclusion> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2</artifactId> - </exclusion> - </exclusions> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -326,11 +326,11 @@ <artifactId>org.wso2.carbon.mex</artifactId> <version>${carbon.version}</version> <exclusions> - <exclusion> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2</artifactId> - </exclusion> - </exclusions> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -338,11 +338,11 @@ <artifactId>org.wso2.carbon.xfer</artifactId> <version>${carbon.version}</version> <exclusions> - <exclusion> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2</artifactId> - </exclusion> - </exclusions> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -472,71 +472,13 @@ <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <executions> - <execution> - <id>copy_components</id> - <phase>test</phase> - <goals> - <goal>attached</goal> - </goals> - <configuration> - <filters> - <filter>src/assembly/filter.properties</filter> - </filters> - <descriptors> - <descriptor>src/assembly/dist.xml</descriptor> - </descriptors> - </configuration> - </execution> - <execution> - <id>dist</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - <configuration> - - <descriptors> - <descriptor>src/assembly/bin.xml</descriptor> - <descriptor>src/assembly/src.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <id>---------------extract-IS-zip</id> - <phase>verify</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <unzip src="target/wso2is-${pom.version}.zip" - dest="target/tmp"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.wso2.maven</groupId> <artifactId>equinox-bundlesinfo-plugin</artifactId> <version>1.0.0</version> <executions> <execution> <id>---------------create-bundlesinfo-file</id> - <phase>verify</phase> + <phase>package</phase> <goals> <goal>bundlesinfo</goal> </goals> @@ -559,23 +501,61 @@ </frameworkBundles> <bundlesDirectories> <param> - ${basedir}/target/tmp/wso2is-${pom.version}/webapps/ROOT/WEB-INF/plugins/common + ${basedir}/target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/plugins/common </param> <param> - ${basedir}/target/tmp/wso2is-${pom.version}/webapps/ROOT/WEB-INF/plugins/server + ${basedir}/target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/plugins/server </param> <param> - ${basedir}/target/tmp/wso2is-${pom.version}/webapps/ROOT/WEB-INF/plugins/console + ${basedir}/target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/plugins/console </param> </bundlesDirectories> <bundleInfoOutputDir> - target/tmp/wso2is-${pom.version}/webapps/ROOT/WEB-INF/eclipse/configuration/org.eclipse.equinox.simpleconfigurator + target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/eclipse/configuration/org.eclipse.equinox.simpleconfigurator </bundleInfoOutputDir> <bundlesUrlPrefix>file:plugins/</bundlesUrlPrefix> <defaultStartLevel>10</defaultStartLevel> </configuration> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <executions> + <execution> + <id>copy_components</id> + <phase>test</phase> + <goals> + <goal>attached</goal> + </goals> + <configuration> + <filters> + <filter>src/assembly/filter.properties</filter> + </filters> + <descriptors> + <descriptor>src/assembly/dist.xml</descriptor> + </descriptors> + </configuration> + </execution> + <execution> + <id>dist</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + <configuration> + + <descriptors> + <descriptor>src/assembly/bin.xml</descriptor> + <descriptor>src/assembly/src.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> @@ -589,11 +569,6 @@ </goals> <configuration> <tasks> - <echo message="Recreating wso2IS ZIP file"/> - <zip destfile="target/wso2is-${pom.version}.zip" update="true"> - <zipfileset dir="target/tmp/" excludes="**/*.sh,**/native/*"/> - <zipfileset dir="target/tmp/" includes="**/*.sh,**/native/*" filemode="755"/> - </zip> <delete dir="target/archive-tmp"/> <delete dir="target/dependency-maven-plugin-markers"/> <delete dir="target/maven-archiver"/> @@ -601,13 +576,13 @@ <delete file="target/wso2is-${pom.version}.jar"/> <delete dir="target/sources"/> <delete dir="target/site"/> - <delete dir="target/tmp"/> <delete dir="src/site"/> </tasks> </configuration> </execution> </executions> </plugin> + </plugins> </build> </project> _______________________________________________ Identity-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/identity-dev
