JBoss Tools SVN: r8253 - in branches/jbosstools-2.1.x/seam/docs: reference and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: smukhina
Date: 2008-05-21 07:01:22 -0400 (Wed, 21 May 2008)
New Revision: 8253
Modified:
branches/jbosstools-2.1.x/seam/docs/
branches/jbosstools-2.1.x/seam/docs/reference/en/images/crud_database_application/crud_database_application_04.png
branches/jbosstools-2.1.x/seam/docs/reference/en/images/crud_database_application/crud_database_application_07.png
branches/jbosstools-2.1.x/seam/docs/reference/en/images/crud_database_application/crud_database_application_09.png
branches/jbosstools-2.1.x/seam/docs/reference/en/images/crud_database_application/crud_database_application_10.png
branches/jbosstools-2.1.x/seam/docs/reference/en/images/crud_database_application/crud_database_application_12.png
branches/jbosstools-2.1.x/seam/docs/reference/en/images/crud_database_application/crud_database_application_13.png
branches/jbosstools-2.1.x/seam/docs/reference/en/master.xml
branches/jbosstools-2.1.x/seam/docs/reference/en/modules/crud_database_application.xml
branches/jbosstools-2.1.x/seam/docs/reference/en/modules/directory_structure.xml
branches/jbosstools-2.1.x/seam/docs/reference/en/modules/generate_entities.xml
branches/jbosstools-2.1.x/seam/docs/reference/en/modules/intro.xml
branches/jbosstools-2.1.x/seam/docs/reference/en/modules/seam_editors.xml
branches/jbosstools-2.1.x/seam/docs/reference/en/modules/seam_preferences.xml
branches/jbosstools-2.1.x/seam/docs/reference/pom.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-324
Merged revisions 8061,8083,8110,8114,8141,8173,8203-8204,8208 via svnmerge from
https://svn.jboss.org/repos/jbosstools/trunk/seam/docs
........
r8061 | ochikvina | 2008-05-13 16:07:27 +0300 (Tue, 13 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-320 - marking the chapters that are new or updated
........
r8083 | smukhina | 2008-05-14 18:48:37 +0300 (Wed, 14 May 2008) | 2 lines
http://jira.jboss.com/jira/browse/JBDS-320
comments are corrected to the corresponding docbook tags with attributes
........
r8110 | ochikvina | 2008-05-15 18:29:18 +0300 (Thu, 15 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-285 - authors info is added
........
r8114 | smukhina | 2008-05-15 19:49:38 +0300 (Thu, 15 May 2008) | 2 lines
http://jira.jboss.com/jira/browse/JBDS-326
folders En-us and publish and staging are removed from nightly docs build, variables for links will be checked then
........
r8141 | smukhina | 2008-05-16 19:18:45 +0300 (Fri, 16 May 2008) | 1 line
new styles 1.1.0 and 1.0.0. are correspondingly added to the guides
........
r8173 | ochikvina | 2008-05-19 11:28:37 +0300 (Mon, 19 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-286 - correcting errors found by XML validator
........
r8203 | ochikvina | 2008-05-20 12:07:36 +0300 (Tue, 20 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-332 - link to database is added and proper info is updated
........
r8204 | ochikvina | 2008-05-20 12:09:20 +0300 (Tue, 20 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-332 - screenshots with specifying database details are updated
........
r8208 | ochikvina | 2008-05-20 17:16:01 +0300 (Tue, 20 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-332 - updating screenshots
........
Property changes on: branches/jbosstools-2.1.x/seam/docs
___________________________________________________________________
Name: svnmerge-integrated
+ /trunk/seam/docs:1-7998,8061-8208
Modified: branches/jbosstools-2.1.x/seam/docs/reference/en/images/crud_database_application/crud_database_application_04.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/seam/docs/reference/en/images/crud_database_application/crud_database_application_07.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/seam/docs/reference/en/images/crud_database_application/crud_database_application_09.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/seam/docs/reference/en/images/crud_database_application/crud_database_application_10.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/seam/docs/reference/en/images/crud_database_application/crud_database_application_12.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/seam/docs/reference/en/images/crud_database_application/crud_database_application_13.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/seam/docs/reference/en/master.xml
===================================================================
--- branches/jbosstools-2.1.x/seam/docs/reference/en/master.xml 2008-05-21 10:23:39 UTC (rev 8252)
+++ branches/jbosstools-2.1.x/seam/docs/reference/en/master.xml 2008-05-21 11:01:22 UTC (rev 8253)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
-"../../resources/support/docbook-dtd/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd"
[<!ENTITY intro SYSTEM "modules/intro.xml">
@@ -17,17 +17,17 @@
<!ENTITY business_application SYSTEM "modules/business_application.xml">
<!ENTITY testng SYSTEM "modules/testng.xml">
-<!ENTITY seamlink "../../../../seam/publish/en-US/html_single/index.html">
-<!ENTITY aslink "../../../../as/publish/en-US/html_single/index.html">
-<!ENTITY esblink "../../../../esb_ref_guide/publish/en-US/html_single/index.html">
-<!ENTITY gsglink "../../../../GettingStartedGuide/publish/en-US/html_single/index.html">
-<!ENTITY hibernatelink "../../../../hibernatetools/publish/en-US/html_single/index.html">
-<!ENTITY jbpmlink "../../../../jbpm/publish/en-US/html_single/index.html">
-<!ENTITY jsflink "../../../../jsf/publish/en-US/html_single/index.html">
-<!ENTITY jsfreflink "../../../../jsf_tools_ref_guide/publish/en-US/html_single/index.html">
-<!ENTITY jsftutoriallink "../../../../jsf_tools_tutorial/publish/en-US/html_single/index.html">
-<!ENTITY strutsreflink "../../../../struts_tools_ref_guide/publish/en-US/html_single/index.html">
-<!ENTITY strutstutoriallink "../../../../struts_tools_tutorial/publish/en-US/html_single/index.html">
+<!ENTITY seamlink "../../../../seam/html_single/index.html">
+<!ENTITY aslink "../../../../as/html_single/index.html">
+<!ENTITY esblink "../../../../esb_ref_guide/html_single/index.html">
+<!ENTITY gsglink "../../../../GettingStartedGuide/html_single/index.html">
+<!ENTITY hibernatelink "../../../../hibernatetools/html_single/index.html">
+<!ENTITY jbpmlink "../../../../jbpm/html_single/index.html">
+<!ENTITY jsflink "../../../../jsf/html_single/index.html">
+<!ENTITY jsfreflink "../../../../jsf_tools_ref_guide/html_single/index.html">
+<!ENTITY jsftutoriallink "../../../../jsf_tools_tutorial/html_single/index.html">
+<!ENTITY strutsreflink "../../../../struts_tools_ref_guide/html_single/index.html">
+<!ENTITY strutstutoriallink "../../../../struts_tools_tutorial/html_single/index.html">
]>
@@ -36,6 +36,9 @@
<bookinfo>
<title>Seam Dev Tools Reference Guide</title>
+ <author><firstname>Anatoly</firstname><surname>Fedosik</surname></author>
+ <author><firstname>Olga</firstname><surname>Chikvina</surname></author>
+ <author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
<pubdate>April 2008</pubdate>
<copyright>
@@ -44,7 +47,7 @@
<holder>JBoss, a division of Red Hat Inc.</holder>
</copyright>
<releaseinfo>
- <para>Version: 2.1.0.CR1</para>
+ Version: 2.1.0.CR1
</releaseinfo>
</bookinfo>
@@ -65,7 +68,5 @@
&crud_application_walkthrough;
&testng;
<!-- TODO: drools used in this section is not available for eclipse .3.3 &business_application; -->
-
-
-
+
</book>
Modified: branches/jbosstools-2.1.x/seam/docs/reference/en/modules/crud_database_application.xml
===================================================================
--- branches/jbosstools-2.1.x/seam/docs/reference/en/modules/crud_database_application.xml 2008-05-21 10:23:39 UTC (rev 8252)
+++ branches/jbosstools-2.1.x/seam/docs/reference/en/modules/crud_database_application.xml 2008-05-21 11:01:22 UTC (rev 8253)
@@ -1,307 +1,483 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="crud_database_application"
- xreflabel="crud_database_application">
- <?dbhtml filename="crud_database_application.html"?>
- <chapterinfo>
- <keywordset>
- <keyword>JBoss Developer Studio</keyword>
- <keyword>Eclipse</keyword>
- <keyword>Java</keyword>
- <keyword>CRUD</keyword>
- <keyword>Database Application</keyword>
- </keywordset>
- </chapterinfo>
- <title>Generate a CRUD Database Application</title>
- <section>
- <title>What is CRUD?</title>
- <para>
- <property>CRUD</property> is an acronym for the four basic types of SQL commands: <emphasis><property>Create</property></emphasis>, <emphasis><property>Read</property></emphasis>, <emphasis><property>Update</property></emphasis>, <emphasis><property>Delete</property></emphasis>. Most applications have some kind of <property>CRUD</property> functionality, and we can assume that every programmer had to deal with <property>CRUD</property> at some point. A <property>CRUD</property> application is one that uses forms to get data into and out of a database.
- </para>
- <para>
- In the next section we will create <link linkend="intro">Seam</link> Web application, connect it to the <ulink url="http://www.postgresql.org/">PostgreSQL</ulink> database and add <property>CRUD</property> support.
- </para>
- </section>
+<chapter id="crud_database_application" xreflabel="crud_database_application">
+ <?dbhtml filename="crud_database_application.html"?>
+ <chapterinfo>
+ <keywordset>
+ <keyword>JBoss Developer Studio</keyword>
+ <keyword>Eclipse</keyword>
+ <keyword>Java</keyword>
+ <keyword>CRUD</keyword>
+ <keyword>Database Application</keyword>
+ </keywordset>
+ </chapterinfo>
+ <title>Generate a CRUD Database Application</title>
+ <section>
+ <title>What is CRUD?</title>
+ <para>
+ <property>CRUD</property> is an acronym for the four basic types of SQL commands: <emphasis>
+ <property>Create</property>
+ </emphasis>, <emphasis>
+ <property>Read</property>
+ </emphasis>, <emphasis>
+ <property>Update</property>
+ </emphasis>, <emphasis>
+ <property>Delete</property>
+ </emphasis>. Most applications have some kind of <property>CRUD</property>
+ functionality, and we can assume that every programmer had to deal with
+ <property>CRUD</property> at some point. A <property>CRUD</property> application is one
+ that uses forms to get data into and out of a database. </para>
+ <para> In the next section we will create <link linkend="intro">Seam</link> Web application,
+ connect it to the <ulink url="http://www.hsqldb.org/">HSQL</ulink> database
+ and add <property>CRUD</property> support. </para>
+ </section>
<section>
<title>How to create the CRUD Database Application with Seam</title>
-
+
<itemizedlist>
- <listitem><para>Create a new Seam Web Project using New Project wizard or main menu <emphasis><property>File > New > Seam Web Project</property>.</emphasis></para></listitem>
+ <listitem><para>First, you should <ulink url="http://docs.jboss.org/tools/resources/"
+ >download</ulink> a database and start it by running <emphasis>
+ <property>./runDBServer.sh</property></emphasis> or <emphasis>
+ <property>runDBServer.bat</property></emphasis>
+ from the database directory.</para></listitem>
+ <listitem>
+ <para>Create a new Seam Web Project using New Project wizard or main menu
+ <emphasis><property>File > New > Seam Web
+ Project</property>.</emphasis></para>
+ </listitem>
</itemizedlist>
<figure>
<title>Seam Web Project Creation</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_01.png"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_01.png"
+ />
</imageobject>
</mediaobject>
</figure>
-
- <itemizedlist>
- <listitem>
- <para>Name your project as <emphasis><property>crudapp</property></emphasis> and follow the next wizard steps keeping default settings.</para>
- <para>Please have a look <link linkend="create_seam">here</link> how to create <emphasis><property>Target Runtime</property></emphasis> and <emphasis><property>Seam Runtime</property></emphasis> in order to get started creating, running, and debugging J2EE applications.</para>
- </listitem>
- </itemizedlist>
+
+ <itemizedlist>
+ <listitem>
+ <para>Name your project as <emphasis>
+ <property>crudapp</property>
+ </emphasis> and follow the next wizard steps keeping default settings.</para>
+ <para>Please have a look <link linkend="create_seam">here</link> how to create <emphasis>
+ <property>Target Runtime</property>
+ </emphasis> and <emphasis>
+ <property>Seam Runtime</property>
+ </emphasis> in order to get started creating, running, and debugging J2EE
+ applications.</para>
+ </listitem>
+ </itemizedlist>
<figure>
<title>New Seam Project Wizard</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_02.png"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_02.png"
+ />
</imageobject>
</mediaobject>
</figure>
-
+
<itemizedlist>
- <listitem><para>On <emphasis><property>Seam Facet</property></emphasis> page click <emphasis><property>New...</property></emphasis> to create a new <property>Connection profile</property>.</para></listitem>
+ <listitem>
+ <para>On <emphasis>
+ <property>Seam Facet</property>
+ </emphasis> page click <emphasis>
+ <property>New...</property>
+ </emphasis> to create a new <property>Connection profile</property>.</para>
+ </listitem>
</itemizedlist>
<figure>
<title>Seam Facet page</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_03.png"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_03.png"
+ />
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
- <listitem><para>On <property>New Connection Profile</property> dialog select the <emphasis><property>PostgreSQL JDBC Connection</property></emphasis> type and click <emphasis><property>Next</property></emphasis>.</para></listitem>
+ <listitem>
+ <para>On <property>New Connection Profile</property> dialog select the <emphasis>
+ <property>HSQLDB Connection Profile</property>
+ </emphasis> type and click <emphasis>
+ <property>Next</property>
+ </emphasis>.</para>
+ </listitem>
</itemizedlist>
<figure>
<title>New JDBC Connection Profile</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_04.png"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_04.png"
+ />
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
- <listitem><para>Name your profile as <emphasis><property>cruddb</property></emphasis> and press <emphasis><property>Next</property></emphasis>.</para></listitem>
+ <listitem>
+ <para>Name your profile as <emphasis>
+ <property>cruddb</property>
+ </emphasis> and press <emphasis>
+ <property>Next</property>
+ </emphasis>.</para>
+ </listitem>
</itemizedlist>
<figure>
<title>New JDBC Connection Profile Name</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_05.png"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_05.png"
+ />
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
- <listitem><para>On the next page click <emphasis><property>...</property></emphasis> to select a database driver.</para></listitem>
+ <listitem>
+ <para>On the next page click <emphasis>
+ <property>...</property>
+ </emphasis> to select a database driver.</para>
+ </listitem>
</itemizedlist>
<figure>
<title>New JDBC Connection Profile Database Driver</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_06.png"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_06.png"
+ />
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
- <listitem><para>On <property>Driver Definitions</property> dialog select the <emphasis><property>PostgreSQL->8.x</property></emphasis> and click <emphasis><property>Add...</property></emphasis>.</para></listitem>
+ <listitem>
+ <para>On <property>Driver Definitions</property> dialog select the <emphasis>
+ <property>Hypersonic DB</property>
+ </emphasis> and click <emphasis>
+ <property>Add...</property>
+ </emphasis>.</para>
+ </listitem>
</itemizedlist>
<figure>
<title>Driver Definitions List</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_07.png"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_07.png"
+ />
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
- <listitem><para>Set the location of <property>JDBC driver</property> and fill all other necessary fields (<emphasis><property>URL</property></emphasis>, <emphasis><property>Database Name</property></emphasis>, <emphasis><property>Password</property></emphasis>, <emphasis><property>User Id</property></emphasis>) and click <emphasis><property>OK</property></emphasis>.</para></listitem>
+ <listitem>
+ <para>Set the location of <property>JDBC driver</property> and fill all other
+ necessary fields (<emphasis>
+ <property>URL</property>
+ </emphasis>, <emphasis>
+ <property>Database Name</property>
+ </emphasis>, <emphasis>
+ <property>Password</property>
+ </emphasis>, <emphasis>
+ <property>User Id</property>
+ </emphasis>) and click <emphasis>
+ <property>OK</property>
+ </emphasis>.</para>
+ </listitem>
</itemizedlist>
<figure>
<title>Edit Driver Definition</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_09.png"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_09.png"
+ />
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
- <listitem><para>Click <emphasis><property>OK</property></emphasis> on the next dialog with newly created driver.</para></listitem>
+ <listitem>
+ <para>After clicking <emphasis>
+ <property>OK</property>
+ </emphasis> to submit the newly created driver you can observe and if you need edit all specified connection details.</para>
+ </listitem>
</itemizedlist>
<figure>
<title>Driver Definitions List</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_10.png"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_10.png"
+ />
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
- <listitem><para>Click <emphasis><property>Test Connection</property></emphasis> on the next dialog and observe that connection can be established.</para></listitem>
+ <listitem>
+ <para>Now click <emphasis>
+ <property>Test Connection</property>
+ </emphasis> to be sure that connection can be
+ established.</para>
+ </listitem>
</itemizedlist>
+
<figure>
- <title>Test JDBC Connection</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_11.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <figure>
<title>JDBC Connection is OK</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_12.png"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_12.png"
+ />
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
- <listitem><para>Validate <emphasis><property>JDBC Connection profile</property></emphasis> settings and press <emphasis><property>Finish</property></emphasis> or <emphasis><property>Back</property></emphasis> if something is wrong.</para></listitem>
+ <listitem>
+ <para>Validate <emphasis>
+ <property>JDBC Connection profile</property>
+ </emphasis> settings and press <emphasis>
+ <property>Finish</property>
+ </emphasis> or <emphasis>
+ <property>Back</property>
+ </emphasis> if something is wrong.</para>
+ </listitem>
</itemizedlist>
<figure>
<title>Validate JDBC Connection settings</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_13.png"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_13.png"
+ />
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
<listitem>
- <para>Observe that newly created profile has been selected on <emphasis><property>Seam Facet</property></emphasis> page and click <emphasis><property>Finish</property></emphasis>.</para>
- <para>This will create 2 projects - <emphasis><property>crudapp</property></emphasis> and <emphasis><property>crudapp-test</property></emphasis>.</para>
+ <para>Observe that newly created profile has been selected on <emphasis>
+ <property>Seam Facet</property>
+ </emphasis> page and click <emphasis>
+ <property>Finish</property>
+ </emphasis>.</para>
+ <para>This will create 2 projects - <emphasis>
+ <property>crudapp</property>
+ </emphasis> and <emphasis>
+ <property>crudapp-test</property>
+ </emphasis>.</para>
</listitem>
</itemizedlist>
<figure>
<title>Last Step of New Seam Project Wizard</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_14.png"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_14.png"
+ />
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
- <listitem><para>Have a look at the created projects. You can expand <property>WEB_CONTENT</property> folder and open <property>home.xhtml</property> or <property>login.xhtml</property> with <property>JBoss Visual Editor</property>.</para></listitem>
+ <listitem>
+ <para>Have a look at the created projects. You can expand
+ <property>WEB_CONTENT</property> folder and open <property>home.xhtml</property>
+ or <property>login.xhtml</property> with <property>JBoss Visual
+ Editor</property>.</para>
+ </listitem>
</itemizedlist>
<figure>
<title>CRUDAPP Seam Project</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_15.png" />
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_15.png"
+ />
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
- <listitem><para>Switch to <property>Database Development</property> perspective with <emphasis><property>Window->Open Perspective->Other...</property></emphasis> and connect to the <emphasis><property>cruddb</property></emphasis> database.</para></listitem>
+ <listitem>
+ <para>Switch to <property>Database Development</property> perspective with <emphasis>
+ <property>Window->Open Perspective->Other...</property>
+ </emphasis> and connect to the <emphasis>
+ <property>cruddb</property>
+ </emphasis> database.</para>
+ </listitem>
</itemizedlist>
<figure>
<title>Connecting to the CRUDDB database</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_16.png" scale="75"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_16.png"
+ scale="75"/>
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
- <listitem><para>Expand <emphasis><property>cruddb</property></emphasis> nodes to view its <emphasis><property>Schemas</property></emphasis>, <emphasis><property>Tables</property></emphasis>, <emphasis><property>Columns</property></emphasis> etc.</para></listitem>
+ <listitem>
+ <para>Expand <emphasis>
+ <property>cruddb</property>
+ </emphasis> nodes to view its <emphasis>
+ <property>Schemas</property>
+ </emphasis>, <emphasis>
+ <property>Tables</property>
+ </emphasis>, <emphasis>
+ <property>Columns</property>
+ </emphasis> etc.</para>
+ </listitem>
</itemizedlist>
<figure>
<title>CRUDDB Database</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_17.png" scale="75"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_17.png"
+ scale="75"/>
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
- <listitem><para>Switch back to the <property>Seam</property> perspective. From the toolbar select <emphasis><property>New->Seam Generate Entities</property></emphasis> to create a set of <property>CRUD</property> Seam components and web pages based on existing tables in the database.
- In the <emphasis><property>Generate Seam Entities</property></emphasis> dialog keep everything by default and press <emphasis><property>Finish</property></emphasis>.
- </para></listitem>
+ <listitem>
+ <para>Switch back to the <property>Seam</property> perspective. From the toolbar
+ select <emphasis>
+ <property>New->Seam Generate Entities</property>
+ </emphasis> to create a set of <property>CRUD</property> Seam components and web
+ pages based on existing tables in the database. In the <emphasis>
+ <property>Generate Seam Entities</property>
+ </emphasis> dialog keep everything by default and press <emphasis>
+ <property>Finish</property>
+ </emphasis>. </para>
+ </listitem>
</itemizedlist>
<figure>
<title>Generate Seam Entities</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_18.png"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_18.png"
+ />
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
- <listitem><para>Under <emphasis><property>WebContent</property></emphasis> folder you can find a lot of generated <property>xhtml</property> files:</para></listitem>
+ <listitem>
+ <para>Under <emphasis>
+ <property>WebContent</property>
+ </emphasis> folder you can find a lot of generated <property>xhtml</property>
+ files:</para>
+ </listitem>
</itemizedlist>
<figure>
<title>Entities Web Pages</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_19.png" scale="75"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_19.png"
+ scale="75"/>
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
- <listitem><para>And under <emphasis><property>src</property></emphasis> folder java classes are created.</para></listitem>
+ <listitem>
+ <para>And under <emphasis>
+ <property>src</property>
+ </emphasis> folder java classes are created.</para>
+ </listitem>
</itemizedlist>
<figure>
<title>Entities Java Classes</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_20.png" scale="75"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_20.png"
+ scale="75"/>
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
<listitem>
- <para>Switch to <property>Hibernate</property> perspective with <emphasis><property>Window->Open Perspective->Other...</property></emphasis>. On <property>Hibernate Configurations</property> view expand the <emphasis><property>crudapp</property></emphasis> configuration. Right click on <property>Customers</property> and select <emphasis><property>Open Mapping Diagram</property></emphasis> from the popup menu.</para>
+ <para>Switch to <property>Hibernate</property> perspective with <emphasis>
+ <property>Window->Open Perspective->Other...</property>
+ </emphasis>. On <property>Hibernate Configurations</property> view expand the <emphasis>
+ <property>crudapp</property>
+ </emphasis> configuration. Right click on <property>Customers</property> and
+ select <emphasis>
+ <property>Open Mapping Diagram</property>
+ </emphasis> from the popup menu.</para>
</listitem>
</itemizedlist>
<figure>
<title>Hibernate Configurations View</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_21.png" scale="75"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_21.png"
+ scale="75"/>
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
<listitem>
- <para>Observe that <property>Mapping Diagram</property> is opened in the editor. Here you can see the relations between models and database tables. Select <property>Customers</property> entity model, right click and select <emphasis><property>Open Source File</property></emphasis>.</para>
+ <para>Observe that <property>Mapping Diagram</property> is opened in the editor.
+ Here you can see the relations between models and database tables. Select
+ <property>Customers</property> entity model, right click and select <emphasis>
+ <property>Open Source File</property>
+ </emphasis>.</para>
</listitem>
</itemizedlist>
<figure>
<title>Mapping Diagram</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_22.png" scale="75"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_22.png"
+ scale="75"/>
</imageobject>
</mediaobject>
</figure>
<itemizedlist>
<listitem>
- <para>This will open the <property>Customers.java</property> file in the java editor.</para>
+ <para>This will open the <property>Customers.java</property> file in the java
+ editor.</para>
</listitem>
</itemizedlist>
<figure>
<title>Entity class from Mapping Diagram</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/crud_database_application/crud_database_application_23.png" scale="75"/>
+ <imagedata
+ fileref="images/crud_database_application/crud_database_application_23.png"
+ scale="75"/>
</imageobject>
</mediaobject>
</figure>
-
- <para>After that you are ready to deploy your application to J2EE application server. This is described in the next chapter.</para>
- </section>
+ <para>After that you are ready to deploy your application to J2EE application server. This
+ is described in the next chapter.</para>
+ </section>
+
</chapter>
-
Modified: branches/jbosstools-2.1.x/seam/docs/reference/en/modules/directory_structure.xml
===================================================================
--- branches/jbosstools-2.1.x/seam/docs/reference/en/modules/directory_structure.xml 2008-05-21 10:23:39 UTC (rev 8252)
+++ branches/jbosstools-2.1.x/seam/docs/reference/en/modules/directory_structure.xml 2008-05-21 11:01:22 UTC (rev 8253)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="directory_str" xreflabel="directory_str">
+<chapter id="directory_str" xreflabel="directory_str" revisionflag="added">
<?dbhtml filename="directory_structure.html"?>
<chapterinfo>
<keywordset>
Modified: branches/jbosstools-2.1.x/seam/docs/reference/en/modules/generate_entities.xml
===================================================================
--- branches/jbosstools-2.1.x/seam/docs/reference/en/modules/generate_entities.xml 2008-05-21 10:23:39 UTC (rev 8252)
+++ branches/jbosstools-2.1.x/seam/docs/reference/en/modules/generate_entities.xml 2008-05-21 11:01:22 UTC (rev 8253)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="generate_entities" xreflabel="generate_entities">
+<chapter id="generate_entities" xreflabel="generate_entities">
<?dbhtml filename="generate_entities.html"?>
<chapterinfo>
<keywordset>
Modified: branches/jbosstools-2.1.x/seam/docs/reference/en/modules/intro.xml
===================================================================
--- branches/jbosstools-2.1.x/seam/docs/reference/en/modules/intro.xml 2008-05-21 10:23:39 UTC (rev 8252)
+++ branches/jbosstools-2.1.x/seam/docs/reference/en/modules/intro.xml 2008-05-21 11:01:22 UTC (rev 8253)
@@ -25,7 +25,7 @@
applications with many component frameworks.</para>
</section>
- <section>
+ <section revisionflag="added">
<title>Installation into Eclipse</title>
<para>Here, we are going to explain how to install Seam plugin into Eclipse.</para>
Modified: branches/jbosstools-2.1.x/seam/docs/reference/en/modules/seam_editors.xml
===================================================================
--- branches/jbosstools-2.1.x/seam/docs/reference/en/modules/seam_editors.xml 2008-05-21 10:23:39 UTC (rev 8252)
+++ branches/jbosstools-2.1.x/seam/docs/reference/en/modules/seam_editors.xml 2008-05-21 11:01:22 UTC (rev 8253)
@@ -88,7 +88,7 @@
on your project which will execute all the active WTP validations.</para>
</section>
- <section id="ComponentsEditor">
+ <section id="ComponentsEditor" revisionflag="changed">
<title>Structured components.xml Editor</title>
<para>When editing <property>components.xml</property> a structured tree editor is available in addition to pure source editing.
Modified: branches/jbosstools-2.1.x/seam/docs/reference/en/modules/seam_preferences.xml
===================================================================
--- branches/jbosstools-2.1.x/seam/docs/reference/en/modules/seam_preferences.xml 2008-05-21 10:23:39 UTC (rev 8252)
+++ branches/jbosstools-2.1.x/seam/docs/reference/en/modules/seam_preferences.xml 2008-05-21 11:01:22 UTC (rev 8253)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="seam_preferences" xreflabel="seam_preferences">
+<chapter id="seam_preferences" xreflabel="seam_preferences"> <!-- mark as new -->
<?dbhtml filename="seam_preferences.html"?>
<chapterinfo>
<keywordset>
@@ -16,7 +16,7 @@
<section id="gen_pref">
<title>General Preferences</title>
-<para>Seam preferences can be set using the Seam preference page. Click on <property><emphasis>Window > Preferences > JBoss Tools > Web > Seam</emphasis>.</property></para>
+ <para>Seam preferences can be set using the Seam preference page. Click on <emphasis><property>Window > Preferences > JBoss Tools > Web > Seam</property>.</emphasis></para>
<para>On this page you can manage the Seam Runtime. Use the appropriate buttons to <property>Add</property> more runtimes or to <property>Remove</property> those that are not needed.</para>
@@ -46,7 +46,7 @@
<title>Validator Preferences</title>
<para>Seam preference page includes a subsection <property>Validator</property>.
- See <property><emphasis>Window > Preferences > JBoss Tools > Web > Seam > Validator</emphasis>.</property></para>
+ See <emphasis><property>Window > Preferences > JBoss Tools > Web > Seam > Validator</property>.</emphasis></para>
<para>On this page you can choose a severity level for the various Seam validator problems. For example, if you want to ignore the case when component
name is duplicated expand the <property>Components</property> node and select <property>Ignore</property> next to <property>Duplicate component name</property>.
After that you won't see the error.</para>
Modified: branches/jbosstools-2.1.x/seam/docs/reference/pom.xml
===================================================================
--- branches/jbosstools-2.1.x/seam/docs/reference/pom.xml 2008-05-21 10:23:39 UTC (rev 8252)
+++ branches/jbosstools-2.1.x/seam/docs/reference/pom.xml 2008-05-21 11:01:22 UTC (rev 8253)
@@ -21,12 +21,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0.Beta1</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0.Beta1</version>
+ <version>1.1.0</version>
<type>jdocbook-style</type>
</dependency>
</dependencies>
17 years, 11 months
JBoss Tools SVN: r8252 - branches/jbosstools-2.1.x/jsf/docs/userguide.
by jbosstools-commits@lists.jboss.org
Author: smukhina
Date: 2008-05-21 06:23:39 -0400 (Wed, 21 May 2008)
New Revision: 8252
Modified:
branches/jbosstools-2.1.x/jsf/docs/userguide/pom.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-324
the file is merged to branch from trunk
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/pom.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/userguide/pom.xml 2008-05-21 10:20:00 UTC (rev 8251)
+++ branches/jbosstools-2.1.x/jsf/docs/userguide/pom.xml 2008-05-21 10:23:39 UTC (rev 8252)
@@ -21,18 +21,18 @@
<dependency>
<groupId>com.jboss</groupId>
<artifactId>jbossent-docbook-xslt</artifactId>
- <version>1.1.0.Beta1</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.jboss</groupId>
<artifactId>jbossent-jdocbook-style</artifactId>
- <version>1.1.0.Beta1</version>
+ <version>1.0.0</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0.Beta1</version>
+ <version>1.1.0</version>
<type>jdocbook-style</type>
</dependency>
</dependencies>
@@ -81,25 +81,8 @@
</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>
<translation>en-US</translation>
</properties>
-
-
</project>
17 years, 11 months
JBoss Tools SVN: r8251 - in branches/jbosstools-2.1.x/jsf/docs: jsf_tools_ref_guide and 8 other directories.
by jbosstools-commits@lists.jboss.org
Author: smukhina
Date: 2008-05-21 06:20:00 -0400 (Wed, 21 May 2008)
New Revision: 8251
Removed:
branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_8.png
Modified:
branches/jbosstools-2.1.x/jsf/docs/
branches/jbosstools-2.1.x/jsf/docs/jsf_tools_ref_guide/en/master.xml
branches/jbosstools-2.1.x/jsf/docs/jsf_tools_ref_guide/en/modules/managed_beans.xml
branches/jbosstools-2.1.x/jsf/docs/jsf_tools_ref_guide/pom.xml
branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/master.xml
branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/adding_managed_bean.xml
branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/adding_navigation.xml
branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/jsf_application.xml
branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/jsp_view_files.xml
branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/running_application.xml
branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/start_page.xml
branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/pom.xml
branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_1.png
branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_10.png
branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_11.png
branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_2.png
branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_3.png
branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_4.png
branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_5.png
branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_6.png
branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_7.png
branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_9.png
branches/jbosstools-2.1.x/jsf/docs/userguide/en/master.xml
branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/editors.xml
branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/palette.xml
branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/preferences.xml
branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/spring_tools.xml
branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/web_projects.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-324
Merged revisions 8046-8047,8059,8081-8083,8108-8109,8114,8141,8149-8151 via svnmerge from
https://svn.jboss.org/repos/jbosstools/trunk/jsf/docs
........
r8046 | afedosik | 2008-05-13 13:40:38 +0300 (Tue, 13 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-322 VPE chapter update, splitpane feature added
........
r8047 | afedosik | 2008-05-13 13:57:18 +0300 (Tue, 13 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-322 VPE chapter update, splitpane feature added
........
r8059 | ochikvina | 2008-05-13 16:05:20 +0300 (Tue, 13 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-320 - marking the chapters that are new or updated
........
r8081 | afedosik | 2008-05-14 18:07:27 +0300 (Wed, 14 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-319 xslt versions (enterprise styles) corrected
........
r8082 | ochikvina | 2008-05-14 18:25:20 +0300 (Wed, 14 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-162 - updating screen
........
r8083 | smukhina | 2008-05-14 18:48:37 +0300 (Wed, 14 May 2008) | 2 lines
http://jira.jboss.com/jira/browse/JBDS-320
comments are corrected to the corresponding docbook tags with attributes
........
r8108 | ochikvina | 2008-05-15 18:28:55 +0300 (Thu, 15 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-285 - authors info is added
........
r8109 | ochikvina | 2008-05-15 18:29:04 +0300 (Thu, 15 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-285 - authors info is added
........
r8114 | smukhina | 2008-05-15 19:49:38 +0300 (Thu, 15 May 2008) | 2 lines
http://jira.jboss.com/jira/browse/JBDS-326
folders En-us and publish and staging are removed from nightly docs build, variables for links will be checked then
........
r8141 | smukhina | 2008-05-16 19:18:45 +0300 (Fri, 16 May 2008) | 1 line
new styles 1.1.0 and 1.0.0. are correspondingly added to the guides
........
r8149 | ochikvina | 2008-05-16 20:10:38 +0300 (Fri, 16 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-286 - correcting errors found by XML validator
........
r8150 | ochikvina | 2008-05-16 20:12:54 +0300 (Fri, 16 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-286 - correcting errors found by XML validator
........
r8151 | ochikvina | 2008-05-16 20:16:27 +0300 (Fri, 16 May 2008) | 1 line
http://jira.jboss.com/jira/browse/JBDS-286 - correcting errors found by XML validator
........
Property changes on: branches/jbosstools-2.1.x/jsf/docs
___________________________________________________________________
Name: svnmerge-integrated
+ /trunk/jsf/docs:1-7998,8046-8151
Modified: branches/jbosstools-2.1.x/jsf/docs/jsf_tools_ref_guide/en/master.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/jsf_tools_ref_guide/en/master.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/jsf_tools_ref_guide/en/master.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -11,24 +11,29 @@
<!ENTITY creation_and_registration SYSTEM "modules/creation_and_registration.xml">
<!ENTITY jsf_project_verification SYSTEM "modules/jsf_project_verification.xml">
-<!ENTITY seamlink "../../../../seam/publish/en-US/html_single/index.html">
-<!ENTITY aslink "../../../../as/publish/en-US/html_single/index.html">
-<!ENTITY esblink "../../../../esb_ref_guide/publish/en-US/html_single/index.html">
-<!ENTITY gsglink "../../../../GettingStartedGuide/publish/en-US/html_single/index.html">
-<!ENTITY hibernatelink "../../../../hibernatetools/publish/en-US/html_single/index.html">
-<!ENTITY jbpmlink "../../../../jbpm/publish/en-US/html_single/index.html">
-<!ENTITY jsflink "../../../../jsf/publish/en-US/html_single/index.html">
-<!ENTITY jsfreflink "../../../../jsf_tools_ref_guide/publish/en-US/html_single/index.html">
-<!ENTITY jsftutoriallink "../../../../jsf_tools_tutorial/publish/en-US/html_single/index.html">
-<!ENTITY strutsreflink "../../../../struts_tools_ref_guide/publish/en-US/html_single/index.html">
-<!ENTITY strutstutoriallink "../../../../struts_tools_tutorial/publish/en-US/html_single/index.html">
-<!ENTITY migrationlink "../../../../Exadel-migration/publish/en-US/html_single/index.html">
+<!ENTITY seamlink "../../../../seam/html_single/index.html">
+<!ENTITY aslink "../../../../as/html_single/index.html">
+<!ENTITY esblink "../../../../esb_ref_guide/html_single/index.html">
+<!ENTITY gsglink "../../../../GettingStartedGuide/html_single/index.html">
+<!ENTITY hibernatelink "../../../../hibernatetools/html_single/index.html">
+<!ENTITY jbpmlink "../../../../jbpm/html_single/index.html">
+<!ENTITY jsflink "../../../../jsf/html_single/index.html">
+<!ENTITY jsfreflink "../../../../jsf_tools_ref_guide/html_single/index.html">
+<!ENTITY jsftutoriallink "../../../../jsf_tools_tutorial/html_single/index.html">
+<!ENTITY strutsreflink "../../../../struts_tools_ref_guide/html_single/index.html">
+<!ENTITY strutstutoriallink "../../../../struts_tools_tutorial/html_single/index.html">
+<!ENTITY migrationlink "../../../../Exadel-migration/html_single/index.html">
]>
<book>
<bookinfo>
<title>JSF Tools Reference Guide</title>
+
+ <author><firstname>Anatoly</firstname><surname>Fedosik</surname></author>
+ <author><firstname>Olga</firstname><surname>Chikvina</surname></author>
+ <author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
+
<pubdate>April 2008</pubdate>
<copyright>
<year>2007</year>
@@ -36,7 +41,7 @@
<holder>JBoss, a division of Red Hat Inc.</holder>
</copyright>
<releaseinfo>
- <para>Version: 2.1.0.CR1</para>
+ Version: 2.1.0.CR1
</releaseinfo>
</bookinfo>
Modified: branches/jbosstools-2.1.x/jsf/docs/jsf_tools_ref_guide/en/modules/managed_beans.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/jsf_tools_ref_guide/en/modules/managed_beans.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/jsf_tools_ref_guide/en/modules/managed_beans.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -138,9 +138,9 @@
<para>When the form is open make sure that all the check boxes are
selected:</para>
<itemizedlist>
- <listitem>Add Java property</listitem>
- <listitem>Generate Getter</listitem>
- <listitem>Generate Setter</listitem>
+ <listitem><para>Add Java property</para></listitem>
+ <listitem><para>Generate Getter</para></listitem>
+ <listitem><para>Generate Setter</para></listitem>
</itemizedlist>
<para/>
<figure>
Modified: branches/jbosstools-2.1.x/jsf/docs/jsf_tools_ref_guide/pom.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/jsf_tools_ref_guide/pom.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/jsf_tools_ref_guide/pom.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -21,12 +21,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0.Beta1</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0.Beta1</version>
+ <version>1.1.0</version>
<type>jdocbook-style</type>
</dependency>
</dependencies>
Modified: branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/master.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/master.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/master.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -11,17 +11,17 @@
<!ENTITY running_application SYSTEM "modules/running_application.xml">
<!ENTITY relevant_resources SYSTEM "modules/relevant_resources.xml">
-<!ENTITY seamlink "../../../../seam/publish/en-US/html_single/index.html">
-<!ENTITY aslink "../../../../as/publish/en-US/html_single/index.html">
-<!ENTITY esblink "../../../../esb_ref_guide/publish/en-US/html_single/index.html">
-<!ENTITY gsglink "../../../../GettingStartedGuide/publish/en-US/html_single/index.html">
-<!ENTITY hibernatelink "../../../../hibernatetools/publish/en-US/html_single/index.html">
-<!ENTITY jbpmlink "../../../../jbpm/publish/en-US/html_single/index.html">
-<!ENTITY jsflink "../../../../jsf/publish/en-US/html_single/index.html">
-<!ENTITY jsfreflink "../../../../jsf_tools_ref_guide/publish/en-US/html_single/index.html">
-<!ENTITY jsftutoriallink "../../../../jsf_tools_tutorial/publish/en-US/html_single/index.html">
-<!ENTITY strutsreflink "../../../../struts_tools_ref_guide/publish/en-US/html_single/index.html">
-<!ENTITY strutstutoriallink "../../../../struts_tools_tutorial/publish/en-US/html_single/index.html">
+<!ENTITY seamlink "../../../../seam/html_single/index.html">
+<!ENTITY aslink "../../../../as/html_single/index.html">
+<!ENTITY esblink "../../../../esb_ref_guide/html_single/index.html">
+<!ENTITY gsglink "../../../../GettingStartedGuide/html_single/index.html">
+<!ENTITY hibernatelink "../../../../hibernatetools/html_single/index.html">
+<!ENTITY jbpmlink "../../../../jbpm/html_single/index.html">
+<!ENTITY jsflink "../../../../jsf/html_single/index.html">
+<!ENTITY jsfreflink "../../../../jsf_tools_ref_guide/html_single/index.html">
+<!ENTITY jsftutoriallink "../../../../jsf_tools_tutorial/html_single/index.html">
+<!ENTITY strutsreflink "../../../../struts_tools_ref_guide/html_single/index.html">
+<!ENTITY strutstutoriallink "../../../../struts_tools_tutorial/html_single/index.html">
]>
@@ -30,6 +30,10 @@
<bookinfo>
<title>JSF Tools Tutorial</title>
+ <author><firstname>Anatoly</firstname><surname>Fedosik</surname></author>
+ <author><firstname>Olga</firstname><surname>Chikvina</surname></author>
+ <author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
+
<pubdate>April 2008</pubdate>
<copyright>
<year>2007</year>
@@ -37,9 +41,9 @@
<holder>JBoss, a division of Red Hat Inc.</holder>
</copyright>
- <releaseinfo>
-<para>Version: 2.1.0.CR1</para>
-</releaseinfo>
+ <releaseinfo>
+ Version: 2.1.0.CR1
+ </releaseinfo>
</bookinfo>
<toc/>
Modified: branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/adding_managed_bean.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/adding_managed_bean.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/adding_managed_bean.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -11,7 +11,7 @@
<title>Adding a Managed Bean to the Application</title>
<para>To store data in the application, we will use a managed bean.</para>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>Click on the <emphasis>
<property>Tree</property>
@@ -74,7 +74,7 @@
</imageobject>
</mediaobject>
</figure>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>Select <emphasis>
<property>File > Save</property>
Modified: branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/adding_navigation.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/adding_navigation.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/adding_navigation.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -19,7 +19,7 @@
<section id="AddingTwoViewsJSPPages">
<?dbhtml filename="AddingTwoViewsJSPPages.html"?>
<title>Adding Two Views (JSP Pages)</title>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>Right-click anywhere on the diagram and select <emphasis>
<property>New View...</property>
@@ -66,7 +66,7 @@
<section id="CreatingTheTransitionNavigationRule">
<?dbhtml filename="CreatingTheTransitionNavigationRule.html"?>
<title>Creating the Transition (Navigation Rule)</title>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>In the diagram, select the connection icon third from the top along
the upper left side of the diagram</para>
@@ -81,7 +81,7 @@
</mediaobject>
</figure>
<para>to get an arrow cursor with a two-pronged plug at the arrow's bottom.</para>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>Click on the <emphasis>
<property>pages/inputname</property>
@@ -100,7 +100,7 @@
</imageobject>
</mediaobject>
</figure>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>Select <emphasis>
<property>File > Save</property>
Modified: branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/jsf_application.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/jsf_application.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/jsf_application.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -65,7 +65,7 @@
</imageobject>
</mediaobject>
</figure>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>Click the plus sign next to <emphasis>
<property>jsfHello</property>
Modified: branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/jsp_view_files.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/jsp_view_files.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/jsp_view_files.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -15,7 +15,7 @@
JSP Visual Page.</para>
<section id="Inputname.jsp">
<title>inputname.jsp</title>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>Click on the <emphasis>
<property>Diagram</property>
@@ -40,7 +40,7 @@
</figure>
<para>Some JSF code is already in the file, because we have chosen a template to create
a page.</para>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>Select the <emphasis>
<property>Visual</property>
@@ -61,7 +61,7 @@
</imageobject>
</mediaobject>
</figure>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>Click on <emphasis>
<property>form</property>
@@ -116,7 +116,8 @@
</emphasis> attribute, and then click on the <emphasis>
<property>Finish</property>
</emphasis> button</para>
- </listitem>' <listitem>
+ </listitem>
+ <listitem>
<para>Select <emphasis>
<property>commandButton</property>
</emphasis> within the JSF HTML palette folder and drag it into the
@@ -171,7 +172,7 @@
</imageobject>
</mediaobject>
</figure>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>Save the file by selecting <emphasis>
<property>File > Save</property>
@@ -181,7 +182,7 @@
</section>
<section id="Greeting.jsp">
<title>greeting.jsp</title>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>Click on the <emphasis>
<property>faces-config.xml</property>
@@ -245,7 +246,7 @@
</body>
</html>
]]></programlisting>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>Save the file</para>
</listitem>
Modified: branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/running_application.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/running_application.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/running_application.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -20,7 +20,7 @@
</imageobject>
</mediaobject>
</figure>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>Start up JBoss by clicking on the icon in JBoss Server view. (If JBoss is
already running, stop it by clicking on the red icon and then start it again.
Modified: branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/start_page.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/start_page.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/en/modules/start_page.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -11,7 +11,7 @@
<title>Creating the Start Page</title>
<para>You also need to create a start page as an entry point into the application.</para>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>In the Package Explorer view to the left, right-click <emphasis>
<property>jsfHello > WebContent</property>
@@ -31,7 +31,7 @@
</itemizedlist>
<para>A JSP editor will open up on the newly created file.</para>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>In the Source part of the split screen, type <emphasis>
<property>/pages/inputname.jsf</property>
@@ -53,7 +53,7 @@
</emphasis> extension for the file name. This is a mapping defined in the web.xml file
for the project for invoking <property>JavaServer Faces</property> when you run the
application.</para>
- <itemizedlist continuation="continues">
+ <itemizedlist>
<listitem>
<para>Select<emphasis>
<property> File > Save</property>
Modified: branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/pom.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/pom.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/jsf_tools_tutorial/pom.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -21,12 +21,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0.Beta1</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0.Beta1</version>
+ <version>1.1.0</version>
<type>jdocbook-style</type>
</dependency>
</dependencies>
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_1.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_10.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_11.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_2.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_3.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_4.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_5.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_6.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_7.png
===================================================================
(Binary files differ)
Deleted: branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_8.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/images/visual_page/visual_page_9.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/master.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/userguide/en/master.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/userguide/en/master.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -34,7 +34,7 @@
<holder>JBoss, a division of Red Hat Inc.</holder>
</copyright>
<releaseinfo>
- <para>Version: 1.1.0.CR1</para>
+ Version: 1.1.0.CR1
</releaseinfo>
</bookinfo>
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/editors.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/editors.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/editors.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -757,24 +757,24 @@
<section id="visual_page">
<title>Visual Page Editor</title>
- <para><property>JBoss Developer Studio</property> comes with a powerful and customizable <property>Visual Page
+ <para>JBoss Developer Studio comes with a powerful and customizable <property>Visual Page
Editor</property> (VPE). You can use the Visual Page Editor to develop an
application using any technology: JSF, Struts, JSP, HTML and others.</para>
- <para>Current VPE version has four tabs: Visual/Source, Visual, Source and Preview.</para>
+ <para>Current VPE version has two tabs: <property>Visual/Source</property> and <property>Preview</property>.</para>
<para>Here is shown a split screen design with instant synchronization between Source and Visual views:</para>
<figure>
<title>Visual/Source View</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_1.png"/>
+ <imagedata fileref="images/visual_page/visual_page_1.png" scale="95"/>
</imageobject>
</mediaobject>
</figure>
- <para>You can also switch to pure Visual design:</para>
+ <para>Preview view is read-only, it shows how the page will look like in a browser.</para>
<figure>
- <title>Visual View</title>
+ <title>Preview View</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/visual_page/visual_page_2.png"/>
@@ -782,54 +782,41 @@
</mediaobject>
</figure>
- <para>Or work just in Source view.</para>
-
- <note><para>Selection bar is now available not only in
- Visual mode but also in Source one.</para></note>
-
+ <para>The Visual Page Editor has a split pane with toggle buttons for quickly moving between source, visual or source/visual modes instead of multiple tabs.</para>
+ <para>You can use Shift + F6 and Alt + Shift + F6 as shortcuts to toggle between the various states of the split pane.</para>
+
+ <tip>
+ <title>Tip:</title>
+ <para>When editing large documents hiding the visual part will speed up the editing.</para>
+ </tip>
+
<figure>
- <title>Source View</title>
+ <title>Split Pane in VPE</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/visual_page/visual_page_3.png"/>
</imageobject>
</mediaobject>
</figure>
+
<para>No matter what view you select, you get a full integration with Properties and Outline
views:</para>
<figure>
- <title>Properties And Outline Views</title>
+ <title>Integration with Properties and Outline Views</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_4.png" scale="65"/>
+ <imagedata fileref="images/visual_page/visual_page_4.png" scale="55"/>
</imageobject>
</mediaobject>
</figure>
- <para>Preview mode is read-only, it shows how the page will look like in a browser.</para>
+
+ <para>The VPE allows you to insert any tags from the palette to the page you
+ are editing with just a click or drag-and-drop.</para>
<figure>
- <title>Preview Mode</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/visual_page/visual_page_5.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>Use the graphical toolbar to add inline styling to any tag.</para>
- <figure>
- <title>Graphical Toolbar</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/visual_page/visual_page_6.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>With just a click or drag-and-drop insert any tags from the palette on to the page you
- are editing.</para>
- <figure>
<title>Inserting Tags From Palette</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_7.png" scale="80"/>
+ <imagedata fileref="images/visual_page/visual_page_5.png" scale="80"/>
</imageobject>
</mediaobject>
</figure>
@@ -837,45 +824,44 @@
<section id="AdvancedSettings954">
<title>Advanced Settings</title>
+
+ <para>In the visual part of VPE there is a graphical toolbar, use it to add inline styling to any tag. The toolbar can be hidden by clicking on
+ arrow sign in the upper left corner.</para>
+
+ <figure>
+ <title>Text Formatting</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_6.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>In the left vertical pane there are three buttons: Preferences, Refresh, Page Design Options.</para>
- <para>There are three buttons on the <property>Visual Page Editor</property> left side:</para>
-
<figure>
<title>Visual Page Editor Buttons</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_8.png"/>
+ <imagedata fileref="images/visual_page/visual_page_7.png"/>
</imageobject>
</mediaobject>
</figure>
- <itemizedlist>
- <listitem>
- <para>Preferences</para>
- </listitem>
- </itemizedlist>
- <para>Provides quick access to Visual Page Editor preferences.</para>
- <figure>
+ <para><property>Preferences</property> button provides a quick access to Visual Page Editor preferences.</para>
+
+ <figure>
<title>Visual Page Editor Preferences Window</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/visual_page/visual_page_9.png"/>
</imageobject>
</mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>Refresh</para>
- </listitem>
- </itemizedlist>
- <para>Refresh displaying information with this button.</para>
+ </figure>
+
+ <para>Clicking on <property>Refresh</property> button you refresh the displaying information.</para>
- <itemizedlist>
- <listitem>
- <para>Page Design Options</para>
- </listitem>
- </itemizedlist>
- <para>This button leads to page design options.</para>
+ <para><property>Page Design Options</property> button leads to page design options.</para>
<figure>
<title>Page Design Options</title>
<mediaobject>
@@ -930,13 +916,11 @@
<property><project>WebContent > pages</property>
</emphasis> and you will see the image appear.</para>
<para/>
- <itemizedlist>
- <listitem>
- <para>Hide Selection bar</para>
- </listitem>
- </itemizedlist>
+
+ <para>At the bottom of VPE there is a <property>Selection bar</property>.</para>
+
<para> By clicking on the component in Visual view or selecting a code snippet in Source
- mode you can see the tags tree. If you want to hide the selection bar, use the
+ mode you see the tags tree. If you want to hide the selection bar, use the
"Hide Selection Bar" button on the lower right side.</para>
<figure>
@@ -953,14 +937,15 @@
<section id="SetupnotesforLinu895x">
<title>Setup notes for Linux</title>
+
+ <para>Linux users may need to do the following to get the Visual Editor to work
+ correctly on their machines.</para>
+
<section id="HowToStartTheVisualPageEditorUnderLinux85">
-
+
<title>How to Start the Visual Page Editor under Linux</title>
- <para>Linux users may need to do the following to get the Visual Editor to work
- correctly on their machines.</para>
-
- <para> The Visual Page Editor requires the library libstdc++.so.5. This library is
+ <para> The Visual Page Editor requires the library libstdc++.so.5. This library is
contained in the compat-libstdc++-33.i386 package.</para>
<itemizedlist>
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/palette.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/palette.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/palette.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<chapter id="palette" xreflabel="palette">
+<chapter id="palette" xreflabel="palette" revisionflag="changed">
<?dbhtml filename="palette.html"?>
<chapterinfo>
<keywordset>
@@ -324,7 +324,7 @@
</itemizedlist>
</para>
</section>
- <section id="Show/Hide">
+ <section id="show_hide">
<?dbhtml filename="Show/Hide.html"?>
<title>Show/Hide</title>
<para><emphasis>
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/preferences.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/preferences.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/preferences.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -16,32 +16,32 @@
<para>From this screen, you can select these more specific sets of <property>JBoss Tools preferences</property>:</para>
<itemizedlist>
- <listitem><link linkend="CodeAssist">Code Assist</link></listitem>
- <listitem><link linkend="Editors">Editors</link></listitem>
- <listitem><link linkend="JBossServers">JBoss Servers</link></listitem>
- <listitem><link linkend="JSF">JSF</link></listitem>
- <listitem><link linkend="JSFFlowDiagram">JSF Flow Diagram</link></listitem>
- <listitem><link linkend="JSFPage">JSF Page</link></listitem>
- <listitem><link linkend="JSFPropject">JSF Propject</link></listitem>
- <listitem><link linkend="PackagingArchives">Packaging Archives</link></listitem>
- <listitem><link linkend="Plug-inInsets">Plug-in Insets</link></listitem>
- <listitem><link linkend="ResourceInsets">Resource Insets</link></listitem>
- <listitem><link linkend="Seam">Seam</link></listitem>
- <listitem><link linkend="SeamValidator">Seam Validator</link></listitem>
- <listitem><link linkend="Struts">Struts</link></listitem>
- <listitem><link linkend="StrutsAutomatic">Struts Automatic</link></listitem>
- <listitem><link linkend="StrutsCustomization">Struts Customization</link></listitem>
- <listitem><link linkend="StrutsFlowDiagram">Struts Flow Diagram</link></listitem>
- <listitem><link linkend="StrutsPages">Struts Pages</link></listitem>
- <listitem><link linkend="StrutsProject">Struts Project</link></listitem>
- <listitem><link linkend="StrutsSupport">Struts Support</link></listitem>
- <listitem><link linkend="TitleDiagram">Title Diagram</link></listitem>
- <listitem><link linkend="Verification">Verification</link></listitem>
- <listitem><link linkend="View">View</link></listitem>
- <listitem><link linkend="VisualPageEditor2">Visual Page Editor</link></listitem>
- <listitem><link linkend="XDoclet">XDoclet</link></listitem>
- <listitem><link linkend="XDocletTemplates">XDoclet Templets</link></listitem>
- <listitem><link linkend="XDocletsVariables">XDoclets Variables</link></listitem>
+ <listitem><para><link linkend="CodeAssist">Code Assist</link></para></listitem>
+ <listitem><para><link linkend="Editors">Editors</link></para></listitem>
+ <listitem><para><link linkend="JBossServers">JBoss Servers</link></para></listitem>
+ <listitem><para><link linkend="JSF">JSF</link></para></listitem>
+ <listitem><para><link linkend="JSFFlowDiagram">JSF Flow Diagram</link></para></listitem>
+ <listitem><para><link linkend="JSFPage">JSF Page</link></para></listitem>
+ <listitem><para><link linkend="JSFPropject">JSF Propject</link></para></listitem>
+ <listitem><para><link linkend="PackagingArchives">Packaging Archives</link></para></listitem>
+ <listitem><para><link linkend="Plug-inInsets">Plug-in Insets</link></para></listitem>
+ <listitem><para><link linkend="ResourceInsets">Resource Insets</link></para></listitem>
+ <listitem><para><link linkend="Seam">Seam</link></para></listitem>
+ <listitem><para><link linkend="SeamValidator">Seam Validator</link></para></listitem>
+ <listitem><para><link linkend="Struts">Struts</link></para></listitem>
+ <listitem><para><link linkend="StrutsAutomatic">Struts Automatic</link></para></listitem>
+ <listitem><para><link linkend="StrutsCustomization">Struts Customization</link></para></listitem>
+ <listitem><para><link linkend="StrutsFlowDiagram">Struts Flow Diagram</link></para></listitem>
+ <listitem><para><link linkend="StrutsPages">Struts Pages</link></para></listitem>
+ <listitem><para><link linkend="StrutsProject">Struts Project</link></para></listitem>
+ <listitem><para><link linkend="StrutsSupport">Struts Support</link></para></listitem>
+ <listitem><para><link linkend="TitleDiagram">Title Diagram</link></para></listitem>
+ <listitem><para><link linkend="Verification">Verification</link></para></listitem>
+ <listitem><para><link linkend="View">View</link></para></listitem>
+ <listitem><para><link linkend="VisualPageEditor2">Visual Page Editor</link></para></listitem>
+ <listitem><para><link linkend="XDoclet">XDoclet</link></para></listitem>
+ <listitem><para><link linkend="XDocletTemplates">XDoclet Templets</link></para></listitem>
+ <listitem><para><link linkend="XDocletsVariables">XDoclets Variables</link></para></listitem>
</itemizedlist>
<section id="CodeAssist">
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/spring_tools.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/spring_tools.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/spring_tools.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="springTools">
+<chapter id="springTools" revisionflag="added">
<?dbhtml filename="springTools.html"?>
<title>Spring Tools</title>
@@ -11,44 +11,17 @@
<title><ulink url="http://springide.org/project/wiki/SpringideGuide">Spring IDE guide</ulink></title>
<para><ulink url="http://springide.org/project">Spring IDE</ulink> is a graphical user interface for the configuration files used by the <ulink url="http://www.springframework.org/">Spring Framework</ulink>. It's built as a set of plugins for the Eclipse platform.</para>
-
- <section>
- <title><ulink url="http://springide.org/project/wiki/SpringideGuide#AddProjectNature">Add Spring Project Nature</ulink></title>
- </section>
-
- <section>
- <title><ulink url="http://springide.org/project/wiki/SpringideGuide#CreateNewProject">Create New Spring Project</ulink></title>
- </section>
-
- <section>
- <title><ulink url="http://springide.org/project/wiki/SpringideGuide#AddProjectReferences">Add References To Other Spring Projects</ulink></title>
- </section>
-
- <section>
- <title><ulink url="http://springide.org/project/wiki/SpringideGuide#AddBeansConfigs">Add Spring Beans Config Files</ulink></title>
- </section>
-
- <section>
- <title><ulink url="http://springide.org/project/wiki/SpringideGuide#CreateBeansConfigSets">Create Spring Beans Config Sets</ulink></title>
- </section>
+
+ <section><title><ulink url="http://springide.org/project/wiki/SpringideGuide#AddProjectNature">Add Spring Project Nature</ulink></title></section>
+ <section><title><ulink url="http://springide.org/project/wiki/SpringideGuide#CreateNewProject">Create New Spring Project</ulink></title></section>
+ <section><title><ulink url="http://springide.org/project/wiki/SpringideGuide#AddProjectReferences">Add References To Other Spring Projects</ulink></title></section>
+ <section><title><ulink url="http://springide.org/project/wiki/SpringideGuide#AddBeansConfigs">Add Spring Beans Config Files</ulink></title></section>
+ <section><title><ulink url="http://springide.org/project/wiki/SpringideGuide#CreateBeansConfigSets">Create Spring Beans Config Sets</ulink></title></section>
+ <section><title><ulink url="http://springide.org/project/wiki/SpringideGuide#OpenSpringExplorer">Open Spring Explorer</ulink></title></section>
+ <section><title><ulink url="http://springide.org/project/wiki/SpringideGuide#ValidateBeansConfig">Validate Spring Beans Config</ulink></title></section>
+ <section><title><ulink url="http://springide.org/project/wiki/SpringideGuide#OpenBeansGraph">Open Spring Beans Graph</ulink></title></section>
+ <section><title><ulink url="http://springide.org/project/wiki/SpringideGuide#SearchBeans">Search Spring Beans</ulink></title></section>
- <section>
- <title><ulink url="http://springide.org/project/wiki/SpringideGuide#OpenSpringExplorer">Open Spring Explorer</ulink></title>
- </section>
-
- <section>
- <title><ulink url="http://springide.org/project/wiki/SpringideGuide#ValidateBeansConfig">Validate Spring Beans Config</ulink></title>
- </section>
-
- <section>
- <title><ulink url="http://springide.org/project/wiki/SpringideGuide#OpenBeansGraph">Open Spring Beans Graph</ulink></title>
- </section>
-
- <section>
- <title><ulink url="http://springide.org/project/wiki/SpringideGuide#SearchBeans">Search Spring Beans</ulink></title>
- </section>
-
-
</section>
</chapter>
Modified: branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/web_projects.xml
===================================================================
--- branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/web_projects.xml 2008-05-21 09:01:58 UTC (rev 8250)
+++ branches/jbosstools-2.1.x/jsf/docs/userguide/en/modules/web_projects.xml 2008-05-21 10:20:00 UTC (rev 8251)
@@ -8,20 +8,22 @@
<itemizedlist>
<listitem><para>Visualize the project better because the project artifacts for JSF and Struts projects are organized and displayed by function.</para></listitem>
-<listitem> Select these kinds of items to drag and drop into JSP pages:
-<itemizedlist>
-<listitem><para>JSF managed bean attributes</para></listitem>
+<listitem>
+ <para>Select these kinds of items to drag and drop into JSP pages:</para>
+ <itemizedlist>
+ <listitem><para>JSF managed bean attributes</para></listitem>
<listitem><para>JSF navigation rules outcomes</para></listitem>
<listitem><para>Property file values</para></listitem>
<listitem><para>Tag library files</para></listitem>
<listitem><para>Tags from tag libraries</para></listitem>
<listitem><para>JSP page links</para></listitem>
-</itemizedlist></listitem>
+</itemizedlist>
+</listitem>
<listitem><para>Use context menus to develop the application (all create and edit functions are available)</para></listitem>
<listitem><para>Use icon shortcuts to create and import JSF and Struts projects</para></listitem>
<listitem><para>Expand and inspect tag library files</para></listitem>
- <listitem><link linkend="AddingCustomJSFTagsToTheRedHatPalette7433">Select custom and third-party tag libraries to drag and drop onto
-the JBoss Tools Palette</link></listitem>
+<listitem><para><link linkend="AddingCustomJSFTagsToTheRedHatPalette7433">Select custom and third-party tag libraries to drag and drop onto
+the JBoss Tools Palette</link></para></listitem>
</itemizedlist>
<section id="ProjectOrganization">
17 years, 11 months
JBoss Tools SVN: r8250 - in trunk/ws/plugins: org.jboss.tools.ws.core/src/org/jboss/tools/ws/core and 12 other directories.
by jbosstools-commits@lists.jboss.org
Author: Grid.Qian
Date: 2008-05-21 05:01:58 -0400 (Wed, 21 May 2008)
New Revision: 8250
Added:
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCore.properties
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCoreMessages.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUI.properties
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUIMessages.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/UIUtils.java
Removed:
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore.properties
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessages.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/JbossWSUI.properties
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/JbossWSUIMessages.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/UIUtils.java
Modified:
trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JbossWSInstallRuntimeDelegate.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommand.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage.java
Log:
JBIDE-2047: improve codes and add validation for jboss ws bottomup
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF 2008-05-21 09:01:58 UTC (rev 8250)
@@ -16,6 +16,8 @@
Eclipse-LazyStart: true
Bundle-Vendor: %PLUGIN_PROVIDER
Export-Package: org.jboss.tools.ws.core,
+ org.jboss.tools.ws.core.classpath,
org.jboss.tools.ws.core.command,
org.jboss.tools.ws.core.facet.delegate,
+ org.jboss.tools.ws.core.messages,
org.jboss.tools.ws.core.utils
Deleted: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore.properties 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore.properties 2008-05-21 09:01:58 UTC (rev 8250)
@@ -1,12 +0,0 @@
-PROGRESS_INSTALL_JBOSSWS_RUNTIME=JBoss Web Service Runtime
-DIR_LIB=lib
-DIR_CLIENT=client
-DIR_WEB_INF=WEB-INF
-DIR_WEB_CONTENT=WebContent
-ERROR_COPY=Exception while copy JBossWS jars
-WS_LOCATION=jbosswsruntimelocation
-JBOSSWS_RUNTIME_LIB=JbossWSRuntimeLib
-JBOSSWS_RUNTIME=JBoss WS Runtime
-JBOSSAS=JBOSS
-ERROR_WS_LOCATION=The JBoss WS Runtime Location is NULL
-ERROR_WS_CLASSPATH=A error comes up when create JBoss WS Classpath
\ No newline at end of file
Deleted: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessages.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessages.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.ws.core;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Grid Qian
- */
-public class JbossWSCoreMessages {
-
- private static final String BUNDLE_NAME = "org.jboss.tools.ws.core.JbossWSCore"; //$NON-NLS-1$
-
- private JbossWSCoreMessages() {
- // Do not instantiate
- }
-
- public static String PROGRESS_INSTALL_JBOSSWS_RUNTIME;
- public static String DIR_LIB;
- public static String DIR_CLIENT;
- public static String DIR_WEB_INF;
- public static String DIR_WEB_CONTENT;
- public static String ERROR_COPY;
- public static String WS_LOCATION;
- public static String JBOSSWS_RUNTIME_LIB;
- public static String JBOSSWS_RUNTIME;
- public static String JBOSSAS;
- public static String ERROR_WS_LOCATION;
- public static String ERROR_WS_CLASSPATH;
-
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, JbossWSCoreMessages.class);
- }
-}
\ No newline at end of file
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -11,7 +11,7 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.launching.JavaRuntime;
-import org.jboss.tools.ws.core.JbossWSCoreMessages;
+import org.jboss.tools.ws.core.messages.JbossWSCoreMessages;
import org.jboss.tools.ws.core.utils.JbossWSCoreUtils;
/**
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -25,7 +25,7 @@
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.jboss.tools.ws.core.JbossWSCoreMessages;
+import org.jboss.tools.ws.core.messages.JbossWSCoreMessages;
import org.jboss.tools.ws.core.utils.StatusUtils;
/**
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -20,7 +20,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.jboss.tools.ws.core.JbossWSCoreMessages;
+import org.jboss.tools.ws.core.messages.JbossWSCoreMessages;
import org.jboss.tools.ws.core.utils.JbossWSCoreUtils;
import org.jboss.tools.ws.core.utils.StatusUtils;
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JbossWSInstallRuntimeDelegate.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JbossWSInstallRuntimeDelegate.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JbossWSInstallRuntimeDelegate.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -16,8 +16,8 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.jboss.tools.ws.core.JbossWSCoreMessages;
import org.jboss.tools.ws.core.command.JbossWSClassPathCommand;
+import org.jboss.tools.ws.core.messages.JbossWSCoreMessages;
/**
* @author Grid Qian
Copied: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCore.properties (from rev 8246, trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore.properties)
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCore.properties (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCore.properties 2008-05-21 09:01:58 UTC (rev 8250)
@@ -0,0 +1,12 @@
+PROGRESS_INSTALL_JBOSSWS_RUNTIME=JBoss Web Service Runtime
+DIR_LIB=lib
+DIR_CLIENT=client
+DIR_WEB_INF=WEB-INF
+DIR_WEB_CONTENT=WebContent
+ERROR_COPY=Exception while copy JBossWS jars
+WS_LOCATION=jbosswsruntimelocation
+JBOSSWS_RUNTIME_LIB=JbossWSRuntimeLib
+JBOSSWS_RUNTIME=JBoss WS Runtime
+JBOSSAS=JBOSS
+ERROR_WS_LOCATION=The JBoss WS Runtime Location is NULL
+ERROR_WS_CLASSPATH=A error comes up when create JBoss WS Classpath
\ No newline at end of file
Copied: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCoreMessages.java (from rev 8246, trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessages.java)
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCoreMessages.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCoreMessages.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.ws.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Grid Qian
+ */
+public class JbossWSCoreMessages {
+
+ private static final String BUNDLE_NAME = "org.jboss.tools.ws.core.JbossWSCore"; //$NON-NLS-1$
+
+ private JbossWSCoreMessages() {
+ // Do not instantiate
+ }
+
+ public static String PROGRESS_INSTALL_JBOSSWS_RUNTIME;
+ public static String DIR_LIB;
+ public static String DIR_CLIENT;
+ public static String DIR_WEB_INF;
+ public static String DIR_WEB_CONTENT;
+ public static String ERROR_COPY;
+ public static String WS_LOCATION;
+ public static String JBOSSWS_RUNTIME_LIB;
+ public static String JBOSSWS_RUNTIME;
+ public static String JBOSSAS;
+ public static String ERROR_WS_LOCATION;
+ public static String ERROR_WS_CLASSPATH;
+
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, JbossWSCoreMessages.class);
+ }
+}
\ No newline at end of file
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -36,8 +36,8 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jst.ws.internal.common.J2EEUtils;
import org.eclipse.osgi.util.NLS;
-import org.jboss.tools.ws.core.JbossWSCoreMessages;
import org.jboss.tools.ws.core.JbossWSCorePlugin;
+import org.jboss.tools.ws.core.messages.JbossWSCoreMessages;
/**
* @author Grid Qian
@@ -120,7 +120,6 @@
}
public static IStatus copy(IPath sourcePath, IPath targetPath) {
- System.out.println(sourcePath + " >> " + targetPath);
IStatus status = Status.OK_STATUS;
File sourceDir = sourcePath.toFile();
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -7,7 +7,7 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.ws.creation.core.commands;
@@ -18,13 +18,14 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
+import org.jboss.tools.ws.core.utils.StatusUtils;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.eclipse.wst.ws.internal.wsrt.IWebService;
import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
import org.jboss.tools.ws.creation.core.data.ServiceModel;
import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
+import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
import org.jboss.tools.ws.creation.core.utils.WSDLPropertyReader;
/**
@@ -35,7 +36,8 @@
private IWebServiceClient wsClient;
private int scenario;
- public InitialClientCommand(ServiceModel model, IWebServiceClient wsClient, int scenario) {
+ public InitialClientCommand(ServiceModel model, IWebServiceClient wsClient,
+ int scenario) {
this.model = model;
this.wsClient = wsClient;
this.scenario = scenario;
@@ -44,15 +46,22 @@
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
-
+
+ if (!JBossWSCreationUtils.validateJBossWSLocation()) {
+ return StatusUtils
+ .errorStatus(JBossWSCreationCoreMessages.ERROR_WS_LOCATION);
+ }
model.setTarget(JBossWSCreationCoreMessages.VALUE_TARGET_0);
if (scenario == WebServiceScenario.CLIENT) {
- try{
- model.setWsdlURI(wsClient.getWebServiceClientInfo().getWsdlURL());
- WSDLPropertyReader reader = new WSDLPropertyReader();
- reader.readWSDL(wsClient.getWebServiceClientInfo().getWsdlURL());
- model.setCustomPackage(reader.packageFromTargetNamespace());
- }catch (WSDLException e) {
+ try {
+ model.setWsdlURI(wsClient.getWebServiceClientInfo()
+ .getWsdlURL());
+ WSDLPropertyReader reader = new WSDLPropertyReader();
+ reader
+ .readWSDL(wsClient.getWebServiceClientInfo()
+ .getWsdlURL());
+ model.setCustomPackage(reader.packageFromTargetNamespace());
+ } catch (WSDLException e) {
return StatusUtils.errorStatus(e.getLocalizedMessage(), e);
}
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -7,18 +7,14 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.axis2.consumption.core.utils.DefaultCodegenUtil;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
+import org.jboss.tools.ws.core.utils.StatusUtils;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.eclipse.wst.ws.internal.wsrt.IWebService;
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLDefinitionFactory;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLParser;
+import org.jboss.tools.ws.core.JbossWSCorePlugin;
import org.jboss.tools.ws.creation.core.data.ServiceModel;
import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
+import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
import org.jboss.tools.ws.creation.core.utils.WSDLPropertyReader;
public class InitialCommand extends AbstractDataModelOperation {
@@ -36,21 +32,25 @@
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
-
+
+ if (!JBossWSCreationUtils.validateJBossWSLocation()) {
+ return StatusUtils
+ .errorStatus(JBossWSCreationCoreMessages.ERROR_WS_LOCATION);
+ }
model.setTarget(JBossWSCreationCoreMessages.VALUE_TARGET_0);
if (scenario == WebServiceScenario.TOPDOWN) {
- try{
- model.setWsdlURI(ws.getWebServiceInfo().getWsdlURL());
- WSDLPropertyReader reader = new WSDLPropertyReader();
- reader.readWSDL(ws.getWebServiceInfo().getWsdlURL());
- model.setCustomPackage(reader.packageFromTargetNamespace());
- model.setServiceList(reader.getServiceList());
- model.setPortTypeList(reader.getPortTypeList());
-
- }catch (WSDLException e) {
+ try {
+ model.setWsdlURI(ws.getWebServiceInfo().getWsdlURL());
+ WSDLPropertyReader reader = new WSDLPropertyReader();
+ reader.readWSDL(ws.getWebServiceInfo().getWsdlURL());
+ model.setCustomPackage(reader.packageFromTargetNamespace());
+ model.setServiceList(reader.getServiceList());
+ model.setPortTypeList(reader.getPortTypeList());
+
+ } catch (WSDLException e) {
return StatusUtils.errorStatus(e.getLocalizedMessage(), e);
}
- }else {
+ } else {
model.setServiceClass(ws.getWebServiceInfo().getImplURL());
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -7,7 +7,7 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.ws.creation.core.commands;
@@ -18,6 +18,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.jboss.tools.ws.core.utils.StatusUtils;
import org.jboss.tools.ws.creation.core.data.ServiceModel;
@@ -38,22 +39,30 @@
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
+
String implClass = model.getServiceClass();
String project = model.getWebProjectName();
ICompilationUnit unit = null;
try {
- unit = JBossWSCreationUtils.getJavaProjectByName(project).findType(
- implClass).getCompilationUnit();
- } catch (JavaModelException e) {
- e.printStackTrace();
- }
- try {
- if(!unit.getSource().contains(JBossWSCreationCoreMessages.WEBSERVICE_ANNOTATION)){
- return StatusUtils.errorStatus(JBossWSCreationCoreMessages.ERROR_NO_ANNOTATION);
+ if (JBossWSCreationUtils.getJavaProjectByName(project).findType(
+ implClass) != null) {
+ unit = JBossWSCreationUtils.getJavaProjectByName(project)
+ .findType(implClass).getCompilationUnit();
+ } else {
+ return StatusUtils.errorStatus(NLS.bind(
+ JBossWSCreationCoreMessages.ERROR_NO_CLASS,
+ new String[] { implClass, project }));
}
+ if (!unit.getSource().contains(
+ JBossWSCreationCoreMessages.WEBSERVICE_ANNOTATION)) {
+ return StatusUtils
+ .errorStatus(JBossWSCreationCoreMessages.ERROR_NO_ANNOTATION);
+ }
} catch (JavaModelException e) {
- e.printStackTrace();
- }
+ return StatusUtils.errorStatus(NLS.bind(
+ JBossWSCreationCoreMessages.ERROR_NO_CLASS, new String[] {
+ implClass, project }));
+ }
return Status.OK_STATUS;
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommand.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommand.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -7,7 +7,7 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.ws.creation.core.commands;
@@ -26,78 +26,95 @@
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.jboss.tools.ws.core.JbossWSCorePlugin;
import org.jboss.tools.ws.creation.core.data.ServiceModel;
+import org.jboss.tools.ws.creation.core.utils.JBossStatusUtils;
import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
/**
* @author Grid Qian
*/
-public class WSProviderInvokeCommand extends AbstractDataModelOperation{
+public class WSProviderInvokeCommand extends AbstractDataModelOperation {
private ServiceModel model;
-
-
- public WSProviderInvokeCommand(ServiceModel model){
+
+ public WSProviderInvokeCommand(ServiceModel model) {
this.model = model;
}
-
+
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
- String runtimeLocation = JbossWSCorePlugin.getDefault().getPreferenceStore().getString("jbosswsruntimelocation");
- String commandLocation = runtimeLocation + Path.SEPARATOR + "bin";
- String command = "sh wsprovide.sh ";
- if(System.getProperty("os.name").toLowerCase().indexOf("win") >= 0){
- command = "cmd.exe /C wsprovide.bat";
- }
- String args = getCommandlineArgs();
+ String runtimeLocation = JbossWSCorePlugin.getDefault()
+ .getPreferenceStore().getString("jbosswsruntimelocation");
+ String commandLocation = runtimeLocation + Path.SEPARATOR + "bin";
+ String command = "sh wsprovide.sh ";
+ if (System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) {
+ command = "cmd.exe /C wsprovide.bat";
+ }
+ String args = getCommandlineArgs();
command += " -k " + args;
-
+
try {
-
- InputStreamReader ir = new InputStreamReader(Runtime.getRuntime().exec(command, null, new File(commandLocation)).getInputStream());
- LineNumberReader input = new LineNumberReader(ir);
- String str = input.readLine();
- while(str != null){
- System.out.println(str);
- str = input.readLine();
- }
-
-
+ Runtime rt = Runtime.getRuntime();
+ Process proc = rt.exec(command, null, new File(commandLocation));
+ InputStreamReader ir = new InputStreamReader(proc.getErrorStream());
+ LineNumberReader input = new LineNumberReader(ir);
+ String str = input.readLine();
+ StringBuffer result = new StringBuffer();
+ while (str != null) {
+ result.append(str).append("\t\r");
+ str = input.readLine();
+
+ }
+ int exitValue = proc.waitFor();
+ if (exitValue != 0) {
+ return JBossStatusUtils.errorStatus(result.toString());
+ }
+
} catch (IOException e) {
e.printStackTrace();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
}
-
+
refreshProject(model.getWebProjectName(), monitor);
-
+
return Status.OK_STATUS;
}
-
- private void refreshProject(String project, IProgressMonitor monitor){
+
+ private void refreshProject(String project, IProgressMonitor monitor) {
try {
- JBossWSCreationUtils.getProjectByName(project).refreshLocal(2, monitor);
+ JBossWSCreationUtils.getProjectByName(project).refreshLocal(2,
+ monitor);
} catch (CoreException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
-
- private String getCommandlineArgs(){
+
+ private String getCommandlineArgs() {
String commandLine;
String project = model.getWebProjectName();
- String projectRoot = JBossWSCreationUtils.getProjectRoot(project).toOSString();
+ String projectRoot = JBossWSCreationUtils.getProjectRoot(project)
+ .toOSString();
commandLine = "-s " + projectRoot + Path.SEPARATOR + "src";
-
- if(model.isGenWSDL()){
- commandLine += " -w ";
- }
- commandLine += " -r " + projectRoot + Path.SEPARATOR + "WebContent" + Path.SEPARATOR + "wsdl ";
-
- commandLine += " -c " + projectRoot + Path.SEPARATOR + "build/classes/ ";
-
- commandLine += model.getServiceClass();
-
+
+ if (model.isGenWSDL()) {
+ commandLine += " -w ";
+ }
+
+ commandLine += " -o " + projectRoot + Path.SEPARATOR
+ + "build/classes/ ";
+
+ commandLine += " -r " + projectRoot + Path.SEPARATOR + "WebContent"
+ + Path.SEPARATOR + "wsdl ";
+
+ commandLine += " -c " + projectRoot + Path.SEPARATOR
+ + "build/classes/ ";
+
+ commandLine += model.getServiceClass();
+
return commandLine;
-
+
}
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-05-21 09:01:58 UTC (rev 8250)
@@ -12,3 +12,5 @@
SEPARATOR_JAVA=/
ERROR_NO_ANNOTATION=This class has not required Annotation!
WEBSERVICE_ANNOTATION=@WebService
+ERROR_NO_CLASS= The class '{0}' cannot be loaded via project {1}.Check that the project contains the class, or that the class is loadable according to the Java Build Path of the project.
+ERROR_WS_LOCATION=The JBoss WS Runtime Location is NULL. Please set the location on JBoss WS preferences page.
\ No newline at end of file
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -20,6 +20,8 @@
public static String ERROR_NO_ANNOTATION;
public static String WEBSERVICE_ANNOTATION;
+ public static String ERROR_NO_CLASS;
+ public static String ERROR_WS_LOCATION;
private JBossWSCreationCoreMessages() {
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -39,6 +39,7 @@
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jst.ws.internal.common.J2EEUtils;
+import org.jboss.tools.ws.core.JbossWSCorePlugin;
public class JBossWSCreationUtils {
@@ -259,5 +260,14 @@
return null;
}
}
+
+ public static boolean validateJBossWSLocation() {
+ String location = JbossWSCorePlugin.getDefault().getPreferenceStore()
+ .getString("jbosswsruntimelocation");
+ if (location == null || location.equals("")) {
+ return false;
+ }
+ return true;
+ }
}
Deleted: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/JbossWSUI.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/JbossWSUI.properties 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/JbossWSUI.properties 2008-05-21 09:01:58 UTC (rev 8250)
@@ -1,41 +0,0 @@
-LABEL_BROUSE=Browse...
-LABEL_WEB_SERVICE_CODEGEN=Web service code generation options
-LABEL_WEB_SERVICE_CLIENT_CODEGEN=Web service client code generation options
-LABEL_WEB_SERVICE_AAR=Web service archive options
-LABEL_DATABINDING=Default Databinding:
-LABEL_AAR_EXTENTION=AAR default extension:
-LABEL_JBOSSWS_RUNTIME_LOAD=JBossWS runtime loaded successfully
-LABEL_JBOSSWS_RUNTIME_LOAD_ERROR=Error occurred while loading JBossWS runtime. Select the correct JBossWS runtime folder.
-LABEL_GENERATE_TESTCASE_CAPTION=Generate a JUnit test case to test the service
-LABEL_GENERATE_SERVERSIDE_INTERFACE=Generate an interface for the skeleton
-LABEL_GENERATE_ALL=Generate all types for all elements referred to by schemas
-LABEL_CLIENT_SIDE=Client mode
-LABEL_SYNC_AND_ASYNC=Generate a client which supports both synchronous and asynchronous invocation
-LABEL_SYNC=Generate a synchronous client
-LABEL_ASYNC=Generate an asynchronous client
-
-JBOSSWS_LOCATION=JBossWS Runtime
-JBOSSWS_RUNTIME=JBossWS Runtime
-JBOSSWS_PREFERENCES=JBossWS Preferences
-JBOSSWS_RUNTIME_TOOLTIP=Select the JBossWS binary distribution folder
-JBOSSWS_PREFERENCES_TOOLTIP=Select the default preferences for JBossWS runtime
-JBOSSWS_RUNTIME_LOCATION=JBossWS runtime location:
-JBOSSWS_RUNTIME_PREFERENCES=JBossWS Runtime Preferences
-LABEL_JBOSSWS_RUNTIME_NOT_EXIT=Select the location of the JBossWS binary distribution or the folder which contains the JBossWS war distribution.
-ERROR_INVALID_JBOSSWS_SERVER_LOCATION=Invalid JBossWS runtime location
-
-ERROR_INVALID_FILE_READ_WRITEL=Exception occurred while reading or writing file {0}
-ERROR_SERVER_IS_NOT_SET=The JBossWS facets cannot be installed since the JBossWS runtime location has not been set. \nGo to the Web Services preference page and set the JBossWS runtime location under JBossWS Preferences.
-
-PROGRESS_INSTALL_JBOSSWS_RUNTIME=Installing JBossWS Runtime
-PROGRESS_UNINSTALL_JBOSSWS_RUNTIME=Uninstalling the JBossWS Runtime
-
-DIR_DOT_METADATA=.metadata
-DIR_DOT_PLUGINS=.plugins
-TEMP_JBOSSWS_FACET_DIR=org.jboss.tools.ws.facet
-WEBAPP_EXPLODED_SERVER_LOCATION_FILE=server.properties
-SERVER_STATUS_LOCATION_FILE=status.properties
-WAR_STATUS_LOCATION_FILE=war.properties
-
-COMMOND=wsconsume.sh
-BIN=bin
\ No newline at end of file
Deleted: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/JbossWSUIMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/JbossWSUIMessages.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/JbossWSUIMessages.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.ws.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Grid Qian
- */
-public final class JbossWSUIMessages extends NLS {
-
- private static final String BUNDLE_NAME =
- "org.jboss.tools.ws.ui.JbossWSUI"; //$NON-NLS-1$
-
- private JbossWSUIMessages() {
- // Do not instantiate
- }
-
- public static String LABEL_BROUSE;
- public static String LABEL_WEB_SERVICE_CODEGEN;
- public static String LABEL_WEB_SERVICE_CLIENT_CODEGEN;
- public static String LABEL_WEB_SERVICE_AAR;
- public static String LABEL_AAR_EXTENTION;
- public static String LABEL_DATABINDING;
- public static String LABEL_JBOSSWS_RUNTIME_LOAD;
- public static String LABEL_JBOSSWS_RUNTIME_LOAD_ERROR;
- public static String LABEL_JBOSSWS_RUNTIME_NOT_EXIT;
- public static String LABEL_GENERATE_TESTCASE_CAPTION;
- public static String LABEL_GENERATE_SERVERSIDE_INTERFACE;
- public static String LABEL_GENERATE_ALL;
- public static String LABEL_CLIENT_SIDE;
- public static String LABEL_SYNC_AND_ASYNC;
- public static String LABEL_SYNC;
- public static String LABEL_ASYNC;
-
- public static String JBOSSWS_LOCATION;
- public static String JBOSSWS_RUNTIME;
- public static String JBOSSWS_PREFERENCES;
- public static String JBOSSWS_RUNTIME_TOOLTIP;
- public static String JBOSSWS_PREFERENCES_TOOLTIP;
- public static String JBOSSWS_RUNTIME_LOCATION;
- public static String JBOSSWS_RUNTIME_PREFERENCES;
-
- public static String ERROR_INVALID_JBOSSWS_SERVER_LOCATION;
- public static String ERROR_INVALID_FILE_READ_WRITEL;
- public static String ERROR_SERVER_IS_NOT_SET;
-
- public static String PROGRESS_INSTALL_JBOSSWS_RUNTIME;
- public static String PROGRESS_UNINSTALL_JBOSSWS_RUNTIME;
-
- //generate for jbossws lib
- public static String DIR_DOT_METADATA;
- public static String DIR_DOT_PLUGINS;
- public static String TEMP_JBOSSWS_FACET_DIR;
- public static String WEBAPP_EXPLODED_SERVER_LOCATION_FILE;
- public static String SERVER_STATUS_LOCATION_FILE;
- public static String WAR_STATUS_LOCATION_FILE;
-
- public static String BIN;
- public static String COMMOND;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, JbossWSUIMessages.class);
- }
-}
Deleted: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/UIUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/UIUtils.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/UIUtils.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -1,502 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.ws.ui;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Grid Qian
- */
-public class UIUtils {
- /**
- * A default padding value for horizontalResize().
- */
- public final static int DEFAULT_PADDING = 35;
-
- String infoPopid_;
-
- public UIUtils(String infoPopid) {
- infoPopid_ = infoPopid;
- }
-
- public Button createRadioButton(Composite parent, String labelName,
- String tooltip, String infopop) {
- return createButton(SWT.RADIO, parent, labelName, tooltip, infopop);
- }
-
- public Button createCheckbox(Composite parent, String labelName,
- String tooltip, String infopop) {
- return createButton(SWT.CHECK, parent, labelName, tooltip, infopop);
- }
-
- public Button createPushButton(Composite parent, String labelName,
- String tooltip, String infopop) {
- return createButton(SWT.NONE, parent, labelName, tooltip, infopop);
- }
-
- public Button createButton(int kind, Composite parent, String labelName,
- String tooltip, String infopop) {
- Button button = new Button(parent, kind);
-
- tooltip = tooltip == null ? labelName : tooltip;
- button.setText(labelName);
- button.setToolTipText(tooltip);
-
- if (infopop != null)
- PlatformUI.getWorkbench().getHelpSystem().setHelp(button,
- infoPopid_ + "." + infopop);
-
- return button;
- }
-
- public Combo createCombo(Composite parent, String labelName,
- String tooltip, String infopop, int style) {
- tooltip = tooltip == null ? labelName : tooltip;
-
- if (labelName != null) {
- Label label = new Label(parent, SWT.WRAP);
- label.setText(labelName);
- label.setToolTipText(tooltip);
- }
-
- Combo combo = new Combo(parent, style);
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.GRAB_HORIZONTAL);
-
- combo.setLayoutData(griddata);
- combo.setToolTipText(tooltip);
-
- if (infopop != null)
- PlatformUI.getWorkbench().getHelpSystem().setHelp(combo,
- infoPopid_ + "." + infopop);
-
- return combo;
- }
-
- public Text createText(Composite parent, String labelName, String tooltip,
- String infopop, int style) {
- tooltip = tooltip == null ? labelName : tooltip;
-
- if (labelName != null) {
- Label label = new Label(parent, SWT.WRAP);
- label.setText(labelName);
- label.setToolTipText(tooltip);
- }
-
- Text text = new Text(parent, style);
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.GRAB_HORIZONTAL);
-
- text.setLayoutData(griddata);
- text.setToolTipText(tooltip);
-
- if (infopop != null)
- PlatformUI.getWorkbench().getHelpSystem().setHelp(text,
- infoPopid_ + "." + infopop);
-
- return text;
- }
-
- public Composite createComposite(Composite parent, int columns) {
- return createComposite(parent, columns, -1, -1);
- }
-
- public Composite createComposite(Composite parent, int columns,
- int marginHeight, int marginWidth) {
- Composite composite = new Composite(parent, SWT.NONE);
-
- GridLayout gridlayout = new GridLayout();
- gridlayout.numColumns = columns;
-
- if (marginHeight >= 0)
- gridlayout.marginHeight = marginHeight;
- if (marginWidth >= 0)
- gridlayout.marginWidth = marginWidth;
-
- composite.setLayout(gridlayout);
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.GRAB_HORIZONTAL);
- composite.setLayoutData(griddata);
-
- return composite;
-
- }
-
- public Group createGroup(Composite parent, String groupName,
- String tooltip, String infopop) {
- return createGroup(parent, groupName, tooltip, infopop, 1, -1, -1);
- }
-
- public Group createGroup(Composite parent, String groupName,
- String tooltip, String infopop, int columns, int marginHeight,
- int marginWidth) {
- Group newGroup = new Group(parent, SWT.NONE);
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.GRAB_HORIZONTAL);
- GridLayout gridlayout = new GridLayout();
-
- gridlayout.numColumns = columns;
-
- if (marginHeight >= 0)
- gridlayout.marginHeight = marginHeight;
- if (marginWidth >= 0)
- gridlayout.marginWidth = marginWidth;
-
- tooltip = tooltip == null ? groupName : tooltip;
- newGroup.setLayout(gridlayout);
- newGroup.setText(groupName);
- newGroup.setLayoutData(griddata);
- newGroup.setToolTipText(tooltip);
-
- if (infopop != null)
- PlatformUI.getWorkbench().getHelpSystem().setHelp(newGroup,
- infoPopid_ + "." + infopop);
-
- return newGroup;
- }
-
- public Tree createTree(Composite parent, String tooltip, String infopop,
- int style) {
-
- tooltip = tooltip == null ? "" : tooltip;
-
- Tree tree = new Tree(parent, style);
-
- tree.setLayoutData(createFillAll());
- tree.setToolTipText(tooltip);
-
- if (infopop != null)
- PlatformUI.getWorkbench().getHelpSystem().setHelp(tree,
- infoPopid_ + "." + infopop);
-
- return tree;
-
- }
-
- public Table createTable(Composite parent, String tooltip, String infopop,
- int style) {
-
- tooltip = tooltip == null ? "" : tooltip;
-
- Table table = new Table(parent, style);
-
- // table.setLayoutData( createFillAll() );
- table.setToolTipText(tooltip);
-
- if (infopop != null)
- PlatformUI.getWorkbench().getHelpSystem().setHelp(table,
- infoPopid_ + "." + infopop);
-
- return table;
-
- }
-
- public Label createHorizontalSeparator(Composite parent, int spacing) {
- Composite composite = createComposite(parent, 1, spacing, -1);
-
- Label separator = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
-
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.GRAB_HORIZONTAL);
- separator.setLayoutData(griddata);
-
- return separator;
- }
-
- public GridData createFillAll() {
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL
- | GridData.GRAB_VERTICAL);
- return data;
- }
-
- public void createInfoPop(Control ctrl, String infopop) {
- if (infopop != null)
- PlatformUI.getWorkbench().getHelpSystem().setHelp(ctrl,
- infoPopid_ + "." + infopop);
- }
-
- /**
- * Resizes the width of the target composite so that it is as wide as the
- * reference composite plus a padding value.
- *
- * @param target
- * The composite to resize.
- * @param reference
- * The reference composite
- * @param padding
- * The padding value
- */
- public void horizontalResize(Composite target, Composite reference,
- int padding) {
-
- Point originalSize = target.getSize();
- Point referenceSize = reference.getSize();
-
- padding = padding >= 0 ? padding : DEFAULT_PADDING;
-
- if (referenceSize.x + padding > originalSize.x)
- target.setSize(referenceSize.x + padding, originalSize.y);
- }
-
- public static void writePropertyToFile(File file,String key, String value) throws IOException {
- Writer out = new BufferedWriter(new OutputStreamWriter(
- new FileOutputStream(file), "8859_1"));
- out.write(key+"="+value+"\n");
- out.close();
- }
-
- // file util
- public static void copyFile(String src, String dest) {
- InputStream is = null;
- FileOutputStream fos = null;
-
- try
- {
- is = new FileInputStream(src);
- fos = new FileOutputStream(dest);
- int c = 0;
- byte[] array = new byte[1024];
- while ((c = is.read(array)) >= 0){
- fos.write(array, 0, c);
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- finally {
- try {
- fos.close();
- is.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- public static File createFileAndParentDirectories(String fileName) throws Exception {
- File file = new File(fileName);
- File parent = file.getParentFile();
- if (!parent.exists()){
- parent.mkdirs();
- }
- file.createNewFile();
- return file;
- }
-
- public static boolean deleteDir(File dir) {
- if (dir.isDirectory()) {
- String[] children = dir.list();
- for (int i=0; i<children.length; i++) {
- boolean success = deleteDir(new File(dir, children[i]));
- if (!success) {
- return false;
- }
- }
- }
- return dir.delete();
- }
-
- public static void deleteDirectories(File dir) {
- File[] children = dir.listFiles();
- for (int i = 0; i < children.length; i++){
- if (children[i].list() != null && children[i].list().length > 0){
- deleteDirectories(children[i]);
- }
- else{
- children[i].delete();
- }
- }
- dir.delete();
- }
-
- public static void deleteDirectories(String dir) {
- File directory = new File(dir);
- deleteDirectories(directory);
- }
-
- public static void createTargetFile(String sourceFileName, String targetFileName)
- throws Exception {
- createTargetFile(sourceFileName, targetFileName, false);
- }
-
- public static void createTargetFile(String sourceFileName, String targetFileName,
- boolean overwrite) throws Exception{
- File idealResultFile = new File(targetFileName);
- if (overwrite || !idealResultFile.exists())
- {
- createFileAndParentDirectories(targetFileName);
- copyFile(sourceFileName, targetFileName);
- }
- }
-
- public static boolean createDirectory(String directory){
- // Create a directory; all ancestor directories must exist
- boolean success = (new File(directory)).mkdir();
- if (!success) {
- // Directory creation failed
- }
- return success;
- }
-
- public static boolean createDirectorys(String directory){
- // Create a directory; all ancestor directories must exist
- boolean success = (new File(directory)).mkdirs();
- if (!success) {
- // Directory creation failed
- }
- return success;
- }
-
- //Copies all files under srcDir to dstDir.
- // If dstDir does not exist, it will be created.
- public static void copyDirectory(File srcDir, File dstDir) throws IOException {
- if (srcDir.isDirectory()) {
- if (!dstDir.exists()) {
- dstDir.mkdir();
- }
-
- String[] children = srcDir.list();
- for (int i=0; i<children.length; i++) {
- copyDirectory(new File(srcDir, children[i]),
- new File(dstDir, children[i]));
- }
- } else {
- copy(srcDir, dstDir);
- }
- }
-
- //Copies src file to dst file.
- // If the dst file does not exist, it is created
- public static void copy(File src, File dst) throws IOException {
- InputStream in = new FileInputStream(src);
- OutputStream out = new FileOutputStream(dst);
-
- // Transfer bytes from in to out
- byte[] buf = new byte[1024];
- int len;
- while ((len = in.read(buf)) > 0) {
- out.write(buf, 0, len);
- }
- in.close();
- out.close();
- }
-
- public static String addAnotherNodeToPath(String currentPath, String newNode) {
- return currentPath + File.separator + newNode;
- }
-
- public static String addNodesToPath(String currentPath, String[] newNode) {
- String returnPath=currentPath;
- for (int i = 0; i < newNode.length; i++) {
- returnPath = returnPath + File.separator + newNode[i];
- }
- return returnPath;
- }
-
- public static String addNodesToPath(StringBuffer currentPath, String[] pathNodes) {
- for (int i = 0; i < pathNodes.length; i++){
- currentPath.append(File.separator);
- currentPath.append(pathNodes[i]);
- }
- return currentPath.toString();
- }
-
- public static String addNodesToURL(String currentPath, String[] newNode) {
- String returnPath=currentPath;
- for (int i = 0; i < newNode.length; i++) {
- returnPath = returnPath + "/" + newNode[i];
- }
- return returnPath;
- }
-
- /**
- * Get the list of file with a prefix of <code>fileNamePrefix</code> & an extension of
- * <code>extension</code>
- *
- * @param sourceDir The directory in which to search the files
- * @param fileNamePrefix The prefix to look for
- * @param extension The extension to look for
- * @return The list of file with a prefix of <code>fileNamePrefix</code> & an extension of
- * <code>extension</code>
- */
- public static File[] getMatchingFiles(String sourceDir, String fileNamePrefix, String extension) {
- List<File> fileList = new ArrayList<File>();
- File libDir = new File(sourceDir);
- String libDirPath = libDir.getAbsolutePath();
- String[] items = libDir.list();
- if (items != null) {
- for (int i = 0; i < items.length; i++) {
- String item = items[i];
- if (fileNamePrefix != null && extension != null) {
- if (item.startsWith(fileNamePrefix) && item.endsWith(extension)) {
- fileList.add(new File(libDirPath + File.separator + item));
- }
- } else if (fileNamePrefix == null && extension != null) {
- if (item.endsWith(extension)) {
- fileList.add(new File(libDirPath + File.separator + item));
- }
- } else if (fileNamePrefix != null && extension == null) {
- if (item.startsWith(fileNamePrefix)) {
- fileList.add(new File(libDirPath + File.separator + item));
- }
- } else {
- fileList.add(new File(libDirPath + File.separator + item));
- }
- }
- return (File[]) fileList.toArray(new File[fileList.size()]);
- }
- return new File[0];
- }
-
- /**
- * Filter out files inside a <code>sourceDir</code> with matching <codefileNamePrefix></code>
- * and <code>extension</code>
- * @param sourceDir The directory to filter the files
- * @param fileNamePrefix The filtering filename prefix
- * @param extension The filtering file extension
- */
- public static void filterOutRestrictedFiles(String sourceDir, String fileNamePrefix, String extension){
- File[] resultedMatchingFiles = getMatchingFiles(sourceDir, fileNamePrefix, extension);
- for (int i = 0; i < resultedMatchingFiles.length; i++) {
- File matchingFilePath = new File(resultedMatchingFiles[i].getAbsolutePath());
- matchingFilePath.delete();
- }
- }
-
-}
\ No newline at end of file
Copied: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUI.properties (from rev 8246, trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/JbossWSUI.properties)
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUI.properties (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUI.properties 2008-05-21 09:01:58 UTC (rev 8250)
@@ -0,0 +1,41 @@
+LABEL_BROUSE=Browse...
+LABEL_WEB_SERVICE_CODEGEN=Web service code generation options
+LABEL_WEB_SERVICE_CLIENT_CODEGEN=Web service client code generation options
+LABEL_WEB_SERVICE_AAR=Web service archive options
+LABEL_DATABINDING=Default Databinding:
+LABEL_AAR_EXTENTION=AAR default extension:
+LABEL_JBOSSWS_RUNTIME_LOAD=JBossWS runtime loaded successfully
+LABEL_JBOSSWS_RUNTIME_LOAD_ERROR=Error occurred while loading JBossWS runtime. Select the correct JBossWS runtime folder.
+LABEL_GENERATE_TESTCASE_CAPTION=Generate a JUnit test case to test the service
+LABEL_GENERATE_SERVERSIDE_INTERFACE=Generate an interface for the skeleton
+LABEL_GENERATE_ALL=Generate all types for all elements referred to by schemas
+LABEL_CLIENT_SIDE=Client mode
+LABEL_SYNC_AND_ASYNC=Generate a client which supports both synchronous and asynchronous invocation
+LABEL_SYNC=Generate a synchronous client
+LABEL_ASYNC=Generate an asynchronous client
+
+JBOSSWS_LOCATION=JBossWS Runtime
+JBOSSWS_RUNTIME=JBossWS Runtime
+JBOSSWS_PREFERENCES=JBossWS Preferences
+JBOSSWS_RUNTIME_TOOLTIP=Select the JBossWS binary distribution folder
+JBOSSWS_PREFERENCES_TOOLTIP=Select the default preferences for JBossWS runtime
+JBOSSWS_RUNTIME_LOCATION=JBossWS runtime location:
+JBOSSWS_RUNTIME_PREFERENCES=JBossWS Runtime Preferences
+LABEL_JBOSSWS_RUNTIME_NOT_EXIT=Select the location of the JBossWS binary distribution or the folder which contains the JBossWS war distribution.
+ERROR_INVALID_JBOSSWS_SERVER_LOCATION=Invalid JBossWS runtime location
+
+ERROR_INVALID_FILE_READ_WRITEL=Exception occurred while reading or writing file {0}
+ERROR_SERVER_IS_NOT_SET=The JBossWS facets cannot be installed since the JBossWS runtime location has not been set. \nGo to the Web Services preference page and set the JBossWS runtime location under JBossWS Preferences.
+
+PROGRESS_INSTALL_JBOSSWS_RUNTIME=Installing JBossWS Runtime
+PROGRESS_UNINSTALL_JBOSSWS_RUNTIME=Uninstalling the JBossWS Runtime
+
+DIR_DOT_METADATA=.metadata
+DIR_DOT_PLUGINS=.plugins
+TEMP_JBOSSWS_FACET_DIR=org.jboss.tools.ws.facet
+WEBAPP_EXPLODED_SERVER_LOCATION_FILE=server.properties
+SERVER_STATUS_LOCATION_FILE=status.properties
+WAR_STATUS_LOCATION_FILE=war.properties
+
+COMMOND=wsconsume.sh
+BIN=bin
\ No newline at end of file
Copied: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUIMessages.java (from rev 8246, trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/JbossWSUIMessages.java)
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUIMessages.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUIMessages.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.ws.ui.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Grid Qian
+ */
+public final class JbossWSUIMessages extends NLS {
+
+ private static final String BUNDLE_NAME =
+ "org.jboss.tools.ws.ui.JbossWSUI"; //$NON-NLS-1$
+
+ private JbossWSUIMessages() {
+ // Do not instantiate
+ }
+
+ public static String LABEL_BROUSE;
+ public static String LABEL_WEB_SERVICE_CODEGEN;
+ public static String LABEL_WEB_SERVICE_CLIENT_CODEGEN;
+ public static String LABEL_WEB_SERVICE_AAR;
+ public static String LABEL_AAR_EXTENTION;
+ public static String LABEL_DATABINDING;
+ public static String LABEL_JBOSSWS_RUNTIME_LOAD;
+ public static String LABEL_JBOSSWS_RUNTIME_LOAD_ERROR;
+ public static String LABEL_JBOSSWS_RUNTIME_NOT_EXIT;
+ public static String LABEL_GENERATE_TESTCASE_CAPTION;
+ public static String LABEL_GENERATE_SERVERSIDE_INTERFACE;
+ public static String LABEL_GENERATE_ALL;
+ public static String LABEL_CLIENT_SIDE;
+ public static String LABEL_SYNC_AND_ASYNC;
+ public static String LABEL_SYNC;
+ public static String LABEL_ASYNC;
+
+ public static String JBOSSWS_LOCATION;
+ public static String JBOSSWS_RUNTIME;
+ public static String JBOSSWS_PREFERENCES;
+ public static String JBOSSWS_RUNTIME_TOOLTIP;
+ public static String JBOSSWS_PREFERENCES_TOOLTIP;
+ public static String JBOSSWS_RUNTIME_LOCATION;
+ public static String JBOSSWS_RUNTIME_PREFERENCES;
+
+ public static String ERROR_INVALID_JBOSSWS_SERVER_LOCATION;
+ public static String ERROR_INVALID_FILE_READ_WRITEL;
+ public static String ERROR_SERVER_IS_NOT_SET;
+
+ public static String PROGRESS_INSTALL_JBOSSWS_RUNTIME;
+ public static String PROGRESS_UNINSTALL_JBOSSWS_RUNTIME;
+
+ //generate for jbossws lib
+ public static String DIR_DOT_METADATA;
+ public static String DIR_DOT_PLUGINS;
+ public static String TEMP_JBOSSWS_FACET_DIR;
+ public static String WEBAPP_EXPLODED_SERVER_LOCATION_FILE;
+ public static String SERVER_STATUS_LOCATION_FILE;
+ public static String WAR_STATUS_LOCATION_FILE;
+
+ public static String BIN;
+ public static String COMMOND;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, JbossWSUIMessages.class);
+ }
+}
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage.java 2008-05-21 08:55:11 UTC (rev 8249)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -32,11 +32,11 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.jboss.tools.ws.core.JbossWSCoreMessages;
import org.jboss.tools.ws.core.JbossWSCorePlugin;
-import org.jboss.tools.ws.ui.JbossWSUIMessages;
+import org.jboss.tools.ws.core.messages.JbossWSCoreMessages;
import org.jboss.tools.ws.ui.JbossWSUIPlugin;
-import org.jboss.tools.ws.ui.UIUtils;
+import org.jboss.tools.ws.ui.messages.JbossWSUIMessages;
+import org.jboss.tools.ws.ui.utils.UIUtils;
/**
* @author Grid Qian
@@ -153,7 +153,6 @@
*/
private void storeValues() {
IPreferenceStore store = this.getPreferenceStore();
- System.out.println(jbosswsPath.getText());
store.setValue(JbossWSCoreMessages.WS_LOCATION, jbosswsPath.getText());
}
Copied: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/UIUtils.java (from rev 8246, trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/UIUtils.java)
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/UIUtils.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/UIUtils.java 2008-05-21 09:01:58 UTC (rev 8250)
@@ -0,0 +1,502 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.ws.ui.utils;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+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.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * @author Grid Qian
+ */
+public class UIUtils {
+ /**
+ * A default padding value for horizontalResize().
+ */
+ public final static int DEFAULT_PADDING = 35;
+
+ String infoPopid_;
+
+ public UIUtils(String infoPopid) {
+ infoPopid_ = infoPopid;
+ }
+
+ public Button createRadioButton(Composite parent, String labelName,
+ String tooltip, String infopop) {
+ return createButton(SWT.RADIO, parent, labelName, tooltip, infopop);
+ }
+
+ public Button createCheckbox(Composite parent, String labelName,
+ String tooltip, String infopop) {
+ return createButton(SWT.CHECK, parent, labelName, tooltip, infopop);
+ }
+
+ public Button createPushButton(Composite parent, String labelName,
+ String tooltip, String infopop) {
+ return createButton(SWT.NONE, parent, labelName, tooltip, infopop);
+ }
+
+ public Button createButton(int kind, Composite parent, String labelName,
+ String tooltip, String infopop) {
+ Button button = new Button(parent, kind);
+
+ tooltip = tooltip == null ? labelName : tooltip;
+ button.setText(labelName);
+ button.setToolTipText(tooltip);
+
+ if (infopop != null)
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(button,
+ infoPopid_ + "." + infopop);
+
+ return button;
+ }
+
+ public Combo createCombo(Composite parent, String labelName,
+ String tooltip, String infopop, int style) {
+ tooltip = tooltip == null ? labelName : tooltip;
+
+ if (labelName != null) {
+ Label label = new Label(parent, SWT.WRAP);
+ label.setText(labelName);
+ label.setToolTipText(tooltip);
+ }
+
+ Combo combo = new Combo(parent, style);
+ GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL
+ | GridData.GRAB_HORIZONTAL);
+
+ combo.setLayoutData(griddata);
+ combo.setToolTipText(tooltip);
+
+ if (infopop != null)
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(combo,
+ infoPopid_ + "." + infopop);
+
+ return combo;
+ }
+
+ public Text createText(Composite parent, String labelName, String tooltip,
+ String infopop, int style) {
+ tooltip = tooltip == null ? labelName : tooltip;
+
+ if (labelName != null) {
+ Label label = new Label(parent, SWT.WRAP);
+ label.setText(labelName);
+ label.setToolTipText(tooltip);
+ }
+
+ Text text = new Text(parent, style);
+ GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL
+ | GridData.GRAB_HORIZONTAL);
+
+ text.setLayoutData(griddata);
+ text.setToolTipText(tooltip);
+
+ if (infopop != null)
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(text,
+ infoPopid_ + "." + infopop);
+
+ return text;
+ }
+
+ public Composite createComposite(Composite parent, int columns) {
+ return createComposite(parent, columns, -1, -1);
+ }
+
+ public Composite createComposite(Composite parent, int columns,
+ int marginHeight, int marginWidth) {
+ Composite composite = new Composite(parent, SWT.NONE);
+
+ GridLayout gridlayout = new GridLayout();
+ gridlayout.numColumns = columns;
+
+ if (marginHeight >= 0)
+ gridlayout.marginHeight = marginHeight;
+ if (marginWidth >= 0)
+ gridlayout.marginWidth = marginWidth;
+
+ composite.setLayout(gridlayout);
+ GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL
+ | GridData.GRAB_HORIZONTAL);
+ composite.setLayoutData(griddata);
+
+ return composite;
+
+ }
+
+ public Group createGroup(Composite parent, String groupName,
+ String tooltip, String infopop) {
+ return createGroup(parent, groupName, tooltip, infopop, 1, -1, -1);
+ }
+
+ public Group createGroup(Composite parent, String groupName,
+ String tooltip, String infopop, int columns, int marginHeight,
+ int marginWidth) {
+ Group newGroup = new Group(parent, SWT.NONE);
+ GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL
+ | GridData.GRAB_HORIZONTAL);
+ GridLayout gridlayout = new GridLayout();
+
+ gridlayout.numColumns = columns;
+
+ if (marginHeight >= 0)
+ gridlayout.marginHeight = marginHeight;
+ if (marginWidth >= 0)
+ gridlayout.marginWidth = marginWidth;
+
+ tooltip = tooltip == null ? groupName : tooltip;
+ newGroup.setLayout(gridlayout);
+ newGroup.setText(groupName);
+ newGroup.setLayoutData(griddata);
+ newGroup.setToolTipText(tooltip);
+
+ if (infopop != null)
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(newGroup,
+ infoPopid_ + "." + infopop);
+
+ return newGroup;
+ }
+
+ public Tree createTree(Composite parent, String tooltip, String infopop,
+ int style) {
+
+ tooltip = tooltip == null ? "" : tooltip;
+
+ Tree tree = new Tree(parent, style);
+
+ tree.setLayoutData(createFillAll());
+ tree.setToolTipText(tooltip);
+
+ if (infopop != null)
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(tree,
+ infoPopid_ + "." + infopop);
+
+ return tree;
+
+ }
+
+ public Table createTable(Composite parent, String tooltip, String infopop,
+ int style) {
+
+ tooltip = tooltip == null ? "" : tooltip;
+
+ Table table = new Table(parent, style);
+
+ // table.setLayoutData( createFillAll() );
+ table.setToolTipText(tooltip);
+
+ if (infopop != null)
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(table,
+ infoPopid_ + "." + infopop);
+
+ return table;
+
+ }
+
+ public Label createHorizontalSeparator(Composite parent, int spacing) {
+ Composite composite = createComposite(parent, 1, spacing, -1);
+
+ Label separator = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
+
+ GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL
+ | GridData.GRAB_HORIZONTAL);
+ separator.setLayoutData(griddata);
+
+ return separator;
+ }
+
+ public GridData createFillAll() {
+ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL
+ | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL
+ | GridData.GRAB_VERTICAL);
+ return data;
+ }
+
+ public void createInfoPop(Control ctrl, String infopop) {
+ if (infopop != null)
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(ctrl,
+ infoPopid_ + "." + infopop);
+ }
+
+ /**
+ * Resizes the width of the target composite so that it is as wide as the
+ * reference composite plus a padding value.
+ *
+ * @param target
+ * The composite to resize.
+ * @param reference
+ * The reference composite
+ * @param padding
+ * The padding value
+ */
+ public void horizontalResize(Composite target, Composite reference,
+ int padding) {
+
+ Point originalSize = target.getSize();
+ Point referenceSize = reference.getSize();
+
+ padding = padding >= 0 ? padding : DEFAULT_PADDING;
+
+ if (referenceSize.x + padding > originalSize.x)
+ target.setSize(referenceSize.x + padding, originalSize.y);
+ }
+
+ public static void writePropertyToFile(File file,String key, String value) throws IOException {
+ Writer out = new BufferedWriter(new OutputStreamWriter(
+ new FileOutputStream(file), "8859_1"));
+ out.write(key+"="+value+"\n");
+ out.close();
+ }
+
+ // file util
+ public static void copyFile(String src, String dest) {
+ InputStream is = null;
+ FileOutputStream fos = null;
+
+ try
+ {
+ is = new FileInputStream(src);
+ fos = new FileOutputStream(dest);
+ int c = 0;
+ byte[] array = new byte[1024];
+ while ((c = is.read(array)) >= 0){
+ fos.write(array, 0, c);
+ }
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ finally {
+ try {
+ fos.close();
+ is.close();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public static File createFileAndParentDirectories(String fileName) throws Exception {
+ File file = new File(fileName);
+ File parent = file.getParentFile();
+ if (!parent.exists()){
+ parent.mkdirs();
+ }
+ file.createNewFile();
+ return file;
+ }
+
+ public static boolean deleteDir(File dir) {
+ if (dir.isDirectory()) {
+ String[] children = dir.list();
+ for (int i=0; i<children.length; i++) {
+ boolean success = deleteDir(new File(dir, children[i]));
+ if (!success) {
+ return false;
+ }
+ }
+ }
+ return dir.delete();
+ }
+
+ public static void deleteDirectories(File dir) {
+ File[] children = dir.listFiles();
+ for (int i = 0; i < children.length; i++){
+ if (children[i].list() != null && children[i].list().length > 0){
+ deleteDirectories(children[i]);
+ }
+ else{
+ children[i].delete();
+ }
+ }
+ dir.delete();
+ }
+
+ public static void deleteDirectories(String dir) {
+ File directory = new File(dir);
+ deleteDirectories(directory);
+ }
+
+ public static void createTargetFile(String sourceFileName, String targetFileName)
+ throws Exception {
+ createTargetFile(sourceFileName, targetFileName, false);
+ }
+
+ public static void createTargetFile(String sourceFileName, String targetFileName,
+ boolean overwrite) throws Exception{
+ File idealResultFile = new File(targetFileName);
+ if (overwrite || !idealResultFile.exists())
+ {
+ createFileAndParentDirectories(targetFileName);
+ copyFile(sourceFileName, targetFileName);
+ }
+ }
+
+ public static boolean createDirectory(String directory){
+ // Create a directory; all ancestor directories must exist
+ boolean success = (new File(directory)).mkdir();
+ if (!success) {
+ // Directory creation failed
+ }
+ return success;
+ }
+
+ public static boolean createDirectorys(String directory){
+ // Create a directory; all ancestor directories must exist
+ boolean success = (new File(directory)).mkdirs();
+ if (!success) {
+ // Directory creation failed
+ }
+ return success;
+ }
+
+ //Copies all files under srcDir to dstDir.
+ // If dstDir does not exist, it will be created.
+ public static void copyDirectory(File srcDir, File dstDir) throws IOException {
+ if (srcDir.isDirectory()) {
+ if (!dstDir.exists()) {
+ dstDir.mkdir();
+ }
+
+ String[] children = srcDir.list();
+ for (int i=0; i<children.length; i++) {
+ copyDirectory(new File(srcDir, children[i]),
+ new File(dstDir, children[i]));
+ }
+ } else {
+ copy(srcDir, dstDir);
+ }
+ }
+
+ //Copies src file to dst file.
+ // If the dst file does not exist, it is created
+ public static void copy(File src, File dst) throws IOException {
+ InputStream in = new FileInputStream(src);
+ OutputStream out = new FileOutputStream(dst);
+
+ // Transfer bytes from in to out
+ byte[] buf = new byte[1024];
+ int len;
+ while ((len = in.read(buf)) > 0) {
+ out.write(buf, 0, len);
+ }
+ in.close();
+ out.close();
+ }
+
+ public static String addAnotherNodeToPath(String currentPath, String newNode) {
+ return currentPath + File.separator + newNode;
+ }
+
+ public static String addNodesToPath(String currentPath, String[] newNode) {
+ String returnPath=currentPath;
+ for (int i = 0; i < newNode.length; i++) {
+ returnPath = returnPath + File.separator + newNode[i];
+ }
+ return returnPath;
+ }
+
+ public static String addNodesToPath(StringBuffer currentPath, String[] pathNodes) {
+ for (int i = 0; i < pathNodes.length; i++){
+ currentPath.append(File.separator);
+ currentPath.append(pathNodes[i]);
+ }
+ return currentPath.toString();
+ }
+
+ public static String addNodesToURL(String currentPath, String[] newNode) {
+ String returnPath=currentPath;
+ for (int i = 0; i < newNode.length; i++) {
+ returnPath = returnPath + "/" + newNode[i];
+ }
+ return returnPath;
+ }
+
+ /**
+ * Get the list of file with a prefix of <code>fileNamePrefix</code> & an extension of
+ * <code>extension</code>
+ *
+ * @param sourceDir The directory in which to search the files
+ * @param fileNamePrefix The prefix to look for
+ * @param extension The extension to look for
+ * @return The list of file with a prefix of <code>fileNamePrefix</code> & an extension of
+ * <code>extension</code>
+ */
+ public static File[] getMatchingFiles(String sourceDir, String fileNamePrefix, String extension) {
+ List<File> fileList = new ArrayList<File>();
+ File libDir = new File(sourceDir);
+ String libDirPath = libDir.getAbsolutePath();
+ String[] items = libDir.list();
+ if (items != null) {
+ for (int i = 0; i < items.length; i++) {
+ String item = items[i];
+ if (fileNamePrefix != null && extension != null) {
+ if (item.startsWith(fileNamePrefix) && item.endsWith(extension)) {
+ fileList.add(new File(libDirPath + File.separator + item));
+ }
+ } else if (fileNamePrefix == null && extension != null) {
+ if (item.endsWith(extension)) {
+ fileList.add(new File(libDirPath + File.separator + item));
+ }
+ } else if (fileNamePrefix != null && extension == null) {
+ if (item.startsWith(fileNamePrefix)) {
+ fileList.add(new File(libDirPath + File.separator + item));
+ }
+ } else {
+ fileList.add(new File(libDirPath + File.separator + item));
+ }
+ }
+ return (File[]) fileList.toArray(new File[fileList.size()]);
+ }
+ return new File[0];
+ }
+
+ /**
+ * Filter out files inside a <code>sourceDir</code> with matching <codefileNamePrefix></code>
+ * and <code>extension</code>
+ * @param sourceDir The directory to filter the files
+ * @param fileNamePrefix The filtering filename prefix
+ * @param extension The filtering file extension
+ */
+ public static void filterOutRestrictedFiles(String sourceDir, String fileNamePrefix, String extension){
+ File[] resultedMatchingFiles = getMatchingFiles(sourceDir, fileNamePrefix, extension);
+ for (int i = 0; i < resultedMatchingFiles.length; i++) {
+ File matchingFilePath = new File(resultedMatchingFiles[i].getAbsolutePath());
+ matchingFilePath.delete();
+ }
+ }
+
+}
\ No newline at end of file
17 years, 11 months
JBoss Tools SVN: r8249 - trunk.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-05-21 04:55:11 -0400 (Wed, 21 May 2008)
New Revision: 8249
Modified:
trunk/
Log:
Recorded merge of revisions 8078-8079 via svnmerge from
https://svn.jboss.org/repos/jbosstools/branches/jbosstools-2.1.x
........
r8078 | scabanovich | 2008-05-14 15:33:47 +0200 (Wed, 14 May 2008) | 1 line
JBIDE-2189 Merge to 2.1.x
........
r8079 | scabanovich | 2008-05-14 15:36:37 +0200 (Wed, 14 May 2008) | 1 line
JBIDE-2189 Merge to 2.1.x
........
Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
- /branches/ganymede:1-7797 /branches/ganymede/trunk:1-8005 /branches/jbosstools-2.1.x:1-7998,8009-8012
+ /branches/ganymede:1-7797 /branches/ganymede/trunk:1-8005 /branches/jbosstools-2.1.x:1-7998,8009-8012,8078-8079
17 years, 11 months
JBoss Tools SVN: r8248 - trunk.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-05-21 04:51:41 -0400 (Wed, 21 May 2008)
New Revision: 8248
Modified:
trunk/
Log:
Blocked revisions 8030 via svnmerge
........
r8030 | max.andersen(a)jboss.com | 2008-05-09 07:19:10 +0200 (Fri, 09 May 2008) | 1 line
move old legacy to non-maintained workspace
........
Property changes on: trunk
___________________________________________________________________
Name: svnmerge-blocked
- /branches/jbosstools-2.1.x:8001
+ /branches/jbosstools-2.1.x:8001,8030
17 years, 11 months
JBoss Tools SVN: r8247 - in branches/jbosstools-2.1.x/documentation/whatsnew: images and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-05-21 04:37:35 -0400 (Wed, 21 May 2008)
New Revision: 8247
Added:
branches/jbosstools-2.1.x/documentation/whatsnew/images/seamsettingsvalidation.png
Modified:
branches/jbosstools-2.1.x/documentation/whatsnew/index.html
branches/jbosstools-2.1.x/documentation/whatsnew/seam/seam-news-1.1.0.CR1.html
Log:
whats new for 2.1.0.GA
Added: branches/jbosstools-2.1.x/documentation/whatsnew/images/seamsettingsvalidation.png
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-2.1.x/documentation/whatsnew/images/seamsettingsvalidation.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/jbosstools-2.1.x/documentation/whatsnew/index.html
===================================================================
--- branches/jbosstools-2.1.x/documentation/whatsnew/index.html 2008-05-20 22:21:45 UTC (rev 8246)
+++ branches/jbosstools-2.1.x/documentation/whatsnew/index.html 2008-05-21 08:37:35 UTC (rev 8247)
@@ -21,6 +21,12 @@
</tr>
<tr>
<td valign="top" align="left">
+ <p align="right"><b>2.1.0.GA</b>
+ <td valign="top"><p>Bugfixes, no new major features</p></td>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
<p align="right"><b>2.1.0.CR1</b>
<td valign="top">
<p><a href="vpe/vpe-news-2.1.0.CR1.html">Visual Page Editor</a></p>
@@ -82,6 +88,13 @@
</tr>
<tr>
<td valign="top" align="left">
+ <p align="right"><b>1.1.0.GA</b></td>
+ <td valign="top">
+ <p>Bugfixes, no new major features</p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
<p align="right"><b>1.1.0.CR1</b></td>
<td valign="top">
<p><a href="jbds/jbds-news-1.1.0.CR1.html">JBoss Developer Studio</a></p>
Modified: branches/jbosstools-2.1.x/documentation/whatsnew/seam/seam-news-1.1.0.CR1.html
===================================================================
--- branches/jbosstools-2.1.x/documentation/whatsnew/seam/seam-news-1.1.0.CR1.html 2008-05-20 22:21:45 UTC (rev 8246)
+++ branches/jbosstools-2.1.x/documentation/whatsnew/seam/seam-news-1.1.0.CR1.html 2008-05-21 08:37:35 UTC (rev 8247)
@@ -37,6 +37,20 @@
<td colspan="2"><hr />
</td>
</tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Seam Project settings validator</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>The Seam validator now validates project settings.</p>
+
+ <p><img src="../images/seamsettingsvalidation.png"/></p>
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
</table>
</body>
17 years, 11 months
JBoss Tools SVN: r8246 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-05-20 18:21:45 -0400 (Tue, 20 May 2008)
New Revision: 8246
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java
Log:
JBIDE-1458
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java 2008-05-20 21:26:59 UTC (rev 8245)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java 2008-05-20 22:21:45 UTC (rev 8246)
@@ -165,7 +165,8 @@
if( !usedMods.contains(mods[i])) {
SingleDeployableModuleDelegate delegate = (SingleDeployableModuleDelegate)
mods[i].loadAdapter(SingleDeployableModuleDelegate.class, new NullProgressMonitor());
- unmakeDeployable(delegate.getWorkspaceRelativePath());
+ if( !delegate.getGlobalSourcePath().toFile().exists())
+ unmakeDeployable(delegate.getWorkspaceRelativePath());
} else {
usedMods.remove(mods[i]);
}
17 years, 11 months
JBoss Tools SVN: r8245 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core: META-INF and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2008-05-20 17:26:59 -0400 (Tue, 20 May 2008)
New Revision: 8245
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
JBIDE-2215 Unable to add User Library as Source Lookup Path to AS/EAP server
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2008-05-20 21:21:12 UTC (rev 8244)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2008-05-20 21:26:59 UTC (rev 8245)
@@ -19,7 +19,8 @@
org.eclipse.jst.common.project.facet.core,
org.eclipse.wst.xml.core,
org.jboss.ide.eclipse.archives.core,
- org.apache.ant
+ org.apache.ant,
+ org.eclipse.jst.server.tomcat.core
Eclipse-LazyStart: true
Export-Package: org.jboss.ide.eclipse.as.core,
org.jboss.ide.eclipse.as.core.extensions.archives,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-05-20 21:21:12 UTC (rev 8244)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-05-20 21:26:59 UTC (rev 8245)
@@ -253,7 +253,7 @@
name="JBoss Application Server Startup Configuration"
public="true"
sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
- sourcePathComputerId="org.jboss.ide.eclipse.as.core.serverSourcePathComputer"/>
+ sourcePathComputerId="org.eclipse.jst.server.tomcat.core.sourcePathComputer"/>
<launchConfigurationType
delegate="org.jboss.ide.eclipse.as.core.server.internal.launch.DeployableLaunchConfiguration"
id="org.jboss.ide.eclipse.as.core.server.stripped.launchConfiguration"
@@ -261,7 +261,7 @@
name="Stripped Server Launch Configuration"
public="false"
sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
- sourcePathComputerId="org.jboss.ide.eclipse.as.core.serverSourcePathComputer"/>
+ sourcePathComputerId="org.eclipse.jst.server.tomcat.core.sourcePathComputer"/>
<launchConfigurationType
delegate="org.jboss.ide.eclipse.as.core.server.internal.launch.TwiddleLaunchConfiguration"
id="org.jboss.ide.eclipse.as.core.server.twiddleConfiguration"
17 years, 11 months
JBoss Tools SVN: r8243 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-05-20 17:09:49 -0400 (Tue, 20 May 2008)
New Revision: 8243
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java
Log:
JBIDE-2239 - working with changed timeout structure, cleanup.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java 2008-05-20 20:31:30 UTC (rev 8242)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java 2008-05-20 21:09:49 UTC (rev 8243)
@@ -26,12 +26,8 @@
import java.util.Properties;
import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.internal.ServerType;
-import org.jboss.ide.eclipse.as.core.server.IServerPollingAttributes;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
-import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
/**
@@ -45,7 +41,6 @@
private boolean expectedState;
private long endTime;
private IServer server;
- private int timeout = -1;
private ServerStatePollerType type;
17 years, 11 months