[jbosstools-commits] JBoss Tools SVN: r38483 - in trunk/central/plugins/org.jboss.tools.central: src/org/jboss/tools/central/configurators and 1 other directories.

Author: nickboldt Date: 2012-02-07 15:27:02 -0500 (Tue, 07 Feb 2012) New Revision: 38483 Added: trunk/central/plugins/org.jboss.tools.central/template/ trunk/central/plugins/org.jboss.tools.central/template/DefaultJBossCentralConfigurator.java trunk/central/plugins/org.jboss.tools.central/template/README.txt Modified: trunk/central/plugins/org.jboss.tools.central/pom.xml trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java Log: JBIDE-10401 generate correct URL in DefaultJBossCentralConfigurator.java via pom.xml Modified: trunk/central/plugins/org.jboss.tools.central/pom.xml =================================================================== --- trunk/central/plugins/org.jboss.tools.central/pom.xml 2012-02-07 20:03:52 UTC (rev 38482) +++ trunk/central/plugins/org.jboss.tools.central/pom.xml 2012-02-07 20:27:02 UTC (rev 38483) @@ -1,13 +1,100 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools.central</groupId> <artifactId>plugins</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.central.plugins</groupId> - <artifactId>org.jboss.tools.central</artifactId> - + <artifactId>org.jboss.tools.central</artifactId> + + <properties> + <!-- TODO: for GA, change this from /development/indigo/ to /stable/indigo/ --> + <jboss.discovery.directory.url>http://download.jboss.org/jbosstools/upd... + </properties> + + <!-- _stable_branch jobs could use this profile but the above default (last stable milestone) is probably better --> + <profiles> + <profile> + <id>3.3.indigo</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <jboss.discovery.directory.url>http://download.jboss.org/jbosstools/upd... + </properties> + </profile> + </profiles> + + <!-- _trunk jobs should use this profile --> + <profiles> + <profile> + <id>trunk</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <jboss.discovery.directory.url>http://download.jboss.org/jbosstools/upd... + </properties> + </profile> + </profiles> + <packaging>eclipse-plugin</packaging> + <build> + <plugins> + <!-- This will copy from the source folder to the template folder. Use only if no filtering/replacement has already been done in source folder + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.5</version> + <executions> + <execution> + <id>copy-resources</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/template/</outputDirectory> + <resources> + <resource> + <directory>src/org/jboss/tools/central/configurators/</directory> + <includes> + <include>**/DefaultJBossCentralConfigurator.java</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> --> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.5</version> + <executions> + <execution> + <id>copy-resources</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/src/org/jboss/tools/central/configurators/</outputDirectory> + <resources> + <resource> + <directory>template/</directory> + <includes> + <include>**/DefaultJBossCentralConfigurator.java</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java 2012-02-07 20:03:52 UTC (rev 38482) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java 2012-02-07 20:27:02 UTC (rev 38483) @@ -18,13 +18,17 @@ /** * - * @author snjeza + * @author snjeza, nboldt * */ public class DefaultJBossCentralConfigurator implements IJBossCentralConfigurator { + + // TODO: for GA, change this from /development/indigo/ to /stable/indigo/ + private static final String JBOSS_DIRECTORY_URL_DEFAULT = "http://download.jboss.org/jbosstools/updates/development/indigo/jbosstools-directory.xml"; - private static final String JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML = "http://download.jboss.org/jbosstools/updates/nightly/core/trunk/jbosstools-directory.xml"; // published URL + // see pom.xml for actual value -- this is passed it at build-time via Maven + private static final String JBOSS_DIRECTORY_URL = "${jboss.discovery.directory.url}"; private static final String TWITTER_LINK ="http://twitter.com/#!/jbosstools"; @@ -43,9 +47,11 @@ @Override public String getJBossDiscoveryDirectory() { + // use commandline override -Djboss.discovery.directory.url String directory = System.getProperty(JBossCentralActivator.JBOSS_DISCOVERY_DIRECTORY, null); if (directory == null) { - return JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML; + // else use Maven-generated value; fall back to default + return JBOSS_DIRECTORY_URL.equals("${" + "jboss.discovery.directory.url" + "}") ? JBOSS_DIRECTORY_URL_DEFAULT : JBOSS_DIRECTORY_URL; } return directory; } Copied: trunk/central/plugins/org.jboss.tools.central/template/DefaultJBossCentralConfigurator.java (from rev 38482, trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java) =================================================================== --- trunk/central/plugins/org.jboss.tools.central/template/DefaultJBossCentralConfigurator.java (rev 0) +++ trunk/central/plugins/org.jboss.tools.central/template/DefaultJBossCentralConfigurator.java 2012-02-07 20:27:02 UTC (rev 38483) @@ -0,0 +1,93 @@ +/************************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.central.configurators; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.central.JBossCentralActivator; + +/** + * + * @author snjeza, nboldt + * + */ +public class DefaultJBossCentralConfigurator implements + IJBossCentralConfigurator { + + // TODO: for GA, change this from /development/indigo/ to /stable/indigo/ + private static final String JBOSS_DIRECTORY_URL_DEFAULT = "http://download.jboss.org/jbosstools/updates/development/indigo/jbosstools-directory.xml"; + + // see pom.xml for actual value -- this is passed it at build-time via Maven + private static final String JBOSS_DIRECTORY_URL = "${jboss.discovery.directory.url}"; + + private static final String TWITTER_LINK ="http://twitter.com/#!/jbosstools"; + + private static final String BLOGS_URL = "http://planet.jboss.org/feeds/blogs"; + + private static final String NEWS_URL = "http://planet.jboss.org/feeds/news"; + + private Image headerImage; + + @Override + public String[] getMainToolbarCommandIds() { + return new String[] {"org.jboss.tools.central.openJBossToolsHome", + "org.jboss.tools.central.favoriteAtEclipseMarketplace", + "org.jboss.tools.central.preferences"}; + } + + @Override + public String getJBossDiscoveryDirectory() { + // use commandline override -Djboss.discovery.directory.url + String directory = System.getProperty(JBossCentralActivator.JBOSS_DISCOVERY_DIRECTORY, null); + if (directory == null) { + // else use Maven-generated value; fall back to default + return JBOSS_DIRECTORY_URL.equals("${" + "jboss.discovery.directory.url" + "}") ? JBOSS_DIRECTORY_URL_DEFAULT : JBOSS_DIRECTORY_URL; + } + return directory; + } + + @Override + public String getTwitterLink() { + return TWITTER_LINK; + } + + @Override + public String getBlogsUrl() { + return BLOGS_URL; + } + + @Override + public String getNewsUrl() { + return NEWS_URL; + } + + @Override + public List<String> getWizardIds() { + List<String> wizardIds = new ArrayList<String>(); + //wizardIDs.add("org.jboss.ide.eclipse.as.openshift.express.ui.wizard.NewServerAdapter"); + wizardIds.add("org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard"); + //wizardIds.add("org.jboss.tools.seam.ui.wizards.SeamProjectWizard"); + //wizardIds.add("org.eclipse.m2e.core.wizards.Maven2ProjectWizard"); + //wizardIds.add(JBossCentralActivator.NEW_PROJECT_EXAMPLES_WIZARD_ID); + wizardIds.add("org.jboss.ide.eclipse.as.openshift.express.ui.wizard.createNewApplicationWizard"); + return wizardIds; + } + + @Override + public Image getHeaderImage() { + if (headerImage == null) { + headerImage = JBossCentralActivator.getDefault().getImage("/icons/jboss.png"); + } + return headerImage; + } +} Added: trunk/central/plugins/org.jboss.tools.central/template/README.txt =================================================================== --- trunk/central/plugins/org.jboss.tools.central/template/README.txt (rev 0) +++ trunk/central/plugins/org.jboss.tools.central/template/README.txt 2012-02-07 20:27:02 UTC (rev 38483) @@ -0,0 +1,4 @@ +This folder is used to dynamically replace ${jboss.discovery.directory.url} in DefaultJBossCentralConfigurator +with a valid URL as defined in this plugin's pom.xml. + +If you change src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java, copy your changes into here too.