This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository eclipse-wtp.
commit 0a81abda09ccb30982d034a3917110abe71ef141 Author: Jakub Adam <[email protected]> Date: Tue Dec 10 10:17:28 2013 +0100 Fix NullPointerException when creating static web project Into Ecore model, added default value for 'version' attribute of ProjectComponents class. --- debian/changelog | 8 ++++++++ debian/patches/genmodel-customizations.patch | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6e7be43..6231f18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +eclipse-wtp (3.5.1-2) UNRELEASED; urgency=medium + + * Fix NullPointerException when creating static web project + - into Ecore model, added default value for 'version' attribute + of ProjectComponents class. + + -- Jakub Adam <[email protected]> Tue, 10 Dec 2013 10:18:31 +0100 + eclipse-wtp (3.5.1-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/genmodel-customizations.patch b/debian/patches/genmodel-customizations.patch index f25f730..a287c74 100644 --- a/debian/patches/genmodel-customizations.patch +++ b/debian/patches/genmodel-customizations.patch @@ -3,6 +3,7 @@ Date: Fri, 30 Aug 2013 19:57:21 +0200 Subject: genmodel-customizations --- + .../model/componentCore.ecore | 2 +- .../model/componentCore.genmodel | 3 +- .../internal/ComponentcoreFactory.java | 92 -- .../internal/ComponentcorePackage.java | 1146 -------------------- @@ -30,10 +31,22 @@ Subject: genmodel-customizations .../internal/util/WTPModulesTranslator.java | 2 +- .../resolvers/DefaultReferenceResolver.java | 2 +- org.eclipse.wst.ws/RT.genmodel | 2 +- - 27 files changed, 19 insertions(+), 1265 deletions(-) + 28 files changed, 20 insertions(+), 1266 deletions(-) delete mode 100644 org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcoreFactory.java delete mode 100644 org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java +diff --git a/org.eclipse.wst.common.modulecore/model/componentCore.ecore b/org.eclipse.wst.common.modulecore/model/componentCore.ecore +index ec338c4..d129d7b 100644 +--- a/org.eclipse.wst.common.modulecore/model/componentCore.ecore ++++ b/org.eclipse.wst.common.modulecore/model/componentCore.ecore +@@ -76,6 +76,6 @@ + <eStructuralFeatures xsi:type="ecore:EReference" name="components" unique="false" + upperBound="-1" eType="#//WorkbenchComponent" containment="true"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1" +- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> ++ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"; defaultValueLiteral="1.0.0"/> + </eClassifiers> + </ecore:EPackage> diff --git a/org.eclipse.wst.common.modulecore/model/componentCore.genmodel b/org.eclipse.wst.common.modulecore/model/componentCore.genmodel index 2e55524..4f24970 100644 --- a/org.eclipse.wst.common.modulecore/model/componentCore.genmodel -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-wtp.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
