May 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r41132 - in trunk/documentation: guides/GettingStartedGuide/en-US and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2012-05-17 18:54:35 -0400 (Thu, 17 May 2012) New Revision: 41132 Modified: trunk/documentation/guides/Beginners_Guide/en-US/Book_Info.xml trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml trunk/documentation/guides/GettingStartedGuide/en-US/usage_reporting.xml trunk/documentation/jboss-tools-docs/all-guides.xml trunk/documentation/jboss-tools-docs/index/en-US/master.xml trunk/documentation/jboss-tools-docs/pom.xml Log: updated to remove exadel migration guide from being published as it seems to have been moved and, really, it isn't necessary any more Modified: trunk/documentation/guides/Beginners_Guide/en-US/Book_Info.xml =================================================================== --- trunk/documentation/guides/Beginners_Guide/en-US/Book_Info.xml 2012-05-17 22:19:22 UTC (rev 41131) +++ trunk/documentation/guides/Beginners_Guide/en-US/Book_Info.xml 2012-05-17 22:54:35 UTC (rev 41132) @@ -9,7 +9,7 @@ <productname>JBoss Developer Studio</productname> - <productnumber>5.0</productnumber> + <productnumber>5.0.Beta</productnumber> <edition>5.0.0</edition> Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-05-17 22:19:22 UTC (rev 41131) +++ trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-05-17 22:54:35 UTC (rev 41132) @@ -8,7 +8,7 @@ <productname>JBoss Developer Studio</productname> <productnumber>5.0</productnumber> <edition>5.0.0</edition> -<pubsnumber>15</pubsnumber> +<pubsnumber>16</pubsnumber> <abstract> <para>The Getting Started Guide explains the JBoss Developer Studio.</para> </abstract> Modified: trunk/documentation/guides/GettingStartedGuide/en-US/usage_reporting.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/usage_reporting.xml 2012-05-17 22:19:22 UTC (rev 41131) +++ trunk/documentation/guides/GettingStartedGuide/en-US/usage_reporting.xml 2012-05-17 22:54:35 UTC (rev 41132) @@ -151,6 +151,14 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term>JBoss Central Enabled</term> + <listitem> + <para> + The <guilabel>JBoss Central Enabled</guilabel> field reports whether JBoss Central is set to be seen upon startup or not. Returned value is either true or false. + </para> + </listitem> + </varlistentry> </variablelist> </section> </section> Modified: trunk/documentation/jboss-tools-docs/all-guides.xml =================================================================== --- trunk/documentation/jboss-tools-docs/all-guides.xml 2012-05-17 22:19:22 UTC (rev 41131) +++ trunk/documentation/jboss-tools-docs/all-guides.xml 2012-05-17 22:54:35 UTC (rev 41132) @@ -6,7 +6,7 @@ <format>dir</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> +    <indexentry> <primaryie>Hibernate Tools Reference Guide Modified: trunk/documentation/jboss-tools-docs/pom.xml =================================================================== --- trunk/documentation/jboss-tools-docs/pom.xml 2012-05-17 22:19:22 UTC (rev 41131) +++ trunk/documentation/jboss-tools-docs/pom.xml 2012-05-17 22:54:35 UTC (rev 41132) @@ -11,7 +11,7 @@ <name>All_Userguides</name> <modules> - <module>../guides/Exadel-migration</module> +  <module>../guides/GettingStartedGuide</module> <module>../guides/Beginners_Guide</module> <module>../../cdi/docs/reference</module>

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41131 - trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooling/3.3.0.Nightly.

by jbosstools-commits＠lists.jboss.org

