JBoss Tools SVN: r25851 - trunk/deltacloud/tests.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-10-15 04:20:34 -0400 (Fri, 15 Oct 2010)
New Revision: 25851
Added:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/
Log:
[JBIDE-7320] adding test plugin
14 years, 3 months
JBoss Tools SVN: r25850 - trunk/deltacloud/tests.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-10-15 04:18:37 -0400 (Fri, 15 Oct 2010)
New Revision: 25850
Removed:
trunk/deltacloud/tests/.classpath
trunk/deltacloud/tests/.project
trunk/deltacloud/tests/.settings/
trunk/deltacloud/tests/META-INF/
trunk/deltacloud/tests/build.properties
trunk/deltacloud/tests/pom.xml
trunk/deltacloud/tests/src/
Log:
[JBIDE-7320] removing bad checking
Deleted: trunk/deltacloud/tests/.classpath
===================================================================
--- trunk/deltacloud/tests/.classpath 2010-10-15 08:16:47 UTC (rev 25849)
+++ trunk/deltacloud/tests/.classpath 2010-10-15 08:18:37 UTC (rev 25850)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
Deleted: trunk/deltacloud/tests/.project
===================================================================
--- trunk/deltacloud/tests/.project 2010-10-15 08:16:47 UTC (rev 25849)
+++ trunk/deltacloud/tests/.project 2010-10-15 08:18:37 UTC (rev 25850)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.jboss.tools.deltacloud.test</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
Deleted: trunk/deltacloud/tests/build.properties
===================================================================
--- trunk/deltacloud/tests/build.properties 2010-10-15 08:16:47 UTC (rev 25849)
+++ trunk/deltacloud/tests/build.properties 2010-10-15 08:18:37 UTC (rev 25850)
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
Deleted: trunk/deltacloud/tests/pom.xml
===================================================================
--- trunk/deltacloud/tests/pom.xml 2010-10-15 08:16:47 UTC (rev 25849)
+++ trunk/deltacloud/tests/pom.xml 2010-10-15 08:18:37 UTC (rev 25850)
@@ -1,17 +0,0 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <groupId>org.jboss.tools.usage.tests</groupId>
- <artifactId>org.jboss.tools.usage.test</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
- <properties>
- <emma.filter/>
- <emma.instrument.bundles/>
- </properties>
-</project>
14 years, 3 months
JBoss Tools SVN: r25849 - in trunk/deltacloud/features: target and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-10-15 04:16:47 -0400 (Fri, 15 Oct 2010)
New Revision: 25849
Added:
trunk/deltacloud/features/.project
trunk/deltacloud/features/build.properties
trunk/deltacloud/features/feature.xml
trunk/deltacloud/features/target/
trunk/deltacloud/features/target/feature.xml
trunk/deltacloud/features/target/maven-archiver/
trunk/deltacloud/features/target/maven-archiver/pom.properties
trunk/deltacloud/features/target/org.jboss.tools.deltacloud.test.feature-1.0.0-SNAPSHOT.jar
trunk/deltacloud/features/target/p2artifacts.xml
trunk/deltacloud/features/target/p2content.xml
Modified:
trunk/deltacloud/features/pom.xml
Log:
[JBIDE-7320] adding test feature
Added: trunk/deltacloud/features/.project
===================================================================
--- trunk/deltacloud/features/.project (rev 0)
+++ trunk/deltacloud/features/.project 2010-10-15 08:16:47 UTC (rev 25849)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.deltacloud.test.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>
Property changes on: trunk/deltacloud/features/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/features/build.properties
===================================================================
--- trunk/deltacloud/features/build.properties (rev 0)
+++ trunk/deltacloud/features/build.properties 2010-10-15 08:16:47 UTC (rev 25849)
@@ -0,0 +1 @@
+bin.includes = feature.xml
Property changes on: trunk/deltacloud/features/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/features/feature.xml
===================================================================
--- trunk/deltacloud/features/feature.xml (rev 0)
+++ trunk/deltacloud/features/feature.xml 2010-10-15 08:16:47 UTC (rev 25849)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.deltacloud.test.feature"
+ label="Feature"
+ version="1.0.0.qualifier">
+
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
+
+ <copyright url="http://www.example.com/copyright">
+ [Enter Copyright Description here.]
+ </copyright>
+
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
+
+</feature>
Property changes on: trunk/deltacloud/features/feature.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/deltacloud/features/pom.xml
===================================================================
--- trunk/deltacloud/features/pom.xml 2010-10-15 08:13:59 UTC (rev 25848)
+++ trunk/deltacloud/features/pom.xml 2010-10-15 08:16:47 UTC (rev 25849)
@@ -1,13 +1,14 @@
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.tools.deltacloud</groupId>
- <artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>deltacloud.features</name>
- <packaging>pom</packaging>
- <modules>
- <module>org.jboss.tools.deltacloud.feature</module>
- </modules>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.deltacloud.features</groupId>
+ <artifactId>org.jboss.tools.deltacloud.test.feature</artifactId>
+ <name>org.jboss.tools.deltacloud.test.feature</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
</project>
-
Added: trunk/deltacloud/features/target/feature.xml
===================================================================
--- trunk/deltacloud/features/target/feature.xml (rev 0)
+++ trunk/deltacloud/features/target/feature.xml 2010-10-15 08:16:47 UTC (rev 25849)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.deltacloud.test.feature"
+ label="Feature"
+ version="1.0.0.v20101015-0944-Beta2">
+
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
+
+ <copyright url="http://www.example.com/copyright">
+ [Enter Copyright Description here.]
+ </copyright>
+
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
+
+</feature>
Property changes on: trunk/deltacloud/features/target/feature.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/features/target/maven-archiver/pom.properties
===================================================================
--- trunk/deltacloud/features/target/maven-archiver/pom.properties (rev 0)
+++ trunk/deltacloud/features/target/maven-archiver/pom.properties 2010-10-15 08:16:47 UTC (rev 25849)
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Fri Oct 15 09:44:00 CEST 2010
+version=1.0.0-SNAPSHOT
+groupId=org.jboss.tools.deltacloud.features
+artifactId=org.jboss.tools.deltacloud.test.feature
Property changes on: trunk/deltacloud/features/target/maven-archiver/pom.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/features/target/org.jboss.tools.deltacloud.test.feature-1.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: trunk/deltacloud/features/target/org.jboss.tools.deltacloud.test.feature-1.0.0-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/deltacloud/features/target/p2artifacts.xml
===================================================================
--- trunk/deltacloud/features/target/p2artifacts.xml (rev 0)
+++ trunk/deltacloud/features/target/p2artifacts.xml 2010-10-15 08:16:47 UTC (rev 25849)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?artifactRepository version='1.1.0'?>
+<artifacts size='1'>
+ <artifact classifier='org.eclipse.update.feature' id='org.jboss.tools.deltacloud.test.feature' version='1.0.0.v20101015-0944-Beta2'>
+ <properties size='7'>
+ <property name='artifact.size' value='2186'/>
+ <property name='download.size' value='2186'/>
+ <property name='download.md5' value='2f8ebe4d1d0e52641005c633b265dd31'/>
+ <property name='maven-groupId' value='org.jboss.tools.deltacloud.features'/>
+ <property name='maven-artifactId' value='org.jboss.tools.deltacloud.test.feature'/>
+ <property name='maven-version' value='1.0.0-SNAPSHOT'/>
+ <property name='download.contentType' value='application/zip'/>
+ </properties>
+ </artifact>
+</artifacts>
Property changes on: trunk/deltacloud/features/target/p2artifacts.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/features/target/p2content.xml
===================================================================
--- trunk/deltacloud/features/target/p2content.xml (rev 0)
+++ trunk/deltacloud/features/target/p2content.xml 2010-10-15 08:16:47 UTC (rev 25849)
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<units size='2'>
+ <unit id='org.jboss.tools.deltacloud.test.feature.feature.group' version='1.0.0.v20101015-0944-Beta2' singleton='false'>
+ <update id='org.jboss.tools.deltacloud.test.feature.feature.group' range='[0.0.0,1.0.0.v20101015-0944-Beta2)' severity='0'/>
+ <properties size='7'>
+ <property name='org.eclipse.equinox.p2.name' value='Feature'/>
+ <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
+ <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+ <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+ <property name='maven-groupId' value='org.jboss.tools.deltacloud.features'/>
+ <property name='maven-artifactId' value='org.jboss.tools.deltacloud.test.feature'/>
+ <property name='maven-version' value='1.0.0-SNAPSHOT'/>
+ </properties>
+ <provides size='1'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='org.jboss.tools.deltacloud.test.feature.feature.group' version='1.0.0.v20101015-0944-Beta2'/>
+ </provides>
+ <requires size='1'>
+ <required namespace='org.eclipse.equinox.p2.iu' name='org.jboss.tools.deltacloud.test.feature.feature.jar' range='[1.0.0.v20101015-0944-Beta2,1.0.0.v20101015-0944-Beta2]'>
+ <filter>
+ (org.eclipse.update.install.features=true)
+ </filter>
+ </required>
+ </requires>
+ <touchpoint id='null' version='0.0.0'/>
+ <licenses size='1'>
+ <license uri='http://www.example.com/license' url='http://www.example.com/license'>
+ [Enter License Description here.]
+ </license>
+ </licenses>
+ <copyright uri='http://www.example.com/copyright' url='http://www.example.com/copyright'>
+ [Enter Copyright Description here.]
+ </copyright>
+ </unit>
+ <unit id='org.jboss.tools.deltacloud.test.feature.feature.jar' version='1.0.0.v20101015-0944-Beta2'>
+ <properties size='6'>
+ <property name='org.eclipse.equinox.p2.name' value='Feature'/>
+ <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
+ <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+ <property name='maven-groupId' value='org.jboss.tools.deltacloud.features'/>
+ <property name='maven-artifactId' value='org.jboss.tools.deltacloud.test.feature'/>
+ <property name='maven-version' value='1.0.0-SNAPSHOT'/>
+ </properties>
+ <provides size='3'>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='org.jboss.tools.deltacloud.test.feature.feature.jar' version='1.0.0.v20101015-0944-Beta2'/>
+ <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
+ <provided namespace='org.eclipse.update.feature' name='org.jboss.tools.deltacloud.test.feature' version='1.0.0.v20101015-0944-Beta2'/>
+ </provides>
+ <filter>
+ (org.eclipse.update.install.features=true)
+ </filter>
+ <artifacts size='1'>
+ <artifact classifier='org.eclipse.update.feature' id='org.jboss.tools.deltacloud.test.feature' version='1.0.0.v20101015-0944-Beta2'/>
+ </artifacts>
+ <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+ <touchpointData size='1'>
+ <instructions size='1'>
+ <instruction key='zipped'>
+ true
+ </instruction>
+ </instructions>
+ </touchpointData>
+ <licenses size='1'>
+ <license uri='http://www.example.com/license' url='http://www.example.com/license'>
+ [Enter License Description here.]
+ </license>
+ </licenses>
+ <copyright uri='http://www.example.com/copyright' url='http://www.example.com/copyright'>
+ [Enter Copyright Description here.]
+ </copyright>
+ </unit>
+</units>
Property changes on: trunk/deltacloud/features/target/p2content.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 3 months
JBoss Tools SVN: r25848 - in trunk/deltacloud/tests: .settings and 8 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-10-15 04:13:59 -0400 (Fri, 15 Oct 2010)
New Revision: 25848
Added:
trunk/deltacloud/tests/.classpath
trunk/deltacloud/tests/.project
trunk/deltacloud/tests/.settings/
trunk/deltacloud/tests/.settings/net.sf.jautodoc.prefs
trunk/deltacloud/tests/.settings/org.eclipse.jdt.core.prefs
trunk/deltacloud/tests/.settings/org.eclipse.jdt.ui.prefs
trunk/deltacloud/tests/META-INF/
trunk/deltacloud/tests/META-INF/MANIFEST.MF
trunk/deltacloud/tests/build.properties
trunk/deltacloud/tests/pom.xml
trunk/deltacloud/tests/src/
trunk/deltacloud/tests/src/org/
trunk/deltacloud/tests/src/org/jboss/
trunk/deltacloud/tests/src/org/jboss/tools/
trunk/deltacloud/tests/src/org/jboss/tools/internal/
trunk/deltacloud/tests/src/org/jboss/tools/internal/deltacloud/
trunk/deltacloud/tests/src/org/jboss/tools/internal/deltacloud/test/
trunk/deltacloud/tests/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java
Log:
[JBIDE-730] added test plugin
Added: trunk/deltacloud/tests/.classpath
===================================================================
--- trunk/deltacloud/tests/.classpath (rev 0)
+++ trunk/deltacloud/tests/.classpath 2010-10-15 08:13:59 UTC (rev 25848)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/deltacloud/tests/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/tests/.project
===================================================================
--- trunk/deltacloud/tests/.project (rev 0)
+++ trunk/deltacloud/tests/.project 2010-10-15 08:13:59 UTC (rev 25848)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.deltacloud.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/deltacloud/tests/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/tests/.settings/net.sf.jautodoc.prefs
===================================================================
--- trunk/deltacloud/tests/.settings/net.sf.jautodoc.prefs (rev 0)
+++ trunk/deltacloud/tests/.settings/net.sf.jautodoc.prefs 2010-10-15 08:13:59 UTC (rev 25848)
@@ -0,0 +1,6 @@
+#Fri Oct 15 09:34:41 CEST 2010
+add_header=true
+eclipse.preferences.version=1
+header_text=/*******************************************************************************\n * Copyright (c) 2010 Red Hat, Inc.\n * Distributed under license by Red Hat, Inc. All rights reserved.\n * This program is made available under the terms of the\n * Eclipse Public License v1.0 which accompanies this distribution,\n * and is available at http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * Red Hat, Inc. - initial API and implementation\n ******************************************************************************/
+project_specific_settings=true
+replacements=<?xml version\="1.0" standalone\="yes"?>\n\n<replacements>\n<replacement key\="get" scope\="1" mode\="0">Gets the</replacement>\n<replacement key\="set" scope\="1" mode\="0">Sets the</replacement>\n<replacement key\="add" scope\="1" mode\="0">Adds the</replacement>\n<replacement key\="edit" scope\="1" mode\="0">Edits the</replacement>\n<replacement key\="remove" scope\="1" mode\="0">Removes the</replacement>\n<replacement key\="init" scope\="1" mode\="0">Inits the</replacement>\n<replacement key\="parse" scope\="1" mode\="0">Parses the</replacement>\n<replacement key\="create" scope\="1" mode\="0">Creates the</replacement>\n<replacement key\="build" scope\="1" mode\="0">Builds the</replacement>\n<replacement key\="is" scope\="1" mode\="0">Checks if is</replacement>\n<replacement key\="print" scope\="1" mode\="0">Prints the</replacement>\n<replacement key\="has" scope\="1" mode\="0">Checks for</replacement>\n</replacements>\n\n
Property changes on: trunk/deltacloud/tests/.settings/net.sf.jautodoc.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/tests/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/deltacloud/tests/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/deltacloud/tests/.settings/org.eclipse.jdt.core.prefs 2010-10-15 08:13:59 UTC (rev 25848)
@@ -0,0 +1,276 @@
+#Fri Oct 15 09:34:40 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
Property changes on: trunk/deltacloud/tests/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/tests/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- trunk/deltacloud/tests/.settings/org.eclipse.jdt.ui.prefs (rev 0)
+++ trunk/deltacloud/tests/.settings/org.eclipse.jdt.ui.prefs 2010-10-15 08:13:59 UTC (rev 25848)
@@ -0,0 +1,4 @@
+#Fri Oct 15 09:34:40 CEST 2010
+eclipse.preferences.version=1
+formatter_profile=_Eclipse [built-in] extended
+formatter_settings_version=11
Property changes on: trunk/deltacloud/tests/.settings/org.eclipse.jdt.ui.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/tests/META-INF/MANIFEST.MF (rev 0)
+++ trunk/deltacloud/tests/META-INF/MANIFEST.MF 2010-10-15 08:13:59 UTC (rev 25848)
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test
+Bundle-SymbolicName: org.jboss.tools.deltacloud.test
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.junit;bundle-version="4.8.1"
Property changes on: trunk/deltacloud/tests/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/tests/build.properties
===================================================================
--- trunk/deltacloud/tests/build.properties (rev 0)
+++ trunk/deltacloud/tests/build.properties 2010-10-15 08:13:59 UTC (rev 25848)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Property changes on: trunk/deltacloud/tests/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/tests/pom.xml
===================================================================
--- trunk/deltacloud/tests/pom.xml (rev 0)
+++ trunk/deltacloud/tests/pom.xml 2010-10-15 08:13:59 UTC (rev 25848)
@@ -0,0 +1,17 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.usage.tests</groupId>
+ <artifactId>org.jboss.tools.usage.test</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+ <properties>
+ <emma.filter/>
+ <emma.instrument.bundles/>
+ </properties>
+</project>
Property changes on: trunk/deltacloud/tests/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/tests/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java
===================================================================
--- trunk/deltacloud/tests/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java (rev 0)
+++ trunk/deltacloud/tests/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2010-10-15 08:13:59 UTC (rev 25848)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.internal.deltacloud.test;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+
+/**
+ * @author Andre Dietisheim
+ */
+(a)RunWith(Suite.class)
+(a)Suite.SuiteClasses({})
+public class DeltaCloudTestSuite {
+
+}
Property changes on: trunk/deltacloud/tests/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 3 months
JBoss Tools SVN: r25847 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-10-15 03:39:34 -0400 (Fri, 15 Oct 2010)
New Revision: 25847
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties
Log:
[JBIDE-7329] internationalized plugin.xml and manifest
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties 2010-10-15 03:38:18 UTC (rev 25846)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties 2010-10-15 07:39:34 UTC (rev 25847)
@@ -1,3 +1,6 @@
+Bundle-Name=Deltacloud UI Plug-in
+Bundle-Provider=JBoss by Red Hat
+
DeltaCloudCategory=Deltacloud
CloudViewerName=Cloud Viewer
InstanceViewer.name=Instances
@@ -12,7 +15,6 @@
command.stopinstance.label = Stop
command.stopinstance.tooltip = Stop
command.rebootinstance = Reboot
-command.rebootinstance = Reboot
command.destroyinstance.label = Destroy
command.destroyinstance.tooltip = Destroy
command.disconnectcloud.label = Disconnect Cloud
@@ -31,8 +33,6 @@
command.filterinstances.tooltip = Filter Instances...
command.startinstance.label = Start
command.startinstance.tooltip = Start
-command.stopinstance.label = Stop
-command.stopinstance.tooltip = Stop
command.rebootinstance.label = Reboot
command.rebootinstance.tooltip = Reboot
command.newconnection.description = Creates a new cloud connection
@@ -47,8 +47,6 @@
command.stopinstance.name = Stop
command.rebootinstance.description = Reboots a cloud instance
command.rebootinstance.name = Reboot
-command.stopinstance.name = Stop
-command.stopinstance.description = Stops a cloud instance
command.destroyinstance.name = Destroy
command.destroyinstance.description = Destroys a cloud instance
command.filterimages.description = Filters images
14 years, 3 months
JBoss Tools SVN: r25846 - in trunk/as/plugins: org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules and 7 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-10-14 23:38:18 -0400 (Thu, 14 Oct 2010)
New Revision: 25846
Added:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/SingleFolderZippedPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractJSTPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJSTPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSESingleFilePublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-7324 - make deployable for folders
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2010-10-14 21:56:53 UTC (rev 25845)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2010-10-15 03:38:18 UTC (rev 25846)
@@ -95,6 +95,11 @@
priority="2"
zipDelegate="true">
</publisher>
+ <publisher
+ class="org.jboss.ide.eclipse.archives.webtools.modules.SingleFolderZippedPublisher"
+ priority="2"
+ zipDelegate="true">
+ </publisher>
</extension>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2010-10-14 21:56:53 UTC (rev 25845)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2010-10-15 03:38:18 UTC (rev 25846)
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ *
+ ******************************************************************************/
package org.jboss.ide.eclipse.archives.webtools.modules;
import java.io.File;
@@ -36,21 +47,12 @@
public class LocalZippedPublisherUtil extends PublishUtil {
- private IServer server;
private String deployRoot;
- private IModule[] module;
- private int publishType;
- private IModuleResourceDelta[] delta;
public IStatus publishModule(IServer server, String deployRoot, IModule[] module,
int publishType, IModuleResourceDelta[] delta,
IProgressMonitor monitor) throws CoreException {
- this.server = server;
this.deployRoot = deployRoot;
- this.module = module;
- this.publishType = publishType;
- this.delta = delta;
-
IStatus[] returnStatus;
Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/SingleFolderZippedPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/SingleFolderZippedPublisher.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/SingleFolderZippedPublisher.java 2010-10-15 03:38:18 UTC (rev 25846)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ *
+ * TODO: Logging and Progress Monitors
+ ******************************************************************************/
+package org.jboss.ide.eclipse.archives.webtools.modules;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
+import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
+
+public class SingleFolderZippedPublisher extends WTPZippedPublisher {
+ public boolean accepts(String method, IServer server, IModule[] module) {
+ if( module != null && module.length > 0
+ && module[module.length-1] != null
+ && module[module.length-1].getModuleType().getId().equals(SingleDeployableFactory.MODULE_TYPE)) {
+ IModule mod = module[module.length-1];
+ IJBTModule del = (IJBTModule)mod.loadAdapter(IJBTModule.class, new NullProgressMonitor());
+ if( del != null && !del.isBinary())
+ return true; // we have a folder
+ }
+ return false;
+ }
+}
\ No newline at end of file
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2010-10-15 03:38:18 UTC (rev 25846)
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.modules;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.server.core.model.IModuleResource;
+import org.eclipse.wst.server.core.util.ModuleFile;
+import org.eclipse.wst.server.core.util.ModuleFolder;
+
+public class ResourceModuleResourceUtil {
+ public static IModuleResource createResource(IResource resource) {
+ return createResource(resource, new Path("/")); //$NON-NLS-1$
+ }
+
+ public static IModuleResource createResource(IResource resource, IPath path) {
+ if( resource instanceof IFile ) {
+ return createFile((IFile)resource, path);
+ }
+ IContainer cont = (IContainer)resource;
+ return createFolder(cont, path);
+ }
+
+ public static IModuleResource createFile(IFile resource, IPath path) {
+ IPath global = resource.getLocation();
+ return new ModuleFile(global.toFile(),
+ global.lastSegment(), path);
+ }
+
+ public static IModuleResource createFolder(IContainer cont, IPath path) {
+ ModuleFolder folder = new ModuleFolder(cont, cont.getName(), path);
+ IModuleResource[] childrenResources = createChildrenResources(cont, path.append(cont.getName()));
+ folder.setMembers(childrenResources);
+ return folder;
+ }
+
+ public static IModuleResource[] createChildrenResources(IContainer parent, IPath forcedParentPath) {
+ ArrayList<IModuleResource> modChildren = new ArrayList<IModuleResource>();
+ IResource[] children = new IResource[]{};
+ try {
+ children = parent.members();
+ } catch(CoreException ce) {
+ }
+ for( int i = 0; i < children.length; i++ ) {
+ modChildren.add(createResource(children[i], forcedParentPath));
+ }
+ return modChildren.toArray(new IModuleResource[modChildren.size()]);
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java 2010-10-14 21:56:53 UTC (rev 25845)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java 2010-10-15 03:38:18 UTC (rev 25846)
@@ -19,6 +19,8 @@
import java.util.List;
import java.util.Set;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
@@ -45,9 +47,9 @@
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.ServerUtil;
import org.eclipse.wst.server.core.internal.ModuleFactory;
-import org.eclipse.wst.server.core.internal.ModuleFile;
import org.eclipse.wst.server.core.internal.PublishServerJob;
import org.eclipse.wst.server.core.internal.ServerPlugin;
+import org.eclipse.wst.server.core.model.IModuleFolder;
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.ModuleDelegate;
import org.eclipse.wst.server.core.model.ModuleFactoryDelegate;
@@ -117,8 +119,6 @@
return getFactory().getModule(workspaceRelative);
}
-
-
private HashMap<IPath, IModule> moduleIdToModule;
private HashMap<IModule, SingleDeployableModuleDelegate> moduleToDelegate;
private IResourceChangeListener resourceListener;
@@ -317,20 +317,33 @@
public class SingleDeployableModuleDelegate extends ModuleDelegate implements IJBTModule {
private IPath global;
private IPath workspaceRelative;
+ private IResource resource;
public SingleDeployableModuleDelegate(IPath workspaceRelative) {
this.workspaceRelative = workspaceRelative;
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(workspaceRelative);
- global = res.getLocation();
+ resource = ResourcesPlugin.getWorkspace().getRoot().findMember(workspaceRelative);
+ global = resource.getLocation();
}
public IModule[] getChildModules() {
return new IModule[0];
}
public IModuleResource[] members() throws CoreException {
- return new IModuleResource[] {
- new ModuleFile(global.toFile(),
- global.lastSegment(),
- global.removeLastSegments(1)) };
+ if( isBinary() && resource instanceof IFile) {
+ IModuleResource resource2 = ResourceModuleResourceUtil.createResource(resource);
+ return new IModuleResource[]{resource2};
+ }
+ /*
+ * Single deployable modules that are folders are not treated as
+ * binary modules, but rather regular modules with no extension.
+ * This means all module resource paths must be relative to the root folder,
+ * and so we ensure that here.
+ */
+ if( !isBinary() && resource instanceof IContainer) {
+ IModuleResource[] resource2 = ResourceModuleResourceUtil.createChildrenResources(
+ (IContainer)resource, new Path("/")); //$NON-NLS-1$
+ return resource2;
+ }
+ return new IModuleResource[]{};
}
public IStatus validate() {
@@ -350,8 +363,11 @@
public String getURI(IModule module) {
return null; // never called
}
+
+ // folders are not binary
public boolean isBinary() {
- return true;
+ boolean b = global.toFile().exists() && global.toFile().isFile();
+ return b;
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractJSTPublisher.java 2010-10-14 21:56:53 UTC (rev 25845)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractJSTPublisher.java 2010-10-15 03:38:18 UTC (rev 25846)
@@ -24,7 +24,7 @@
* This abstract publisher is only suitable for non force-zipped deployments
*/
public boolean accepts(String method, IServer server, IModule[] module) {
- if( module == null || !method.equals(getTargetedPublishMethodId()))
+ if( module == null || (publishMethodSpecific() && !method.equals(getTargetedPublishMethodId())))
return false;
IDeployableServer ds = ServerConverter.getDeployableServer(server);
return ds != null
@@ -33,6 +33,15 @@
}
/**
+ * Return true if this publisher requires a specific
+ * publish method / publish method id.
+ * Clients are expected to override
+ */
+ protected boolean publishMethodSpecific() {
+ return false;
+ }
+
+ /**
* Get the publish method this publisher is associated with
* @return
*/
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2010-10-14 21:56:53 UTC (rev 25845)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2010-10-15 03:38:18 UTC (rev 25846)
@@ -156,7 +156,8 @@
// First delete it
// if the module we're publishing is a project, not a binary, clean it's folder
- if( !(new Path(module.getName()).segmentCount() > 1 ))
+ //if( !(new Path(module.getName()).segmentCount() > 1 ))
+ if( !ServerModelUtilities.isBinaryModule(module))
callback.deleteResource(new Path("/"), ProgressMonitorUtil.submon(monitor, 100)); //$NON-NLS-1$
if( monitor.isCanceled())
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2010-10-14 21:56:53 UTC (rev 25845)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2010-10-15 03:38:18 UTC (rev 25846)
@@ -10,17 +10,22 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.publishers;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
+import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
public class SingleFilePublisher extends AbstractServerToolsPublisher {
public boolean accepts(String method, IServer server, IModule[] module) {
- if( LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(method)
- && module != null && module.length > 0
+ if( module != null && module.length > 0
&& module[module.length-1] != null
- && module[module.length-1].getModuleType().getId().equals(SingleDeployableFactory.MODULE_TYPE))
- return true;
+ && module[module.length-1].getModuleType().getId().equals(SingleDeployableFactory.MODULE_TYPE)) {
+ IModule mod = module[module.length-1];
+ IJBTModule del = (IJBTModule)mod.loadAdapter(IJBTModule.class, new NullProgressMonitor());
+ if( del != null && del.isBinary())
+ return true;
+ }
return false;
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml 2010-10-14 21:56:53 UTC (rev 25845)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml 2010-10-15 03:38:18 UTC (rev 25846)
@@ -13,6 +13,7 @@
</extension>
<extension
point="org.jboss.ide.eclipse.as.core.publishers">
+<!--
<publisher
class="org.jboss.ide.eclipse.as.rse.core.RSESingleFilePublisher"
priority="7">
@@ -21,11 +22,17 @@
class="org.jboss.ide.eclipse.as.rse.core.RSEJSTPublisher"
priority="5">
</publisher>
+-->
<publisher
class="org.jboss.ide.eclipse.as.rse.core.archives.RSEZippedJSTPublisher"
priority="3"
zipDelegate="true">
</publisher>
+ <publisher
+ class="org.jboss.ide.eclipse.as.rse.core.archives.RSEZippedFolderPublisher"
+ priority="8"
+ zipDelegate="true">
+ </publisher>
</extension>
</plugin>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJSTPublisher.java 2010-10-14 21:56:53 UTC (rev 25845)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJSTPublisher.java 2010-10-15 03:38:18 UTC (rev 25846)
@@ -15,6 +15,7 @@
import org.jboss.ide.eclipse.as.core.publishers.AbstractJSTPublisher;
+@Deprecated
public class RSEJSTPublisher extends AbstractJSTPublisher {
@Override
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSESingleFilePublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSESingleFilePublisher.java 2010-10-14 21:56:53 UTC (rev 25845)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSESingleFilePublisher.java 2010-10-15 03:38:18 UTC (rev 25846)
@@ -15,14 +15,15 @@
import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher;
+@Deprecated
public class RSESingleFilePublisher extends AbstractServerToolsPublisher {
public boolean accepts(String method, IServer server, IModule[] module) {
- if( RSEPublishMethod.RSE_ID.equals(method)
- && module != null && module.length > 0
- && module[module.length-1] != null
- && module[module.length-1].getModuleType().getId().equals(SingleDeployableFactory.MODULE_TYPE))
- return true;
+// if( RSEPublishMethod.RSE_ID.equals(method)
+// && module != null && module.length > 0
+// && module[module.length-1] != null
+// && module[module.length-1].getModuleType().getId().equals(SingleDeployableFactory.MODULE_TYPE))
+// return true;
return false;
}
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java 2010-10-15 03:38:18 UTC (rev 25846)
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ *
+ * TODO: Logging and Progress Monitors
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.rse.core.archives;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod;
+import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
+
+/**
+ * This class is in charge of RSE zipped publishing for deployable folders
+ */
+public class RSEZippedFolderPublisher extends RSEZippedJSTPublisher {
+ public boolean accepts(String method, IServer server, IModule[] module) {
+ if( !RSEPublishMethod.RSE_ID.equals(method))
+ return false;
+
+ IDeployableServer ds = ServerConverter.getDeployableServer(server);
+ if( module != null && module.length > 0
+ && module[module.length-1] != null
+ && module[module.length-1].getModuleType().getId().equals(SingleDeployableFactory.MODULE_TYPE)) {
+ IModule mod = module[module.length-1];
+ IJBTModule del = (IJBTModule)mod.loadAdapter(IJBTModule.class, new NullProgressMonitor());
+ if( del != null && !del.isBinary())
+ return ds != null && ds.zipsWTPDeployments();; // we have a folder
+ }
+ return false;
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java 2010-10-14 21:56:53 UTC (rev 25845)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java 2010-10-15 03:38:18 UTC (rev 25846)
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
@@ -89,7 +89,7 @@
return false;
Iterator i = sel.iterator();
while(i.hasNext())
- if( !(i.next() instanceof IFile ))
+ if( !(i.next() instanceof IResource ))
return false;
}
return true;
@@ -101,7 +101,7 @@
return Messages.ActionDelegateMakeDeployable;
}
- // True if we want to unpublish, false if we wantt to publish
+ // True if we want to unpublish, false if we want to publish
protected boolean verifyType() {
if( selection instanceof IStructuredSelection ) {
IStructuredSelection sel = (IStructuredSelection)selection;
@@ -111,7 +111,7 @@
Object o;
while(i.hasNext()) {
o = i.next();
- if( !(o instanceof IFile) || SingleDeployableFactory.findModule(((IFile)o).getFullPath()) == null)
+ if( !(o instanceof IResource) || SingleDeployableFactory.findModule(((IResource)o).getFullPath()) == null)
return false;
}
}
@@ -136,8 +136,8 @@
Object[] objs = sel2.toArray();
IModule[] modules = new IModule[objs.length];
for( int i = 0; i < objs.length; i++ ) {
- SingleDeployableFactory.makeDeployable(((IFile)objs[i]).getFullPath());
- modules[i] = SingleDeployableFactory.findModule(((IFile)objs[i]).getFullPath());
+ SingleDeployableFactory.makeDeployable(((IResource)objs[i]).getFullPath());
+ modules[i] = SingleDeployableFactory.findModule(((IResource)objs[i]).getFullPath());
}
tryToPublish();
@@ -148,8 +148,8 @@
Object[] objs = sel2.toArray();
ArrayList<IPath> paths = new ArrayList<IPath>();
for( int i = 0; i < objs.length; i++ )
- if(objs[i] instanceof IFile )
- paths.add(((IFile)objs[i]).getFullPath());
+ if(objs[i] instanceof IResource )
+ paths.add(((IResource)objs[i]).getFullPath());
new UndeployFromServerJob(paths).schedule();
}
@@ -182,7 +182,7 @@
} else {
IModule[] modules = new IModule[objs.length];
for( int i = 0; i < objs.length; i++ ) {
- modules[i] = SingleDeployableFactory.findModule(((IFile)objs[i]).getFullPath());
+ modules[i] = SingleDeployableFactory.findModule(((IResource)objs[i]).getFullPath());
}
try {
IServerWorkingCopy copy = server.createWorkingCopy();
@@ -204,7 +204,7 @@
protected boolean allFiles(Object[] objs) {
for( int i = 0; i < objs.length; i++ )
- if( !(objs[i] instanceof IFile) )
+ if( !(objs[i] instanceof IResource) )
return false;
return true;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-10-14 21:56:53 UTC (rev 25845)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-10-15 03:38:18 UTC (rev 25846)
@@ -196,7 +196,7 @@
adaptable="true"
id="org.jboss.ide.eclipse.as.ui.popups.makeDeployable.contrib"
nameFilter="*"
- objectClass="org.eclipse.core.resources.IFile">
+ objectClass="org.eclipse.core.resources.IResource">
<action
id="org.jboss.ide.eclipse.as.ui.popups.makeDeployable.action"
label="Make Publishable"
14 years, 3 months
JBoss Tools SVN: r25845 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs: userguide and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: jjohnstn
Date: 2010-10-14 17:56:53 -0400 (Thu, 14 Oct 2010)
New Revision: 25845
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/userguide/images/imagefilter.png
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/userguide/images/instancefilter.png
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/userguide/deltacloud.html
Log:
2010-10-14 Jeff Johnston <jjohnstn(a)redhat.com>
* userguide/images/imagefilter.png: New file.
* userguide/images/instancefilter.png: New file.
* userguide/deltacloud.html: Update to add information
about Image and Instance filtering.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/ChangeLog 2010-10-14 21:45:21 UTC (rev 25844)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/ChangeLog 2010-10-14 21:56:53 UTC (rev 25845)
@@ -1,3 +1,10 @@
+2010-10-14 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * userguide/images/imagefilter.png: New file.
+ * userguide/images/instancefilter.png: New file.
+ * userguide/deltacloud.html: Update to add information
+ about Image and Instance filtering.
+
2010-09-30 Jeff Johnston <jjohnstn(a)redhat.com>
* pom.xml: New file.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/userguide/deltacloud.html
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/userguide/deltacloud.html 2010-10-14 21:45:21 UTC (rev 25844)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/userguide/deltacloud.html 2010-10-14 21:56:53 UTC (rev 25845)
@@ -124,7 +124,11 @@
<li>Stop - stop a running Instance</li>
<li>Reboot - reboot an Instance</li>
<li>Destroy - stop and destroy an Instance (this is not always enabled, such as in the case of EC2 where stopping terminates the Instance)</li>
-<li>Show in Remote System Explorer - this action creates an SSL connection to the Instance using the key specified earlier in the Launch Instance dialog. Note: the key name corresponds to a file on the local system and this file must be placed on the list of private SSH2 keys prior to trying to connect to the Instance, otherwise the connection will fail. To make the key file accessible, go to <noformat>Window->Preferences->General->Network Connections->SSH2</noformat> and select the "Add Private Key" button.</li>
+<li>Show in Remote System Explorer - this action creates an RSE connection to the Instance and opens the RSE Remote Systems viewer which allows access to the remote file system.
+By default, an RSE connection will be made automatically when an Instance is launched via the Deltacloud Tools unless the preference found at <noformat>Windows->Preferences->Deltacloud</noformat> is disabled.
+The Remote Systems view can also be opened manually via <noformat>Windows->Open View...</noformat> or by switching to the RSE Perspective.
+To access the remote file system, a local file corresponding to the key name used when the Instance is launched must be placed in the list of private SSH2 keys prior to trying to accessing the
+remote files. To make the key file accessible, go to <noformat>Window->Preferences->General->Network Connections->SSH2</noformat> and select the "Add Private Key" button.</li>
</ul>
</p>
<p>
@@ -135,6 +139,32 @@
<img border="0" src="images/bgpreferences.png"/>
+<a name="InstanceFilter"></a>
+<h2 id="Instance Filter">Instance Filter</h2>
+<p>
+If a large number of Instances exist, the list can be filtered to only include those of interest. Filtering can be accomplished either by right-clicking in the Cloud Viewer and
+selecting "Filter Instances..." or by using the pull-down menu in the Instances View and selecting "Filter...". This brings up the following dialog:</p>
+
+<img border="0" src="images/instancefilter.png"/>
+
+<p>
+The filter allows specification of matcher patterns for the fields:
+<ul>
+<li>Name</li>
+<li>ID</li>
+<li>Image ID</li>
+<li>Owner ID</li>
+<li>Key Name</li>
+<li>Realm</li>
+<li>Hardware Profile</li>
+</ul>
+</p>
+
+<p>
+All filtering fields allow specification of wildcards (e.g. ami* will match all strings starting with ami). Filters are saved across sessions and are per cloud. By default, all
+filtering fields are initially set to "*" meaning "all possible values". If any filter field is not "*", a "filtered" label will appear on the right side of the Instances view to signify
+that not all available Instances are being shown in the view.</p>
+
<a name="RSEPerspective"></a>
<h2 id="RSE Perspective">RSE Perspective</h2>
<p>
@@ -168,6 +198,29 @@
</ul>
</p>
+<a name="ImageFilter"></a>
+<h2 id="Image Filter">Image Filter</h2>
+<p>
+If a large number of Images exist, the list can be filtered to only include those of interest just as with Instances. Filtering can be accomplished either by right-clicking in the Cloud Viewer and
+selecting "Filter Images..." or by using the pull-down menu in the Images View and selecting "Filter...". This brings up the following dialog:</p>
+
+<img border="0" src="images/imagefilter.png"/>
+
+<p>
+The filter allows specification of matcher patterns for the fields:
+<ul>
+<li>Name</li>
+<li>ID</li>
+<li>Architecture</li>
+<li>Description</li>
+</ul>
+</p>
+
+<p>
+As with the Instance filter, all filtering fields allow specification of the "*" wildcard. Image filters are saved across sessions and are per cloud. By default, all
+filtering fields are initially set to "*" meaning "all possible values". If any filter field is not "*", a "filtered" label will appear on the right side of the Images view to signify
+that not all available Images are being shown in the view.</p>
+
<a name="ManageKeys"></a>
<h2 id="Manage Keys">Manage Keys</h2>
<p>
@@ -178,10 +231,10 @@
<p>
The Directory field is where key files are stored. To select a different directory, click on the Browse... button.</p>
<p>
-To create a key, hit the "New..." button. This brings up a simple dialog:
+To create a key, hit the "New..." button. This brings up a simple dialog:</p>
<img border="0" src="images/createkey.png"/>
-</p>
+
<p>
where the key name is entered. The name must be unique for the Cloud (i.e. not just the directory). When OK is pressed, the key file will be created in the specified directory chosen for the Manage Keys dialog.</p>
<p>
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/userguide/images/imagefilter.png
===================================================================
(Binary files differ)
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/userguide/images/imagefilter.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/userguide/images/instancefilter.png
===================================================================
(Binary files differ)
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.docs/userguide/images/instancefilter.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 3 months
JBoss Tools SVN: r25844 - branches/jbosstools-3.2.0.Beta1/birt/docs/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-10-14 17:45:21 -0400 (Thu, 14 Oct 2010)
New Revision: 25844
Modified:
branches/jbosstools-3.2.0.Beta1/birt/docs/en-US/master.xml
Log:
updated for beta
Modified: branches/jbosstools-3.2.0.Beta1/birt/docs/en-US/master.xml
===================================================================
--- branches/jbosstools-3.2.0.Beta1/birt/docs/en-US/master.xml 2010-10-14 20:52:35 UTC (rev 25843)
+++ branches/jbosstools-3.2.0.Beta1/birt/docs/en-US/master.xml 2010-10-14 21:45:21 UTC (rev 25844)
@@ -60,7 +60,7 @@
<releaseinfo>
- Version: 1.1.1.GA
+ Version: 3.2.0.Beta
</releaseinfo>
14 years, 3 months
JBoss Tools SVN: r25843 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: jjohnstn
Date: 2010-10-14 16:52:35 -0400 (Thu, 14 Oct 2010)
New Revision: 25843
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties
Log:
2010-10-14 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add Refresh.label message.
* src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (createPartControl): Fix filtering
label showing up in wrong area and when there is no filtering occurring.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-14 20:47:20 UTC (rev 25842)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-14 20:52:35 UTC (rev 25843)
@@ -1,5 +1,6 @@
2010-10-14 Jeff Johnston <jjohnstn(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add Refresh.label message.
* src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (createPartControl): Fix filtering
label showing up in wrong area and when there is no filtering occurring.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-10-14 20:47:20 UTC (rev 25842)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-10-14 20:52:35 UTC (rev 25843)
@@ -30,6 +30,8 @@
CloudSelector.label=Select Cloud:
+Refresh.label=Refresh
+
Filter.label=Filter...
Filtered.label=filtered
FilteredImages.tooltip=Images shown have been filtered
14 years, 3 months
JBoss Tools SVN: r25842 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: jjohnstn
Date: 2010-10-14 16:47:20 -0400 (Thu, 14 Oct 2010)
New Revision: 25842
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
Log:
2010-10-14 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (createPartControl): Fix filtering
label showing up in wrong area and when there is no filtering occurring.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-14 20:20:04 UTC (rev 25841)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-14 20:47:20 UTC (rev 25842)
@@ -1,3 +1,8 @@
+2010-10-14 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (createPartControl): Fix filtering
+ label showing up in wrong area and when there is no filtering occurring.
+
2010-10-13 Jeff Johnston <jjohnstn(a)redhat.com>
[JBIDE-7194]
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-10-14 20:20:04 UTC (rev 25841)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-10-14 20:47:20 UTC (rev 25842)
@@ -250,6 +250,8 @@
currCloud.removeInstanceListListener(parentView);
viewer.setInput(currCloud);
currCloud.addInstanceListListener(parentView);
+ IInstanceFilter filter = currCloud.getInstanceFilter();
+ filterLabel.setVisible(!filter.toString().equals(IInstanceFilter.ALL_STRING));
}
Point p1 = cloudSelectorLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT);
@@ -267,6 +269,11 @@
cloudSelector.setLayoutData(f);
f = new FormData();
+ f.top = new FormAttachment(0, 5 + centering);
+ f.right = new FormAttachment(100, -10);
+ filterLabel.setLayoutData(f);
+
+ f = new FormData();
f.top = new FormAttachment(cloudSelector, 8);
f.left = new FormAttachment(0, 0);
f.right = new FormAttachment(100, 0);
14 years, 3 months