Author: sameera Date: Sun Aug 9 12:33:11 2009 New Revision: 42894 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=42894
Log: Integration p2 profile generation to WSAS. Modified: branches/wsas/java/3.1.1/product/modules/distribution/pom.xml branches/wsas/java/3.1.1/product/modules/distribution/src/ (props changed) Modified: branches/wsas/java/3.1.1/product/modules/distribution/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/3.1.1/product/modules/distribution/pom.xml?rev=42894&r1=42893&r2=42894&view=diff ============================================================================== --- branches/wsas/java/3.1.1/product/modules/distribution/pom.xml (original) +++ branches/wsas/java/3.1.1/product/modules/distribution/pom.xml Sun Aug 9 12:33:11 2009 @@ -649,6 +649,385 @@ <inherited>false</inherited> <executions> <execution> + <id>1_unpack-p2-features</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.logging.mgt.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.logging.mgt.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.tools.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.tools.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.system.statistics.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.system.statistics.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.soaptracer.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.soaptracer.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.module.mgt.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.module.mgt.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.caching.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.caching.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.rm.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.rm.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.security.mgt.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.security.mgt.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.aarservices.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.aarservices.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.axis1services.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.axis1services.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.dataservices.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.dataservices.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.ejbservices.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.ejbservices.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.jarservices.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.jarservices.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.jaxwsservices.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.jaxwsservices.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.servicehosting.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.servicehosting.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.pojoservices.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.pojoservices.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.springservices.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.springservices.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.service.mgt.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.service.mgt.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.throttle.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.throttle.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.transport.mgt.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.transport.mgt.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.message.flows.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.message.flows.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.xkms.mgt.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.xkms.mgt.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.sts.server.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.sts.ui.feature</artifactId> + <version>${carbon.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target/p2-features</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> <id>unpack-wso2carbon</id> <phase>package</phase> <goals> @@ -676,6 +1055,89 @@ <version>1.1</version> <executions> <execution> + <id>copy-p2-resources</id> + <phase>package</phase> + <configuration> + <tasks> + <mkdir dir="target/wso2carbon-${carbon.version}/repository/components/plugins/"/> + <mkdir dir="target/wso2carbon-${carbon.version}/repository/components/configuration/"/> + <copy todir="target/wso2carbon-${carbon.version}/repository/components/" + overwrite="true"> + <fileset + dir="target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/eclipse/provisioning/"> + </fileset> + </copy> + <copy todir="target/wso2carbon-${carbon.version}/repository/components/configuration/" + overwrite="true"> + <fileset + dir="src/p2-profile-gen/configuration"> + </fileset> + </copy> + <copy todir="target/wso2carbon-${carbon.version}/repository/components/plugins/" + overwrite="true"> + <fileset + dir="target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/eclipse/plugins"> + </fileset> + </copy> + + <echo message="Running P2 Metadata generator"/> + <java jar="${basedir}/target/wso2carbon-${carbon.version}/repository/components/plugins/org.eclipse.equinox.launcher-1.0.200.v20090520.jar" + fork="true"> + <arg line="-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator + -source target/p2-features + -metadataRepository file:${basedir}/target/p2-repo + -artifactRepository file:${basedir}/target/p2-repo + -publishArtifacts + -publishArtifactRepository + -root org.wso2.wsas + -rootVersion 3.1.1"/> + </java> + + <echo message="Running P2 director app"/> + <java jar="${basedir}/target/wso2carbon-${carbon.version}/repository/components/plugins/org.eclipse.equinox.launcher-1.0.200.v20090520.jar" + fork="true"> + <arg line="-application org.eclipse.equinox.p2.director + -metadataRepository file:${basedir}/target/p2-repo + -artifactRepository file:${basedir}/target/p2-repo + -installIU org.wso2.wsas + -destination ${basedir}/target/wso2carbon-${carbon.version}/repository/components + -profile WSO2CarbonProfile"/> + </java> + + <copy file="target/wso2carbon-${carbon.version}/repository/components/artifacts.xml" + tofile="target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/eclipse/provisioning/artifacts.xml" + overwrite="true"/> + + <copy todir="target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/eclipse/provisioning/p2/org.eclipse.equinox.p2.engine/profileRegistry" + overwrite="true"> + <fileset + dir="target/wso2carbon-${carbon.version}/repository/components/p2/org.eclipse.equinox.p2.engine/profileRegistry"> + <include name="**/*.profile"/> + </fileset> + </copy> + + <delete includeEmptyDirs="true"> + <fileset dir="target/wso2carbon-${carbon.version}/repository/components/"> + <exclude name="dropins/**" /> + <exclude name="lib/**"/> + <exclude name="extensions/**"/> + </fileset> + </delete> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + <executions> + <execution> <id>extract-docs-from-components</id> <phase>package</phase> <goals> @@ -750,6 +1212,8 @@ <delete dir="target/sources"/> <delete dir="target/site"/> <delete dir="src/site"/> + <delete dir="target/p2-features"/> + <delete dir="target/p2-repo"/> </tasks> </configuration> <goals> @@ -775,7 +1239,7 @@ <configuration> <frameworkBundles> <param> - org.wso2.carbon.servletbridge,1.0.0,file:plugins/org.wso2.carbon.servletbridge_1.0.0.jar,10,false + org.wso2.carbon.servletbridge,1.0.1,file:plugins/org.wso2.carbon.servletbridge_1.0.1.jar,10,false </param> </frameworkBundles> <bundlesDirectories> _______________________________________________ Wsas-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