Author: dpalmer Date: 2012-05-17 18:19:22 -0400 (Thu, 17 May 2012) New Revision: 41131 Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... Log: Updated jenkins job names Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... =================================================================== --- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-05-17 22:15:46 UTC (rev 41130) +++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-05-17 22:19:22 UTC (rev 41131) @@ -13,14 +13,14 @@  -<child location='../../../../staging/soatools-3.3.0.Nightly.component--bpel/all/repo/'/> -<child location='../../../../staging/soatools-3.3.0.Nightly.component--droolsjbpm/all/repo/'/> -<child location='../../../../staging/soatools-3.3.0.Nightly.component--esb/all/repo/'/> -<child location='../../../../staging/soatools-3.3.0.Nightly.component--flow/all/repo/'/> -<child location='../../../../staging/soatools-3.3.0.Nightly.component--jbpm/all/repo/'/> -<child location='../../../../staging/soatools-3.3.0.Nightly.component--modeshape/all/repo/'/> -<child location='../../../../staging/soatools-3.3.0.Nightly.component--runtime-soa/all/repo/'/> -<child location='../../../../staging/soatools-3.3.0.Nightly.component--teiid-designer/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--bpel/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--droolsjbpm/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--esb/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--flow/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--jbpm/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--modeshape/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--runtime-soa/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--teiid-designer/all/repo/'/> <child location='http://download.jboss.org/savara/releases/updates/2.0.x/' /> <child location='../../../../staging/SwitchYard-Tools/eclipse/'/> Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... =================================================================== --- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-05-17 22:15:46 UTC (rev 41130) +++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-05-17 22:19:22 UTC (rev 41131) @@ -13,14 +13,14 @@  -<child location='../../../../staging/soatools-3.3.0.Nightly.component--bpel/all/repo/'/> -<child location='../../../../staging/soatools-3.3.0.Nightly.component--droolsjbpm/all/repo/'/> -<child location='../../../../staging/soatools-3.3.0.Nightly.component--esb/all/repo/'/> -<child location='../../../../staging/soatools-3.3.0.Nightly.component--flow/all/repo/'/> -<child location='../../../../staging/soatools-3.3.0.Nightly.component--jbpm/all/repo/'/> -<child location='../../../../staging/soatools-3.3.0.Nightly.component--modeshape/all/repo/'/> -<child location='../../../../staging/soatools-3.3.0.Nightly.component--runtime-soa/all/repo/'/> -<child location='../../../../staging/soatools-3.3.0.Nightly.component--teiid-designer/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--bpel/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--droolsjbpm/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--esb/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--flow/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--jbpm/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--modeshape/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--runtime-soa/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Nightly.component--teiid-designer/all/repo/'/> <child location='http://download.jboss.org/savara/releases/updates/2.0.x/' /> <child location='../../../../staging/SwitchYard-Tools/eclipse/'/>

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41130 - trunk/build/aggregate.

by jbosstools-commits＠lists.jboss.org

Author: dpalmer Date: 2012-05-17 18:15:46 -0400 (Thu, 17 May 2012) New Revision: 41130 Modified: trunk/build/aggregate/build.xml Log: [JBIDE-11720] Adjusted regex to match the soatools job names as well as the jbosstools names Modified: trunk/build/aggregate/build.xml =================================================================== --- trunk/build/aggregate/build.xml 2012-05-17 21:30:20 UTC (rev 41129) +++ trunk/build/aggregate/build.xml 2012-05-17 22:15:46 UTC (rev 41130) @@ -525,10 +525,10 @@ <isset property="BUILD_ALIAS" /> </and> <then> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\3" /> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9.]+)(_.*?\.)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\4" /> </then> <else> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": \1.${BUILD_TS}-H${BUILD_NUMBER}\2\3" /> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9.]+)(.*).aggregate" replace=": \2.${BUILD_TS}-H${BUILD_NUMBER}\3" /> </else> </if> </then>

