Author: sameera Date: Wed Aug 19 11:07:12 2009 New Revision: 43793 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=43793
Log: updates to esb distribution maven module - to cope with the p2 level changes Modified: branches/esb/java/2.1.1/product/modules/distribution/pom.xml branches/esb/java/2.1.1/product/modules/distribution/src/main/assembly/bin.xml Modified: branches/esb/java/2.1.1/product/modules/distribution/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/esb/java/2.1.1/product/modules/distribution/pom.xml?rev=43793&r1=43792&r2=43793&view=diff ============================================================================== --- branches/esb/java/2.1.1/product/modules/distribution/pom.xml (original) +++ branches/esb/java/2.1.1/product/modules/distribution/pom.xml Wed Aug 19 11:07:12 2009 @@ -30,7 +30,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>wso2esb</artifactId> <packaging>pom</packaging> - <name>WSO2 ESB Distribution</name> + <name>WSO2 ESB - Distribution</name> <url>http://www.wso2.org/projects/esb/java</url> <description>WSO2 Enterprise Service Bus Distribution</description> @@ -1238,10 +1238,10 @@ </param> <param> ${basedir}/target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/plugins/console - </param> - <param> - ${basedir}/target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/eclipse/plugins </param> + <!--<param>--> + <!--${basedir}/target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/eclipse/plugins--> + <!--</param>--> </bundlesDirectories> <bundleInfoOutputDir>${basedir}/target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/eclipse/configuration/org.eclipse.equinox.simpleconfigurator</bundleInfoOutputDir> <bundlesUrlPrefix>file:plugins/</bundlesUrlPrefix> Modified: branches/esb/java/2.1.1/product/modules/distribution/src/main/assembly/bin.xml URL: http://wso2.org/svn/browse/wso2/branches/esb/java/2.1.1/product/modules/distribution/src/main/assembly/bin.xml?rev=43793&r1=43792&r2=43793&view=diff ============================================================================== --- branches/esb/java/2.1.1/product/modules/distribution/src/main/assembly/bin.xml (original) +++ branches/esb/java/2.1.1/product/modules/distribution/src/main/assembly/bin.xml Wed Aug 19 11:07:12 2009 @@ -24,9 +24,8 @@ <exclude>**/README.txt</exclude> <exclude>**/carbon.xml</exclude> <exclude>**/web.xml</exclude> - <exclude>**/bundles.info</exclude> - <exclude>**/artifacts.xml</exclude> - <exclude>**/*.profile</exclude> + <!--<exclude>**/bundles.info</exclude>--> + <exclude>**/artifacts.xml</exclude> </excludes> </fileSet> <fileSet> @@ -94,6 +93,13 @@ <directory>../../modules/samples/src/main/conf/synapse</directory> <outputDirectory>wso2esb-${pom.version}/repository/samples</outputDirectory> </fileSet> + <fileSet> + <directory>../features/p2-profile-generation/target/wso2carbon-${carbon.version}/repository/components/p2</directory> + <outputDirectory>wso2esb-${pom.version}/webapps/ROOT/WEB-INF/eclipse/provisioning/p2</outputDirectory> + <includes> + <include>**/*.profile</include> + </includes> + </fileSet> </fileSets> <dependencySets> <dependencySet> @@ -130,6 +136,11 @@ </dependencySets> <files> <file> + <source>../features/p2-profile-generation/target/wso2carbon-${carbon.version}/repository/components/artifacts.xml</source> + <outputDirectory>wso2esb-${pom.version}/webapps/ROOT/WEB-INF/eclipse/provisioning</outputDirectory> + <fileMode>644</fileMode> + </file> + <file> <source>src/main/conf/axis2.xml</source> <outputDirectory>wso2esb-${pom.version}/conf</outputDirectory> <destName>axis2.xml</destName> @@ -168,14 +179,14 @@ <destName>cipher-text.properties</destName> <filtered>true</filtered> </file> - <file> - <source>src/main/conf/1245693525161.profile</source> - <outputDirectory>wso2esb-${pom.version}/webapps/ROOT/WEB-INF/eclipse/provisioning/p2/org.eclipse.equinox.p2.engine/profileRegistry/WSO2CarbonProfile.profile/</outputDirectory> - </file> - <file> - <source>src/main/conf/artifacts.xml</source> - <outputDirectory>wso2esb-${pom.version}/webapps/ROOT/WEB-INF/eclipse/provisioning/</outputDirectory> - </file> + <!--<file>--> + <!--<source>src/main/conf/1245693525161.profile</source>--> + <!--<outputDirectory>wso2esb-${pom.version}/webapps/ROOT/WEB-INF/eclipse/provisioning/p2/org.eclipse.equinox.p2.engine/profileRegistry/WSO2CarbonProfile.profile/</outputDirectory>--> + <!--</file>--> + <!--<file>--> + <!--<source>src/main/conf/artifacts.xml</source>--> + <!--<outputDirectory>wso2esb-${pom.version}/webapps/ROOT/WEB-INF/eclipse/provisioning/</outputDirectory>--> + <!--</file>--> <file> <source>../../LICENSE.txt</source> <outputDirectory>wso2esb-${pom.version}</outputDirectory> @@ -263,11 +274,11 @@ <outputDirectory>wso2esb-${pom.version}/tmp/sampleClient</outputDirectory> <destName>README.txt</destName> </file> - <file> - <source>target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info</source> - <outputDirectory>wso2esb-${pom.version}/webapps/ROOT/WEB-INF/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/</outputDirectory> - <filtered>true</filtered> - <fileMode>644</fileMode> - </file> + <!--<file>--> + <!--<source>target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info</source>--> + <!--<outputDirectory>wso2esb-${pom.version}/webapps/ROOT/WEB-INF/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/</outputDirectory>--> + <!--<filtered>true</filtered>--> + <!--<fileMode>644</fileMode>--> + <!--</file>--> </files> </assembly> _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
