Author: keith Date: Tue Aug 4 04:38:11 2009 New Revision: 42571 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=42571
Log: Fixing versions in branch also getting rid of the carbon.core patch cause we are moving to carbon 2.0.1 Removed: branches/mashup/java/2.0/product/modules/distribution/dbscripts/ branches/mashup/java/2.0/product/modules/org.wso2.carbon.core/ Modified: branches/mashup/java/2.0/product/modules/distribution/bin.xml branches/mashup/java/2.0/product/modules/distribution/pom.xml branches/mashup/java/2.0/product/pom.xml Modified: branches/mashup/java/2.0/product/modules/distribution/bin.xml URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/2.0/product/modules/distribution/bin.xml?rev=42571&r1=42570&r2=42571&view=diff ============================================================================== --- branches/mashup/java/2.0/product/modules/distribution/bin.xml (original) +++ branches/mashup/java/2.0/product/modules/distribution/bin.xml Tue Aug 4 04:38:11 2009 @@ -129,7 +129,6 @@ <dependencySet> <outputDirectory>wso2mashup-${pom.version}/webapps/ROOT/WEB-INF/plugins/common</outputDirectory> <includes> - <include>org.wso2.carbon:org.wso2.carbon.core:jar</include> <include>org.wso2.carbon:org.wso2.carbon.security.policy:jar</include> <include>org.wso2.carbon:org.wso2.carbon.security.rampart:jar</include> <include>org.apache.axis.wso2:axis:jar</include> @@ -141,6 +140,13 @@ <include>org.apache.synapse:synapse-common:jar</include> </includes> </dependencySet> + + <dependencySet> + <outputDirectory>wso2mashup-${pom.version}/resources/clientRepository/modules</outputDirectory> + <includes> + <include>org.apache.rampart:rampart:mar</include> + </includes> + </dependencySet> </dependencySets> <fileSets> Modified: branches/mashup/java/2.0/product/modules/distribution/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/2.0/product/modules/distribution/pom.xml?rev=42571&r1=42570&r2=42571&view=diff ============================================================================== --- branches/mashup/java/2.0/product/modules/distribution/pom.xml (original) +++ branches/mashup/java/2.0/product/modules/distribution/pom.xml Tue Aug 4 04:38:11 2009 @@ -16,35 +16,29 @@ <dependencies> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.core</artifactId> - <version>2.0.01</version> - </dependency> - <!-- Task component with startups --> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.startup</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.task</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.task.services</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.task.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> @@ -313,53 +307,53 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.ui.menu.tools</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.ui.menu.registry</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.registry.core</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.registry.app</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.registry.mgt.ui.resources</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.registry.ui.resources</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.registry.ui.common</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.registry.common</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.registry.mgt.ui.search</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.registry.ui.search</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <!-- TODO all other Carbon --> @@ -374,169 +368,169 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.rm</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.rm.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.security.mgt</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <!--<dependency>--> <!--<groupId>org.wso2.carbon</groupId>--> <!--<artifactId>org.wso2.carbon.documentation</artifactId>--> - <!--<version>${carbon.version}</version>--> + <!--<version>${carbon.components.version}</version>--> <!--</dependency>--> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.security.mgt.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.security.policy</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.security.rahas</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.security.rampart</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.logging.service</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.logging.admin.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.logging.view.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <!-- <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.logging.ext</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> --> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.throttle</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.throttle.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.tracer</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.tracer.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.codegen</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.codegen.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.module.mgt</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.module.mgt.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.service.mgt</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.service.mgt.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.operation.mgt</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.operation.mgt.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.transport.mgt</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.transport.mgt.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.transport.http</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.transport.https</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <!--dependency> @@ -554,7 +548,7 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.transport.mail</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <!--dependency> @@ -566,73 +560,73 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.transport.jms</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.transport.jms.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.server.admin</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.server.admin.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.caching</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.caching.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.statistics</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.statistics.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.tryit</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.tryit.common</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.tryit.external.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.tryit.external</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> @@ -674,49 +668,49 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.wsdlconverter</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.viewflows</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.viewflows.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.xkms</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.sts</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.sts.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.policyeditor</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.policyeditor.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> @@ -735,13 +729,13 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.mex</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.xfer</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <!-- Eventing dependencies --> @@ -754,19 +748,19 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.eventing.core</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.eventing</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.eventing.ui</artifactId> - <version>${carbon.version}</version> + <version>${carbon.components.version}</version> </dependency> <dependency> @@ -786,6 +780,13 @@ <groupId>org.springframework.ws.wso2</groupId> <artifactId>spring.framework</artifactId> <version>${spring.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.rampart</groupId> + <artifactId>rampart</artifactId> + <type>mar</type> + <version>1.41</version> </dependency> </dependencies> @@ -948,26 +949,6 @@ </goals> <configuration> <tasks> - <echo message="Recereating wso2mashup ZIP file"/> - - <echo message="########### Recreate Default Database ##############"/> - <delete dir="${basedir}/target/tmp/wso2mashup-${pom.version}/database"/> - <path id="h2.classpath"> - <path refid="maven.compile.classpath"/> - </path> - - <sql - driver="org.h2.Driver" - url="jdbc:h2:${basedir}/target/tmp/wso2mashup-${pom.version}/database/WSO2CARBON_DB" - userid="wso2carbon" password="wso2carbon" autocommit="true" - onerror="continue"> - <classpath> - <path refid="h2.classpath"/> - </classpath> - <fileset file="${basedir}/dbscripts/h2.sql"/> - </sql> - <echo message="##################### END ############################"/> - <zip destfile="${basedir}/target/wso2mashup-${pom.version}.zip" update="true"> <zipfileset dir="${basedir}/target/tmp/" excludes="**/*.sh,**/native/*"/> <zipfileset dir="${basedir}/target/tmp/" includes="**/*.sh,**/native/*" filemode="755"/> Modified: branches/mashup/java/2.0/product/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/2.0/product/pom.xml?rev=42571&r1=42570&r2=42571&view=diff ============================================================================== --- branches/mashup/java/2.0/product/pom.xml (original) +++ branches/mashup/java/2.0/product/pom.xml Tue Aug 4 04:38:11 2009 @@ -22,7 +22,6 @@ <modules> <module>modules/styles</module> <module>modules/org.wso2.carbon.core</module> - <module>modules/distribution</module> <!--<module>modules/integration</module>--> </modules> @@ -117,8 +116,9 @@ </issueManagement> <properties> - <carbon.version>2.0.0</carbon.version> - <mashup.components.version>2.1.0-SNAPSHOT</mashup.components.version> + <carbon.version>2.0.1.SNAPSHOT</carbon.version> + <carbon.components.version>2.0.1.SNAPSHOT</carbon.components.version> + <mashup.components.version>2.0.1.SNAPSHOT</mashup.components.version> <axis2.json.version>1.5.0.wso2v1</axis2.json.version> <axiom-e4x.version>2.0.0.SNAPSHOT</axiom-e4x.version> <mashup.version>2.0.0.SNAPSHOT</mashup.version> _______________________________________________ Mashup-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