12 years, 8 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2012-05-17 17:30:20 -0400 (Thu, 17 May 2012) New Revision: 41129 Modified: trunk/build/parent/pom.xml Log: added https://repository.jboss.org/nexus/content/repositories/releases/ to fix nightly build failures in org.jboss.tools.vpe.ui.bot.test which cannot download richfaces artifacts Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2012-05-17 21:18:15 UTC (rev 41128) +++ trunk/build/parent/pom.xml 2012-05-17 21:30:20 UTC (rev 41129) @@ -872,6 +872,17 @@ </profile> </profiles> + <repositories> + <repository> + <id>jboss-releases</id> + <name>JBoss Releases Maven Repository</name> + <url>https://repository.jboss.org/nexus/content/repositories/releases/</url> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> +  <pluginRepositories> <pluginRepository>

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41128 - trunk/requirements/soap.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-05-17 17:18:15 -0400 (Thu, 17 May 2012) New Revision: 41128 Modified: trunk/requirements/soap/build.properties Log: fix again - File '/qa/hudson_ws/workspace/soatools-3.3.0.Nightly.component--esb/sources/tests/org.jboss.tools.esb.ui.bot.test/../../../requirements/target/jboss-soa-p-5.3/jboss-soa-p-5/jboss-as' does not exist Modified: trunk/requirements/soap/build.properties =================================================================== --- trunk/requirements/soap/build.properties 2012-05-17 21:15:01 UTC (rev 41127) +++ trunk/requirements/soap/build.properties 2012-05-17 21:18:15 UTC (rev 41128) @@ -40,5 +40,5 @@ soap53.build.name=soa-p-5.3.0.ER2 soap53.build.archive=${soap53.build.name}.zip soap53.build.archive.md5=1f70c15b26a0d812ba2a39a96c6a8c57 -soap53.build.archive.root=jboss-soa-p.5.3 +soap53.build.archive.root=jboss-soa-p-5.3

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41127 - trunk/requirements/soap.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-05-17 17:15:01 -0400 (Thu, 17 May 2012) New Revision: 41127 Modified: trunk/requirements/soap/build.properties Log: use jboss-soa-p.5.3 instead of jboss-soa-p-5 Modified: trunk/requirements/soap/build.properties =================================================================== --- trunk/requirements/soap/build.properties 2012-05-17 21:10:39 UTC (rev 41126) +++ trunk/requirements/soap/build.properties 2012-05-17 21:15:01 UTC (rev 41127) @@ -40,5 +40,5 @@ soap53.build.name=soa-p-5.3.0.ER2 soap53.build.archive=${soap53.build.name}.zip soap53.build.archive.md5=1f70c15b26a0d812ba2a39a96c6a8c57 -soap53.build.archive.root=jboss-soa-p-5 +soap53.build.archive.root=jboss-soa-p.5.3

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41126 - trunk/requirements/soap.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-05-17 17:10:39 -0400 (Thu, 17 May 2012) New Revision: 41126 Modified: trunk/requirements/soap/buildRequirement.xml Log: pass correct variables through to generic/build.xml so that things are checked out into the correct folders Modified: trunk/requirements/soap/buildRequirement.xml =================================================================== --- trunk/requirements/soap/buildRequirement.xml 2012-05-17 21:10:33 UTC (rev 41125) +++ trunk/requirements/soap/buildRequirement.xml 2012-05-17 21:10:39 UTC (rev 41126) @@ -1,7 +1,7 @@ <project default="build.requirement"> <property file="build.properties"/> - + <target name="build.soap"> <ant antfile="../generic/build.xml" target="build.driver" inheritall="true"> <property name="driver.properties" value="${basedir}/build.properties"/> @@ -11,37 +11,42 @@ </ant> </target> - <target name="build.requirement"> <antcall target="build.soap"> <param name="build.uri" value="${soap43.build.uri}"/> <param name="build.archive" value="${soap43.build.archive}"/> + <param name="requirement.name" value="${soap43.build.name}"/> + <param name="unzip.dest" value="../target/${soap43.build.archive.root}"/> <param name="md5" value="${soap43.build.archive.md5}" /> </antcall> <antcall target="build.soap"> <param name="build.uri" value="${soap50.build.uri}"/> <param name="build.archive" value="${soap50.build.archive}"/> + <param name="requirement.name" value="${soap50.build.name}"/> + <param name="unzip.dest" value="../target/${soap50.build.archive.root}"/> <param name="md5" value="${soap50.build.archive.md5}" /> </antcall> <antcall target="build.soap"> <param name="build.uri" value="${soap51.build.uri}"/> <param name="build.archive" value="${soap51.build.archive}"/> + <param name="requirement.name" value="${soap51.build.name}"/> + <param name="unzip.dest" value="../target/${soap51.build.archive.root}"/> <param name="md5" value="${soap51.build.archive.md5}" /> </antcall> <antcall target="build.soap"> <param name="build.uri" value="${soap52.build.uri}"/> <param name="build.archive" value="${soap52.build.archive}"/> + <param name="requirement.name" value="${soap52.build.name}"/> + <param name="unzip.dest" value="../target/${soap52.build.archive.root}"/> <param name="md5" value="${soap52.build.archive.md5}" /> </antcall> - - <antcall target="build.soap"> + <antcall target="build.soap"> <param name="build.uri" value="${soap53.build.uri}"/> - <param name="build.archive" value="${soap53.build.archive}"/> - <param name="md5" value="${soap53.build.archive.md5}" /> + <param name="build.archive" value="${soap53.build.archive}"/> + <param name="requirement.name" value="${soap53.build.name}"/> + <param name="unzip.dest" value="../target/${soap53.build.archive.root}"/> + <param name="md5" value="${soap53.build.archive.md5}" /> </antcall> + </target> - - - </target> - </project>

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41125 - trunk/requirements/generic.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-05-17 17:10:33 -0400 (Thu, 17 May 2012) New Revision: 41125 Modified: trunk/requirements/generic/build.xml Log: ensure correct checkout folders are used for soa-p runtimes; provide logged errors in case configuration is missing; provide a way to run the script independent of overall build infra (simply with 'cd requirements/soap; ant -f buildRequirement.xml') Modified: trunk/requirements/generic/build.xml =================================================================== --- trunk/requirements/generic/build.xml 2012-05-17 20:28:36 UTC (rev 41124) +++ trunk/requirements/generic/build.xml 2012-05-17 21:10:33 UTC (rev 41125) @@ -6,8 +6,35 @@ <property name="driver.dest" value="${requirement.download.root}/${requirement}"/> - <target name="init" /> - + <target name="init"> + <condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}"> + <available file="${WORKSPACE}/results" /> + </condition> + + <condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools" else="${java.io.tmpdir}"> + <available file="/home/hudson/static_build_env/jbds" type="dir" /> + </condition> + <mkdir dir="${COMMON_TOOLS}" /> + + <available file="${COMMON_TOOLS}/ant-contrib.jar" type="file" property="ant-contrib.jar.exists" /> + <antcall target="get.ant-contrib" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" /> + </classpath> + </taskdef> + </target> + + <target name="get.ant-contrib" unless="ant-contrib.jar.exists"> + <property name="ANTCONTRIB_MIRROR" value="http://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib..." /> + <get usetimestamp="true" dest="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" src="${ANTCONTRIB_MIRROR}/ant-contrib-1.0b2-bin.zip" /> + <touch file="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" /> + <mkdir dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" /> + <unzip src="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" dest="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" overwrite="true" /> + <copy file="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_/ant-contrib/lib/ant-contrib.jar" tofile="${COMMON_TOOLS}/ant-contrib.jar" failonerror="true" /> + <delete dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" includeemptydirs="true" quiet="true" /> + </target> + <target name="build.requirement" depends="build.driver" /> <target name="unpack.requirement" depends="unzip.archive" /> @@ -16,7 +43,7 @@ <target name="build.driver" depends="unzip.archive" /> - <target name="unzip.archive" depends="download.archive"> + <target name="unzip.archive" depends="download.archive,defaults"> <property name="ext" value="zip"/> <echo level="debug">Unpacking ${driver.dest}/${build.archive} to ${unzip.dest}</echo> <if> @@ -33,15 +60,57 @@ <target name="post.unpack.requirement"> </target> - <target name="unpack-tar.gz"> + <target name="unpack-tar.gz" depends="defaults"> <untar compression="gzip" src="${driver.dest}/${build.archive}" dest="${unzip.dest}" /> </target> - <target name="unpack-zip"> + <target name="unpack-zip" depends="defaults"> <unzip src="${driver.dest}/${build.archive}" dest="${unzip.dest}" /> </target> - <target name="check.archive" depends="init"> + <target name="defaults"> + <if> + <or> + <contains string="${driver.dest}" substring="{requirement.download.root"/> + <contains string="${driver.dest}" substring="{requirement"/> + </or> + <then> + <var name="driver.dest" unset="true"/> + <var name="requirement.name" unset="true"/> + <var name="requirement" unset="true"/> + <basename property="requirement.name" file="${basedir}"/> + <basename property="requirement" file="${basedir}"/> + <property name="driver.dest" value="${basedir}/../download/${requirement.name}"/> + <echo>WARING! requirement, requirement.name, and driver.dest are not specified in + requirements/${requirement.name}/build.properties or + requirements/${requirement.name}/buildRequirement.xml. + Falling back to default assumptions. +- +requirement = ${requirement} +driver.dest = ${driver.dest}</echo> + </then> + </if> + <if> + <or> + <not> + <isset property="unzip.dest"/> + </not> + <contains string="${unzip.dest}" substring="{unzip.dest"/> + </or> + <then> + <var name="unzip.dest" unset="true"/> + <var name="unzip.dest" value="${basedir}/../target/${requirement}"/> + <echo>WARING! unzip.dest is not specified in + requirements/${requirement.name}/build.properties or + requirements/${requirement.name}/buildRequirement.xml. + Falling back to default assumption. +- +unzip.dest = ${unzip.dest}</echo> + </then> + </if> + </target> + + <target name="check.archive" depends="init,defaults"> <echo>Checking the requirement's archive ${build.archive}</echo> <if> <available file="${driver.dest}/${build.archive}" />

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41124 - trunk/requirements/soap.

