Author: nickboldt Date: 2012-04-19 17:11:17 -0400 (Thu, 19 Apr 2012) New Revision: 40355 Modified: trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml trunk/build/aggregate/soa-site/site/index.html trunk/build/aggregate/soa-site/site/jbosstools-directory.xml Log: merge changes from JBDS in to JBT; JBT soa site contains only individual connectors whereas JBDS now contains bundles for SOA-P and BRMS Modified: trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml =================================================================== --- trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml 2012-04-19 21:08:39 UTC (rev 40354) +++ trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml 2012-04-19 21:11:17 UTC (rev 40355) @@ -3,18 +3,20 @@ <plugin> <extension point="org.eclipse.mylyn.discovery.core.connectorDiscovery"> + <!-- JBDS only <connectorCategory - description="All-In-One Install: Tools for use with JBoss SOA runtimes" + description="Collections of tools associated with JBoss products" id="com.jboss.jbds.central.discovery.soatooling.bundle" - name="JBoss Developer Studio - SOA Tooling" + name="JBoss Product Tooling" relevance="60"> <group id="com.jboss.jbds.central.discovery.soatooling.bundle.a" /> <group id="com.jboss.jbds.central.discovery.soatooling.bundle.b" /> </connectorCategory> + --> <connectorCategory - description="Individual Install: Tools for use with JBoss SOA runtimes" + description="Tools for use with individual JBoss projects (or products)" id="com.jboss.jbds.central.discovery.soatooling" - name="JBoss Developer Studio - SOA Tooling - Components" + name="JBoss Project Tooling" relevance="60"> <!-- use groups to reorder items in a category; otherwise default to alpha order --> <group id="com.jboss.jbds.central.discovery.soatooling.bdgj" /> @@ -22,6 +24,7 @@ <group id="com.jboss.jbds.central.discovery.soatooling.r" /> </connectorCategory> + <!-- JBDS only <connectorDescriptor categoryId="com.jboss.jbds.central.discovery.soatooling.bundle" groupId="com.jboss.jbds.central.discovery.soatooling.bundle.a" @@ -95,7 +98,9 @@ url="http://devstudio.jboss.com/"> </overview> </connectorDescriptor> + --> + <!-- JBT only --> <connectorDescriptor categoryId="com.jboss.jbds.central.discovery.soatooling" groupId="com.jboss.jbds.central.discovery.soatooling.bdgj" @@ -224,7 +229,7 @@ license="Free, EPL" provider="JBoss by Red Hat" siteUrl="%jboss.soa.update.url" - name="JBoss ModeShape JCR REST Tools" + name="JBoss ModeShape Tooling" description="Resource (un)publishing to ModeShape repositories" id="org.jboss.tools.modeshape.rest.feature"> <iu id="org.jboss.tools.modeshape.rest.feature"/> @@ -276,6 +281,5 @@ url="http://devstudio.jboss.com/"> </overview> </connectorDescriptor> - </extension> </plugin> Modified: trunk/build/aggregate/soa-site/site/index.html =================================================================== --- trunk/build/aggregate/soa-site/site/index.html 2012-04-19 21:08:39 UTC (rev 40354) +++ trunk/build/aggregate/soa-site/site/index.html 2012-04-19 21:11:17 UTC (rev 40355) @@ -82,10 +82,10 @@ #EEEEEE "> <td class="rowLine"> -<a style="font-size:x-small" href="features/org.jboss.savara.tools.feature_2.1.0.v20120419-1402-H491-Final.jar">org.jboss.savara.tools.feature</a> +<a style="font-size:x-small" href="features/org.jboss.savara.tools.feature_2.1.0.v20120419-2007-H492-Final.jar">org.jboss.savara.tools.feature</a> </td> <td> -<span style="font-size:x-small">2.1.0.v20120419-1402-H491-Final</span> +<span style="font-size:x-small">2.1.0.v20120419-2007-H492-Final</span> </td> <td> <span style="font-size:x-small"> @@ -112,10 +112,10 @@ #EEEEEE "> <td class="rowLine"> -<a style="font-size:x-small" href="features/org.jboss.tools.central.discovery.soa-tooling.feature_1.0.0.v20120419-2000-Beta3.jar">org.jboss.tools.central.discovery.soa-tooling.feature</a> +<a style="font-size:x-small" href="features/org.jboss.tools.central.discovery.soa-tooling.feature_1.0.0.v20120419-2031-Beta3.jar">org.jboss.tools.central.discovery.soa-tooling.feature</a> </td> <td> -<span style="font-size:x-small">1.0.0.v20120419-2000-Beta3</span> +<span style="font-size:x-small">1.0.0.v20120419-2031-Beta3</span> </td> <td/> </tr> @@ -141,10 +141,10 @@ #EEEEEE "> <td class="rowLine"> -<a style="font-size:x-small" href="features/org.jboss.tools.jbpm.common.feature_4.4.0.v20120419-1356-Beta3.jar">org.jboss.tools.jbpm.common.feature</a> +<a style="font-size:x-small" href="features/org.jboss.tools.jbpm.common.feature_4.4.0.v20120419-2019-H716-Beta3.jar">org.jboss.tools.jbpm.common.feature</a> </td> <td> -<span style="font-size:x-small">4.4.0.v20120419-1356-Beta3</span> +<span style="font-size:x-small">4.4.0.v20120419-2019-H716-Beta3</span> </td> <td> <span style="font-size:x-small"> @@ -159,10 +159,10 @@ #FFFFFF "> <td class="rowLine"> -<a style="font-size:x-small" href="features/org.jboss.tools.jbpm.convert.feature_1.0.0.v20120419-1356-Beta3.jar">org.jboss.tools.jbpm.convert.feature</a> +<a style="font-size:x-small" href="features/org.jboss.tools.jbpm.convert.feature_1.0.0.v20120419-2019-H716-Beta3.jar">org.jboss.tools.jbpm.convert.feature</a> </td> <td> -<span style="font-size:x-small">1.0.0.v20120419-1356-Beta3</span> +<span style="font-size:x-small">1.0.0.v20120419-2019-H716-Beta3</span> </td> <td> <span style="font-size:x-small"> @@ -177,10 +177,10 @@ #EEEEEE "> <td class="rowLine"> -<a style="font-size:x-small" href="features/org.jboss.tools.jbpm3.feature_3.2.1.v20120419-1356-Beta3.jar">org.jboss.tools.jbpm3.feature</a> +<a style="font-size:x-small" href="features/org.jboss.tools.jbpm3.feature_3.2.1.v20120419-2019-H716-Beta3.jar">org.jboss.tools.jbpm3.feature</a> </td> <td> -<span style="font-size:x-small">3.2.1.v20120419-1356-Beta3</span> +<span style="font-size:x-small">3.2.1.v20120419-2019-H716-Beta3</span> </td> <td> <span style="font-size:x-small"> @@ -399,10 +399,10 @@ #EEEEEE "> <td class="rowLine"> -<a style="font-size:x-small" href="features/org.pi4soa.core.feature_3.1.2.v20120419-1349-H297-Beta2.jar">org.pi4soa.core.feature</a> +<a style="font-size:x-small" href="features/org.pi4soa.core.feature_3.1.2.v20120419-1955-H298-Beta2.jar">org.pi4soa.core.feature</a> </td> <td> -<span style="font-size:x-small">3.1.2.v20120419-1349-H297-Beta2</span> +<span style="font-size:x-small">3.1.2.v20120419-1955-H298-Beta2</span> </td> <td> <span style="font-size:x-small"> @@ -414,10 +414,10 @@ #FFFFFF "> <td class="rowLine"> -<a style="font-size:x-small" href="features/org.savara.tools.feature_2.1.0.v20120419-1402-H491-Final.jar">org.savara.tools.feature</a> +<a style="font-size:x-small" href="features/org.savara.tools.feature_2.1.0.v20120419-2007-H492-Final.jar">org.savara.tools.feature</a> </td> <td> -<span style="font-size:x-small">2.1.0.v20120419-1402-H491-Final</span> +<span style="font-size:x-small">2.1.0.v20120419-2007-H492-Final</span> </td> <td> <span style="font-size:x-small"> @@ -429,10 +429,10 @@ #EEEEEE "> <td class="rowLine"> -<a style="font-size:x-small" href="features/org.savara.tools.incubator.feature_2.1.0.v20120419-1402-H491-Final.jar">org.savara.tools.incubator.feature</a> +<a style="font-size:x-small" href="features/org.savara.tools.incubator.feature_2.1.0.v20120419-2007-H492-Final.jar">org.savara.tools.incubator.feature</a> </td> <td> -<span style="font-size:x-small">2.1.0.v20120419-1402-H491-Final</span> +<span style="font-size:x-small">2.1.0.v20120419-2007-H492-Final</span> </td> <td> <span style="font-size:x-small"> Modified: trunk/build/aggregate/soa-site/site/jbosstools-directory.xml =================================================================== --- trunk/build/aggregate/soa-site/site/jbosstools-directory.xml 2012-04-19 21:08:39 UTC (rev 40354) +++ trunk/build/aggregate/soa-site/site/jbosstools-directory.xml 2012-04-19 21:11:17 UTC (rev 40355) @@ -1,4 +1,4 @@ <?xml version='1.0' encoding='UTF-8'?> <directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/"> -<entry url="plugins/org.jboss.tools.central.discovery.soa-tooling_1.0.0.v20120419-2000-Beta3.jar" permitCategories="true"/> +<entry url="plugins/org.jboss.tools.central.discovery.soa-tooling_1.0.0.v20120419-2031-Beta3.jar" permitCategories="true"/> </directory>