Skip to content
This repository has been archived by the owner on Oct 27, 2022. It is now read-only.

Commit

Permalink
JBIDE-19753 - Investigate if Arquillian works fine with Sapphire 9.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@snjeza
snjeza committed May 18, 2015
1 parent 85c91ab commit b937b58
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 32 deletions.
18 changes: 9 additions & 9 deletions features/org.jboss.tools.arquillian.feature/feature.xml
View file
Expand Up @@ -19,15 +19,15 @@
</license>

<requires>
<import feature="org.eclipse.sapphire" version="8.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.java" version="8.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.java.jdt" version="8.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.modeling.xml" version="8.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.osgi" version="8.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.platform" version="8.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.ui.swt.xml.editor" version="8.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.ui" version="8.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.ui.swt.gef" version="8.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire" version="9.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.java" version="9.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.java.jdt" version="9.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.modeling.xml" version="9.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.osgi" version="9.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.platform" version="9.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.ui.swt.xml.editor" version="9.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.ui" version="9.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sapphire.ui.swt.gef" version="9.0.0" match="greaterOrEqual"/>
</requires>

<plugin
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.arquillian.core/META-INF/MANIFEST.MF
View file
Expand Up @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
org.jboss.tools.foundation.core;bundle-version="1.0.0",
org.eclipse.core.filesystem
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Export-Package: org.jboss.forge.arquillian.container,
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.arquillian.maven.configurator/META-INF/MANIFEST.MF
View file
Expand Up @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.jboss.tools.maven.ui,
org.jboss.tools.arquillian.core,
org.eclipse.jface
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
14 changes: 7 additions & 7 deletions plugins/org.jboss.tools.arquillian.ui/META-INF/MANIFEST.MF
View file
Expand Up @@ -30,19 +30,19 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.103.0",
org.eclipse.jdt.core.manipulation;bundle-version="1.5.0",
org.eclipse.m2e.core.ui,
org.eclipse.compare.core,
org.eclipse.sapphire.platform;bundle-version="0.7.1",
org.eclipse.sapphire.modeling;bundle-version="0.7.1",
org.eclipse.sapphire.modeling.xml;bundle-version="0.7.1",
org.eclipse.sapphire.java;bundle-version="0.7.1",
org.eclipse.sapphire.ui;bundle-version="0.7.1",
org.eclipse.sapphire.ui.swt.xml.editor;bundle-version="0.7.1",
org.eclipse.sapphire.platform;bundle-version="9.0.0",
org.eclipse.sapphire.modeling;bundle-version="9.0.0",
org.eclipse.sapphire.modeling.xml;bundle-version="9.0.0",
org.eclipse.sapphire.java;bundle-version="9.0.0",
org.eclipse.sapphire.ui;bundle-version="9.0.0",
org.eclipse.sapphire.ui.swt.xml.editor;bundle-version="9.0.0",
org.eclipse.wst.sse.ui;bundle-version="1.3.200",
org.eclipse.wst.xml.ui;bundle-version="1.1.401",
org.eclipse.m2e.profiles.ui;bundle-version="1.5.0",
org.eclipse.ui.workbench,
org.eclipse.ui.browser;bundle-version="3.4.200"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Export-Package: org.jboss.tools.arquillian.editor.internal.actions,
Expand Down
8 changes: 4 additions & 4 deletions ....tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Arquillian.java
View file
Expand Up @@ -14,11 +14,11 @@
import org.eclipse.sapphire.ElementList;
import org.eclipse.sapphire.ElementType;
import org.eclipse.sapphire.ImpliedElementProperty;
import org.eclipse.sapphire.Length;
import org.eclipse.sapphire.ListProperty;
import org.eclipse.sapphire.modeling.annotations.CountConstraint;
import org.eclipse.sapphire.Type;
import org.eclipse.sapphire.modeling.annotations.Label;
import org.eclipse.sapphire.modeling.annotations.Service;
import org.eclipse.sapphire.modeling.annotations.Type;
import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
import org.eclipse.sapphire.modeling.xml.annotations.XmlNamespace;
Expand All @@ -44,7 +44,7 @@ public interface Arquillian extends Element {
@Type( base = Protocol.class )
@Label( standard = "Default Protocol" )
@XmlBinding( path = "defaultProtocol" )
@CountConstraint (max=1)
@Length (max=1)
ImpliedElementProperty PROP_DEFAULT_PROTOCOL =
new ImpliedElementProperty( TYPE, "DefaultProtocol" ); //$NON-NLS-1$

Expand All @@ -53,7 +53,7 @@ public interface Arquillian extends Element {
@Type( base = Engine.class )
@Label( standard = "Engine" )
@XmlBinding( path = "engine" )
@CountConstraint (max=1)
@Length (max=1)
ImpliedElementProperty PROP_ENGINE =
new ImpliedElementProperty( TYPE, "Engine" ); //$NON-NLS-1$

Expand Down
2 changes: 1 addition & 1 deletion ...ols.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Configuration.java
View file
Expand Up @@ -14,8 +14,8 @@
import org.eclipse.sapphire.ElementList;
import org.eclipse.sapphire.ElementType;
import org.eclipse.sapphire.ListProperty;
import org.eclipse.sapphire.Type;
import org.eclipse.sapphire.modeling.annotations.Label;
import org.eclipse.sapphire.modeling.annotations.Type;
import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;

/**
Expand Down
6 changes: 3 additions & 3 deletions ...s.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Container.java
View file
Expand Up @@ -14,19 +14,19 @@
import org.eclipse.sapphire.ElementList;
import org.eclipse.sapphire.ElementType;
import org.eclipse.sapphire.ImpliedElementProperty;
import org.eclipse.sapphire.Length;
import org.eclipse.sapphire.ListProperty;
import org.eclipse.sapphire.Type;
import org.eclipse.sapphire.Unique;
import org.eclipse.sapphire.Value;
import org.eclipse.sapphire.ValueProperty;
import org.eclipse.sapphire.modeling.annotations.CountConstraint;
import org.eclipse.sapphire.modeling.annotations.DefaultValue;
import org.eclipse.sapphire.modeling.annotations.Fact;
import org.eclipse.sapphire.modeling.annotations.Facts;
import org.eclipse.sapphire.modeling.annotations.Label;
import org.eclipse.sapphire.modeling.annotations.Required;
import org.eclipse.sapphire.modeling.annotations.Service;
import org.eclipse.sapphire.modeling.annotations.Services;
import org.eclipse.sapphire.modeling.annotations.Type;
import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
import org.jboss.tools.arquillian.editor.internal.services.ContainerProfilesService;
Expand Down Expand Up @@ -79,7 +79,7 @@ public interface Container extends Element {

@Type(base = Configuration.class)
@Label(standard = "Configuration")
@CountConstraint (max=1)
@Length (max=1)
@XmlBinding( path = "configuration" )
ImpliedElementProperty PROP_CONFIGURATION =
new ImpliedElementProperty( TYPE, "Configuration" ); //$NON-NLS-1$
Expand Down
2 changes: 1 addition & 1 deletion ...boss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Engine.java
View file
Expand Up @@ -14,8 +14,8 @@
import org.eclipse.sapphire.ElementList;
import org.eclipse.sapphire.ElementType;
import org.eclipse.sapphire.ListProperty;
import org.eclipse.sapphire.Type;
import org.eclipse.sapphire.modeling.annotations.Label;
import org.eclipse.sapphire.modeling.annotations.Type;
import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...s.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Extension.java
View file
Expand Up @@ -14,13 +14,13 @@
import org.eclipse.sapphire.ElementList;
import org.eclipse.sapphire.ElementType;
import org.eclipse.sapphire.ListProperty;
import org.eclipse.sapphire.Type;
import org.eclipse.sapphire.Unique;
import org.eclipse.sapphire.Value;
import org.eclipse.sapphire.ValueProperty;
import org.eclipse.sapphire.modeling.annotations.Enablement;
import org.eclipse.sapphire.modeling.annotations.Label;
import org.eclipse.sapphire.modeling.annotations.Required;
import org.eclipse.sapphire.modeling.annotations.Type;
import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;

Expand Down
6 changes: 3 additions & 3 deletions ...jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Group.java
View file
Expand Up @@ -13,17 +13,17 @@
import org.eclipse.sapphire.Element;
import org.eclipse.sapphire.ElementList;
import org.eclipse.sapphire.ElementType;
import org.eclipse.sapphire.Length;
import org.eclipse.sapphire.ListProperty;
import org.eclipse.sapphire.Type;
import org.eclipse.sapphire.Unique;
import org.eclipse.sapphire.Value;
import org.eclipse.sapphire.ValueProperty;
import org.eclipse.sapphire.modeling.annotations.CountConstraint;
import org.eclipse.sapphire.modeling.annotations.DefaultValue;
import org.eclipse.sapphire.modeling.annotations.Fact;
import org.eclipse.sapphire.modeling.annotations.Facts;
import org.eclipse.sapphire.modeling.annotations.Label;
import org.eclipse.sapphire.modeling.annotations.Required;
import org.eclipse.sapphire.modeling.annotations.Type;
import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;

Expand Down Expand Up @@ -61,7 +61,7 @@ public interface Group extends Element {

@Type( base = Container.class )
@Label( standard = "Container" )
@CountConstraint(min=1)
@Length(min=1)
@XmlListBinding( mappings = @XmlListBinding.Mapping( element = "container", type = Container.class ))
ListProperty PROP_CONTAINER = new ListProperty( TYPE, "Container" ); //$NON-NLS-1$

Expand Down
2 changes: 1 addition & 1 deletion ...ss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Protocol.java
View file
Expand Up @@ -14,14 +14,14 @@
import org.eclipse.sapphire.ElementList;
import org.eclipse.sapphire.ElementType;
import org.eclipse.sapphire.ListProperty;
import org.eclipse.sapphire.Type;
import org.eclipse.sapphire.Unique;
import org.eclipse.sapphire.Value;
import org.eclipse.sapphire.ValueProperty;
import org.eclipse.sapphire.internal.EnumToStringConversionService;
import org.eclipse.sapphire.modeling.annotations.Enablement;
import org.eclipse.sapphire.modeling.annotations.Label;
import org.eclipse.sapphire.modeling.annotations.Service;
import org.eclipse.sapphire.modeling.annotations.Type;
import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
import org.jboss.tools.arquillian.editor.internal.services.ProtocolDependenciesService;
Expand Down

0 comments on commit b937b58

Please sign in to comment.