by jbosstools-commits＠lists.jboss.org

Author: ldimaggio Date: 2012-05-17 16:28:36 -0400 (Thu, 17 May 2012) New Revision: 41124 Modified: trunk/requirements/soap/build.properties Log: Changed soap53.build.archive.root=jboss-soa-p-5 Modified: trunk/requirements/soap/build.properties =================================================================== --- trunk/requirements/soap/build.properties 2012-05-17 17:07:07 UTC (rev 41123) +++ trunk/requirements/soap/build.properties 2012-05-17 20:28:36 UTC (rev 41124) @@ -40,5 +40,5 @@ soap53.build.name=soa-p-5.3.0.ER2 soap53.build.archive=${soap53.build.name}.zip soap53.build.archive.md5=1f70c15b26a0d812ba2a39a96c6a8c57 -soap53.build.archive.root=jboss-soa-p.5.3.0 +soap53.build.archive.root=jboss-soa-p-5

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41123 - in trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim: resources/config and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2012-05-17 13:07:07 -0400 (Thu, 17 May 2012) New Revision: 41123 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/Device.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ManageDevicesDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties Log: https://issues.jboss.org/browse/JBIDE-11896 : BrowserSim: pixel ratio problem - added pixel ratio property for devices Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/Device.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/Device.java 2012-05-17 16:24:06 UTC (rev 41122) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/Device.java 2012-05-17 17:07:07 UTC (rev 41123) @@ -10,23 +10,35 @@ ******************************************************************************/ package org.jboss.tools.vpe.browsersim.model; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; + /** * @author Yahor Radtsevich (yradtsevich) */ public class Device { public static final int DEFAULT_SIZE = -1; + public static final DecimalFormat PIXEL_RAIO_FORMAT = new DecimalFormat("0.###"); //$NON-NLS-1$ + static { + DecimalFormatSymbols formatSymbols = new DecimalFormatSymbols(); + formatSymbols.setDecimalSeparator('.'); + PIXEL_RAIO_FORMAT.setDecimalFormatSymbols(formatSymbols); + } private String name; private int width; private int height; + private double pixelRatio; private String userAgent; private String skinId; - public Device(String name, int width, int height, String userAgent, String skinId) { + + public Device(String name, int width, int height, double pixelRatio, String userAgent, String skinId) { this.name = name; this.width = width; this.height = height; + this.pixelRatio = pixelRatio; this.userAgent = userAgent; this.skinId = skinId; } @@ -50,4 +62,8 @@ public String getSkinId() { return skinId; } + + public double getPixelRatio() { + return pixelRatio; + } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java 2012-05-17 16:24:06 UTC (rev 41122) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java 2012-05-17 17:07:07 UTC (rev 41123) @@ -18,6 +18,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.text.ParseException; import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; @@ -34,7 +35,7 @@ private static final String DEFAULT_PREFERENCES_RESOURCE = "config/devices.cfg"; private static final String USER_PREFERENCES_FOLDER = "org.jboss.tools.vpe.browsersim"; private static final String USER_PREFERENCES_FILE = "devices.cfg"; - private static final int CURRENT_CONFIG_VERSION = 5; + private static final int CURRENT_CONFIG_VERSION = 6; public static void saveUserDefinedDevicesList(DevicesList devicesList) { File configFolder = new File(USER_PREFERENCES_FOLDER); @@ -72,7 +73,7 @@ } if (devicesList == null) { - Device device = new Device("Default", 1024, 768, null, null); + Device device = new Device("Default", 1024, 768, 1.0, null, null); List<Device> devices = new ArrayList<Device>(); devices.add(device); devicesList = new DevicesList(devices, 0, true, null); @@ -98,6 +99,8 @@ writer.write('\t'); writer.write(encode( String.valueOf(device.getHeight()) )); writer.write('\t'); + writer.write(encode( Device.PIXEL_RAIO_FORMAT.format(device.getPixelRatio()) )); + writer.write('\t'); if (device.getUserAgent() != null) { writer.write( encode(device.getUserAgent() )); } @@ -164,21 +167,30 @@ } } - Pattern devicePattern = Pattern.compile("^(.*)\\t(\\-?[0-9]+)\\t(\\-?[0-9]+)\\t(.+)?\\t(.+)?$"); + Pattern devicePattern = Pattern.compile("^(.*)\\t([0-9]+)\\t([0-9]+)\\t([0-9]*\\.?[0-9]*)\\t(.+)?\\t(.+)?$"); devices = new ArrayList<Device>(); while ((nextLine = reader.readLine()) != null) { Matcher deviceMatcher = devicePattern.matcher(nextLine); if (deviceMatcher.matches()) { + double pixelRatio; + try { + pixelRatio = Device.PIXEL_RAIO_FORMAT.parse(deviceMatcher.group(4)).doubleValue(); + } catch (ParseException e) { + pixelRatio = 1.0; + e.printStackTrace(); + } + devices.add(new Device( decode(deviceMatcher.group(1)), Integer.parseInt(deviceMatcher.group(2)), Integer.parseInt(deviceMatcher.group(3)), - deviceMatcher.group(4) != null - ? decode(deviceMatcher.group(4)) + pixelRatio, + deviceMatcher.group(5) != null + ? decode(deviceMatcher.group(5)) : null, - deviceMatcher.group(5) != null - ? decode(deviceMatcher.group(5)) + deviceMatcher.group(6) != null + ? decode(deviceMatcher.group(6)) : null )); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2012-05-17 16:24:06 UTC (rev 41122) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2012-05-17 17:07:07 UTC (rev 41123) @@ -1,12 +1,12 @@ -ConfigVersion=5 +ConfigVersion=6 SelectedDeviceIndex=2 UseSkins=true TruncateWindow= -Desktop (Default User-Agent) 1024 768 -Apple iPad 2 768 1024 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5 iPhone 4 -Apple iPhone 3 320 480 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 iPhone 3 -Apple iPhone 4 640 960 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 iPhone 4 -RIM BlackBerry Bold Touch 9900 640 480 Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+ Android -Samsung Galaxy S 480 800 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android -Samsung Galaxy S II 480 800 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android -Samsung Galaxy Tab 10.1 800 1280 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13 Android +Desktop (Default User-Agent) 1024 768 1 +Apple iPad 2 768 1024 1 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5 iPhone 4 +Apple iPhone 3 320 480 1 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 iPhone 3 +Apple iPhone 4 640 960 2 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 iPhone 4 +RIM BlackBerry Bold Touch 9900 640 480 1 Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+ Android +Samsung Galaxy S 480 800 1.5 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android +Samsung Galaxy S II 480 800 1.5 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android +Samsung Galaxy Tab 10.1 800 1280 1 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13 Android Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-05-17 16:24:06 UTC (rev 41122) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-05-17 17:07:07 UTC (rev 41123) @@ -481,15 +481,17 @@ ? DeviceOrientation.PORTRAIT : DeviceOrientation.LANDSCAPE); Rectangle clientArea = getMonitorClientArea(); - skin.setOrientationAndSize( deviceOrientation.getOrientationAngle(), new Point(device.getWidth(), device.getHeight()), + Point size = getSizeInDesktopPixels(device); + skin.setOrientationAndSize( deviceOrientation.getOrientationAngle(), size, getSizeAdvisor()); fixShellLocation(clientArea); deviceOrientation.addObserver(new Observer() { public void update(Observable o, Object arg) { int orientationAngle = ((DeviceOrientation) o).getOrientationAngle(); - - int minSize = Math.min(device.getWidth(), device.getHeight()); - int maxSize = Math.max(device.getWidth(), device.getHeight()); + + Point size = getSizeInDesktopPixels(device); + int minSize = Math.min(size.x, size.y); + int maxSize = Math.max(size.x, size.y); Point browserSize; if (orientationAngle == DeviceOrientation.LANDSCAPE || orientationAngle == DeviceOrientation.LANDSCAPE_INVERTED) { @@ -582,6 +584,22 @@ deviceOrientation.notifyObservers(); } + /** + * See JBIDE-11896 BrowserSim: pixel ratio problem. + * + * On many mobile devices like iPhone 4 1 CSS pixel = 2 device pixels. + */ + protected Point getSizeInDesktopPixels(Device device) { + double pixelRatio = device.getPixelRatio(); + if (device.getPixelRatio() == 0.0) { + pixelRatio = 1.0; + new RuntimeException("Pixel Ratio is 0.0").printStackTrace(); + } + int width = (int) Math.round(device.getWidth() / pixelRatio); + int height = (int) Math.round(device.getHeight() / pixelRatio); + return new Point(width, height); + } + class ControlHandlerImpl implements ControlHandler { private Browser browser; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java 2012-05-17 16:24:06 UTC (rev 41122) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java 2012-05-17 17:07:07 UTC (rev 41123) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.vpe.browsersim.ui; +import java.text.ParseException; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -46,6 +47,7 @@ private Text textName; private Text textWidth; private Text textHeight; + private Text textPixelRatio; private Text textUserAgent; private Button checkButtonWidth; private Button checkButtonHeight; @@ -130,6 +132,15 @@ } attachCheckBoxToText(checkButtonHeight, textHeight); + Label labelPixelRatio = new Label(shell, SWT.NONE); + labelPixelRatio.setText(Messages.EditDeviceDialog_PIXEL_RATIO); + textPixelRatio = new Text(shell, SWT.BORDER); + textPixelRatio.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); + textPixelRatio.setTextLimit(5); + textPixelRatio.addVerifyListener(new VerifyFloatListener()); + + textPixelRatio.setText(Device.PIXEL_RAIO_FORMAT.format(initialDevice.getPixelRatio())); + checkButtonUserAgent = new Button(shell, SWT.CHECK); checkButtonUserAgent.setText(Messages.EditDeviceDialog_USER_AGENT); checkButtonUserAgent.setSelection(initialDevice.getUserAgent() != null); @@ -168,9 +179,17 @@ buttonOk.setText(Messages.EditDeviceDialog_OK); buttonOk.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { + double pixelRatio; + try { + pixelRatio = Device.PIXEL_RAIO_FORMAT.parse(textPixelRatio.getText()).doubleValue(); + } catch (ParseException e1) { + pixelRatio = 1.0; + } + resultDevice = new Device(textName.getText(), checkButtonWidth.getSelection() ? Integer.valueOf("0" + textWidth.getText()) : Device.DEFAULT_SIZE, //$NON-NLS-1$ checkButtonHeight.getSelection() ? Integer.valueOf("0" + textHeight.getText()) : Device.DEFAULT_SIZE, //$NON-NLS-1$ + pixelRatio, checkButtonUserAgent.getSelection() ? textUserAgent.getText() : null, comboSkin.getSelectionIndex() == 0 ? null : skinIds.get(comboSkin.getSelectionIndex())); shell.close(); @@ -206,6 +225,34 @@ } } +final class VerifyFloatListener implements VerifyListener { + public void verifyText(VerifyEvent e) { + for (char c : e.text.toCharArray()) { + if (!('0' <= c && c <= '9') && c != ',' && c != '.') { + e.doit = false; + return; + } + } + + Text text = (Text) e.widget; + String oldText = text.getText(); + String newText = oldText.substring(0, e.start) + e.text + oldText.substring(e.end); + + int delimiterCounter = 0; + for (char c : newText.toCharArray()) { + if (c == ',' || c == '.') { + delimiterCounter++; + } + } + if (delimiterCounter > 1) { + e.doit = false; + return; + } + + e.text = e.text.replace(',', '.'); + } +} + final class VerifyDigitsListener implements VerifyListener { public void verifyText(VerifyEvent e) { for (char c : e.text.toCharArray()) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ManageDevicesDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ManageDevicesDialog.java 2012-05-17 16:24:06 UTC (rev 41122) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ManageDevicesDialog.java 2012-05-17 17:07:07 UTC (rev 41123) @@ -90,7 +90,7 @@ */ private void createContents() { shell = new Shell(getParent(), getStyle()); - shell.setSize(650, 450); + shell.setSize(750, 500); shell.setText(getText()); shell.setLayout(new GridLayout(1, false)); @@ -110,23 +110,27 @@ TableColumn tableColumnName = new TableColumn(table, SWT.NONE); - tableColumnName.setWidth(100); + tableColumnName.setWidth(175); tableColumnName.setText(Messages.ManageDevicesDialog_NAME); TableColumn tableColumnWidth = new TableColumn(table, SWT.NONE); - tableColumnWidth.setWidth(100); + tableColumnWidth.setWidth(75); tableColumnWidth.setText(Messages.ManageDevicesDialog_WIDTH); TableColumn tableColumnHeight = new TableColumn(table, SWT.NONE); - tableColumnHeight.setWidth(100); + tableColumnHeight.setWidth(75); tableColumnHeight.setText(Messages.ManageDevicesDialog_HEIGHT); + TableColumn tableColumnPixelRatio = new TableColumn(table, SWT.NONE); + tableColumnPixelRatio.setWidth(75); + tableColumnPixelRatio.setText(Messages.ManageDevicesDialog_PIXEL_RATIO); + TableColumn tableColumnUseragent = new TableColumn(table, SWT.NONE); - tableColumnUseragent.setWidth(100); + tableColumnUseragent.setWidth(150); tableColumnUseragent.setText(Messages.ManageDevicesDialog_USER_AGENT); TableColumn tableColumnSkin = new TableColumn(table, SWT.NONE); - tableColumnSkin.setWidth(100); + tableColumnSkin.setWidth(75); tableColumnSkin.setText(Messages.ManageDevicesDialog_SKIN); Composite compositeControls = new Composite(devicesGroup, SWT.NONE); @@ -139,7 +143,7 @@ buttonAdd.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { Device newDevice = new EditDeviceDialog(shell, SWT.APPLICATION_MODAL | SWT.SHELL_TRIM, - new Device(Messages.ManageDevicesDialog_NEW_DEVICE, 480, 800, Messages.ManageDevicesDialog_NEW_USER_AGENT, null)).open(); + new Device(Messages.ManageDevicesDialog_NEW_DEVICE, 320, 480, 1.0, Messages.ManageDevicesDialog_NEW_USER_AGENT, null)).open(); if (newDevice != null) { devices.add(newDevice); selectedDeviceIndex = devices.size() - 1; @@ -281,7 +285,7 @@ updateDevices(); } - public void updateDevices() {//TODO + public void updateDevices() { table.removeAll(); for (Device device : devices) { TableItem tableItem = new TableItem(table, SWT.NONE); @@ -289,6 +293,7 @@ device.getName(), device.getWidth() == Device.DEFAULT_SIZE ? Messages.ManageDevicesDialog_DEFAULT : String.valueOf(device.getWidth()), device.getHeight() == Device.DEFAULT_SIZE ? Messages.ManageDevicesDialog_DEFAULT : String.valueOf(device.getHeight()), + Device.PIXEL_RAIO_FORMAT.format(device.getPixelRatio()), device.getUserAgent() == null ? Messages.ManageDevicesDialog_DEFAULT : device.getUserAgent(), device.getSkinId() == null ? Messages.ManageDevicesDialog_NONE : device.getSkinId() }); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java 2012-05-17 16:24:06 UTC (rev 41122) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java 2012-05-17 17:07:07 UTC (rev 41123) @@ -17,6 +17,7 @@ */ public class Messages { private static final String BUNDLE_NAME = Messages.class.getName().toString().toLowerCase(); + public static String BrowserSim_ADDRESS; public static String BrowserSim_BROWSER_SIM; @@ -38,6 +39,7 @@ public static String EditDeviceDialog_NAME; public static String EditDeviceDialog_NONE; public static String EditDeviceDialog_OK; + public static String EditDeviceDialog_PIXEL_RATIO; public static String EditDeviceDialog_SKIN; public static String EditDeviceDialog_USER_AGENT; public static String EditDeviceDialog_WIDTH; @@ -60,6 +62,7 @@ public static String ManageDevicesDialog_NEW_USER_AGENT; public static String ManageDevicesDialog_NONE; public static String ManageDevicesDialog_OK; + public static String ManageDevicesDialog_PIXEL_RATIO; public static String ManageDevicesDialog_PREFERENCES; public static String ManageDevicesDialog_PROMPT; public static String ManageDevicesDialog_REMOVE; @@ -77,6 +80,7 @@ public static String SizeWarningDialog_OK; public static String SizeWarningDialog_REMEMBER_MY_DECISION; + static { NLS.initializeMessages(BUNDLE_NAME, Messages.class); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties 2012-05-17 16:24:06 UTC (rev 41122) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties 2012-05-17 17:07:07 UTC (rev 41123) @@ -17,6 +17,7 @@ EditDeviceDialog_MANAGE_DEVICES=Manage Devices EditDeviceDialog_NAME=Name: EditDeviceDialog_NONE=None +EditDeviceDialog_PIXEL_RATIO=Pixel Ratio: EditDeviceDialog_OK=OK EditDeviceDialog_SKIN=Skin: EditDeviceDialog_USER_AGENT=User-Agent: @@ -44,6 +45,7 @@ ManageDevicesDialog_NEW_DEVICE=New Device ManageDevicesDialog_NEW_USER_AGENT=New User-Agent ManageDevicesDialog_OK=OK +ManageDevicesDialog_PIXEL_RATIO=Pixel Ratio ManageDevicesDialog_PREFERENCES=Preferences ManageDevicesDialog_PROMPT=Prompt ManageDevicesDialog_REMOVE=Remove

12 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2012