JBoss Tools SVN: r30290 - trunk/cdi/features/org.jboss.tools.cdi.seam.feature.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-04-04 17:46:04 -0400 (Mon, 04 Apr 2011)
New Revision: 30290
Added:
trunk/cdi/features/org.jboss.tools.cdi.seam.feature/.project
trunk/cdi/features/org.jboss.tools.cdi.seam.feature/build.properties
trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties
trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml
trunk/cdi/features/org.jboss.tools.cdi.seam.feature/license.html
trunk/cdi/features/org.jboss.tools.cdi.seam.feature/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8673
Added: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/.project
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.seam.feature/.project (rev 0)
+++ trunk/cdi/features/org.jboss.tools.cdi.seam.feature/.project 2011-04-04 21:46:04 UTC (rev 30290)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.cdi.seam.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/cdi/features/org.jboss.tools.cdi.seam.feature/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/build.properties
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.seam.feature/build.properties (rev 0)
+++ trunk/cdi/features/org.jboss.tools.cdi.seam.feature/build.properties 2011-04-04 21:46:04 UTC (rev 30290)
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ license.html
Property changes on: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties (rev 0)
+++ trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties 2011-04-04 21:46:04 UTC (rev 30290)
@@ -0,0 +1,25 @@
+featureName=Seam 3 Tools
+featureProvider=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+# "description" property - description of the feature
+description=Context and Dependency Injection Tools
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# START NON-TRANSLATABLE
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=Red Hat, Inc. licenses these features and plugins to you under \
+certain open source licenses (or aggregations of such licenses), which \
+in a particular case may include the Eclipse Public License, the GNU \
+Lesser General Public License, and/or certain other open source \
+licenses. For precise licensing details, consult the corresponding \
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
+Raleigh NC 27606 USA.
+# END NON-TRANSLATABLE
+########### end of license property ##########################################
Property changes on: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml (rev 0)
+++ trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml 2011-04-04 21:46:04 UTC (rev 30290)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.cdi.seam.feature"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%featureProvider">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ JBoss, Home of Professional Open Source
+Copyright 2006-2010, JBoss by Red Hat, and individual contributors
+as indicated
+by the @authors tag. See the copyright.txt in the distribution
+for a full listing of individual contributors.
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.jboss.tools.cdi.seam.solder.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Property changes on: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/license.html
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.seam.feature/license.html (rev 0)
+++ trunk/cdi/features/org.jboss.tools.cdi.seam.feature/license.html 2011-04-04 21:46:04 UTC (rev 30290)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/license.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/pom.xml
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.seam.feature/pom.xml (rev 0)
+++ trunk/cdi/features/org.jboss.tools.cdi.seam.feature/pom.xml 2011-04-04 21:46:04 UTC (rev 30290)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.cdi.features</groupId>
+ <artifactId>org.jboss.tools.cdi.seam.feature</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
Property changes on: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 2 months
JBoss Tools SVN: r30288 - trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-04-04 17:44:10 -0400 (Mon, 04 Apr 2011)
New Revision: 30288
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF
Log:
JBIDE-8676 org.jboss.ide.eclipse.as.test unnecessarily requires org.eclipse.jpt.core
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2011-04-04 21:36:18 UTC (rev 30287)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2011-04-04 21:44:10 UTC (rev 30288)
@@ -40,7 +40,8 @@
org.jboss.ide.eclipse.as.classpath.ui,
org.jboss.ide.eclipse.as.wtp.core,
org.jboss.ide.eclipse.as.wtp.ui,
- org.eclipse.jst.jsf.core
+ org.eclipse.jst.jsf.core,
+ org.eclipse.jpt.jpa.core
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
13 years, 2 months
JBoss Tools SVN: r30287 - in trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test: src/org/jboss/tools/cdi/solder/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-04 17:36:18 -0400 (Mon, 04 Apr 2011)
New Revision: 30287
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/bin/org/jboss/tools/cdi/solder/core/test/CDISolderCoreAllTests.class
trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/VetoTest.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
JBIDE-8196
https://issues.jboss.org/browse/JBIDE-8196
Modified: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/bin/org/jboss/tools/cdi/solder/core/test/CDISolderCoreAllTests.class
===================================================================
(Binary files differ)
Modified: trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/VetoTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/VetoTest.java 2011-04-04 21:33:25 UTC (rev 30286)
+++ trunk/cdi/tests/org.jboss.tools.cdi.solder.core.test/src/org/jboss/tools/cdi/solder/core/test/VetoTest.java 2011-04-04 21:36:18 UTC (rev 30287)
@@ -49,7 +49,7 @@
Object name = a.getMemberValue(null);
assertEquals("tiger", name); //...and it is annotated with @Named("tiger")
Set<IBean> bs = cdi.getBeans("tiger", false);
- assertTrue(bs.isEmpty()); //...CDI model does not have bean named "tiger"
+ assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "tiger"
bs = cdi.getBeans(d.getResource().getFullPath());
assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource
@@ -61,7 +61,7 @@
name = a.getMemberValue(null);
assertEquals("lion", name); //...and it is annotated with @Named("lion")
bs = cdi.getBeans("lion", false);
- assertTrue(bs.isEmpty()); //...CDI model does not have bean named "lion"
+ assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "lion"
bs = cdi.getBeans(d.getResource().getFullPath());
assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource
}
@@ -77,7 +77,7 @@
Object name = a.getMemberValue(null);
assertEquals("bear", name); //...and it is annotated with @Named("bear")
Set<IBean> bs = cdi.getBeans("bear", false);
- assertTrue(bs.isEmpty()); //...CDI model does not have bean named "bear"
+ assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "bear"
bs = cdi.getBeans(d.getResource().getFullPath());
assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource
@@ -89,17 +89,17 @@
name = a.getMemberValue(null);
assertEquals("bee", name); //...and it is annotated with @Named("bee")
bs = cdi.getBeans("bee", false);
- assertTrue(bs.isEmpty()); //...CDI model does not have bean named "bee"
+ assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "bee"
bs = cdi.getBeans(d.getResource().getFullPath());
assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource
//3. class annotated @Requires that references single available class
bs = cdi.getBeans("fly", false);
- assertTrue(!bs.isEmpty()); //...CDI model have a bean named "fly"
+ assertEquals(1, bs.size()); //...CDI model has a bean named "fly"
//4. class annotated @Requires that references array of available classes
bs = cdi.getBeans("dragonfly", false);
- assertTrue(!bs.isEmpty()); //...CDI model have a bean named "dragonfly"
+ assertEquals(1, bs.size()); //...CDI model has a bean named "dragonfly"
}
13 years, 2 months
JBoss Tools SVN: r30286 - trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-04 17:33:25 -0400 (Mon, 04 Apr 2011)
New Revision: 30286
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/CDISolderCoreExtension.java
Log:
JBIDE-8198
https://issues.jboss.org/browse/JBIDE-8198
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/CDISolderCoreExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/CDISolderCoreExtension.java 2011-04-04 21:32:34 UTC (rev 30285)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/CDISolderCoreExtension.java 2011-04-04 21:33:25 UTC (rev 30286)
@@ -6,13 +6,18 @@
import java.util.Set;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IAnnotated;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
+import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.extension.ICDIExtension;
import org.jboss.tools.cdi.core.extension.feature.IBeanNameFeature;
import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedTypeFeature;
import org.jboss.tools.cdi.internal.core.impl.definition.DefinitionContext;
+import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.ParameterDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.EclipseJavaUtil;
@@ -54,6 +59,27 @@
}
}
}
+
+ List<FieldDefinition> fs = typeDefinition.getFields();
+ for (FieldDefinition f: fs) {
+ IParametedType exact = getExactType(f, typeDefinition.getType(), context);
+ System.out.println("field:" + exact);
+ if(exact != null) {
+
+ }
+ }
+
+ List<MethodDefinition> ms = typeDefinition.getMethods();
+ for (MethodDefinition m: ms) {
+ List<ParameterDefinition> ps = m.getParameters();
+ for (ParameterDefinition p: ps) {
+ IParametedType exact = getExactType(p, typeDefinition.getType(), context);
+ System.out.println("parameter:" + exact);
+ if(exact != null) {
+
+ }
+ }
+ }
}
private List<String> getRequiredClasses(IAnnotated d) {
@@ -76,4 +102,27 @@
return result;
}
+ private IParametedType getExactType(IAnnotated annotated, IType declaringType, DefinitionContext context) {
+ IAnnotationDeclaration a = annotated.getAnnotation(CDISolderConstants.EXACT_ANNOTATION_TYPE_NAME);
+ if(a != null) {
+ Object o = a.getMemberValue(null);
+ if(o != null) {
+ String s = o.toString();
+ if(s.length() > 0) {
+ String q = EclipseJavaUtil.resolveType(declaringType, s);
+ if(q != null) {
+ try {
+ return context.getProject().getTypeFactory().getParametedType(declaringType, "Q" + q + ";");
+ } catch (JavaModelException e) {
+ CDISolderCorePlugin.getDefault().logError(e);
+ }
+
+ }
+ }
+ System.out.println("Exact:" + s);
+ }
+ }
+ return null;
+ }
+
}
13 years, 2 months
JBoss Tools SVN: r30285 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-04 17:32:34 -0400 (Mon, 04 Apr 2011)
New Revision: 30285
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java
Log:
JBIDE-8198
https://issues.jboss.org/browse/JBIDE-8198
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java 2011-04-04 21:06:16 UTC (rev 30284)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java 2011-04-04 21:32:34 UTC (rev 30285)
@@ -16,13 +16,20 @@
import java.util.Map;
import java.util.Set;
+import org.eclipse.jdt.core.IMemberValuePair;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.SourceRange;
+import org.eclipse.jdt.internal.core.MemberValuePair;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IAnnotated;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
+import org.jboss.tools.cdi.internal.core.impl.AnnotationLiteral;
import org.jboss.tools.cdi.internal.core.impl.JavaAnnotation;
import org.jboss.tools.cdi.internal.core.impl.ParametedType;
+import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.text.ITextSourceReference;
public class ParameterDefinition implements IAnnotated {
@@ -62,14 +69,51 @@
}
// JDT doesn't have API for annotations for method params. So let's wrap ITextSourceReference into IAnnotationDeclaration.
AnnotationDeclaration ad = new AnnotationDeclaration();
- //TODO it should be annotation literal!
- System.out.println("!!!!!!!!!!!!!Here we are!!!!!!!!");
- ad.setDeclaration(new JavaAnnotation(null, methodDefinition.getMethod().getDeclaringType()));
+ IType t = null;
+ try {
+ t = EclipseJavaUtil.findType(methodDefinition.getMethod().getJavaProject(), annotationTypeName);
+ } catch (JavaModelException e) {
+
+ }
+ if(t == null) return null;
+ int b = reference.getStartPosition();
+ int e = reference.getLength() + b;
+ if(b < 0 || e < b) return null;
+ String source = methodDefinition.getTypeDefinition().getContent().substring(b, e);
+
+ //compute member value parameters
+ IMemberValuePair[] memberValues = getMemberValues(source);
+
+ AnnotationLiteral a = new AnnotationLiteral(methodDefinition.getResource(), source, new SourceRange(b, e - b), memberValues, t);
+ ad.setDeclaration(a);
CDICoreNature nature = CDICorePlugin.getCDI(methodDefinition.getResource().getProject(), false);
ad.setProject(nature);
return ad;
}
+ private static IMemberValuePair[] EMPTY_PAIRS = new IMemberValuePair[0];
+
+ private IMemberValuePair[] getMemberValues(String source) {
+ int p1 = source.indexOf('(');
+ int p2 = source.indexOf(')');
+ if(p1 >= 0 && p2 > p1) {
+ String params = source.substring(p1 + 1, p2).trim();
+ if(params.length() > 0) {
+ if(params.startsWith("{") && params.endsWith("}")) {
+ //TODO
+ } else if(params.endsWith(".class")) {
+ params = params.substring(0, params.length() - 6);
+ IMemberValuePair pair = new MemberValuePair("value", params, IMemberValuePair.K_CLASS);
+ return new IMemberValuePair[]{pair};
+ } else {
+ //TODO
+ }
+ }
+ }
+
+ return EMPTY_PAIRS;
+ }
+
/**
* Returns an empty list because JDT doesn't have API for annotations for method params. Use getAnnotationTypes() instead.
*
13 years, 2 months
JBoss Tools SVN: r30283 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-04 16:58:19 -0400 (Mon, 04 Apr 2011)
New Revision: 30283
Modified:
trunk/build/target-platform/publish.sh
Log:
bump M5 -> M6
Modified: trunk/build/target-platform/publish.sh
===================================================================
--- trunk/build/target-platform/publish.sh 2011-04-04 20:54:13 UTC (rev 30282)
+++ trunk/build/target-platform/publish.sh 2011-04-04 20:58:19 UTC (rev 30283)
@@ -2,7 +2,7 @@
# Hudson creates a repo in ${repoDir}; copy it into other places for access by downstream jobs and users
# defaults for JBoss Tools
-targetZipFile=e37M5-wtp33M5.target
+targetZipFile=e37M6-wtp33M6.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO
destinationPath=/home/hudson/static_build_env/jbds/target-platform
DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform
@@ -21,7 +21,7 @@
'-exclude') exclude="$2"; shift 2;;
'-jbt_3.3.indigo')
# defaults for JBT (trunk)
- targetZipFile=e37M5-wtp33M5.target
+ targetZipFile=e37M6-wtp33M6.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo
destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo
DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo
@@ -30,7 +30,7 @@
shift 1;;
'-jbt')
# defaults for JBT (stable branch)
- targetZipFile=e37M5-wtp33M5.target
+ targetZipFile=e37M6-wtp33M6.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO
destinationPath=/home/hudson/static_build_env/jbds/target-platform
DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform
@@ -39,7 +39,7 @@
shift 1;;
'-jbds_3.3.indigo')
# defaults for JBDS (trunk)
- targetZipFile=jbds500-e37M5-wtp33M5.target
+ targetZipFile=jbds500-e37M6-wtp33M6.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.3.indigo
destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.3.indigo
DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.3.indigo
@@ -48,7 +48,7 @@
shift 1;;
'-jbds')
# defaults for JBDS (stable branch)
- targetZipFile=jbds500-e37M5-wtp33M5.target
+ targetZipFile=jbds500-e37M6-wtp33M6.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO
destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform
DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform
13 years, 2 months
JBoss Tools SVN: r30282 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-04 16:54:13 -0400 (Mon, 04 Apr 2011)
New Revision: 30282
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
update DTP M6 versions
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-04-04 19:41:24 UTC (rev 30281)
+++ trunk/build/target-platform/jbds.target 2011-04-04 20:54:13 UTC (rev 30282)
@@ -6,24 +6,23 @@
from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
using vi, apply this transform:
- :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit version="\2" id="\1.feature.group"\/>/g
+ :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
<!-- CVS -->
<unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110121-7B77FO-8sF7BA7FFU67UJ5"/>
<!-- DTP 1.9 -->
- <unit id="org.eclipse.datatools.enablement.sdk.feature.feature.group" version="1.9.0.v201010181130-7I9O-FE9JfxXy1iz06uC_FrlImH-"/>
- <unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.9.0.v201010181130-7PA3-FEPPYupCWLDHfffcc2LJx83"/>
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBGKBZI_FcRd"/>
- <!-- should be 0.13.0.201103231111, not 0.11
+ <!-- should be newer M6 versions
:%s/<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkp9kfkUGJsrNYJ73"\/> /<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou"\/> /g
-->
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7FCcNBHFCQGgERLX"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.0.v201010181130-4107w3121151A1A53"/>
- <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7ACcNBGLEOIeD_WM"/>
- <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6y2z-fiIax-vy-Mg9L"/>
+ <!-- next two updated in M6 -->
+ <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7BCcNBGMDPHiDYRL"/>
+ <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6y2z-fiIbw0xx-Qi9L"/>
<unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.0.v201010181130-77788dBmKDNOMgJvJ8Of7QBR"/>
<unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.9.0.v201010181130-67D0AqGBJVKbHlH1GU7QBR"/>
<unit id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.9.0.v201010181130-7F47SFC7sRbrSZope9vW"/>
@@ -31,7 +30,8 @@
<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.9.0.v201010181130-2-07w31211518181A"/>
<unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.9.0.v201010181130-542AkF79P7QCP9SDB"/>
<unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.9.0.v201010181130-546AkF78Y7R9PAX77"/>
- <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKEGXFmGfNW"/>
+ <!-- next one updated in M6 -->
+ <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKFFYHlGjPW"/>
<unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.0.v201010181130-3328s735357795A8D"/>
<unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.0.v201010181130-548dAkF79Q7RAN9UFJ"/>
<unit id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.9.0.v201010181130-542AkF77g7V9N9e77"/>
@@ -40,7 +40,7 @@
<unit id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.9.0.v201010181130-540AkF78Y7VCOCQDB"/>
<unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.9.0.v201010181130-541AkF79P7N8NAQ77"/>
<unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.9.0.v201010181130-7N845FDsn0TdrPUJuQMtjCYJTJ0T"/>
-
+
<unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.9.0.v201101201115-57B3AkF7AI8FDDAOCP"/>
<unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.9.0.v201010181130-7A-3F7RZHLz-Hz-OlPz0Qf"/>
<unit id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.9.0.v201010181130-278-78B04G8S_IMz00Iz00PmQz01"/>
@@ -55,6 +55,11 @@
<unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
+ <!-- remove SDK features
+ <unit id="org.eclipse.datatools.enablement.sdk.feature.feature.group" version="1.9.0.v201010181130-7I9O-FE9JfxXy1iz06uC_FrlImH-"/>
+ <unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.9.0.v201010181130-7PA3-FEPPYupCWLDHfffcc2LJx83"/>
+ -->
+
<!-- XSD 2.7 -->
<unit id="org.eclipse.xsd.ecore.converter.feature.group" version="2.6.0.v20110310-1804"/>
<unit id="org.eclipse.xsd.edit.feature.group" version="2.6.0.v20110128-1446"/>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-04-04 19:41:24 UTC (rev 30281)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-04-04 20:54:13 UTC (rev 30282)
@@ -31,8 +31,6 @@
<repository location="http://download.jboss.org/jbosstools/updates/indigo/"/>
</source>
<iu id="org.eclipse.cvs.feature.group" version=""/>
-<iu id="org.eclipse.datatools.enablement.sdk.feature.feature.group" version=""/>
-<iu id="org.eclipse.datatools.sdk.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.modelbase.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.connectivity.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-04-04 19:41:24 UTC (rev 30281)
+++ trunk/build/target-platform/multiple.target 2011-04-04 20:54:13 UTC (rev 30282)
@@ -4,7 +4,7 @@
from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
using vi, apply this transform:
- :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit version="\2" id="\1.feature.group"\/>/g
+ :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -105,13 +105,17 @@
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.100.v20110124-0830-44Eo8s7353574H2531"/>
<unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5FiuFpBGyHd2xA_SWnfP"/>
- <!-- DTP -->
+ <!-- DTP 1.9 -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBGKBZI_FcRd"/>
- <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkp9kfkUGJsrNYJ73"/>
+ <!-- should be newer M6 versions
+ :%s/<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkp9kfkUGJsrNYJ73"\/> /<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou"\/> /g
+ -->
+ <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7FCcNBHFCQGgERLX"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.0.v201010181130-4107w3121151A1A53"/>
- <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7ACcNBGLEOIeD_WM"/>
- <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6y2z-fiIax-vy-Mg9L"/>
+ <!-- next two updated in M6 -->
+ <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7BCcNBGMDPHiDYRL"/>
+ <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6y2z-fiIbw0xx-Qi9L"/>
<unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.0.v201010181130-77788dBmKDNOMgJvJ8Of7QBR"/>
<unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.9.0.v201010181130-67D0AqGBJVKbHlH1GU7QBR"/>
<unit id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.9.0.v201010181130-7F47SFC7sRbrSZope9vW"/>
@@ -119,7 +123,8 @@
<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.9.0.v201010181130-2-07w31211518181A"/>
<unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.9.0.v201010181130-542AkF79P7QCP9SDB"/>
<unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.9.0.v201010181130-546AkF78Y7R9PAX77"/>
- <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKEGXFmGfNW"/>
+ <!-- next one updated in M6 -->
+ <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKFFYHlGjPW"/>
<unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.0.v201010181130-3328s735357795A8D"/>
<unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.0.v201010181130-548dAkF79Q7RAN9UFJ"/>
<unit id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.9.0.v201010181130-542AkF77g7V9N9e77"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-04-04 19:41:24 UTC (rev 30281)
+++ trunk/build/target-platform/unified.target 2011-04-04 20:54:13 UTC (rev 30282)
@@ -4,7 +4,7 @@
from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
using vi, apply this transform:
- :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit version="\2" id="\1.feature.group"\/>/g
+ :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -105,13 +105,17 @@
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.100.v20110124-0830-44Eo8s7353574H2531"/>
<unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5FiuFpBGyHd2xA_SWnfP"/>
- <!-- DTP -->
+ <!-- DTP 1.9 -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBGKBZI_FcRd"/>
- <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkp9kfkUGJsrNYJ73"/>
+ <!-- should be newer M6 versions
+ :%s/<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkp9kfkUGJsrNYJ73"\/> /<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou"\/> /g
+ -->
+ <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7FCcNBHFCQGgERLX"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.0.v201010181130-4107w3121151A1A53"/>
- <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7ACcNBGLEOIeD_WM"/>
- <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6y2z-fiIax-vy-Mg9L"/>
+ <!-- next two updated in M6 -->
+ <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7BCcNBGMDPHiDYRL"/>
+ <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6y2z-fiIbw0xx-Qi9L"/>
<unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.0.v201010181130-77788dBmKDNOMgJvJ8Of7QBR"/>
<unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.9.0.v201010181130-67D0AqGBJVKbHlH1GU7QBR"/>
<unit id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.9.0.v201010181130-7F47SFC7sRbrSZope9vW"/>
@@ -119,7 +123,8 @@
<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.9.0.v201010181130-2-07w31211518181A"/>
<unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.9.0.v201010181130-542AkF79P7QCP9SDB"/>
<unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.9.0.v201010181130-546AkF78Y7R9PAX77"/>
- <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKEGXFmGfNW"/>
+ <!-- next one updated in M6 -->
+ <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKFFYHlGjPW"/>
<unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.0.v201010181130-3328s735357795A8D"/>
<unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.0.v201010181130-548dAkF79Q7RAN9UFJ"/>
<unit id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.9.0.v201010181130-542AkF77g7V9N9e77"/>
13 years, 2 months
JBoss Tools SVN: r30281 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-04 15:41:24 -0400 (Mon, 04 Apr 2011)
New Revision: 30281
Modified:
trunk/build/target-platform/jbds.target
Log:
ensure JBDS target KEEPS latest version of org.eclipse.datatools.connectivity.feature.feature.group; when building TP, finds older version
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-04-04 19:40:31 UTC (rev 30280)
+++ trunk/build/target-platform/jbds.target 2011-04-04 19:41:24 UTC (rev 30281)
@@ -16,7 +16,10 @@
<unit id="org.eclipse.datatools.enablement.sdk.feature.feature.group" version="1.9.0.v201010181130-7I9O-FE9JfxXy1iz06uC_FrlImH-"/>
<unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.9.0.v201010181130-7PA3-FEPPYupCWLDHfffcc2LJx83"/>
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBGKBZI_FcRd"/>
- <unit version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou" id="org.eclipse.datatools.connectivity.feature.feature.group"/>
+ <!-- should be 0.13.0.201103231111, not 0.11
+ :%s/<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkp9kfkUGJsrNYJ73"\/> /<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou"\/> /g
+ -->
+ <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7FCcNBHFCQGgERLX"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.0.v201010181130-4107w3121151A1A53"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7ACcNBGLEOIeD_WM"/>
13 years, 2 months
