Skip to content

Commit

Permalink
regenerate specs & docs
Browse files Browse the repository at this point in the history
  • Loading branch information
@sebastianbenz
sebastianbenz committed Sep 5, 2013
1 parent a38370e commit fb0601b
Show file tree
Hide file tree
Showing 38 changed files with 270 additions and 290 deletions.
2 changes: 1 addition & 1 deletion examples/org.jnario.examples/META-INF/MANIFEST.MF
View file
Expand Up @@ -10,7 +10,7 @@ Require-Bundle: org.mockito;bundle-version="1.8.4",
com.google.guava,
org.junit,
org.eclipse.xtext.xbase.lib,
org.jnario.tests;bundle-version="0.6.0",
org.jnario.tests;bundle-version="1.0.0",
com.google.inject;bundle-version="3.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5

2 changes: 1 addition & 1 deletion examples/org.jnario.maven.example/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<xtend.version>2.4.3-SNAPSHOT</xtend.version>
<jnario.version>0.6.0-SNAPSHOT</jnario.version>
<jnario.version>1.0.0-SNAPSHOT</jnario.version>
</properties>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.jnario.maven.example</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions examples/selenium-example/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<project.build.resourceEncoding>${sourceEncoding}</project.build.resourceEncoding>
<maven.compiler.encoding>${sourceEncoding}</maven.compiler.encoding>
<xtend.version>2.4.2</xtend.version>
<jnario.version>0.6.0-SNAPSHOT</jnario.version>
<jnario.version>1.0.0-SNAPSHOT</jnario.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -109,5 +109,5 @@
</build>
<url>http://www.jnario.org</url>
<groupId>org.jnario</groupId>
<version>0.6.0</version>
<version>1.0.0</version>
</project>
6 changes: 3 additions & 3 deletions features/org.jnario.ui-feature/feature.xml
View file
Expand Up @@ -35,10 +35,10 @@ http://www.eclipse.org/legal/epl-v10.html Description here.
<import plugin="org.eclipse.xtext.xbase.ui" version="2.4.3" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.junit"/>
<import plugin="org.eclipse.pde.ui"/>
<import plugin="org.jnario" version="0.6.0" match="greaterOrEqual"/>
<import plugin="org.jnario" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.debug.core" match="greaterOrEqual"/>
<import plugin="org.eclipse.debug.ui" match="greaterOrEqual"/>
<import plugin="org.jnario.feature" version="0.6.0" match="greaterOrEqual"/>
<import plugin="org.jnario.feature" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase.lib" version="2.4.3" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.ui"/>
<import plugin="org.eclipse.jdt.core"/>
Expand All @@ -52,7 +52,7 @@ http://www.eclipse.org/legal/epl-v10.html Description here.
<import plugin="com.ibm.icu"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.jnario.lib" version="0.6.0" match="greaterOrEqual"/>
<import plugin="org.jnario.lib" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.jnario.suite"/>
<import plugin="com.google.guava"/>
</requires>
Expand Down
2 changes: 1 addition & 1 deletion plugins/jnario-maven-archetype/src/main/resources/archetype-resources/pom.xml
View file
Expand Up @@ -12,7 +12,7 @@
<project.build.resourceEncoding>${sourceEncoding}</project.build.resourceEncoding>
<maven.compiler.encoding>${sourceEncoding}</maven.compiler.encoding>
<xtend.version>2.4.3</xtend.version>
<jnario.version>0.6.0-SNAPSHOT</jnario.version>
<jnario.version>1.0.0-SNAPSHOT</jnario.version>
</properties>
<repositories>
<repository>
Expand Down
8 changes: 4 additions & 4 deletions plugins/org.jnario.feature.ui/META-INF/MANIFEST.MF
View file
Expand Up @@ -19,17 +19,17 @@ Require-Bundle: org.eclipse.xtext.ui;bundle-version="[2.4.3,2.5.0)",
org.eclipse.xtext.xbase.ui,
org.eclipse.jdt.junit,
org.eclipse.pde.ui,
org.jnario;bundle-version="0.6.0",
org.jnario.ui;bundle-version="0.6.0",
org.jnario;bundle-version="1.0.0",
org.jnario.ui;bundle-version="1.0.0",
org.eclipse.debug.core,
org.eclipse.debug.ui,
org.jnario.feature;bundle-version="0.6.0",
org.jnario.feature;bundle-version="1.0.0",
org.eclipse.xtext.xbase.lib;bundle-version="[2.4.3,2.5.0)",
org.eclipse.jdt.annotation;bundle-version="1.0.0";resolution:=optional,
org.eclipse.jdt.ui,
org.eclipse.jdt.core,
org.eclipse.xtend.ide;bundle-version="2.3.1",
org.jnario.lib;bundle-version="0.6.0"
org.jnario.lib;bundle-version="1.0.0"
Import-Package: org.apache.commons.logging,
org.apache.log4j,
org.eclipse.jdt.core,
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.jnario.feature/META-INF/MANIFEST.MF
View file
Expand Up @@ -17,8 +17,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.4.3,2.5.0)";visibility:=ree
org.eclipse.emf.common,
org.antlr.runtime,
org.eclipse.xtext.common.types;bundle-version="[2.4.3,2.5.0)",
org.jnario.lib;bundle-version="0.6.0",
org.jnario;bundle-version="0.6.0",
org.jnario.lib;bundle-version="1.0.0",
org.jnario;bundle-version="1.0.0",
org.eclipse.xtend.core;bundle-version="[2.4.3,2.5.0)",
org.eclipse.xtext.xbase.lib,
org.eclipse.jdt.annotation;bundle-version="1.0.0";resolution:=optional
Expand Down
38 changes: 19 additions & 19 deletions ...s/org.jnario.feature/xtend-gen/org/jnario/feature/jvmmodel/StepReferenceFieldCreator.java
View file
Expand Up @@ -45,16 +45,16 @@ public void copyXtendMemberForReferences(final Scenario scenario) {
EList<Step> _steps = scenario.getSteps();
Iterable<StepReference> _filter = Iterables.<StepReference>filter(_steps, StepReference.class);
final Function1<StepReference,Boolean> _function = new Function1<StepReference,Boolean>() {
public Boolean apply(final StepReference it) {
StepImplementation _reference = it.getReference();
XExpression _expression = null;
if (_reference!=null) {
_expression=_reference.getExpression();
}
boolean _notEquals = (!Objects.equal(_expression, null));
return Boolean.valueOf(_notEquals);
public Boolean apply(final StepReference it) {
StepImplementation _reference = it.getReference();
XExpression _expression = null;
if (_reference!=null) {
_expression=_reference.getExpression();
}
};
boolean _notEquals = (!Objects.equal(_expression, null));
return Boolean.valueOf(_notEquals);
}
};
final Iterable<StepReference> refs = IterableExtensions.<StepReference>filter(_filter, _function);
final Set<String> fieldNames = this.getExistingFieldNamesForContainerOfStepReference(scenario);
for (final StepReference ref : refs) {
Expand All @@ -75,18 +75,18 @@ private Set<String> getExistingFieldNamesForContainerOfStepReference(final Scena
private Set<String> getExistingFieldNames(final Iterable<XtendMember> members) {
Iterable<XtendField> _filter = Iterables.<XtendField>filter(members, XtendField.class);
final Function1<XtendField,Boolean> _function = new Function1<XtendField,Boolean>() {
public Boolean apply(final XtendField it) {
boolean _notEquals = (!Objects.equal(it, null));
return Boolean.valueOf(_notEquals);
}
};
public Boolean apply(final XtendField it) {
boolean _notEquals = (!Objects.equal(it, null));
return Boolean.valueOf(_notEquals);
}
};
Iterable<XtendField> _filter_1 = IterableExtensions.<XtendField>filter(_filter, _function);
final Function1<XtendField,String> _function_1 = new Function1<XtendField,String>() {
public String apply(final XtendField it) {
String _name = it.getName();
return _name;
}
};
public String apply(final XtendField it) {
String _name = it.getName();
return _name;
}
};
Iterable<String> _map = IterableExtensions.<XtendField, String>map(_filter_1, _function_1);
Set<String> _set = IterableExtensions.<String>toSet(_map);
return _set;
Expand Down
48 changes: 24 additions & 24 deletions plugins/org.jnario.feature/xtend-gen/org/jnario/feature/jvmmodel/StepsProvider.java
View file
Expand Up @@ -32,40 +32,40 @@ public Iterable<StepImplementation> getSteps(final EObject context) {
EList<EObject> _contents = _eResource_1.getContents();
final Iterable<FeatureFile> featureFiles = Iterables.<FeatureFile>filter(_contents, FeatureFile.class);
final Function1<FeatureFile,EList<XtendTypeDeclaration>> _function = new Function1<FeatureFile,EList<XtendTypeDeclaration>>() {
public EList<XtendTypeDeclaration> apply(final FeatureFile it) {
EList<XtendTypeDeclaration> _xtendTypes = it.getXtendTypes();
return _xtendTypes;
}
};
public EList<XtendTypeDeclaration> apply(final FeatureFile it) {
EList<XtendTypeDeclaration> _xtendTypes = it.getXtendTypes();
return _xtendTypes;
}
};
Iterable<EList<XtendTypeDeclaration>> _map = IterableExtensions.<FeatureFile, EList<XtendTypeDeclaration>>map(featureFiles, _function);
Iterable<XtendTypeDeclaration> _flatten = Iterables.<XtendTypeDeclaration>concat(_map);
final Iterable<Feature> features = Iterables.<Feature>filter(_flatten, Feature.class);
final Function1<Feature,Iterable<Scenario>> _function_1 = new Function1<Feature,Iterable<Scenario>>() {
public Iterable<Scenario> apply(final Feature it) {
Iterable<Scenario> _xblockexpression = null;
{
Background _background = it.getBackground();
boolean _equals = Objects.equal(_background, null);
if (_equals) {
return it.getScenarios();
}
EList<Scenario> _scenarios = it.getScenarios();
Background _background_1 = it.getBackground();
Iterable<Scenario> _plus = Iterables.<Scenario>concat(_scenarios, Collections.<Background>unmodifiableList(Lists.<Background>newArrayList(_background_1)));
_xblockexpression = (_plus);
public Iterable<Scenario> apply(final Feature it) {
Iterable<Scenario> _xblockexpression = null;
{
Background _background = it.getBackground();
boolean _equals = Objects.equal(_background, null);
if (_equals) {
return it.getScenarios();
}
return _xblockexpression;
EList<Scenario> _scenarios = it.getScenarios();
Background _background_1 = it.getBackground();
Iterable<Scenario> _plus = Iterables.<Scenario>concat(_scenarios, Collections.<Background>unmodifiableList(Lists.<Background>newArrayList(_background_1)));
_xblockexpression = (_plus);
}
};
return _xblockexpression;
}
};
Iterable<Iterable<Scenario>> _map_1 = IterableExtensions.<Feature, Iterable<Scenario>>map(features, _function_1);
Iterable<Scenario> _flatten_1 = Iterables.<Scenario>concat(_map_1);
final Iterable<Scenario> scenarios = IterableExtensions.<Scenario>filterNull(_flatten_1);
final Function1<Scenario,EList<Step>> _function_2 = new Function1<Scenario,EList<Step>>() {
public EList<Step> apply(final Scenario it) {
EList<Step> _steps = it.getSteps();
return _steps;
}
};
public EList<Step> apply(final Scenario it) {
EList<Step> _steps = it.getSteps();
return _steps;
}
};
Iterable<EList<Step>> _map_2 = IterableExtensions.<Scenario, EList<Step>>map(scenarios, _function_2);
Iterable<Step> _flatten_2 = Iterables.<Step>concat(_map_2);
Iterable<StepImplementation> _filter = Iterables.<StepImplementation>filter(_flatten_2, StepImplementation.class);
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.jnario.spec.ui/META-INF/MANIFEST.MF
View file
Expand Up @@ -23,10 +23,10 @@ Require-Bundle: org.jnario.spec;visibility:=reexport,
org.eclipse.jdt.core,
org.eclipse.pde.ui,
org.eclipse.xtend.ide;bundle-version="[2.4.3,2.5.0)",
org.jnario;bundle-version="0.6.0",
org.jnario;bundle-version="1.0.0",
org.eclipse.jdt.ui,
com.ibm.icu,
org.jnario.ui;bundle-version="0.6.0",
org.jnario.ui;bundle-version="1.0.0",
org.eclipse.xtext.xbase.lib;bundle-version="[2.4.3,2.5.0)"
Import-Package: org.apache.log4j,
org.apache.commons.logging
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.jnario.spec/META-INF/MANIFEST.MF
View file
Expand Up @@ -17,9 +17,9 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.4.3,2.5.0)";visibility:=ree
org.eclipse.emf.common,
org.antlr.runtime,
org.eclipse.xtext.common.types;bundle-version="[2.4.3,2.5.0)",
org.jnario.lib;bundle-version="0.6.0",
org.jnario.lib;bundle-version="1.0.0",
org.eclipse.xtend.core;bundle-version="[2.4.3,2.5.0)",
org.jnario;bundle-version="0.6.0",
org.jnario;bundle-version="1.0.0",
org.eclipse.xtext.xbase.lib;bundle-version="[2.4.3,2.5.0)",
org.eclipse.jdt.annotation;bundle-version="1.0.0";resolution:=optional,
org.apache.commons.lang
Expand Down
10 changes: 5 additions & 5 deletions plugins/org.jnario.standalone/META-INF/MANIFEST.MF
View file
Expand Up @@ -9,12 +9,12 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.xtext;bundle-version="[2.4.3,2.5.0)",
org.eclipse.xtend.core;bundle-version="[2.4.3,2.5.0)",
org.eclipse.jdt.core,
org.jnario.feature;bundle-version="0.6.0",
org.jnario;bundle-version="0.6.0",
org.jnario.spec;bundle-version="0.6.0",
org.jnario.feature;bundle-version="1.0.0",
org.jnario;bundle-version="1.0.0",
org.jnario.spec;bundle-version="1.0.0",
org.eclipse.xtext.xbase.lib;bundle-version="[2.4.3,2.5.0)",
org.jnario.lib;bundle-version="0.6.0",
org.jnario.suite;bundle-version="0.6.0",
org.jnario.lib;bundle-version="1.0.0",
org.jnario.suite;bundle-version="1.0.0",
org.apache.ant;bundle-version="1.8.3";resolution:=optional
Import-Package: org.apache.log4j
Export-Package: org.jnario.compiler
8 changes: 4 additions & 4 deletions plugins/org.jnario.suite.ui/META-INF/MANIFEST.MF
View file
Expand Up @@ -23,13 +23,13 @@ Require-Bundle: org.jnario.suite;visibility:=reexport,
org.eclipse.xtend.lib,
com.google.guava,
org.eclipse.xtext.xbase.lib,
org.jnario;bundle-version="0.6.0",
org.jnario.ui;bundle-version="0.6.0",
org.jnario;bundle-version="1.0.0",
org.jnario.ui;bundle-version="1.0.0",
org.eclipse.jdt.ui,
org.eclipse.jdt.junit,
org.eclipse.pde.ui,
org.jnario.feature.ui;bundle-version="0.6.0",
org.jnario.spec.ui;bundle-version="0.6.0"
org.jnario.feature.ui;bundle-version="1.0.0",
org.jnario.spec.ui;bundle-version="1.0.0"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.jnario.suite.ui.contentassist,
Expand Down
8 changes: 4 additions & 4 deletions plugins/org.jnario.suite/META-INF/MANIFEST.MF
View file
Expand Up @@ -13,17 +13,17 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
org.eclipse.emf.codegen.ecore;resolution:=optional,
org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
org.jnario.feature;bundle-version="0.6.0",
org.jnario.spec;bundle-version="0.6.0",
org.jnario.feature;bundle-version="1.0.0",
org.jnario.spec;bundle-version="1.0.0",
org.eclipse.xtend.core;bundle-version="[2.4.3,2.5.0)",
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
org.antlr.runtime,
org.eclipse.xtext.common.types,
org.eclipse.xtext.xbase.lib,
org.jnario;bundle-version="0.6.0",
org.jnario.lib;bundle-version="0.6.0",
org.jnario;bundle-version="1.0.0",
org.jnario.lib;bundle-version="1.0.0",
org.eclipse.xtext.xbase.ui;bundle-version="2.4.3"
Import-Package: org.apache.log4j,
org.eclipse.xtext.xbase.lib
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.jnario.ui/META-INF/MANIFEST.MF
View file
Expand Up @@ -10,12 +10,12 @@ Require-Bundle: org.eclipse.core.resources,
org.eclipse.jdt.core,
org.eclipse.core.runtime,
org.eclipse.xtext.ui;bundle-version="[2.4.3,2.5.0)",
org.jnario;bundle-version="0.6.0",
org.jnario;bundle-version="1.0.0",
org.eclipse.xtend.ide;bundle-version="[2.4.3,2.5.0)",
org.eclipse.xtext.common.types.ui;bundle-version="[2.4.3,2.5.0)",
org.eclipse.jdt.ui,
org.eclipse.xtext.xbase.ui;bundle-version="[2.4.3,2.5.0)",
org.jnario.lib;bundle-version="0.6.0",
org.jnario.lib;bundle-version="1.0.0",
org.eclipse.ui,
org.eclipse.jdt.junit,
org.eclipse.xtext.ui.shared;bundle-version="[2.4.3,2.5.0)"
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jnario/META-INF/MANIFEST.MF
View file
Expand Up @@ -10,7 +10,7 @@ Import-Package: org.apache.commons.logging,
Require-Bundle: org.eclipse.xtext;bundle-version="[2.4.3,2.5.0)",
org.eclipse.xtext.xbase;bundle-version="[2.4.3,2.5.0)",
org.eclipse.xtext.xbase.lib;bundle-version="[2.4.3,2.5.0)",
org.jnario.lib;bundle-version="0.6.0",
org.jnario.lib;bundle-version="1.0.0",
org.eclipse.emf.mwe2.lib;resolution:=optional,
org.eclipse.xtend.core;bundle-version="[2.4.3,2.5.0)",
org.objectweb.asm;bundle-version="3.2.0",
Expand Down
6 changes: 3 additions & 3 deletions prepare-release.sh
View file
Expand Up @@ -8,18 +8,18 @@ read nextversion
echo "Releasing $version"

#pull the latest state from the repository
#git pull --rebase
git pull --rebase

#prepare update site
cd ../jnario-gh-pages
git pull origin gh-pages
cd ../jnario

#run all tests
#mvn clean verify
mvn clean verify

#create release branch
#git branch rb-$version
git branch rb-$version

#change the releng/update-site/category.xml file. Replace <version>.qualifier by <version+1>
sed -i '' 's/$version/$nextversion/g' releng/org.jnario.updatesite/category.xml
Expand Down
8 changes: 4 additions & 4 deletions releng/org.jnario.updatesite/category.xml
View file
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/org.jnario_0.6.0.qualifier.jar" id="org.jnario" version="0.6.0.qualifier">
<feature url="features/org.jnario_1.0.0.qualifier.jar" id="org.jnario" version="1.0.0.qualifier">
<category name="Jnario"/>
</feature>
<feature url="features/org.jnario.sdk_0.6.0.qualifier.jar" id="org.jnario.sdk" version="0.6.0.qualifier">
<feature url="features/org.jnario.sdk_1.0.0.qualifier.jar" id="org.jnario.sdk" version="1.0.0.qualifier">
<category name="Jnario"/>
</feature>
<feature url="features/org.jnario.ui_0.6.0.qualifier.jar" id="org.jnario.ui" version="0.6.0.qualifier">
<feature url="features/org.jnario.ui_1.0.0.qualifier.jar" id="org.jnario.ui" version="1.0.0.qualifier">
<category name="Jnario"/>
</feature>
<feature url="features/org.jnario.m2e_0.6.0.qualifier.jar" id="org.jnario.m2e" version="0.6.0.qualifier">
<feature url="features/org.jnario.m2e_1.0.0.qualifier.jar" id="org.jnario.m2e" version="1.0.0.qualifier">
<category name="Jnario"/>
</feature>
<category-def name="Jnario" label="Jnario"/>
Expand Down
8 changes: 4 additions & 4 deletions releng/org.jnario.updatesite/site.xml
View file
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/org.jnario.sdk_0.6.0.qualifier.jar" id="org.jnario.sdk" version="0.6.0.qualifier">
<feature url="features/org.jnario.sdk_1.0.0.qualifier.jar" id="org.jnario.sdk" version="1.0.0.qualifier">
<category name="Jnario"/>
</feature>
<feature url="features/org.jnario_0.6.0.qualifier.jar" id="org.jnario" version="0.6.0.qualifier">
<feature url="features/org.jnario_1.0.0.qualifier.jar" id="org.jnario" version="1.0.0.qualifier">
<category name="Jnario"/>
</feature>
<feature url="features/org.jnario.ui_0.6.0.qualifier.jar" id="org.jnario.ui" version="0.6.0.qualifier">
<feature url="features/org.jnario.ui_1.0.0.qualifier.jar" id="org.jnario.ui" version="1.0.0.qualifier">
<category name="Jnario"/>
</feature>
<feature url="features/org.jnario.m2e_0.6.0.qualifier.jar" id="org.jnario.m2e" version="0.6.0.qualifier">
<feature url="features/org.jnario.m2e_1.0.0.qualifier.jar" id="org.jnario.m2e" version="1.0.0.qualifier">
<category name="Jnario"/>
</feature>
<category-def name="Jnario" label="Jnario"/>
Expand Down
6 changes: 3 additions & 3 deletions tests/org.jnario.lib.tests/META-INF/MANIFEST.MF
View file
Expand Up @@ -6,9 +6,9 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: BMW
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.junit;bundle-version="4.8.2",
org.jnario.lib;bundle-version="0.6.0",
org.jnario;bundle-version="0.6.0",
org.jnario.tests;bundle-version="0.6.0",
org.jnario.lib;bundle-version="1.0.0",
org.jnario;bundle-version="1.0.0",
org.jnario.tests;bundle-version="1.0.0",
org.eclipse.xtext.util;bundle-version="[2.4.3,2.5.0)",
org.mockito;bundle-version="1.8.4",
org.objenesis;bundle-version="1.0.0"

0 comments on commit fb0601b

Please sign in to comment.