JBoss Tools SVN: r20393 - branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
by jbosstools-commits@lists.jboss.org
Author: yzhishko
Date: 2010-02-19 13:29:08 -0500 (Fri, 19 Feb 2010)
New Revision: 20393
Modified:
branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5862 - test is disabled in branch
Modified: branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-19 17:34:33 UTC (rev 20392)
+++ branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-19 18:29:08 UTC (rev 20393)
@@ -126,7 +126,7 @@
suite.addTestSuite(EditFontFamilyTest_JBIDE5872.class);
suite.addTestSuite(ChangeMessageBundleTest_JBIDE5818.class);
suite.addTestSuite(TestForUsingComponentsLibrariesWithDefaultNamespace.class);
- suite.addTestSuite(EditingSPecialSymbolsVPE_JBIDE3810.class);
+// suite.addTestSuite(EditingSPecialSymbolsVPE_JBIDE3810.class);
suite.addTestSuite(OpenOnJsf20Test_JBIDE5382.class);
suite.addTestSuite(MozDirtyTest_JBIDE5105.class);
suite.addTestSuite(VpeI18nTest_JBIDE4887.class);
14 years, 4 months
JBoss Tools SVN: r20392 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
by jbosstools-commits@lists.jboss.org
Author: yzhishko
Date: 2010-02-19 12:34:33 -0500 (Fri, 19 Feb 2010)
New Revision: 20392
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5862 - test is disabled in trunk.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-19 16:08:23 UTC (rev 20391)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-19 17:34:33 UTC (rev 20392)
@@ -126,7 +126,7 @@
suite.addTestSuite(EditFontFamilyTest_JBIDE5872.class);
suite.addTestSuite(ChangeMessageBundleTest_JBIDE5818.class);
suite.addTestSuite(TestForUsingComponentsLibrariesWithDefaultNamespace.class);
- suite.addTestSuite(EditingSPecialSymbolsVPE_JBIDE3810.class);
+// suite.addTestSuite(EditingSPecialSymbolsVPE_JBIDE3810.class);
suite.addTestSuite(OpenOnJsf20Test_JBIDE5382.class);
suite.addTestSuite(MozDirtyTest_JBIDE5105.class);
suite.addTestSuite(VpeI18nTest_JBIDE4887.class);
14 years, 4 months
JBoss Tools SVN: r20391 - in trunk/documentation/guides/MigrationGuide: en and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: ochikvina
Date: 2010-02-19 11:08:23 -0500 (Fri, 19 Feb 2010)
New Revision: 20391
Added:
trunk/documentation/guides/MigrationGuide/en/master.xml
trunk/documentation/guides/MigrationGuide/pom.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-1062 - Added the first version of the guide.</p>
</body></html>
Added: trunk/documentation/guides/MigrationGuide/en/master.xml
===================================================================
--- trunk/documentation/guides/MigrationGuide/en/master.xml (rev 0)
+++ trunk/documentation/guides/MigrationGuide/en/master.xml 2010-02-19 16:08:23 UTC (rev 20391)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.docbook.org/xml/4.3/docbookx.dtd"
+
+[<!ENTITY introduction SYSTEM "modules/introduction.xml">
+<!ENTITY migration SYSTEM "modules/migration.xml">
+<!ENTITY issues SYSTEM "modules/issues.xml">
+<!ENTITY gsglink "../../GettingStartedGuide/html_single/index.html">
+
+]>
+
+<book>
+ <bookinfo>
+ <title>Exadel 2.1 to 3.0 Migration Guide</title>
+
+
+ <copyright>
+ <year>2010</year>
+ <holder>JBoss by Red Hat</holder>
+ </copyright>
+ <releaseinfo>
+Version: 3.0.0.GA
+</releaseinfo>
+
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/Exadel-migration/pdf...">PDF version</ulink>
+ </para>
+</abstract>
+
+
+ </bookinfo>
+
+ <toc/>
+&introduction;
+&migration;
+&issues;
+</book>
Property changes on: trunk/documentation/guides/MigrationGuide/en/master.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/documentation/guides/MigrationGuide/pom.xml
===================================================================
--- trunk/documentation/guides/MigrationGuide/pom.xml (rev 0)
+++ trunk/documentation/guides/MigrationGuide/pom.xml 2010-02-19 16:08:23 UTC (rev 20391)
@@ -0,0 +1,162 @@
+<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>
+
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>exadel-migration-guide${translation}</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+ <name>Exadel_2.1_to_3.0_Migration_Guide</name>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ </properties>
+ </profile>
+ <profile>
+ <id>releaseTest</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ </properties>
+ </profile>
+ <profile>
+ <id>releaseJBDS</id>
+ <properties>
+ <master>master.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>diffmk</id>
+ <properties>
+ <master>master_output.xml</master>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-diff.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-diff.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf-diff.xsl</xsl-pdf>
+ </properties>
+ </profile>
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.0-200803311251UTC-MPJDOCBOOK-8</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>com.jboss</groupId>
+ <artifactId>jbossent-docbook-xslt</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jboss</groupId>
+ <artifactId>jbossent-jdocbook-style</artifactId>
+ <version>1.0.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>jbosstools-docbook-xslt</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop</artifactId>
+ <version>0.95</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>${master}</sourceDocumentName>
+ <sourceDirectory>${pom.basedir}/en</sourceDirectory>
+ <imageResource>
+ <directory>${pom.basedir}/en</directory>
+ <includes>
+ <include>images/**/*</include>
+ </includes>
+ </imageResource>
+ <cssResource>
+ <directory>${pom.basedir}/${cssdir}</directory>
+ </cssResource>
+
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>${xsl-pdf}</stylesheetResource>
+ <finalName>${pom.name}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>${xsl-chunked}</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>${xsl-single}</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>eclipse</formatName>
+ <stylesheetResource>classpath:/xslt/com/jboss/tools/eclipse.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.72.0</docbookVersion>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <distributionManagement>
+ <repository>
+ <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
+ <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
+ <!-- todo : replace this with direct svn access once the svnkit providers are available -->
+ <id>repository.jboss.org</id>
+ <url>file://${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <properties>
+ <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single.xsl</xsl-single>
+ <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml.xsl</xsl-chunked>
+ <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf>
+ <stylesdir>../../../documentation/jbosstools-docbook-xslt/src/main/resources/</stylesdir>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/com/css/</cssdir>
+ <master>master.xml</master>
+ <translation>en-US</translation>
+ </properties>
+
+</project>
Property changes on: trunk/documentation/guides/MigrationGuide/pom.xml
___________________________________________________________________
Name: svn:executable
+ *
14 years, 4 months
JBoss Tools SVN: r20390 - in trunk/documentation/guides/MigrationGuide/en: modules and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: ochikvina
Date: 2010-02-19 11:06:36 -0500 (Fri, 19 Feb 2010)
New Revision: 20390
Added:
trunk/documentation/guides/MigrationGuide/en/images/jdbs2.png
trunk/documentation/guides/MigrationGuide/en/images/jdbs4.png
trunk/documentation/guides/MigrationGuide/en/images/migration-guide-step-1.png
trunk/documentation/guides/MigrationGuide/en/modules/introduction.xml
trunk/documentation/guides/MigrationGuide/en/modules/issues.xml
trunk/documentation/guides/MigrationGuide/en/modules/migration.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-1062 - Added the first version of the guide.</p>
</body></html>
Added: trunk/documentation/guides/MigrationGuide/en/images/jdbs2.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/guides/MigrationGuide/en/images/jdbs2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/guides/MigrationGuide/en/images/jdbs4.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/guides/MigrationGuide/en/images/jdbs4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/guides/MigrationGuide/en/images/migration-guide-step-1.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/guides/MigrationGuide/en/images/migration-guide-step-1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/guides/MigrationGuide/en/modules/introduction.xml
===================================================================
--- trunk/documentation/guides/MigrationGuide/en/modules/introduction.xml (rev 0)
+++ trunk/documentation/guides/MigrationGuide/en/modules/introduction.xml 2010-02-19 16:06:36 UTC (rev 20390)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="introduction" xreflabel="introduction">
+ <?dbhtml filename="introduction.html"?>
+ <chapterinfo>
+ <keywordset>
+ <keyword>JBoss Developer Studio</keyword>
+ <keyword>JBDS</keyword>
+ <keyword>Exadel Studio Pro</keyword>
+ </keywordset>
+ </chapterinfo>
+
+ <title>Introduction </title>
+ <para>This document is intended to help you to easily migrate from 2.1 to 3.0.0
+ <property>JBoss Developer Studio</property>.
+ It also describes some popular issues that can appear while the process of migration,
+ as well as the methods of their solving. </para>
+
+
+ <section>
+ <title>Other relevant resources on the topic</title>
+ <para>All JBoss Developer Studio release documentation you can find at <ulink url="http://www.redhat.com/docs/en-US/JBoss_Developer_Studio/">http://www.redhat.com/docs/en-US/JBoss_Developer_Studio</ulink> in the corresponding release directory.</para>
+ <para>For more information about JBoss Developer Studio please visit
+ <ulink url="http://www.jboss.com/products/devstudio/">http://www.jboss.com/products/devstudio/</ulink>.</para>
+ <para>If your problem is not described in the guide or you have questions or suggestions concerned both the documentation and studio behavior, you are welcome at <ulink url="http://community.jboss.org/en/jbossdevstudio?view=discussions">JBoss Users forum</ulink>.
+ </para>
+ </section>
+</chapter>
Property changes on: trunk/documentation/guides/MigrationGuide/en/modules/introduction.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/documentation/guides/MigrationGuide/en/modules/issues.xml
===================================================================
--- trunk/documentation/guides/MigrationGuide/en/modules/issues.xml (rev 0)
+++ trunk/documentation/guides/MigrationGuide/en/modules/issues.xml 2010-02-19 16:06:36 UTC (rev 20390)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="issues" xreflabel="issues">
+ <?dbhtml filename="introduction.html"?>
+ <chapterinfo>
+ <keywordset>
+ <keyword>JBoss Developer Studio</keyword>
+ <keyword>JBDS</keyword>
+ <keyword>Exadel Studio Pro</keyword>
+ </keywordset>
+ </chapterinfo>
+
+ <title>Possible issues</title>
+ <para>In this chapter you will find a list of most popular
+ issues that can appear while the process of migration,
+ </para>
+
+
+ <section>
+ <title>Visual Editor starts with "Missing Natures" message dialog</title>
+ <para>While opening existing projects or creating new ones
+ with some standard eclipse wizards this message can appear:</para>
+ <figure>
+ <title>"Missing Natures" message</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jdbs4.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>This message shows that some functionality of Visual Editor may not work if a project
+ doesn't have org.jboss.tools.jsf.jsfnature or org.jboss.tools.jst.web.kb.kbnature
+ in .project configuration. To fix this problem and turn off the message box execute the following steps:</para>
+ <itemizedlist>
+ <listitem><para>Right click the project in Package Explorer.</para></listitem>
+ <listitem><para>Select <property>Configure -> Add JSF Capabilities</property> from the context menu.</para></listitem>
+ <listitem><para>Configure your project using Add JSF Capabilities wizard and press <property>Finish</property></para></listitem>
+ </itemizedlist>
+ </section>
+
+
+</chapter>
Added: trunk/documentation/guides/MigrationGuide/en/modules/migration.xml
===================================================================
--- trunk/documentation/guides/MigrationGuide/en/modules/migration.xml (rev 0)
+++ trunk/documentation/guides/MigrationGuide/en/modules/migration.xml 2010-02-19 16:06:36 UTC (rev 20390)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="jsf_struts" xreflabel="jsf_struts">
+ <?dbhtml filename="jsf_struts.html"?>
+ <chapterinfo>
+ <keywordset>
+ <keyword>JBoss Developer Studio</keyword>
+ <keyword>JBDS</keyword>
+ <keyword>Exadel Studio Pro</keyword>
+ <keyword>Migration</keyword>
+ </keywordset>
+ </chapterinfo>
+
+ <title>Migration Process</title>
+ <para>In this chapter you can find concise description of JBoss Developer Studio migration from
+ 2.1.0 to 3.0.0 version.</para>
+ <section id="migration">
+ <title>How to migrate from 2.1 to 3.0.0 JBoss Developer Studio</title>
+ <para></para>
+ <para>To migrate from 2.1 to 3.0.0 you have to install a fresh JBDS 3.0.0 and go through all the steps of
+ installation process that is fully described in
+ <ulink url="gsglink">Getting Started with JBoss Developer Studio</ulink> guide.</para>
+ <figure>
+ <title>Process of JBDS 3.0.0 installation </title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jdbs2.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Now you can not update your JBDS 2.X to 3.0.0 using update site(https://devstudio.jboss.com/updates/3.0/ ), as it was available in previous versions:</para>
+ <figure>
+ <title>Installation from the update site</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/migration-guide-step-1.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>The reason is that JBDS 3.0 uses Eclipse 3.5, whereas JBDS 2.x uses Eclipse 3.4.
+ Because of this platform change, a full install is required to migrate. </para>
+ <para>When the installation process is complete you can point your JBDS 3.0.0 at your old workspace directory and continue working with your projects created using previous
+ JBDS/Tools versions, or create a new one and import old projects into the new workspace.
+ </para>
+
+ <note>
+ <title>Note:</title>
+ <para>In JBDS 3.0.0 Lunux users no longer need to install the library libstdc+.so.5 on their mashines.
+ Now this library is not required and can be removed from the system.
+ </para>
+ </note>
+ </section>
+
+
+</chapter>
14 years, 4 months
JBoss Tools SVN: r20387 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2010-02-19 10:57:59 -0500 (Fri, 19 Feb 2010)
New Revision: 20387
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5218, code adjustments.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java 2010-02-19 15:51:55 UTC (rev 20386)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java 2010-02-19 15:57:59 UTC (rev 20387)
@@ -150,22 +150,22 @@
nsIDOMDocument doc = controller.getXulRunnerEditor().getDOMDocument();
nsIDOMElement localeText = doc.getElementById(LOCALE_TEXT0_ID);
String localizedText = getLocalizedText(localeText);
- checkLocaleStrings(file, "en", localizedText);
+ checkLocaleStrings(file, "en", localizedText); //$NON-NLS-1$
localeText = doc.getElementById(LOCALE_TEXT1_ID);
localizedText = getLocalizedText(localeText);
- checkLocaleStrings(file, "de", localizedText);
+ checkLocaleStrings(file, "de", localizedText); //$NON-NLS-1$
localeText = doc.getElementById(LOCALE_TEXT2_ID);
localizedText = getLocalizedText(localeText);
/*
* f:view will use default locale if nothing is specified.
*/
- checkLocaleStrings(file, "en_US", localizedText);
+ checkLocaleStrings(file, "en_US", localizedText); //$NON-NLS-1$
localeText = doc.getElementById(LOCALE_TEXT_ID);
localizedText = getLocalizedText(localeText);
- checkLocaleStrings(file, "en_GB", localizedText);
+ checkLocaleStrings(file, "en_GB", localizedText); //$NON-NLS-1$
closeEditors();
}
@@ -352,13 +352,16 @@
}
ClassLoader classLoader = new URLClassLoader(urls, ClassLoader
.getSystemClassLoader());
+
ResourceBundle bundle = ResourceBundle.getBundle(bundleName,
new Locale(localeName), classLoader);
String bundleText = bundle.getString(bundleKey);
assertNotNull(bundleText);
assertTrue(
"Text is '" + currentText + "', but should be in '"//$NON-NLS-1$ //$NON-NLS-2$
- + localeName + "' locale", bundleText.equalsIgnoreCase(currentText)); //$NON-NLS-1$
+ + localeName
+ + "' locale, bundle's value is '" + bundleText + "'", bundleText.equalsIgnoreCase(currentText) //$NON-NLS-1$ //$NON-NLS-2$
+ );
}
/**
14 years, 4 months
JBoss Tools SVN: r20385 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2010-02-19 10:23:56 -0500 (Fri, 19 Feb 2010)
New Revision: 20385
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5218, JUnit was updated to correct bundles loading for JVM 5 and 6.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java 2010-02-19 14:42:13 UTC (rev 20384)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java 2010-02-19 15:23:56 UTC (rev 20385)
@@ -10,7 +10,21 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.ui.test.TestUtil;
@@ -49,6 +63,10 @@
private static final String LOCALE_TEXT3_ID = "localeText3"; //$NON-NLS-1$
private static final String FVIEW_ID = "fviewid"; //$NON-NLS-1$
+
+ private static final String DEFAUT_BUNDLE_NAME = "demo.Messages"; //$NON-NLS-1$
+ private static final String DEFAUT_MESSAGE_KEY = "hello_message"; //$NON-NLS-1$
+ private String[] javaSources;
public TestFViewLocaleAttribute_JBIDE5218(String name) {
super(name);
@@ -114,25 +132,40 @@
* @throws Throwable
*/
public void testSeveralFViewsWithLocales() throws Throwable {
- VpeController controller = openInVpe(
- JsfAllTests.IMPORT_JSF_20_PROJECT_NAME, SEVERAL_FVIEWS_PAGE);
+
+ IFile file =
+ (IFile) TestUtil.getComponentPath(SEVERAL_FVIEWS_PAGE, JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
+ assertNotNull("Could not open specified file." //$NON-NLS-1$
+ + " componentPage = " + SEVERAL_FVIEWS_PAGE //$NON-NLS-1$
+ + ";projectName = " + JsfAllTests.IMPORT_JSF_20_PROJECT_NAME, file); //$NON-NLS-1$
+ IEditorInput input = new FileEditorInput(file);
+ assertNotNull("Editor input is null", input); //$NON-NLS-1$
+ /*
+ * open and get the editor
+ */
+ JSPMultiPageEditor part = openEditor(input);
+ VpeController controller = TestUtil.getVpeController(part);
+
+ javaSources = EclipseResourceUtil.getJavaProjectSrcLocations(file.getProject());
nsIDOMDocument doc = controller.getXulRunnerEditor().getDOMDocument();
-
nsIDOMElement localeText = doc.getElementById(LOCALE_TEXT0_ID);
String localizedText = getLocalizedText(localeText);
- assertTrue("Text is '"+localizedText+"', but should be in 'en' locale", HELLO_EN.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
-
+ checkLocaleStrings(file, "en", localizedText);
+
localeText = doc.getElementById(LOCALE_TEXT1_ID);
localizedText = getLocalizedText(localeText);
- assertTrue("Text is '"+localizedText+"', but should be in 'de' locale", HELLO2_DE.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ checkLocaleStrings(file, "de", localizedText);
localeText = doc.getElementById(LOCALE_TEXT2_ID);
localizedText = getLocalizedText(localeText);
- assertTrue("Text is '"+localizedText+"', but should be in default locale", HELLO_EN_US.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ /*
+ * f:view will use default locale if nothing is specified.
+ */
+ checkLocaleStrings(file, "en_US", localizedText);
localeText = doc.getElementById(LOCALE_TEXT_ID);
localizedText = getLocalizedText(localeText);
- assertTrue("Text is '"+localizedText+"', but should be in 'en_GB' locale", HELLO_EN_GB.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ checkLocaleStrings(file, "en_GB", localizedText);
closeEditors();
}
@@ -270,7 +303,64 @@
closeEditors();
}
+
+ /**
+ * Short version of {@link #checkLocaleStrings(IFile, String, String, String, String)}
+ * <p>
+ * Uses default values for bundle name and message key.
+ */
+ private void checkLocaleStrings(IFile openedFile, String localeName, String currentText) {
+ checkLocaleStrings(openedFile, localeName, DEFAUT_BUNDLE_NAME,
+ DEFAUT_MESSAGE_KEY, currentText);
+ }
+
+ /**
+ * Loads a message from resource bundle and
+ * compares it to the specified one.
+ * <p>
+ * Fixes difference in JVM 5 and 6 bundles loading.
+ *
+ * @param openedFile file opened in the editor
+ * @param localeName string code of the locale
+ * @param bundleName the name of the bundle
+ * @param bundleKey message key
+ * @param currentText compared string
+ */
+ private void checkLocaleStrings(IFile openedFile, String localeName,
+ String bundleName, String bundleKey, String currentText) {
+ /*
+ * javaSources should be initialized before call.
+ */
+ URL[] urls = new URL[0];
+ try {
+ if (javaSources != null) {
+ File tempFile;
+ urls = new URL[javaSources.length];
+ for (int i = 0; i < javaSources.length; ++i) {
+ try {
+ tempFile = new File(javaSources[i]).getCanonicalFile();
+ urls[i] = tempFile.toURL();
+ } catch (IOException ioe) {
+ VpePlugin.reportProblem(ioe);
+ }
+ }
+ }
+ } catch (MissingResourceException ex) {
+ VpePlugin.getDefault().logError(
+ "Project source folder is missing!", ex); //$NON-NLS-1$
+ }
+ ClassLoader classLoader = new URLClassLoader(urls, ClassLoader
+ .getSystemClassLoader());
+ ResourceBundle bundle = ResourceBundle.getBundle(bundleName,
+ new Locale(localeName), classLoader);
+ String bundleText = bundle.getString(bundleKey);
+ assertNotNull(bundleText);
+ assertTrue(
+ "Text is '" + currentText + "', but should be in '"//$NON-NLS-1$ //$NON-NLS-2$
+ + localeName + "' locale", bundleText.equalsIgnoreCase(currentText)); //$NON-NLS-1$
+ }
+
/**
* Gets the text value from the container.
* Container should be a simple tag like div or span.
14 years, 4 months
JBoss Tools SVN: r20384 - trunk/hibernatetools/docs/reference/en/images/plugins.
by jbosstools-commits@lists.jboss.org
Author: smukhina
Date: 2010-02-19 09:42:13 -0500 (Fri, 19 Feb 2010)
New Revision: 20384
Modified:
trunk/hibernatetools/docs/reference/en/images/plugins/map_diagram2.png
trunk/hibernatetools/docs/reference/en/images/plugins/map_diagram3.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_12_a.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_12_b.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_16.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_17_a.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_2.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_3.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_4.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_4_a.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_5.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_7.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_8.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_8a.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_9.png
Log:
JBDS-1083 Hibernate guide update
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/map_diagram2.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/map_diagram3.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_12_a.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_12_b.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_16.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_17_a.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_2.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_3.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_4.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_4_a.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_5.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_7.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_8.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_8a.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_9.png
===================================================================
(Binary files differ)
14 years, 4 months