February 2012 - jbosstools-commits

JBoss Tools SVN: r38799 - trunk/documentation/guides/JBDS_Release_Notes/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2012-02-15 20:34:49 -0500 (Wed, 15 Feb 2012) New Revision: 38799 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml Log: updated for windows 64 bit support Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml =================================================================== --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2012-02-16 01:12:01 UTC (rev 38798) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2012-02-16 01:34:49 UTC (rev 38799) @@ -8,7 +8,7 @@ <productname>JBoss Developer Studio</productname> <productnumber>5.0</productnumber> <edition>0</edition> - <pubsnumber>1</pubsnumber> + <pubsnumber>2</pubsnumber> <abstract> <para> These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here. Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml =================================================================== --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2012-02-16 01:12:01 UTC (rev 38798) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2012-02-16 01:34:49 UTC (rev 38799) @@ -44,12 +44,12 @@ </listitem> <listitem> <para> - Windows XP + Windows XP (32 and 64bit) </para> </listitem> <listitem> <para> - Windows 7 + Windows 7 (32 and 64bit) </para> </listitem> <listitem>

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38798 - in workspace/dgolovin/new-releng: features and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2012-02-15 20:12:01 -0500 (Wed, 15 Feb 2012) New Revision: 38798 Added: workspace/dgolovin/new-releng/features/ workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/ workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/.project workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/build.properties workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/feature.xml workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/pom.xml workspace/dgolovin/new-releng/features/pom.xml Modified: workspace/dgolovin/new-releng/parent/pom.xml workspace/dgolovin/new-releng/pom.xml workspace/dgolovin/new-releng/target-platform/jboss.tools.tp.product workspace/dgolovin/new-releng/target-platform/pom.xml Log: Added: workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/.project =================================================================== --- workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/.project (rev 0) +++ workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/.project 2012-02-16 01:12:01 UTC (rev 38798) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.tp.dependencies</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: workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/build.properties =================================================================== --- workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/build.properties (rev 0) +++ workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/build.properties 2012-02-16 01:12:01 UTC (rev 38798) @@ -0,0 +1 @@ +bin.includes = feature.xml Property changes on: workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/build.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/feature.xml =================================================================== --- workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/feature.xml (rev 0) +++ workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/feature.xml 2012-02-16 01:12:01 UTC (rev 38798) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.tp.dependencies" + label="Dependencies" + 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> + + <plugin + id="com.sun.syndication" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="com.ning.async-http-client" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.slf4j.api" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.netty" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Property changes on: workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/feature.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/pom.xml =================================================================== --- workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/pom.xml (rev 0) +++ workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/pom.xml 2012-02-16 01:12:01 UTC (rev 38798) @@ -0,0 +1,15 @@ +<?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>com.jboss.tools.releng</groupId> + <artifactId>features</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + <groupId>com.jboss.tools.releng.features</groupId> + <artifactId>org.jboss.tools.releng.dependencies</artifactId> + <name>org.jboss.tools.releng.dependencies feature</name> + + <packaging>eclipse-feature</packaging> +</project> Property changes on: workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: workspace/dgolovin/new-releng/features/pom.xml =================================================================== --- workspace/dgolovin/new-releng/features/pom.xml (rev 0) +++ workspace/dgolovin/new-releng/features/pom.xml 2012-02-16 01:12:01 UTC (rev 38798) @@ -0,0 +1,19 @@ +<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>com.jboss.tools.releng</groupId> + <artifactId>parent</artifactId> + <version>0.0.1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <groupId>com.jboss.tools.releng</groupId> + <artifactId>features</artifactId> + <name>Releng Features</name> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <modules> + <module>org.jboss.tools.tp.dependencies</module> + </modules> +</project> + Property changes on: workspace/dgolovin/new-releng/features/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: workspace/dgolovin/new-releng/parent/pom.xml =================================================================== --- workspace/dgolovin/new-releng/parent/pom.xml 2012-02-16 01:02:39 UTC (rev 38797) +++ workspace/dgolovin/new-releng/parent/pom.xml 2012-02-16 01:12:01 UTC (rev 38798) @@ -287,7 +287,8 @@ </repository> <repository> <id>eclipse.epp</id> - <url>http://build.eclipse.org/technology/epp/epp_repo/indigo/epp.build/buildre...</url> + <url>http://build.eclipse.org/technology/epp/epp_build/indigo/download/2012021...</url> +  <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -320,7 +321,7 @@ </repository> <repository> <id>eclipse.wtp</id> - <url>http://download.eclipse.org/webtools/downloads/drops/R3.3.2/M-3.3.2-20120...</url> + <url>http://download.eclipse.org/webtools/downloads/drops/R3.3.2/M-3.3.2-20120...</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -353,7 +354,7 @@ </repository> <repository> <id>eclipse.m2e-wtp</id> - <url>http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S...</url> + <url>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2ecl...</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -362,5 +363,16 @@ <enabled>true</enabled> </releases> </repository> + <repository> + <id>eclipse.m2e-extra</id> + <url>http://repository.sonatype.org/content/repositories/forge-sites/m2e-extra...</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> </repositories> </project> Modified: workspace/dgolovin/new-releng/pom.xml =================================================================== --- workspace/dgolovin/new-releng/pom.xml 2012-02-16 01:02:39 UTC (rev 38797) +++ workspace/dgolovin/new-releng/pom.xml 2012-02-16 01:12:01 UTC (rev 38798) @@ -8,6 +8,7 @@ <version>0.0.1</version> <packaging>pom</packaging> <modules> + <module>features</module> <module>target-platform</module> </modules> </project> Modified: workspace/dgolovin/new-releng/target-platform/jboss.tools.tp.product =================================================================== --- workspace/dgolovin/new-releng/target-platform/jboss.tools.tp.product 2012-02-16 01:02:39 UTC (rev 38797) +++ workspace/dgolovin/new-releng/target-platform/jboss.tools.tp.product 2012-02-16 01:12:01 UTC (rev 38798) @@ -96,6 +96,23 @@ <feature id="org.eclipse.birt.source"/> <feature id="org.eclipse.birt.integration.wtp"/> <feature id="org.eclipse.birt.integration.wtp.source"/> + <feature id="org.eclipse.mylyn.sdk_feature"/> + <feature id="org.eclipse.mylyn_feature"/> + <feature id="org.eclipse.datatools.enablement.sdk.feature" /> + <feature id="org.eclipse.datatools.sdk.feature" /> + <feature id="org.eclipse.rse" /> + <feature id="org.eclipse.mylyn.commons" /> + <feature id="org.eclipse.mylyn.sdk_feature" /> + <feature id="org.eclipse.graphiti.sdk.plus.feature" /> + <feature id="org.eclipse.emf.transaction.sdk" /> + <feature id="org.eclipse.emf.validation.sdk" /> + <feature id="org.eclipse.epp.usagedata.feature" /> + <feature id="org.eclipse.ocl.core.sdk" /> + <feature id="org.eclipse.ocl.all.sdk" /> + <feature id="org.eclipse.uml2.sdk" /> + <feature id="org.jboss.tools.tp.dependencies" /> + <feature id="org.eclipse.jgit" /> + <feature id="org.eclipse.egit" /> </features> Modified: workspace/dgolovin/new-releng/target-platform/pom.xml =================================================================== --- workspace/dgolovin/new-releng/target-platform/pom.xml 2012-02-16 01:02:39 UTC (rev 38797) +++ workspace/dgolovin/new-releng/target-platform/pom.xml 2012-02-16 01:12:01 UTC (rev 38798) @@ -19,6 +19,7 @@ <version>${tychoVersion}</version> <configuration> <publishArtifacts>true</publishArtifacts> + </configuration> </plugin> <plugin>

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38797 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-02-15 20:02:39 -0500 (Wed, 15 Feb 2012) New Revision: 38797 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java Log: JBIDE-10921 https://issues.jboss.org/browse/JBIDE-10921 Synchronization in XMarkerManager is fixed. Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java 2012-02-16 00:37:14 UTC (rev 38796) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java 2012-02-16 01:02:39 UTC (rev 38797) @@ -185,16 +185,22 @@ } catch (CoreException e) { ModelPlugin.getPluginLog().logError(e); } - Set<XModelObject> os = errorObjects.get(file); - if(os == null) { - os = new HashSet<XModelObject>(); - errorObjects.put(file, os); + Set<XModelObject> os; + + synchronized (this) { + os = errorObjects.get(file); + if(os == null) { + os = new HashSet<XModelObject>(); + errorObjects.put(file, os); + } } reload(ms, os, IMarker.SEVERITY_ERROR); - os = warningObjects.get(file); - if(os == null) { - os = new HashSet<XModelObject>(); - warningObjects.put(file, os); + synchronized (this) { + os = warningObjects.get(file); + if(os == null) { + os = new HashSet<XModelObject>(); + warningObjects.put(file, os); + } } reload(ms, os, IMarker.SEVERITY_WARNING); } @@ -216,37 +222,49 @@ ((XModelObjectImpl)o).addErrorAttributeDirty(attr); } } - synchronized(objects) { - Iterator<XModelObject> it = objects.iterator(); - while(it.hasNext()) { - XModelObject o = it.next(); - if(!es.contains(o)) { - if(o.getErrorState() == severity) { - o.setErrorState(0); - } - it.remove(); - } else if(es.contains(o)) { - if(severity > o.getErrorState()) { - o.setErrorState(severity); - } else { - ((XModelObjectImpl)o).commitErrorAttributes(); - } - es.remove(o); + Set<XModelObject> copy = new HashSet<XModelObject>(); + Set<XModelObject> toRemove = new HashSet<XModelObject>(); + Set<XModelObject> toAdd = new HashSet<XModelObject>(); + + synchronized(this) { + copy.addAll(objects); + } + + Iterator<XModelObject> it = copy.iterator(); + while(it.hasNext()) { + XModelObject o = it.next(); + if(!es.contains(o)) { + if(o.getErrorState() == severity) { + o.setErrorState(0); } - } - it = es.iterator(); - while(it.hasNext()) { - XModelObject o = (XModelObject)it.next(); + toRemove.add(o); + } else if(es.contains(o)) { if(severity > o.getErrorState()) { o.setErrorState(severity); } else { ((XModelObjectImpl)o).commitErrorAttributes(); - } - if(!objects.contains(o)) { - objects.add(o); } + es.remove(o); } } + it = es.iterator(); + while(it.hasNext()) { + XModelObject o = (XModelObject)it.next(); + if(severity > o.getErrorState()) { + o.setErrorState(severity); + } else { + ((XModelObjectImpl)o).commitErrorAttributes(); + } + if(!objects.contains(o)) { + toAdd.add(o); + } + } + + synchronized(this) { + objects.removeAll(toRemove); + objects.addAll(toAdd); + } + } void update(XModelObject object) {

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38796 - trunk/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-02-15 19:37:14 -0500 (Wed, 15 Feb 2012) New Revision: 38796 Modified: trunk/build/publish.sh Log: JBIDE-10923 add support for Tycho 0.14 convention of repository.zip (as well as old site_assembly.zip) Modified: trunk/build/publish.sh =================================================================== --- trunk/build/publish.sh 2012-02-16 00:37:05 UTC (rev 38795) +++ trunk/build/publish.sh 2012-02-16 00:37:14 UTC (rev 38796) @@ -43,14 +43,26 @@ # check for aggregate zip or overall zip z="" -if [[ -d ${WORKSPACE}/sources/aggregate/site/target ]]; then - siteZip=${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip +if [[ -d ${WORKSPACE}/sources/aggregate/site/target ]]; then + if [[ -f ${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip ]]; then + siteZip=${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip + else + siteZip=${WORKSPACE}/sources/aggregate/site/target/repository.zip + fi z=$siteZip -elif [[ -d ${WORKSPACE}/sources/aggregate/site/site/target ]]; then - siteZip=${WORKSPACE}/sources/aggregate/site/site/target/site_assembly.zip +elif [[ -d ${WORKSPACE}/sources/aggregate/site/site/target ]]; then + if [[ -f ${WORKSPACE}/sources/aggregate/site/site/target/site_assembly.zip ]]; then + siteZip=${WORKSPACE}/sources/aggregate/site/site/target/site_assembly.zip + else + siteZip=${WORKSPACE}/sources/aggregate/site/site/target/repository.zip + fi z=$siteZip -elif [[ -d ${WORKSPACE}/sources/site/target ]]; then - siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip +elif [[ -d ${WORKSPACE}/sources/site/target ]]; then + if [[ -f ${WORKSPACE}/sources/site/target/site_assembly.zip ]]; then + siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip + else + siteZip=${WORKSPACE}/sources/site/target/repository.zip + fi z=$siteZip fi @@ -109,8 +121,8 @@ fi z="" -# if component zips exist, copy site_assembly.zip too -for z in $(find ${WORKSPACE}/sources/*/site/target -type f -name "site_assembly.zip"); do +# if component zips exist, copy repository.zip (or site_assembly.zip) too +for z in $(find ${WORKSPACE}/sources/*/site/target -type f -name "repository.zip" -o -name "site_assembly.zip"); do y=${z%%/site/target/*}; y=${y##*/} if [[ $y != "aggregate" ]]; then # prevent duplicate nested sites #echo "[$y] $z ..." @@ -194,7 +206,7 @@ fi # JBIDE-9870 check if there's a sources update site and rename it if found (note, bottests-site/site/sources won't work; use bottests-site/souces) -for z in $(find ${WORKSPACE}/sources/aggregate/*/sources/target/ -name "site_assembly.zip"); do +for z in $(find ${WORKSPACE}/sources/aggregate/*/sources/target/ -name "repository.zip" -o -name "site_assembly.zip"); do echo "Collect sources from update site in $z" mv $z ${STAGINGDIR}/all/${SRCSNAME/-Sources-/-Update-Sources-} for m in $(md5sum ${z}); do if [[ $m != ${z} ]]; then echo $m > ${z}.MD5; fi; done

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38795 - trunk/build/parent.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-02-15 19:37:05 -0500 (Wed, 15 Feb 2012) New Revision: 38795 Added: trunk/build/parent/update-site-build-DEPRECATED.xml Removed: trunk/build/parent/update-site-build.xml Log: deprecate orphaned script update-site-build.xml Copied: trunk/build/parent/update-site-build-DEPRECATED.xml (from rev 38793, trunk/build/parent/update-site-build.xml) =================================================================== --- trunk/build/parent/update-site-build-DEPRECATED.xml (rev 0) +++ trunk/build/parent/update-site-build-DEPRECATED.xml 2012-02-16 00:37:05 UTC (rev 38795) @@ -0,0 +1,111 @@ +<project default="custom.build" name="site build.xml"> +  + +  + + <taskdef resource="net/sf/antcontrib/antlib.xml" /> + <dirname property="componentPath" file="${basedir}" /> + <basename property="componentName" file="${componentPath}" /> + + <target name="custom.build" description="generate list of jars in the site to aid in versioning downstream"> + <if> + <available file="${basedir}/target/site" type="dir" /> + <then> + <var name="all.features" value="" /> + <var name="all.plugins" value="" /> + <var name="all.feature.jars" value="" /> + <var name="all.plugin.jars" value="" /> + +  + <if> + <not> + <isset property="JOB_NAME" /> + </not> + <then> + <var name="JOB_NAME" value="${componentName}" /> + </then> + </if> + + <if> + <not> + <isset property="BUILD_NUMBER" /> + </not> + <then> + <var name="BUILD_NUMBER" value="000" /> + </then> + </if> + + <if> + <not> + <isset property="BUILD_ID" /> + </not> + <then> + <tstamp> +  + <format property="BUILD_ID" pattern="yyyy-MM-dd_hh-mm-ss" /> + </tstamp> + </then> + </if> + +  + <for keepgoing="true" param="jarName"> + <path> + <fileset dir="${basedir}/target/site" includes="*/*.jar" /> + </path> + <sequential> + <propertyregex property="jarNameProp" defaultvalue="@{jarName}" input="@{jarName}" + regexp=".+/(plugins|features)/(.+)_([^_]+).jar" + replace="${JOB_NAME}[${BUILD_ID}][H${BUILD_NUMBER}][\1][\2]" casesensitive="true" override="true" /> + <propertyregex property="jarNameRelPath" defaultvalue="@{jarName}" input="@{jarName}" regexp="${basedir}/target/site/(features|plugins)/" replace="" casesensitive="true" override="true" /> + <propertyregex property="jarNameName" defaultvalue="${jarNameRelPath}" input="${jarNameRelPath}" regexp="(.+)_([0-9]+\.[0-9]+\.[0-9]+\.[^_]*).jar" replace="\1" casesensitive="true" override="true" /> + <property value="${jarNameRelPath}" name="${jarNameProp}" /> + <if> + <contains string="${jarNameProp}" substring="[features]" /> + <then> + <var name="all.features" value="${all.features}, ${jarNameName}" /> + <var name="all.feature.jars" value="${all.feature.jars}, ${jarNameRelPath}" /> + </then> + <elseif> + <contains string="${jarNameProp}" substring="[plugins]" /> + <then> + <var name="all.plugins" value="${all.plugins}, ${jarNameName}" /> + <var name="all.plugin.jars" value="${all.plugin.jars}, ${jarNameRelPath}" /> + </then> + </elseif> + </if> + <var name="jarNameProp" unset="true" /> + </sequential> + </for> + +  + <propertyregex property="all.${componentName}.features" defaultvalue="${all.features}" input="${all.features}" regexp=", (.+)" replace="\1" casesensitive="true" override="true" /> + <propertyregex property="all.${componentName}.plugins" defaultvalue="${all.plugins}" input="${all.plugins}" regexp=", (.+)" replace="\1" casesensitive="true" override="true" /> + <var unset="true" name="all.features" /> + <var unset="true" name="all.plugins" /> + <propertyregex property="all.${componentName}.feature.jars" defaultvalue="${all.feature.jars}" input="${all.feature.jars}" regexp=", (.+)" replace="\1" casesensitive="true" override="true" /> + <propertyregex property="all.${componentName}.plugin.jars" defaultvalue="${all.plugin.jars}" input="${all.plugin.jars}" regexp=", (.+)" replace="\1" casesensitive="true" override="true" /> + <var unset="true" name="all.feature.jars" /> + <var unset="true" name="all.plugin.jars" /> + <var name="${componentName}.JOB_NAME" value="${JOB_NAME}" /> + <var name="${componentName}.BUILD_ID" value="${BUILD_ID}" /> + <var name="${componentName}.BUILD_NUMBER" value="${BUILD_NUMBER}" /> + +  + <echoproperties format="xml" destfile="${basedir}/target/site/jarlist.xml"> + <propertyset> + <propertyref regex="${JOB_NAME}\[${BUILD_ID}\]\[H${BUILD_NUMBER}\]|${componentName}.JOB_NAME|${componentName}.BUILD_ID|${componentName}.BUILD_NUMBER|all.${componentName}.feature|all.${componentName}.plugin" /> + </propertyset> + </echoproperties> + +  + <zip destfile="${basedir}/target/site_assembly.zip" update="true" basedir="${basedir}/target/site" includes="jarlist.xml" /> + </then> + </if> + </target> +</project> Deleted: trunk/build/parent/update-site-build.xml =================================================================== --- trunk/build/parent/update-site-build.xml 2012-02-16 00:14:51 UTC (rev 38794) +++ trunk/build/parent/update-site-build.xml 2012-02-16 00:37:05 UTC (rev 38795) @@ -1,110 +0,0 @@ -<project default="custom.build" name="site build.xml"> - -  - - <taskdef resource="net/sf/antcontrib/antlib.xml" /> - <dirname property="componentPath" file="${basedir}" /> - <basename property="componentName" file="${componentPath}" /> - - <target name="custom.build" description="generate list of jars in the site to aid in versioning downstream"> - <if> - <available file="${basedir}/target/site" type="dir" /> - <then> - <var name="all.features" value="" /> - <var name="all.plugins" value="" /> - <var name="all.feature.jars" value="" /> - <var name="all.plugin.jars" value="" /> - -  - <if> - <not> - <isset property="JOB_NAME" /> - </not> - <then> - <var name="JOB_NAME" value="${componentName}" /> - </then> - </if> - - <if> - <not> - <isset property="BUILD_NUMBER" /> - </not> - <then> - <var name="BUILD_NUMBER" value="000" /> - </then> - </if> - - <if> - <not> - <isset property="BUILD_ID" /> - </not> - <then> - <tstamp> -  - <format property="BUILD_ID" pattern="yyyy-MM-dd_hh-mm-ss" /> - </tstamp> - </then> - </if> - -  - <for keepgoing="true" param="jarName"> - <path> - <fileset dir="${basedir}/target/site" includes="*/*.jar" /> - </path> - <sequential> - <propertyregex property="jarNameProp" defaultvalue="@{jarName}" input="@{jarName}" - regexp=".+/(plugins|features)/(.+)_([^_]+).jar" - replace="${JOB_NAME}[${BUILD_ID}][H${BUILD_NUMBER}][\1][\2]" casesensitive="true" override="true" /> - <propertyregex property="jarNameRelPath" defaultvalue="@{jarName}" input="@{jarName}" regexp="${basedir}/target/site/(features|plugins)/" replace="" casesensitive="true" override="true" /> - <propertyregex property="jarNameName" defaultvalue="${jarNameRelPath}" input="${jarNameRelPath}" regexp="(.+)_([0-9]+\.[0-9]+\.[0-9]+\.[^_]*).jar" replace="\1" casesensitive="true" override="true" /> - <property value="${jarNameRelPath}" name="${jarNameProp}" /> - <if> - <contains string="${jarNameProp}" substring="[features]" /> - <then> - <var name="all.features" value="${all.features}, ${jarNameName}" /> - <var name="all.feature.jars" value="${all.feature.jars}, ${jarNameRelPath}" /> - </then> - <elseif> - <contains string="${jarNameProp}" substring="[plugins]" /> - <then> - <var name="all.plugins" value="${all.plugins}, ${jarNameName}" /> - <var name="all.plugin.jars" value="${all.plugin.jars}, ${jarNameRelPath}" /> - </then> - </elseif> - </if> - <var name="jarNameProp" unset="true" /> - </sequential> - </for> - -  - <propertyregex property="all.${componentName}.features" defaultvalue="${all.features}" input="${all.features}" regexp=", (.+)" replace="\1" casesensitive="true" override="true" /> - <propertyregex property="all.${componentName}.plugins" defaultvalue="${all.plugins}" input="${all.plugins}" regexp=", (.+)" replace="\1" casesensitive="true" override="true" /> - <var unset="true" name="all.features" /> - <var unset="true" name="all.plugins" /> - <propertyregex property="all.${componentName}.feature.jars" defaultvalue="${all.feature.jars}" input="${all.feature.jars}" regexp=", (.+)" replace="\1" casesensitive="true" override="true" /> - <propertyregex property="all.${componentName}.plugin.jars" defaultvalue="${all.plugin.jars}" input="${all.plugin.jars}" regexp=", (.+)" replace="\1" casesensitive="true" override="true" /> - <var unset="true" name="all.feature.jars" /> - <var unset="true" name="all.plugin.jars" /> - <var name="${componentName}.JOB_NAME" value="${JOB_NAME}" /> - <var name="${componentName}.BUILD_ID" value="${BUILD_ID}" /> - <var name="${componentName}.BUILD_NUMBER" value="${BUILD_NUMBER}" /> - -  - <echoproperties format="xml" destfile="${basedir}/target/site/jarlist.xml"> - <propertyset> - <propertyref regex="${JOB_NAME}\[${BUILD_ID}\]\[H${BUILD_NUMBER}\]|${componentName}.JOB_NAME|${componentName}.BUILD_ID|${componentName}.BUILD_NUMBER|all.${componentName}.feature|all.${componentName}.plugin" /> - </propertyset> - </echoproperties> - -  - <zip destfile="${basedir}/target/site_assembly.zip" update="true" basedir="${basedir}/target/site" includes="jarlist.xml" /> - </then> - </if> - </target> -</project>

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38794 - workspace/Denny/esb-example-soa-p5.0.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2012-02-15 19:14:51 -0500 (Wed, 15 Feb 2012) New Revision: 38794 Modified: workspace/Denny/esb-example-soa-p5.0/transform_CSV2XML_all.zip Log: JBDS-2011 ESB 5 example: transform_CSV2XML fails - "EL Validator cannot run on project a because Validation Builder precedes JBoss Knowledge Base Builder" Modified: workspace/Denny/esb-example-soa-p5.0/transform_CSV2XML_all.zip =================================================================== (Binary files differ)

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38793 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2012-02-15 19:01:23 -0500 (Wed, 15 Feb 2012) New Revision: 38793 Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java Log: JBIDE-10264 Wizard-ify the project examples Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java 2012-02-15 23:26:41 UTC (rev 38792) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java 2012-02-16 00:01:23 UTC (rev 38793) @@ -106,6 +106,10 @@ // FIXME } for (IProjectExamplesWizardPage contributedPage:contributedPages) { + String type = projectExample.getImportType(); + if (type == null || !type.equals(contributedPage.getProjectExampleType())) { + continue; + } if (!contributedPage.finishPage()) { return false; }

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38792 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2012-02-15 18:26:41 -0500 (Wed, 15 Feb 2012) New Revision: 38792 Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java Log: JBIDE-10691 the "requirements" part of project examples should not 'disappear' when they are fullfilled Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java 2012-02-15 23:25:45 UTC (rev 38791) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java 2012-02-15 23:26:41 UTC (rev 38792) @@ -316,7 +316,8 @@ Object object = selection.getFirstElement(); if (object instanceof ProjectFix) { ProjectFix fix = (ProjectFix) object; - if (!unsatisfiedFixes.contains(fix)) { + if (!unsatisfiedFixes.contains(fix) && !(ProjectFix.WTP_RUNTIME.equals(fix.getType()) + || ProjectFix.SEAM_RUNTIME.equals(fix.getType()))) { return; } if (ProjectFix.WTP_RUNTIME.equals(fix.getType())

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38791 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-02-15 18:25:45 -0500 (Wed, 15 Feb 2012) New Revision: 38791 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java Log: [JBIDE-10914] disabling the whole application configuration widgets again if you check *use existing* since this issue turned out to be invalid Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-15 23:15:44 UTC (rev 38790) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-15 23:25:45 UTC (rev 38791) @@ -68,6 +68,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; @@ -79,6 +80,7 @@ import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils; +import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils.IWidgetVisitor; import org.jboss.tools.openshift.express.internal.ui.wizard.CreationLogDialog.LogEntry; import com.openshift.express.client.Cartridge; @@ -364,10 +366,13 @@ existingAppNameText.setEnabled(useExisting); browseAppsButton.setEnabled(useExisting); - newAppNameLabel.setEnabled(!useExisting); - newAppNameText.setEnabled(!useExisting); - newAppTypeLabel.setEnabled(!useExisting); - newAppCartridgeCombo.setEnabled(!useExisting); + UIUtils.doForAllChildren(new IWidgetVisitor() { + + @Override + public void visit(Control control) { + control.setEnabled(!useExisting); + } + }, newAppConfigurationGroup); } private void fillCartridgesCombo(DataBindingContext dbc, Combo cartridgesCombo) {

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38790 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-02-15 18:15:44 -0500 (Wed, 15 Feb 2012) New Revision: 38790 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java Log: [JBIDE-10901] setting widget values to imported application Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-15 23:07:40 UTC (rev 38789) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-15 23:15:44 UTC (rev 38790) @@ -155,6 +155,7 @@ public void loadCartridges() throws OpenShiftException { setCartridges(getUser().getCartridges()); + refreshSelectedCartridge(); } public void setCartridges(List<ICartridge> cartridges) { @@ -169,6 +170,15 @@ return wizardModel.getApplicationCartridge(); } + /** + * forces property change listeners to update their value + */ + protected void refreshSelectedCartridge() { + ICartridge selectedCartridge = getSelectedCartridge(); + setSelectedCartridge((ICartridge) null); + setSelectedCartridge(selectedCartridge); + } + public void setSelectedCartridge(ICartridge cartridge) { firePropertyChange(PROPERTY_SELECTED_CARTRIDGE , wizardModel.getApplicationCartridge() Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java 2012-02-15 23:07:40 UTC (rev 38789) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java 2012-02-15 23:15:44 UTC (rev 38790) @@ -184,7 +184,7 @@ public IServerType getServerType(); - public void setServerType(IServerType serverType); + public IServerType setServerType(IServerType serverType); public boolean isUseExistingApplication(); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-02-15 23:07:40 UTC (rev 38789) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-02-15 23:15:44 UTC (rev 38790) @@ -311,8 +311,8 @@ } @Override - public void setServerType(IServerType serverType) { - setProperty(SERVER_TYPE, serverType); + public IServerType setServerType(IServerType serverType) { + return (IServerType) setProperty(SERVER_TYPE, serverType); } private void setPublicationMode(String mode) { @@ -326,7 +326,8 @@ @Override public boolean setUseExistingApplication(boolean useExistingApplication) { - return (Boolean) setProperty(USE_EXISTING_APPLICATION, useExistingApplication); + Boolean isUseExistingApplication = (Boolean) setProperty(USE_EXISTING_APPLICATION, useExistingApplication); + return isUseExistingApplication != null && isUseExistingApplication; } protected void setUseExistingApplication(IApplication application) { @@ -363,7 +364,7 @@ public Set<IEmbeddableCartridge> getSelectedEmbeddableCartridges() { @SuppressWarnings("unchecked") Set<IEmbeddableCartridge> selectedEmbeddableCartridges = - (Set<IEmbeddableCartridge>) dataModel.get(KEY_SELECTED_EMBEDDABLE_CARTRIDGES); + (Set<IEmbeddableCartridge>) getProperty(KEY_SELECTED_EMBEDDABLE_CARTRIDGES); if (selectedEmbeddableCartridges == null) { selectedEmbeddableCartridges = new HashSet<IEmbeddableCartridge>(); setSelectedEmbeddableCartridges(selectedEmbeddableCartridges); @@ -371,16 +372,16 @@ return selectedEmbeddableCartridges; } + @SuppressWarnings("unchecked") @Override public Set<IEmbeddableCartridge> setSelectedEmbeddableCartridges( Set<IEmbeddableCartridge> selectedEmbeddableCartridges) { - dataModel.put(KEY_SELECTED_EMBEDDABLE_CARTRIDGES, selectedEmbeddableCartridges); - return selectedEmbeddableCartridges; + return (Set<IEmbeddableCartridge>) setProperty(KEY_SELECTED_EMBEDDABLE_CARTRIDGES, selectedEmbeddableCartridges); } @Override public ICartridge setApplicationCartridge(ICartridge cartridge) { - return (ICartridge) dataModel.put(APPLICATION_CARTRIDGE, cartridge); + return (ICartridge) setProperty(APPLICATION_CARTRIDGE, cartridge); } protected void setApplicationCartridge(IApplication application) { @@ -392,13 +393,12 @@ @Override public ICartridge getApplicationCartridge() { - return (ICartridge) dataModel.get(APPLICATION_CARTRIDGE); + return (ICartridge) getProperty(APPLICATION_CARTRIDGE); } @Override public String setApplicationName(String applicationName) { - firePropertyChange(APPLICATION_NAME, getApplicationName(), dataModel.put(APPLICATION_NAME, applicationName)); - return applicationName; + return (String) setProperty(APPLICATION_NAME, applicationName); } protected void setApplicationName(IApplication application) { @@ -410,18 +410,17 @@ @Override public String getApplicationName() { - return (String) dataModel.get(APPLICATION_NAME); + return (String) getProperty(APPLICATION_NAME); } @Override public IUser getUser() { - return (IUser) dataModel.get(USER); + return (IUser) getProperty(USER); } @Override public IUser setUser(IUser user) { - dataModel.put(USER, user); - return user; + return (IUser) setProperty(USER, user); } @Override

12 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits February 2012