Author: keith Date: Mon Mar 23 23:48:58 2009 New Revision: 32437 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=32437
Log: switching the carbon version to SNAPSHOT Modified: trunk/mashup/java/modules/distribution/dist.xml trunk/mashup/java/modules/distribution/pom.xml trunk/mashup/java/pom.xml Modified: trunk/mashup/java/modules/distribution/dist.xml URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/distribution/dist.xml?rev=32437&r1=32436&r2=32437&view=diff ============================================================================== --- trunk/mashup/java/modules/distribution/dist.xml (original) +++ trunk/mashup/java/modules/distribution/dist.xml Mon Mar 23 23:48:58 2009 @@ -5,88 +5,87 @@ <includeBaseDirectory>false</includeBaseDirectory> <dependencySets> <dependencySet> - <!--<outputFileNameMapping>${artifact.artifactId}_${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>--> - <outputDirectory>wso2mashup-${pom.version}/webapps/ROOT/WEB-INF/plugins</outputDirectory> + <outputDirectory>wso2mashup-${pom.version}/webapps/ROOT/WEB-INF/plugins/console</outputDirectory> <includes> <include>org.wso2.mashup:org.wso2.mashup.styles:jar</include> - <!-- other bundles--> - - <include>org.wso2.carbon:org.wso2.carbon.rm:jar</include> <include>org.wso2.carbon:org.wso2.carbon.rm.ui:jar</include> - - <include>org.wso2.carbon:org.wso2.carbon.security.mgt:jar</include> <include>org.wso2.carbon:org.wso2.carbon.security.mgt.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.security.policy:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.security.rahas:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.security.rampart:jar</include> - - <include>org.wso2.carbon:org.wso2.carbon.logging.service:jar</include> <include>org.wso2.carbon:org.wso2.carbon.logging.admin.ui:jar</include> <include>org.wso2.carbon:org.wso2.carbon.logging.view.ui:jar</include> - <!-- log4j.xml is read from conf folder - <include>org.wso2.carbon:org.wso2.carbon.logging.ext:jar</include> - --> - <include>org.wso2.carbon:org.wso2.carbon.throttle:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.xfer:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.mex:jar</include> <include>org.wso2.carbon:org.wso2.carbon.throttle.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.caching:jar</include> <include>org.wso2.carbon:org.wso2.carbon.caching.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.tracer:jar</include> <include>org.wso2.carbon:org.wso2.carbon.tracer.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.transport.mgt:jar</include> <include>org.wso2.carbon:org.wso2.carbon.transport.mgt.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.transport.http:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.transport.https:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.transport.jms:jar</include> <include>org.wso2.carbon:org.wso2.carbon.transport.http.ui:jar</include> <include>org.wso2.carbon:org.wso2.carbon.transport.https.ui:jar</include> <include>org.wso2.carbon:org.wso2.carbon.transport.jms.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.transport.mail:jar</include> <include>org.wso2.carbon:org.wso2.carbon.transport.mail.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.tryit:jar</include> <include>org.wso2.carbon:org.wso2.carbon.tryit.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.service.mgt:jar</include> <include>org.wso2.carbon:org.wso2.carbon.service.mgt.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.operation.mgt:jar</include> <include>org.wso2.carbon:org.wso2.carbon.operation.mgt.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.server.admin:jar</include> <include>org.wso2.carbon:org.wso2.carbon.server.admin.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.statistics:jar</include> <include>org.wso2.carbon:org.wso2.carbon.statistics.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.module.mgt:jar</include> <include>org.wso2.carbon:org.wso2.carbon.module.mgt.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.viewflows:jar</include> <include>org.wso2.carbon:org.wso2.carbon.viewflows.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.spring.framework:jar</include> <include>org.wso2.carbon:org.wso2.carbon.ui.menu.tools:jar</include> <include>org.wso2.carbon:org.wso2.carbon.validator.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.validator:jar</include> <include>org.wso2.carbon:org.wso2.carbon.wsdl2code:jar</include> <include>org.wso2.carbon:org.wso2.carbon.wsdl2code.ui:jar</include> <include>org.wso2.carbon:org.wso2.carbon.java2wsdl:jar</include> <include>org.wso2.carbon:org.wso2.carbon.java2wsdl.ui:jar</include> <include>org.wso2.carbon:org.wso2.carbon.wsdlconverter:jar</include> <include>org.wso2.carbon:org.wso2.carbon.wsdlconverter.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.sts:jar</include> <include>org.wso2.carbon:org.wso2.carbon.sts.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.xkms:jar</include> <include>org.wso2.carbon:org.wso2.carbon.policyeditor.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.policyeditor:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.user.mgt:jar</include> <include>org.wso2.carbon:org.wso2.carbon.user.mgt.stub:jar</include> <include>org.wso2.carbon:org.wso2.carbon.user.mgt.ui:jar</include> <include>org.wso2.carbon:org.wso2.carbon.axis2.jibx:jar</include> <include>org.wso2.carbon:org.wso2.carbon.jibx:jar</include> <include>org.wso2.carbon:org.wso2.carbon.axis2.jaxbri:jar</include> <include>org.wso2.carbon:org.wso2.carbon.jaxbri:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.eventing.ui:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.registry.ui.resources:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.registry.ui.common:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.registry.ui.search:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.ui.menu.registry:jar</include> + </includes> + </dependencySet> + + <dependencySet> + <outputDirectory>wso2mashup-${pom.version}/webapps/ROOT/WEB-INF/plugins/server</outputDirectory> + <includes> + <include>org.wso2.carbon:org.wso2.carbon.rm:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.security.mgt:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.security.rahas:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.logging.service:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.throttle:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.xfer:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.mex:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.caching:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.tracer:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.transport.mgt:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.transport.http:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.transport.https:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.transport.jms:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.transport.mail:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.tryit:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.service.mgt:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.operation.mgt:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.server.admin:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.statistics:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.module.mgt:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.viewflows:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.sts:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.xkms:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.policyeditor:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.user.mgt:jar</include> <include>org.wso2.carbon:org.wso2.carbon.eventing.savan:jar</include> <include>org.wso2.carbon:org.wso2.carbon.eventing.core:jar</include> <include>org.wso2.carbon:org.wso2.carbon.eventing:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.eventing.ui:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.eventing.ui:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.registry.app:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.registry.mgt.ui.search:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.registry.mgt.ui.resources:jar</include> <include>org.wso2.carbon:org.wso2.carbon.jsservices:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.axis:jar</include> <include>org.wso2.carbon:org.wso2.carbon.axis2.json:jar</include> <include>org.wso2.carbon:org.wso2.carbon.js:jar</include> <include>org.wso2.carbon:org.wso2.carbon.mashup-utils:jar</include> @@ -105,15 +104,21 @@ <include>org.wso2.carbon:org.wso2.carbon.javascript.hostobjects.feed:jar</include> <include>org.wso2.carbon:org.wso2.carbon.javascript.hostobjects.atom:jar</include> <include>org.wso2.wsf.javascript:axiom-e4x:jar</include> + </includes> + </dependencySet> + + <dependencySet> + <outputDirectory>wso2mashup-${pom.version}/webapps/ROOT/WEB-INF/plugins/common</outputDirectory> + <includes> + <include>org.wso2.carbon:org.wso2.carbon.security.policy:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.security.rampart:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.user.mgt:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.axis2.jibx:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.jibx:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.axis2.jaxbri:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.jaxbri:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.axis:jar</include> <include>org.wso2.carbon:org.wso2.carbon.spring.framework:jar</include> - - <include>org.wso2.carbon:org.wso2.carbon.registry.mgt.ui.resources:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.registry.ui.resources:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.registry.ui.common:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.registry.app:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.registry.mgt.ui.search:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.registry.ui.search:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.ui.menu.registry:jar</include> <include>org.wso2.carbon:org.wso2.carbon.abdera:jar</include> </includes> </dependencySet> Modified: trunk/mashup/java/modules/distribution/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/distribution/pom.xml?rev=32437&r1=32436&r2=32437&view=diff ============================================================================== --- trunk/mashup/java/modules/distribution/pom.xml (original) +++ trunk/mashup/java/modules/distribution/pom.xml Mon Mar 23 23:48:58 2009 @@ -600,7 +600,7 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.eventing.savan</artifactId> - <version>${savan.version}</version> + <version>${carbon.version}</version> </dependency> <dependency> @@ -755,7 +755,7 @@ <delete dir="${tempdir}"/> <mkdir dir="${tempdir}"/> <unzip dest="${tempdir}"> - <fileset dir="target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/plugins/"> + <fileset dir="target/wso2carbon-${carbon.version}/webapps/ROOT/WEB-INF/plugins/console"> <include name="*.ui*.jar"/> </fileset> </unzip> Modified: trunk/mashup/java/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/pom.xml?rev=32437&r1=32436&r2=32437&view=diff ============================================================================== --- trunk/mashup/java/pom.xml (original) +++ trunk/mashup/java/pom.xml Mon Mar 23 23:48:58 2009 @@ -114,13 +114,12 @@ </issueManagement> <properties> - <carbon.version>1.5.1</carbon.version> + <carbon.version>SNAPSHOT</carbon.version> <axis2.json.version>1.4.1-wso2</axis2.json.version> <axiom-e4x.version>SNAPSHOT</axiom-e4x.version> <mashup.version>SNAPSHOT</mashup.version> <synapse.version>1.2.wso2v2</synapse.version> <quartz.version>1.6.0</quartz.version> - <savan.version>1.0wso2v2</savan.version> <httpunit.version>1.6.1</httpunit.version> <tidy.version>SNAPSHOT</tidy.version> <rome.version>0.9</rome.version> _______________________________________________ Mashup-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
