Author: keith Date: Mon Apr 20 10:03:27 2009 New Revision: 33779 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=33779
Log: Fixing the names and versions of orbit bundles to go in line with the refractoring done there 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=33779&r1=33778&r2=33779&view=diff ============================================================================== --- trunk/mashup/java/modules/distribution/dist.xml (original) +++ trunk/mashup/java/modules/distribution/dist.xml Mon Apr 20 10:03:27 2009 @@ -90,31 +90,30 @@ <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.jsservices.admin:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.axis2.json:jar</include> + <include>org.apache.axis2.wso2: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> <include>org.apache.synapse:synapse-tasks:jar</include> <include>org.apache.synapse:synapse-utils:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.quartz:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.rome:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.jdom:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.abdera:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.abdera-extensions:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.webharvest:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.htmlcleaner:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.bsh:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.saxon:jar</include> + <include>org.opensymphony.wso2:quartz:jar</include> + <include>rome.wso2:rome:jar</include> + <include>jdom.wso2:jdom:jar</include> + <include>org.apache.abdera.wso2:abdera-extensions:jar</include> + <include>org.webharvest.wso2:webharvest-core:jar</include> + <include>org.htmlcleaner.wso2:htmlcleaner:jar</include> + <include>bsh.wso2:bsh:jar</include> + <include>net.sf.saxon.wso2:saxon:jar</include> <include>org.wso2.carbon:org.wso2.carbon.im-wrapper.core:jar</include> <include>org.wso2.carbon:org.wso2.carbon.im-wrapper.msn:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.jml:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.cindy:jar</include> + <include>net.sf.jml.wso2:jml:jar</include> + <include>net.sf.cindy.wso2:cindy:jar</include> <include>org.wso2.carbon:org.wso2.carbon.im-wrapper.jabber:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.smack:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.smackx:jar</include> + <include>org.igniterealtime.smack.wso2:smack:jar</include> + <include>org.igniterealtime.smack.wso2:smackx:jar</include> <include>org.wso2.carbon:org.wso2.carbon.im-wrapper.oscar:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.joscar-client:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.joscar-common:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.joscar-protocol:jar</include> + <include>net.kano.joust.wso2:joscar-client:jar</include> + <include>net.kano.joust.wso2:joscar-common:jar</include> + <include>net.kano.joust.wso2:joscar-protocol:jar</include> <include>org.wso2.carbon:org.wso2.carbon.socks:jar</include> <include>org.wso2.carbon:org.wso2.carbon.im-wrapper.yahoo:jar</include> <include>org.wso2.carbon:org.wso2.carbon.javascript.hostobjects.im:jar</include> @@ -143,7 +142,7 @@ <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.abdera:jar</include> + <include>org.apache.abdera.wso2:abdera:jar</include> <include>org.wso2.carbon:org.wso2.carbon.tryit.common: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=33779&r1=33778&r2=33779&view=diff ============================================================================== --- trunk/mashup/java/modules/distribution/pom.xml (original) +++ trunk/mashup/java/modules/distribution/pom.xml Mon Apr 20 10:03:27 2009 @@ -68,8 +68,8 @@ </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.quartz</artifactId> + <groupId>org.opensymphony.wso2</groupId> + <artifactId>quartz</artifactId> <version>${quartz.version}</version> </dependency> @@ -116,14 +116,14 @@ </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.rome</artifactId> + <groupId>rome.wso2</groupId> + <artifactId>rome</artifactId> <version>${rome.version}</version> </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.jdom</artifactId> + <groupId>jdom.wso2</groupId> + <artifactId>jdom</artifactId> <version>${jdom.version}</version> </dependency> @@ -134,26 +134,26 @@ </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.webharvest</artifactId> + <groupId>org.webharvest.wso2</groupId> + <artifactId>webharvest-core</artifactId> <version>${webharvest.version}</version> </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.htmlcleaner</artifactId> + <groupId>org.htmlcleaner.wso2</groupId> + <artifactId>htmlcleaner</artifactId> <version>${htmlcleaner.version}</version> </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.bsh</artifactId> + <groupId>bsh.wso2</groupId> + <artifactId>bsh</artifactId> <version>${bsh.version}</version> </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.saxon</artifactId> + <groupId>net.sf.saxon.wso2</groupId> + <artifactId>saxon</artifactId> <version>${saxon.version}</version> </dependency> @@ -176,14 +176,14 @@ </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.jml</artifactId> + <groupId>net.sf.jml.wso2</groupId> + <artifactId>jml</artifactId> <version>${jml.version}</version> </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.cindy</artifactId> + <groupId>net.sf.cindy.wso2</groupId> + <artifactId>cindy</artifactId> <version>${cindy.version}</version> </dependency> @@ -194,14 +194,14 @@ </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.smack</artifactId> + <groupId>org.igniterealtime.smack.wso2</groupId> + <artifactId>smack</artifactId> <version>${smack.version}</version> </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.smackx</artifactId> + <groupId>org.igniterealtime.smack.wso2</groupId> + <artifactId>smackx</artifactId> <version>${smack.version}</version> </dependency> @@ -212,26 +212,26 @@ </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.socks</artifactId> + <groupId>socks.wso2</groupId> + <artifactId>socks</artifactId> <version>${socks.version}</version> </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.joscar-client</artifactId> + <groupId>net.kano.joust.wso2</groupId> + <artifactId>joscar-client</artifactId> <version>${joscar.version}</version> </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.joscar-common</artifactId> + <groupId>net.kano.joust.wso2</groupId> + <artifactId>joscar-common</artifactId> <version>${joscar.version}</version> </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.joscar-protocol</artifactId> + <groupId>net.kano.joust.wso2</groupId> + <artifactId>joscar-protocol</artifactId> <version>${joscar.version}</version> </dependency> @@ -249,13 +249,13 @@ <!-- Apache Abdera dependencies --> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.abdera</artifactId> + <groupId>org.apache.abdera.wso2</groupId> + <artifactId>abdera</artifactId> <version>${abdera.version}</version> </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.abdera-extensions</artifactId> + <groupId>org.apache.abdera.wso2</groupId> + <artifactId>abdera-extensions</artifactId> <version>${abdera.version}</version> </dependency> @@ -726,8 +726,8 @@ </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.axis2.json</artifactId> + <groupId>org.apache.axis2.wso2</groupId> + <artifactId>axis2-json</artifactId> <version>${axis2.json.version}</version> </dependency> Modified: trunk/mashup/java/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/pom.xml?rev=33779&r1=33778&r2=33779&view=diff ============================================================================== --- trunk/mashup/java/pom.xml (original) +++ trunk/mashup/java/pom.xml Mon Apr 20 10:03:27 2009 @@ -115,25 +115,25 @@ <properties> <carbon.version>SNAPSHOT</carbon.version> - <axis2.json.version>1.4.1-wso2</axis2.json.version> + <axis2.json.version>1.4.1-wso2v1</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> + <quartz.version>1.6.0-wso2v1</quartz.version> <httpunit.version>1.6.1</httpunit.version> <tidy.version>SNAPSHOT</tidy.version> - <rome.version>0.9</rome.version> - <jdom.version>1.0</jdom.version> - <abdera.version>0.4.0</abdera.version> - <webharvest.version>1.0</webharvest.version> - <htmlcleaner.version>1.55</htmlcleaner.version> - <bsh.version>1.3.0</bsh.version> - <saxon.version>8.7</saxon.version> - <jml.version>1.0b3</jml.version> - <cindy.version>2.4.4</cindy.version> - <socks.version>1.01</socks.version> - <joscar.version>2007.11.10</joscar.version> - <smack.version>3.0.4</smack.version> + <rome.version>0.9-wso2v1</rome.version> + <jdom.version>1.0-wso2v1</jdom.version> + <abdera.version>0.4.0-wso2v1</abdera.version> + <webharvest.version>1.0-wso2v1</webharvest.version> + <htmlcleaner.version>1.55-wso2v1</htmlcleaner.version> + <bsh.version>1.3.0-wso2v1</bsh.version> + <saxon.version>8.7-wso2v1</saxon.version> + <jml.version>1.0b3-wso2v1</jml.version> + <cindy.version>2.4.4-wso2v1</cindy.version> + <socks.version>1.01-wso2v1</socks.version> + <joscar.version>2007.11.10-wso2v1</joscar.version> + <smack.version>3.0.4-wso2v1</smack.version> </properties> <mailingLists> _______________________________________________ Mashup-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
