October 2011 - jbosstools-commits

JBoss Tools SVN: r35642 - branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-10-13 19:28:44 -0400 (Thu, 13 Oct 2011) New Revision: 35642 Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml Log: updated for brew Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml =================================================================== --- branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-10-13 23:28:05 UTC (rev 35641) +++ branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-10-13 23:28:44 UTC (rev 35642) @@ -8,7 +8,7 @@ <productname>JBoss Developer Studio</productname> <productnumber>4.1</productnumber> <edition>4.1.1</edition> -<pubsnumber>18</pubsnumber> +<pubsnumber>19</pubsnumber> <abstract> <para>The Getting Started Guide explains the JBoss Developer Studio.</para> </abstract>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35641 - branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/project_examples.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-10-13 19:28:05 -0400 (Thu, 13 Oct 2011) New Revision: 35641 Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/project_examples/pr_example_2a.png Log: updated for TOOLSDOC-264 Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/project_examples/pr_example_2a.png =================================================================== (Binary files differ)

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35640 - trunk/documentation/guides/GettingStartedGuide/en-US/images/project_examples.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-10-13 19:27:48 -0400 (Thu, 13 Oct 2011) New Revision: 35640 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/project_examples/pr_example_2a.png Log: updated for TOOLSDOC-264 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/project_examples/pr_example_2a.png =================================================================== (Binary files differ)

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35639 - trunk/build/aggregate/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-10-13 19:25:39 -0400 (Thu, 13 Oct 2011) New Revision: 35639 Modified: trunk/build/aggregate/site/site.xml Log: https://issues.jboss.org/browse/JBIDE-9907 move discovery plugin into its own feature so it won't be installed OOTB. Modified: trunk/build/aggregate/site/site.xml =================================================================== --- trunk/build/aggregate/site/site.xml 2011-10-13 23:25:30 UTC (rev 35638) +++ trunk/build/aggregate/site/site.xml 2011-10-13 23:25:39 UTC (rev 35639) @@ -11,6 +11,8 @@ <feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.central.feature" version="0.0.0"> <category name="AllTools"/> </feature> + <feature url="features/org.jboss.tools.central.discovery.feature_0.0.0.jar" id="org.jboss.tools.central.discovery.feature" version="0.0.0"> + </feature> <feature url="features/org.jboss.tools.richfaces.feature_0.0.0.jar" id="org.jboss.tools.richfaces.feature" version="0.0.0"> <category name="AllTools" /> <category name="WebTools" />

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35638 - in trunk/central: features/org.jboss.tools.central.discovery.feature and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-10-13 19:25:30 -0400 (Thu, 13 Oct 2011) New Revision: 35638 Added: trunk/central/features/org.jboss.tools.central.discovery.feature/ trunk/central/features/org.jboss.tools.central.discovery.feature/.project trunk/central/features/org.jboss.tools.central.discovery.feature/build.properties trunk/central/features/org.jboss.tools.central.discovery.feature/feature.properties trunk/central/features/org.jboss.tools.central.discovery.feature/feature.xml trunk/central/features/org.jboss.tools.central.discovery.feature/license.html trunk/central/features/org.jboss.tools.central.discovery.feature/pom.xml Modified: trunk/central/features/org.jboss.tools.central.feature/feature.properties trunk/central/features/org.jboss.tools.central.feature/feature.xml trunk/central/features/org.jboss.tools.central.feature/license.html trunk/central/features/pom.xml trunk/central/site/site.xml Log: https://issues.jboss.org/browse/JBIDE-9907 move discovery plugin into its own feature so it won't be installed OOTB. Added: trunk/central/features/org.jboss.tools.central.discovery.feature/.project =================================================================== --- trunk/central/features/org.jboss.tools.central.discovery.feature/.project (rev 0) +++ trunk/central/features/org.jboss.tools.central.discovery.feature/.project 2011-10-13 23:25:30 UTC (rev 35638) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.central.discovery.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> Added: trunk/central/features/org.jboss.tools.central.discovery.feature/build.properties =================================================================== --- trunk/central/features/org.jboss.tools.central.discovery.feature/build.properties (rev 0) +++ trunk/central/features/org.jboss.tools.central.discovery.feature/build.properties 2011-10-13 23:25:30 UTC (rev 35638) @@ -0,0 +1,3 @@ +bin.includes = feature.xml,\ + license.html,\ + feature.properties Copied: trunk/central/features/org.jboss.tools.central.discovery.feature/feature.properties (from rev 35637, trunk/central/features/org.jboss.tools.central.feature/feature.properties) =================================================================== --- trunk/central/features/org.jboss.tools.central.discovery.feature/feature.properties (rev 0) +++ trunk/central/features/org.jboss.tools.central.discovery.feature/feature.properties 2011-10-13 23:25:30 UTC (rev 35638) @@ -0,0 +1,54 @@ +############################################################################### +# Copyright (c) 2008-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. +############################################################################## +# feature.properties +# contains externalized strings for feature.xml +# "%foo" in feature.xml corresponds to the key "foo" in this file +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file should be translated. + +# "featureName" property - name of the feature +featureName=JBoss Central Discovery + +# "providerName" property - name of the company that provides the feature +providerName=JBoss by Red Hat + +# "updateSiteName" property - label for the update site +updateSiteName=JBossTools Update Site + +# "description" property - description of the feature +description=JBoss Central Discovery - do not install this feature; instead, it will be discovered and used with JBoss Central. + +# "copyright" property - text of the "Feature Update Copyright" +copyright=Copyright (c) 2011 Red Hat, Inc. and others.\nAll rights reserved. This program and the accompanying materials\n +are made available under the terms of the Eclipse Public License v1.0\n\ +which accompanies this distribution, and is available at\n\ +http\://www.eclipse.org/legal/epl-v10.html\n\ +\n\ +Contributors\:\n\ +JBoss by Red Hat - Initial implementation.\n + ############### end of copyright property #################################### + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +licenseURL=license.html + +# START NON-TRANSLATABLE +# "license" property - text of the "Feature Update License" +# should be plain text version of license agreement pointed to be "licenseURL" +license=Red Hat, Inc. licenses these features and plugins to you under \ +certain open source licenses (or aggregations of such licenses), which \ +in a particular case may include the Eclipse Public License, the GNU \ +Lesser General Public License, and/or certain other open source \ +licenses. For precise licensing details, consult the corresponding \ +source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \ +Raleigh NC 27606 USA. +# END NON-TRANSLATABLE +########### end of license property ########################################## Added: trunk/central/features/org.jboss.tools.central.discovery.feature/feature.xml =================================================================== --- trunk/central/features/org.jboss.tools.central.discovery.feature/feature.xml (rev 0) +++ trunk/central/features/org.jboss.tools.central.discovery.feature/feature.xml 2011-10-13 23:25:30 UTC (rev 35638) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature id="org.jboss.tools.central.discovery.feature" label="%featureName" version="1.0.0.qualifier" provider-name="%featureName"> + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <plugin id="org.jboss.tools.central.discovery" download-size="0" install-size="0" version="0.0.0" unpack="false"/> +</feature> Copied: trunk/central/features/org.jboss.tools.central.discovery.feature/license.html (from rev 35637, trunk/central/features/org.jboss.tools.central.feature/license.html) =================================================================== --- trunk/central/features/org.jboss.tools.central.discovery.feature/license.html (rev 0) +++ trunk/central/features/org.jboss.tools.central.discovery.feature/license.html 2011-10-13 23:25:30 UTC (rev 35638) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<html> + +<body> +<p>Red Hat, Inc. licenses these features and plugins to you under +certain open source licenses (or aggregations of such licenses), which +in a particular case may include the Eclipse Public License, the GNU +Lesser General Public License, and/or certain other open source +licenses. For precise licensing details, consult the corresponding +source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, +Raleigh NC 27606 USA. +</p> +</body> +</html> Added: trunk/central/features/org.jboss.tools.central.discovery.feature/pom.xml =================================================================== --- trunk/central/features/org.jboss.tools.central.discovery.feature/pom.xml (rev 0) +++ trunk/central/features/org.jboss.tools.central.discovery.feature/pom.xml 2011-10-13 23:25:30 UTC (rev 35638) @@ -0,0 +1,12 @@ +<?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> + <parent> + <groupId>org.jboss.tools.central</groupId> + <artifactId>features</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.central.features</groupId> + <artifactId>org.jboss.tools.central.discovery.feature</artifactId> + <packaging>eclipse-feature</packaging> +</project> Modified: trunk/central/features/org.jboss.tools.central.feature/feature.properties =================================================================== --- trunk/central/features/org.jboss.tools.central.feature/feature.properties 2011-10-13 21:27:01 UTC (rev 35637) +++ trunk/central/features/org.jboss.tools.central.feature/feature.properties 2011-10-13 23:25:30 UTC (rev 35638) @@ -24,10 +24,10 @@ updateSiteName=JBossTools Update Site # "description" property - description of the feature -description=Extensions for Eclipse JDT tooling, provides features such as easily connecting the debugger to remote Java application. +description=JBoss Central # "copyright" property - text of the "Feature Update Copyright" -copyright=Copyright (c) 2008-2011 Red Hat, Inc. and others.\nAll rights reserved. This program and the accompanying materials\n +copyright=Copyright (c) 2011 Red Hat, Inc. and others.\nAll rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n\ which accompanies this distribution, and is available at\n\ http\://www.eclipse.org/legal/epl-v10.html\n\ Modified: trunk/central/features/org.jboss.tools.central.feature/feature.xml =================================================================== --- trunk/central/features/org.jboss.tools.central.feature/feature.xml 2011-10-13 21:27:01 UTC (rev 35637) +++ trunk/central/features/org.jboss.tools.central.feature/feature.xml 2011-10-13 23:25:30 UTC (rev 35638) @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.central.feature" - label="%featureName" - version="1.0.0.qualifier" - provider-name="%featureName" - plugin="org.jboss.tools.central"> - +<feature id="org.jboss.tools.central.feature" label="%featureName" version="1.0.0.qualifier" provider-name="%featureName" plugin="org.jboss.tools.central"> <description> %description </description> @@ -18,11 +12,5 @@ %license </license> - <plugin - id="org.jboss.tools.central" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - + <plugin id="org.jboss.tools.central" download-size="0" install-size="0" version="0.0.0" unpack="false"/> </feature> Modified: trunk/central/features/org.jboss.tools.central.feature/license.html =================================================================== --- trunk/central/features/org.jboss.tools.central.feature/license.html 2011-10-13 21:27:01 UTC (rev 35637) +++ trunk/central/features/org.jboss.tools.central.feature/license.html 2011-10-13 23:25:30 UTC (rev 35638) @@ -11,4 +11,4 @@ Raleigh NC 27606 USA. </p> </body> -</html> \ No newline at end of file +</html> Modified: trunk/central/features/pom.xml =================================================================== --- trunk/central/features/pom.xml 2011-10-13 21:27:01 UTC (rev 35637) +++ trunk/central/features/pom.xml 2011-10-13 23:25:30 UTC (rev 35638) @@ -14,6 +14,7 @@ <packaging>pom</packaging> <modules> <module>org.jboss.tools.central.feature</module> + <module>org.jboss.tools.central.discovery.feature</module> </modules> </project> Modified: trunk/central/site/site.xml =================================================================== --- trunk/central/site/site.xml 2011-10-13 21:27:01 UTC (rev 35637) +++ trunk/central/site/site.xml 2011-10-13 23:25:30 UTC (rev 35638) @@ -8,5 +8,8 @@ <feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.central.feature" version="0.0.0"> <category name="JBoss Central Nightly Build Update Site"/> </feature> +  + <feature url="features/org.jboss.tools.central.discovery.feature_0.0.0.jar" id="org.jboss.tools.central.discovery.feature" version="0.0.0"> + </feature> </site>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35637 - trunk/central/plugins/org.jboss.tools.central.discovery.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-10-13 17:27:01 -0400 (Thu, 13 Oct 2011) New Revision: 35637 Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml Log: replace link to jira w/ link to jbds 4.0 update site. Not sure either makes sense, but you de boss, Max. (JBIDE-9840) Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml =================================================================== --- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-10-13 21:17:11 UTC (rev 35636) +++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-10-13 21:27:01 UTC (rev 35637) @@ -6,7 +6,7 @@ <certification id="com.jboss.jbds.discovery.JbdsCertified" name="JBDS Certified" - url="https://issues.jboss.org/browse/JBDS-1627"> + url="http://devstudio.jboss.com/updates/4.0/"> <description> Features certified with JBoss Developer Studio have been tested by Red Hat. </description>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35636 - in trunk/download.jboss.org/jbosstools/updates: requirements/egit and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-10-13 17:17:11 -0400 (Thu, 13 Oct 2011) New Revision: 35636 Added: trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.0.0... Removed: trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.1.0... Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeArtifacts... trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeContent.xml trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml Log: update to egit 1.1 Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeArtifacts... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeArtifacts... 2011-10-13 21:00:54 UTC (rev 35635) +++ trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeArtifacts... 2011-10-13 21:17:11 UTC (rev 35636) @@ -3,7 +3,7 @@ <repository name='JBoss Tools Requirements - Composite Indigo SR1 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> <properties size='2'> <property name='p2.compressed' value='true'/> -<property name='p2.timestamp' value='1318354979000'/> +<property name='p2.timestamp' value='1318538731000'/> </properties> <children size='14'> <child location='../../requirements/indigo/201109230900-SR1/'/> @@ -12,7 +12,7 @@ <child location='../../requirements/ecf/3.5.2/'/> <child location='../../requirements/eclipse/3.7.1/'/> -<child location='../../requirements/egit/1.0.0/'/> +<child location='../../requirements/egit/1.1.0.201109151100/'/> <child location='../../requirements/emf/2.7.1/'/>  <child location='../../requirements/m2eclipse/20111005-1500/'/> Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeContent.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeContent.xml 2011-10-13 21:00:54 UTC (rev 35635) +++ trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeContent.xml 2011-10-13 21:17:11 UTC (rev 35636) @@ -3,7 +3,7 @@ <repository name='JBoss Tools Requirements - Composite Indigo SR1 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'> <properties size='2'> <property name='p2.compressed' value='true'/> -<property name='p2.timestamp' value='1318354979000'/> +<property name='p2.timestamp' value='1318538743000'/> </properties> <children size='14'> <child location='../../requirements/indigo/201109230900-SR1/'/> @@ -12,7 +12,7 @@ <child location='../../requirements/ecf/3.5.2/'/> <child location='../../requirements/eclipse/3.7.1/'/> -<child location='../../requirements/egit/1.0.0/'/> +<child location='../../requirements/egit/1.1.0.201109151100/'/> <child location='../../requirements/emf/2.7.1/'/>  <child location='../../requirements/m2eclipse/20111005-1500/'/> Copied: trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.0.0... (from rev 35635, trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml) =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.0.0... (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.0.0... 2011-10-13 21:17:11 UTC (rev 35636) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project default="mirror"> +  + <target name="mirror"> + <property name="URL1" value="http://download.eclipse.org/egit/updates/" /> + <property name="URL2" value="http://download.eclipse.org/egit/github/updates/" /> + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/egit/1.0.0/" /> + <property name="compress" value="true" /> + + <p2.mirror> + <repository location="file:${destination}/1.0.0/" name="egit + github plugins for Eclipse 3.6 - 3.7" /> + <source> + <repository location="${URL1}" /> + <repository location="${URL2}" /> + </source> + + <slicingOptions includeFeatures="true" followStrict="true" /> + </p2.mirror> + + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.0.0/" artifactRepository="file:${destination}/1.0.0/" publishartifacts="true" source="${destination}/1.0.0/" compress="${compress}" /> + </target> +</project> Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.1.0... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.1.0... 2011-10-13 21:00:54 UTC (rev 35635) +++ trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.1.0... 2011-10-13 21:17:11 UTC (rev 35636) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project default="mirror"> -  - <target name="mirror"> - <property name="URL1" value="http://download.eclipse.org/egit/updates-nightly/" /> - <property name="URL2" value="http://download.eclipse.org/egit/github/updates-nightly/" /> - <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/egit/1.1.0/" /> - <property name="compress" value="true" /> - - <p2.mirror> - <repository location="file:${destination}/1.1.0/" name="egit + github plugins for Eclipse 3.6 - 3.7" /> - <source> - <repository location="${URL1}" /> - <repository location="${URL2}" /> - </source> - - <slicingOptions includeFeatures="true" followStrict="true" /> - </p2.mirror> - - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.1.0/" artifactRepository="file:${destination}/1.1.0/" publishartifacts="true" source="${destination}/1.1.0/" compress="${compress}" /> - </target> -</project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml 2011-10-13 21:00:54 UTC (rev 35635) +++ trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml 2011-10-13 21:17:11 UTC (rev 35636) @@ -16,13 +16,17 @@ -f ~/RHDS/updates/requirements/egit/build.xml -Ddestination=/tmp/egit-repo --> <target name="mirror"> - <property name="URL1" value="http://download.eclipse.org/egit/updates/" /> - <property name="URL2" value="http://download.eclipse.org/egit/github/updates/" /> - <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/egit/1.0.0/" /> + <property name="URL1" value="http://download.eclipse.org/egit/updates-1.1/" /> + <property name="URL2" value="http://download.eclipse.org/egit/github/updates-1.1/" /> +  + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/egit/1.1.0.201109151100/" /> <property name="compress" value="true" /> <p2.mirror> - <repository location="file:${destination}/1.0.0/" name="egit + github plugins for Eclipse 3.6 - 3.7" /> + <repository location="file:${destination}/1.1.0.201109151100/" name="egit + github plugins for Eclipse 3.6 - 3.7" /> <source> <repository location="${URL1}" /> <repository location="${URL2}" /> @@ -31,6 +35,6 @@ <slicingOptions includeFeatures="true" followStrict="true" /> </p2.mirror> - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.0.0/" artifactRepository="file:${destination}/1.0.0/" publishartifacts="true" source="${destination}/1.0.0/" compress="${compress}" /> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.1.0.201109151100/" artifactRepository="file:${destination}/1.1.0.201109151100/" publishartifacts="true" source="${destination}/1.1.0.201109151100/" compress="${compress}" /> </target> </project>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35635 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-10-13 17:00:54 -0400 (Thu, 13 Oct 2011) New Revision: 35635 Modified: trunk/build/target-platform/multiple.target trunk/build/target-platform/unified.target Log: bump version of jgit to 1.1.0 Modified: trunk/build/target-platform/multiple.target =================================================================== --- trunk/build/target-platform/multiple.target 2011-10-13 20:10:24 UTC (rev 35634) +++ trunk/build/target-platform/multiple.target 2011-10-13 21:00:54 UTC (rev 35635) @@ -249,7 +249,7 @@ <unit id="org.eclipse.jsch.ui" version="1.1.300.I20110511-0800"/> <unit id="org.eclipse.jsch.core" version="1.1.300.I20110514-0800"/> <unit id="com.jcraft.jsch" version="0.1.41.v201101211617"/> - <unit id="org.eclipse.jgit.feature.group" version="1.0.0.201106090707-r"/> + <unit id="org.eclipse.jgit.feature.group" version="1.1.0.201109151100-r"/> <unit id="org.eclipse.egit.feature.group" version="1.1.0.201109151100-r"/> </location> </locations> Modified: trunk/build/target-platform/unified.target =================================================================== --- trunk/build/target-platform/unified.target 2011-10-13 20:10:24 UTC (rev 35634) +++ trunk/build/target-platform/unified.target 2011-10-13 21:00:54 UTC (rev 35635) @@ -249,7 +249,7 @@ <unit id="org.eclipse.jsch.ui" version="1.1.300.I20110511-0800"/> <unit id="org.eclipse.jsch.core" version="1.1.300.I20110514-0800"/> <unit id="com.jcraft.jsch" version="0.1.41.v201101211617"/> - <unit id="org.eclipse.jgit.feature.group" version="1.0.0.201106090707-r"/> + <unit id="org.eclipse.jgit.feature.group" version="1.1.0.201109151100-r"/> <unit id="org.eclipse.egit.feature.group" version="1.1.0.201109151100-r"/> </location> </locations>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35634 - in trunk/as/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/ui/wizard and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-10-13 16:10:24 -0400 (Thu, 13 Oct 2011) New Revision: 35634 Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java Log: [JBIDE-9793] implemented key validator and "new" (create new key pair) functionality Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-13 20:09:45 UTC (rev 35633) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-13 20:10:24 UTC (rev 35634) @@ -30,4 +30,5 @@ Import-Package: org.jboss.tools.common.databinding, org.jboss.tools.common.ui, org.jboss.tools.common.ui.databinding, - org.jboss.tools.common.ui.preferencevalue + org.jboss.tools.common.ui.preferencevalue, + org.jboss.tools.common.ui.ssh Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-10-13 20:09:45 UTC (rev 35633) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-10-13 20:10:24 UTC (rev 35634) @@ -11,16 +11,26 @@ package org.jboss.tools.openshift.express.internal.ui.wizard; import java.io.File; +import java.io.FileNotFoundException; import org.eclipse.core.databinding.Binding; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.UpdateValueStrategy; import org.eclipse.core.databinding.beans.BeanProperties; +import org.eclipse.core.databinding.validation.IValidator; +import org.eclipse.core.databinding.validation.ValidationStatus; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.jface.databinding.fieldassist.ControlDecorationSupport; import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.jface.dialogs.IInputValidator; +import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.wizard.IWizard; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -29,17 +39,25 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Link; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; import org.jboss.tools.common.ui.databinding.DataBindingUtils; +import org.jboss.tools.common.ui.databinding.MandatoryStringValidator; +import org.jboss.tools.common.ui.databinding.ParametrizableWizardPageSupport; +import org.jboss.tools.common.ui.ssh.SshPrivateKeysPreferences; +import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.SSHKeyPair; +import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator; /** * @author André Dietisheim */ public class NewDomainWizardPage extends AbstractOpenshiftWizardPage { - private static final String DIRECTORY_SSH_KEYS = ".ssh"; + private static final String OPENSHIFT_KEY_PREFIX = "openshift_id_rsa_"; + private static final String PUBLIC_KEY_SUFFIX = ".pub"; private static final String FILTEREXPRESSION_PUBLIC_SSH_KEY = "*.pub"; private static final String FILTERNAME_PUBLIC_SSH_KEY = "Public ssh key file (*.pub)"; @@ -51,44 +69,133 @@ } protected void doCreateControls(Composite container, DataBindingContext dbc) { - GridLayoutFactory.fillDefaults().numColumns(3).applyTo(container); + GridLayoutFactory.fillDefaults().numColumns(4).applyTo(container); Label namespaceLabel = new Label(container, SWT.NONE); namespaceLabel.setText("&Domain name"); - GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(namespaceLabel); + GridDataFactory.fillDefaults() + .align(SWT.LEFT, SWT.CENTER).applyTo(namespaceLabel); Text namespaceText = new Text(container, SWT.BORDER); - GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).span(2, 1).applyTo(namespaceText); + GridDataFactory.fillDefaults() + .span(3, 1).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(namespaceText); DataBindingUtils.bindMandatoryTextField( namespaceText, "Domain name", NewDomainWizardModel.PROPERTY_NAMESPACE, model, dbc); Label sshKeyLabel = new Label(container, SWT.NONE); sshKeyLabel.setText("SSH Public Key"); - GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(sshKeyLabel); + GridDataFactory.fillDefaults() + .align(SWT.LEFT, SWT.CENTER).applyTo(sshKeyLabel); Text sshKeyText = new Text(container, SWT.READ_ONLY | SWT.BORDER); - GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(sshKeyText); + GridDataFactory.fillDefaults() + .align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(sshKeyText); + Binding sshKeyTextBinding = dbc.bindValue( + WidgetProperties.text(SWT.Modify).observe(sshKeyText), + BeanProperties.value(NewDomainWizardModel.PROPERTY_SSHKEY).observe(model), + new UpdateValueStrategy().setAfterGetValidator(new MandatoryStringValidator( + "You have to select a ssh public key")), + new UpdateValueStrategy().setAfterGetValidator(new SSHKeyValidator())); + ControlDecorationSupport.create(sshKeyTextBinding, SWT.TOP | SWT.LEFT); - Binding sshKeyBinding = dbc.bindValue( - WidgetProperties.text(SWT.Modify).observe(sshKeyText) - , BeanProperties.value(NewDomainWizardModel.PROPERTY_SSHKEY).observe(model) - , new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER) - , null - ); - ControlDecorationSupport.create(sshKeyBinding, SWT.TOP | SWT.LEFT); + Button browseButton = new Button(container, SWT.PUSH); + browseButton.setText("Browse"); + GridDataFactory.fillDefaults() + .align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(browseButton); + browseButton.addSelectionListener(onBrowse()); - Button browseSShKeyButton = new Button(container, SWT.PUSH); - browseSShKeyButton.setText("Browse"); - GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(browseSShKeyButton); - browseSShKeyButton.addSelectionListener(onBrowseSshKey()); + Button createButton = new Button(container, SWT.PUSH); + createButton.setText("New"); + GridDataFactory.fillDefaults() + .align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(createButton); + createButton.addSelectionListener(onNew()); + + new Label(container, SWT.NONE); // spacer + Link sshPrefsLink = new Link(container, SWT.NONE); + sshPrefsLink + .setText("Please make sure that your private key for the public key is listed in the <a>SSH2 Preferences</a>"); + GridDataFactory.fillDefaults() + .span(2, 1).align(SWT.FILL, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(sshPrefsLink); + sshPrefsLink.addSelectionListener(onSshPrefs()); + } - private SelectionListener onBrowseSshKey() { + private SelectionListener onNew() { return new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { + + InputDialog dialog = new InputDialog(getShell(), + "New ssh key" + , "Please pick a passphrase for your new ssh key pair", "openshift" + , new IInputValidator() { + + @Override + public String isValid(String input) { + if (isEmpty(input)) { + return "You have to provide a pass phrase"; + } + return null; + } + }); + if (Dialog.OK == dialog.open()) { + try { + String passPhrase = dialog.getValue(); + String sshKeysDirectory = SshPrivateKeysPreferences.getSshKeyDirectory(); + SSHKeyPair keyPair = createSshKeyPair(passPhrase, sshKeysDirectory); + SshPrivateKeysPreferences.add(keyPair.getPrivateKeyPath()); + model.setSshKey(keyPair.getPublicKeyPath()); + } catch (FileNotFoundException ex) { + IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, + "Could not read the ssh key folder", ex); + OpenshiftUIActivator.log(status); + ErrorDialog.openError(getShell(), + "Error creating a new ssh key pair", + "Could not create a new ssh key pair", status); + } catch (OpenshiftException ex) { + IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, + "Could not create an ssh key pair", ex); + OpenshiftUIActivator.log(status); + ErrorDialog.openError(getShell(), + "Error creating a new ssh key pair", + "Could not create a new ssh key pair", status); + } + } + } + }; + } + + private SSHKeyPair createSshKeyPair(String passPhrase, String sshKeysDirectory) throws OpenshiftException { + String privateKeyPath = getKeyPairFileName(sshKeysDirectory); + String publicKeyPath = getPublicKeyPath(privateKeyPath); + return SSHKeyPair.create(passPhrase, privateKeyPath, publicKeyPath); + } + + private String getKeyPairFileName(String sshKeysDirectory) { + int i = 0; + File privateKey = null; + while (isReadable(privateKey = new File(sshKeysDirectory, OPENSHIFT_KEY_PREFIX + i)) + || isReadable(new File(sshKeysDirectory, getPublicKeyPath(privateKey.getName())))) { + i++; + } + return privateKey.getAbsolutePath(); + } + + private String getPublicKeyPath(String privateKeyPath) { + return privateKeyPath + PUBLIC_KEY_SUFFIX; + } + + private SelectionListener onBrowse() { + return new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); FileDialog dialog = new FileDialog(shell); - dialog.setFilterPath(getSshKeysDirectory()); + try { + dialog.setFilterPath(SshPrivateKeysPreferences.getSshKeyDirectory()); + } catch (FileNotFoundException ex) { + // ignore + } dialog.setFilterNames(new String[] { FILTERNAME_PUBLIC_SSH_KEY }); dialog.setFilterExtensions(new String[] { FILTEREXPRESSION_PUBLIC_SSH_KEY }); String sshKeyPath = dialog.open(); @@ -99,9 +206,79 @@ }; } - private String getSshKeysDirectory() { - String userHome = System.getProperty("user.home"); - File sshKeysDirectory = new File(userHome, DIRECTORY_SSH_KEYS); - return sshKeysDirectory.getAbsolutePath(); + private SelectionAdapter onSshPrefs() { + return new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + SshPrivateKeysPreferences.openPreferencesPage(getShell()); + } + }; } + + @Override + protected void setupWizardPageSupport(DataBindingContext dbc) { + ParametrizableWizardPageSupport.create( + IStatus.ERROR, this, + dbc); + } + + private class SSHKeyValidator implements IValidator { + + @Override + public IStatus validate(Object value) { + if (!(value instanceof String) + || isEmpty((String) value) + || !isReadable((String) value)) { + return ValidationStatus.error("You have to provide a valid ssh public key"); + } + if (!isKeyKnownToSsh((String) value)) { + return ValidationStatus.warning( + NLS.bind("Could not find the private portion for the public key \"{0}\". " + + "Make sure your private key is listed in the ssh2 preferences.", value)); + } + return ValidationStatus.ok(); + } + + private boolean isKeyKnownToSsh(String publicKeyPath) { + if (isEmpty(publicKeyPath)) { + return false; + } + for (String preferencesKey : SshPrivateKeysPreferences.getKeys()) { + try { + File privateKey = SshPrivateKeysPreferences.getPrivateKey(preferencesKey); + if (privateKey == null + || !isReadable(privateKey)) { + continue; + } + if (publicKeyPath.startsWith(privateKey.getAbsolutePath() + ".")) { + return true; + } + } catch (FileNotFoundException e) { + continue; + } + } + return false; + } + } + + private boolean isReadable(String path) { + if (path == null) { + return false; + } + return isReadable(new File(path)); + } + + private boolean isReadable(File file) { + if (file == null) { + return false; + } + return file.exists() + && file.canRead(); + } + + private boolean isEmpty(String value) { + return value == null + || ((String) value).length() == 0; + } }

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35633 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/ssh.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-10-13 16:09:45 -0400 (Thu, 13 Oct 2011) New Revision: 35633 Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/ssh/SshPrivateKeysPreferences.java Log: [JBIDE-9793] added #getPrivateKey and #openPreferencesPage Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/ssh/SshPrivateKeysPreferences.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/ssh/SshPrivateKeysPreferences.java 2011-10-13 19:59:40 UTC (rev 35632) +++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/ssh/SshPrivateKeysPreferences.java 2011-10-13 20:09:45 UTC (rev 35633) @@ -14,6 +14,9 @@ import java.io.FileNotFoundException; import org.eclipse.core.runtime.Platform; +import org.eclipse.jface.preference.PreferenceDialog; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.dialogs.PreferencesUtil; import org.jboss.tools.common.ui.preferencevalue.StringPreferenceValue; import org.jboss.tools.common.ui.preferencevalue.StringsPreferenceValue; @@ -22,6 +25,8 @@ */ public class SshPrivateKeysPreferences { + private static final String SSH_PREFERENCE_PAGE_ID = "org.eclipse.jsch.ui.SSHPreferences"; + private static final String JSCH_PLUGIN_ID = "org.eclipse.jsch.core"; /** * Preference keys defined by org.eclipse.jsch. @@ -47,11 +52,11 @@ public static void add(String keyName) { sshPrivateKeyPreference.add(keyName); } - + public static String[] getKeys() { return sshPrivateKeyPreference.get(); } - + /** * Removes the given keyName from the ssh-preferences * @@ -95,9 +100,37 @@ } return builder.toString(); } - + + /** + * Returns the private key for the given entry from the ssh preferences. + * This methods prepends the ssh directory to the path if it's a relative + * one. There's no guarantee that the file returned really exists. + * + * @param privateKeysPreferencesEntry + * @return + * @throws FileNotFoundException + */ + public static File getPrivateKey(String privateKeysPreferencesEntry) throws FileNotFoundException { + if (isEmpty(privateKeysPreferencesEntry)) { + return null; + } + + if (privateKeysPreferencesEntry.startsWith(File.separator)) { + return new File(privateKeysPreferencesEntry); + } else { + return new File(getSshKeyDirectory(), privateKeysPreferencesEntry); + } + } + private static boolean isEmpty(String value) { return value == null || value.length() == 0; } + + public static void openPreferencesPage(Shell shell) { + PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn( + shell, SSH_PREFERENCE_PAGE_ID, null, null); + dialog.open(); + + } }

13 years, 3 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2011