From jbosstools-commits at lists.jboss.org Thu Jan 3 07:41:59 2008
Content-Type: multipart/mixed; boundary="===============8834712287897274871=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5487 -
trunk/hibernatetools/docs/reference/en/modules.
Date: Thu, 03 Jan 2008 07:41:58 -0500
Message-ID:
--===============8834712287897274871==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: afedosik
Date: 2008-01-03 07:41:58 -0500 (Thu, 03 Jan 2008)
New Revision: 5487
Modified:
trunk/hibernatetools/docs/reference/en/modules/ant.xml
trunk/hibernatetools/docs/reference/en/modules/codegen.xml
trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml
trunk/hibernatetools/docs/reference/en/modules/plugins.xml
trunk/hibernatetools/docs/reference/en/modules/reverseengineering.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-239 - Spelling and grammer in Guide =
are corrected.
Modified: trunk/hibernatetools/docs/reference/en/modules/ant.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/ant.xml 2007-12-29 15:10=
:27 UTC (rev 5486)
+++ trunk/hibernatetools/docs/reference/en/modules/ant.xml 2008-01-03 12:41=
:58 UTC (rev 5487)
@@ -201,10 +201,10 @@
=
Each have in common that they are able to build up a Hibernate
Configuration object from which a set of exporter=
s can be run to generate
- various output. Note: output can be anything, e.g. specific files, s=
tatments execution against
+ various output. Note: output can be anything, e.g. specific files, s=
tatements execution against
a database, error reporting or anything else that can be done in jav=
a code.
=
- The following section decribes what the the various configuratio=
n can do, plus list the
+ The following section describes what the various configuration c=
an do, plus list the
individual settings they have.
=
@@ -265,7 +265,7 @@
=
- A standard Ant fileset. Used to include hibernate mapp=
ing files.Remember that if
+ A standard Ant fileset. Used to include hibernate mapp=
ing files. Remember that if
mappings are already specified in the hibernate.cfg.xml th=
en it should not be
included via the fileset as it will result in duplicate im=
port exceptions.
@@ -461,8 +461,8 @@
tables and has no other columns.
- detectOptimisticLock (efault:true): If true columns na=
med VERSION or TIMESTAMP
- with appropriate types will be mapped with the apropriate =
optimistic locking
+ detectOptimisticLock (default:true): If true columns n=
amed VERSION or TIMESTAMP
+ with appropriate types will be mapped with the appropriate=
optimistic locking
corresponding to <version> or
<timestamp>
@@ -493,7 +493,7 @@
Exporters
=
- Exporters is the parts that does the actual job of converting th=
e hibernate metamodel into
+ Exporters are the parts that does the actual job of converting t=
he hibernate metamodel into
various artifacts, mainly code. The following section describes the =
current supported set of
exporters in the Hibernate Tool distribution. I=
t is also possible for userdefined exporters,
that is done through the
@@ -568,7 +568,7 @@
=
- delimiter (default: ";"): What delimter to use to sepa=
rate statements
+ delimiter (default: ";"): What delimiter to use to sep=
arate statements
=
@@ -602,8 +602,8 @@
POJO java code exporter (<hbm2java>)=
=
- <hbm2java> is a java codegen=
erator. Options for controlling wether JDK 5
- syntax can be used and wether the POJO should be annotated with EJ=
B3/Hibernate Annotations.
+ <hbm2java> is a java codegen=
erator. Options for controlling whether JDK 5
+ syntax can be used and whether the POJO should be annotated with E=
JB3/Hibernate Annotations.
=
@@ -837,7 +837,7 @@
Using properties to configure Exporters
=
- Exporters can be controlled by user properties. The user propert=
ies is specificed via
+ Exporters can be controlled by user properties. The user propert=
ies are specified via
<property> or
@@ -860,7 +860,7 @@
<property> is enough for specifying
the properties needed for the exporters. Still the ant tools suppo=
rts the notion of
- <propertyset>. The functionallity of
+ <propertyset>. The functionality of
<propertyset> is explained in detail in the Ant task
manual.
@@ -881,7 +881,7 @@
<hibernatetool> or inside any exporter will automatically
create an instance of x.y.z.NameOfToolClass and=
it will be available in
- the templates as $sometool. This is usefull to =
delegate logic and code
+ the templates as $sometool. This is useful to d=
elegate logic and code
generation to java code instead of placing such logic in the templ=
ates.
=
Modified: trunk/hibernatetools/docs/reference/en/modules/codegen.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/codegen.xml 2007-12-29 1=
5:10:27 UTC (rev 5486)
+++ trunk/hibernatetools/docs/reference/en/modules/codegen.xml 2008-01-03 1=
2:41:58 UTC (rev 5487)
@@ -177,7 +177,7 @@
default-value
=
- default initializatioin value for a field
+ default initialization value for a field
=
@@ -192,7 +192,7 @@
=
include this property in the equals()
and hashCode() method. If no use-in-equals =
is
- specificed, no equals/hashcode will be generated.
+ specified, no equals/hashcode will be generated.
=
@@ -265,7 +265,7 @@
"class-scope" to the cu=
rrent class, not the subclasses.
=
- Recomendations
+ Recommendations
=
The following are some good practices when using
@@ -408,7 +408,7 @@
=
With an
<meta attribute=3D"class-code">,
- you can add addional methods on a given class, nevertheless such
+ you can add additional methods on a given class, nevertheless such
<meta> attribute can not=
be used at property
scope level and Hibernate Tools does not prov=
ide such
@@ -416,7 +416,7 @@
<meta> attributes.
=
A possibly solution for this is to modify the freemarker
- templates responsable for generating the POJO's. If you look inside
+ templates responsible for generating the POJO's. If you look inside
hibernate-tools.jar, you can f=
ind the template:
@@ -474,7 +474,7 @@
contents will be generated into the body of the relevant
set method.
=
- As an examlpe let us add a pre-condition for property
+ As an example let us add a pre-condition for property
name preventing no Person can
have an empty name. So we have to modify the
Modified: trunk/hibernatetools/docs/reference/en/modules/codegenarchitectur=
e.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml =
2007-12-29 15:10:27 UTC (rev 5486)
+++ trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml =
2008-01-03 12:41:58 UTC (rev 5487)
@@ -70,7 +70,7 @@
=
In most projects you will normally use only one of the Core, Ann=
otation or JPA
configuration and possibly the JDBC configuration if you are using t=
he reverse engineering
- facilities of Hibernate Tools. The important th=
ing to note is that no matter which Hibnerate
+ facilities of Hibernate Tools. The important th=
ing to note is that no matter which Hibernate
Configuration type you are using Hibernate Tools supports them.
=
The following drawing illustrates the core concepts:
Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2007-12-29 1=
5:10:27 UTC (rev 5486)
+++ trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2008-01-03 1=
2:41:58 UTC (rev 5487)
@@ -85,7 +85,7 @@
Press Finish to create the configuration file, after optionally creat=
ing a Console
- onfiguration, the
+ configuration, the hibernate.cfg.xml will be automatically opened in an editor. The last opti=
on Create Console Configuration
@@ -101,7 +101,7 @@
should configure Hibernate and what configurati=
on files, including which
classpath is needed to load the POJO's, JDBC drivers etc. It is requ=
ired to make usage of
query prototyping, reverse engineering and code generation. You can =
have multiple named
- console configurations. Normally you would just need one per project=
, but more is definitly
+ console configurations. Normally you would just need one per project=
, but more is definitely
possible.
=
You create a console configuration by running the Console Config=
uration wizard, shown in
@@ -137,7 +137,7 @@
Classpath for classpath and Mappings
- for additional mappings. The two latter ones is normally=
not required if you
+ for additional mappings. The two latter ones are normall=
y not required if you
specify a project and it has /hibernate.cfg.xml
@@ -516,7 +516,7 @@
=
- The first time you create a code generation launcher you shoul=
d give it a meaningfull
+ The first time you create a code generation launcher you shoul=
d give it a meaningful
name, otherwise the default prefix New_Generation will be used.
@@ -633,7 +633,7 @@
If reveng.xml does not provide enough customization =
you can provide your own
implementation of an ReverseEngineeringStrategy. The cla=
ss need to be in the
- claspath of the Console Configuration, otherwise you wil=
l get class not found
+ classpath of the Console Configuration, otherwise you wi=
ll get class not found
exceptions. See for details and an
example of a custom strategy.
@@ -778,7 +778,7 @@
=
- Generate a hibernate.cfg.xml file. Used to keep the =
hibernate.cfg.xml uptodate
+ Generate a hibernate.cfg.xml file. Used to keep the =
hibernate.cfg.xml update
with any new found mapping files.
@@ -812,7 +812,7 @@
Each Exporter listens to certain properties and these can be s=
etup in the Properties section where you can add/remove predefined or custome=
r properties for each of
- the exporters. The following table lists the time of writing pre-d=
efined properties:
+ the exporters. The following table lists the time of writing prede=
fined properties:
=
@@ -937,7 +937,7 @@
hbm.xml
and cfg.xml
- files. The editor is based on the Eclipse WTP tools and =
extend its functionallity
+ files. The editor is based on the Eclipse WTP tools and =
extend its functionality
to provide Hibernate specific code completion.
=
@@ -968,7 +968,7 @@
files to the relevant class/field in java code.
=
- Navigation Functionallity
+ Navigation Functionality
@@ -991,7 +991,7 @@
=
- This is done via the standard hyperlink navigation functionall=
ity in Eclipse; per
+ This is done via the standard hyperlink navigation functionali=
ty in Eclipse; per
default it is done by pressing F3 while the cursor is on a class/f=
ield or by pressing Ctrl and the mouse button to perform the same navigation.=
para>
@@ -1079,7 +1079,7 @@
=
Note that not all the features of the .reveng.xml file is exposed or fully=
implemented in
- the editor, but the main functionallity is there. To understand the =
full flexibility of the
+ the editor, but the main functionality is there. To understand the f=
ull flexibility of the
reveng.xml, please see
=
@@ -1090,7 +1090,7 @@
Ctrl+N or via the code generation
launcher.
=
- The following screentshot shows the
+ The following screenshot shows the Overview page where the wanted conso=
le configuration
is selected (auto-detected if Hibernate 3 support is enabled for the=
project)
=
@@ -1239,7 +1239,7 @@
=
Errors during creation of the SessionFactory or running the queries
(e.g. if your configuration or query is incorrect) will be shown i=
n a message dialog or
- inlined in the view that detected the error, you may get more info=
rmation about the error in
+ inclined in the view that detected the error, you may get more inf=
ormation about the error in
the Error Log view on the right pane.
=
Results of a query will be shown in the Query result view and =
details of possible errors
Modified: trunk/hibernatetools/docs/reference/en/modules/reverseengineering=
.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/reverseengineering.xml 2=
007-12-29 15:10:27 UTC (rev 5486)
+++ trunk/hibernatetools/docs/reference/en/modules/reverseengineering.xml 2=
008-01-03 12:41:58 UTC (rev 5487)
@@ -41,7 +41,7 @@
filtering. This file can be created by hand (its just basic XML) or you
can use the Hibernate plugins which have a specialized editor.
=
- Many databases is case-sensitive with their names and thus=
if
+ Many databases are case-sensitive with their names and thu=
s if
you cannot make some table match and you are sure it is not excluded b=
y a
<table-filter>then check if the case matches; most databases sto=
res
table names in uppercase.
@@ -178,7 +178,7 @@
/>
]]>
=
- The number of attributes specificed and the sequence of the
+ The number of attributes specified and the sequence of the
sql-type's is important. Meaning that Hibernate will
search for the most specific first, and if no specific match is foun=
d it
will seek from top to bottom when trying to resolve a type
@@ -290,7 +290,7 @@
char
=
Even though there is a generic match for VARCHAR, t=
he
- more specifc type-mapping for VARCHAR with not-null=3D"fal=
se" is
+ more specific type-mapping for VARCHAR with not-null=3D"fa=
lse" is
chosen. The first VARCHAR sql-type matches in length but h=
as
no value for not-null and thus is not considered.
@@ -356,9 +356,9 @@
Table filters (<table-filter>)
=
The
- <table-filter> let you speci=
fcy matching rules for
+ <table-filter> let you speci=
fy matching rules for
performing general filtering/setup for tables, e.g. let you include =
or
- exclude specific tables based on the schema or even a specifc
+ exclude specific tables based on the schema or even a specific
prefix.
=
@@ -493,7 +493,7 @@
generator/class (Optional): defines which identifier
generator should be used. The class name is any hibernate sh=
ort
- hand name or fully quailfied class name for an identifier
+ hand name or fully qualified class name for an identifier
strategy.
=
--===============8834712287897274871==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 08:39:46 2008
Content-Type: multipart/mixed; boundary="===============8328667565253827121=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5488 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages.
Date: Thu, 03 Jan 2008 08:39:45 -0500
Message-ID:
--===============8328667565253827121==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-03 08:39:45 -0500 (Thu, 03 Jan 2008)
New Revision: 5488
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/actionListener.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/attribute.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/commandButton.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/commandLink.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/convertDateTime.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/convertNumber.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/converter.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/dataTable.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/facet.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/form.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/graphicImage.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/inputHidden.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/inputSecret.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/inputText.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/inputTextArea.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/loadBundle.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/message.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/messages.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/outputFormat.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/outputLabel.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/outputLink.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/outputText.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/panelGrid.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/panelGroup.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/param.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/phaseListener.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/selectBooleanCheckbox.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/selectItem.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/selectItems.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/selectManyCheckbox.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/selectManyListbox.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/selectManyMenu.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/selectOneListbox.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/selectOneMenu.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/selectOneRadio.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/setPropertyActionListener.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/subview.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/validateDoubleRange.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/validateLength.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/validateLongRange.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/validator.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/valueChangeListener.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/verbatim.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/view.jsp
Log:
update jsf junit
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest=
/WebContent/pages/actionListener.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/actionListener.jsp 2008-01-03 12:41:58 UTC (rev 5487)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/actionListener.jsp 2008-01-03 13:39:45 UTC (rev 5488)
@@ -1,18 +0,0 @@
-<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%>
-<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest=
/WebContent/pages/attribute.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/attribute.jsp 2008-01-03 12:41:58 UTC (rev 5487)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/attribute.jsp 2008-01-03 13:39:45 UTC (rev 5488)
@@ -1,18 +0,0 @@
-<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%>
-<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest=
/WebContent/pages/commandButton.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/commandButton.jsp 2008-01-03 12:41:58 UTC (rev 5487)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/commandButton.jsp 2008-01-03 13:39:45 UTC (rev 5488)
@@ -1,19 +0,0 @@
-<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%>
-<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest=
/WebContent/pages/commandLink.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/commandLink.jsp 2008-01-03 12:41:58 UTC (rev 5487)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/commandLink.jsp 2008-01-03 13:39:45 UTC (rev 5488)
@@ -1,19 +0,0 @@
-<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%>
-<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest=
/WebContent/pages/convertDateTime.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/convertDateTime.jsp 2008-01-03 12:41:58 UTC (rev 5487)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/convertDateTime.jsp 2008-01-03 13:39:45 UTC (rev 5488)
@@ -1,16 +0,0 @@
-<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%>
-<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest=
/WebContent/pages/convertNumber.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/convertNumber.jsp 2008-01-03 12:41:58 UTC (rev 5487)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/convertNumber.jsp 2008-01-03 13:39:45 UTC (rev 5488)
@@ -1,16 +0,0 @@
-<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%>
-<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest=
/WebContent/pages/converter.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/converter.jsp 2008-01-03 12:41:58 UTC (rev 5487)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/converter.jsp 2008-01-03 13:39:45 UTC (rev 5488)
@@ -1,16 +0,0 @@
-<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%>
-<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest=
/WebContent/pages/dataTable.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/dataTable.jsp 2008-01-03 12:41:58 UTC (rev 5487)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/dataTable.jsp 2008-01-03 13:39:45 UTC (rev 5488)
@@ -1,50 +0,0 @@
-<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%>
-<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%>
-
-
-
-
-
-
-
-
+
+
+
+
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W=
ebContent/pages/components/view.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/components/view.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/components/view.jsp 2008-01-03 13:40:47 UTC (rev 5489)
@@ -0,0 +1,13 @@
+<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%>
+<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%>
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
--===============0014680427054239551==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 08:44:31 2008
Content-Type: multipart/mixed; boundary="===============0940091949383768730=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5490 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
Date: Thu, 03 Jan 2008 08:44:30 -0500
Message-ID:
--===============0940091949383768730==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-03 08:44:30 -0500 (Thu, 03 Jan 2008)
New Revision: 5490
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfJbideTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1467
was created test for this bug
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfJbideTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfJbideTest.java 2008-01-03 13:40:47 UTC (rev 5489)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfJbideTest.java 2008-01-03 13:44:30 UTC (rev 5490)
@@ -10,15 +10,32 @@
*************************************************************************=
*****/
package org.jboss.tools.jsf.vpe.jsf.test;
=
+import java.util.ArrayList;
+import java.util.List;
+
import junit.framework.TestCase;
=
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.ILogListener;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.editor.VpeEditorPart;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNamedNodeMap;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.interfaces.nsIDOMNodeList;
=
/**
- * Class for testing all jsf components
+ * Class for testing all jsf bugs
* =
* @author sdzmitrovich
* =
@@ -26,6 +43,9 @@
public class JsfJbideTest extends TestCase implements ILogListener {
=
private final static String EDITOR_ID =3D "org.jboss.tools.jst.jsp.jspedi=
tor.JSPTextEditor"; // $NON-NLS-1$
+ // type of input tag
+ private static final String ATTR_TYPE_VALUE =3D "radio";
+
// $NON-NLS-1$
=
// check warning log
@@ -48,6 +68,10 @@
super.setUp();
=
Platform.addLogListener(this);
+
+ TestJsfUtil.waitForJobs();
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .closeAllEditors(true);
}
=
/**
@@ -60,42 +84,149 @@
protected void tearDown() throws Exception {
super.tearDown();
Platform.removeLogListener(this);
+
+ TestJsfUtil.waitForJobs();
+
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .closeAllEditors(true);
}
=
/*
* JBIDE's test cases
*/
=
+ /**
+ * test for http://jira.jboss.com/jira/browse/JBIDE-1467
+ * =
+ * REQUIREMENT :test page must have only one tag
+ * =
+ * test check that all "radio" elements ( of xulRunner DOMDocument ) have
+ * equal "name" attributes
+ */
public void testJBIDE_1467() throws PartInitException, Throwable {
+ // path to test page
String path =3D "JBIDE/JBIDE-1467.jsp";
- =
- }
-
- /*private void performTestForJsfComponent(String componentPage)
- throws PartInitException, Throwable {
- TestJsfComponentsUtil.waitForJobs();
- =
+ // wait
+ TestJsfUtil.waitForJobs();
+ // set exception
exception =3D null;
- IPath componentPath =3D TestJsfComponentsUtil
- .getComponentPath(componentPage);
=
- IFile file =3D ResourcesPlugin.getWorkspace().getRoot().getFile(
- componentPath);
+ // get test page path
+ IFile file =3D (IFile) TestJsfUtil.getComponentPath(path);
+
IEditorInput input =3D new FileEditorInput(file);
=
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ // get editor
+ JSPMultiPageEditor part =3D (JSPMultiPageEditor) PlatformUI
+ .getWorkbench().getActiveWorkbenchWindow().getActivePage()
.openEditor(input, EDITOR_ID, true);
=
- TestJsfComponentsUtil.waitForJobs();
- TestJsfComponentsUtil.delay(3000);
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .closeAllEditors(true);
+ // wait for jobs
+ TestJsfUtil.waitForJobs();
+ // wait full initialization of vpe
+ TestJsfUtil.delay(3000);
=
+ VpeEditorPart visualEditor =3D (VpeEditorPart) part.getVisualEditor();
+ VpeController vpeController =3D visualEditor.getController();
+
+ // get xulRunner editor
+ XulRunnerEditor xulRunnerEditor =3D vpeController.getXulRunnerEditor();
+
+ // get dom document
+ nsIDOMDocument document =3D xulRunnerEditor.getDOMDocument();
+ nsIDOMElement element =3D document.getDocumentElement();
+
+ if (element !=3D null) {
+
+ // get root node
+ nsIDOMNode node =3D (nsIDOMNode) element
+ .queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
+
+ List elements =3D new ArrayList();
+
+ // find "input" elements
+ findElementsByName(node, elements, HTML.TAG_INPUT);
+
+ // check that "radio" elements have equal names
+ // (size of list of names =3D=3D 1 )
+ assertEquals(getRadioNames(elements).size(), 1);
+
+ }
+
+ // check exception
if (exception !=3D null) {
throw exception;
}
- }*/
=
+ }
+
+ /**
+ * find elements by name
+ * =
+ * @param node -
+ * current node
+ * @param elements -
+ * list of found elements
+ * @param name -
+ * name element
+ */
+ void findElementsByName(nsIDOMNode node, List elements,
+ String name) {
+
+ // get children
+ nsIDOMNodeList children =3D node.getChildNodes();
+ for (int i =3D 0; i < children.getLength(); i++) {
+ nsIDOMNode child =3D children.item(i);
+
+ // if current child is required then add his to list
+ if (name.equalsIgnoreCase((child.getNodeName()))) {
+
+ elements.add(child);
+ return;
+ }
+ // if current child is not required
+ findElementsByName(child, elements, name);
+
+ }
+
+ }
+
+ private List getRadioNames(List elements) {
+
+ // list of "name" of "radio" elements
+ List radioNames =3D new ArrayList();
+
+ for (nsIDOMNode element : elements) {
+ // attributes
+ nsIDOMNamedNodeMap attributes =3D element.getAttributes();
+
+ if (null !=3D attributes) {
+ // get type of element
+ nsIDOMNode type =3D attributes.getNamedItem(HTML.ATTR_TYPE);
+
+ // if type is "radio"
+ if ((null !=3D type)
+ && (ATTR_TYPE_VALUE.equalsIgnoreCase(type
+ .getNodeValue()))) {
+
+ // get "name" attribute
+ nsIDOMNode name =3D attributes.getNamedItem(HTML.ATTR_NAME);
+
+ // check for null
+ assertNotNull(name);
+
+ // if name is unique
+ if (!radioNames.contains(name.getNodeValue()))
+ radioNames.add(name.getNodeValue());
+
+ }
+ }
+ }
+
+ return radioNames;
+
+ }
+
public void logging(IStatus status, String plugin) {
switch (status.getSeverity()) {
case IStatus.ERROR:
--===============0940091949383768730==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 08:45:06 2008
Content-Type: multipart/mixed; boundary="===============3308045275990451476=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5491 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
Date: Thu, 03 Jan 2008 08:45:06 -0500
Message-ID:
--===============3308045275990451476==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-03 08:45:05 -0500 (Thu, 03 Jan 2008)
New Revision: 5491
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfComponentTest.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/TestJsfUtil.java
Log:
update jsf junit
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfAllTests.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfAllTests.java 2008-01-03 13:44:30 UTC (rev 5490)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfAllTests.java 2008-01-03 13:45:05 UTC (rev 5491)
@@ -26,8 +26,7 @@
=
private static void prepareTests() {
=
- TestJsfUtil.importJsfPages(JsfTestPlugin
- .getPluginResourcePath()
+ TestJsfUtil.importJsfPages(JsfTestPlugin.getPluginResourcePath()
+ TEST_PROJECT_PATH);
=
}
@@ -40,7 +39,7 @@
// $JUnit-BEGIN$
=
suite.addTestSuite(JsfComponentTest.class);
-// suite.addTestSuite(JsfJideTest.class);
+ suite.addTestSuite(JsfJbideTest.class);
=
// $JUnit-END$
return suite;
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfComponentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfComponentTest.java 2008-01-03 13:44:30 UTC (rev 5490)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfComponentTest.java 2008-01-03 13:45:05 UTC (rev 5491)
@@ -71,99 +71,99 @@
*/
=
public void testCommandButton() throws PartInitException, Throwable {
- performTestForJsfComponent("commandButton.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/commandButton.jsp"); // $NON-NLS-=
1$
}
=
public void testCommandLink() throws PartInitException, Throwable {
- performTestForJsfComponent("commandLink.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/commandLink.jsp"); // $NON-NLS-1$
}
=
public void testDataTable() throws PartInitException, Throwable {
- performTestForJsfComponent("dataTable.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/dataTable.jsp"); // $NON-NLS-1$
}
=
public void testForm() throws PartInitException, Throwable {
- performTestForJsfComponent("form.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/form.jsp"); // $NON-NLS-1$
}
=
public void testGraphicImage() throws PartInitException, Throwable {
- performTestForJsfComponent("graphicImage.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/graphicImage.jsp"); // $NON-NLS-1$
}
=
public void testInputHidden() throws PartInitException, Throwable {
- performTestForJsfComponent("inputHidden.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/inputHidden.jsp"); // $NON-NLS-1$
}
=
public void testInputSecret() throws PartInitException, Throwable {
- performTestForJsfComponent("inputSecret.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/inputSecret.jsp"); // $NON-NLS-1$
}
=
public void testInputText() throws PartInitException, Throwable {
- performTestForJsfComponent("inputText.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/inputText.jsp"); // $NON-NLS-1$
}
=
public void testInputTextArea() throws PartInitException, Throwable {
- performTestForJsfComponent("inputTextArea.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/inputTextArea.jsp"); // $NON-NLS-=
1$
}
=
public void testMessage() throws PartInitException, Throwable {
- performTestForJsfComponent("message.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/message.jsp"); // $NON-NLS-1$
}
=
public void testMessages() throws PartInitException, Throwable {
- performTestForJsfComponent("messages.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/messages.jsp"); // $NON-NLS-1$
}
=
public void testOutputFormat() throws PartInitException, Throwable {
- performTestForJsfComponent("outputFormat.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/outputFormat.jsp"); // $NON-NLS-1$
}
=
public void testOutputLabel() throws PartInitException, Throwable {
- performTestForJsfComponent("outputLabel.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/outputLabel.jsp"); // $NON-NLS-1$
}
=
public void testOutputLink() throws PartInitException, Throwable {
- performTestForJsfComponent("outputLink.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/outputLink.jsp"); // $NON-NLS-1$
}
=
public void testOutputText() throws PartInitException, Throwable {
- performTestForJsfComponent("outputText.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/outputText.jsp"); // $NON-NLS-1$
}
=
public void testPanelGrid() throws PartInitException, Throwable {
- performTestForJsfComponent("panelGrid.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/panelGrid.jsp"); // $NON-NLS-1$
}
=
public void testPanelGroup() throws PartInitException, Throwable {
- performTestForJsfComponent("panelGroup.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/panelGroup.jsp"); // $NON-NLS-1$
}
=
public void testSelectBooleanCheckbox() throws PartInitException, Throwab=
le {
- performTestForJsfComponent("selectBooleanCheckbox.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectBooleanCheckbox.jsp"); // $=
NON-NLS-1$
}
=
public void testSelectManyCheckbox() throws PartInitException, Throwable {
- performTestForJsfComponent("selectManyCheckbox.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectManyCheckbox.jsp"); // $NON=
-NLS-1$
}
=
public void testSelectManyListbox() throws PartInitException, Throwable {
- performTestForJsfComponent("selectManyListbox.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectManyListbox.jsp"); // $NON-=
NLS-1$
}
=
public void testSelectManyMenu() throws PartInitException, Throwable {
- performTestForJsfComponent("selectManyMenu.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectManyMenu.jsp"); // $NON-NLS=
-1$
}
=
public void testSelectOneListbox() throws PartInitException, Throwable {
- performTestForJsfComponent("selectOneListbox.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectOneListbox.jsp"); // $NON-N=
LS-1$
}
=
public void testSelectOneMenu() throws PartInitException, Throwable {
- performTestForJsfComponent("selectOneMenu.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectOneMenu.jsp"); // $NON-NLS-=
1$
}
=
public void testSelectOneRadio() throws PartInitException, Throwable {
- performTestForJsfComponent("selectOneRadio.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectOneRadio.jsp"); // $NON-NLS=
-1$
}
=
/*
@@ -171,84 +171,84 @@
*/
=
public void testActionListener() throws PartInitException, Throwable {
- performTestForJsfComponent("actionListener.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/actionListener.jsp"); // $NON-NLS=
-1$
}
=
public void testAttribute() throws PartInitException, Throwable {
- performTestForJsfComponent("attribute.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/attribute.jsp"); // $NON-NLS-1$
}
=
public void testConvertDateTime() throws PartInitException, Throwable {
- performTestForJsfComponent("convertDateTime.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/convertDateTime.jsp"); // $NON-NL=
S-1$
}
=
public void testConvertNumber() throws PartInitException, Throwable {
- performTestForJsfComponent("convertNumber.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/convertNumber.jsp"); // $NON-NLS-=
1$
}
=
public void testConverter() throws PartInitException, Throwable {
- performTestForJsfComponent("converter.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/converter.jsp"); // $NON-NLS-1$
}
=
public void testFacet() throws PartInitException, Throwable {
- performTestForJsfComponent("facet.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/facet.jsp"); // $NON-NLS-1$
}
=
public void testLoadBundle() throws PartInitException, Throwable {
- performTestForJsfComponent("loadBundle.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/loadBundle.jsp"); // $NON-NLS-1$
}
=
public void testParam() throws PartInitException, Throwable {
- performTestForJsfComponent("param.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/param.jsp"); // $NON-NLS-1$
}
=
public void testPhaseListener() throws PartInitException, Throwable {
- performTestForJsfComponent("phaseListener.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/phaseListener.jsp"); // $NON-NLS-=
1$
}
=
public void testSelectItem() throws PartInitException, Throwable {
- performTestForJsfComponent("selectItem.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectItem.jsp"); // $NON-NLS-1$
}
=
public void testSelectItems() throws PartInitException, Throwable {
- performTestForJsfComponent("selectItems.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectItems.jsp"); // $NON-NLS-1$
}
=
public void testSetPropertyActionListener() throws PartInitException,
Throwable {
- performTestForJsfComponent("setPropertyActionListener.jsp"); // $NON-NLS=
-1$
+ performTestForJsfComponent("components/setPropertyActionListener.jsp"); =
// $NON-NLS-1$
}
=
public void testSubview() throws PartInitException, Throwable {
- performTestForJsfComponent("subview.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/subview.jsp"); // $NON-NLS-1$
}
=
public void testValidateDoubleRange() throws PartInitException, Throwable=
{
- performTestForJsfComponent("validateDoubleRange.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/validateDoubleRange.jsp"); // $NO=
N-NLS-1$
}
=
public void testValidateLength() throws PartInitException, Throwable {
- performTestForJsfComponent("validateLength.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/validateLength.jsp"); // $NON-NLS=
-1$
}
=
public void testValidateLongRange() throws PartInitException, Throwable {
- performTestForJsfComponent("validateLongRange.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/validateLongRange.jsp"); // $NON-=
NLS-1$
}
=
public void testValidator() throws PartInitException, Throwable {
- performTestForJsfComponent("validator.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/validator.jsp"); // $NON-NLS-1$
}
=
public void testValueChangeListener() throws PartInitException, Throwable=
{
- performTestForJsfComponent("valueChangeListener.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/valueChangeListener.jsp"); // $NO=
N-NLS-1$
}
=
public void testVerbatim() throws PartInitException, Throwable {
- performTestForJsfComponent("verbatim.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/verbatim.jsp"); // $NON-NLS-1$
}
=
public void testView() throws PartInitException, Throwable {
- performTestForJsfComponent("view.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/view.jsp"); // $NON-NLS-1$
}
=
private void performTestForJsfComponent(String componentPage)
@@ -256,15 +256,8 @@
TestJsfUtil.waitForJobs();
=
exception =3D null;
- =
- // IPath componentPath =3D TestJsfComponentsUtil
- // .getComponentPath(componentPage);
- //
- // IFile file =3D ResourcesPlugin.getWorkspace().getRoot().getFile(
- // componentPath);
=
- IFile file =3D (IFile) TestJsfUtil
- .getComponentPath(componentPage);
+ IFile file =3D (IFile) TestJsfUtil.getComponentPath(componentPage);
=
IEditorInput input =3D new FileEditorInput(file);
=
@@ -273,6 +266,7 @@
=
TestJsfUtil.waitForJobs();
TestJsfUtil.delay(3000);
+
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.closeAllEditors(true);
=
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/TestJsfUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/TestJsfUtil.java 2008-01-03 13:44:30 UTC (rev 5490)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/TestJsfUtil.java 2008-01-03 13:45:05 UTC (rev 5491)
@@ -100,9 +100,6 @@
PROJECT_NAME);
if (project !=3D null) {
return project.getFolder(COMPONENTS_PATH).findMember(componentPage);
- // if (resource !=3D null) {
- // return resource.getFullPath();
- // }
=
}
=
--===============3308045275990451476==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 08:49:07 2008
Content-Type: multipart/mixed; boundary="===============6124707503156161781=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5492 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF.
Date: Thu, 03 Jan 2008 08:49:07 -0500
Message-ID:
--===============6124707503156161781==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-03 08:49:07 -0500 (Thu, 03 Jan 2008)
New Revision: 5492
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF
Log:
update jsf junit
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFES=
T.MF
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2=
008-01-03 13:45:05 UTC (rev 5491)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2=
008-01-03 13:49:07 UTC (rev 5492)
@@ -10,6 +10,11 @@
org.junit,
org.eclipse.core.resources,
org.eclipse.ui.ide,
- org.jboss.tools.common
+ org.jboss.tools.common,
+ org.jboss.tools.jst.jsp,
+ org.jboss.tools.common.text.ext,
+ org.jboss.tools.common.model,
+ org.jboss.tools.vpe.xulrunner,
+ org.mozilla.xpcom
Eclipse-LazyStart: true
Bundle-ClassPath: jsf-test.jar
--===============6124707503156161781==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 12:46:47 2008
Content-Type: multipart/mixed; boundary="===============6111489742807007007=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5493 - in
trunk/hibernatetools/docs/reference/en/images: plugins and 1 other directory.
Date: Thu, 03 Jan 2008 12:46:47 -0500
Message-ID:
--===============6111489742807007007==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ochikvina
Date: 2008-01-03 12:46:47 -0500 (Thu, 03 Jan 2008)
New Revision: 5493
Added:
trunk/hibernatetools/docs/reference/en/images/plugins/
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_1.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_12.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_2.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_3.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_4.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_5.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_6.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_7.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_8.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_9.png
Log:
http://jira.jboss.com/jira/browse/JBDS-185 - folder 'plugins' is added to '=
images' folder
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_1.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/=
plugins_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_12.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/=
plugins_12.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_2.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/=
plugins_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_3.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/=
plugins_3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_4.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/=
plugins_4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_5.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/=
plugins_5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_6.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/=
plugins_6.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_7.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/=
plugins_7.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_8.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/=
plugins_8.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_9.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/=
plugins_9.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
--===============6111489742807007007==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 12:47:02 2008
Content-Type: multipart/mixed; boundary="===============3554390182992511911=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5494 -
trunk/hibernatetools/docs/reference/en/modules.
Date: Thu, 03 Jan 2008 12:47:02 -0500
Message-ID:
--===============3554390182992511911==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ochikvina
Date: 2008-01-03 12:47:02 -0500 (Thu, 03 Jan 2008)
New Revision: 5494
Modified:
trunk/hibernatetools/docs/reference/en/modules/plugins.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-185 - folder 'plugins' is added to '=
images' folder
Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2008-01-03 1=
7:46:47 UTC (rev 5493)
+++ trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2008-01-03 1=
7:47:02 UTC (rev 5494)
@@ -65,11 +65,11 @@
Hibernate Configuration File Wizard
-
+
=
-
+
@@ -80,7 +80,7 @@
=
Enter your configuration information in this dialog. Details abo=
ut the configuration
- options can be found in Hibernate reference doc=
umentation.
+ options can be found in Hibernate reference documentation<=
/property>.
=
Press Finish
@@ -121,11 +121,11 @@
Creating Hibernate Console Configuration
-
+
=
-
+
=
@@ -304,11 +304,11 @@
Specifying Classpath in Hibernate Console Configuration
-
+
=
-
+
=
@@ -384,11 +384,11 @@
Specifying additional Mappings in Hibernate Console Configu=
ration
-
+
=
-
+
@@ -452,11 +452,11 @@
Console Overview
-
+
=
-
+
=
@@ -484,7 +484,7 @@
Code Generation Launcher
=
When you click on
- Hibernate Code Generation...
+ Open Hibernate Code Generation Dialog... the standard Eclipse launcher dialog will appear. In t=
his dialog you can create,
edit and delete named Hibernate code generation "launchers".
=
@@ -492,11 +492,11 @@
Getting Hibernate Code Generation Wizard
-
+
=
-
+
@@ -507,11 +507,11 @@
Hibernate Code Generation Wizard
-
+
=
-
+
@@ -521,7 +521,7 @@
New_Generation will be used.
=
-
+ Tip:The "At least one exporter option must be selected"=
; is just a
warning stating that for this launch to work you need to select =
an exporter on the
Exporter tab. When an exporter has been selected the warning wil=
l disappear.
@@ -656,17 +656,17 @@
=
- Detect optimistic lock columns
+ Detect optimistic lock columns
=
- Automatically detect optimistic lock columns. Control=
lable via reveng.
- strategy; the current default is to use columns named VERS=
ION or TIMESTAMP.
+ Automatically detect optimistic lock columns. C=
ontrollable via reveng.
+ strategy; the current default is to use columns named VERS=
ION or TIMESTAMP.
=
- Detect many-to-many tables
+ Detect many-to-many tables
=
- Automatically detect many-to-many tables. Controllabl=
e via reveng.
- strategy.
+ Automatically detect many-to-many tables. Contr=
ollable via reveng.
+ strategy.
=
@@ -708,11 +708,11 @@
Selecting Exporters
-
+
=
-
+
@@ -1052,11 +1052,11 @@
Property Completion
-
+
=
-
+
@@ -1074,7 +1074,7 @@
configure the reverse engineering process.
=
The editor is intended to allow easy definition of type mappings=
, table include/excludes
- and specific override settings for columns, e.g. define a explicit n=
ame for a column when the
+ and specific override settings for columns, e.g. define an explicit =
name for a column when the
default naming rules is not applicable.
=
Note that not all the features of the
@@ -1189,7 +1189,7 @@
=
=
- Hibernate Console perspective showing ent=
ity structure, query editor and
+ Hibernate Console perspective shows entit=
y structure, query editor and
result
=
=
--===============3554390182992511911==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 20:54:38 2008
Content-Type: multipart/mixed; boundary="===============7722655236949111785=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5495 -
trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb.
Date: Thu, 03 Jan 2008 20:54:38 -0500
Message-ID:
--===============7722655236949111785==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-03 20:54:38 -0500 (Thu, 03 Jan 2008)
New Revision: 5495
Modified:
trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/commo=
n/kb/KbDinamicResource.java
trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/commo=
n/kb/KbDtdStore.java
trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/commo=
n/kb/KbHtmlMap.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml template=
s file in seam-gen.
JUnit tests also added.
Modified: trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tool=
s/common/kb/KbDinamicResource.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/comm=
on/kb/KbDinamicResource.java 2008-01-03 17:47:02 UTC (rev 5494)
+++ trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/comm=
on/kb/KbDinamicResource.java 2008-01-04 01:54:38 UTC (rev 5495)
@@ -19,19 +19,19 @@
*/
public interface KbDinamicResource extends KbResource {
=
- public static final String BUNDLE_PROPERTY_TYPE =3D "bundleProperty";
- public static final String BEAN_PROPERTY_TYPE =3D "beanProperty";
- public static final String BEAN_METHOD_BY_SYGNATURE_TYPE =3D "beanMethodB=
ySignature";
- public static final String JSP_PATH_TYPE =3D "jspPath";
- public static final String BUNDLE_NAME_TYPE =3D "bundleName";
- public static final String VIEW_ACTIONS_TYPE =3D "viewActions";
- public static final String IMAGE_FILE_TYPE =3D "file";
- public static final String ENUMERATION_TYPE =3D "enumeration";
- public static final String JSF_VARIABLES_TYPE =3D "jsfVariables";
- public static final String FACELETS_JSFC_TYPE =3D "faceletsJsfCTags";
- public static final String MANAGED_BEAN_NAME_TYPE =3D "managedBeanName";
- public static final String JSF_ID =3D "jsfID";
- public static final String TAGLIB_TYPE =3D "taglib";
+ String BUNDLE_PROPERTY_TYPE =3D "bundleProperty";
+ String BEAN_PROPERTY_TYPE =3D "beanProperty";
+ String BEAN_METHOD_BY_SYGNATURE_TYPE =3D "beanMethodBySignature";
+ String JSP_PATH_TYPE =3D "jspPath";
+ String BUNDLE_NAME_TYPE =3D "bundleName";
+ String VIEW_ACTIONS_TYPE =3D "viewActions";
+ String IMAGE_FILE_TYPE =3D "file";
+ String ENUMERATION_TYPE =3D "enumeration";
+ String JSF_VARIABLES_TYPE =3D "jsfVariables";
+ String FACELETS_JSFC_TYPE =3D "faceletsJsfCTags";
+ String MANAGED_BEAN_NAME_TYPE =3D "managedBeanName";
+ String JSF_ID =3D "jsfID";
+ String TAGLIB_TYPE =3D "taglib";
=
/**
* Sets a parameter for resource.
Modified: trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tool=
s/common/kb/KbDtdStore.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/comm=
on/kb/KbDtdStore.java 2008-01-03 17:47:02 UTC (rev 5494)
+++ trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/comm=
on/kb/KbDtdStore.java 2008-01-04 01:54:38 UTC (rev 5495)
@@ -21,18 +21,18 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.StringTokenizer;
import java.util.Vector;
=
import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.XMLSerializer;
+import org.jboss.tools.common.kb.configuration.KbConfigurationFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
=
-import org.jboss.tools.common.kb.configuration.KbConfigurationFactory;
-
/**
* @author eskimo
*/
@@ -41,9 +41,9 @@
public static final String XML_DECLARATION =3D "";
=
private String schemaLocation; =
- private Vector activeDocuments;
- private Vector registratedResources;
- private Vector downloadingResources;
+ private List activeDocuments;
+ private List registratedResources;
+ private List downloadingResources;
=
private static final KbDtdStore INSTANCE =3D new KbDtdStore();
=
@@ -83,7 +83,7 @@
}
=
InerDtdQuery inerDtdQuery =3D getInerDtdQery(new KbQuery(queryForLastTag=
, query.getResources()));
- ArrayList elementTypes =3D inerDtdQuery.getElementTypes();
+ List elementTypes =3D inerDtdQuery.getElementTypes();
=
return KbSchemaUtil.getTagInformationFromElementTypes(elementTypes, last=
Tag, new HashSet());
}
@@ -115,7 +115,7 @@
return proposals;
}
=
- ArrayList proposals =3D queryTagProposal(getInerDtdQery(quer=
y));
+ List proposals =3D queryTagProposal(getInerDtdQery(query));
KbProposal endTag =3D getEndTagProposal(query);
if(endTag !=3D null) {
proposals.add(endTag);
@@ -141,7 +141,7 @@
throw new IllegalArgumentException("Bad query: " + strQuery + ". Query =
must starts with \"" + KbQuery.TAG_SEPARATOR + "\" or \"" + KbQuery.XML_DEC=
LARATION_QUERY + "\"");
}
=
- ArrayList elementTypes =3D new ArrayList();
+ List elementTypes =3D new ArrayList();
String tagQuery =3D null;
int lastTagSeparator =3D strQuery.lastIndexOf(KbQuery.TAG_SEPARATOR);
if(lastTagSeparator > firstTagSeparator) {
@@ -325,7 +325,7 @@
}
}
=
- private ArrayList getChildElementTypes(Collection resources, Str=
ingTokenizer tagNames) {
+ private List getChildElementTypes(Collection resources, StringTo=
kenizer tagNames) {
// KbPlugin.log("--> getChildElementTypes(Collection resources, StringTok=
enizer tagNames)");
// KbPlugin.log(" resources size =3D " + resources.size());
// KbPlugin.log(" tagNames =3D " + tagNames);
@@ -333,7 +333,7 @@
String tagName =3D tagNames.nextToken();
// KbPlugin.log(" tagName =3D " + tagName);
=
- ArrayList childElements =3D getChildElements(resources, tagName=
, true);
+ List childElements =3D getChildElements(resources, tagName, tru=
e);
=
// KbPlugin.log(" childElements size =3D " + childElements.size());
=
@@ -405,7 +405,7 @@
return null;
}
=
- private ArrayList addCollection(Collection col1, Collec=
tion col2) {
+ private List addCollection(Collection col1, Collection<=
Element> col2) {
ArrayList arrayList =3D new ArrayList();
Iterator iterator =3D col1.iterator();
while(iterator.hasNext()) {
@@ -418,7 +418,7 @@
return arrayList;
}
=
- private ArrayList getChildElements(Collection resources, String =
elementTypeName, boolean rootTag) {
+ private List getChildElements(Collection resources, String eleme=
ntTypeName, boolean rootTag) {
// KbPlugin.log("--> getChildElements(Collection resources, String elemen=
tTypeName, boolean rootTag)");
// KbPlugin.log(" resources size =3D " + resources.size());
// KbPlugin.log(" elementTypeName =3D " + elementTypeName);
@@ -473,11 +473,11 @@
return elements;
}
=
- private ArrayList queryTagProposal(InerDtdQuery query) {
+ private List queryTagProposal(InerDtdQuery query) {
return queryTagProposal(query.getElementTypes(), query.getTagQuery());
}
=
- private ArrayList queryTagProposal(ArrayList elementTypes, St=
ring query) {
+ private List queryTagProposal(List elementTypes, String query=
) {
// KbPlugin.log("--> queryTagProposal(ArrayList elementTypes, String que=
ry)");
// KbPlugin.log(" Query =3D " + query);
// KbPlugin.log(" elementTypes size =3D " + elementTypes.size());
@@ -722,7 +722,7 @@
}
}
=
- private ArrayList getTags(Collection elementTypes, String tag=
Mask) {
+ private List getTags(Collection elementTypes, String tagMask)=
{
// KbPlugin.log("--> getTags(Collection elementTypes, String tagMask)");
// KbPlugin.log(" elementTypes size =3D " + elementTypes.size());
// KbPlugin.log(" tagMask =3D " + tagMask);
@@ -730,7 +730,7 @@
return getTagProposal(getElementTypesByName(elementTypes, tagMask, true)=
);
}
=
- private ArrayList getElementTypesByName(Collection elementTypes,=
String name, boolean mask) {
+ private List getElementTypesByName(Collection elementTypes, Stri=
ng name, boolean mask) {
// KbPlugin.log("--> getElementTypesByName(Collection elementTypes, Strin=
g name, boolean mask)");
// KbPlugin.log(" elementTypes size =3D " + elementTypes.size());
// KbPlugin.log(" name =3D " + name);
@@ -755,7 +755,7 @@
return elements;
}
=
- private ArrayList getAttributes(Collection elementTypes, Stri=
ng tagName, String attributeMask) {
+ private List getAttributes(Collection elementTypes, String ta=
gName, String attributeMask) {
// KbPlugin.log("--> getAttributes(String prefix, String tagName, String =
attributeMask)");
// KbPlugin.log(" prefix =3D " + prefix);
// KbPlugin.log(" tagName =3D " + tagName);
@@ -764,10 +764,10 @@
return getAttributeProposal(getAttributeTypesByName(elementTypes, tagNam=
e, attributeMask, true));
}
=
- private ArrayList getAttributeTypesByName(Collection elementType=
s, String tagName, String attributeName, boolean mask) {
- ArrayList attributes =3D new ArrayList();
+ private List getAttributeTypesByName(Collection elementTypes, St=
ring tagName, String attributeName, boolean mask) {
+ List attributes =3D new ArrayList();
=
- ArrayList elements =3D getElementTypesByName(elementTypes, tagName, fals=
e);
+ List elements =3D getElementTypesByName(elementTypes, tagName, false);
if(!elements.isEmpty()) {
Element element =3D (Element)elements.get(0);
=
@@ -785,10 +785,10 @@
return attributes;
}
=
- private ArrayList getEnumeration(Collection elementTypes, Str=
ing tagName, String attributeName, String valueMask) {
- ArrayList enumeration =3D new ArrayList();
+ private List getEnumeration(Collection elementTypes, String t=
agName, String attributeName, String valueMask) {
+ List enumeration =3D new ArrayList();
=
- ArrayList attributeTypes =3D new ArrayList();
+ List attributeTypes =3D new ArrayList();
attributeTypes =3D getAttributeTypesByName(elementTypes, tagName, attrib=
uteName, false);
if(!attributeTypes.isEmpty()) {
Element attributeType =3D (Element)attributeTypes.get(0);
@@ -814,15 +814,15 @@
return enumeration;
}
=
- private ArrayList getTagProposal(ArrayList elements)=
{
+ private List getTagProposal(List elements) {
return getProposal(elements, true);
}
=
- private ArrayList getAttributeProposal(ArrayList elements) {
+ private List getAttributeProposal(List elements) {
return getProposal(elements, false);
}
=
- private ArrayList getProposal(ArrayList elements, boolean tag=
) {
+ private List getProposal(List elements, boolean tag) {
// KbPlugin.log("--> getProposal(ArrayList elements, boolean tag)");
// KbPlugin.log(" elemnets size =3D " + elements.size());
// KbPlugin.log(" tag =3D " + tag);
@@ -959,10 +959,10 @@
=
private class InerDtdQuery {
=
- private ArrayList elementTypes;
+ private List elementTypes;
private String tagQuery;
=
- public InerDtdQuery(ArrayList elementTypes, String tagQuery) {
+ public InerDtdQuery(List elementTypes, String tagQuery) {
this.elementTypes =3D elementTypes;
this.tagQuery =3D tagQuery;
}
@@ -970,7 +970,7 @@
/**
* @return
*/
- public ArrayList getElementTypes() {
+ public List getElementTypes() {
return elementTypes;
}
=
Modified: trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tool=
s/common/kb/KbHtmlMap.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/comm=
on/kb/KbHtmlMap.java 2008-01-03 17:47:02 UTC (rev 5494)
+++ trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/comm=
on/kb/KbHtmlMap.java 2008-01-04 01:54:38 UTC (rev 5495)
@@ -22,6 +22,8 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.Properties;
=
import org.apache.xml.serialize.OutputFormat;
@@ -39,13 +41,13 @@
public class KbHtmlMap {
private final static String ROOT_ELEMENT_ATTRIBUTE_VALUE =3D "HTML";
=
- private HashMap htmlMap;
+ private Map htmlMap;
private static File hashMapLocation =3D new File(KbConfigurationFactory.g=
etInstance().getDefaultConfiguration().getHtmlMapFilePath());
=
/**
* =
*/
- private KbHtmlMap(HashMap proposals) {
+ private KbHtmlMap(Map proposals) {
htmlMap =3D proposals;
}
=
@@ -56,7 +58,7 @@
HashMap children =3D new HashMap();
Element elementType =3D (Element)nodeList.item(i);
String tagName =3D elementType.getAttribute(SchemaNodeFactory.NAME_ATTR=
IBUTE);
- ArrayList childrenElementTypes =3D getChildElementTypes(schema, tagName=
);
+ List childrenElementTypes =3D getChildElementTypes(schema, tagName);
addOptionalTags(children, elementType);
for(int j=3D0; j children =3D new HashMap();
Element elementType =3D (Element)nodeList.item(i);
String tagName =3D elementType.getAttribute(SchemaNodeFactory.NAME_ATTR=
IBUTE);
- ArrayList childrenElementTypes =3D getChildElementTypes(schema, tagName=
);
+ List childrenElementTypes =3D getChildElementTypes(schema, tagName);
addOptionalTags(children, elementType);
for(int j=3D0; j getChildElementTypes(Document schema, S=
tring tagName) {
- ArrayList childElementTypes =3D new ArrayList();
+ private static List getChildElementTypes(Document schema, String=
tagName) {
+ List childElementTypes =3D new ArrayList();
=
- ArrayList childElements =3D getChildElements(schema, tagName);
+ List childElements =3D getChildElements(schema, tagName);
=
for(Iterator iter =3D childElements.iterator(); iter.hasNext();) {
Element element =3D (Element)iter.next();
--===============7722655236949111785==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 20:54:41 2008
Content-Type: multipart/mixed; boundary="===============2702021838698346265=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5496 -
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/xpl.
Date: Thu, 03 Jan 2008 20:54:41 -0500
Message-ID:
--===============2702021838698346265==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-03 20:54:41 -0500 (Thu, 03 Jan 2008)
New Revision: 5496
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/j=
st/web/debug/ui/internal/views/properties/xpl/WebDataProperties.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml template=
s file in seam-gen.
JUnit tests also added.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/=
tools/jst/web/debug/ui/internal/views/properties/xpl/WebDataProperties.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/=
jst/web/debug/ui/internal/views/properties/xpl/WebDataProperties.java 2008-=
01-04 01:54:38 UTC (rev 5495)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/=
jst/web/debug/ui/internal/views/properties/xpl/WebDataProperties.java 2008-=
01-04 01:54:41 UTC (rev 5496)
@@ -71,7 +71,7 @@
private static Map enablements =3D new HashMap(12);
private static Map filters =3D new HashMap(2);
=
- private IPreferenceStore fStore;
+ private final IPreferenceStore fStore;
=
public WebDataProperties (IPreferenceStore store) {
this.fStore =3D store;
@@ -87,7 +87,7 @@
try {
Boolean value =3D (Boolean)enablements.get(filter);
if (value =3D=3D null && fStore !=3D null) {
- value =3D new Boolean(fStore.getBoolean(filter));
+ value =3D Boolean.valueOf(fStore.getBoolean(filter));
synchronized (this) {
enablements.put(filter, value);
}
@@ -135,7 +135,7 @@
newValue=3D false;
}
=
- enablements.put(p, new Boolean(newValue));
+ enablements.put(p, Boolean.valueOf(newValue));
fireWebDataPropertyChanged(p);
}
if (filters.containsKey(p)) {
@@ -213,7 +213,7 @@
store.setDefault(SHOW_STRUTS_DYNAACTIONFORM_FILTER+VALUE_POSTFIX, "*");
=
}
- private List fListeners =3D new ArrayList();
+ private final List fListeners =3D new ArrayList();
public void addWebDataPropertyChangeListener (IWebDataPropertyChangeListe=
ner listener) {
if (!fListeners.contains(listener)) fListeners.add(listener);
}
--===============2702021838698346265==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 20:54:45 2008
Content-Type: multipart/mixed; boundary="===============4396634057151126643=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5497 -
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet.
Date: Thu, 03 Jan 2008 20:54:44 -0500
Message-ID:
--===============4396634057151126643==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-03 20:54:44 -0500 (Thu, 03 Jan 2008)
New Revision: 5497
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam=
/core/test/project/facet/AbstractSeamFacetTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam=
/core/test/project/facet/SeamFacetInstallDelegateTest.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml template=
s file in seam-gen.
JUnit tests also added.
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/too=
ls/seam/core/test/project/facet/AbstractSeamFacetTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea=
m/core/test/project/facet/AbstractSeamFacetTest.java 2008-01-04 01:54:41 UT=
C (rev 5496)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea=
m/core/test/project/facet/AbstractSeamFacetTest.java 2008-01-04 01:54:44 UT=
C (rev 5497)
@@ -24,6 +24,7 @@
import org.jboss.tools.seam.core.project.facet.SeamVersion;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataMode=
lProperties;
import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDa=
taModelProvider;
+import org.jboss.tools.seam.internal.core.project.facet.SeamFacetPreInstal=
lDelegate;
=
/**
* Base class for facet related tests; based on the facet test class found=
in
@@ -68,16 +69,16 @@
super.setUp();
assertSeamHomeAvailable();
File folder =3D getSeamHomeFolder();
- =
- =
- =
+
SeamRuntimeManager.getInstance().addRuntime(SEAM_1_2_0, folder.getAbsolu=
tePath(), SeamVersion.SEAM_1_2, true);
seamRuntime =3D SeamRuntimeManager.getInstance().findRuntimeByName(SEAM_=
1_2_0);
=
}
=
protected File getSeamHomeFolder() {
- return new File(System.getProperty("jbosstools.test.seam.1.2.1.eap.home"=
, "/home/max/rhdevstudio/jboss-eap/seam"));
+ return new File(
+ System.getProperty("jbosstools.test.seam.1.2.1.eap.home", =
+ "C:/jbdevstudio/jboss-eap/seam"));
}
=
=
@@ -152,7 +153,7 @@
null);
=
installDependentFacets(fproj);
- =
+// new SeamFacetPreInstallDelegate().execute(fproj.getProject(), getSeamF=
acetVersion(), config, null);
fproj.installProjectFacet(getSeamFacetVersion(), config, null);
=
SeamProjectsSet seamProjectsSet =3D new SeamProjectsSet(fproj.getProject=
());
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/too=
ls/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea=
m/core/test/project/facet/SeamFacetInstallDelegateTest.java 2008-01-04 01:5=
4:41 UTC (rev 5496)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea=
m/core/test/project/facet/SeamFacetInstallDelegateTest.java 2008-01-04 01:5=
4:44 UTC (rev 5497)
@@ -12,10 +12,14 @@
=
import java.io.IOException;
=
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataMode=
lProperties;
+import org.jboss.tools.seam.internal.core.project.facet.SeamFacetPreInstal=
lDelegate;
+import org.jboss.tools.test.util.ResourcesUtils;
=
public class SeamFacetInstallDelegateTest extends AbstractSeamFacetTest {
=
@@ -46,4 +50,73 @@
=
}
=
+ public void testJiraJbide1544() throws CoreException, IOException {
+
+ final String catalogName =3D "catalog1";
+ final String schemaName =3D "schema1";
+ =
+ IDataModel createSeamDataModel =3D createSeamDataModel("war");
+ createSeamDataModel.setProperty(ISeamFacetDataModelProperties.DB_DEFAULT=
_CATALOG_NAME, catalogName);
+ createSeamDataModel.setProperty(ISeamFacetDataModelProperties.DB_DEFAULT=
_SCHEMA_NAME, schemaName); =
+ IFacetedProject fproj =3D createSeamProject("customSchemaAndCatalog",cre=
ateSeamDataModel);
+ IFile persistence =3D (IFile)fproj.getProject().findMember("src/model/M=
ETA-INF/persistence.xml");
+ assertTrue(persistence.exists());
+ boolean schemaExists =3D ResourcesUtils.findLineInFile(persistence, ".*"=
+
+ NLS.bind(
+ SeamFacetPreInstallDelegate.PROP_DECL, =
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME.replace(".","\=
\."),
+ schemaName}));
+ boolean catalogExists =3D ResourcesUtils.findLineInFile(persistence, ".*=
" +
+ NLS.bind(
+ SeamFacetPreInstallDelegate.PROP_DECL, =
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME.replace(".",=
"\\."),
+ catalogName})); =
+ assertTrue(
+ NLS.bind(
+ "Cannot find ''{0}'' property in persistence.xml file",
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME})
+ , schemaExists);
+ =
+ assertTrue(
+ NLS.bind(
+ "Cannot find ''{0}'' property in persistence.xml file",
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME})
+ , catalogExists);
+ =
+ createSeamDataModel =3D createSeamDataModel("war");
+ fproj =3D createSeamProject("noSchemaAndCatalog",createSeamDataModel);
+ persistence =3D (IFile)fproj.getProject().findMember("src/model/META-INF=
/persistence.xml");
+ assertTrue(persistence.exists());
+ schemaExists =3D ResourcesUtils.findLineInFile(persistence, ".*" +
+ NLS.bind(
+ SeamFacetPreInstallDelegate.PROP_DECL, =
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME.replace(".","\=
\."),
+ ".*"}));
+ catalogExists =3D ResourcesUtils.findLineInFile(persistence, ".*" +
+ NLS.bind(
+ SeamFacetPreInstallDelegate.PROP_DECL, =
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME.replace(".",=
"\\."),
+ ".*"})); =
+ assertTrue(
+ NLS.bind(
+ "''{0}'' property mustn't be in persistence.xml file",
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME})
+ , !schemaExists);
+ =
+ assertTrue(
+ NLS.bind(
+ "''{0}'' property mustn't be in persistence.xml file",
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME})
+ , !catalogExists);
+
+ }
+
}
--===============4396634057151126643==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 20:54:49 2008
Content-Type: multipart/mixed; boundary="===============3403699122556251454=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5498 -
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util.
Date: Thu, 03 Jan 2008 20:54:47 -0500
Message-ID:
--===============3403699122556251454==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-03 20:54:47 -0500 (Thu, 03 Jan 2008)
New Revision: 5498
Modified:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/Res=
ourcesUtils.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml template=
s file in seam-gen.
JUnit tests also added.
Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/u=
til/ResourcesUtils.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/Re=
sourcesUtils.java 2008-01-04 01:54:44 UTC (rev 5497)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/Re=
sourcesUtils.java 2008-01-04 01:54:47 UTC (rev 5498)
@@ -12,9 +12,13 @@
=
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
=
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IResource;
@@ -108,4 +112,18 @@
=
return project;
}
+ =
+ public static boolean findLineInFile(IFile file, String pattern) throws C=
oreException, IOException {
+ InputStream content =3D file.getContents(true);
+ LineNumberReader contentReader =3D new LineNumberReader(new InputStreamR=
eader(content));
+ String line;
+ boolean patternIsFound =3D false;
+ do {
+ line =3D contentReader.readLine();
+ if(line!=3Dnull && !patternIsFound) {
+ patternIsFound =3D line.matches(pattern);
+ }
+ } while (line !=3D null && !patternIsFound);
+ return patternIsFound;
+ }
}
--===============3403699122556251454==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 20:54:51 2008
Content-Type: multipart/mixed; boundary="===============3887917179010311218=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5499 - in
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui:
widget/field and 1 other directory.
Date: Thu, 03 Jan 2008 20:54:51 -0500
Message-ID:
--===============3887917179010311218==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-03 20:54:51 -0500 (Thu, 03 Jan 2008)
New Revision: 5499
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/i=
nternal/project/facet/SeamInstallWizardPage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/w=
idget/field/TextField.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml template=
s file in seam-gen.
JUnit tests also added.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/se=
am/ui/internal/project/facet/SeamInstallWizardPage.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/=
internal/project/facet/SeamInstallWizardPage.java 2008-01-04 01:54:47 UTC (=
rev 5498)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/=
internal/project/facet/SeamInstallWizardPage.java 2008-01-04 01:54:51 UTC (=
rev 5499)
@@ -121,11 +121,11 @@
.getDialectNames()), getDefaultDbType(), false);
=
private IFieldEditor dbSchemaName =3D IFieldEditorFactory.INSTANCE.create=
TextEditor(
- ISeamFacetDataModelProperties.DB_SCHEMA_NAME,
+ ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME,
SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME, ""); //$N=
ON-NLS-1$
=
private IFieldEditor dbCatalogName =3D IFieldEditorFactory.INSTANCE.creat=
eTextEditor(
- ISeamFacetDataModelProperties.DB_CATALOG_NAME,
+ ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME,
SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME, ""); //$=
NON-NLS-1$
=
private IFieldEditor dbTablesExists =3D IFieldEditorFactory.INSTANCE
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/se=
am/ui/widget/field/TextField.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/=
widget/field/TextField.java 2008-01-04 01:54:47 UTC (rev 5498)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/=
widget/field/TextField.java 2008-01-04 01:54:51 UTC (rev 5499)
@@ -27,7 +27,7 @@
}
=
public void modifyText(ModifyEvent e) {
- firePropertyChange(new Object(),((Text)e.widget).getText());
+ firePropertyChange(new Object(),((Text)e.widget).getText().trim());
}
=
public Text getTextControl() {
--===============3887917179010311218==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 20:54:54 2008
Content-Type: multipart/mixed; boundary="===============6408897870610824632=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5500 -
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special.
Date: Thu, 03 Jan 2008 20:54:54 -0500
Message-ID:
--===============6408897870610824632==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-03 20:54:54 -0500 (Thu, 03 Jan 2008)
New Revision: 5500
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools=
/common/model/ui/wizards/special/DefaultSpecialWizard.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml template=
s file in seam-gen.
JUnit tests also added.
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos=
s/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool=
s/common/model/ui/wizards/special/DefaultSpecialWizard.java 2008-01-04 01:5=
4:51 UTC (rev 5499)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool=
s/common/model/ui/wizards/special/DefaultSpecialWizard.java 2008-01-04 01:5=
4:54 UTC (rev 5500)
@@ -88,11 +88,7 @@
} catch (Exception e) {
ModelUIPlugin.getPluginLog().logError(e);
}
- try {
- setStep();
- } catch (Exception t) {
- ModelUIPlugin.getPluginLog().logError("Error while executing action " +=
name, t);
- }
+ setStep();
}
=
private void setStep() {
--===============6408897870610824632==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 20:54:58 2008
Content-Type: multipart/mixed; boundary="===============1738001824482535747=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5501 -
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
Date: Thu, 03 Jan 2008 20:54:58 -0500
Message-ID:
--===============1738001824482535747==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-03 20:54:58 -0500 (Thu, 03 Jan 2008)
New Revision: 5501
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co=
mmon/model/util/EclipseResourceUtil.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml template=
s file in seam-gen.
JUnit tests also added.
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t=
ools/common/model/util/EclipseResourceUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c=
ommon/model/util/EclipseResourceUtil.java 2008-01-04 01:54:54 UTC (rev 5500)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c=
ommon/model/util/EclipseResourceUtil.java 2008-01-04 01:54:58 UTC (rev 5501)
@@ -499,7 +499,7 @@
}
=
public static IType getValidType(IProject project, String className) {
- if (className =3D=3D null && className.length() =3D=3D 0) return null;
+ if (className =3D=3D null || className.length() =3D=3D 0) return null;
IJavaProject javaProject =3D getJavaProject(project);
if(javaProject =3D=3D null) return null;
IFile f =3D null;
@@ -546,7 +546,7 @@
* Returns true only if project has no sources but output contains *.clas=
s file =
*/ =
public static boolean isContainedInOutput(IProject project, String classN=
ame) {
- if (className =3D=3D null && className.length() =3D=3D 0) return false;
+ if (className =3D=3D null || className.length() =3D=3D 0) return false;
IJavaProject javaProject =3D getJavaProject(project);
if(javaProject =3D=3D null) return false;
try {
--===============1738001824482535747==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 20:55:05 2008
Content-Type: multipart/mixed; boundary="===============3900270170968958150=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5502 -
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
Date: Thu, 03 Jan 2008 20:55:05 -0500
Message-ID:
--===============3900270170968958150==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-03 20:55:05 -0500 (Thu, 03 Jan 2008)
New Revision: 5502
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in=
ternal/core/project/facet/ISeamFacetDataModelProperties.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in=
ternal/core/project/facet/SeamFacetInstallDataModelProvider.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in=
ternal/core/project/facet/SeamFacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in=
ternal/core/project/facet/SeamFacetPreInstallDelegate.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml template=
s file in seam-gen.
JUnit tests also added.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/=
seam/internal/core/project/facet/ISeamFacetDataModelProperties.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i=
nternal/core/project/facet/ISeamFacetDataModelProperties.java 2008-01-04 01=
:54:58 UTC (rev 5501)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i=
nternal/core/project/facet/ISeamFacetDataModelProperties.java 2008-01-04 01=
:55:05 UTC (rev 5502)
@@ -132,6 +132,14 @@
* Schema name
*/
String DB_SCHEMA_NAME =3D "schema.property"; //$NON-NLS-1$
+
+ /**
+ * If it is empty schema.property is empty
+ * If is not empty schema.property should be set to
+ *
<property name=3D"hibernate.default_schema" value=
=3D"${hibernate.default_schema}"/> =
+ * =
+ */
+ String DB_DEFAULT_SCHEMA_NAME =3D "hibernate.default_schema"; //$NON-NLS-=
1$
=
/**
* Catalog name
@@ -139,6 +147,13 @@
String DB_CATALOG_NAME =3D "catalog.property"; //$NON-NLS-1$
=
/**
+ * If it is empty catalog.property is empty
+ * If is not empty catalog.property should be set to
+ *
<property name=3D"hibernate.default_catalog" value=
=3D"${hibernate.default_catalog}"/> =
+ */
+ String DB_DEFAULT_CATALOG_NAME =3D "hibernate.default_catalog"; //$NON-NL=
S-1$
+ =
+ /**
* DB tables already exists in database check box value
*/
String DB_ALREADY_EXISTS =3D "database.exists"; //$NON-NLS-1$
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/=
seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i=
nternal/core/project/facet/SeamFacetInstallDataModelProvider.java 2008-01-0=
4 01:54:58 UTC (rev 5501)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i=
nternal/core/project/facet/SeamFacetInstallDataModelProvider.java 2008-01-0=
4 01:55:05 UTC (rev 5502)
@@ -7,55 +7,44 @@
* =
* Contributors: =
* Red Hat, Inc. - initial API and implementation =
- *************************************************************************=
*****/ =
+ *************************************************************************=
*****/
package org.jboss.tools.seam.internal.core.project.facet;
=
import java.io.File;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Set;
=
import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataMode=
lProvider;
import org.jboss.tools.seam.core.SeamCorePlugin;
=
/**
* Data model provider for Seam facet wizard page
+ * =
* @author eskimo
- *
+ * =
*/
public class SeamFacetInstallDataModelProvider extends
FacetInstallDataModelProvider implements ISeamFacetDataModelProperties {
- =
- @Override
- public IStatus validate(String name) {
- // TODO Auto-generated method stub
- return super.validate(name);
- }
=
- public static final Map SEAM_LIBRARIES=3D new HashMap();
- =
- static {
- SEAM_LIBRARIES.put("1.2",new String[] { //$NON-NLS-1$
- });
- }
+ private static final String EMPTY_STRING =3D "";
+
/**
* Returns set of facet properties for facet wizard page
+ * =
+ * @return set of property names
*/
- @Override
public Set getPropertyNames() {
Set names =3D super.getPropertyNames();
- =
+
// General group
names.add(ISeamFacetDataModelProperties.JBOSS_AS_HOME);
names.add(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME);
names.add(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS);
names.add(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER);
names.add(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_RUNTIME);
- =
+
// Database group
names.add(ISeamFacetDataModelProperties.DB_TYPE);
names.add(ISeamFacetDataModelProperties.HIBERNATE_DIALECT);
@@ -65,8 +54,9 @@
names.add(ISeamFacetDataModelProperties.DB_USER_NAME);
names.add(ISeamFacetDataModelProperties.DB_USER_PASSWORD);
names.add(ISeamFacetDataModelProperties.DB_SCHEMA_NAME);
+ names.add(ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME);
names.add(ISeamFacetDataModelProperties.DB_CATALOG_NAME);
-
+ names.add(ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME);
names.add(ISeamFacetDataModelProperties.DB_ALREADY_EXISTS);
names.add(ISeamFacetDataModelProperties.RECREATE_TABLES_AND_DATA_ON_DEPL=
OY);
=
@@ -84,31 +74,46 @@
names.add(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT);
names.add(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME);
names.add(ISeamFacetDataModelProperties.HIBERNATE_HBM2DDL_AUTO);
- =
+
return names;
}
- =
+
/**
* Returns default value for a given property
+ * =
+ * @param propertyName name of property which default value requested
+ * @return default value =
*/
public Object getDefaultProperty(String propertyName) {
- if(JBOSS_AS_HOME.equals(propertyName)) {
+ if (JBOSS_AS_HOME.equals(propertyName)) {
return "Jboss_AS_HOME"; //$NON-NLS-1$
- } else if(JBOSS_AS_DEPLOY_AS.equals(propertyName)) {
+ } else if (JBOSS_AS_DEPLOY_AS.equals(propertyName)) {
return "Jboos_DEPLOY_AS"; //$NON-NLS-1$
} else if (propertyName.equals(FACET_ID)) {
- return ISeamCoreConstants.SEAM_CORE_FACET_ID;
- } else if(SEAM_TEST_PROJECT.equals(propertyName)) {
- return "";
- } else if(SEAM_EJB_PROJECT.equals(propertyName)) {
- return "";
- } else if(SEAM_EAR_PROJECT.equals(propertyName)) {
- return "";
+ return ISeamCoreConstants.SEAM_CORE_FACET_ID;
+ } else if (SEAM_TEST_PROJECT.equals(propertyName)) {
+ return EMPTY_STRING;
+ } else if (SEAM_EJB_PROJECT.equals(propertyName)) {
+ return EMPTY_STRING;
+ } else if (SEAM_EAR_PROJECT.equals(propertyName)) {
+ return EMPTY_STRING;
+ } else if (DB_DEFAULT_CATALOG_NAME.equals(propertyName)) {
+ return EMPTY_STRING;
+ } else if (DB_DEFAULT_SCHEMA_NAME.equals(propertyName)) {
+ return EMPTY_STRING;
}
return super.getDefaultProperty(propertyName);
}
- =
+
+ /**
+ * Calculate path to templates folder
+ * =
+ * @return path to templates
+ * @throws IOException if templates folder not found
+ */
public static File getTemplatesFolder() throws IOException {
- return new File(FileLocator.resolve(Platform.getBundle(SeamCorePlugin.PL=
UGIN_ID).getEntry("/templates")).getPath()); //$NON-NLS-1$
+ return new File(FileLocator.resolve(
+ Platform.getBundle(SeamCorePlugin.PLUGIN_ID).getEntry(
+ "/templates")).getPath()); //$NON-NLS-1$
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/=
seam/internal/core/project/facet/SeamFacetInstallDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i=
nternal/core/project/facet/SeamFacetInstallDelegate.java 2008-01-04 01:54:5=
8 UTC (rev 5501)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i=
nternal/core/project/facet/SeamFacetInstallDelegate.java 2008-01-04 01:55:0=
5 UTC (rev 5502)
@@ -50,15 +50,37 @@
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
=
+/**
+ * Install delegate for seam faset version 1.2
+ * =
+ * @author eskimo =
+ */
public class SeamFacetInstallDelegate extends SeamFacetAbstractInstallDele=
gate {
=
- public static String DEV_WAR_PROFILE =3D "dev-war"; //$NON-NLS-1$
- public static String DEV_EAR_PROFILE =3D "dev"; //$NON-NLS-1$
- public static String TEST_WAR_PROFILE =3D "test-war"; //$NON-NLS-1$
- public static String TEST_EAR_PROFILE =3D "test"; //$NON-NLS-1$
+ /**
+ *
+ **/
+ public static final String DEV_WAR_PROFILE =3D "dev-war"; //$NON-NLS-1$
=
+ /**
+ * =
+ */
+ public static final String DEV_EAR_PROFILE =3D "dev"; //$NON-NLS-1$
=
- public static AntCopyUtils.FileSet JBOSS_WAR_LIB_FILESET_WAR_CONFIG =3D n=
ew AntCopyUtils.FileSet() =
+ /**
+ * =
+ */
+ public static final String TEST_WAR_PROFILE =3D "test-war"; //$NON-NLS-1$
+
+ /**
+ * =
+ */
+ public static final String TEST_EAR_PROFILE =3D "test"; //$NON-NLS-1$
+ =
+ /**
+ * =
+ */
+ public static final AntCopyUtils.FileSet JBOSS_WAR_LIB_FILESET_WAR_CONFIG=
=3D new AntCopyUtils.FileSet() =
.include("ajax4jsf.*\\.jar") //$NON-NLS-1$
.include("richfaces.*\\.jar") //$NON-NLS-1$
.include("antlr.*\\.jar") //$NON-NLS-1$
@@ -83,7 +105,10 @@
.include("stringtemplate.*\\.jar") //$NON-NLS-1$
// el-ri needed for JBIDE-939
.include("el-ri.*\\.jar"); //$NON-NLS-1$ =
- =
+
+ /**
+ * =
+ */
public static AntCopyUtils.FileSet JBOSS_TEST_LIB_FILESET =3D new AntCopy=
Utils.FileSet() =
.include("testng-.*-jdk15\\.jar") //$NON-NLS-1$
.include("myfaces-api-.*\\.jar") //$NON-NLS-1$
@@ -95,6 +120,9 @@
.exclude(".*/CVS") //$NON-NLS-1$
.exclude(".*/\\.svn"); //$NON-NLS-1$
=
+ /**
+ * =
+ */
public static AntCopyUtils.FileSet JBOSS_WAR_LIB_FILESET_EAR_CONFIG =3D n=
ew AntCopyUtils.FileSet() =
.include("ajax4jsf.*\\.jar") //$NON-NLS-1$
.include("richfaces.*\\.jar") //$NON-NLS-1$
@@ -110,7 +138,9 @@
.include("jsf-facelets\\.jar") //$NON-NLS-1$
.include("oscache.*\\.jar"); //$NON-NLS-1$
=
- =
+ /**
+ * =
+ */
public static AntCopyUtils.FileSet JBOSS_EAR_CONTENT =3D new AntCopyUtil=
s.FileSet()
.include("antlr.*\\.jar") //$NON-NLS-1$
.include("commons-jci-core.*\\.jar") //$NON-NLS-1$
@@ -125,10 +155,16 @@
// el-ri needed for JBIDE-939
.include("el-ri.*\\.jar"); //$NON-NLS-1$ =
=
+ /**
+ * =
+ */
public static AntCopyUtils.FileSet JBOSS_EAR_CONTENT_META_INF =3D new Ant=
CopyUtils.FileSet()
.include("META-INF/application\\.xml") //$NON-NLS-1$
.include("META-INF/jboss-app\\.xml"); //$NON-NLS-1$
- =
+
+ /**
+ * =
+ */
public static AntCopyUtils.FileSet VIEW_FILESET =3D new AntCopyUtils.File=
Set()
.include("home\\.xhtml") //$NON-NLS-1$
.include("error\\.xhtml") //$NON-NLS-1$
@@ -145,13 +181,19 @@
.exclude(".*/CVS") //$NON-NLS-1$
.exclude(".*/\\.svn"); //$NON-NLS-1$
=
+ /**
+ * =
+ */
public static AntCopyUtils.FileSet CVS_SVN =3D new AntCopyUtils.FileSet()
.include(".*") //$NON-NLS-1$
.exclude(".*/CVS") //$NON-NLS-1$
.exclude("CVS") //$NON-NLS-1$
.exclude(".*\\.svn") //$NON-NLS-1$
.exclude(".*/\\.svn"); //$NON-NLS-1$
- =
+
+ /**
+ * =
+ */
public static AntCopyUtils.FileSet JBOOS_WAR_WEBINF_SET =3D new AntCopyUt=
ils.FileSet()
.include("WEB-INF") //$NON-NLS-1$
.include("WEB-INF/web\\.xml") //$NON-NLS-1$
@@ -159,27 +201,48 @@
.include("WEB-INF/jboss-web\\.xml") //$NON-NLS-1$
.include("WEB-INF/faces-config\\.xml") //$NON-NLS-1$
.include("WEB-INF/componets\\.xml"); //$NON-NLS-1$
- =
+
+ /**
+ * =
+ */
public static AntCopyUtils.FileSet JBOOS_WAR_WEB_INF_CLASSES_SET =3D new =
AntCopyUtils.FileSet()
.include("import\\.sql") //$NON-NLS-1$
.include("security\\.drl") //$NON-NLS-1$
.include("seam\\.properties") //$NON-NLS-1$
.include("messages_en\\.properties"); //$NON-NLS-1$
- =
+
+ /**
+ * =
+ */
public static AntCopyUtils.FileSet JBOOS_EJB_WEB_INF_CLASSES_SET =3D new =
AntCopyUtils.FileSet()
.include("import\\.sql") //$NON-NLS-1$
.include("seam\\.properties")
.exclude(".*/WEB-INF"); //$NON-NLS-1$
- =
+
+ /**
+ * =
+ */
public static AntCopyUtils.FileSet JBOSS_EAR_META_INF_SET =3D new AntCopy=
Utils.FileSet()
.include("META-INF/jboss-app\\.xml"); //$NON-NLS-1$
- =
+
+ /**
+ * =
+ */
public static String DROOLS_LIB_SEAM_RELATED_PATH =3D "drools/lib"; //$NO=
N-NLS-1$
- =
+
+ /**
+ * =
+ */
public static String SEAM_LIB_RELATED_PATH =3D "lib"; //$NON-NLS-1$
- =
+
+ /**
+ * =
+ */
public static String WEB_LIBRARIES_RELATED_PATH =3D "WEB-INF/lib"; //$NON=
-NLS-1$
- =
+
+ /**
+ * =
+ */
public void doExecute(final IProject project, IProjectFacetVersion fv,
Object config, IProgressMonitor monitor) throws CoreException {
final IDataModel model =3D (IDataModel)config;
@@ -191,51 +254,50 @@
IContainer webRootFolder =3D webRootVirtFolder.getUnderlyingFolder();
=
model.setProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME, proje=
ct.getName());
- model.setProperty(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, proje=
ct.getName()+"-test"); //$NON-NLS-1$
+ model.setProperty(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, proje=
ct.getName() + "-test"); //$NON-NLS-1$
=
- Boolean dbExists =3D (Boolean)model.getProperty(ISeamFacetDataModelPrope=
rties.DB_ALREADY_EXISTS);
- Boolean dbRecreate =3D (Boolean)model.getProperty(ISeamFacetDataModelPro=
perties.RECREATE_TABLES_AND_DATA_ON_DEPLOY);
- if(!dbExists && !dbRecreate) {
- model.setProperty(ISeamFacetDataModelProperties.HIBERNATE_HBM2DDL_AUTO,=
"update"); //$NON-NLS-1$
- } else if(dbExists && !dbRecreate) {
- model.setProperty(ISeamFacetDataModelProperties.HIBERNATE_HBM2DDL_AUTO,=
"validate"); //$NON-NLS-1$
- } else if(dbRecreate) {
- model.setProperty(ISeamFacetDataModelProperties.HIBERNATE_HBM2DDL_AUTO,=
"create-drop"); //$NON-NLS-1$
+ Boolean dbExists =3D (Boolean) model.getProperty(ISeamFacetDataModelProp=
erties.DB_ALREADY_EXISTS);
+ Boolean dbRecreate =3D (Boolean) model.getProperty(ISeamFacetDataModelPr=
operties.RECREATE_TABLES_AND_DATA_ON_DEPLOY);
+ if (!dbExists && !dbRecreate) {
+ model.setProperty(ISeamFacetDataModelProperties.HIBERNATE_HBM2DDL_AUTO,=
"update"); //$NON-NLS-1$
+ } else if (dbExists && !dbRecreate) {
+ model.setProperty(ISeamFacetDataModelProperties.HIBERNATE_HBM2DDL_AUTO,=
"validate"); //$NON-NLS-1$
+ } else if (dbRecreate) {
+ model.setProperty(ISeamFacetDataModelProperties.HIBERNATE_HBM2DDL_AUTO,=
"create-drop"); //$NON-NLS-1$
}
=
+ final String consoleName =3D isWarConfiguration(model) ? project.getName=
() : project.getName() + "-ejb";
=
- final String consoleName =3D isWarConfiguration(model)?project.getName()=
:project.getName()+"-ejb";
=
- =
final File webContentFolder =3D webRootFolder.getLocation().toFile();
- final File webInfFolder =3D new File(webContentFolder,"WEB-INF"); //$NON=
-NLS-1$
- final File webInfClasses =3D new File(webInfFolder,"classes"); //$NON-NL=
S-1$
+ final File webInfFolder =3D new File(webContentFolder, "WEB-INF"); //$NO=
N-NLS-1$
+ final File webInfClasses =3D new File(webInfFolder, "classes"); //$NON-N=
LS-1$
final File webInfClassesMetaInf =3D new File(webInfClasses, "META-INF");=
//$NON-NLS-1$
webInfClassesMetaInf.mkdirs();
- final File webLibFolder =3D new File(webContentFolder,WEB_LIBRARIES_RELA=
TED_PATH);
- final File srcFolder =3D isWarConfiguration(model)?new File(srcRootFolde=
r.getUnderlyingFolder().getLocation().toFile(),"model"):srcRootFolder.getUn=
derlyingFolder().getLocation().toFile(); //$NON-NLS-1$
+ final File webLibFolder =3D new File(webContentFolder, WEB_LIBRARIES_REL=
ATED_PATH);
+ final File srcFolder =3D isWarConfiguration(model) ? new File(srcRootFol=
der.getUnderlyingFolder().getLocation().toFile(), "model") : srcRootFolder.=
getUnderlyingFolder().getLocation().toFile(); //$NON-NLS-1$
final File webMetaInf =3D new File(webContentFolder, "META-INF"); //$NON=
-NLS-1$
final SeamRuntime selectedRuntime =3D SeamRuntimeManager.getInstance().f=
indRuntimeByName(model.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTI=
ME_NAME).toString());
=
final String seamHomePath =3D selectedRuntime.getHomeDir();
=
final File seamHomeFolder =3D new File(seamHomePath);
- final File seamLibFolder =3D new File(seamHomePath,SEAM_LIB_RELATED_PATH=
);
- final File seamGenResFolder =3D new File(seamHomePath,"seam-gen/resource=
s"); //$NON-NLS-1$
- final File seamGenResMetainfFolder =3D new File(seamGenResFolder,"META-I=
NF"); //$NON-NLS-1$
+ final File seamLibFolder =3D new File(seamHomePath, SEAM_LIB_RELATED_PAT=
H);
+ final File seamGenResFolder =3D new File(seamHomePath, "seam-gen/resourc=
es"); //$NON-NLS-1$
+ final File seamGenResMetainfFolder =3D new File(seamGenResFolder, "META-=
INF"); //$NON-NLS-1$
=
- final File droolsLibFolder =3D new File(seamHomePath,DROOLS_LIB_SEAM_REL=
ATED_PATH);
- final File seamGenHomeFolder =3D new File(seamHomePath,"seam-gen"); //$N=
ON-NLS-1$
- final File seamGenViewSource =3D new File(seamGenHomeFolder,"view"); //$=
NON-NLS-1$
+ final File droolsLibFolder =3D new File(seamHomePath, DROOLS_LIB_SEAM_RE=
LATED_PATH);
+ final File seamGenHomeFolder =3D new File(seamHomePath, "seam-gen"); //$=
NON-NLS-1$
+ final File seamGenViewSource =3D new File(seamGenHomeFolder, "view"); //=
$NON-NLS-1$
final File dataSourceDsFile =3D new File(seamGenResFolder, "datasource-d=
s.xml"); //$NON-NLS-1$
- final File componentsFile =3D new File(seamGenResFolder,"WEB-INF/compone=
nts"+(isWarConfiguration(model)?"-war":"")+".xml"); //$NON-NLS-1$ //$NON-NL=
S-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ final File componentsFile =3D new File(seamGenResFolder, "WEB-INF/compon=
ents" + (isWarConfiguration(model) ? "-war" : "") + ".xml"); //$NON-NLS-1$ =
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
=
final File hibernateConsoleLaunchFile =3D new File(seamGenHomeFolder, "h=
ibernatetools/hibernate-console.launch"); //$NON-NLS-1$
final File hibernateConsolePropsFile =3D new File(seamGenHomeFolder, "hi=
bernatetools/hibernate-console.properties"); //$NON-NLS-1$
//final File hibernateConsolePref =3D new File(seamGenHomeFolder, "hiber=
natetools/.settings/org.hibernate.eclipse.console.prefs"); //$NON-NLS-1$
- final File persistenceFile =3D new File(seamGenResFolder,"META-INF/persi=
stence-" + (isWarConfiguration(model)?DEV_WAR_PROFILE:DEV_EAR_PROFILE) + ".=
xml"); //$NON-NLS-1$ //$NON-NLS-2$
+ final File persistenceFile =3D new File(seamGenResFolder, "META-INF/pers=
istence-" + (isWarConfiguration(model) ? DEV_WAR_PROFILE : DEV_EAR_PROFILE)=
+ ".xml"); //$NON-NLS-1$ //$NON-NLS-2$
=
- final File applicationFile =3D new File(seamGenResFolder,"META-INF/appli=
cation.xml"); //$NON-NLS-1$
+ final File applicationFile =3D new File(seamGenResFolder, "META-INF/appl=
ication.xml"); //$NON-NLS-1$
=
final FilterSet jdbcFilterSet =3D SeamFacetFilterSetFactory.createJdbcFi=
lterSet(model);
final FilterSet projectFilterSet =3D SeamFacetFilterSetFactory.createPr=
ojectFilterSet(model);
@@ -263,11 +325,11 @@
=
AntCopyUtils.copyFileToFile(
componentsFile,
- new File(webInfFolder,"components.xml"), //$NON-NLS-1$
+ new File(webInfFolder, "components.xml"), //$NON-NLS-1$
new FilterSetCollection(projectFilterSet), true);
=
AntCopyUtils.copyFilesAndFolders(
- seamGenResFolder,webContentFolder,new AntCopyUtils.FileSetFileFilter(w=
ebInfSet), viewFilterSetCollection, true);
+ seamGenResFolder, webContentFolder, new AntCopyUtils.FileSetFileFilter=
(webInfSet), viewFilterSetCollection, true);
=
=
final FilterSetCollection hibernateDialectFilterSet =3D new FilterSetCol=
lection();
@@ -276,18 +338,18 @@
hibernateDialectFilterSet.addFilterSet(SeamFacetFilterSetFactory.createH=
ibernateDialectFilterSet(model));
=
=
- createTestProject(model,project,selectedRuntime);
+ createTestProject(model, project, selectedRuntime);
=
// *********************************************************************=
***********************
// Handle WAR/EAR configurations
// *********************************************************************=
***********************
- if(isWarConfiguration(model)) {
+ if (isWarConfiguration(model)) {
=
AntCopyUtils.FileSet webInfClassesSet =3D new AntCopyUtils.FileSet(JBOO=
S_WAR_WEB_INF_CLASSES_SET).dir(seamGenResFolder);
AntCopyUtils.copyFilesAndFolders(
- seamGenResFolder,srcFolder,new AntCopyUtils.FileSetFileFilter(webInfC=
lassesSet), viewFilterSetCollection, true);
+ seamGenResFolder, srcFolder, new AntCopyUtils.FileSetFileFilter(webIn=
fClassesSet), viewFilterSetCollection, true);
=
- createComponentsProperties(srcFolder, isWarConfiguration(model)?"":proj=
ect.getName()+"-ear", false); //$NON-NLS-1$ //$NON-NLS-2$
+ createComponentsProperties(srcFolder, isWarConfiguration(model) ? "" : =
project.getName() + "-ear", false); //$NON-NLS-1$ //$NON-NLS-2$
=
/*AntCopyUtils.copyFileToFolder(
hibernateConsolePref,
@@ -295,18 +357,18 @@
new FilterSetCollection(projectFilterSet), true);*/
=
// In case of WAR configuration
- AntCopyUtils.copyFiles(seamHomeFolder,webLibFolder,new AntCopyUtils.Fil=
eSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).d=
ir(seamHomeFolder)));
- AntCopyUtils.copyFiles(seamLibFolder,webLibFolder,new AntCopyUtils.File=
SetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).di=
r(seamLibFolder)));
- AntCopyUtils.copyFiles(droolsLibFolder,webLibFolder,new AntCopyUtils.Fi=
leSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).=
dir(droolsLibFolder)));
+ AntCopyUtils.copyFiles(seamHomeFolder, webLibFolder, new AntCopyUtils.F=
ileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG)=
.dir(seamHomeFolder)));
+ AntCopyUtils.copyFiles(seamLibFolder, webLibFolder, new AntCopyUtils.Fi=
leSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).=
dir(seamLibFolder)));
+ AntCopyUtils.copyFiles(droolsLibFolder, webLibFolder, new AntCopyUtils.=
FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG=
).dir(droolsLibFolder)));
=
// ********************************************************************=
************************
// Copy seam project indicator
// ********************************************************************=
************************
- AntCopyUtils.copyFileToFolder(new File(seamGenResFolder,"seam.propertie=
s"), srcFolder, true); //$NON-NLS-1$
+ AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "seam.properti=
es"), srcFolder, true); //$NON-NLS-1$
final IContainer source =3D srcRootFolder.getUnderlyingFolder();
=
- IPath actionSrcPath =3D new Path(source.getFullPath().removeFirstSegmen=
ts(1)+"/action"); //$NON-NLS-1$
- IPath modelSrcPath =3D new Path(source.getFullPath().removeFirstSegment=
s(1)+"/model"); //$NON-NLS-1$
+ IPath actionSrcPath =3D new Path(source.getFullPath().removeFirstSegmen=
ts(1) + "/action"); //$NON-NLS-1$
+ IPath modelSrcPath =3D new Path(source.getFullPath().removeFirstSegment=
s(1) + "/model"); //$NON-NLS-1$
=
srcRootFolder.delete(IVirtualFolder.FORCE, monitor);
WtpUtils.createSourceFolder(project, actionSrcPath, source.getFullPath(=
).removeFirstSegments(1), webRootFolder.getFullPath().removeFirstSegments(1=
).append("WEB-INF/dev")); //$NON-NLS-1$
@@ -316,24 +378,24 @@
srcRootFolder.createLink(modelSrcPath, 0, null); =
=
AntCopyUtils.copyFileToFile(
- new File(seamGenHomeFolder,"src/Authenticator.java"), //$NON-NLS-1$
- new File(project.getLocation().toFile(),source.getFullPath().removeFi=
rstSegments(1)+"/action/" + model.getProperty(ISeamFacetDataModelProperties=
.SESION_BEAN_PACKAGE_NAME).toString().replace('.', '/')+"/"+"Authenticator.=
java"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ new File(seamGenHomeFolder, "src/Authenticator.java"), //$NON-NLS-1$
+ new File(project.getLocation().toFile(), source.getFullPath().removeF=
irstSegments(1) + "/action/" + model.getProperty(ISeamFacetDataModelPropert=
ies.SESION_BEAN_PACKAGE_NAME).toString().replace('.', '/') + "/" + "Authent=
icator.java"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
new FilterSetCollection(filtersFilterSet), true);
=
AntCopyUtils.copyFileToFile(
persistenceFile,
- new File(srcFolder,"META-INF/persistence.xml"), //$NON-NLS-1$
+ new File(srcFolder, "META-INF/persistence.xml"), //$NON-NLS-1$
viewFilterSetCollection, true);
=
- File resources =3D new File(project.getLocation().toFile(),"resources");
+ File resources =3D new File(project.getLocation().toFile(), "resources"=
);
AntCopyUtils.copyFileToFile(
dataSourceDsFile, =
- new File(resources,project.getName()+"-ds.xml"), //$NON-NLS-1$
+ new File(resources, project.getName() + "-ds.xml"), //$NON-NLS-1$
viewFilterSetCollection, true);
=
AntCopyUtils.copyFileToFile(
hibernateConsoleLaunchFile, =
- new File(project.getLocation().toFile(),project.getName()+".launch"),=
//$NON-NLS-1$
+ new File(project.getLocation().toFile(), project.getName() + ".launch=
"), //$NON-NLS-1$
viewFilterSetCollection, true);
=
AntCopyUtils.copyFileToFolder(
@@ -344,17 +406,17 @@
WtpUtils.setClasspathEntryAsExported(project, new Path("org.eclipse.jst=
.j2ee.internal.web.container"), monitor); //$NON-NLS-1$
=
} else {
- model.setProperty(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, proje=
ct.getName()+"-ejb"); //$NON-NLS-1$
- model.setProperty(ISeamFacetDataModelProperties.SEAM_EAR_PROJECT, proje=
ct.getName()+"-ear"); //$NON-NLS-1$
+ model.setProperty(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, proje=
ct.getName() + "-ejb"); //$NON-NLS-1$
+ model.setProperty(ISeamFacetDataModelProperties.SEAM_EAR_PROJECT, proje=
ct.getName() + "-ear"); //$NON-NLS-1$
=
// In case of EAR configuration
- AntCopyUtils.copyFiles(seamHomeFolder,webLibFolder,new AntCopyUtils.Fil=
eSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).d=
ir(seamHomeFolder)));
- AntCopyUtils.copyFiles(seamLibFolder,webLibFolder,new AntCopyUtils.File=
SetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).di=
r(seamLibFolder)));
- AntCopyUtils.copyFiles(droolsLibFolder,webLibFolder,new AntCopyUtils.Fi=
leSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).=
dir(droolsLibFolder)));
- AntCopyUtils.copyFileToFolder(new File(seamGenResFolder,"messages_en.pr=
operties"),srcFolder, true); //$NON-NLS-1$
+ AntCopyUtils.copyFiles(seamHomeFolder, webLibFolder, new AntCopyUtils.F=
ileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG)=
.dir(seamHomeFolder)));
+ AntCopyUtils.copyFiles(seamLibFolder, webLibFolder, new AntCopyUtils.Fi=
leSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).=
dir(seamLibFolder)));
+ AntCopyUtils.copyFiles(droolsLibFolder, webLibFolder, new AntCopyUtils.=
FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG=
).dir(droolsLibFolder)));
+ AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "messages_en.p=
roperties"), srcFolder, true); //$NON-NLS-1$
=
- File ear =3D new File(project.getLocation().removeLastSegments(1).toFil=
e(),model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME)+"-ea=
r"); //$NON-NLS-1$
- File ejb =3D new File(project.getLocation().removeLastSegments(1).toFil=
e(),model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME)+"-ej=
b"); //$NON-NLS-1$
+ File ear =3D new File(project.getLocation().removeLastSegments(1).toFil=
e(), model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME) + "=
-ear"); //$NON-NLS-1$
+ File ejb =3D new File(project.getLocation().removeLastSegments(1).toFil=
e(), model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME) + "=
-ejb"); //$NON-NLS-1$
ear.mkdir();
ejb.mkdir();
=
@@ -362,16 +424,16 @@
FilterSet filterSet =3D new FilterSet();
filterSet.addFilter("projectName", project.getName()); //$NON-NLS-1$
filterSet.addFilter("runtimeName", WtpUtils.getServerRuntimeName(proje=
ct)); //$NON-NLS-1$
- if(model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PAT=
H)!=3Dnull) {
- File driver =3D new File(((String[])model.getProperty(ISeamFacetDataM=
odelProperties.JDBC_DRIVER_JAR_PATH))[0]);
- filterSet.addFilter("driverJar"," " + driver.getName() + "\n"); //$NO=
N-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PA=
TH) !=3D null) {
+ File driver =3D new File(((String[]) model.getProperty(ISeamFacetData=
ModelProperties.JDBC_DRIVER_JAR_PATH))[0]);
+ filterSet.addFilter("driverJar", " " + driver.getName() + "\n"); //$N=
ON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} else {
- filterSet.addFilter("driverJar",""); //$NON-NLS-1$ //$NON-NLS-2$
+ filterSet.addFilter("driverJar", ""); //$NON-NLS-1$ //$NON-NLS-2$
}
AntCopyUtils.FileSet excludeCvsSvn =3D new AntCopyUtils.FileSet(CVS_SV=
N).dir(seamGenResFolder);
=
AntCopyUtils.copyFilesAndFolders(
- new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(),"ejb=
"), //$NON-NLS-1$
+ new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "ej=
b"), //$NON-NLS-1$
ejb, new AntCopyUtils.FileSetFileFilter(excludeCvsSvn),
new FilterSetCollection(filterSet), true);
=
@@ -379,31 +441,31 @@
// Copy sources to ejb project in case of EAR configuration
// *******************************************************************=
************************
AntCopyUtils.copyFileToFile(
- new File(seamGenHomeFolder,"src/Authenticator.java"), //$NON-NLS-1$
- new File(ejb,"ejbModule/" + model.getProperty(ISeamFacetDataModelPro=
perties.SESION_BEAN_PACKAGE_NAME).toString().replace('.', '/')+"/"+"Authent=
icator.java"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ new File(seamGenHomeFolder, "src/Authenticator.java"), //$NON-NLS-1$
+ new File(ejb, "ejbModule/" + model.getProperty(ISeamFacetDataModelPr=
operties.SESION_BEAN_PACKAGE_NAME).toString().replace('.', '/') + "/" + "Au=
thenticator.java"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
new FilterSetCollection(filtersFilterSet), true);
AntCopyUtils.copyFileToFile(
persistenceFile,
- new File(ejb,"ejbModule/META-INF/persistence.xml"), //$NON-NLS-1$
+ new File(ejb, "ejbModule/META-INF/persistence.xml"), //$NON-NLS-1$
viewFilterSetCollection, true);
=
- createComponentsProperties(new File(ejb,"ejbModule"), isWarConfigurati=
on(model)?"":project.getName()+"-ear", false); //$NON-NLS-1$ //$NON-NLS-2$ =
//$NON-NLS-3$
+ createComponentsProperties(new File(ejb, "ejbModule"), isWarConfigurat=
ion(model) ? "" : project.getName() + "-ear", false); //$NON-NLS-1$ //$NON-=
NLS-2$ //$NON-NLS-3$
=
AntCopyUtils.FileSet ejbSrcResourcesSet =3D new AntCopyUtils.FileSet(J=
BOOS_EJB_WEB_INF_CLASSES_SET).dir(seamGenResFolder);
AntCopyUtils.copyFilesAndFolders(
- seamGenResFolder,new File(ejb,"ejbModule"),new AntCopyUtils.FileSetF=
ileFilter(ejbSrcResourcesSet), viewFilterSetCollection, true); //$NON-NLS-1$
+ seamGenResFolder, new File(ejb, "ejbModule"), new AntCopyUtils.FileS=
etFileFilter(ejbSrcResourcesSet), viewFilterSetCollection, true); //$NON-NL=
S-1$
=
=
// *******************************************************************=
*************************
// Copy seam project indicator
// *******************************************************************=
*************************
- AntCopyUtils.copyFileToFolder(new File(seamGenResFolder,"seam.properti=
es"), new File(ejb,"ejbModule/"), true); //$NON-NLS-1$ //$NON-NLS-2$
+ AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "seam.propert=
ies"), new File(ejb, "ejbModule/"), true); //$NON-NLS-1$ //$NON-NLS-2$
=
=
=
AntCopyUtils.copyFileToFolder(
- new File(seamGenResFolder,"META-INF/ejb-jar.xml"), //$NON-NLS-1$
- new File(ejb,"ejbModule/META-INF/"), //$NON-NLS-1$
+ new File(seamGenResFolder, "META-INF/ejb-jar.xml"), //$NON-NLS-1$
+ new File(ejb, "ejbModule/META-INF/"), //$NON-NLS-1$
viewFilterSetCollection, true);
=
/*AntCopyUtils.copyFileToFolder(
@@ -412,11 +474,11 @@
new FilterSetCollection(projectFilterSet), true);*/
=
FilterSet ejbFilterSet =3D new FilterSet();
- ejbFilterSet.addFilter("projectName",ejb.getName()); //$NON-NLS-1$
+ ejbFilterSet.addFilter("projectName", ejb.getName()); //$NON-NLS-1$
=
AntCopyUtils.copyFileToFile(
hibernateConsoleLaunchFile, =
- new File(ejb,ejb.getName()+".launch"), //$NON-NLS-1$
+ new File(ejb, ejb.getName() + ".launch"), //$NON-NLS-1$
new FilterSetCollection(ejbFilterSet), true);
=
AntCopyUtils.copyFileToFolder(
@@ -424,34 +486,34 @@
ejb,
hibernateDialectFilterSet, true);
=
- File earContentsFolder =3D new File(ear,"EarContent"); //$NON-NLS-1$
+ File earContentsFolder =3D new File(ear, "EarContent"); //$NON-NLS-1$
=
FilterSet earFilterSet =3D new FilterSet();
- earFilterSet.addFilter("projectName",ear.getName()+".ear"); //$NON-NLS=
-1$ //$NON-NLS-2$
+ earFilterSet.addFilter("projectName", ear.getName() + ".ear"); //$NON-=
NLS-1$ //$NON-NLS-2$
=
AntCopyUtils.copyFileToFolder(
- new File(seamGenResFolder,"META-INF/jboss-app.xml"), //$NON-NLS-1$
- new File(earContentsFolder,"META-INF"), //$NON-NLS-1$
- new FilterSetCollection(earFilterSet),true);
+ new File(seamGenResFolder, "META-INF/jboss-app.xml"), //$NON-NLS-1$
+ new File(earContentsFolder, "META-INF"), //$NON-NLS-1$
+ new FilterSetCollection(earFilterSet), true);
=
// Copy configuration files from template
AntCopyUtils.copyFilesAndFolders(
- new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(),"ear=
"), //$NON-NLS-1$
+ new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "ea=
r"), //$NON-NLS-1$
ear, new AntCopyUtils.FileSetFileFilter(excludeCvsSvn),
new FilterSetCollection(filterSet), true);
=
// Fill ear contents
- AntCopyUtils.copyFiles(seamHomeFolder,earContentsFolder,new AntCopyUti=
ls.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamHo=
meFolder)));
- AntCopyUtils.copyFiles(seamLibFolder,earContentsFolder,new AntCopyUtil=
s.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLib=
Folder)));
- AntCopyUtils.copyFiles(droolsLibFolder,earContentsFolder,new AntCopyUt=
ils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(drool=
sLibFolder)));
- AntCopyUtils.copyFiles(seamLibFolder,earContentsFolder,new AntCopyUtil=
s.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLib=
Folder)));
- AntCopyUtils.copyFiles(seamGenResFolder,earContentsFolder,new AntCopyU=
tils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seam=
GenResFolder))); =
+ AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyU=
tils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seam=
HomeFolder)));
+ AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUt=
ils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamL=
ibFolder)));
+ AntCopyUtils.copyFiles(droolsLibFolder, earContentsFolder, new AntCopy=
Utils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(dro=
olsLibFolder)));
+ AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUt=
ils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamL=
ibFolder)));
+ AntCopyUtils.copyFiles(seamGenResFolder, earContentsFolder, new AntCop=
yUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(se=
amGenResFolder))); =
=
=
- File resources =3D new File(ear,"resources");
+ File resources =3D new File(ear, "resources");
AntCopyUtils.copyFileToFile(
dataSourceDsFile, =
- new File(resources,project.getName()+"-ds.xml"), //$NON-NLS-1$ //$N=
ON-NLS-2$
+ new File(resources, project.getName() + "-ds.xml"), //$NON-NLS-1$ /=
/$NON-NLS-2$
viewFilterSetCollection, true);
=
try {
@@ -461,22 +523,21 @@
* @see java.io.FilenameFilter#accept(java.io.File, java.lang.String)
*/
public boolean accept(File dir, String name) {
- if(name.lastIndexOf(".jar")>0) return true; //$NON-NLS-1$
- return false;
+ return name.lastIndexOf(".jar") > 0; //$NON-NLS-1$
}
});
String earJarsStr =3D ""; //$NON-NLS-1$
for (File file : earJars) {
- earJarsStr +=3D" " + file.getName() +" \n"; //$NON-NLS-1$ //$NON-NLS=
-2$
+ earJarsStr +=3D " " + file.getName() + " \n"; //$NON-NLS-1$ //$NON-N=
LS-2$
}
=
FilterSetCollection manifestFilterCol =3D new FilterSetCollection(pro=
jectFilterSet);
FilterSet manifestFilter =3D new FilterSet();
- manifestFilter.addFilter("earLibs",earJarsStr); //$NON-NLS-1$
+ manifestFilter.addFilter("earLibs", earJarsStr); //$NON-NLS-1$
manifestFilterCol.addFilterSet(manifestFilter);
- AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvi=
der.getTemplatesFolder(),"war/META-INF/MANIFEST.MF"), webMetaInf, manifestF=
ilterCol, true); //$NON-NLS-1$
- File ejbMetaInf =3D new File(ejb,"ejbModule/META-INF"); //$NON-NLS-1$
- AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvi=
der.getTemplatesFolder(),"ejb/ejbModule/META-INF/MANIFEST.MF"), ejbMetaInf,=
manifestFilterCol, true); //$NON-NLS-1$
+ AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvi=
der.getTemplatesFolder(), "war/META-INF/MANIFEST.MF"), webMetaInf, manifest=
FilterCol, true); //$NON-NLS-1$
+ File ejbMetaInf =3D new File(ejb, "ejbModule/META-INF"); //$NON-NLS-1$
+ AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvi=
der.getTemplatesFolder(), "ejb/ejbModule/META-INF/MANIFEST.MF"), ejbMetaInf=
, manifestFilterCol, true); //$NON-NLS-1$
} catch (IOException e) {
SeamCorePlugin.getPluginLog().logError(e);
}
@@ -500,28 +561,32 @@
=
IWorkspaceRoot wsRoot =3D ResourcesPlugin.getWorkspace().getRoot();
=
- if(!isWarConfiguration(model)) {
+ if (!isWarConfiguration(model)) {
=
- IProject ejbProjectToBeImported =3D wsRoot.getProject(project.getName()=
+"-ejb");
- ResourcesUtils.importExistingProject(ejbProjectToBeImported, wsPath+"/"=
+project.getName()+"-ejb", project.getName()+"-ejb");
+ IProject ejbProjectToBeImported =3D wsRoot.getProject(project.getName()=
+ "-ejb");
+ ResourcesUtils.importExistingProject(ejbProjectToBeImported, wsPath + "=
/" + project.getName() + "-ejb", project.getName() + "-ejb");
toggleHibernateOnProject(ejbProjectToBeImported, consoleName);
IProjectFacet sf =3D ProjectFacetsManager.getProjectFacet("jst.ejb"); =
IProjectFacetVersion pfv =3D ProjectFacetsManager.create(ejbProjectToBe=
Imported).getInstalledVersion(sf);
ClasspathHelper.addClasspathEntries(ejbProjectToBeImported, pfv);
=
- IProject earProjectToBeImported =3D wsRoot.getProject(project.getName()=
+"-ear");
- ResourcesUtils.importExistingProject(earProjectToBeImported, wsPath+"/"=
+project.getName()+"-ear", project.getName()+"-ear");
+ IProject earProjectToBeImported =3D wsRoot.getProject(project.getName()=
+ "-ear");
+ ResourcesUtils.importExistingProject(earProjectToBeImported, wsPath + "=
/" + project.getName() + "-ear", project.getName() + "-ear");
=
}
=
- IProject testProjectToBeImported =3D wsRoot.getProject(project.getName()=
+"-test");
- ResourcesUtils.importExistingProject(testProjectToBeImported, wsPath+"/"=
+project.getName()+"-test", project.getName()+"-test");
+ IProject testProjectToBeImported =3D wsRoot.getProject(project.getName()=
+ "-test");
+ ResourcesUtils.importExistingProject(testProjectToBeImported, wsPath + "=
/" + project.getName() + "-test", project.getName() + "-test");
toggleHibernateOnProject(testProjectToBeImported, consoleName);
=
}
=
=
-
+ /**
+ * =
+ * @param model
+ * @return
+ */
public static boolean isWarConfiguration(IDataModel model) {
return "war".equals(model.getProperty(ISeamFacetDataModelProperties.JBOS=
S_AS_DEPLOY_AS)); //$NON-NLS-1$
}
@@ -540,7 +605,7 @@
=
prefs.put(SEAM_RUNTIME_NAME, model.getProperty(SEAM_RUNTIME_NAME).toStri=
ng());
=
- prefs.put(SEAM_CONNECTION_PROFILE,model.getProperty(SEAM_CONNECTION_PROF=
ILE).toString());
+ prefs.put(SEAM_CONNECTION_PROFILE, model.getProperty(SEAM_CONNECTION_PRO=
FILE).toString());
=
prefs.put(SESION_BEAN_PACKAGE_NAME, model.getProperty(SESION_BEAN_PACKAG=
E_NAME).toString());
=
@@ -549,17 +614,17 @@
prefs.put(TEST_CASES_PACKAGE_NAME, model.getProperty(TEST_CASES_PACKAGE_=
NAME).toString());
=
prefs.put(SEAM_TEST_PROJECT, =
- model.getProperty(SEAM_TEST_PROJECT)=3D=3Dnull?
- "":model.getProperty(SEAM_TEST_PROJECT).toString()); //$NON-NLS-1$
+ model.getProperty(SEAM_TEST_PROJECT) =3D=3D null =
+ ? "" : model.getProperty(SEAM_TEST_PROJECT).toString()); //$NON-NLS-1$
=
- if(DEPLOY_AS_EAR.equals(model.getProperty(JBOSS_AS_DEPLOY_AS))) {
+ if (DEPLOY_AS_EAR.equals(model.getProperty(JBOSS_AS_DEPLOY_AS))) {
prefs.put(SEAM_EJB_PROJECT, =
- model.getProperty(SEAM_EJB_PROJECT)=3D=3Dnull?
- "":model.getProperty(SEAM_EJB_PROJECT).toString()); //$NON-NLS-1$
+ model.getProperty(SEAM_EJB_PROJECT) =3D=3D null =
+ ? "" : model.getProperty(SEAM_EJB_PROJECT).toString()); //$NON-NLS-1$
=
prefs.put(SEAM_EAR_PROJECT, =
- model.getProperty(SEAM_EAR_PROJECT)=3D=3Dnull?
- "":model.getProperty(SEAM_EAR_PROJECT).toString()); //$NON-NLS-1$
+ model.getProperty(SEAM_EAR_PROJECT) =3D=3D null =
+ ? "" : model.getProperty(SEAM_EAR_PROJECT).toString()); //$NON-NLS-1$
}
=
try {
@@ -571,29 +636,29 @@
=
private void createTestProject(IDataModel model, IProject seamWebProject,=
SeamRuntime seamRuntime) {
String projectName =3D model.getProperty(ISeamFacetDataModelProperties.=
SEAM_PROJECT_NAME).toString();
- File testProjectDir =3D new File(seamWebProject.getLocation().removeLas=
tSegments(1).toFile(),projectName+"-test"); //$NON-NLS-1$
+ File testProjectDir =3D new File(seamWebProject.getLocation().removeLas=
tSegments(1).toFile(), projectName + "-test"); //$NON-NLS-1$
testProjectDir.mkdir();
=
IVirtualComponent component =3D ComponentCore.createComponent(seamWebPr=
oject);
IVirtualFolder webRootVirtFolder =3D component.getRootFolder().getFolde=
r(new Path("/")); //$NON-NLS-1$
=
- File testLibDir =3D new File(testProjectDir,"lib"); //$NON-NLS-1$
- File embededEjbDir =3D new File(testProjectDir,"embedded-ejb"); //$NON-=
NLS-1$
- File testSrcDir =3D new File(testProjectDir,"test-src"); //$NON-NLS-1$
+ File testLibDir =3D new File(testProjectDir, "lib"); //$NON-NLS-1$
+ File embededEjbDir =3D new File(testProjectDir, "embedded-ejb"); //$NON=
-NLS-1$
+ File testSrcDir =3D new File(testProjectDir, "test-src"); //$NON-NLS-1$
String seamGenResFolder =3D seamRuntime.getResourceTemplatesDir();
- File persistenceFile =3D new File(seamGenResFolder ,"META-INF/persisten=
ce-" + (isWarConfiguration(model)?TEST_WAR_PROFILE:TEST_EAR_PROFILE) + ".xm=
l"); //$NON-NLS-1$ //$NON-NLS-2$
- File jbossBeansFile =3D new File(seamGenResFolder ,"META-INF/jboss-bean=
s.xml"); //$NON-NLS-1$
+ File persistenceFile =3D new File(seamGenResFolder , "META-INF/persiste=
nce-" + (isWarConfiguration(model) ? TEST_WAR_PROFILE:TEST_EAR_PROFILE) + "=
.xml"); //$NON-NLS-1$ //$NON-NLS-2$
+ File jbossBeansFile =3D new File(seamGenResFolder , "META-INF/jboss-bea=
ns.xml"); //$NON-NLS-1$
FilterSet filterSet =3D new FilterSet();
filterSet.addFilter("projectName", projectName); //$NON-NLS-1$
filterSet.addFilter("runtimeName", WtpUtils.getServerRuntimeName(seamWe=
bProject)); //$NON-NLS-1$
- filterSet.addFilter("webRootFolder",webRootVirtFolder.getUnderlyingFold=
er().getFullPath().removeFirstSegments(1).toString()); //$NON-NLS-1$
+ filterSet.addFilter("webRootFolder", webRootVirtFolder.getUnderlyingFol=
der().getFullPath().removeFirstSegments(1).toString()); //$NON-NLS-1$
=
final SeamRuntime selectedRuntime =3D SeamRuntimeManager.getInstance().=
findRuntimeByName(model.getProperty(ISeamFacetDataModelProperties.SEAM_RUNT=
IME_NAME).toString());
final String seamHomePath =3D selectedRuntime.getHomeDir();
=
AntCopyUtils.FileSet includeLibs =
=3D new AntCopyUtils.FileSet(JBOSS_TEST_LIB_FILESET)
- .dir(new File(seamRuntime.getHomeDir(),"lib")); //$NON-NLS-1$
+ .dir(new File(seamRuntime.getHomeDir(), "lib")); //$NON-NLS-1$
File[] libs =3D includeLibs.getDir().listFiles(new AntCopyUtils.FileSet=
FileFilter(includeLibs));
StringBuffer testLibraries =3D new StringBuffer();
=
@@ -604,15 +669,15 @@
StringBuffer requiredProjects =3D new StringBuffer();
requiredProjects.append(
"\t"); //$NON-NLS-1$ //$NON-NLS-2$
- if(!isWarConfiguration(model)) {
+ if (!isWarConfiguration(model)) {
requiredProjects.append(
"\n\t"); //$NON-NLS-1$ //$NON-N=
LS-2$
} =
- filterSet.addFilter("testLibraries",testLibraries.toString()); //$NON-N=
LS-1$
- filterSet.addFilter("requiredProjects",requiredProjects.toString()); //=
$NON-NLS-1$
+ filterSet.addFilter("testLibraries", testLibraries.toString()); //$NON-=
NLS-1$
+ filterSet.addFilter("requiredProjects", requiredProjects.toString()); /=
/$NON-NLS-1$
File testTemplateDir =3D null;
try {
- testTemplateDir =3D new File(SeamFacetInstallDataModelProvider.getTemp=
latesFolder(),"test"); //$NON-NLS-1$
+ testTemplateDir =3D new File(SeamFacetInstallDataModelProvider.getTemp=
latesFolder(), "test"); //$NON-NLS-1$
} catch (IOException e) {
SeamCorePlugin.getPluginLog().logError(e);
return;
@@ -626,14 +691,14 @@
new AntCopyUtils.FileSetFileFilter(excludeCvsSvn),
new FilterSetCollection(filterSet), true);
=
- excludeCvsSvn.dir(new File(seamRuntime.getHomeDir(),"embedded-ejb/conf"=
)); //$NON-NLS-1$
+ excludeCvsSvn.dir(new File(seamRuntime.getHomeDir(), "embedded-ejb/conf=
")); //$NON-NLS-1$
AntCopyUtils.copyFiles(
- new File(seamRuntime.getHomeDir(),"embedded-ejb/conf"), //$NON-NLS-1$
+ new File(seamRuntime.getHomeDir(), "embedded-ejb/conf"), //$NON-NLS-1$
embededEjbDir,
new AntCopyUtils.FileSetFileFilter(excludeCvsSvn));
=
AntCopyUtils.copyFiles(
- new File(seamRuntime.getHomeDir(),"lib"), //$NON-NLS-1$
+ new File(seamRuntime.getHomeDir(), "lib"), //$NON-NLS-1$
testLibDir,
new AntCopyUtils.FileSetFileFilter(includeLibs));
=
@@ -641,14 +706,17 @@
}
=
/**
+ * =
* @param seamGenResFolder
+ * @param projectName
+ * @param embedded
*/
private void createComponentsProperties(final File seamGenResFolder, Stri=
ng projectName, Boolean embedded) {
Properties components =3D new Properties();
- String prefix =3D "".equals(projectName)?"":projectName+"/"; //$NON-NLS-=
1$ //$NON-NLS-2$ //$NON-NLS-3$
+ String prefix =3D "".equals(projectName) ? "" : projectName + "/"; //$NO=
N-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
components.put("embeddedEjb", embedded.toString()); //$NON-NLS-1$
- components.put("jndiPattern", prefix+"#{ejbName}/local"); //$NON-NLS-1$ =
//$NON-NLS-2$
- File componentsProps =3D new File(seamGenResFolder,"components.propertie=
s"); //$NON-NLS-1$
+ components.put("jndiPattern", prefix + "#{ejbName}/local"); //$NON-NLS-1=
$ //$NON-NLS-2$
+ File componentsProps =3D new File(seamGenResFolder, "components.properti=
es"); //$NON-NLS-1$
try {
componentsProps.createNewFile();
components.store(new FileOutputStream(componentsProps), ""); //$NON-NLS=
-1$
@@ -657,14 +725,20 @@
}
}
=
+ /**
+ * =
+ * @param project
+ * @param defaultConsoleName
+ * @return
+ */
public static boolean toggleHibernateOnProject(IProject project, String d=
efaultConsoleName) {
IScopeContext scope =3D new ProjectScope(project);
=
Preferences node =3D scope.getNode("org.hibernate.eclipse.console");
=
- if(node!=3Dnull) {
- node.putBoolean("hibernate3.enabled", true );
- node.put("default.configuration", defaultConsoleName );
+ if (node !=3D null) {
+ node.putBoolean("hibernate3.enabled", true);
+ node.put("default.configuration", defaultConsoleName);
try {
node.flush();
} catch (BackingStoreException e) {
@@ -676,9 +750,9 @@
}
=
try {
- addProjectNature(project, "org.hibernate.eclipse.console.hibernateNatur=
e", new NullProgressMonitor() );
+ addProjectNature(project, "org.hibernate.eclipse.console.hibernateNatur=
e", new NullProgressMonitor());
return true;
- } catch(CoreException ce) {
+ } catch (CoreException ce) {
SeamCorePlugin.getDefault().logError("Could not activate Hibernate natu=
re on project " + project.getName(), ce); =
return false;
} =
@@ -687,20 +761,24 @@
=
/**
* Add the given project nature to the given project (if it isn't already=
added).
+ * =
+ * @param project
+ * @param nature
+ * @param monitor
* @return true if nature where added, false if not
- * @throws OperationCanceledException if job were cancelled or CoreExcept=
ion if something went wrong. =
+ * @throws OperationCanceledException if job were canceled or CoreExcepti=
on if something went wrong. =
*/
public static boolean addProjectNature(IProject project, String nature, I=
ProgressMonitor monitor) throws CoreException {
- if (monitor !=3D null && monitor.isCanceled() ) {
+ if (monitor !=3D null && monitor.isCanceled()) {
throw new OperationCanceledException();
}
=
- if (!project.hasNature(nature) ) {
+ if (!project.hasNature(nature)) {
IProjectDescription description =3D project.getDescription();
- String[] prevNatures=3D description.getNatureIds();
- String[] newNatures=3D new String[prevNatures.length + 1];
+ String[] prevNatures =3D description.getNatureIds();
+ String[] newNatures =3D new String[prevNatures.length + 1];
System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
- newNatures[prevNatures.length]=3D nature;
+ newNatures[prevNatures.length] =3D nature;
description.setNatureIds(newNatures);
project.setDescription(description, monitor);
return true;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/=
seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i=
nternal/core/project/facet/SeamFacetPreInstallDelegate.java 2008-01-04 01:5=
4:58 UTC (rev 5501)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i=
nternal/core/project/facet/SeamFacetPreInstallDelegate.java 2008-01-04 01:5=
5:05 UTC (rev 5502)
@@ -11,6 +11,7 @@
=
package org.jboss.tools.seam.internal.core.project.facet;
=
+import java.text.Format;
import java.util.Properties;
=
import org.eclipse.core.resources.IProject;
@@ -19,40 +20,89 @@
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.datatools.connectivity.drivers.DriverManager;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
+/**
+ * TBD
+ * =
+ * @author eskimo
+ */
public class SeamFacetPreInstallDelegate implements IDelegate {
+ =
+ =
+ /**
+ * Indentation for hibernate property declaration
+ */
+ public static final String PROP_INDENT =3D "\n ";
=
+ /**
+ * Property declaration in persistence.xml
+ */
+ public static final String PROP_DECL =3D "";
+ =
+ private static final String EMPTY_STRING =3D "";
+ =
+ /**
+ * Execute pre-install operations for installed facet
+ * =
+ * @param project created after finish pressed in wizard
+ * @param fv -IProjectFacetversion described facet that will be installed
+ * @param config - IDataModel that provide data collected from user
+ * @param monitor - IProgressMonitor
+ * @throws CoreException when meet the problems
+ */
public void execute(IProject project, IProjectFacetVersion fv,
Object config, IProgressMonitor monitor) throws CoreException {
- IDataModel model =3D (IDataModel)config;
+ IDataModel model =3D (IDataModel) config;
=
- if(model.getProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFI=
LE)!=3Dnull) {
+ if (model.getProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROF=
ILE) !=3D null) {
IConnectionProfile connProfile =3D ProfileManager.getInstance().getProf=
ileByName(model.getProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_P=
ROFILE).toString());
- Properties props =3D connProfile.getBaseProperties(); //Properties("org=
.eclipse.datatools.connectivity.db.generic.connectionProfile");
+ if (connProfile!=3Dnull) {
+ Properties props =3D connProfile.getBaseProperties(); //Properties("or=
g.eclipse.datatools.connectivity.db.generic.connectionProfile");
=
- // Collect properties name from DTP Connection Profile
- model.setProperty(ISeamFacetDataModelProperties.DB_USER_NAME,
- props.get("org.eclipse.datatools.connectivity.db.username")=3D=3Dnull=
//$NON-NLS-1$
- ?"":props.get("org.eclipse.datatools.connectivity.db.username").toStr=
ing()); //$NON-NLS-1$ //$NON-NLS-2$
- =
- model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_CLASS_NAME,
- props.get("org.eclipse.datatools.connectivity.db.driverClass")=3D=3Dn=
ull //$NON-NLS-1$
- ?"":props.get("org.eclipse.datatools.connectivity.db.driverClass").to=
String()); //$NON-NLS-1$ //$NON-NLS-2$
- =
- model.setProperty(ISeamFacetDataModelProperties.DB_USER_PASSWORD,
- props.get("org.eclipse.datatools.connectivity.db.password")=3D=3Dnull=
//$NON-NLS-1$
- ?"":props.get("org.eclipse.datatools.connectivity.db.password").toStr=
ing()); //$NON-NLS-1$ //$NON-NLS-2$
- =
- model.setProperty(ISeamFacetDataModelProperties.JDBC_URL_FOR_DB,
- props.get("org.eclipse.datatools.connectivity.db.URL")=3D=3Dnull //$N=
ON-NLS-1$
- ?"":props.get("org.eclipse.datatools.connectivity.db.URL").toString()=
); //$NON-NLS-1$ //$NON-NLS-2$
- =
- model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH,
- DriverManager.getInstance().getDriverInstanceByID(
- props.get("org.eclipse.datatools.connectivity.driverDefinitionID")=
.toString()).getJarListAsArray()); //$NON-NLS-1$
+ // Collect properties name from DTP Connection Profile
+ model.setProperty(ISeamFacetDataModelProperties.DB_USER_NAME,
+ props.get("org.eclipse.datatools.connectivity.db.username") =3D=3D n=
ull //$NON-NLS-1$
+ ? "" : props.get("org.eclipse.datatools.connectivity.db.username").t=
oString()); //$NON-NLS-1$ //$NON-NLS-2$
+ =
+ model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_CLASS_NAME,
+ props.get("org.eclipse.datatools.connectivity.db.driverClass") =3D=
=3D null //$NON-NLS-1$
+ ? "" : props.get("org.eclipse.datatools.connectivity.db.driverClass"=
).toString()); //$NON-NLS-1$ //$NON-NLS-2$
+ =
+ model.setProperty(ISeamFacetDataModelProperties.DB_USER_PASSWORD,
+ props.get("org.eclipse.datatools.connectivity.db.password") =3D=3D n=
ull //$NON-NLS-1$
+ ? "" : props.get("org.eclipse.datatools.connectivity.db.password").t=
oString()); //$NON-NLS-1$ //$NON-NLS-2$
+ =
+ model.setProperty(ISeamFacetDataModelProperties.JDBC_URL_FOR_DB,
+ props.get("org.eclipse.datatools.connectivity.db.URL") =3D=3D null /=
/$NON-NLS-1$
+ ? "" : props.get("org.eclipse.datatools.connectivity.db.URL").toStri=
ng()); //$NON-NLS-1$ //$NON-NLS-2$
+ =
+ model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH,
+ DriverManager.getInstance().getDriverInstanceByID(
+ props.get("org.eclipse.datatools.connectivity.driverDefinitionID"=
).toString()).getJarListAsArray()); //$NON-NLS-1$
+ }
}
+ =
+ String defaultSchema =3D (String) model.getProperty(ISeamFacetDataModelP=
roperties.DB_DEFAULT_SCHEMA_NAME);
+ =
+ if (!EMPTY_STRING.equals(defaultSchema)) {
+ model.setStringProperty(ISeamFacetDataModelProperties.DB_SCHEMA_NAME, =
+ PROP_INDENT + NLS.bind(PROP_DECL, =
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME,
+ defaultSchema}));
+ }
+
+ String defaultCatalog =3D (String) model.getProperty(ISeamFacetDataModel=
Properties.DB_DEFAULT_CATALOG_NAME); =
+ =
+ if (!EMPTY_STRING.equals(defaultCatalog)) {
+ model.setStringProperty(ISeamFacetDataModelProperties.DB_CATALOG_NAME, =
+ PROP_INDENT + NLS.bind(PROP_DECL, =
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME,
+ defaultCatalog}));
+ }
}
}
--===============3900270170968958150==--
From jbosstools-commits at lists.jboss.org Thu Jan 3 20:55:09 2008
Content-Type: multipart/mixed; boundary="===============7466177461987677992=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5503 -
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink.
Date: Thu, 03 Jan 2008 20:55:08 -0500
Message-ID:
--===============7466177461987677992==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-03 20:55:08 -0500 (Thu, 03 Jan 2008)
New Revision: 5503
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools=
/common/text/ext/hyperlink/HyperlinkPartitionerDefinition.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml template=
s file in seam-gen.
JUnit tests also added.
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jbos=
s/tools/common/text/ext/hyperlink/HyperlinkPartitionerDefinition.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool=
s/common/text/ext/hyperlink/HyperlinkPartitionerDefinition.java 2008-01-04 =
01:55:05 UTC (rev 5502)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool=
s/common/text/ext/hyperlink/HyperlinkPartitionerDefinition.java 2008-01-04 =
01:55:08 UTC (rev 5503)
@@ -234,7 +234,7 @@
}
=
public boolean equals(Object obj) {
- if(obj =3D=3D null && !(obj instanceof ContentType)) {
+ if(obj =3D=3D null || !(obj instanceof ContentType)) {
return false;
}
ContentType type =3D (ContentType)obj;
@@ -285,7 +285,7 @@
}
=
public boolean equals(Object obj) {
- if(obj =3D=3D null && !(obj instanceof PartitionType)) {
+ if(obj =3D=3D null || !(obj instanceof PartitionType)) {
return false;
}
PartitionType type =3D (PartitionType)obj;
@@ -392,7 +392,7 @@
}
=
public boolean equals(Object obj) {
- if(obj =3D=3D null && !(obj instanceof Axis)) {
+ if(obj =3D=3D null || !(obj instanceof Axis)) {
return false;
}
Axis axis =3D (Axis)obj;
--===============7466177461987677992==--
From jbosstools-commits at lists.jboss.org Fri Jan 4 06:05:05 2008
Content-Type: multipart/mixed; boundary="===============0876735026743446283=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5504 - in
trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/util
and 1 other directories.
Date: Fri, 04 Jan 2008 06:01:05 -0500
Message-ID:
--===============0876735026743446283==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-04 06:01:05 -0500 (Fri, 04 Jan 2008)
New Revision: 5504
Added:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/tem=
plate/JsfSelectManyListbox.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/tem=
plate/JsfSelectOneListbox.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/uti=
l/HTML.java
trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-jsf.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1501
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor=
/template/JsfSelectManyListbox.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te=
mplate/JsfSelectManyListbox.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te=
mplate/JsfSelectManyListbox.java 2008-01-04 11:01:05 UTC (rev 5504)
@@ -0,0 +1,153 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
+package org.jboss.tools.vpe.editor.template;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * @author Sergey Dzmitrovich
+ * =
+ * template for selectOneListbox select item
+ * =
+ */
+public class JsfSelectManyListbox extends VpeAbstractTemplate {
+
+ /**
+ * "size" attribute
+ */
+ private static final String ATTR_SIZE =3D "size";
+
+ /**
+ * "size" attribute
+ */
+ private static final String ATTR_MULTIPLE_VALUE =3D "multiple";
+ /**
+ * list of visible children
+ */
+ private static List CHILDREN_LIST =3D new ArrayList();
+
+ static {
+ CHILDREN_LIST.add("selectItem");
+ CHILDREN_LIST.add("selectItems");
+ }
+
+ /**
+ * list of copied attributes
+ */
+ private static List ATTR_LIST_COPY =3D new ArrayList();
+
+ static {
+ ATTR_LIST_COPY.add("style");
+ ATTR_LIST_COPY.add("styleClass");
+ }
+
+ /**
+ * =
+ */
+ public JsfSelectManyListbox() {
+
+ // TODO Auto-generated constructor stub
+ }
+
+ /*
+ * (non-Javadoc)
+ * =
+ * @see org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.=
tools.vpe.editor.context.VpePageContext,
+ * org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument)
+ */
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+
+ // create select element
+ nsIDOMElement select =3D visualDocument.createElement(HTML.TAG_SELECT);
+
+ Element element =3D (Element) sourceNode;
+
+ // import attributes from source
+ for (String attributeName : ATTR_LIST_COPY) {
+
+ // get attribute
+ String attr =3D element.getAttribute(attributeName);
+
+ // add attribute to "select"
+ if (attr !=3D null)
+ select.setAttribute(HTML.ATTR_STYLE, attr);
+
+ }
+
+ // set "multiple" attribute
+ select.setAttribute(HTML.ATTR_MULTIPLE, ATTR_MULTIPLE_VALUE);
+
+ // get "size" attribute
+ String size =3D element.getAttribute(ATTR_SIZE);
+
+ // add "size" attribute to "select"
+ if (size !=3D null)
+ // if source has "size" attribute import it
+ select.setAttribute(HTML.ATTR_SIZE, size);
+ else
+ // count size
+ select.setAttribute(HTML.ATTR_SIZE, String
+ .valueOf(countSize(element)));
+
+ return new VpeCreationData(select);
+ }
+
+ /**
+ * Count size for "select" (size =3D number of "selectItem" and "selectIt=
ems"
+ * children )
+ * =
+ * =
+ * @param sourceNode
+ * @return size of select (1 or more)
+ */
+ private int countSize(Node sourceNode) {
+
+ NodeList children =3D sourceNode.getChildNodes();
+ int size =3D 0;
+ for (int i =3D 0; i < children.getLength(); i++) {
+
+ Node child =3D children.item(i);
+ // if children is one of visible items
+ if (CHILDREN_LIST.contains(child.getLocalName()))
+ size++;
+ }
+ // if 'size' =3D=3D 0 return 1 else 'size'
+ return size =3D=3D 0 ? 1 : size;
+
+ }
+
+ /**
+ * =
+ */
+ public void removeAttribute(VpePageContext pageContext,
+ Element sourceElement, nsIDOMDocument visualDocument,
+ nsIDOMNode visualNode, Object data, String name) {
+
+ // get DOMElement(root element is select)
+ nsIDOMElement select =3D (nsIDOMElement) visualNode
+ .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+
+ // remove attribute
+ select.removeAttribute(name);
+ }
+
+}
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor=
/template/JsfSelectOneListbox.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te=
mplate/JsfSelectOneListbox.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te=
mplate/JsfSelectOneListbox.java 2008-01-04 11:01:05 UTC (rev 5504)
@@ -0,0 +1,145 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
+package org.jboss.tools.vpe.editor.template;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * @author Sergey Dzmitrovich
+ * =
+ * template for selectOneListbox select item
+ * =
+ */
+public class JsfSelectOneListbox extends VpeAbstractTemplate {
+
+ /**
+ * "size" attribute
+ */
+ private static final String ATTR_SIZE =3D "size";
+
+ /**
+ * list of visible children
+ */
+ private static List CHILDREN_LIST =3D new ArrayList();
+
+ static {
+ CHILDREN_LIST.add("selectItem");
+ CHILDREN_LIST.add("selectItems");
+ }
+
+ /**
+ * list of copied attributes
+ */
+ private static List ATTR_LIST_COPY =3D new ArrayList();
+
+ static {
+ ATTR_LIST_COPY.add("style");
+ ATTR_LIST_COPY.add("styleClass");
+ }
+
+ /**
+ * =
+ */
+ public JsfSelectOneListbox() {
+
+ // TODO Auto-generated constructor stub
+ }
+
+ /*
+ * (non-Javadoc)
+ * =
+ * @see org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.=
tools.vpe.editor.context.VpePageContext,
+ * org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument)
+ */
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+
+ // create select element
+ nsIDOMElement select =3D visualDocument.createElement(HTML.TAG_SELECT);
+
+ Element element =3D (Element) sourceNode;
+
+ // import attributes from source
+ for (String attributeName : ATTR_LIST_COPY) {
+
+ // get attribute
+ String attr =3D element.getAttribute(attributeName);
+
+ // add attribute to "select"
+ if (attr !=3D null)
+ select.setAttribute(HTML.ATTR_STYLE, attr);
+
+ }
+
+ // get "size" attribute
+ String size =3D element.getAttribute(ATTR_SIZE);
+
+ // add "size" attribute to "select"
+ if (size !=3D null)
+ // if source has "size" attribute import it
+ select.setAttribute(HTML.ATTR_SIZE, size);
+ else
+ // count size
+ select.setAttribute(HTML.ATTR_SIZE, String
+ .valueOf(countSize(element)));
+
+ return new VpeCreationData(select);
+ }
+
+ /**
+ * Count size for "select" (size =3D number of "selectItem" and "selectIt=
ems"
+ * children )
+ * =
+ * =
+ * @param sourceNode
+ * @return size of select (1 or more)
+ */
+ private int countSize(Node sourceNode) {
+
+ NodeList children =3D sourceNode.getChildNodes();
+ int size =3D 0;
+ for (int i =3D 0; i < children.getLength(); i++) {
+
+ Node child =3D children.item(i);
+ // if children is one of visible items
+ if (CHILDREN_LIST.contains(child.getLocalName()))
+ size++;
+ }
+ // if 'size' =3D=3D 0 return 1 else 'size'
+ return size =3D=3D 0 ? 1 : size;
+
+ }
+
+ /**
+ * =
+ */
+ public void removeAttribute(VpePageContext pageContext,
+ Element sourceElement, nsIDOMDocument visualDocument,
+ nsIDOMNode visualNode, Object data, String name) {
+
+ // get DOMElement(root element is select)
+ nsIDOMElement select =3D (nsIDOMElement) visualNode
+ .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+
+ // remove attribute
+ select.removeAttribute(name);
+ }
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi=
tor/util/HTML.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ut=
il/HTML.java 2008-01-04 01:55:08 UTC (rev 5503)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ut=
il/HTML.java 2008-01-04 11:01:05 UTC (rev 5504)
@@ -19,43 +19,45 @@
=
private HTML() {}
=
- public static final String TAG_HTML =3D "HTML";
- public static final String TAG_HEAD =3D "HEAD";
- public static final String TAG_BODY =3D "BODY";
- public static final String TAG_IMG =3D "IMG";
- public static final String TAG_LINK =3D "LINK";
- public static final String TAG_SELECT =3D "SELECT";
- public static final String TAG_OPTION =3D "OPTION";
- public static final String TAG_STYLE =3D "STYLE";
- public static final String TAG_TABLE =3D "TABLE";
- public static final String TAG_TBODY =3D "TBODY";
- public static final String TAG_THEAD =3D "THEAD";
- public static final String TAG_TFOOT =3D "TFOOT";
- public static final String TAG_TH =3D "TH"; =
- public static final String TAG_TR =3D "TR";
- public static final String TAG_TD =3D "TD";
- public static final String TAG_COL =3D "COL";
- public static final String TAG_COLS =3D "COLS";
- public static final String TAG_COLGROUP =3D "COLGROUP";
- public static final String TAG_BR =3D "BR";
- public static final String TAG_LI =3D "LI";
- public static final String TAG_DIV =3D "DIV";
- public static final String TAG_SPAN =3D "SPAN";
- public static final String TAG_P =3D "P";
- public static final String TAG_TEXTAREA =3D "TEXTAREA";
- public static final String TAG_INPUT =3D "INPUT";
- public static final String TAG_BUTTON =3D "BUTTON";
- public static final String TAG_OL =3D "OL";
- public static final String TAG_UL =3D "UL";
+ public static final String TAG_HTML =3D "HTML";
+ public static final String TAG_HEAD =3D "HEAD";
+ public static final String TAG_BODY =3D "BODY";
+ public static final String TAG_IMG =3D "IMG";
+ public static final String TAG_LINK =3D "LINK";
+ public static final String TAG_SELECT =3D "SELECT";
+ public static final String TAG_OPTION =3D "OPTION";
+ public static final String TAG_STYLE =3D "STYLE";
+ public static final String TAG_TABLE =3D "TABLE";
+ public static final String TAG_TBODY =3D "TBODY";
+ public static final String TAG_THEAD =3D "THEAD";
+ public static final String TAG_TFOOT =3D "TFOOT";
+ public static final String TAG_TH =3D "TH"; =
+ public static final String TAG_TR =3D "TR";
+ public static final String TAG_TD =3D "TD";
+ public static final String TAG_COL =3D "COL";
+ public static final String TAG_COLS =3D "COLS";
+ public static final String TAG_COLGROUP =3D "COLGROUP";
+ public static final String TAG_BR =3D "BR";
+ public static final String TAG_LI =3D "LI";
+ public static final String TAG_DIV =3D "DIV";
+ public static final String TAG_SPAN =3D "SPAN";
+ public static final String TAG_P =3D "P";
+ public static final String TAG_TEXTAREA =3D "TEXTAREA";
+ public static final String TAG_INPUT =3D "INPUT";
+ public static final String TAG_BUTTON =3D "BUTTON";
+ public static final String TAG_OL =3D "OL";
+ public static final String TAG_UL =3D "UL";
=
=
=
- public static final String ATTR_ID =3D "ID";
- public static final String ATTR_TYPE =3D"TYPE";
- public static final String ATTR_TEXT =3D"TEXT";
- public static final String ATTR_CLASS =3D"CLASS";
- public static final String ATTR_TITLE =3D"TITLE";
- public static final String ATTR_NAME =3D"NAME";
- public static final String ATTR_VALUE =3D"VALUE";
- public static final String ATTR_STYLE =3D"STYLE";
+ public static final String ATTR_ID =3D "ID";
+ public static final String ATTR_TYPE =3D"TYPE";
+ public static final String ATTR_TEXT =3D"TEXT";
+ public static final String ATTR_CLASS =3D"CLASS";
+ public static final String ATTR_TITLE =3D"TITLE";
+ public static final String ATTR_NAME =3D"NAME";
+ public static final String ATTR_VALUE =3D"VALUE";
+ public static final String ATTR_STYLE =3D"STYLE";
+ public static final String ATTR_SIZE =3D"SIZE";
+ public static final String ATTR_MULTIPLE =3D "MULTIPLE";
}
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-jsf=
.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-jsf.xml 2=
008-01-04 01:55:08 UTC (rev 5503)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-jsf.xml 2=
008-01-04 11:01:05 UTC (rev 5504)
@@ -671,45 +671,9 @@
=
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -740,82 +704,45 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--===============0876735026743446283==--
From jbosstools-commits at lists.jboss.org Fri Jan 4 06:24:32 2008
Content-Type: multipart/mixed; boundary="===============8945235850115645222=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5505 -
trunk/hibernatetools/docs/reference/en/modules.
Date: Fri, 04 Jan 2008 06:20:31 -0500
Message-ID:
--===============8945235850115645222==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: afedosik
Date: 2008-01-04 06:20:31 -0500 (Fri, 04 Jan 2008)
New Revision: 5505
Modified:
trunk/hibernatetools/docs/reference/en/modules/ant.xml
trunk/hibernatetools/docs/reference/en/modules/codegen.xml
trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml
trunk/hibernatetools/docs/reference/en/modules/plugins.xml
trunk/hibernatetools/docs/reference/en/modules/reverseengineering.xml
trunk/hibernatetools/docs/reference/en/modules/setup.xml
Log:
Spelling and grammer in Guide are corrected.
[ Show ?\194?\187 ]
Catherine Luts [03/Jan/08 07:42 AM] Spelling and grammer in Guide are corre=
cted.
Modified: trunk/hibernatetools/docs/reference/en/modules/ant.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/ant.xml 2008-01-04 11:01=
:05 UTC (rev 5504)
+++ trunk/hibernatetools/docs/reference/en/modules/ant.xml 2008-01-04 11:20=
:31 UTC (rev 5505)
@@ -12,17 +12,17 @@
from tools.hibernate.org The hibernate-tools.jar is located in your eclipse plugins directory at
- /plugins/org.hibernate.eclipse.x.x.x/lib/tools/hibernate=
-tools.jar.
+ /plugins/org.hibernate.eclipse.x.x.x/lib/tools/hibernate=
-tools.jar
- This jar is 100% independent from the eclipse platform and can=
thus be used
+ . This jar is 100% independent from the eclipse platform and c=
an thus be used
independently of eclipse.
=
- There might be incompabilities with respect to the Hibernate3.=
jar bundled with the tools
+ There might be incapabilities with respect to the Hibernate3.j=
ar bundled with the tools
and your own jar. Thus to avoid any confusion it is recommended to=
use the hibernate3.jar
& hibernate-annotations.jar bundled with the tools when you wa=
nt to use the Ant
- tasks. Do not worry about using e.g. Hibernate 3.2 jar's with e.g.=
an Hibernate 3.1 project
+ tasks. Do not worry about using e.g. Hibernate 3.2 jar's with e.g.=
a Hibernate 3.1 project
since the output generated will work with previous Hibernate 3 ver=
sions.
@@ -46,11 +46,11 @@
classpathref=3D"toolslib" />
]]>
=
- this
+ This <taskdef>
- defines a Ant task called
+ defines an Ant task called <hibernatetool>
@@ -101,12 +101,12 @@
destdir (required): destination direc=
tory for files generated
- with exporters.
+ with exporters
=
templatepath (optional): A path to be=
used to look up
- user-edited templates.
+ user-edited templates
=
@@ -122,7 +122,7 @@
=
One of 4 different ways of configuring the Hibernate Met=
a Model must be
- specified.
+ specified
=
@@ -138,9 +138,9 @@
The following example shows the most basic setup for generatin=
g pojo's via
hbm2java from a normal
- hibernate.cfg.xml.
+ hibernate.cfg.xml
- The output will be put in the
+ . The output will be put in the ${build.dir}/generated
directory.
=
@@ -188,7 +188,7 @@
Hibernate Configurations
=
- hibernatetool supports four different Hiberna=
te configurations: A
+ Hibernatetool supports four different Hiberna=
te configurations: A
standard Hibernate configuration (<configuration>), Annotation based configuration (
@@ -315,7 +315,7 @@
<taskdef>.
=
The
- <annotationconfiguration> su=
pports the same attributes as an
+ <annotationconfiguration> su=
pports the same attributes as a
<configuration> except tha=
t the configurationfile attribute is now required as
that is from where an AnnotationConfiguration g=
ets the list of
@@ -338,14 +338,14 @@
JPA based configuration (<jpaconfiguration>)
=
- An
+ A <jpaconfiguration> is used w=
hen you want to read the metamodel from
JPA/Hibernate Annotation where you want to use the auto-scan confi=
guration as defined in the
JPA spec (part of EJB3). In other words, when you do not have a
hibernate.cfg.xml, but instead h=
ave a setup where you use a
- persistence.xml packaged in an J=
PA compliant manner.
+ persistence.xml packaged in a JP=
A compliant manner.
=
<jpaconfiguration> will simply just t=
ry and
auto-configure it self based on the available classpath, e.g. look=
for
@@ -354,10 +354,10 @@
=
The persistenceunit attribute can be used t=
o select a specific
persistence unit. If no persistenceunit is specified it will autom=
atically search for one
- and if a unique one is found use it, but if multiple persistence u=
nits are available it will
+ and if an unique one is found use it, but if multiple persistence =
units are available it will
error.
=
- To use an
+ To use a <jpaconfiguration> you will =
need to specify some additional jars
from Hibernate EntityManager in the <taskdef> of the hibernate=
tool. The
@@ -721,7 +721,7 @@
ejb3 (default: false): the generated cfg.xml will have=
<mapping
class=3D".."/>, opposed to <mapping resource=3D"..."=
/> for each
- mapping.
+ mapping
@@ -792,7 +792,7 @@
Generic Hibernate metamodel exporter (<hbmtemplat=
e>)
=
- Generic exporter that can be controlled by a user provided tem=
plate or class.
+ Generic exporter that can be controlled by an user provided te=
mplate or class.
=
<property> allows you bind a=
string value to a key. The value will be
available in the templates via $<key>. The following example=
will assign the
string value
- "true" to the variable=
$descriptors
+ "true" to the variable=
$descriptors.
=
]]>
=
Modified: trunk/hibernatetools/docs/reference/en/modules/codegen.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/codegen.xml 2008-01-04 1=
1:01:05 UTC (rev 5504)
+++ trunk/hibernatetools/docs/reference/en/modules/codegen.xml 2008-01-04 1=
1:20:31 UTC (rev 5505)
@@ -288,7 +288,7 @@
</class>
</hibernate-mapping>
=
- and for
+ And for Event.hbm file:
=
<hibernate-mapping> =
@@ -317,7 +317,7 @@
will include the other part (if at all) in the
toString()/equals() methods. Therefore it is no=
t a
good practice to put at class scope such meta attributes, unless y=
ou
- are defining a class without bi-directional associations
+ are defining a class without bi-directional associations.
=
We recomend instead to add the meta
attributes at the property level:
@@ -426,7 +426,7 @@
accessors for pojo's.
=
Extract the
- PojoPropertyAccessor.ftl into a
+ PojoPropertyAccessor.ftl into a
local folder i.e. ${hbm.template.path}, respecti=
ng
the whole path, for example:
@@ -495,9 +495,9 @@
</class>
</hibernate-mapping>
=
- i) If you don'' use <[[CDATA[]]>=
literal>
+ I) If you don'' use <[[CDATA[]]>=
literal>
you have to scape the & symbol, i.e.: &
- ii). Note that we
+ II). Note that we
are referring to "firstName" directly and this is the parameter na=
me
not the actual field name. If you want to refer the field you have=
to
use "this.firstName" instead.
@@ -532,7 +532,7 @@
Invoking the target <hbm2java> will
generate on the
- ${hbm2java.dest.dir} the file:
+ ${hbm2java.dest.dir} the file
Person.java:
=
// default package
Modified: trunk/hibernatetools/docs/reference/en/modules/codegenarchitectur=
e.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml =
2008-01-04 11:01:05 UTC (rev 5504)
+++ trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml =
2008-01-04 11:20:31 UTC (rev 5505)
@@ -33,7 +33,7 @@
=
- A
+ An Annotation configuration uses Hibernate Annotations and supports hbm.xml
Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2008-01-04 1=
1:01:05 UTC (rev 5504)
+++ trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2008-01-04 1=
1:20:31 UTC (rev 5505)
@@ -367,7 +367,7 @@
=
When enabled the project classpath will be appended =
to the classpath specified
- above.
+ above
=
@@ -569,7 +569,7 @@
=
The name of the console configuration which should b=
e used when code
- generating.
+ generating
=
@@ -606,7 +606,7 @@
=
The package name here is used as the default package=
name for any entities
- found when reverse engineering.
+ found when reverse engineering
=
@@ -687,7 +687,7 @@
=
- A path to a directory with custom templates.
+ A path to a directory with custom templates
@@ -768,7 +768,7 @@
=
- Generate mapping (hbm.xml) files for each entity
+ Generate mapping (hbm.xml) files for each entity.
=
@@ -907,7 +907,7 @@
=
Pattern to use for the generated files, relatively=
for the output dir.
- Example: {package-name}/{class-name}.java
+ Example: {package-name}/{class-name}.java .
=
@@ -919,7 +919,7 @@
=
- executable to run GraphViz (only relevant, but opt=
ional for Schema
+ Executable to run GraphViz (only relevant, but opt=
ional for Schema
documentation)
@@ -1068,7 +1068,7 @@
Reveng.xml editor
=
A
- reveng.xml
+ reveng.xml
file is used to customize and control how reverse engineering is =
performed by
the tools. The plugins provide and editor to ease the editing of thi=
s file and hence used to
configure the reverse engineering process.
@@ -1078,15 +1078,15 @@
default naming rules is not applicable.
=
Note that not all the features of the
- .reveng.xml file is exposed or fully=
implemented in
+ .reveng.xml file is exposed or full=
y implemented in
the editor, but the main functionality is there. To understand the f=
ull flexibility of the
reveng.xml, please see
=
The editor is activated as soon as an
- .reveng.xml file is opened. To get a=
n initial
+ .reveng.xml file is opened. To get =
an initial
- reveng.xml file the reveng.xml wiz=
ard can be started via
+ reveng.xml file the reveng.xml wi=
zard can be started via Ctrl+N or via the code generation
launcher.
=
@@ -1190,7 +1190,7 @@
=
Hibernate Console perspective shows entit=
y structure, query editor and
- result
+ result.
=
=
The console configuration does not dynamically adjust to chang=
es done in mappings and
@@ -1202,7 +1202,7 @@
Mapping Diagram
=
A mapping diagram for entities are available by right clicki=
ng on the entity you want
- an mapping diagram for and then choose
+ a mapping diagram for and then choose Open Mapping Diagram
=
Modified: trunk/hibernatetools/docs/reference/en/modules/reverseengineering=
.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/reverseengineering.xml 2=
008-01-04 11:01:05 UTC (rev 5504)
+++ trunk/hibernatetools/docs/reference/en/modules/reverseengineering.xml 2=
008-01-04 11:20:31 UTC (rev 5505)
@@ -129,7 +129,7 @@
=
]]>
=
- which in turn is equal to:
+ Which in turn is equal to:
=
]]>
=
@@ -309,7 +309,7 @@
java.lang.Character
=
The most specific VARCHAR with not-null=3D"true" is
- selected.
+ selected
=
@@ -445,11 +445,11 @@
=
- catalog (Optional): Catalog name for table. Has to be sp=
ecified if you are reverse engineering multiple catalogs or if it is not eq=
ual to hiberante.default_catalog
+ catalog (Optional): Catalog name for table. Has to be sp=
ecified if you are reverse engineering multiple catalogs or if it is not eq=
ual to hiberante.default_catalog.
=
- schema (Optional): Schema name for table. Has to be spec=
ified if you are reverse engineering multiple schemas or if it is not equal=
to hiberante.default_schema
+ schema (Optional): Schema name for table. Has to be spec=
ified if you are reverse engineering multiple schemas or if it is not equal=
to hiberante.default_schema.
=
@@ -555,17 +555,17 @@
=
type (Optional): Which hibernate-type to use for this
- specific column.
+ specific column
=
property (Optional): What property name will be
- generated for this column.
+ generated for this column
=
exclude (default: false): set to true if this column
- should be ignored.
+ should be ignored
@@ -581,7 +581,7 @@
name of the resulting properties (many-to-one and
one-to-many's).
=
- Note
+ Note:
=
@@ -626,26 +626,26 @@
foreign-catalog (Optional): Name of the foreign tabl=
e's
catalog. (Only relevant if you want to explicitly define a
- foreign key)
+ foreign key).
=
foreign-schema (Optional): Name of the foreign table=
's
schema. (Only relevant if you want to explicitly define a
- foreign key)
+ foreign key).
=
foreign-table (Optional): Name of the foreign table.
(Only relevant if you want to explicitly define a foreign
- key)
+ key).
=
column-ref (Optional): Defines that the foreign-key
constraint between a local-column and foreign-column name.
(Only relevant if you want to explicitly define a foreign
- key)
+ key).
=
@@ -670,7 +670,7 @@
Custom strategy
=
- It is possible to implement a user strategy. Such strategy must
+ It is possible to implement an user strategy. Such strategy must
implement org.hibernate.cfg.reveng.ReverseEngineeringStrategy. It is
recommended that one uses the DelegatingReverseEngineeringSt=
rategy and
Modified: trunk/hibernatetools/docs/reference/en/modules/setup.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/setup.xml 2008-01-04 11:=
01:05 UTC (rev 5504)
+++ trunk/hibernatetools/docs/reference/en/modules/setup.xml 2008-01-04 11:=
20:31 UTC (rev 5505)
@@ -3,8 +3,8 @@
Download and install Hibernate Tools
=
Hibernate Tools can be used "standalone&=
quot; via Ant
- 1.6.x or fully integrated into a Eclipse 3.3.x + WTP 2.x based IDE, su=
ch as JBoss
- Tools or an default Eclipse 3.3.x + WTP 2.x installation.=
The following describes
+ 1.6.x or fully integrated into an Eclipse 3.3.x + WTP 2.x based IDE, s=
uch as JBoss
+ Tools or a default Eclipse 3.3.x + WTP 2.x installation. =
The following describes
the install steps in these environments.
=
@@ -69,7 +69,7 @@
hibernate-tools.jar
and associated libraries. The libraries are included in =
the distribution from the
Hibernate website and the Eclipse updatesite. The libraries are loca=
ted in the eclipse plugins
- directory at
+ directory at /plugins/org.hibernate.eclipse.x.x.x/lib/tools/.
--===============8945235850115645222==--
From jbosstools-commits at lists.jboss.org Fri Jan 4 07:35:12 2008
Content-Type: multipart/mixed; boundary="===============9019832783930405411=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5506 -
trunk/jsf/docs/userguide/en/images/palette.
Date: Fri, 04 Jan 2008 07:35:12 -0500
Message-ID:
--===============9019832783930405411==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ykryvinchanka
Date: 2008-01-04 07:35:12 -0500 (Fri, 04 Jan 2008)
New Revision: 5506
Modified:
trunk/jsf/docs/userguide/en/images/palette/palette_14.png
trunk/jsf/docs/userguide/en/images/palette/palette_15.png
trunk/jsf/docs/userguide/en/images/palette/palette_17.png
trunk/jsf/docs/userguide/en/images/palette/palette_18.png
trunk/jsf/docs/userguide/en/images/palette/palette_19.png
trunk/jsf/docs/userguide/en/images/palette/palette_20.png
trunk/jsf/docs/userguide/en/images/palette/palette_21.png
trunk/jsf/docs/userguide/en/images/palette/palette_22.png
trunk/jsf/docs/userguide/en/images/palette/palette_23.png
trunk/jsf/docs/userguide/en/images/palette/palette_4.png
Log:
http://jira.jboss.com/jira/browse/JBDS-232 http://jira.jboss.com/jira/brows=
e/JBDS-226 Update information about the palette + retaken with 96 resolution
Modified: trunk/jsf/docs/userguide/en/images/palette/palette_14.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/palette/palette_15.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/palette/palette_17.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/palette/palette_18.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/palette/palette_19.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/palette/palette_20.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/palette/palette_21.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/palette/palette_22.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/palette/palette_23.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/palette/palette_4.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
--===============9019832783930405411==--
From jbosstools-commits at lists.jboss.org Fri Jan 4 07:37:45 2008
Content-Type: multipart/mixed; boundary="===============3795446028100661895=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5507 -
trunk/jsf/docs/userguide/en/images/palette.
Date: Fri, 04 Jan 2008 07:37:45 -0500
Message-ID:
--===============3795446028100661895==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ykryvinchanka
Date: 2008-01-04 07:37:45 -0500 (Fri, 04 Jan 2008)
New Revision: 5507
Added:
trunk/jsf/docs/userguide/en/images/palette/palette_1.png
trunk/jsf/docs/userguide/en/images/palette/palette_10.png
trunk/jsf/docs/userguide/en/images/palette/palette_11.png
trunk/jsf/docs/userguide/en/images/palette/palette_12.png
trunk/jsf/docs/userguide/en/images/palette/palette_13.png
trunk/jsf/docs/userguide/en/images/palette/palette_2.png
trunk/jsf/docs/userguide/en/images/palette/palette_24.png
trunk/jsf/docs/userguide/en/images/palette/palette_3.png
trunk/jsf/docs/userguide/en/images/palette/palette_5.png
trunk/jsf/docs/userguide/en/images/palette/palette_6.png
trunk/jsf/docs/userguide/en/images/palette/palette_7.png
trunk/jsf/docs/userguide/en/images/palette/palette_8.png
trunk/jsf/docs/userguide/en/images/palette/palette_9.png
Removed:
trunk/jsf/docs/userguide/en/images/palette/Cursor_position.png
trunk/jsf/docs/userguide/en/images/palette/PaletteEditor.png
trunk/jsf/docs/userguide/en/images/palette/PaletteEditor2.png
trunk/jsf/docs/userguide/en/images/palette/PaletteEditor3.png
trunk/jsf/docs/userguide/en/images/palette/PaletteEditor4.png
trunk/jsf/docs/userguide/en/images/palette/PaletteEditor5.png
trunk/jsf/docs/userguide/en/images/palette/PaletteEditor6.png
trunk/jsf/docs/userguide/en/images/palette/PaletteEditor7.png
trunk/jsf/docs/userguide/en/images/palette/PaletteEditor8.png
trunk/jsf/docs/userguide/en/images/palette/PaletteEditor9.png
trunk/jsf/docs/userguide/en/images/palette/pallete_1.png
trunk/jsf/docs/userguide/en/images/palette/pallete_10.png
trunk/jsf/docs/userguide/en/images/palette/pallete_11.png
trunk/jsf/docs/userguide/en/images/palette/pallete_12.png
trunk/jsf/docs/userguide/en/images/palette/pallete_13.png
trunk/jsf/docs/userguide/en/images/palette/pallete_2.png
trunk/jsf/docs/userguide/en/images/palette/pallete_3.png
trunk/jsf/docs/userguide/en/images/palette/pallete_4.png
trunk/jsf/docs/userguide/en/images/palette/pallete_5.png
trunk/jsf/docs/userguide/en/images/palette/pallete_6.png
trunk/jsf/docs/userguide/en/images/palette/pallete_7.png
trunk/jsf/docs/userguide/en/images/palette/pallete_8.png
trunk/jsf/docs/userguide/en/images/palette/pallete_9.png
Log:
http://jira.jboss.com/jira/browse/JBDS-232 http://jira.jboss.com/jira/brows=
e/JBDS-226 Update information about the palette + retaken with 96 resolution
Deleted: trunk/jsf/docs/userguide/en/images/palette/Cursor_position.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/PaletteEditor.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/PaletteEditor2.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/PaletteEditor3.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/PaletteEditor4.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/PaletteEditor5.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/PaletteEditor6.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/PaletteEditor7.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/PaletteEditor8.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/PaletteEditor9.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Added: trunk/jsf/docs/userguide/en/images/palette/palette_1.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/palette/palette_1.p=
ng
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/palette/palette_10.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/palette/palette_10.=
png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/palette/palette_11.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/palette/palette_11.=
png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/palette/palette_12.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/palette/palette_12.=
png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/palette/palette_13.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/palette/palette_13.=
png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/palette/palette_2.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/palette/palette_2.p=
ng
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/palette/palette_24.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/palette/palette_24.=
png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/palette/palette_3.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/palette/palette_3.p=
ng
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/palette/palette_5.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/palette/palette_5.p=
ng
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/palette/palette_6.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/palette/palette_6.p=
ng
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/palette/palette_7.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/palette/palette_7.p=
ng
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/palette/palette_8.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/palette/palette_8.p=
ng
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/palette/palette_9.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/palette/palette_9.p=
ng
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/jsf/docs/userguide/en/images/palette/pallete_1.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/pallete_10.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/pallete_11.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/pallete_12.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/pallete_13.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/pallete_2.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/pallete_3.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/pallete_4.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/pallete_5.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/pallete_6.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/pallete_7.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/pallete_8.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/palette/pallete_9.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
--===============3795446028100661895==--
From jbosstools-commits at lists.jboss.org Fri Jan 4 07:40:01 2008
Content-Type: multipart/mixed; boundary="===============6919079819712173116=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5508 -
trunk/jsf/docs/userguide/en/modules.
Date: Fri, 04 Jan 2008 07:40:00 -0500
Message-ID:
--===============6919079819712173116==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ykryvinchanka
Date: 2008-01-04 07:40:00 -0500 (Fri, 04 Jan 2008)
New Revision: 5508
Modified:
trunk/jsf/docs/userguide/en/modules/palette.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-226 (Screens retaken with 96 resolu=
tion) Scale param is defined
Modified: trunk/jsf/docs/userguide/en/modules/palette.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/docs/userguide/en/modules/palette.xml 2008-01-04 12:37:45 UTC=
(rev 5507)
+++ trunk/jsf/docs/userguide/en/modules/palette.xml 2008-01-04 12:40:00 UTC=
(rev 5508)
@@ -50,25 +50,34 @@
JBoss Tools Palette
=
- In the Palette Editor window(Figure 5.1. "Palette =
Editor") we can see that every
+ In the Palette Editor window we can see that every
group contains its own subgroups. For example, JSF include=
s Core, Facelets, HTML.
So, in the Palette every group has the next view: <Grou=
p name>
<Subgroup name>.
=
- JBoss Tools Palette
+ Subgroups of JSF group
-
+
=
By default the Palette is represented in Web Development=
Perspective with four
- groups(Figure 5.2. "JBoss Tools Palette"). If yo=
u can't see it, select
+ groups. If you can't see it, select Window > Show View Other... > JBoos To=
ols Web >
JBoss Tools Palette from the menu bar.
+ =
+
+ JBoss Tools Palette
+
+
+
+
+
+
=
By using Show/Hide button you can a=
dd any predefined group of
tag libraries. It's also possible to create your own =
group.
@@ -91,7 +100,7 @@
Inserting Tag
-
+
@@ -114,7 +123,7 @@
Cursor position
-
+
@@ -157,7 +166,7 @@
Web Projects View
-
+
@@ -171,7 +180,7 @@
Import Tags From TLD File Form
-
+
@@ -182,7 +191,7 @@
JBoss Tools Palette with New Tag Library
-
+
@@ -197,7 +206,7 @@
Import Button
-
+
@@ -208,7 +217,7 @@
Import Tags From TLD File Form
-
+
@@ -217,7 +226,7 @@
Select TLD File
-
+
@@ -247,7 +256,7 @@
Palette Buttons
-
+
@@ -366,7 +375,7 @@
Show/Hide Button
-
+
@@ -381,7 +390,7 @@
Show/Hide Drawers
-
+
@@ -396,7 +405,7 @@
New Added Groups
-
+
@@ -425,7 +434,7 @@
Rich Faces Components
-
+
--===============6919079819712173116==--
From jbosstools-commits at lists.jboss.org Fri Jan 4 09:37:14 2008
Content-Type: multipart/mixed; boundary="===============7308797325605517961=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5509 -
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.
Date: Fri, 04 Jan 2008 09:37:13 -0500
Message-ID:
--===============7308797325605517961==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-04 09:37:13 -0500 (Fri, 04 Jan 2008)
New Revision: 5509
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/tem=
plate/JsfRadioSelectItemTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/tem=
plate/JsfSelectManyListbox.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/tem=
plate/JsfSelectOneListbox.java
Log:
update comments
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi=
tor/template/JsfRadioSelectItemTemplate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te=
mplate/JsfRadioSelectItemTemplate.java 2008-01-04 12:40:00 UTC (rev 5508)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te=
mplate/JsfRadioSelectItemTemplate.java 2008-01-04 14:37:13 UTC (rev 5509)
@@ -1,13 +1,13 @@
-/*************************************************************************=
******
- * Copyright (c) 2007 Exadel, Inc. and 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- *************************************************************************=
*****/
+/*************************************************************************=
****** =
+* Copyright (c) 2007 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.vpe.editor.template;
=
import org.eclipse.wst.xml.core.internal.document.ElementImpl;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi=
tor/template/JsfSelectManyListbox.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te=
mplate/JsfSelectManyListbox.java 2008-01-04 12:40:00 UTC (rev 5508)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te=
mplate/JsfSelectManyListbox.java 2008-01-04 14:37:13 UTC (rev 5509)
@@ -1,13 +1,13 @@
-/*************************************************************************=
******
- * Copyright (c) 2007 Exadel, Inc. and 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- *************************************************************************=
*****/
+/*************************************************************************=
****** =
+* Copyright (c) 2007 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.vpe.editor.template;
=
import java.util.ArrayList;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi=
tor/template/JsfSelectOneListbox.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te=
mplate/JsfSelectOneListbox.java 2008-01-04 12:40:00 UTC (rev 5508)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te=
mplate/JsfSelectOneListbox.java 2008-01-04 14:37:13 UTC (rev 5509)
@@ -1,13 +1,13 @@
-/*************************************************************************=
******
- * Copyright (c) 2007 Exadel, Inc. and 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- *************************************************************************=
*****/
+/*************************************************************************=
****** =
+* Copyright (c) 2007 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.vpe.editor.template;
=
import java.util.ArrayList;
--===============7308797325605517961==--
From jbosstools-commits at lists.jboss.org Fri Jan 4 09:38:03 2008
Content-Type: multipart/mixed; boundary="===============0991191250603906958=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5510 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
Date: Fri, 04 Jan 2008 09:38:03 -0500
Message-ID:
--===============0991191250603906958==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-04 09:38:02 -0500 (Fri, 04 Jan 2008)
New Revision: 5510
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfAllTests.java
Log:
update comments
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfAllTests.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfAllTests.java 2008-01-04 14:37:13 UTC (rev 5509)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfAllTests.java 2008-01-04 14:38:02 UTC (rev 5510)
@@ -1,12 +1,12 @@
-/*************************************************************************=
******
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+/*************************************************************************=
****** =
+ * Copyright (c) 2007 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
*************************************************************************=
*****/
package org.jboss.tools.jsf.vpe.jsf.test;
=
--===============0991191250603906958==--
From jbosstools-commits at lists.jboss.org Fri Jan 4 09:38:36 2008
Content-Type: multipart/mixed; boundary="===============2803009604543553474=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5511 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
Date: Fri, 04 Jan 2008 09:38:36 -0500
Message-ID:
--===============2803009604543553474==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-04 09:38:36 -0500 (Fri, 04 Jan 2008)
New Revision: 5511
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfComponentTest.java
Log:
update comments
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfComponentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfComponentTest.java 2008-01-04 14:38:02 UTC (rev 5510)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfComponentTest.java 2008-01-04 14:38:36 UTC (rev 5511)
@@ -1,12 +1,12 @@
-/*************************************************************************=
******
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+/*************************************************************************=
****** =
+ * Copyright (c) 2007 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
*************************************************************************=
*****/
package org.jboss.tools.jsf.vpe.jsf.test;
=
--===============2803009604543553474==--
From jbosstools-commits at lists.jboss.org Fri Jan 4 09:39:17 2008
Content-Type: multipart/mixed; boundary="===============5519418047164108545=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5512 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
Date: Fri, 04 Jan 2008 09:39:17 -0500
Message-ID:
--===============5519418047164108545==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-04 09:39:17 -0500 (Fri, 04 Jan 2008)
New Revision: 5512
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfTestPlugin.java
Log:
update comments
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfTestPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfTestPlugin.java 2008-01-04 14:38:36 UTC (rev 5511)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfTestPlugin.java 2008-01-04 14:39:17 UTC (rev 5512)
@@ -1,3 +1,14 @@
+/*************************************************************************=
****** =
+ * Copyright (c) 2007 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.jsf.vpe.jsf.test;
=
import java.net.URL;
@@ -54,11 +65,11 @@
public static JsfTestPlugin getDefault() {
return plugin;
}
- =
- public static IPluginLog getPluginLog() {
- return getDefault();
- }
=
+ public static IPluginLog getPluginLog() {
+ return getDefault();
+ }
+
public static String getPluginResourcePath() {
Bundle bundle =3D Platform.getBundle(PLUGIN_ID);
URL url =3D null;
--===============5519418047164108545==--
From jbosstools-commits at lists.jboss.org Fri Jan 4 09:40:27 2008
Content-Type: multipart/mixed; boundary="===============5576426636266930800=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5513 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
Date: Fri, 04 Jan 2008 09:40:22 -0500
Message-ID:
--===============5576426636266930800==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-04 09:40:22 -0500 (Fri, 04 Jan 2008)
New Revision: 5513
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/TestJsfUtil.java
Log:
update comments
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/TestJsfUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/TestJsfUtil.java 2008-01-04 14:39:17 UTC (rev 5512)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/TestJsfUtil.java 2008-01-04 14:40:22 UTC (rev 5513)
@@ -1,13 +1,14 @@
-/*************************************************************************=
******
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+/*************************************************************************=
****** =
+ * Copyright (c) 2007 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
*************************************************************************=
*****/
+
package org.jboss.tools.jsf.vpe.jsf.test;
=
import java.io.File;
--===============5576426636266930800==--
From jbosstools-commits at lists.jboss.org Fri Jan 4 09:43:37 2008
Content-Type: multipart/mixed; boundary="===============8253072307947032448=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5514 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
Date: Fri, 04 Jan 2008 09:43:36 -0500
Message-ID:
--===============8253072307947032448==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-04 09:43:36 -0500 (Fri, 04 Jan 2008)
New Revision: 5514
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfJbideTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1501
was added junit
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfJbideTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfJbideTest.java 2008-01-04 14:40:22 UTC (rev 5513)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfJbideTest.java 2008-01-04 14:43:36 UTC (rev 5514)
@@ -1,13 +1,14 @@
-/*************************************************************************=
******
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+/*************************************************************************=
****** =
+ * Copyright (c) 2007 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
*************************************************************************=
*****/
+
package org.jboss.tools.jsf.vpe.jsf.test;
=
import java.util.ArrayList;
@@ -46,10 +47,9 @@
// type of input tag
private static final String ATTR_TYPE_VALUE =3D "radio";
=
- // $NON-NLS-1$
-
// check warning log
private final static boolean checkWarning =3D false;
+
private Throwable exception;
=
public JsfJbideTest(String name) {
@@ -65,13 +65,12 @@
*/
=
protected void setUp() throws Exception {
+
super.setUp();
=
Platform.addLogListener(this);
=
- TestJsfUtil.waitForJobs();
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .closeAllEditors(true);
+ closeEditors();
}
=
/**
@@ -82,13 +81,12 @@
* @see TestCase#tearDown()
*/
protected void tearDown() throws Exception {
+
super.tearDown();
+
Platform.removeLogListener(this);
=
- TestJsfUtil.waitForJobs();
-
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .closeAllEditors(true);
+ closeEditors();
}
=
/*
@@ -98,42 +96,33 @@
/**
* test for http://jira.jboss.com/jira/browse/JBIDE-1467
* =
- * REQUIREMENT :test page must have only one tag
+ * the cause of bug : tags ( which vpe template for=
ms
+ * when process "selectOneRadio" jsf tag ) didn't have equal "name"
+ * attribute
* =
- * test check that all "radio" elements ( of xulRunner DOMDocument ) have
+ * REQUIREMENT :test page must has only one tag
+ * =
+ * test checks that all "radio" elements ( of xulRunner DOMDocument ) have
* equal "name" attributes
*/
public void testJBIDE_1467() throws PartInitException, Throwable {
- // path to test page
- String path =3D "JBIDE/JBIDE-1467.jsp";
+
// wait
TestJsfUtil.waitForJobs();
// set exception
exception =3D null;
=
// get test page path
- IFile file =3D (IFile) TestJsfUtil.getComponentPath(path);
+ IFile file =3D (IFile) TestJsfUtil
+ .getComponentPath("JBIDE/1467/JBIDE-1467.jsp");
=
IEditorInput input =3D new FileEditorInput(file);
=
- // get editor
- JSPMultiPageEditor part =3D (JSPMultiPageEditor) PlatformUI
- .getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .openEditor(input, EDITOR_ID, true);
+ // open and get editor
+ JSPMultiPageEditor part =3D openEditor(input);
=
- // wait for jobs
- TestJsfUtil.waitForJobs();
- // wait full initialization of vpe
- TestJsfUtil.delay(3000);
-
- VpeEditorPart visualEditor =3D (VpeEditorPart) part.getVisualEditor();
- VpeController vpeController =3D visualEditor.getController();
-
- // get xulRunner editor
- XulRunnerEditor xulRunnerEditor =3D vpeController.getXulRunnerEditor();
-
// get dom document
- nsIDOMDocument document =3D xulRunnerEditor.getDOMDocument();
+ nsIDOMDocument document =3D getVpePageSource(part);
nsIDOMElement element =3D document.getDocumentElement();
=
if (element !=3D null) {
@@ -149,7 +138,7 @@
=
// check that "radio" elements have equal names
// (size of list of names =3D=3D 1 )
- assertEquals(getRadioNames(elements).size(), 1);
+ assertEquals(1, getRadioNames(elements).size());
=
}
=
@@ -161,6 +150,131 @@
}
=
/**
+ * test for http://jira.jboss.com/jira/browse/JBIDE-1467
+ * =
+ * the cause of bug :
+ * =
+ * 1.
- . This jar is 100% independent from the eclipse platform and c=
an thus be used
- independently of eclipse.
+ /plugins/org.hibernate.eclipse.x.x.x/lib/tools/hibernate=
-tools.jar
+ .
+ This jar is 100% independent from the eclipse platform and can t=
hus be used independently
+ of eclipse.
=
There might be incapabilities with respect to the Hibernate3.j=
ar bundled with the tools
@@ -28,13 +27,14 @@
=
- The <hibernatetool> ant Task
+ The <hibernatetool> Ant Task
=
- To use the ant tasks you need to have the hibernatetool task def=
ined. That is done in your
+ To use the ant tasks you need to have the
+ hibernatetool
+ task defined. That is done in your build.xml by inserting the following xml (assuming the jars are in=
the
- lib directory): =
-
+ lib directory):
@@ -51,9 +51,7 @@
<taskdef> defines an Ant task called
-
- <hibernatetool>
-
+ hibernatetool which now can be used anywhere in your ant build.xml files. It is important to include all the Hibe=
rnate Tools
@@ -65,9 +63,7 @@
=
When using the
-
- <hibernatetool>
-
+ hibernatetool task you have to specify one or more of the following:=
para>
=
@@ -140,9 +136,9 @@
hibernate.cfg.xml
- . The output will be put in the
- ${build.dir}/generated
- directory.
+ . The output will be put in the
+ ${build.dir}/generated
+ directory.
=
@@ -157,8 +153,8 @@
and finally runs a custom code generation via <hbmtemplate>
. This is again from a normal
- hibernate.cfg.xml and the output
- is still put in the
+ hibernate.cfg.xml
+ and the output is still put in the ${build.dir}/generated
@@ -201,8 +197,12 @@
=
Each have in common that they are able to build up a Hibernate
Configuration object from which a set of exporter=
s can be run to generate
- various output. Note: output can be anything, e.g. specific files, s=
tatements execution against
- a database, error reporting or anything else that can be done in jav=
a code.
+ various output. =
+ =
+ Output can be anything, e.g. specific files, statements executi=
on
+ against a database, error reporting or anything else that can be don=
e in java code.
+
+
=
The following section describes what the various configuration c=
an do, plus list the
individual settings they have.
@@ -265,8 +265,8 @@
=
- A standard Ant fileset. Used to include hibernate mapp=
ing files. Remember that if
- mappings are already specified in the hibernate.cfg.xml th=
en it should not be
+ A standard Ant fileset. Used to include hibernate mapp=
ing files. Remember that
+ if mappings are already specified in the hibernate.cfg.xml=
then it should not be
included via the fileset as it will result in duplicate im=
port exceptions.
@@ -277,15 +277,18 @@
Example
=
This example shows an example where no
- hibernate.cfg.xml exists,
- and a
- hibernate.properties=
emphasis> + fileset is used instead. =
-
+
+ hibernate.cfg.xml
+
+ exists, and a
+
+ hibernate.properties
+
+ + fileset is used instead.
-
- Hibernate will still read any global /hibernate.propert=
ies available in
- the classpath, but the specified properties file here will overr=
ide those values for any
- non-global property.
+ Hibernate will still read any global /hibernate.=
properties
+ available in the classpath, but the specified properties file =
here will override those
+ values for any non-global property.
=
@@ -308,18 +311,20 @@
Annotation based Configuration (<annotationconfiguration&g=
t;)
=
An
- <annotationconfiguration> is=
used when you want to
- read the metamodel from EJB3/Hibernate Annotations based POJO's. T=
o use it remember to put
- the jars file needed for using hibernate annotations in the classp=
ath of the
-
- <taskdef>.
+ <annotationconfiguration>
+ is used when you want to read the metamodel from EJB3/=
Hibernate Annotations
+ based POJO's. To use it remember to put the jars file needed for u=
sing hibernate annotations
+ in the classpath of the
+ <taskdef>
+ .
=
The
- <annotationconfiguration> su=
pports the same attributes as a
-
- <configuration> except tha=
t the configurationfile attribute is now required as
- that is from where an AnnotationConfiguration g=
ets the list of
- classes/packages it should load.
+ <annotationconfiguration>
+ supports the same attributes as a
+ <configuration>
+ except that the configurationfile attribute is now req=
uired as that is from
+ where an AnnotationConfiguration gets the list =
of classes/packages it
+ should load.
=
Thus the minimal usage is:
=
@@ -339,29 +344,31 @@
JPA based configuration (<jpaconfiguration>)
=
A
- <jpaconfiguration> is used w=
hen you want to read the metamodel from
- JPA/Hibernate Annotation where you want to use the auto-scan confi=
guration as defined in the
- JPA spec (part of EJB3). In other words, when you do not have a
-
- hibernate.cfg.xml, but instead h=
ave a setup where you use a
-
- persistence.xml packaged in a JP=
A compliant manner.
+ <jpaconfiguration>
+ is used when you want to read the metamodel from JPA/H=
ibernate Annotation where
+ you want to use the auto-scan configuration as defined in the JPA =
spec (part of EJB3). In
+ other words, when you do not have a
+ hibernate.cfg.xml
+ , but instead have a setup where you use a
+ persistence.xml
+ packaged in a JPA compliant manner.
=
<jpaconfiguration> will simply just t=
ry and
- auto-configure it self based on the available classpath, e.g. look=
for
-
- META-INF/persistence.xml.
+ auto-configure it self based on the available classpath, e.g. look=
for
+ META-INF/persistence.xml
+ .
=
The persistenceunit attribute can be used t=
o select a specific
persistence unit. If no persistenceunit is specified it will autom=
atically search for one
- and if an unique one is found use it, but if multiple persistence =
units are available it will
- error.
+ and if an unique one is found use it, but if multiple persistence =
units are available it
+ will error.
=
To use a
- <jpaconfiguration> you will =
need to specify some additional jars
- from Hibernate EntityManager in the
- <taskdef> of the hibernate=
tool. The
- following shows a full setup:
+ <jpaconfiguration>
+ you will need to specify some additional jars from Hib=
ernate EntityManager in
+ the
+ <taskdef>
+ of the hibernatetool. The following shows a full setup=
:
=
@@ -389,27 +396,35 @@
]]>
=
- =
- ejb3configuration were the name used =
in previous versions. It
- still works but will emit a warning telling you to use jp=
aconfiguration
- instead.
-
=
+
+ ejb3configuration were the name used in p=
revious versions. It still
+ works but will emit a warning telling you to use jpacon=
figuration
+ instead.
+
+
=
JDBC Configuration for reverse engineering (<jdbcconfigura=
tion>)
=
A
- <jdbcconfiguration><=
/emphasis> is used to perform reverse
- engineering of the database from a JDBC connection.
+
+ <jdbcconfiguration>
+
+ is used to perform reverse engineering of the database=
from a JDBC connection.
=
This configuration works by reading the connection properties =
from
=
The
- <jdbcconfiguration><=
/emphasis> has the same attributes as a
-
- <configuration> plus the following additional attributes:
+
+ <jdbcconfiguration>
+
+ has the same attributes as a
+
+ <configuration>
+
+ plus the following additional attributes:
=
@@ -474,12 +489,17 @@
Example
=
Here is an example of using
- <jdbcconfiguration> to
- generate Hibernate xml mappings via <hbm2hbmxml><=
/literal>. The
- connection settings is here read from a
- hibernate.properties=
emphasis> file but
- could just as well have been read from a
- hibernate.cfg.xml.
+
+ <jdbcconfiguration>
+
+ to generate Hibernate xml mappings via
+ <hbm2hbmxml>. The connection settings i=
s here read from a
+
+ hibernate.properties
+
+ file but could just as well have been read from a
+ hibernate.cfg.xml
+ .
=
@@ -493,20 +513,24 @@
Exporters
=
- Exporters are the parts that does the actual job of converting t=
he hibernate metamodel into
- various artifacts, mainly code. The following section describes the =
current supported set of
- exporters in the Hibernate Tool distribution. I=
t is also possible for userdefined exporters,
- that is done through the
- <hbmtemplate> exporter.
+ Exporters are the parts that does the actual job of converting t=
he hibernate metamodel
+ into various artifacts, mainly code. The following section describes=
the current supported set
+ of exporters in the Hibernate Tool distribution=
. It is also possible for
+ userdefined exporters, that is done through the
+
+ <hbmtemplate>
+
+ exporter.
=
Database schema exporter (<hbm2ddl>)
=
- <hbm2ddl> lets you run schem=
aexport and schemaupdate which generates the
- appropriate SQL DDL and allow you to store the result in a file or=
export it directly to the
- database. Remember that if a custom naming strategy is needed it i=
s placed on the
- configuration element.
+ <hbm2ddl>
+ lets you run schemaexport and schemaupdate which gener=
ates the appropriate SQL
+ DDL and allow you to store the result in a file or export it direc=
tly to the database.
+ Remember that if a custom naming strategy is needed it is placed o=
n the configuration
+ element.
=
@@ -545,11 +569,12 @@
=
- update(default: false): Try and create an update scrip=
t representing the "delta"
- between what is in the database and what the mappings spec=
ify. Ignores create/update
- attributes. (Do *not* use against production dat=
abases, no guarantees at
- all that the proper delta can be generated nor that the =
underlying database can
- actually execute the needed operations)
+ update(default: false): Try and create an update scrip=
t representing the
+ "delta" between what is in the database and what=
the mappings
+ specify. Ignores create/update attributes. (Do *=
not* use against
+ production databases, no guarantees at all that the prop=
er delta can be generated
+ nor that the underlying database can actually execute th=
e needed
+ operations)
=
@@ -587,9 +612,11 @@
Example
=
Basic example of using
- <hbm2ddl>, which does not =
export to the database
- but simply dumps the sql to a file named
- sql.ddl.
+ <hbm2ddl>
+ , which does not export to the database but simply du=
mps the sql to a file
+ named
+ sql.ddl
+ .
=
@@ -602,8 +629,9 @@
POJO java code exporter (<hbm2java>)=
=
- <hbm2java> is a java codegen=
erator. Options for controlling whether JDK 5
- syntax can be used and whether the POJO should be annotated with E=
JB3/Hibernate Annotations.
+ <hbm2java>
+ is a java codegenerator. Options for controlling wheth=
er JDK 5 syntax can be
+ used and whether the POJO should be annotated with EJB3/Hibernate =
Annotations.
=
@@ -636,8 +664,8 @@
Example
=
Basic example of using
- <hbm2java> to generate POJ=
O's that utilize jdk5
- constructs.
+ <hbm2java>
+ to generate POJO's that utilize jdk5 constructs.
=
@@ -650,12 +678,13 @@
Hibernate Mapping files exporter (<hbm2hbmxml>=
)
=
- <hbm2hbmxml> generates a set=
of .hbm files. Intended to be used together
- with a
- <jdbcconfiguration> when p=
erforming reverse engineering, but can be
- used with any kind of configuration. e.g. to convert from annotati=
on based pojo's to
-
- hbm.xml. Note that not every pos=
sible mapping transformation is possible/implemented
+ <hbm2hbmxml>
+ generates a set of .hbm files. Intended to be used tog=
ether with a
+ <jdbcconfiguration>
+ when performing reverse engineering, but can be used w=
ith any kind of
+ configuration. e.g. to convert from annotation based pojo's to
+ hbm.xml
+ . Note that not every possible mapping transformation i=
s possible/implemented
(contributions welcome) so some hand editing might be necessary.=
para>
=
]]>
@@ -663,8 +692,9 @@
Example
=
- Basic usage of
- <hbm2hbmxml>.
+ Basic usage of
+ <hbm2hbmxml>
+ .
=
@@ -672,19 +702,20 @@
]]>
=
- <hbm2hbmxml>
- is normally used with a
- <jdbcconfiguration>
-
- like in the above example, but any other configuration can also =
be used to convert between
- the different ways of performing mappings. Here is an example of=
that, using an
-
- <annotationconfiguration>.
- =
- Not all conversions is implemented
- (contributions welcome), so some hand editing might be necessary.<=
/para>
-
+ <hbm2hbmxml>
+ is normally used with a
+ <jdbcconfiguration>
+ like in the above example, but any other configurati=
on can also be used to
+ convert between the different ways of performing mappings. Here =
is an example of that,
+ using an
+ <annotationconfiguration>
+ .
=
+
+ Not all conversions is implemented (contributions welcome)=
, so some hand editing
+ might be necessary.
+
+
@@ -698,13 +729,15 @@
Hibernate Configuration file exporter (<hbm2cfgxm=
l>)
=
- <hbm2cfgxml> generates a
- hibernate.cfg.xml. Intended to b=
e used together
- with a
- <jdbcconfiguration> when p=
erforming reverse engineering, but can be
- used with any kind of configuration. The
- <hbm2cfgxml> will contain =
the
- properties used and adds mapping entries for each mapped class.
+ <hbm2cfgxml>
+ generates a
+ hibernate.cfg.xml
+ . Intended to be used together with a
+ <jdbcconfiguration>
+ when performing reverse engineering, but can be used w=
ith any kind of
+ configuration. The
+ <hbm2cfgxml>
+ will contain the properties used and adds mapping entr=
ies for each mapped class.
=
@@ -732,8 +765,8 @@
Documentation exporter (<hbm2doc>)=
title>
=
- <hbm2doc> generates html doc=
umentation a'la javadoc for the database
- schema et.al.
+ <hbm2doc>
+ generates html documentation a'la javadoc for the data=
base schema et.al.
=
]]>
@@ -742,8 +775,9 @@
Query exporter (<query>)
=
- <query> is used to execute a=
HQL query statements and optionally send the
- output to a file. Can be used for verifying the mappings and for b=
asic data extraction.
+ <query>
+ is used to execute a HQL query statements and optional=
ly send the output to a
+ file. Can be used for verifying the mappings and for basic data ex=
traction.
=
@@ -761,8 +795,9 @@
Examples
=
Simplest usage of
- <query> will just execute =
the query without dumping to
- a file. This can be used to verify that queries can actually be =
performed.
+ <query>
+ will just execute the query without dumping to a fil=
e. This can be used to
+ verify that queries can actually be performed.
=
@@ -770,14 +805,15 @@
]]>
=
Multiple queries can be executed by nested
- <hql> elements. In this
- example we also let the output be dumped to
- queryresult.txt.
- =
-
- Currently the dump is simply a call to toString on each element.=
-
+ <hql>
+ elements. In this example we also let the output be =
dumped to
+ queryresult.txt
+ .
=
+
+ Currently the dump is simply a call to toString on each e=
lement.
+
+
@@ -800,18 +836,19 @@
exporterclass=3D"Exporter classname"
/>]]>
=
- Previous versions of the tools used Velocity. We are now=
using Freemarker which
- provides us much better exception and error handling.
-
+
+ Previous versions of the tools used Velocity. We are now usi=
ng Freemarker which
+ provides us much better exception and error handling.
+
=
Exporter via <hbmtemplate>
=
- The following is an example of reverse engineering via
-
- <jdbcconfiguration> and =
use a custom Exporter via the
-
- <hbmtemplate>.
+ The following is an example of reverse engineering via
+ <jdbcconfiguration>
+ and use a custom Exporter via the
+ <hbmtemplate>
+ .
=
@@ -837,63 +874,78 @@
Using properties to configure Exporters
=
- Exporters can be controlled by user properties. The user propert=
ies are specified via
-
- <property> or
-
- <propertyset> and each exporter will have access to them
- directly in the templates and via Exporter.setProperties()<=
/literal>.
+ Exporters can be controlled by user properties. The user propert=
ies are specified via
+ <property>
+ or
+
+ <propertyset>
+
+ and each exporter will have access to them directly in t=
he templates and via
+ Exporter.setProperties().
=
<property> and
<propertyset>
=
The
- <property> allows you bind a=
string value to a key. The value will be
- available in the templates via $<key>. The following example=
will assign the
- string value
- "true" to the variable=
$descriptors.
+ <property>
+ allows you bind a string value to a key. The value wil=
l be available in the
+ templates via $<key>. The following example will assign the =
string value
+ "true"
+ to the variable $descriptors.
=
]]>
=
Most times using
- <property> is enough for specifying
- the properties needed for the exporters. Still the ant tools suppo=
rts the notion of
-
- <propertyset>. The functionality of
-
- <propertyset> is explained in detail in the Ant task
- manual.
+
+ <property>
+
+ is enough for specifying the properties needed for the=
exporters. Still the ant
+ tools supports the notion of
+
+ <propertyset>
+
+ . The functionality of
+
+ <propertyset>
+
+ is explained in detail in the Ant task manual.
=
Getting access to user specific classes
=
- If the templates need to access some user class it is possible=
by specifying a
-
- "toolclass" in the pro=
perties.
+ If the templates need to access some user class it is possible=
by specifying a
+ "toolclass"
+ in the properties.
=
]]>
=
Placing the above
- <property> tag in
-
- <hibernatetool> or inside any exporter will automatically
- create an instance of x.y.z.NameOfToolClass and=
it will be available in
- the templates as $sometool. This is useful to d=
elegate logic and code
- generation to java code instead of placing such logic in the templ=
ates.
+
+ <property>
+
+ tag in
+
+ <hibernatetool>
+
+ or inside any exporter will automatically create an in=
stance of
+ x.y.z.NameOfToolClass and it will be availabl=
e in the templates as
+ $sometool. This is useful to delegate logic a=
nd code generation to java
+ code instead of placing such logic in the templates.
=
Example
=
Here is an example that uses
- <hbmtemplate> together with
-
- <property> which will be=
available to the templates/exporter.
- This
- example actually simulates what <hbm2java> actually does.<=
/para>
-
+ <hbmtemplate>
+ together with
+ <property>
+ which will be available to the templates/exporter. <=
/para>
+
+ This example actually simulates what <hbm2java> act=
ually does.
+
=
--===============0172345248342365471==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ochikvina
Date: 2008-01-04 12:46:57 -0500 (Fri, 04 Jan 2008)
New Revision: 5521
Modified:
trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml
trunk/hibernatetools/docs/reference/en/modules/setup.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-236 - adding highlighting
Modified: trunk/hibernatetools/docs/reference/en/modules/codegenarchitectur=
e.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml =
2008-01-04 17:45:51 UTC (rev 5520)
+++ trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml =
2008-01-04 17:46:57 UTC (rev 5521)
@@ -21,9 +21,7 @@
- A
- Core configuration
- uses Hibernate Core and supports reading
+ A Core configuration uses Hibernate Core and supports read=
ing hbm.xml files, requires a hibernate.cfg.xml
@@ -33,9 +31,7 @@
=
- An
- Annotation configuration
- uses Hibernate Annotations and supports
+ An Annotation configuration uses Hibernate Annotations and=
supports hbm.xml and annotated classes, requires a hibernate.cfg.xml
@@ -45,9 +41,7 @@
=
- A
- JPA configuration
- uses a Hibernate EntityManager and supports
+ A JPA configuration uses a Hibernate EntityManager and sup=
ports hbm.xml and annotated classes requires that the project ha=
s a META-INF/persistence.xml
@@ -57,9 +51,7 @@
=
- A
- JDBC configuration
- uses Hibernate Tools reverse =
engineering and reads its
+ A JDBC configuration uses Hibernate Tools reverse engineering and reads its
mappings via JDBC metadata + additional reverse engineering fi=
les (reveng.xml).
Automatically used in Eclipse when doing reverse engineering f=
rom JDBC and named
Modified: trunk/hibernatetools/docs/reference/en/modules/setup.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/setup.xml 2008-01-04 17:=
45:51 UTC (rev 5520)
+++ trunk/hibernatetools/docs/reference/en/modules/setup.xml 2008-01-04 17:=
46:57 UTC (rev 5521)
@@ -69,11 +69,7 @@
hibernate-tools.jar and associated libraries. The libraries are included in =
the distribution from the
Hibernate website and the Eclipse updatesite. The libraries are loca=
ted in the eclipse plugins
- directory at
-
- /plugins/org.hibernate.eclipse.x.x.x/lib/tools/.
-
- These libraries are 100% independent from the eclipse pla=
tform. How to use these
- via ant tasks are described in the Ant chapter.
+ directory at /plugins/org.hibernate.eclipse.x.x.x/lib/tools/. These=
libraries are 100% independent from the eclipse platform. How to use these
+ via ant tasks are described in the Ant Tools=
link> chapter.
--===============0172345248342365471==--
From jbosstools-commits at lists.jboss.org Fri Jan 4 14:09:04 2008
Content-Type: multipart/mixed; boundary="===============5401954917957630987=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5522 - trunk/jsf/tests.
Date: Fri, 04 Jan 2008 14:09:03 -0500
Message-ID:
--===============5401954917957630987==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dsakovich
Date: 2008-01-04 14:09:03 -0500 (Fri, 04 Jan 2008)
New Revision: 5522
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/
Log:
http://jira.jboss.com/jira/browse/JBIDE-1504
--===============5401954917957630987==--
From jbosstools-commits at lists.jboss.org Fri Jan 4 14:10:16 2008
Content-Type: multipart/mixed; boundary="===============8838659892701238234=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5523 - in
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test: META-INF and 9 other
directories.
Date: Fri, 04 Jan 2008 14:10:15 -0500
Message-ID:
--===============8838659892701238234==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dsakovich
Date: 2008-01-04 14:10:15 -0500 (Fri, 04 Jan 2008)
New Revision: 5523
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/.project
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST.=
MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/build.properties
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelets=
test.jar
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tool=
s/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tool=
s/jsf/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tool=
s/jsf/vpe/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tool=
s/jsf/vpe/facelets/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tool=
s/jsf/vpe/facelets/test/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tool=
s/jsf/vpe/facelets/test/FaceletsAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tool=
s/jsf/vpe/facelets/test/FaceletsComponentTest.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tool=
s/jsf/vpe/facelets/test/FaceletsTestPlugin.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tool=
s/jsf/vpe/facelets/test/ImportFaceletsComponents.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1504
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/.classpath
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/.classpath =
(rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/.classpath 2008-0=
1-04 19:10:15 UTC (rev 5523)
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/.project
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/.project =
(rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/.project 2008-01-=
04 19:10:15 UTC (rev 5523)
@@ -0,0 +1,28 @@
+
+
+ org.jboss.tools.jsf.vpe.facelets.test
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIF=
EST.MF
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST=
.MF (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST=
.MF 2008-01-04 19:10:15 UTC (rev 5523)
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test Plug-in
+Bundle-SymbolicName: org.jboss.tools.jsf.vpe.facelets.test
+Bundle-Version: 1.0.0
+Bundle-Activator: org.jboss.tools.jsf.vpe.facelets.test.FaceletsTestPlugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.jboss.tools.vpe,
+ org.junit,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.jboss.tools.common
+Eclipse-LazyStart: true
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/build.properti=
es
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/build.properties =
(rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/build.properties =
2008-01-04 19:10:15 UTC (rev 5523)
@@ -0,0 +1,4 @@
+source.. =3D src/
+output.. =3D bin/
+bin.includes =3D META-INF/,\
+ .
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/face=
letstest.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/=
resources/faceletstest.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/=
tools/jsf/vpe/facelets/test/FaceletsAllTests.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsAllTests.java (rev=
0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsAllTests.java 2008-01-04 19:10:15 UTC (rev=
5523)
@@ -0,0 +1,19 @@
+package org.jboss.tools.jsf.vpe.facelets.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class FaceletsAllTests {
+
+ public static Test suite() {
+
+ TestSuite suite =3D new TestSuite("Tests for Vpe Facelets components"); /=
/ $NON-NLS-1$
+ // $JUnit-BEGIN$
+
+ suite.addTestSuite(FaceletsComponentTest.class);
+
+ // $JUnit-END$
+ return suite;
+
+ }
+}
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/=
tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsComponentTest.java =
(rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-04 19:10:15 UTC=
(rev 5523)
@@ -0,0 +1,172 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
+package org.jboss.tools.jsf.vpe.facelets.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.ILogListener;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+
+/**
+ * Class for testing all Seam components
+ * =
+ * @author dsakovich(a)exadel.com
+ * =
+ */
+public class FaceletsComponentTest extends TestCase implements ILogListene=
r {
+
+ private final static String EDITOR_ID =3D "org.jboss.tools.jst.jsp.jsp=
editor.JSPTextEditor"; // $NON-NLS-1$
+ private final static String TEST_PROJECT_JAR_PATH =3D "/faceletstest.j=
ar"; // $NON-NLS-1$
+
+ // check warning log
+ private final static boolean checkWarning =3D false;
+ private Throwable exception;
+
+ public FaceletsComponentTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Perform pre-test initialization.
+ * =
+ * @throws Exception
+ * =
+ * @see TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ // TODO: Use TestSetup to create and remove project once for all tests
+ // not for every one
+ if (ResourcesPlugin.getWorkspace().getRoot().findMember("faceletsTest") =
=3D=3D null) {
+
+ ImportFaceletsComponents.importFaceletsPages(FaceletsTestPlugin
+ .getPluginResourcePath()
+ + TEST_PROJECT_JAR_PATH);
+
+ waitForJobs();
+ delay(5000);
+ }
+ Platform.addLogListener(this);
+ }
+
+ /**
+ * Perform post-test cleanup.
+ * =
+ * @throws Exception
+ * =
+ * @see TestCase#tearDown()
+ */
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ if (ResourcesPlugin.getWorkspace().getRoot().findMember("faceletsTest") !=
=3D null) {
+ ImportFaceletsComponents.removeProject();
+ }
+ Platform.removeLogListener(this);
+ }
+
+ /**
+ * Process UI input but do not return for the specified time interval.
+ * =
+ * @param waitTimeMillis
+ * the number of milliseconds
+ */
+ private void delay(long waitTimeMillis) {
+ Display display =3D Display.getCurrent();
+ if (display !=3D null) {
+ long endTimeMillis =3D System.currentTimeMillis() + waitTimeMillis;
+ while (System.currentTimeMillis() < endTimeMillis) {
+ if (!display.readAndDispatch())
+ display.sleep();
+ }
+ display.update();
+ }
+ // Otherwise, perform a simple sleep.
+ else {
+ try {
+ Thread.sleep(waitTimeMillis);
+ } catch (InterruptedException e) {
+ // Ignored.
+ }
+ }
+ }
+
+ /**
+ * Wait until all background tasks are complete.
+ */
+ public void waitForJobs() {
+ while (Job.getJobManager().currentJob() !=3D null)
+ delay(5000);
+ }
+
+ public void testInsert() throws PartInitException, Throwable {
+ performTestForFaceletComponent("insert.xhtml"); // $NON-NLS-1$
+ }
+
+ public void testDefine() throws PartInitException, Throwable {
+ performTestForFaceletComponent("define.xhtml"); // $NON-NLS-1$
+ }
+
+ public void testComposite() throws PartInitException, Throwable {
+ performTestForFaceletComponent("composition.xhtml"); // $NON-NLS-1$
+ }
+
+ private void performTestForFaceletComponent(String componentPage)
+ throws PartInitException, Throwable {
+ waitForJobs();
+
+ exception =3D null;
+ IPath componentPath =3D ImportFaceletsComponents
+ .getComponentPath(componentPage);
+
+ IFile file =3D ResourcesPlugin.getWorkspace().getRoot().getFile(
+ componentPath);
+ IEditorInput input =3D new FileEditorInput(file);
+
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .openEditor(input, EDITOR_ID, true);
+
+ waitForJobs();
+ delay(5000);
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .closeAllEditors(true);
+
+ if (exception !=3D null) {
+ throw exception;
+ }
+ }
+
+ public void logging(IStatus status, String plugin) {
+ switch (status.getSeverity()) {
+ case IStatus.ERROR:
+ exception =3D status.getException();
+ break;
+ case IStatus.WARNING:
+ if (checkWarning)
+ exception =3D status.getException();
+ break;
+ default:
+ break;
+ }
+
+ }
+
+}
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/=
tools/jsf/vpe/facelets/test/FaceletsTestPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsTestPlugin.java (r=
ev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsTestPlugin.java 2008-01-04 19:10:15 UTC (r=
ev 5523)
@@ -0,0 +1,74 @@
+package org.jboss.tools.jsf.vpe.facelets.test;
+
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.common.log.BaseUIPlugin;
+import org.jboss.tools.common.log.IPluginLog;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class FaceletsTestPlugin extends BaseUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID =3D "org.jboss.tools.jsf.vpe.face=
lets.test";
+
+ // The shared instance
+ private static FaceletsTestPlugin plugin;
+
+ /**
+ * The constructor
+ */
+ public FaceletsTestPlugin() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * =
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framewor=
k.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin =3D this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * =
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework=
.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin =3D null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ * =
+ * @return the shared instance
+ */
+ public static FaceletsTestPlugin getDefault() {
+ return plugin;
+ }
+
+ public static IPluginLog getPluginLog() {
+ return getDefault();
+ }
+
+ public static String getPluginResourcePath() {
+ Bundle bundle =3D Platform.getBundle(PLUGIN_ID);
+ URL url =3D null;
+ try {
+ url =3D bundle =3D=3D null ? null : FileLocator.resolve(bundle
+ .getEntry("/resources")); // $NON-NLS-1$
+ } catch (Exception e) {
+ url =3D bundle.getEntry("/resources"); // $NON-NLS-1$
+ }
+ return (url =3D=3D null) ? null : url.getPath();
+ }
+
+}
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/=
tools/jsf/vpe/facelets/test/ImportFaceletsComponents.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/ImportFaceletsComponents.java =
(rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/ImportFaceletsComponents.java 2008-01-04 19:10:15 =
UTC (rev 5523)
@@ -0,0 +1,92 @@
+package org.jboss.tools.jsf.vpe.facelets.test;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.zip.ZipFile;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.IOverwriteQuery;
+import org.eclipse.ui.internal.wizards.datatransfer.ZipLeveledStructurePro=
vider;
+import org.eclipse.ui.wizards.datatransfer.ImportOperation;
+
+/**
+ * Class for importing project from jar file
+ * =
+ * @author dsakovich(a)exadel.com
+ * =
+ */
+public class ImportFaceletsComponents {
+ private static final String PROJECT_NAME =3D "faceletsTest"; // $NON-N=
LS-1$
+ private static final String COMPONENTS_PATH =3D "WebContent/pages"; //=
$NON-NLS-1$
+
+ @SuppressWarnings("restriction")
+ static void importFaceletsPages(String path) {
+ IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject(
+ PROJECT_NAME);
+ ZipLeveledStructureProvider zipStructureProvider;
+ try {
+ zipStructureProvider =3D new ZipLeveledStructureProvider(new ZipFile(
+ path));
+
+ IOverwriteQuery overwrite =3D new IOverwriteQuery() {
+ public String queryOverwrite(String pathString) {
+ return ALL;
+ }
+ };
+
+ ImportOperation importOp =3D new ImportOperation(project
+ .getFullPath(), zipStructureProvider.getRoot(),
+ zipStructureProvider, overwrite);
+
+ importOp.setContext(PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getShell());
+
+ importOp.run(new NullProgressMonitor());
+ } catch (InvocationTargetException ite) {
+ FaceletsTestPlugin.getPluginLog().logError(ite.getCause());
+ } catch (InterruptedException ie) {
+ FaceletsTestPlugin.getPluginLog().logError(ie);
+ } catch (IOException e) {
+ FaceletsTestPlugin.getPluginLog().logError(e);
+ }
+ }
+
+ /**
+ * =
+ * @return
+ * @throws CoreException
+ */
+ static IPath getComponentPath(String componentPage) throws CoreExcepti=
on {
+ IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject(
+ PROJECT_NAME);
+ if (project !=3D null) {
+ IResource resource =3D project.getFolder(COMPONENTS_PATH).findMember(
+ componentPage);
+ if (resource !=3D null) {
+ return resource.getFullPath();
+ }
+
+ }
+
+ return null;
+ }
+
+ /**
+ * =
+ * @throws CoreException
+ */
+ static void removeProject() throws CoreException {
+ IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject(
+ PROJECT_NAME);
+ if (project !=3D null) {
+ project.delete(IResource.ALWAYS_DELETE_PROJECT_CONTENT,
+ new NullProgressMonitor());
+ }
+ }
+}
--===============8838659892701238234==--
From jbosstools-commits at lists.jboss.org Mon Jan 7 13:15:45 2008
Content-Type: multipart/mixed; boundary="===============3895758834739464720=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5524 -
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages.
Date: Mon, 07 Jan 2008 13:15:45 -0500
Message-ID:
--===============3895758834739464720==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-07 13:15:45 -0500 (Mon, 07 Jan 2008)
New Revision: 5524
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclip=
se/as/ui/preferencepages/ViewPreferencePage.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1483
Check for null value added
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/id=
e/eclipse/as/ui/preferencepages/ViewPreferencePage.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/ecli=
pse/as/ui/preferencepages/ViewPreferencePage.java 2008-01-04 19:10:15 UTC (=
rev 5523)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/ecli=
pse/as/ui/preferencepages/ViewPreferencePage.java 2008-01-07 18:15:45 UTC (=
rev 5524)
@@ -117,8 +117,10 @@
retval =3D retval && comp.performOk();
}
=
- // refresh the viewer
- JBossServerView.getDefault().refreshAll();
+ // refresh the viewer if it is opened
+ if (JBossServerView.getDefault() !=3D null) {
+ JBossServerView.getDefault().refreshAll();
+ }
=
return retval;
}
--===============3895758834739464720==--
From jbosstools-commits at lists.jboss.org Tue Jan 8 09:51:09 2008
Content-Type: multipart/mixed; boundary="===============5677393823333679620=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5525 -
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/popup.
Date: Tue, 08 Jan 2008 09:51:09 -0500
Message-ID:
--===============5677393823333679620==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: vyemialyanchyk
Date: 2008-01-08 09:51:09 -0500 (Tue, 08 Jan 2008)
New Revision: 5525
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/or=
g/jboss/tools/hibernate/ui/veditor/editors/popup/PopupMenuProvider.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1560
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor=
/src/org/jboss/tools/hibernate/ui/veditor/editors/popup/PopupMenuProvider.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/o=
rg/jboss/tools/hibernate/ui/veditor/editors/popup/PopupMenuProvider.java 20=
08-01-07 18:15:45 UTC (rev 5524)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/o=
rg/jboss/tools/hibernate/ui/veditor/editors/popup/PopupMenuProvider.java 20=
08-01-08 14:51:09 UTC (rev 5525)
@@ -1,3 +1,13 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
package org.jboss.tools.hibernate.ui.veditor.editors.popup;
=
import org.eclipse.gef.ContextMenuProvider;
@@ -44,19 +54,22 @@
if (getViewer().getSelection() instanceof StructuredSelection){
IStructuredSelection selection =3D (IStructuredSelection) getViewer().g=
etSelection();
if (selection !=3D null && selection.getFirstElement() instanceof OrmE=
ditPart) {
- Shape shape =3D (Shape)((OrmEditPart)selection.getFirstElement()).getM=
odel();
- Object first =3D shape.getOrmElement();
- if (first instanceof PersistentClass
- || first instanceof Property
- || first instanceof Table
- || first instanceof Column){ =
- action =3D getActionRegistry().getAction(OpenSourceAction.ACTION_ID);
- appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
- createMenuItem(getMenu(), action);
- =
- action =3D getActionRegistry().getAction(OpenMappingAction.ACTION_ID);
- appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
- createMenuItem(getMenu(), action); =
+ Object obj =3D ((OrmEditPart)selection.getFirstElement()).getModel();
+ if (null !=3D obj && obj instanceof Shape) {
+ Shape shape =3D (Shape)obj;
+ Object first =3D shape.getOrmElement();
+ if (first instanceof PersistentClass
+ || first instanceof Property
+ || first instanceof Table
+ || first instanceof Column){ =
+ action =3D getActionRegistry().getAction(OpenSourceAction.ACTION_ID);
+ appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
+ createMenuItem(getMenu(), action);
+ =
+ action =3D getActionRegistry().getAction(OpenMappingAction.ACTION_ID=
);
+ appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
+ createMenuItem(getMenu(), action); =
+ } =
} =
} =
}
--===============5677393823333679620==--
From jbosstools-commits at lists.jboss.org Tue Jan 8 11:17:00 2008
Content-Type: multipart/mixed; boundary="===============8297380560152063917=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5526 -
trunk/hibernatetools/docs/reference/en/modules.
Date: Tue, 08 Jan 2008 11:13:00 -0500
Message-ID:
--===============8297380560152063917==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ochikvina
Date: 2008-01-08 11:12:59 -0500 (Tue, 08 Jan 2008)
New Revision: 5526
Modified:
trunk/hibernatetools/docs/reference/en/modules/ant.xml
trunk/hibernatetools/docs/reference/en/modules/codegen.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-173 - highlighting meeningful words
Modified: trunk/hibernatetools/docs/reference/en/modules/ant.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/ant.xml 2008-01-08 14:51=
:09 UTC (rev 5525)
+++ trunk/hibernatetools/docs/reference/en/modules/ant.xml 2008-01-08 16:12=
:59 UTC (rev 5526)
@@ -9,20 +9,19 @@
hibernate-tools.jar
contains the core for the Hibernate Tools. It is used as the
basis for both the Ant tasks described in this document and the ecli=
pse plugins both available
- from tools.hibernate.org The
+ from tools.hibernate.org. The hibernate-tools.jar
- is located in your eclipse plugins directory at
- /plugins/org.hibernate.eclipse.x.x.x/lib/tools/hibernate=
-tools.jar
- .
+ is located in your eclipse plugins directory at
+ /plugins/org.hibernate.eclipse.x.x.x/lib/tools/hibernate-tools.jar.<=
/para>
This jar is 100% independent from the eclipse platform and can t=
hus be used independently
of eclipse.
=
There might be incapabilities with respect to the Hibernate3.j=
ar bundled with the tools
and your own jar. Thus to avoid any confusion it is recommended to=
use the hibernate3.jar
- & hibernate-annotations.jar bundled with the tools when you wa=
nt to use the Ant
- tasks. Do not worry about using e.g. Hibernate 3.2 jar's with e.g.=
a Hibernate 3.1 project
- since the output generated will work with previous Hibernate 3 ver=
sions.
+ and hibernate-annotations.jar bundled with the tools when you want=
to use the Ant tasks. Do
+ not worry about using e.g. Hibernate 3.2 jar's with e.g. a Hiberna=
te 3.1 project since the
+ output generated will work with previous Hibernate 3 versions.
=
@@ -106,8 +105,8 @@
=
- classpath (optional): A classpath to =
be used to resolve
- resources, such as mappings and usertypes. Optional, but ver=
y often required.
+ classpath (optional): A classpath to be used to resolve =
resources, such as
+ mappings and usertypes. Optional, but very often required.=
para>
=
@@ -131,8 +130,9 @@
Basic examples
=
- The following example shows the most basic setup for generatin=
g pojo's via
- hbm2java from a normal
+ The following example shows the most basic setup for generatin=
g pojo's via
+ <hbm2java>
+ from a normal hibernate.cfg.xml
@@ -148,7 +148,9 @@
=
The following example is similar, but now we are performing mu=
ltiple exports from the
- same configuration. We are exporting the schema via hbm2dll, gener=
ates some DAO code via
+ same configuration. We are exporting the schema via
+ <hbm2dll>
+ , generates some DAO code via <hbm2dao> and finally runs a custom code generation via <hbmtemplate>
@@ -197,11 +199,10 @@
=
Each have in common that they are able to build up a Hibernate
Configuration object from which a set of exporter=
s can be run to generate
- various output. =
- =
- Output can be anything, e.g. specific files, statements executi=
on
- against a database, error reporting or anything else that can be don=
e in java code.
-
+ various output.
+ Output can be anything, e.g. specific files, statements exec=
ution against a database,
+ error reporting or anything else that can be done in java code.<=
/para>
+
=
The following section describes what the various configuration c=
an do, plus list the
@@ -353,13 +354,17 @@
persistence.xml packaged in a JPA compliant manner.
=
- <jpaconfiguration> will simply just t=
ry and
- auto-configure it self based on the available classpath, e.g. look=
for
+ The
+ <jpaconfiguration>
+ will simply just try and auto-configure it self based =
on the available
+ classpath, e.g. look for META-INF/persistence.xml.
=
- The persistenceunit attribute can be used t=
o select a specific
- persistence unit. If no persistenceunit is specified it will autom=
atically search for one
+ The
+ persistenceunit attribute can be u=
sed to select a specific
+ persistence unit. If no
+ persistenceunit is specified it =
will automatically search for one
and if an unique one is found use it, but if multiple persistence =
units are available it
will error.
=
@@ -493,7 +498,8 @@
<jdbcconfiguration> to generate Hibernate xml mappings via
- <hbm2hbmxml>. The connection settings i=
s here read from a
+
+ <hbm2hbmxml>. The connec=
tion settings is here read from a hibernate.properties
@@ -712,7 +718,7 @@
.
=
- Not all conversions is implemented (contributions welcome)=
, so some hand editing
+ Not all conversions are implemented (contributions welcome=
), so some hand editing
might be necessary.
=
@@ -811,6 +817,7 @@
.
=
+ Tip: Currently the dump is simply a call to toString on each e=
lement.
=
Modified: trunk/hibernatetools/docs/reference/en/modules/codegen.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/codegen.xml 2008-01-08 1=
4:51:09 UTC (rev 5525)
+++ trunk/hibernatetools/docs/reference/en/modules/codegen.xml 2008-01-08 1=
6:12:59 UTC (rev 5526)
@@ -21,7 +21,8 @@
=
You can use the <meta> tag to e.g. tell
- hbm2java to only generate
+
+ <hbm2java> to only generate =
"protected" setters, have
classes always implement a certain set of interfaces or even have them
extend a certain base class and even more.
--===============8297380560152063917==--
From jbosstools-commits at lists.jboss.org Tue Jan 8 13:54:40 2008
Content-Type: multipart/mixed; boundary="===============0891839782012468068=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5527 - trunk/jsf/tests.
Date: Tue, 08 Jan 2008 13:54:40 -0500
Message-ID:
--===============0891839782012468068==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: mareshkau
Date: 2008-01-08 13:54:40 -0500 (Tue, 08 Jan 2008)
New Revision: 5527
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/
Log:
Was created base junit plugin in which contains functionality to import pro=
ject for testing and base class.
--===============0891839782012468068==--
From jbosstools-commits at lists.jboss.org Tue Jan 8 13:55:16 2008
Content-Type: multipart/mixed; boundary="===============3643662938918130238=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5528 - in
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test: META-INF and 7 other
directories.
Date: Tue, 08 Jan 2008 13:55:16 -0500
Message-ID:
--===============3643662938918130238==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: mareshkau
Date: 2008-01-08 13:55:16 -0500 (Tue, 08 Jan 2008)
New Revision: 5528
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/.project
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/META-INF/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/build.properties
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/=
ui/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/=
ui/test/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/=
ui/test/ImportProvider.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/=
ui/test/TestUtil.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/=
ui/test/VPETestPlugin.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/=
ui/test/VpeTest.java
Log:
Was created base junit plugin in which contains functionality to import pro=
ject for testing and base class.
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/.classpath
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/.classpath =
(rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/.classpath 2008-01-08 1=
8:55:16 UTC (rev 5528)
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/.project
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/.project =
(rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/.project 2008-01-08 18:=
55:16 UTC (rev 5528)
@@ -0,0 +1,28 @@
+
+
+ org.jboss.tools.jsf.vpe.ui.test
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/META-INF/MANIFEST.MF
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/META-INF/MANIFEST.MF =
(rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/META-INF/MANIFEST.MF 20=
08-01-08 18:55:16 UTC (rev 5528)
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Visual Editor Test Plugin
+Bundle-SymbolicName: org.jboss.tools.jsf.vpe.ui.test
+Bundle-Version: 1.0.0
+Bundle-Activator: org.jboss.tools.vpe.ui.test.VPETestPlugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.jboss.tools.vpe,
+ org.junit,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.jboss.tools.common,
+ org.jboss.tools.jst.jsp,
+ org.jboss.tools.common.text.ext,
+ org.jboss.tools.common.model,
+ org.jboss.tools.vpe.xulrunner,
+ org.mozilla.xpcom
+Eclipse-LazyStart: true
+Bundle-ClassPath: .
+Export-Package: org.jboss.tools.vpe.ui.test
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/build.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/build.properties =
(rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/build.properties 2008-0=
1-08 18:55:16 UTC (rev 5528)
@@ -0,0 +1,4 @@
+source.. =3D src/
+output.. =3D bin/
+bin.includes =3D META-INF/,\
+ .
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/=
vpe/ui/test/ImportProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/ImportProvider.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/ImportProvider.java 2008-01-08 18:55:16 UTC (rev 5528)
@@ -0,0 +1,107 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
+package org.jboss.tools.vpe.ui.test;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
+import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
+
+/**
+ * @author sdzmitrovich
+ * =
+ */
+public class ImportProvider implements IImportStructureProvider {
+
+ /**
+ * list of files which will not be imported
+ */
+ List unimportedFiles =3D new ArrayList();
+
+ /**
+ * Creates an instance of ImportProvider.
+ */
+ public ImportProvider() {
+ super();
+ }
+
+ /*
+ * (non-Javadoc) Method declared on IImportStructureProvider
+ */
+ public List getChildren(Object element) {
+ File folder =3D (File) element;
+ String[] children =3D folder.list();
+ int childrenLength =3D children =3D=3D null ? 0 : children.length;
+ List result =3D new ArrayList(childrenLength);
+
+ for (int i =3D 0; i < childrenLength; i++) {
+ if (!unimportedFiles.contains(children[i]))
+ result.add(new File(folder, children[i]));
+ }
+
+ return result;
+ }
+
+ /*
+ * (non-Javadoc) Method declared on IImportStructureProvider
+ */
+ public InputStream getContents(Object element) {
+ try {
+ return new FileInputStream((File) element);
+ } catch (FileNotFoundException e) {
+ IDEWorkbenchPlugin.log(e.getLocalizedMessage(), e);
+ return null;
+ }
+ }
+
+ /*
+ * (non-Javadoc) Method declared on IImportStructureProvider
+ */
+ public String getFullPath(Object element) {
+ return ((File) element).getPath();
+ }
+
+ /*
+ * (non-Javadoc) Method declared on IImportStructureProvider
+ */
+ public String getLabel(Object element) {
+
+ // Get the name - if it is empty then return the path as it is a file
+ // root
+ File file =3D (File) element;
+ String name =3D file.getName();
+ if (name.length() =3D=3D 0) {
+ return file.getPath();
+ }
+ return name;
+ }
+
+ /*
+ * (non-Javadoc) Method declared on IImportStructureProvider
+ */
+ public boolean isFolder(Object element) {
+ return ((File) element).isDirectory();
+ }
+
+ public List getUnimportedFiles() {
+ return unimportedFiles;
+ }
+
+ public void setUnimportedFiles(List unimportedFiles) {
+ this.unimportedFiles =3D unimportedFiles;
+ }
+
+}
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/=
vpe/ui/test/TestUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/TestUtil.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/TestUtil.java 2008-01-08 18:55:16 UTC (rev 5528)
@@ -0,0 +1,145 @@
+/*************************************************************************=
****** =
+ * Copyright (c) 2007 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.vpe.ui.test;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.IOverwriteQuery;
+import org.eclipse.ui.wizards.datatransfer.ImportOperation;
+
+/**
+ * Class for importing project from jar file
+ * =
+ * @author sdzmitrovich
+ * =
+ */
+public class TestUtil {
+ =
+ private static final String COMPONENTS_PATH =3D "WebContent/pages"; // $N=
ON-NLS-1$
+
+ @SuppressWarnings("restriction")
+ static void importProjectIntoWorkspace(String path,String projectName) {
+
+ IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject(
+ projectName);
+
+ try {
+
+ IOverwriteQuery overwrite =3D new IOverwriteQuery() {
+ public String queryOverwrite(String pathString) {
+ return ALL;
+ }
+ };
+
+ ImportProvider importProvider =3D new ImportProvider();
+
+ // need to remove from imported project "svn" files
+ List unimportedFiles =3D new ArrayList();
+ unimportedFiles.add(".svn");
+
+ importProvider.setUnimportedFiles(unimportedFiles);
+
+ // create import operation
+ ImportOperation importOp =3D new ImportOperation(project
+ .getFullPath(), new File(path), importProvider, overwrite);
+
+ // import files just to project folder ( without old structure )
+ importOp.setCreateContainerStructure(false);
+
+ importOp.setContext(PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getShell());
+
+ // run import
+ importOp.run(new NullProgressMonitor());
+
+ } catch (InvocationTargetException ite) {
+ VPETestPlugin.getDefault().logError(ite.getCause());
+ } catch (InterruptedException ie) {
+ VPETestPlugin.getDefault().logError(ie);
+ }
+ }
+
+ /**
+ * =
+ * @return
+ * @throws CoreException
+ */
+ public static IResource getComponentPath(String componentPage,String proj=
ectName)
+ throws CoreException {
+ IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject(
+ projectName);
+ if (project !=3D null) {
+ return project.getFolder(COMPONENTS_PATH).findMember(componentPage);
+
+ }
+
+ return null;
+ }
+
+ /**
+ * =
+ * @throws CoreException
+ */
+ static void removeProject(String projectName) throws CoreException {
+ IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject(
+ projectName);
+ if (project !=3D null) {
+ project.delete(IResource.ALWAYS_DELETE_PROJECT_CONTENT,
+ new NullProgressMonitor());
+ }
+ }
+
+ /**
+ * Process UI input but do not return for the specified time interval.
+ * =
+ * @param waitTimeMillis
+ * the number of milliseconds
+ */
+ public static void delay(long waitTimeMillis) {
+ Display display =3D Display.getCurrent();
+ if (display !=3D null) {
+ long endTimeMillis =3D System.currentTimeMillis() + waitTimeMillis;
+ while (System.currentTimeMillis() < endTimeMillis) {
+ if (!display.readAndDispatch())
+ display.sleep();
+ }
+ display.update();
+ }
+ // Otherwise, perform a simple sleep.
+ else {
+ try {
+ Thread.sleep(waitTimeMillis);
+ } catch (InterruptedException e) {
+ // Ignored.
+ }
+ }
+ }
+
+ /**
+ * Wait until all background tasks are complete.
+ */
+ public static void waitForJobs() {
+ while (Job.getJobManager().currentJob() !=3D null)
+ delay(100);
+ }
+
+}
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/=
vpe/ui/test/VPETestPlugin.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/VPETestPlugin.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/VPETestPlugin.java 2008-01-08 18:55:16 UTC (rev 5528)
@@ -0,0 +1,60 @@
+/*************************************************************************=
****** =
+* Copyright (c) 2007 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.vpe.ui.test;
+
+import org.jboss.tools.common.log.BaseUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class VPETestPlugin extends BaseUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID =3D "org.jboss.tools.vpe.ui.test";
+
+ // The shared instance
+ private static VPETestPlugin plugin;
+ =
+ /**
+ * The constructor
+ */
+ public VPETestPlugin() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleC=
ontext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin =3D this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleCon=
text)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin =3D null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static VPETestPlugin getDefault() {
+ return plugin;
+ }
+
+}
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/=
vpe/ui/test/VpeTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/VpeTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/VpeTest.java 2008-01-08 18:55:16 UTC (rev 5528)
@@ -0,0 +1,259 @@
+/*************************************************************************=
****** =
+* Copyright (c) 2007 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.vpe.ui.test;
+
+
+import java.io.File;
+
+import junit.framework.TestCase;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.ILogListener;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.editor.VpeEditorPart;
+import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
+import org.mozilla.interfaces.nsIDOMDocument;
+
+/**
+ * @author Max Areshkau
+ * =
+ * Base Class for VPE tests
+ */
+public class VpeTest extends TestCase implements ILogListener {
+
+ /**
+ * Editor in which we open visual page
+ */
+ private final static String EDITOR_ID =3D "org.jboss.tools.jst.jsp.jspedi=
tor.JSPTextEditor";
+ =
+ /**
+ * Collects exceptions
+ */
+ private Throwable exception;
+ =
+ // check warning log
+ private Boolean checkWarning;
+ =
+ /**
+ * Contains project name with information for testing
+ */
+ private String importProjectName;
+ =
+ /**
+ * Contains plugin resource path
+ */
+ private String pluginResourcePath;
+ /**
+ * =
+ * @param name
+ * @param importProjectName
+ */
+ =
+ public VpeTest(String name, String importProjectName,String pluginResourc=
ePath) {
+ super(name);
+ setImportProjectName(importProjectName);
+ setPluginResourcePath(pluginResourcePath);
+ }
+ /**
+ * Perform pre-test initialization.
+ * =
+ * @throws Exception
+ * =
+ * @see TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+
+ super.setUp();
+ closeEditors();
+ if (ResourcesPlugin.getWorkspace().getRoot().findMember(getImportProject=
Name()) =3D=3D null) {
+ closeEditors();
+ TestUtil.importProjectIntoWorkspace((getPluginResourcePath()
+ + File.separator+getImportProjectName()),getImportProjectName());
+ }
+ Platform.addLogListener(this);
+ closeEditors();
+ }
+ /**
+ * Perform post-test cleanup.
+ * =
+ * @throws Exception
+ * =
+ * @see TestCase#tearDown()
+ */
+ protected void tearDown() throws Exception {
+
+ super.tearDown();
+ TestUtil.removeProject(getImportProjectName());
+ Platform.removeLogListener(this);
+ =
+ closeEditors();
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.ru=
ntime.IStatus, java.lang.String)
+ */
+ public void logging(IStatus status, String plugin) {
+ switch (status.getSeverity()) {
+ case IStatus.ERROR:
+ setException(status.getException());
+ break;
+ case IStatus.WARNING:
+ if (getCheckWarning())
+ setException(status.getException());
+ break;
+ default:
+ break;
+ }
+
+ }
+ /**
+ * close all opened editors
+ */
+ protected void closeEditors() {
+
+ // wait
+ TestUtil.waitForJobs();
+
+ // close
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .closeAllEditors(true);
+
+ }
+ /**
+ * get xulrunner source page
+ * =
+ * @param part -
+ * JSPMultiPageEditor
+ * @return nsIDOMDocument
+ */
+ protected nsIDOMDocument getVpeVisualDocument(JSPMultiPageEditor part) {
+
+ VpeEditorPart visualEditor =3D (VpeEditorPart) part.getVisualEditor();
+ VpeController vpeController =3D visualEditor.getController();
+
+ // get xulRunner editor
+ XulRunnerEditor xulRunnerEditor =3D vpeController.getXulRunnerEditor();
+
+ // get dom document
+ nsIDOMDocument document =3D xulRunnerEditor.getDOMDocument();
+
+ return document;
+ }
+ /**
+ * Perfoms test for some page
+ * =
+ * @param componentPage
+ * @throws PartInitException
+ * @throws Throwable
+ */
+ protected void performTestForJsfComponent(String componentPage)
+ throws PartInitException, Throwable {
+ TestUtil.waitForJobs();
+
+ setException(null);
+
+ IFile file =3D (IFile) TestUtil.getComponentPath(componentPage,getImport=
ProjectName());
+ IEditorInput input =3D new FileEditorInput(file);
+ =
+ TestUtil.waitForJobs();
+ =
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .openEditor(input, EDITOR_ID, true);
+
+ TestUtil.waitForJobs();
+ TestUtil.delay(3000);
+ =
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .closeAllEditors(true);
+
+ if (getException() !=3D null) {
+ throw getException();
+ }
+ } =
+ /**
+ * Open JSPMultiPageEditor editor
+ * =
+ * @param input
+ * @return
+ * @throws PartInitException
+ */
+ protected JSPMultiPageEditor openEditor(IEditorInput input)
+ throws PartInitException {
+
+ // get editor
+ JSPMultiPageEditor part =3D (JSPMultiPageEditor) PlatformUI
+ .getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .openEditor(input, EDITOR_ID, true);
+
+ // wait for jobs
+ TestUtil.waitForJobs();
+// // wait full initialization of vpe
+ TestUtil.delay(3000);
+
+ return part;
+
+ }
+ /**
+ * @return the exception
+ */
+ protected Throwable getException() {
+ return exception;
+ }
+ /**
+ * @param exception the exception to set
+ */
+ protected void setException(Throwable exception) {
+ this.exception =3D exception;
+ }
+ /**
+ * @return the checkWarning
+ */
+ protected Boolean getCheckWarning() {
+ return checkWarning;
+ }
+ /**
+ * @param checkWarning the checkWarning to set
+ */
+ protected void setCheckWarning(Boolean checkWarning) {
+ this.checkWarning =3D checkWarning;
+ }
+ /**
+ * @return the importProjectName
+ */
+ protected String getImportProjectName() {
+ return importProjectName;
+ }
+ /**
+ * @param importProjectName the importProjectName to set
+ */
+ protected void setImportProjectName(String importProjectName) {
+ this.importProjectName =3D importProjectName;
+ }
+ /**
+ * @return the pluginResourcePath
+ */
+ protected String getPluginResourcePath() {
+ return pluginResourcePath;
+ }
+ /**
+ * @param pluginResourcePath the pluginResourcePath to set
+ */
+ protected void setPluginResourcePath(String pluginResourcePath) {
+ this.pluginResourcePath =3D pluginResourcePath;
+ }
+
+}
--===============3643662938918130238==--
From jbosstools-commits at lists.jboss.org Tue Jan 8 13:59:01 2008
Content-Type: multipart/mixed; boundary="===============2396900393724226458=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5529 - in
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test:
resources/jsfTest/WebContent/pages/JBIDE and 1 other directories.
Date: Tue, 08 Jan 2008 13:59:01 -0500
Message-ID:
--===============2396900393724226458==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: mareshkau
Date: 2008-01-08 13:59:01 -0500 (Tue, 08 Jan 2008)
New Revision: 5529
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/JBIDE/JBIDE-1484.jsp
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/ImportProvider.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/TestJsfUtil.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfComponentTest.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfJbideTest.java
Log:
junit code adjustment
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFES=
T.MF
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2=
008-01-08 18:55:16 UTC (rev 5528)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2=
008-01-08 18:59:01 UTC (rev 5529)
@@ -15,6 +15,7 @@
org.jboss.tools.common.text.ext,
org.jboss.tools.common.model,
org.jboss.tools.vpe.xulrunner,
- org.mozilla.xpcom
+ org.mozilla.xpcom,
+ org.jboss.tools.jsf.vpe.ui.test;visibility:=3Dreexport
Eclipse-LazyStart: true
Bundle-ClassPath: jsf-test.jar
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W=
ebContent/pages/JBIDE/JBIDE-1484.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/JBIDE/JBIDE-1484.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/JBIDE/JBIDE-1484.jsp 2008-01-08 18:59:01 UTC (rev 5529)
@@ -0,0 +1,14 @@
+<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%>
+<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%>
+
+
+
+
+
+
+
+ =
+
+
+
+
\ No newline at end of file
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/too=
ls/jsf/vpe/jsf/test/ImportProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/ImportProvider.java 2008-01-08 18:55:16 UTC (rev 5528)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/ImportProvider.java 2008-01-08 18:59:01 UTC (rev 5529)
@@ -1,107 +0,0 @@
-/*************************************************************************=
******
- * Copyright (c) 2007 Exadel, Inc. and 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- *************************************************************************=
*****/
-package org.jboss.tools.jsf.vpe.jsf.test;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-
-/**
- * @author sdzmitrovich
- * =
- */
-public class ImportProvider implements IImportStructureProvider {
-
- /**
- * list of files which will not be imported
- */
- List unimportedFiles =3D new ArrayList();
-
- /**
- * Creates an instance of ImportProvider.
- */
- public ImportProvider() {
- super();
- }
-
- /*
- * (non-Javadoc) Method declared on IImportStructureProvider
- */
- public List getChildren(Object element) {
- File folder =3D (File) element;
- String[] children =3D folder.list();
- int childrenLength =3D children =3D=3D null ? 0 : children.length;
- List result =3D new ArrayList(childrenLength);
-
- for (int i =3D 0; i < childrenLength; i++) {
- if (!unimportedFiles.contains(children[i]))
- result.add(new File(folder, children[i]));
- }
-
- return result;
- }
-
- /*
- * (non-Javadoc) Method declared on IImportStructureProvider
- */
- public InputStream getContents(Object element) {
- try {
- return new FileInputStream((File) element);
- } catch (FileNotFoundException e) {
- IDEWorkbenchPlugin.log(e.getLocalizedMessage(), e);
- return null;
- }
- }
-
- /*
- * (non-Javadoc) Method declared on IImportStructureProvider
- */
- public String getFullPath(Object element) {
- return ((File) element).getPath();
- }
-
- /*
- * (non-Javadoc) Method declared on IImportStructureProvider
- */
- public String getLabel(Object element) {
-
- // Get the name - if it is empty then return the path as it is a file
- // root
- File file =3D (File) element;
- String name =3D file.getName();
- if (name.length() =3D=3D 0) {
- return file.getPath();
- }
- return name;
- }
-
- /*
- * (non-Javadoc) Method declared on IImportStructureProvider
- */
- public boolean isFolder(Object element) {
- return ((File) element).isDirectory();
- }
-
- public List getUnimportedFiles() {
- return unimportedFiles;
- }
-
- public void setUnimportedFiles(List unimportedFiles) {
- this.unimportedFiles =3D unimportedFiles;
- }
-
-}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfAllTests.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfAllTests.java 2008-01-08 18:55:16 UTC (rev 5528)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfAllTests.java 2008-01-08 18:59:01 UTC (rev 5529)
@@ -10,6 +10,8 @@
*************************************************************************=
*****/
package org.jboss.tools.jsf.vpe.jsf.test;
=
+import org.eclipse.core.runtime.CoreException;
+
import junit.framework.Test;
import junit.framework.TestSuite;
=
@@ -22,25 +24,13 @@
=
public class JsfAllTests {
=
- private final static String TEST_PROJECT_PATH =3D "/jsfTest";
-
- private static void prepareTests() {
-
- TestJsfUtil.importJsfPages(JsfTestPlugin.getPluginResourcePath()
- + TEST_PROJECT_PATH);
-
- }
-
public static Test suite() {
- // prepare tests
- prepareTests();
=
TestSuite suite =3D new TestSuite("Tests for Vpe Jsf components"); // $N=
ON-NLS-1$
// $JUnit-BEGIN$
-
suite.addTestSuite(JsfComponentTest.class);
suite.addTestSuite(JsfJbideTest.class);
-
+ //cleanUpTests();
// $JUnit-END$
return suite;
=
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfComponentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfComponentTest.java 2008-01-08 18:55:16 UTC (rev 5528)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfComponentTest.java 2008-01-08 18:59:01 UTC (rev 5529)
@@ -10,16 +10,8 @@
*************************************************************************=
*****/
package org.jboss.tools.jsf.vpe.jsf.test;
=
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.ILogListener;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.vpe.ui.test.VpeTest;
=
/**
* Class for testing all jsf components
@@ -27,45 +19,15 @@
* @author sdzmitrovich
* =
*/
-public class JsfComponentTest extends TestCase implements ILogListener {
+public class JsfComponentTest extends VpeTest {
=
- private final static String EDITOR_ID =3D "org.jboss.tools.jst.jsp.jspedi=
tor.JSPTextEditor"; // $NON-NLS-1$
- // $NON-NLS-1$
-
- // check warning log
- private final static boolean checkWarning =3D false;
- private Throwable exception;
-
+ //import project name =
+ private static final String IMPORT_PROJECT_NAME =3D "jsfTest"; =
+ =
public JsfComponentTest(String name) {
- super(name);
+ super(name,IMPORT_PROJECT_NAME,JsfTestPlugin.getPluginResourcePath());
}
=
- /**
- * Perform pre-test initialization.
- * =
- * @throws Exception
- * =
- * @see TestCase#setUp()
- */
-
- protected void setUp() throws Exception {
- super.setUp();
-
- Platform.addLogListener(this);
- }
-
- /**
- * Perform post-test cleanup.
- * =
- * @throws Exception
- * =
- * @see TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- super.tearDown();
- Platform.removeLogListener(this);
- }
-
/*
* JSF HTML test cases
*/
@@ -250,44 +212,4 @@
public void testView() throws PartInitException, Throwable {
performTestForJsfComponent("components/view.jsp"); // $NON-NLS-1$
}
-
- private void performTestForJsfComponent(String componentPage)
- throws PartInitException, Throwable {
- TestJsfUtil.waitForJobs();
-
- exception =3D null;
-
- IFile file =3D (IFile) TestJsfUtil.getComponentPath(componentPage);
-
- IEditorInput input =3D new FileEditorInput(file);
-
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .openEditor(input, EDITOR_ID, true);
-
- TestJsfUtil.waitForJobs();
- TestJsfUtil.delay(3000);
-
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .closeAllEditors(true);
-
- if (exception !=3D null) {
- throw exception;
- }
- }
-
- public void logging(IStatus status, String plugin) {
- switch (status.getSeverity()) {
- case IStatus.ERROR:
- exception =3D status.getException();
- break;
- case IStatus.WARNING:
- if (checkWarning)
- exception =3D status.getException();
- break;
- default:
- break;
- }
-
- }
-
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfJbideTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfJbideTest.java 2008-01-08 18:55:16 UTC (rev 5528)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfJbideTest.java 2008-01-08 18:59:01 UTC (rev 5529)
@@ -14,81 +14,39 @@
import java.util.ArrayList;
import java.util.List;
=
-import junit.framework.TestCase;
-
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.ILogListener;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
-import org.jboss.tools.vpe.editor.VpeController;
-import org.jboss.tools.vpe.editor.VpeEditorPart;
import org.jboss.tools.vpe.editor.util.HTML;
-import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNamedNodeMap;
import org.mozilla.interfaces.nsIDOMNode;
import org.mozilla.interfaces.nsIDOMNodeList;
-
/**
* Class for testing all jsf bugs
* =
* @author sdzmitrovich
* =
*/
-public class JsfJbideTest extends TestCase implements ILogListener {
+public class JsfJbideTest extends VpeTest {
=
- private final static String EDITOR_ID =3D "org.jboss.tools.jst.jsp.jspedi=
tor.JSPTextEditor"; // $NON-NLS-1$
// type of input tag
private static final String ATTR_TYPE_VALUE =3D "radio";
+ =
+ //import project name
+ =
+ private static final String IMPORT_PROJECT_NAME =3D "jsfTest"; =
=
- // check warning log
- private final static boolean checkWarning =3D false;
-
- private Throwable exception;
-
public JsfJbideTest(String name) {
- super(name);
+ super(name,IMPORT_PROJECT_NAME,JsfTestPlugin.getPluginResourcePath());
}
=
- /**
- * Perform pre-test initialization.
- * =
- * @throws Exception
- * =
- * @see TestCase#setUp()
- */
=
- protected void setUp() throws Exception {
-
- super.setUp();
-
- Platform.addLogListener(this);
-
- closeEditors();
- }
-
- /**
- * Perform post-test cleanup.
- * =
- * @throws Exception
- * =
- * @see TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
-
- super.tearDown();
-
- Platform.removeLogListener(this);
-
- closeEditors();
- }
-
/*
* JBIDE's test cases
*/
@@ -108,13 +66,13 @@
public void testJBIDE_1467() throws PartInitException, Throwable {
=
// wait
- TestJsfUtil.waitForJobs();
+ TestUtil.waitForJobs();
// set exception
- exception =3D null;
+ setException(null);
=
// get test page path
- IFile file =3D (IFile) TestJsfUtil
- .getComponentPath("JBIDE/1467/JBIDE-1467.jsp");
+ IFile file =3D (IFile) TestUtil
+ .getComponentPath("JBIDE/1467/JBIDE-1467.jsp",getImportProjectName());
=
IEditorInput input =3D new FileEditorInput(file);
=
@@ -122,7 +80,7 @@
JSPMultiPageEditor part =3D openEditor(input);
=
// get dom document
- nsIDOMDocument document =3D getVpePageSource(part);
+ nsIDOMDocument document =3D getVpeVisualDocument(part);
nsIDOMElement element =3D document.getDocumentElement();
=
if (element !=3D null) {
@@ -143,8 +101,8 @@
}
=
// check exception
- if (exception !=3D null) {
- throw exception;
+ if (getException() !=3D null) {
+ throw getException();
}
=
}
@@ -175,15 +133,15 @@
public void testJBIDE_1501() throws PartInitException, Throwable {
=
// wait
- TestJsfUtil.waitForJobs();
+ TestUtil.waitForJobs();
// set exception
- exception =3D null;
+ setException(null);
=
// _____1st Part____//
=
// get test page path
- IFile file =3D (IFile) TestJsfUtil
- .getComponentPath("JBIDE/1501/JBIDE-1501_multiple.jsp");
+ IFile file =3D (IFile) TestUtil
+ .getComponentPath("JBIDE/1501/JBIDE-1501_multiple.jsp",getImportProjec=
tName());
=
IEditorInput input =3D new FileEditorInput(file);
=
@@ -191,7 +149,7 @@
JSPMultiPageEditor part =3D openEditor(input);
=
// get dom document
- nsIDOMDocument document =3D getVpePageSource(part);
+ nsIDOMDocument document =3D getVpeVisualDocument(part);
assertNotNull(document);
=
// get dom element
@@ -223,8 +181,8 @@
// _____2nd Part____//
=
// get test page path
- file =3D (IFile) TestJsfUtil
- .getComponentPath("JBIDE/1501/JBIDE-1501_size.jsp");
+ file =3D (IFile) TestUtil
+ .getComponentPath("JBIDE/1501/JBIDE-1501_size.jsp",getImportProjectNam=
e());
=
input =3D new FileEditorInput(file);
=
@@ -232,7 +190,7 @@
part =3D openEditor(input);
=
// get dom document
- document =3D getVpePageSource(part);
+ document =3D getVpeVisualDocument(part);
assertNotNull(document);
=
// get dom element
@@ -265,8 +223,8 @@
}
=
// check exception
- if (exception !=3D null) {
- throw exception;
+ if (getException() !=3D null) {
+ throw getException();
}
=
}
@@ -345,78 +303,4 @@
=
}
=
- /**
- * close all opened editors
- */
- private void closeEditors() {
-
- // wait
- TestJsfUtil.waitForJobs();
-
- // close
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .closeAllEditors(true);
-
- }
-
- /**
- * Open JSPMultiPageEditor editor
- * =
- * @param input
- * @return
- * @throws PartInitException
- */
- private JSPMultiPageEditor openEditor(IEditorInput input)
- throws PartInitException {
-
- // get editor
- JSPMultiPageEditor part =3D (JSPMultiPageEditor) PlatformUI
- .getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .openEditor(input, EDITOR_ID, true);
-
- // wait for jobs
- TestJsfUtil.waitForJobs();
- // wait full initialization of vpe
- TestJsfUtil.delay(3000);
-
- return part;
-
- }
-
- /**
- * get xulrunner source page
- * =
- * @param part -
- * JSPMultiPageEditor
- * @return nsIDOMDocument
- */
- private nsIDOMDocument getVpePageSource(JSPMultiPageEditor part) {
-
- VpeEditorPart visualEditor =3D (VpeEditorPart) part.getVisualEditor();
- VpeController vpeController =3D visualEditor.getController();
-
- // get xulRunner editor
- XulRunnerEditor xulRunnerEditor =3D vpeController.getXulRunnerEditor();
-
- // get dom document
- nsIDOMDocument document =3D xulRunnerEditor.getDOMDocument();
-
- return document;
- }
-
- public void logging(IStatus status, String plugin) {
- switch (status.getSeverity()) {
- case IStatus.ERROR:
- exception =3D status.getException();
- break;
- case IStatus.WARNING:
- if (checkWarning)
- exception =3D status.getException();
- break;
- default:
- break;
- }
-
- }
-
}
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/too=
ls/jsf/vpe/jsf/test/TestJsfUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/TestJsfUtil.java 2008-01-08 18:55:16 UTC (rev 5528)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/TestJsfUtil.java 2008-01-08 18:59:01 UTC (rev 5529)
@@ -1,157 +0,0 @@
-/*************************************************************************=
****** =
- * Copyright (c) 2007 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.jsf.vpe.jsf.test;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-
-/**
- * Class for importing project from jar file
- * =
- * @author sdzmitrovich
- * =
- */
-public class TestJsfUtil {
- private static final String PROJECT_NAME =3D "JsfTest"; // $NON-NLS-1$
- private static final String COMPONENTS_PATH =3D "WebContent/pages"; // $N=
ON-NLS-1$
-
- @SuppressWarnings("restriction")
- static void importJsfPages(String path) {
-
- if (ResourcesPlugin.getWorkspace().getRoot().findMember(
- TestJsfUtil.PROJECT_NAME) !=3D null) {
- waitForJobs();
-
- try {
- removeProject();
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject(
- PROJECT_NAME);
-
- try {
-
- IOverwriteQuery overwrite =3D new IOverwriteQuery() {
- public String queryOverwrite(String pathString) {
- return ALL;
- }
- };
-
- ImportProvider importProvider =3D new ImportProvider();
-
- // need to remove from imported project "svn" files
- List unimportedFiles =3D new ArrayList();
- unimportedFiles.add(".svn");
-
- importProvider.setUnimportedFiles(unimportedFiles);
-
- // create import operation
- ImportOperation importOp =3D new ImportOperation(project
- .getFullPath(), new File(path), importProvider, overwrite);
-
- // import files just to project folder ( without old structure )
- importOp.setCreateContainerStructure(false);
-
- importOp.setContext(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell());
-
- // run import
- importOp.run(new NullProgressMonitor());
-
- } catch (InvocationTargetException ite) {
- JsfTestPlugin.getPluginLog().logError(ite.getCause());
- } catch (InterruptedException ie) {
- JsfTestPlugin.getPluginLog().logError(ie);
- }
- }
-
- /**
- * =
- * @return
- * @throws CoreException
- */
- static IResource getComponentPath(String componentPage)
- throws CoreException {
- IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject(
- PROJECT_NAME);
- if (project !=3D null) {
- return project.getFolder(COMPONENTS_PATH).findMember(componentPage);
-
- }
-
- return null;
- }
-
- /**
- * =
- * @throws CoreException
- */
- static void removeProject() throws CoreException {
- IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject(
- PROJECT_NAME);
- if (project !=3D null) {
- project.delete(IResource.ALWAYS_DELETE_PROJECT_CONTENT,
- new NullProgressMonitor());
- }
- }
-
- /**
- * Process UI input but do not return for the specified time interval.
- * =
- * @param waitTimeMillis
- * the number of milliseconds
- */
- public static void delay(long waitTimeMillis) {
- Display display =3D Display.getCurrent();
- if (display !=3D null) {
- long endTimeMillis =3D System.currentTimeMillis() + waitTimeMillis;
- while (System.currentTimeMillis() < endTimeMillis) {
- if (!display.readAndDispatch())
- display.sleep();
- }
- display.update();
- }
- // Otherwise, perform a simple sleep.
- else {
- try {
- Thread.sleep(waitTimeMillis);
- } catch (InterruptedException e) {
- // Ignored.
- }
- }
- }
-
- /**
- * Wait until all background tasks are complete.
- */
- public static void waitForJobs() {
- while (Job.getJobManager().currentJob() !=3D null)
- delay(5000);
- }
-
-}
--===============2396900393724226458==--
From jbosstools-commits at lists.jboss.org Tue Jan 8 14:48:46 2008
Content-Type: multipart/mixed; boundary="===============4422473271990312050=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5530 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
Date: Tue, 08 Jan 2008 14:48:45 -0500
Message-ID:
--===============4422473271990312050==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: mareshkau
Date: 2008-01-08 14:48:45 -0500 (Tue, 08 Jan 2008)
New Revision: 5530
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfJbideTest.java
Log:
junit code adjustment
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfJbideTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfJbideTest.java 2008-01-08 18:59:01 UTC (rev 5529)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfJbideTest.java 2008-01-08 19:48:45 UTC (rev 5530)
@@ -72,10 +72,13 @@
=
// get test page path
IFile file =3D (IFile) TestUtil
- .getComponentPath("JBIDE/1467/JBIDE-1467.jsp",getImportProjectName());
-
+ .getComponentPath("JBIDE/JBIDE-1467/JBIDE-1467.jsp",getImportProjectNa=
me());
+ =
+ assertNotNull("Could not open specified file "+file.getFullPath(), file);
+ =
IEditorInput input =3D new FileEditorInput(file);
-
+ =
+ assertNotNull("Editor input is null",input);
// open and get editor
JSPMultiPageEditor part =3D openEditor(input);
=
@@ -260,7 +263,6 @@
}
=
}
-
/**
* =
* @param elements
--===============4422473271990312050==--
From jbosstools-commits at lists.jboss.org Tue Jan 8 19:56:43 2008
Content-Type: multipart/mixed; boundary="===============1134678445628449165=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5531 -
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util.
Date: Tue, 08 Jan 2008 19:56:43 -0500
Message-ID:
--===============1134678445628449165==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-08 19:56:43 -0500 (Tue, 08 Jan 2008)
New Revision: 5531
Added:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xpl/
Log:
Test Utils to be able Join to background tasks and delay in UI threads. Cla=
sses were taken from org.eclipse.ui.tests.navigator plugin on :pserver:anon=
ymous(a)dev.eclipse.org:/cvsroot/eclipse/org.eclipse.ui.tests.navigator
--===============1134678445628449165==--
From jbosstools-commits at lists.jboss.org Tue Jan 8 19:57:00 2008
Content-Type: multipart/mixed; boundary="===============3582002917706340556=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5532 -
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xpl.
Date: Tue, 08 Jan 2008 19:57:00 -0500
Message-ID:
--===============3582002917706340556==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-08 19:57:00 -0500 (Tue, 08 Jan 2008)
New Revision: 5532
Added:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xpl=
/DisplayHelper.java
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xpl=
/DisplayWaiter.java
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xpl=
/EditorTestHelper.java
Log:
Test Utils to be able Join to background tasks and delay in UI threads. Cla=
sses were taken from org.eclipse.ui.tests.navigator plugin on :pserver:anon=
ymous(a)dev.eclipse.org:/cvsroot/eclipse/org.eclipse.ui.tests.navigator
Added: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util=
/xpl/DisplayHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xp=
l/DisplayHelper.java (rev 0)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xp=
l/DisplayHelper.java 2008-01-09 00:57:00 UTC (rev 5532)
@@ -0,0 +1,222 @@
+/*************************************************************************=
******
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * IBM Corporation - initial API and implementation
+ *************************************************************************=
******/
+package org.jboss.tools.test.util.xpl;
+
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * Runs the event loop of the given display until {@link #condition()} bec=
omes
+ * true or no events have occurred for the supplied timeout.
+ * Between running the event loop, {@link Display#sleep()} is called.
+ *
+ * There is a caveat: the given timeouts must be long enough that the call=
ing
+ * thread can enter Display.sleep() before the timeout elapse=
s,
+ * otherwise, the waiter may time out before sleep is called =
and
+ * the sleeping thread may never be waken up.
+ *
+ * =
+ * @since 3.1
+ */
+public abstract class DisplayHelper {
+ /**
+ * Creates a new instance.
+ */
+ protected DisplayHelper() {
+ }
+ =
+ /**
+ * Until {@link #condition()} becomes true or the timeout
+ * elapses, call {@link Display#sleep()} and run the event loop.
+ *
+ * If timeout < 0, the event loop is never driven and
+ * only the condition is checked. If timeout =3D=3D 0, the e=
vent
+ * loop is driven at most once, but Display.sleep() is never
+ * invoked.
+ *
+ * =
+ * @param display the display to run the event loop of
+ * @param timeout the timeout in milliseconds
+ * @return true if the condition became true,
+ * false if the timeout elapsed
+ */
+ public final boolean waitForCondition(Display display, long timeout) {
+ // if the condition already holds, succeed
+ if (condition())
+ return true;
+ =
+ if (timeout < 0)
+ return false;
+ =
+ // if driving the event loop once makes the condition hold, succeed
+ // without spawning a thread.
+ driveEventQueue(display);
+ if (condition())
+ return true;
+ =
+ // if the timeout is negative or zero, fail
+ if (timeout =3D=3D 0)
+ return false;
+
+ // repeatedly sleep until condition becomes true or timeout elapses
+ DisplayWaiter waiter=3D new DisplayWaiter(display);
+ DisplayWaiter.Timeout timeoutState=3D waiter.start(timeout);
+ boolean condition;
+ try {
+ do {
+ if (display.sleep())
+ driveEventQueue(display);
+ condition=3D condition();
+ } while (!condition && !timeoutState.hasTimedOut());
+ } finally {
+ waiter.stop();
+ }
+ return condition;
+ }
+ =
+ /**
+ * Call {@link Display#sleep()} and run the event loop until the given
+ * timeout has elapsed.
+ *
+ * If timeout < 0, nothing happens. If
+ * timeout =3D=3D 0, the event loop is driven exactly once, =
but
+ * Display.sleep() is never invoked.
+ *
+ * =
+ * @param display the display to run the event loop of
+ * @param millis the timeout in milliseconds
+ */
+ public static void sleep(Display display, long millis) {
+ new DisplayHelper() {
+ public boolean condition() {
+ return false;
+ }
+ }.waitForCondition(display, millis);
+ }
+ =
+ /**
+ * Call {@link Display#sleep()} and run the event loop once if
+ * sleep returns before the timeout elapses. Returns
+ * true if any events were processed, false if
+ * not.
+ *
+ * If timeout < 0, nothing happens and false is returned.
+ * If timeout =3D=3D 0, the event loop is driven exactly onc=
e,
+ * but Display.sleep() is never invoked.
+ *
+ * =
+ * @param display the display to run the event loop of
+ * @param timeout the timeout in milliseconds
+ * @return true if any event was taken off the event queue,
+ * false if not
+ */
+ public static boolean runEventLoop(Display display, long timeout) {
+ if (timeout < 0)
+ return false;
+ =
+ if (timeout =3D=3D 0)
+ return driveEventQueue(display);
+ =
+ // repeatedly sleep until condition becomes true or timeout elapses
+ DisplayWaiter waiter=3D new DisplayWaiter(display);
+ DisplayWaiter.Timeout timeoutState=3D waiter.start(timeout);
+ boolean events=3D false;
+ if (display.sleep() && !timeoutState.hasTimedOut()) {
+ driveEventQueue(display);
+ events=3D true;
+ }
+ waiter.stop();
+ return events;
+ }
+ =
+ /**
+ * The condition which has to be met in order for
+ * {@link #waitForCondition(Display, int)} to return before the timeout
+ * elapses.
+ * =
+ * @return true if the condition is met, false
+ * if the event loop should be driven some more
+ */
+ protected abstract boolean condition();
+
+ /**
+ * Runs the event loop on the given display.
+ * =
+ * @param display the display
+ * @return if display.readAndDispatch returned
+ * true at least once
+ */
+ private static boolean driveEventQueue(Display display) {
+ boolean events=3D false;
+ while (display.readAndDispatch()) {
+ events=3D true;
+ }
+ return events;
+ }
+
+ /**
+ * Until {@link #condition()} becomes true or the timeout
+ * elapses, call {@link Display#sleep()} and run the event loop.
+ *
+ * If timeout < 0, the event loop is never driven and
+ * only the condition is checked. If timeout =3D=3D 0, the e=
vent
+ * loop is driven at most once, but Display.sleep() is never
+ * invoked.
+ *
+ *
+ * The condition gets rechecked every interval milliseconds,=
even
+ * if no events were read from the queue.
+ *
+ * =
+ * @param display the display to run the event loop of
+ * @param timeout the timeout in milliseconds
+ * @param interval the interval to re-check the condition in milliseconds
+ * @return true if the condition became true,
+ * false if the timeout elapsed
+ */
+ public final boolean waitForCondition(Display display, long timeout, long=
interval) {
+ // if the condition already holds, succeed
+ if (condition())
+ return true;
+ =
+ if (timeout < 0)
+ return false;
+ =
+ // if driving the event loop once makes the condition hold, succeed
+ // without spawning a thread.
+ driveEventQueue(display);
+ if (condition())
+ return true;
+ =
+ // if the timeout is negative or zero, fail
+ if (timeout =3D=3D 0)
+ return false;
+ =
+ // repeatedly sleep until condition becomes true or timeout elapses
+ DisplayWaiter waiter=3D new DisplayWaiter(display, true);
+ long currentTimeMillis=3D System.currentTimeMillis();
+ long finalTimeout=3D timeout + currentTimeMillis;
+ if (finalTimeout < currentTimeMillis)
+ finalTimeout=3D Long.MAX_VALUE;
+ boolean condition;
+ try {
+ do {
+ waiter.restart(interval);
+ if (display.sleep())
+ driveEventQueue(display);
+ condition=3D condition();
+ } while (!condition && finalTimeout > System.currentTimeMillis());
+ } finally {
+ waiter.stop();
+ }
+ return condition;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/t=
ools/test/util/xpl/DisplayHelper.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util=
/xpl/DisplayWaiter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xp=
l/DisplayWaiter.java (rev 0)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xp=
l/DisplayWaiter.java 2008-01-09 00:57:00 UTC (rev 5532)
@@ -0,0 +1,410 @@
+/*************************************************************************=
******
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * IBM Corporation - initial API and implementation
+ *************************************************************************=
******/
+package org.jboss.tools.test.util.xpl;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import junit.framework.Assert;
+
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * Implements the thread that will wait for the timeout and wake up the di=
splay
+ * so it does not wait forever. The thread may be restarted after it was s=
topped
+ * or timed out.
+ * =
+ * @since 3.1
+ */
+final class DisplayWaiter {
+ /**
+ * Timeout state of a display waiter thread.
+ */
+ public final class Timeout {
+ boolean fTimeoutState=3D false;
+ /**
+ * Returns true if the timeout has been reached,
+ * false if not.
+ * =
+ * @return true if the timeout has been reached,
+ * false if not
+ */
+ public boolean hasTimedOut() {
+ synchronized (fMutex) {
+ return fTimeoutState;
+ }
+ }
+ void setTimedOut(boolean timedOut) {
+ fTimeoutState=3D timedOut;
+ }
+ Timeout(boolean initialState) {
+ fTimeoutState=3D initialState;
+ }
+ }
+ =
+ // configuration
+ private final Display fDisplay;
+ private final Object fMutex=3D new Object();
+ private final boolean fKeepRunningOnTimeout;
+ =
+ /* State -- possible transitions:
+ * =
+ * STOPPED -> RUNNING
+ * RUNNING -> STOPPED
+ * RUNNING -> IDLE
+ * IDLE -> RUNNING
+ * IDLE -> STOPPED
+ */
+ private static final int RUNNING=3D 1 << 1;
+ private static final int STOPPED=3D 1 << 2;
+ private static final int IDLE=3D 1 << 3;
+ =
+ /** The current state. */
+ private int fState;
+ /** The time in milliseconds (see Date) that the timeout will occur. */
+ private long fNextTimeout;
+ /** The thread. */
+ private Thread fCurrentThread;
+ /** The timeout state of the current thread. */
+ private Timeout fCurrentTimeoutState;
+
+ /**
+ * Creates a new instance on the given display and timeout.
+ * =
+ * @param display the display to run the event loop of
+ */
+ public DisplayWaiter(Display display) {
+ this(display, false);
+ }
+ =
+ /**
+ * Creates a new instance on the given display and timeout.
+ * =
+ * @param display the display to run the event loop of
+ * @param keepRunning true if the thread should be kept
+ * running after timing out
+ */
+ public DisplayWaiter(Display display, boolean keepRunning) {
+ Assert.assertNotNull(display);
+ fDisplay=3D display;
+ fState=3D STOPPED;
+ fKeepRunningOnTimeout=3D keepRunning;
+ }
+ =
+ /**
+ * Starts the timeout thread if it is not currently running. Nothing happ=
ens
+ * if a thread is already running.
+ * =
+ * @param delay the delay from now in milliseconds
+ * @return the timeout state which can be queried for its timed out status
+ */
+ public Timeout start(long delay) {
+ Assert.assertTrue(delay > 0);
+ synchronized (fMutex) {
+ switch (fState) {
+ case STOPPED:
+ startThread();
+ setNextTimeout(delay);
+ break;
+ case IDLE:
+ unhold();
+ setNextTimeout(delay);
+ break;
+ }
+ =
+ return fCurrentTimeoutState;
+ }
+ }
+
+ /**
+ * Sets the next timeout to current time plus delay.
+ * =
+ * @param delay the delay until the next timeout occurs in milliseconds f=
rom
+ * now
+ */
+ private void setNextTimeout(long delay) {
+ long currentTimeMillis=3D System.currentTimeMillis();
+ long next=3D currentTimeMillis + delay;
+ if (next > currentTimeMillis)
+ fNextTimeout=3D next;
+ else
+ fNextTimeout=3D Long.MAX_VALUE;
+ }
+ =
+ /**
+ * Starts the thread if it is not currently running; resets the timeout if
+ * it is.
+ * =
+ * @param delay the delay from now in milliseconds
+ * @return the timeout state which can be queried for its timed out status
+ */
+ public Timeout restart(long delay) {
+ Assert.assertTrue(delay > 0);
+ synchronized (fMutex) {
+ switch (fState) {
+ case STOPPED:
+ startThread();
+ break;
+ case IDLE:
+ unhold();
+ break;
+ }
+ setNextTimeout(delay);
+
+ return fCurrentTimeoutState;
+ }
+ }
+
+ /**
+ * Stops the thread if it is running. If not, nothing happens. Another
+ * thread may be started by calling {@link #start(long)} or
+ * {@link #restart(long)}.
+ */
+ public void stop() {
+ synchronized (fMutex) {
+ if (tryTransition(RUNNING | IDLE, STOPPED))
+ fMutex.notifyAll();
+ }
+ }
+ =
+ /**
+ * Puts the reaper thread on hold but does not stop it. It may be restart=
ed
+ * by calling {@link #start(long)} or {@link #restart(long)}.
+ */
+ public void hold() {
+ synchronized (fMutex) {
+ // nothing to do if there is no thread
+ if (tryTransition(RUNNING, IDLE))
+ fMutex.notifyAll();
+ }
+ }
+
+ /**
+ * Transition to RUNNING and clear the timed out flag. Assume
+ * current state is IDLE.
+ */
+ private void unhold() {
+ checkedTransition(IDLE, RUNNING);
+ fCurrentTimeoutState=3D new Timeout(false);
+ fMutex.notifyAll();
+ }
+ =
+ /**
+ * Start the thread. Assume the current state is STOPPED.
+ */
+ private void startThread() {
+ checkedTransition(STOPPED, RUNNING);
+ fCurrentTimeoutState=3D new Timeout(false);
+ fCurrentThread=3D new Thread() {
+ /**
+ * Exception thrown when a thread notices that it has been stopped
+ * and a new thread has been started.
+ */
+ final class ThreadChangedException extends Exception {
+ private static final long serialVersionUID=3D 1L;
+ }
+
+ /*
+ * @see java.lang.Runnable#run()
+ */
+ public void run() {
+ try {
+ run2();
+ } catch (InterruptedException e) {
+ // ignore and end the thread - we never interrupt ourselves,
+ // so it must be an external entity that interrupted us
+ Logger.global.log(Level.FINE, "", e); //$NON-NLS-1$
+ } catch (ThreadChangedException e) {
+ // the thread was stopped and restarted before we got out
+ // of a wait - we're no longer used
+ // we might have been notified instead of the current thread,
+ // so wake it up
+ Logger.global.log(Level.FINE, "", e); //$NON-NLS-1$
+ synchronized (fMutex) {
+ fMutex.notifyAll();
+ }
+ }
+ }
+ =
+ /**
+ * Runs the thread.
+ * =
+ * @throws InterruptedException if the thread was interrupted
+ * @throws ThreadChangedException if the thread changed
+ */
+ private void run2() throws InterruptedException, ThreadChangedException=
{
+ synchronized (fMutex) {
+ checkThread();
+ tryHold(); // wait / potential state change
+ assertStates(STOPPED | RUNNING);
+ =
+ while (isState(RUNNING)) {
+ waitForTimeout(); // wait / potential state change
+ =
+ if (isState(RUNNING))
+ timedOut(); // state change
+ assertStates(STOPPED | IDLE);
+ =
+ tryHold(); // wait / potential state change
+ assertStates(STOPPED | RUNNING);
+ }
+ assertStates(STOPPED);
+ }
+ }
+
+ /**
+ * Check whether the current thread is this thread, throw an
+ * exception otherwise.
+ * =
+ * @throws ThreadChangedException if the current thread changed
+ */
+ private void checkThread() throws ThreadChangedException {
+ if (fCurrentThread !=3D this)
+ throw new ThreadChangedException();
+ }
+
+ /**
+ * Waits until the next timeout occurs.
+ * =
+ * @throws InterruptedException if the thread was interrupted
+ * @throws ThreadChangedException if the thread changed
+ */
+ private void waitForTimeout() throws InterruptedException, ThreadChange=
dException {
+ long delta;
+ while (isState(RUNNING) && (delta =3D fNextTimeout - System.currentTim=
eMillis()) > 0) {
+ delta=3D Math.max(delta, 50); // wait at least 50ms in order to avoid=
timing out before the display is going to sleep
+ Logger.global.finest("sleeping for " + delta + "ms"); //$NON-NLS-1$ /=
/$NON-NLS-2$
+ fMutex.wait(delta);
+ checkThread();
+ }
+ }
+
+ /**
+ * Sets the timed out flag and wakes up the display. Transitions to
+ * IDLE (if in keep-running mode) or
+ * STOPPED.
+ */
+ private void timedOut() {
+ Logger.global.finer("timed out"); //$NON-NLS-1$
+ fCurrentTimeoutState.setTimedOut(true);
+ fDisplay.wake(); // wake up call!
+ if (fKeepRunningOnTimeout)
+ checkedTransition(RUNNING, IDLE);
+ else
+ checkedTransition(RUNNING, STOPPED);
+ }
+ =
+ /**
+ * Waits while the state is IDLE, then returns. The
+ * state must not be RUNNING when calling this
+ * method. The state is either STOPPED or
+ * RUNNING when the method returns.
+ * =
+ * @throws InterruptedException if the thread was interrupted
+ * @throws ThreadChangedException if the thread has changed while on
+ * hold
+ */
+ private void tryHold() throws InterruptedException, ThreadChangedExcept=
ion {
+ while (isState(IDLE)) {
+ fMutex.wait(0);
+ checkThread();
+ }
+ assertStates(STOPPED | RUNNING);
+ }
+ };
+ =
+ fCurrentThread.start();
+ }
+ =
+ /**
+ * Transitions to nextState if the current state is one of
+ * possibleStates. Returns true if the
+ * transition happened, false otherwise.
+ * =
+ * @param possibleStates the states which trigger a transition
+ * @param nextState the state to transition to
+ * @return true if the transition happened,
+ * false otherwise
+ */
+ private boolean tryTransition(int possibleStates, int nextState) {
+ if (isState(possibleStates)) {
+ Logger.global.finer(name(fState) + " > " + name(nextState) + " (" + nam=
e(possibleStates) + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ fState=3D nextState;
+ return true;
+ }
+ Logger.global.finest("noTransition" + name(fState) + " !> " + name(nextS=
tate) + " (" + name(possibleStates) + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$=
NON-NLS-3$ //$NON-NLS-4$
+ return false;
+ }
+ =
+ /**
+ * Checks the possibleStates and throws an assertion if it is
+ * not met, then transitions to nextState.
+ * =
+ * @param possibleStates the allowed states
+ * @param nextState the state to transition to
+ */
+ private void checkedTransition(int possibleStates, int nextState) {
+ assertStates(possibleStates);
+ Logger.global.finer(name(fState) + " > " + name(nextState)); //$NON-NLS-=
1$
+ fState=3D nextState;
+ }
+ =
+ /**
+ * Implements state consistency checking.
+ * =
+ * @param states the allowed states
+ * @throws junit.framework.AssertionFailedError if the current state is n=
ot
+ * in states
+ */
+ private void assertStates(int states) {
+ Assert.assertTrue("illegal state", isState(states)); //$NON-NLS-1$
+ }
+
+ /**
+ * Answers true if the current state is in the given
+ * states.
+ * =
+ * @param states the possible states
+ * @return true if the current state is in the given states,
+ * false otherwise
+ */
+ private boolean isState(int states) {
+ return (states & fState) =3D=3D fState;
+ }
+ =
+ /**
+ * Pretty print the given states.
+ * =
+ * @param states the states
+ * @return a string representation of the states
+ */
+ private String name(int states) {
+ StringBuffer buf=3D new StringBuffer();
+ boolean comma=3D false;
+ if ((states & RUNNING) =3D=3D RUNNING) {
+ buf.append("RUNNING"); //$NON-NLS-1$
+ comma=3D true;
+ }
+ if ((states & STOPPED) =3D=3D STOPPED) {
+ if (comma)
+ buf.append(","); //$NON-NLS-1$
+ buf.append("STOPPED"); //$NON-NLS-1$
+ comma=3D true;
+ }
+ if ((states & IDLE) =3D=3D IDLE) {
+ if (comma)
+ buf.append(","); //$NON-NLS-1$
+ buf.append("IDLE"); //$NON-NLS-1$
+ }
+ return buf.toString();
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/t=
ools/test/util/xpl/DisplayWaiter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util=
/xpl/EditorTestHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xp=
l/EditorTestHelper.java (rev 0)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xp=
l/EditorTestHelper.java 2008-01-09 00:57:00 UTC (rev 5532)
@@ -0,0 +1,265 @@
+/*************************************************************************=
******
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * IBM Corporation - initial API and implementation
+ *************************************************************************=
******/
+package org.jboss.tools.test.util.xpl;
+
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.jobs.IJobManager;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorReference;
+import org.eclipse.ui.IViewReference;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.WorkbenchException;
+
+
+/**
+ * @since 3.1
+ */
+public class EditorTestHelper {
+ =
+ =
+ =
+ public static final String TEXT_EDITOR_ID=3D "org.eclipse.ui.DefaultTextE=
ditor"; //$NON-NLS-1$
+ =
+ public static final String COMPILATION_UNIT_EDITOR_ID=3D "org.eclipse.jdt=
.ui.CompilationUnitEditor"; //$NON-NLS-1$
+ =
+ public static final String RESOURCE_PERSPECTIVE_ID=3D "org.eclipse.ui.res=
ourcePerspective"; //$NON-NLS-1$
+ =
+ public static final String JAVA_PERSPECTIVE_ID=3D "org.eclipse.jdt.ui.Jav=
aPerspective"; //$NON-NLS-1$
+ =
+ public static final String OUTLINE_VIEW_ID=3D "org.eclipse.ui.views.Conte=
ntOutline"; //$NON-NLS-1$
+ =
+ public static final String PACKAGE_EXPLORER_VIEW_ID=3D "org.eclipse.jdt.u=
i.PackageExplorer"; //$NON-NLS-1$
+ =
+ public static final String NAVIGATOR_VIEW_ID=3D "org.eclipse.ui.views.Res=
ourceNavigator"; //$NON-NLS-1$
+ =
+ public static final String INTRO_VIEW_ID=3D "org.eclipse.ui.internal.intr=
oview"; //$NON-NLS-1$
+ =
+ public static void closeEditor(IEditorPart editor) {
+ IWorkbenchPartSite site;
+ IWorkbenchPage page;
+ if (editor !=3D null && (site=3D editor.getSite()) !=3D null && (page=3D=
site.getPage()) !=3D null)
+ page.closeEditor(editor, false);
+ }
+ =
+ public static void closeAllEditors() {
+ IWorkbenchWindow[] windows=3D PlatformUI.getWorkbench().getWorkbenchWind=
ows();
+ for (int i=3D 0; i < windows.length; i++) {
+ IWorkbenchPage[] pages=3D windows[i].getPages();
+ for (int j=3D 0; j < pages.length; j++) {
+ IEditorReference[] editorReferences=3D pages[j].getEditorReferences();
+ for (int k=3D 0; k < editorReferences.length; k++)
+ closeEditor(editorReferences[k].getEditor(false));
+ }
+ }
+ }
+ =
+ /**
+ * Runs the event queue on the current display until it is empty.
+ */
+ public static void runEventQueue() {
+ IWorkbenchWindow window=3D getActiveWorkbenchWindow();
+ if (window !=3D null)
+ runEventQueue(window.getShell());
+ }
+ =
+ public static void runEventQueue(IWorkbenchPart part) {
+ runEventQueue(part.getSite().getShell());
+ }
+ =
+ public static void runEventQueue(Shell shell) {
+ runEventQueue(shell.getDisplay());
+ }
+ =
+ public static void runEventQueue(Display display) {
+ while (display.readAndDispatch()) {
+ // do nothing
+ }
+ }
+ =
+ /**
+ * Runs the event queue on the current display and lets it sleep until the
+ * timeout elapses.
+ * =
+ * @param millis the timeout in milliseconds
+ */
+ public static void runEventQueue(long millis) {
+ runEventQueue(getActiveDisplay(), millis);
+ }
+ =
+ public static void runEventQueue(IWorkbenchPart part, long millis) {
+ runEventQueue(part.getSite().getShell(), millis);
+ }
+ =
+ public static void runEventQueue(Shell shell, long millis) {
+ runEventQueue(shell.getDisplay(), millis);
+ }
+ =
+ public static void runEventQueue(Display display, long minTime) {
+ if (display !=3D null) {
+ DisplayHelper.sleep(display, minTime);
+ } else {
+ sleep((int) minTime);
+ }
+ }
+ =
+ public static IWorkbenchWindow getActiveWorkbenchWindow() {
+ return PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ }
+ =
+ public static void forceFocus() {
+ IWorkbenchWindow window=3D getActiveWorkbenchWindow();
+ if (window =3D=3D null) {
+ IWorkbenchWindow[] wbWindows=3D PlatformUI.getWorkbench().getWorkbenchW=
indows();
+ if (wbWindows.length =3D=3D 0)
+ return;
+ window=3D wbWindows[0];
+ }
+ Shell shell=3D window.getShell();
+ if (shell !=3D null && !shell.isDisposed()) {
+ shell.forceActive();
+ shell.forceFocus();
+ }
+ }
+ =
+ public static IWorkbenchPage getActivePage() {
+ IWorkbenchWindow window=3D getActiveWorkbenchWindow();
+ return window !=3D null ? window.getActivePage() : null;
+ }
+ =
+ public static Display getActiveDisplay() {
+ IWorkbenchWindow window=3D getActiveWorkbenchWindow();
+ return window !=3D null ? window.getShell().getDisplay() : null;
+ } =
+ =
+ public static void joinBackgroundActivities() throws CoreException {
+ // Join Building
+ Logger.global.entering("EditorTestHelper", "joinBackgroundActivities"); =
//$NON-NLS-1$ //$NON-NLS-2$
+ Logger.global.finer("join builder"); //$NON-NLS-1$
+ boolean interrupted=3D true;
+ while (interrupted) {
+ try {
+ Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
+ interrupted=3D false;
+ } catch (InterruptedException e) {
+ interrupted=3D true;
+ }
+ } =
+ // Join jobs
+ joinJobs(0, 0, 500);
+ Logger.global.exiting("EditorTestHelper", "joinBackgroundActivities"); /=
/$NON-NLS-1$ //$NON-NLS-2$
+ }
+ =
+ public static boolean joinJobs(long minTime, long maxTime, long intervalT=
ime) {
+ Logger.global.entering("EditorTestHelper", "joinJobs"); //$NON-NLS-1$ //=
$NON-NLS-2$
+ runEventQueue(minTime);
+ =
+ DisplayHelper helper=3D new DisplayHelper() {
+ public boolean condition() {
+ return allJobsQuiet();
+ }
+ };
+ boolean quiet=3D helper.waitForCondition(getActiveDisplay(), maxTime > 0=
? maxTime : Long.MAX_VALUE, intervalTime);
+ Logger.global.exiting("EditorTestHelper", "joinJobs", new Boolean(quiet)=
); //$NON-NLS-1$ //$NON-NLS-2$
+ return quiet;
+ }
+ =
+ public static void sleep(int intervalTime) {
+ try {
+ Thread.sleep(intervalTime);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ =
+ public static boolean allJobsQuiet() {
+ IJobManager jobManager=3D Platform.getJobManager();
+ Job[] jobs=3D jobManager.find(null);
+ for (int i=3D 0; i < jobs.length; i++) {
+ Job job=3D jobs[i];
+ int state=3D job.getState();
+ if (state =3D=3D Job.RUNNING || state =3D=3D Job.WAITING) {
+ Logger.global.finest(job.getName());
+ return false;
+ }
+ }
+ return true;
+ }
+ =
+ public static boolean isViewShown(String viewId) {
+ return getActivePage().findViewReference(viewId) !=3D null;
+ }
+ =
+ public static boolean showView(String viewId, boolean show) throws PartIn=
itException {
+ IWorkbenchPage activePage=3D getActivePage();
+ IViewReference view=3D activePage.findViewReference(viewId);
+ boolean shown=3D view !=3D null;
+ if (shown !=3D show)
+ if (show)
+ activePage.showView(viewId);
+ else
+ activePage.hideView(view);
+ return shown;
+ }
+ =
+ public static void bringToTop() {
+ getActiveWorkbenchWindow().getShell().forceActive();
+ } =
+ =
+ public static String showPerspective(String perspective) throws Workbench=
Exception {
+ String shownPerspective=3D getActivePage().getPerspective().getId();
+ if (!perspective.equals(shownPerspective)) {
+ IWorkbench workbench=3D PlatformUI.getWorkbench();
+ IWorkbenchWindow activeWindow=3D workbench.getActiveWorkbenchWindow();
+ workbench.showPerspective(perspective, activeWindow);
+ }
+ return shownPerspective;
+ }
+ =
+ =
+ =
+ public static IFile[] findFiles(IResource resource) throws CoreException {
+ List files=3D new ArrayList();
+ findFiles(resource, files);
+ return (IFile[]) files.toArray(new IFile[files.size()]);
+ }
+ =
+ private static void findFiles(IResource resource, List files) throws Core=
Exception {
+ if (resource instanceof IFile) {
+ files.add(resource);
+ return;
+ }
+ if (resource instanceof IContainer) {
+ IResource[] resources=3D ((IContainer) resource).members();
+ for (int i=3D 0; i < resources.length; i++)
+ findFiles(resources[i], files);
+ }
+ }
+ =
+}
Property changes on: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/t=
ools/test/util/xpl/EditorTestHelper.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
--===============3582002917706340556==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 01:56:37 2008
Content-Type: multipart/mixed; boundary="===============1050903399500769560=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5533 - in
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test:
src/org/jboss/tools/jsf/vpe/facelets/test and 1 other directory.
Date: Wed, 09 Jan 2008 01:56:37 -0500
Message-ID:
--===============1050903399500769560==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-09 01:56:37 -0500 (Wed, 09 Jan 2008)
New Revision: 5533
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelets=
test.jar
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tool=
s/jsf/vpe/facelets/test/FaceletsComponentTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1504
comments TODO and proposed assets added
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/f=
aceletstest.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jbo=
ss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-09 00:57:00 UTC=
(rev 5532)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-09 06:56:37 UTC=
(rev 5533)
@@ -118,17 +118,62 @@
}
=
public void testInsert() throws PartInitException, Throwable {
- performTestForFaceletComponent("insert.xhtml"); // $NON-NLS-1$
+ performTestForFaceletComponent("insert.xhtml"); // $NON-NLS-1$
}
=
public void testDefine() throws PartInitException, Throwable {
- performTestForFaceletComponent("define.xhtml"); // $NON-NLS-1$
+ performTestForFaceletComponent("define.xhtml"); // $NON-NLS-1$
+ // TODO check that content from ui:defime element is shown
+ assertTrue("Defined content is not shown",false);
}
=
public void testComposite() throws PartInitException, Throwable {
- performTestForFaceletComponent("composition.xhtml"); // $NON-NLS-1$
+ performTestForFaceletComponent("composition.xhtml"); // $NON-NLS-1$
+ // TODO check that related and absolute path is processed
+ assertTrue("Template with absolute path is not included",false);
+ assertTrue("Template with related path is not included",false); =
}
=
+ public void testComponent() throws PartInitException, Throwable {
+ performTestForFaceletComponent("component.xhtml"); // $NON-NLS-1$
+ // TODO check that content from ui:defime element is shown
+ //assertTrue("Component's content is not shown",false);
+ }
+ =
+ public void testRemove() throws PartInitException, Throwable {
+ performTestForFaceletComponent("remove.xhtml"); // $NON-NLS-1$
+ // TODO check that content in ui:remove isn't shown in VPE
+ assertTrue("Content inside ui:remove tag shouldn't be shown",false);
+ }
+ =
+ public void testDecorate() throws PartInitException, Throwable {
+ performTestForFaceletComponent("decorate.xhtml"); // $NON-NLS-1$
+ // TODO check that related and absolute path is processed
+ assertTrue("Template with absolute path is not included",false);
+ assertTrue("Template with related path is not included",false); =
+ }
+
+ public void testRepeat() throws PartInitException, Throwable {
+ performTestForFaceletComponent("repeat.xhtml"); // $NON-NLS-1$
+ assertTrue("Component's content is not shown",false); =
+ } =
+ =
+ public void testDebug() throws PartInitException, Throwable {
+ performTestForFaceletComponent("debug.xhtml"); // $NON-NLS-1$
+ }
+ =
+ public void testInclude() throws PartInitException, Throwable {
+ performTestForFaceletComponent("include.xhtml"); // $NON-NLS-1$
+ // TODO check that absolute and related path is processed
+ assertTrue("Template with absolute path is not included",false);
+ assertTrue("Template with related path is not included",false); =
+ }
+ =
+ public void testFragment() throws PartInitException, Throwable {
+ performTestForFaceletComponent("fragment.xhtml"); // $NON-NLS-1$
+ // TODO check that fragment's content is showed
+ assertTrue("Fragment's content is not sown",false);
+ }
private void performTestForFaceletComponent(String componentPage)
throws PartInitException, Throwable {
waitForJobs();
--===============1050903399500769560==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 02:51:54 2008
Content-Type: multipart/mixed; boundary="===============1580509917110279590=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5534 -
trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun.
Date: Wed, 09 Jan 2008 02:51:54 -0500
Message-ID:
--===============1580509917110279590==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-09 02:51:54 -0500 (Wed, 09 Jan 2008)
New Revision: 5534
Modified:
trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/f=
irstrun/JBossASAdapterInitializer.java
Log:
fix for initJBossAS that always return null
Modified: trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tool=
s/jst/firstrun/JBossASAdapterInitializer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/=
firstrun/JBossASAdapterInitializer.java 2008-01-09 06:56:37 UTC (rev 5533)
+++ trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/=
firstrun/JBossASAdapterInitializer.java 2008-01-09 07:51:54 UTC (rev 5534)
@@ -94,7 +94,7 @@
try {
JstFirstRunPlugin.getDefault().getPreferenceStore().setDefault(FIRST_ST=
ART_PREFERENCE_NAME, true);
boolean firstStart =3D JstFirstRunPlugin.getDefault().getPreferenceStor=
e().getBoolean(FIRST_START_PREFERENCE_NAME);
- if(!firstStart) {
+ if (!firstStart) {
return;
}
JstFirstRunPlugin.getDefault().getPreferenceStore().setValue(FIRST_STAR=
T_PREFERENCE_NAME, false);
@@ -102,7 +102,7 @@
String jbossASLocation =3D null;
String pluginLocation =3D FileLocator.resolve(JstFirstRunPlugin.getDefa=
ult().getBundle().getEntry("/")).getPath();
File jbossASDir =3D new File(pluginLocation, JBOSS_AS_HOME);
- if(jbossASDir.isDirectory()) {
+ if (jbossASDir.isDirectory()) {
jbossASLocation =3D jbossASDir.getAbsolutePath();
} else {
return;
@@ -111,48 +111,48 @@
IPath jbossAsLocationPath =3D new Path(jbossASLocation);
=
IServer[] servers =3D ServerCore.getServers();
- for(int i=3D0; i0) {
+ if (runtimeTypes.length > 0) {
runtime =3D runtimeTypes[0].createRuntime(runtimeId, progressMonitor);
runtime.setLocation(jbossAsLocationPath);
IVMInstall defaultVM =3D JavaRuntime.getDefaultVMInstall();
// IJBossServerRuntime.PROPERTY_VM_ID
- ((RuntimeWorkingCopy)runtime).setAttribute("PROPERTY_VM_ID", defaultVM.=
getId());
+ ((RuntimeWorkingCopy) runtime).setAttribute("PROPERTY_VM_ID", defaultVM=
.getId());
// IJBossServerRuntime.PROPERTY_VM_TYPE_ID
- ((RuntimeWorkingCopy)runtime).setAttribute("PROPERTY_VM_TYPE_ID", defau=
ltVM.getVMInstallType().getId());
+ ((RuntimeWorkingCopy) runtime).setAttribute("PROPERTY_VM_TYPE_ID", defa=
ultVM.getVMInstallType().getId());
// IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME
- ((RuntimeWorkingCopy)runtime).setAttribute("org.jboss.ide.eclipse.as.co=
re.runtime.configurationName", JBOSS_AS_DEFAULT_CONFIGURATION_NAME);
+ ((RuntimeWorkingCopy) runtime).setAttribute("org.jboss.ide.eclipse.as.c=
ore.runtime.configurationName", JBOSS_AS_DEFAULT_CONFIGURATION_NAME);
=
runtime.save(false, progressMonitor);
}
@@ -212,11 +212,11 @@
server.setName(JBOSS_AS_NAME);
// JBossServer.DEPLOY_DIRECTORY
String deployVal =3D runtime.getLocation().append("server").append(JBOSS=
_AS_DEFAULT_CONFIGURATION_NAME).append("deploy").toOSString();
- ((ServerWorkingCopy)server).setAttribute("org.jboss.ide.eclipse.as.core.=
server.deployDirectory", deployVal);
+ ((ServerWorkingCopy) server).setAttribute("org.jboss.ide.eclipse.as.core=
.server.deployDirectory", deployVal);
=
// IDeployableServer.TEMP_DEPLOY_DIRECTORY
String deployTmpFolderVal =3D runtime.getLocation().append("server").app=
end(JBOSS_AS_DEFAULT_CONFIGURATION_NAME).append("tmp").append("jbosstoolsTe=
mp").toOSString();
- ((ServerWorkingCopy)server).setAttribute("org.jboss.ide.eclipse.as.core.=
server.tempDeployDirectory", deployTmpFolderVal);
+ ((ServerWorkingCopy) server).setAttribute("org.jboss.ide.eclipse.as.core=
.server.tempDeployDirectory", deployTmpFolderVal);
=
// If we'd need to set up a username / pw for JMX, do it here.
// ((ServerWorkingCopy)serverWC).setAttribute(JBossServer.SERVER_USERNAME=
, authUser);
@@ -260,7 +260,7 @@
}
=
driver =3D DriverManager.getInstance().getDriverInstanceByName(HSQL_DRIV=
ER_NAME);
- if (driver !=3D null) {
+ if (driver !=3D null && ProfileManager.getInstance().getProfileByName("D=
efaultDS") =3D=3D null) {
// create profile
Properties props =3D new Properties();
props.setProperty(ConnectionProfileConstants.PROP_DRIVER_DEFINITION_ID,=
HSQL_DRIVER_DEFINITION_ID);
--===============1580509917110279590==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 02:52:38 2008
Content-Type: multipart/mixed; boundary="===============6436097358002594688=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5535 -
trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util.
Date: Wed, 09 Jan 2008 02:52:38 -0500
Message-ID:
--===============6436097358002594688==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-09 02:52:38 -0500 (Wed, 09 Jan 2008)
New Revision: 5535
Modified:
trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/commo=
n/test/util/TestProjectProvider.java
Log:
System.out.println removed
Modified: trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tool=
s/common/test/util/TestProjectProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/comm=
on/test/util/TestProjectProvider.java 2008-01-09 07:51:54 UTC (rev 5534)
+++ trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/comm=
on/test/util/TestProjectProvider.java 2008-01-09 07:52:38 UTC (rev 5535)
@@ -69,7 +69,6 @@
}
=
private void init(String bundleName, String projectPath, String name) thr=
ows Exception {
- System.out.println("init");
IProject p =3D ResourcesPlugin.getWorkspace().getRoot().getProject(name);
if(p.exists()) {
project =3D p;
@@ -79,7 +78,6 @@
}
return;
}
- System.out.println("create");
=
Bundle bundle =3D Platform.getBundle(bundleName);
URL url =3D null;
--===============6436097358002594688==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 02:55:02 2008
Content-Type: multipart/mixed; boundary="===============7389567963482066949=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5536 -
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test.
Date: Wed, 09 Jan 2008 02:55:02 -0500
Message-ID:
--===============7389567963482066949==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-09 02:55:02 -0500 (Wed, 09 Jan 2008)
New Revision: 5536
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web=
/test/WebContentAssistProviderTest.java
Log:
Test error was fixed
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/=
jst/web/test/WebContentAssistProviderTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/we=
b/test/WebContentAssistProviderTest.java 2008-01-09 07:52:38 UTC (rev 5535)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/we=
b/test/WebContentAssistProviderTest.java 2008-01-09 07:55:02 UTC (rev 5536)
@@ -19,6 +19,7 @@
=
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
@@ -46,6 +47,7 @@
}
=
public void testJsfBeanPropertyList() {
+ waitForJobs();
// seam beans list
List beanList =3D webPromptingProvider.getList(projectModel, WebPromptin=
gProvider.JSF_BEAN_PROPERTIES, "facesManagedBean", new Properties());
assertTrue("Bean property list does not contain Managed bean property in=
XModel.", beanList.contains("property1"));
@@ -77,11 +79,9 @@
public void setUp() throws Exception {
provider =3D new TestProjectProvider("org.jboss.tools.jst.web.test", nul=
l, "TestsWebArtefacts", makeCopy); =
project =3D provider.getProject();
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception e) {
- ModelPlugin.getPluginLog().logError(e);
- }
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ project.build(IncrementalProjectBuilder.FULL_BUILD,null);
+ waitForJobs();
XModelObject xmo =3D EclipseResourceUtil.getObjectByResource(project);
assertNotNull("Can't get XModel Object for test project.", xmo);
projectModel =3D xmo.getModel();
--===============7389567963482066949==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 03:00:07 2008
Content-Type: multipart/mixed; boundary="===============6935927538895968726=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5537 - in
trunk/seam/tests/org.jboss.tools.seam.core.test:
src/org/jboss/tools/seam/core/test and 1 other directory.
Date: Wed, 09 Jan 2008 03:00:05 -0500
Message-ID:
--===============6935927538895968726==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-09 03:00:04 -0500 (Wed, 09 Jan 2008)
New Revision: 5537
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam=
/core/test/ScannerTest.java
Log:
EditorTestHelper.joinBackgroundActivities(); used to test how it works. =
SetUp method was switched from TestProjectProvider to importProject that cr=
eates copy of project in current workspace.
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST=
.MF
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 20=
08-01-09 07:55:02 UTC (rev 5536)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 20=
08-01-09 08:00:04 UTC (rev 5537)
@@ -21,5 +21,8 @@
org.eclipse.ui.workbench,
org.eclipse.wst.common.modulecore,
org.eclipse.wst.common.frameworks,
- org.eclipse.jface
+ org.eclipse.jface,
+ org.jboss.tools.jst.firstrun,
+ org.eclipse.wst.server.core,
+ org.eclipse.datatools.connectivity
Provide-Package: org.jboss.tools.seam.core.test
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/too=
ls/seam/core/test/ScannerTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea=
m/core/test/ScannerTest.java 2008-01-09 07:55:02 UTC (rev 5536)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea=
m/core/test/ScannerTest.java 2008-01-09 08:00:04 UTC (rev 5537)
@@ -50,46 +50,27 @@
import org.jboss.tools.seam.internal.core.scanner.lib.ClassPath;
import org.jboss.tools.seam.internal.core.scanner.lib.LibraryScanner;
import org.jboss.tools.test.util.JUnitUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.test.util.xpl.EditorTestHelper;
=
public class ScannerTest extends TestCase {
- TestProjectProvider provider =3D null;
IProject project =3D null;
boolean makeCopy =3D true;
=
- public ScannerTest() {}
+ public ScannerTest() {
+ super("Seam Scanner test");
+ }
=
protected void setUp() throws Exception {
- provider =3D new TestProjectProvider("org.jboss.tools.seam.core.test", n=
ull, "TestScanner", true); =
- project =3D provider.getProject();
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor(=
));
- } catch (Exception e) {
- JUnitUtils.fail("Error in refreshing",e);
- }
- try {
- XJob.waitForJob();
- } catch (InterruptedException e) {
- JUnitUtils.fail("Interrupted",e);
- }
+ project =3D ResourcesUtils.importProject(
+ "org.jboss.tools.seam.core.test","/projects/TestScanner" , new NullPro=
gressMonitor());
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()=
);
+ EditorTestHelper.joinBackgroundActivities();
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMoni=
tor());
+ EditorTestHelper.joinBackgroundActivities();
}
- =
+
private ISeamProject getSeamProject() {
- try {
- XJob.waitForJob();
- } catch (Exception e) {
- JUnitUtils.fail("Interrupted",e);
- }
- try {
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMon=
itor());
- try {
- XJob.waitForJob();
- } catch (InterruptedException e) {
- JUnitUtils.fail("Interrupted",e);
- }
- } catch (Exception e) {
- e.printStackTrace();
- JUnitUtils.fail("Cannot build",e);
- }
ISeamProject seamProject =3D null;
try {
seamProject =3D (ISeamProject)project.getNature(SeamProject.NATURE_ID);
@@ -321,7 +302,7 @@
=
try {
project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMon=
itor());
- XJob.waitForJob();
+ EditorTestHelper.joinBackgroundActivities();
} catch (Exception e) {
JUnitUtils.fail("Cannot build",e);
}
@@ -501,4 +482,9 @@
assertTrue("Component inner_JBIDE_1374 declared in inner static class is=
not found.", c !=3D null);
}
=
+ @Override
+ protected void tearDown() throws Exception {
+ EditorTestHelper.joinBackgroundActivities();
+ project.delete(true,true, null);
+ }
}
--===============6935927538895968726==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 03:02:39 2008
Content-Type: multipart/mixed; boundary="===============3623471175696448139=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5538 - in
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test:
wizard and 1 other directory.
Date: Wed, 09 Jan 2008 03:02:39 -0500
Message-ID:
--===============3623471175696448139==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-09 03:02:39 -0500 (Wed, 09 Jan 2008)
New Revision: 5538
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/u=
i/test/hyperlink/SeamViewHyperlinkPartitionerTest.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/u=
i/test/wizard/SeamProjectNewWizardTest.java
Log:
Test errors were fixed
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools=
/seam/ui/test/hyperlink/SeamViewHyperlinkPartitionerTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/=
ui/test/hyperlink/SeamViewHyperlinkPartitionerTest.java 2008-01-09 08:00:04=
UTC (rev 5537)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/=
ui/test/hyperlink/SeamViewHyperlinkPartitionerTest.java 2008-01-09 08:02:39=
UTC (rev 5538)
@@ -11,6 +11,8 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentExtension3;
@@ -30,9 +32,10 @@
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
import org.jboss.tools.common.text.ext.util.AxisUtil;
import org.jboss.tools.seam.text.ext.hyperlink.SeamViewHyperlinkPartitione=
r;
+import org.jboss.tools.test.util.ResourcesUtils;
=
public class SeamViewHyperlinkPartitionerTest extends TestCase {
- TestProjectProvider provider =3D null;
+
IProject project =3D null;
boolean makeCopy =3D false;
private static final String PROJECT_NAME =3D "TestSeamELContentAssist";
@@ -43,21 +46,15 @@
}
=
public void setUp() throws Exception {
- provider =3D new TestProjectProvider("org.jboss.tools.seam.ui.test", nul=
l, PROJECT_NAME, makeCopy); =
- project =3D provider.getProject();
+ //provider =3D new TestProjectProvider("", null, PROJECT_NAME, makeCopy)=
; =
+ project =3D ResourcesUtils.importProject(Platform.getBundle("org.jboss.t=
ools.seam.ui.test"), "/projects/TestSeamELContentAssist", new NullProgressM=
onitor());
Throwable exception =3D null;
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception x) {
- exception =3D x;
- x.printStackTrace();
- }
- assertNull("An exception caught: " + (exception !=3D null? exception.get=
Message() : ""), exception);
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
}
=
protected void tearDown() throws Exception {
- if(provider !=3D null) {
- provider.dispose();
+ if(project !=3D null) {
+ project.delete(true, true, null);
}
}
=
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools=
/seam/ui/test/wizard/SeamProjectNewWizardTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/=
ui/test/wizard/SeamProjectNewWizardTest.java 2008-01-09 08:00:04 UTC (rev 5=
537)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/=
ui/test/wizard/SeamProjectNewWizardTest.java 2008-01-09 08:02:39 UTC (rev 5=
538)
@@ -26,6 +26,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDat=
aModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWiz=
ard;
import org.jboss.tools.common.util.WorkbenchUtils;
import org.jboss.tools.jst.firstrun.JBossASAdapterInitializer;
@@ -40,9 +41,22 @@
*/
public class SeamProjectNewWizardTest extends TestCase{
=
+ =
+ /**
+ * =
+ */
+ private static final String SEAM_2_0_0_RT_NAME =3D "Seam 2.0";
+ /**
+ * =
+ */
+ private static final String SEAM_1_2_1_RT_NAME =3D "Seam 1.2.1";
+ public static final String JBOSS_AS_42_HOME =
+ =3D System.getProperty("jbosstools.test.jboss.home.4.2", "C:\\java\\jbos=
s-4.2.2.GA");
NewProjectDataModelFacetWizard wizard;
IWizardPage startSeamPrjWzPg;
-
+ SeamRuntimeManager manager =3D SeamRuntimeManager.getInstance();
+ =
+ =
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -83,7 +97,9 @@
=
// Create JBoss AS Runtime, Server, HSQL DB Driver
try {
- JBossASAdapterInitializer.initJBossAS("", new NullProgressMonitor());
+ IServerWorkingCopy server =3D JBossASAdapterInitializer.initJBossAS(JBO=
SS_AS_42_HOME, new NullProgressMonitor());
+ System.out.println(server.getName());
+ System.out.println(server.getRuntime().getName());
} catch (CoreException e) {
fail("Cannot create JBoss AS Runtime, Server or HSQL Driver for unexist=
ed AS location to test New Seam Project Wizard. " + e.getMessage());
} catch (ConnectionProfileException e) {
@@ -91,14 +107,12 @@
}
=
// Create Seam Runtime and set proper field
- SeamRuntimeManager manager =3D SeamRuntimeManager.getInstance();
-
Bundle seamTest =3D Platform.getBundle("org.jboss.tools.seam.ui.test");
try {
URL seamUrl =3D FileLocator.resolve(seamTest.getEntry("/seam"));
File folder =3D new File(seamUrl.getPath());
- manager.addRuntime("Seam 1.2.1", folder.getAbsolutePath(), SeamVersion.=
SEAM_1_2, true);
- manager.addRuntime("Seam 2.0", folder.getAbsolutePath(), SeamVersion.SE=
AM_2_0, true);
+ manager.addRuntime(SEAM_1_2_1_RT_NAME, folder.getAbsolutePath(), SeamVe=
rsion.SEAM_1_2, true);
+ manager.addRuntime(SEAM_2_0_0_RT_NAME, folder.getAbsolutePath(), SeamVe=
rsion.SEAM_2_0, true);
} catch (IOException e) {
fail("Cannot create Seam Runtime to test New Seam Project Wizard. " + e=
.getMessage());
}
@@ -122,5 +136,15 @@
assertTrue("Finish button is disabled at first wizard page in spite of c=
reated JBoss AS Runtime, Server, DB Connection and Seam Runtime and valid p=
roject name.", canFinish);
=
wizard.performCancel();
+ =
+ manager.removeRuntime(manager.findRuntimeByName(SEAM_1_2_1_RT_NAME));
+ manager.removeRuntime(manager.findRuntimeByName(SEAM_2_0_0_RT_NAME)); =
+ =
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+ =
}
\ No newline at end of file
--===============3623471175696448139==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 03:02:44 2008
Content-Type: multipart/mixed; boundary="===============5675277635824690736=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5539 - in
trunk/tests/tests/org.jboss.tools.test: src/org/jboss/tools/test/util and 1
other directory.
Date: Wed, 09 Jan 2008 03:02:43 -0500
Message-ID:
--===============5675277635824690736==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-09 03:02:43 -0500 (Wed, 09 Jan 2008)
New Revision: 5539
Modified:
trunk/tests/tests/org.jboss.tools.test/META-INF/MANIFEST.MF
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/Res=
ourcesUtils.java
Log:
Test errors were fixed
Modified: trunk/tests/tests/org.jboss.tools.test/META-INF/MANIFEST.MF
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tests/tests/org.jboss.tools.test/META-INF/MANIFEST.MF 2008-01-09 =
08:02:39 UTC (rev 5538)
+++ trunk/tests/tests/org.jboss.tools.test/META-INF/MANIFEST.MF 2008-01-09 =
08:02:43 UTC (rev 5539)
@@ -12,5 +12,6 @@
Provide-Package: org.jboss.ide.tests.util
Eclipse-LazyStart: true
Export-Package: org.jboss.tools.test.util,
+ org.jboss.tools.test.util.xpl,
org.jboss.tools.tests
Bundle-ClassPath: tools-tests.jar
Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/u=
til/ResourcesUtils.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/Re=
sourcesUtils.java 2008-01-09 08:02:39 UTC (rev 5538)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/Re=
sourcesUtils.java 2008-01-09 08:02:43 UTC (rev 5539)
@@ -31,6 +31,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.swt.widgets.Display;
@@ -113,6 +114,13 @@
return project;
}
=
+ public static IProject createEclipseProject(String bundle,
+ String templateLocation, IProgressMonitor monitor)
+ throws CoreException, IOException {
+ return createEclipseProject(
+ Platform.getBundle(bundle), templateLocation, monitor);
+ }
+ =
public static boolean findLineInFile(IFile file, String pattern) throws C=
oreException, IOException {
InputStream content =3D file.getContents(true);
LineNumberReader contentReader =3D new LineNumberReader(new InputStreamR=
eader(content));
@@ -126,4 +134,20 @@
} while (line !=3D null && !patternIsFound);
return patternIsFound;
}
+
+ /**
+ * @param string
+ * @param string2
+ * @param nullProgressMonitor
+ * @return
+ * @throws InterruptedException =
+ * @throws InvocationTargetException =
+ * @throws CoreException =
+ * @throws IOException =
+ */
+ public static IProject importProject(String bundleName, String templatePa=
th,
+ NullProgressMonitor monitor) throws IOException, CoreException, Invocat=
ionTargetException, InterruptedException {
+ // TODO Auto-generated method stub
+ return importProject(Platform.getBundle(bundleName), templatePath, monit=
or);
+ }
}
--===============5675277635824690736==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 04:23:32 2008
Content-Type: multipart/mixed; boundary="===============3301855320332383367=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5540 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE.
Date: Wed, 09 Jan 2008 04:23:32 -0500
Message-ID:
--===============3301855320332383367==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-09 04:23:32 -0500 (Wed, 09 Jan 2008)
New Revision: 5540
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/JBIDE/JBIDE-1467/
Log:
update junit
--===============3301855320332383367==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 04:34:47 2008
Content-Type: multipart/mixed; boundary="===============3467961376914688349=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5541 - in
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE:
1467 and 1 other directory.
Date: Wed, 09 Jan 2008 04:34:47 -0500
Message-ID:
--===============3467961376914688349==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-09 04:34:47 -0500 (Wed, 09 Jan 2008)
New Revision: 5541
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/JBIDE/1467/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/JBIDE/1467/JBIDE-1467.jsp
Log:
update junit
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W=
ebContent/pages/JBIDE/1467/JBIDE-1467.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/JBIDE/1467/JBIDE-1467.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/JBIDE/1467/JBIDE-1467.jsp 2008-01-09 09:34:47 UTC (rev 5541)
@@ -0,0 +1,22 @@
+<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%>
+<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
--===============3467961376914688349==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 04:35:08 2008
Content-Type: multipart/mixed; boundary="===============3020551536881343491=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5542 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
Date: Wed, 09 Jan 2008 04:35:07 -0500
Message-ID:
--===============3020551536881343491==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-09 04:35:07 -0500 (Wed, 09 Jan 2008)
New Revision: 5542
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfJbideTest.java
Log:
update junit
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfJbideTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfJbideTest.java 2008-01-09 09:34:47 UTC (rev 5541)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfJbideTest.java 2008-01-09 09:35:07 UTC (rev 5542)
@@ -72,7 +72,7 @@
=
// get test page path
IFile file =3D (IFile) TestUtil
- .getComponentPath("JBIDE/JBIDE-1467/JBIDE-1467.jsp",getImportProjectNa=
me());
+ .getComponentPath("JBIDE/1467/JBIDE-1467.jsp",getImportProjectName());
=
assertNotNull("Could not open specified file "+file.getFullPath(), file);
=
--===============3020551536881343491==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 04:36:03 2008
Content-Type: multipart/mixed; boundary="===============0016257102843959674=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5543 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test.
Date: Wed, 09 Jan 2008 04:36:03 -0500
Message-ID:
--===============0016257102843959674==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-09 04:36:03 -0500 (Wed, 09 Jan 2008)
New Revision: 5543
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/=
ui/test/VpeTest.java
Log:
close editors before removing of project =
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/too=
ls/vpe/ui/test/VpeTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/VpeTest.java 2008-01-09 09:35:07 UTC (rev 5542)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/VpeTest.java 2008-01-09 09:36:03 UTC (rev 5543)
@@ -98,13 +98,18 @@
protected void tearDown() throws Exception {
=
super.tearDown();
+ =
+ closeEditors();
+
TestUtil.removeProject(getImportProjectName());
Platform.removeLogListener(this);
- =
- closeEditors();
+
}
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.ru=
ntime.IStatus, java.lang.String)
+ /*
+ * (non-Javadoc)
+ * =
+ * @see org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.ru=
ntime.IStatus,
+ * java.lang.String)
*/
public void logging(IStatus status, String plugin) {
switch (status.getSeverity()) {
--===============0016257102843959674==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 06:03:12 2008
Content-Type: multipart/mixed; boundary="===============7638955799728859040=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5544 -
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject.
Date: Wed, 09 Jan 2008 06:03:11 -0500
Message-ID:
--===============7638955799728859040==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgeraskov
Date: 2008-01-09 06:03:11 -0500 (Wed, 09 Jan 2008)
New Revision: 5544
Added:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/HibernateNatureRemoveTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java
Removed:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/HibernateNatureTest.java
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/TestSet.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1571
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/or=
g/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java =
(rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java =
2008-01-09 11:03:11 UTC (rev 5544)
@@ -0,0 +1,182 @@
+package org.hibernate.eclipse.console.test.mappingproject;
+
+import java.util.Enumeration;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestFailure;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.core.PackageFragmentRoot;
+import org.eclipse.jdt.ui.IPackagesViewPart;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+
+public class HibernateAllMappingTests extends TestCase {
+
+ private MappingTestProject project;
+ =
+ private static IPackageFragment activePackage;
+
+ public HibernateAllMappingTests(String name) {
+ super(name);
+ }
+ =
+ private TestResult result =3D null;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ this.project =3D MappingTestProject.getTestProject();
+
+ //PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().c=
loseAllPerspectives(false, true);
+ =
+ =
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().set=
Perspective(
+ PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWith=
Id("org.eclipse.ui.resourcePerspective"));
+ =
+ IPackagesViewPart packageExplorer =3D null; =
+ try {
+ packageExplorer =3D (IPackagesViewPart) PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage().showView(JavaUI.ID_PACKAGE=
S);
+ } catch (PartInitException e) {
+ throw new RuntimeException(e);
+ }
+ =
+ packageExplorer.selectAndReveal(project.getIJavaProject());
+ =
+ waitForJobs();
+ runTestsAfterSetup();
+ }
+
+ private void runTestsAfterSetup() {
+ TestSuite suite =3D TestSetAfterSetup.getTests();
+ for (int i =3D 0; i < suite.testCount(); i++) {
+ Test test =3D suite.testAt(i);
+ test.run(result);
+ /*if (result.failureCount() > 0 || result.errorCount() > 0){
+ // we have failed tests after setup
+ fail(((Throwable)result.failures().nextElement()).getMessage());
+ }*/
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#run(junit.framework.TestResult)
+ */
+ @Override
+ public void run(TestResult result) {
+ this.result =3D result; =
+ super.run(result);
+ } =
+ =
+ public void tearDown() throws Exception {
+ waitForJobs();
+ runTestsBeforeTearDown();
+ waitForJobs();
+ this.project.deleteIProject();
+ waitForJobs();
+ super.tearDown();
+ }
+
+ private void runTestsBeforeTearDown() {
+ TestSuite suite =3D TestSetBeforeTearDown.getTests();
+ for (int i =3D 0; i < suite.testCount(); i++) {
+ Test test =3D suite.testAt(i);
+ test.run(result); =
+ } =
+ }
+
+ /**
+ * Process UI input but do not return for the specified time interval.
+ * =
+ * @param waitTimeMillis
+ * the number of milliseconds
+ */
+ protected void delay(long waitTimeMillis) {
+ Display display =3D Display.getCurrent();
+
+ // If this is the UI thread,
+ // then process input.
+ if (display !=3D null) {
+ long endTimeMillis =3D System.currentTimeMillis() + waitTimeMillis;
+ while (System.currentTimeMillis() < endTimeMillis) {
+ if (!display.readAndDispatch())
+ display.sleep();
+ }
+ display.update();
+ }
+
+ // Otherwise, perform a simple sleep.
+ else {
+ try {
+ Thread.sleep(waitTimeMillis);
+ } catch (InterruptedException e) {
+ // Ignored.
+ }
+ }
+ }
+
+ /**
+ * Wait until all background tasks are complete.
+ */
+ public void waitForJobs() {
+ while (Platform.getJobManager().currentJob() !=3D null)
+ delay(1000);
+ }
+ =
+ protected MappingTestProject getProject() {
+ return this.project;
+ } =
+ =
+ public void testEachPackWithTestSet() throws JavaModelException {
+ /*if (result.failureCount() > 0 || result.errorCount() > 0){
+ // we have failed tests after setup
+ fail("One or more setup test failed.");
+ }*/
+ TestSuite suite =3D TestSet.getTests();
+ IPackageFragmentRoot[] roots =3D project.getIJavaProject().getAllPackage=
FragmentRoots(); =
+ for (int i =3D 0; i < roots.length; i++) {
+ if (roots[i].getClass() !=3D PackageFragmentRoot.class) continue;
+ PackageFragmentRoot packageFragmentRoot =3D (PackageFragmentRoot) roots=
[i];
+ IJavaElement[] els =3D packageFragmentRoot.getChildren();//.getCompilat=
ionUnits();
+ for (int j =3D 0; j < els.length; j++) {
+ IJavaElement javaElement =3D els[j];
+ if (javaElement instanceof IPackageFragment){
+ IPackageFragment pack =3D (IPackageFragment) javaElement;
+ // use packages only with compilation units
+ if (pack.getCompilationUnits().length =3D=3D 0) continue;
+ =
+ activePackage =3D pack;
+ //=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D =
+ //run all tests for package
+ for (int k =3D 0; k < suite.testCount(); k++) {
+ Test test =3D suite.testAt(k);
+ test.run(result);
+ waitForJobs();
+ }
+ //=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D
+ }
+ } =
+ }
+ waitForJobs();
+ //delay(2000);
+ }
+
+ /**
+ * @return the activePackage
+ */
+ public static IPackageFragment getActivePackage() {
+ return activePackage;
+ }
+}
+ =
\ No newline at end of file
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/or=
g/hibernate/eclipse/console/test/mappingproject/HibernateNatureRemoveTest.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/HibernateNatureRemoveTest.java=
(rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/HibernateNatureRemoveTest.java=
2008-01-09 11:03:11 UTC (rev 5544)
@@ -0,0 +1,21 @@
+package org.hibernate.eclipse.console.test.mappingproject;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.IJavaProject;
+import org.hibernate.eclipse.console.utils.ProjectUtils;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class HibernateNatureRemoveTest extends TestCase {
+ public void testEnableHibernateNature() throws BackingStoreException, Cor=
eException {
+ MappingTestProject project =3D MappingTestProject.getTestProject();
+ IJavaProject prj =3D project.getIJavaProject();
+ ProjectUtils.removeProjectNature(prj.getProject(), "org.hibernate.eclips=
e.console.hibernateNature", new NullProgressMonitor() );
+ }
+}
Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.conso=
le.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatu=
reRemoveTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Deleted: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/=
org/hibernate/eclipse/console/test/mappingproject/HibernateNatureTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/HibernateNatureTest.java 2008-=
01-09 09:36:03 UTC (rev 5543)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/HibernateNatureTest.java 2008-=
01-09 11:03:11 UTC (rev 5544)
@@ -1,33 +0,0 @@
-package org.hibernate.eclipse.console.test.mappingproject;
-
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.jdt.core.IJavaProject;
-import org.hibernate.eclipse.console.utils.ProjectUtils;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-import junit.framework.TestCase;
-
-/**
- * @author Dmitry Geraskov
- *
- */
-public class HibernateNatureTest extends TestCase {
- public void testEnableHibernateNature() throws BackingStoreException, Cor=
eException {
- MappingTestProject project =3D MappingTestProject.getTestProject();
- IJavaProject prj =3D project.getIJavaProject();
- IScopeContext scope =3D new ProjectScope(prj.getProject() );
-
- Preferences node =3D scope.getNode("org.hibernate.eclipse.console");
-
- node.putBoolean("hibernate3.enabled", true );
- node.put("default.configuration", "testcfg" );
- node.flush();
-
- ProjectUtils.addProjectNature(prj.getProject(), "org.hibernate.eclipse.c=
onsole.hibernateNature", new NullProgressMonitor() );
- ProjectUtils.removeProjectNature(prj.getProject(), "org.hibernate.eclips=
e.console.hibernateNature", new NullProgressMonitor() );
- }
-}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src=
/org/hibernate/eclipse/console/test/mappingproject/TestSet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSet.java 2008-01-09 09:36:=
03 UTC (rev 5543)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSet.java 2008-01-09 11:03:=
11 UTC (rev 5544)
@@ -8,13 +8,31 @@
*/
public class TestSet{
=
+ /** =
+ * use only addTestSuit to prevent errors!!!
+ * @return
+ */
public static TestSuite getTests(){
TestSuite suite =3D new TestSuite("Test for MappingTestProject" );
- //use only addTestSuit to prevent errors
- suite.addTestSuite( OpenJavaEditors.class );
- suite.addTestSuite( HibernateNatureTest.class );
+ =
+ addTestsPackSetUp( suite );
+ addPackTests( suite );
+ addTestsPackTearDown( suite ); =
=
return suite;
}
+ =
+ =
+ private static void addTestsPackSetUp(TestSuite suite){
+ //suite.addTestSuite( UpdateConfigurationTest.class );
+ }
+ =
+ private static void addPackTests(TestSuite suite){
+ =
+ }
+ =
+ private static void addTestsPackTearDown(TestSuite suite){
+ //suite.addTestSuite( CloaseAllEditorsTest.class );
+ }
=
}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/or=
g/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java =
(rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java 2008-01=
-09 11:03:11 UTC (rev 5544)
@@ -0,0 +1,16 @@
+package org.hibernate.eclipse.console.test.mappingproject;
+
+import junit.framework.TestSuite;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class TestSetAfterSetup {
+ public static TestSuite getTests(){
+ TestSuite suite =3D new TestSuite("Test for MappingTestProject" );
+ suite.addTestSuite( HibernateNatureAddTest.class );
+ //suite.addTestSuite( CreateConsoleConfigTest.class );
+ return suite;
+ }
+}
Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.conso=
le.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterS=
etup.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/or=
g/hibernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java =
(rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java 200=
8-01-09 11:03:11 UTC (rev 5544)
@@ -0,0 +1,16 @@
+package org.hibernate.eclipse.console.test.mappingproject;
+
+import junit.framework.TestSuite;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class TestSetBeforeTearDown {
+ public static TestSuite getTests(){
+ TestSuite suite =3D new TestSuite("Test for MappingTestProject" );
+ suite.addTestSuite( HibernateNatureRemoveTest.class );
+ =
+ return suite;
+ }
+}
Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.conso=
le.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetBefore=
TearDown.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
--===============7638955799728859040==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 06:10:22 2008
Content-Type: multipart/mixed; boundary="===============8878980589679925746=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5545 -
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject.
Date: Wed, 09 Jan 2008 06:10:21 -0500
Message-ID:
--===============8878980589679925746==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgeraskov
Date: 2008-01-09 06:10:21 -0500 (Wed, 09 Jan 2008)
New Revision: 5545
Added:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/ProjectUtil.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1571
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/or=
g/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/ProjectUtil.java =
(rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/ProjectUtil.java 2008-01-09 11=
:10:21 UTC (rev 5545)
@@ -0,0 +1,81 @@
+package org.hibernate.eclipse.console.test.mappingproject;
+
+import java.util.Iterator;
+
+import org.apache.tools.ant.filters.StringInputStream;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IType;
+import org.hibernate.mapping.PersistentClass;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class ProjectUtil {
+ =
+ private static final StringBuilder XML_HEADER =3D new StringBuilder("\n")
+ .append("\n");
+ =
+ private static final StringBuilder XML_CFG_START =3D new StringBuilder("<=
hibernate-configuration>\n")
+ .append("\n")
+ .append("\n")
+ .append("org.hibernate.dialect.SQLServerDialect\n"=
);
+ =
+ private static final StringBuilder XML_CFG_END =3D new StringBuilder("\n")
+ .append("\n"); =
+ =
+ =
+ public static final String CFG_FILE_NAME =3D "hibernate.cfg.xml";
+ =
+ public static void customizeCFGFileForPack(IPackageFragment pack) throws =
CoreException{
+ IFolder srcFolder =3D (IFolder) pack.getParent().getResource();
+ IFile iFile =3D srcFolder.getFile(CFG_FILE_NAME);
+ if (iFile.exists()) {
+ iFile.delete(true, null);
+ }
+ String file_boby =3D XML_HEADER.toString() + XML_CFG_START.toString();
+ if (pack.getNonJavaResources().length > 0){
+ Object[] ress =3D pack.getNonJavaResources();
+ for (int i =3D 0; i < ress.length; i++) {
+ if (ress[i] instanceof IFile){
+ IFile res =3D (IFile)ress[i];
+ if (res.getName().endsWith(".hbm.xml")){
+ file_boby +=3D "\n";
+ }
+ }
+ }
+ } =
+ /*if (pack.getCompilationUnits().length > 0){
+ ICompilationUnit[] comps =3D pack.getCompilationUnits();
+ for (int i =3D 0; i < comps.length; i++) {
+ ICompilationUnit compilationUnit =3D comps[i];
+ IType[] types =3D compilationUnit.getTypes();
+ for (int j =3D 0; j < types.length; j++) {
+ IType type =3D types[j];
+ if (type.isAnnotation()){
+ System.out.println(type);
+ }
+ }
+ }
+ }*/
+
+ file_boby +=3D XML_CFG_END.toString();
+ iFile.create(new StringInputStream(file_boby),
+ true, null);
+ }
+ =
+ public static String getPersistentClassName(PersistentClass persClass) {
+ if (persClass =3D=3D null) {
+ return "";
+ } else { =
+ return persClass.getEntityName() !=3D null ? persClass.getEntityName() =
: persClass.getClassName();
+ }
+ }
+
+}
Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.conso=
le.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.j=
ava
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
--===============8878980589679925746==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 06:10:41 2008
Content-Type: multipart/mixed; boundary="===============6377057719595959520=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5546 -
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject.
Date: Wed, 09 Jan 2008 06:10:41 -0500
Message-ID:
--===============6377057719595959520==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgeraskov
Date: 2008-01-09 06:10:41 -0500 (Wed, 09 Jan 2008)
New Revision: 5546
Added:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/TestSet.java
Log:
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src=
/org/hibernate/eclipse/console/test/mappingproject/TestSet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSet.java 2008-01-09 11:10:=
21 UTC (rev 5545)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSet.java 2008-01-09 11:10:=
41 UTC (rev 5546)
@@ -24,7 +24,7 @@
=
=
private static void addTestsPackSetUp(TestSuite suite){
- //suite.addTestSuite( UpdateConfigurationTest.class );
+ suite.addTestSuite( UpdateConfigurationTest.class );
}
=
private static void addPackTests(TestSuite suite){
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/or=
g/hibernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java =
(rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java 2=
008-01-09 11:10:41 UTC (rev 5546)
@@ -0,0 +1,26 @@
+package org.hibernate.eclipse.console.test.mappingproject;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.JavaModelException;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class UpdateConfigurationTest extends TestCase {
+ =
+ public void testUpdateConfiguration() throws JavaModelException{
+ //fail("test fail");
+ IPackageFragment pack =3D HibernateAllMappingTests.getActivePackage();
+ assertNotNull( pack );
+ try {
+ ProjectUtil.customizeCFGFileForPack(pack);
+ } catch (CoreException e) {
+ fail("Error customising " + ProjectUtil.CFG_FILE_NAME + " file for pack=
age " =
+ + pack.getPath() + ".\n" + e.getMessage());
+ }
+ }
+}
Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.conso=
le.test/src/org/hibernate/eclipse/console/test/mappingproject/UpdateConfigu=
rationTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
--===============6377057719595959520==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 06:13:39 2008
Content-Type: multipart/mixed; boundary="===============6496205417917139857=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5547 -
trunk/jsf/docs/userguide/en/images/editors_features.
Date: Wed, 09 Jan 2008 06:13:39 -0500
Message-ID:
--===============6496205417917139857==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ykryvinchanka
Date: 2008-01-09 06:13:39 -0500 (Wed, 09 Jan 2008)
New Revision: 5547
Modified:
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_1.p=
ng
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_10.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_11.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_12.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_13.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_14.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_15.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_18.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_19.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_2.p=
ng
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_3.p=
ng
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_4.p=
ng
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_5.p=
ng
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_6.p=
ng
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_7.p=
ng
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8.p=
ng
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_9.p=
ng
Log:
http://jira.jboss.com/jira/browse/JBDS-226 Screens retaken in 96 resolution=
+ scale parameter is defined
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_1.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_10.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_11.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_12.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_13.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_14.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_15.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_18.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_19.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_2.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_3.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_4.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_5.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_6.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_7.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_8.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_9.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
--===============6496205417917139857==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 06:15:39 2008
Content-Type: multipart/mixed; boundary="===============1624874687086448915=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5548 -
trunk/jsf/docs/userguide/en/modules.
Date: Wed, 09 Jan 2008 06:15:39 -0500
Message-ID:
--===============1624874687086448915==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ykryvinchanka
Date: 2008-01-09 06:15:39 -0500 (Wed, 09 Jan 2008)
New Revision: 5548
Modified:
trunk/jsf/docs/userguide/en/modules/editors_features.xml
trunk/jsf/docs/userguide/en/modules/struts_support.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-226 Screens retaken in 96 resolution=
+ scale parameter is defined
Modified: trunk/jsf/docs/userguide/en/modules/editors_features.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/docs/userguide/en/modules/editors_features.xml 2008-01-09 11:=
13:39 UTC (rev 5547)
+++ trunk/jsf/docs/userguide/en/modules/editors_features.xml 2008-01-09 11:=
15:39 UTC (rev 5548)
@@ -27,7 +27,7 @@
NameBean Managed Bean =
-
+
@@ -144,7 +144,7 @@
Content Assist in JSF Configuration File =
-
+
@@ -162,7 +162,7 @@
Content Assist in web.xml File =
-
+
@@ -222,7 +222,7 @@
Content Assist in Tree JSF Configuration Editor =
-
+
Modified: trunk/jsf/docs/userguide/en/modules/struts_support.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/docs/userguide/en/modules/struts_support.xml 2008-01-09 11:13=
:39 UTC (rev 5547)
+++ trunk/jsf/docs/userguide/en/modules/struts_support.xml 2008-01-09 11:15=
:39 UTC (rev 5548)
@@ -437,7 +437,7 @@
Errors in Source Mode
-
+
--===============1624874687086448915==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 07:09:14 2008
Content-Type: multipart/mixed; boundary="===============5962786738724481931=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5549 - in
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors:
popup and 1 other directory.
Date: Wed, 09 Jan 2008 07:09:14 -0500
Message-ID:
--===============5962786738724481931==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: vyemialyanchyk
Date: 2008-01-09 07:09:14 -0500 (Wed, 09 Jan 2008)
New Revision: 5549
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/or=
g/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/or=
g/jboss/tools/hibernate/ui/veditor/editors/popup/PopupMenuProvider.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1413
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor=
/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/o=
rg/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2008-01-09 11=
:15:39 UTC (rev 5548)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/o=
rg/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2008-01-09 12=
:09:14 UTC (rev 5549)
@@ -34,6 +34,7 @@
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.RootClass;
+import org.jboss.tools.hibernate.ui.veditor.editors.actions.AutoLayoutActi=
on;
import org.jboss.tools.hibernate.ui.veditor.editors.actions.ExportImageAct=
ion;
import org.jboss.tools.hibernate.ui.veditor.editors.actions.OpenMappingAct=
ion;
import org.jboss.tools.hibernate.ui.veditor.editors.actions.OpenSourceActi=
on;
@@ -106,6 +107,9 @@
=
action =3D new ExportImageAction(this);
registry.registerAction(action);
+
+ action =3D new AutoLayoutAction(this);
+ registry.registerAction(action);
=
}
=
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor=
/src/org/jboss/tools/hibernate/ui/veditor/editors/popup/PopupMenuProvider.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/o=
rg/jboss/tools/hibernate/ui/veditor/editors/popup/PopupMenuProvider.java 20=
08-01-09 11:15:39 UTC (rev 5548)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/o=
rg/jboss/tools/hibernate/ui/veditor/editors/popup/PopupMenuProvider.java 20=
08-01-09 12:09:14 UTC (rev 5549)
@@ -29,6 +29,7 @@
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
import org.hibernate.mapping.Table;
+import org.jboss.tools.hibernate.ui.veditor.editors.actions.AutoLayoutActi=
on;
import org.jboss.tools.hibernate.ui.veditor.editors.actions.ExportImageAct=
ion;
import org.jboss.tools.hibernate.ui.veditor.editors.actions.OpenMappingAct=
ion;
import org.jboss.tools.hibernate.ui.veditor.editors.actions.OpenSourceActi=
on;
@@ -74,6 +75,10 @@
} =
}
=
+ action =3D getActionRegistry().getAction(AutoLayoutAction.ACTION_ID);
+ appendToGroup(GEFActionConstants.GROUP_VIEW, action);
+ createMenuItem(getMenu(), action);
+ =
action =3D getActionRegistry().getAction(ExportImageAction.ACTION_ID);
appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
createMenuItem(getMenu(), action);
--===============5962786738724481931==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 07:09:45 2008
Content-Type: multipart/mixed; boundary="===============6870595426002384304=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5550 -
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions.
Date: Wed, 09 Jan 2008 07:09:45 -0500
Message-ID:
--===============6870595426002384304==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: vyemialyanchyk
Date: 2008-01-09 07:09:45 -0500 (Wed, 09 Jan 2008)
New Revision: 5550
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/or=
g/jboss/tools/hibernate/ui/veditor/editors/actions/AutoLayoutAction.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1413
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/sr=
c/org/jboss/tools/hibernate/ui/veditor/editors/actions/AutoLayoutAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/o=
rg/jboss/tools/hibernate/ui/veditor/editors/actions/AutoLayoutAction.java =
(rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/o=
rg/jboss/tools/hibernate/ui/veditor/editors/actions/AutoLayoutAction.java 2=
008-01-09 12:09:45 UTC (rev 5550)
@@ -0,0 +1,33 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
+package org.jboss.tools.hibernate.ui.veditor.editors.actions;
+
+import org.eclipse.jface.action.Action;
+import org.jboss.tools.hibernate.ui.veditor.editors.VisualEditor;
+
+public class AutoLayoutAction extends Action {
+
+ public static final String ACTION_ID =3D "Auto layout";
+
+ private VisualEditor editor;
+
+ public AutoLayoutAction(VisualEditor editor) {
+ this.editor =3D editor;
+ setId(ACTION_ID);
+ setText(ACTION_ID);
+ //setImageDescriptor(ImageDescriptor.createFromFile(
+ // VisualEditor.class, "icons/export.png"));
+ }
+
+ public void run() {
+ editor.getViewerContents().update();
+ }
+}
--===============6870595426002384304==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 08:09:06 2008
Content-Type: multipart/mixed; boundary="===============2754442406957396832=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5551 -
trunk/jsf/docs/userguide/en/images/editors_features.
Date: Wed, 09 Jan 2008 08:09:05 -0500
Message-ID:
--===============2754442406957396832==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ykryvinchanka
Date: 2008-01-09 08:09:05 -0500 (Wed, 09 Jan 2008)
New Revision: 5551
Modified:
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_16.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_17.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_20.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_32.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_33.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_34.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_35.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_36.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_37.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_38.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_39.=
png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_40.=
png
Log:
http://jira.jboss.com/jira/browse/JBDS-226 Screens retaken in 96 resolution=
+ scale parameter is defined
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_16.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_17.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_20.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_32.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_33.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_34.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_35.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_36.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_37.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_38.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_39.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_featu=
res_40.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
--===============2754442406957396832==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 08:17:10 2008
Content-Type: multipart/mixed; boundary="===============5810266803431900886=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5552 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
Date: Wed, 09 Jan 2008 08:17:09 -0500
Message-ID:
--===============5810266803431900886==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-09 08:17:09 -0500 (Wed, 09 Jan 2008)
New Revision: 5552
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfJbideTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfComponentTest.java
Log:
update junit (Divide JsfJbideTest)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfAllTests.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfAllTests.java 2008-01-09 13:09:05 UTC (rev 5551)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfAllTests.java 2008-01-09 13:17:09 UTC (rev 5552)
@@ -10,11 +10,12 @@
*************************************************************************=
*****/
package org.jboss.tools.jsf.vpe.jsf.test;
=
-import org.eclipse.core.runtime.CoreException;
-
import junit.framework.Test;
import junit.framework.TestSuite;
=
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1467Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1501Test;
+
/**
* Class for testing all RichFaces components
* =
@@ -29,7 +30,8 @@
TestSuite suite =3D new TestSuite("Tests for Vpe Jsf components"); // $N=
ON-NLS-1$
// $JUnit-BEGIN$
suite.addTestSuite(JsfComponentTest.class);
- suite.addTestSuite(JsfJbideTest.class);
+ suite.addTestSuite(JsfJbide1467Test.class);
+ suite.addTestSuite(JsfJbide1501Test.class);
//cleanUpTests();
// $JUnit-END$
return suite;
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfComponentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfComponentTest.java 2008-01-09 13:09:05 UTC (rev 5551)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfComponentTest.java 2008-01-09 13:17:09 UTC (rev 5552)
@@ -10,7 +10,6 @@
*************************************************************************=
*****/
package org.jboss.tools.jsf.vpe.jsf.test;
=
-import org.eclipse.ui.PartInitException;
import org.jboss.tools.vpe.ui.test.VpeTest;
=
/**
@@ -21,110 +20,110 @@
*/
public class JsfComponentTest extends VpeTest {
=
- //import project name =
- private static final String IMPORT_PROJECT_NAME =3D "jsfTest"; =
- =
+ // import project name
+ private static final String IMPORT_PROJECT_NAME =3D "jsfTest";
+
public JsfComponentTest(String name) {
- super(name,IMPORT_PROJECT_NAME,JsfTestPlugin.getPluginResourcePath());
+ super(name, IMPORT_PROJECT_NAME, JsfTestPlugin.getPluginResourcePath());
}
=
/*
* JSF HTML test cases
*/
=
- public void testCommandButton() throws PartInitException, Throwable {
+ public void testCommandButton() throws Throwable {
performTestForJsfComponent("components/commandButton.jsp"); // $NON-NLS-=
1$
}
=
- public void testCommandLink() throws PartInitException, Throwable {
+ public void testCommandLink() throws Throwable {
performTestForJsfComponent("components/commandLink.jsp"); // $NON-NLS-1$
}
=
- public void testDataTable() throws PartInitException, Throwable {
+ public void testDataTable() throws Throwable {
performTestForJsfComponent("components/dataTable.jsp"); // $NON-NLS-1$
}
=
- public void testForm() throws PartInitException, Throwable {
+ public void testForm() throws Throwable {
performTestForJsfComponent("components/form.jsp"); // $NON-NLS-1$
}
=
- public void testGraphicImage() throws PartInitException, Throwable {
+ public void testGraphicImage() throws Throwable {
performTestForJsfComponent("components/graphicImage.jsp"); // $NON-NLS-1$
}
=
- public void testInputHidden() throws PartInitException, Throwable {
+ public void testInputHidden() throws Throwable {
performTestForJsfComponent("components/inputHidden.jsp"); // $NON-NLS-1$
}
=
- public void testInputSecret() throws PartInitException, Throwable {
+ public void testInputSecret() throws Throwable {
performTestForJsfComponent("components/inputSecret.jsp"); // $NON-NLS-1$
}
=
- public void testInputText() throws PartInitException, Throwable {
+ public void testInputText() throws Throwable {
performTestForJsfComponent("components/inputText.jsp"); // $NON-NLS-1$
}
=
- public void testInputTextArea() throws PartInitException, Throwable {
+ public void testInputTextArea() throws Throwable {
performTestForJsfComponent("components/inputTextArea.jsp"); // $NON-NLS-=
1$
}
=
- public void testMessage() throws PartInitException, Throwable {
+ public void testMessage() throws Throwable {
performTestForJsfComponent("components/message.jsp"); // $NON-NLS-1$
}
=
- public void testMessages() throws PartInitException, Throwable {
+ public void testMessages() throws Throwable {
performTestForJsfComponent("components/messages.jsp"); // $NON-NLS-1$
}
=
- public void testOutputFormat() throws PartInitException, Throwable {
+ public void testOutputFormat() throws Throwable {
performTestForJsfComponent("components/outputFormat.jsp"); // $NON-NLS-1$
}
=
- public void testOutputLabel() throws PartInitException, Throwable {
+ public void testOutputLabel() throws Throwable {
performTestForJsfComponent("components/outputLabel.jsp"); // $NON-NLS-1$
}
=
- public void testOutputLink() throws PartInitException, Throwable {
+ public void testOutputLink() throws Throwable {
performTestForJsfComponent("components/outputLink.jsp"); // $NON-NLS-1$
}
=
- public void testOutputText() throws PartInitException, Throwable {
+ public void testOutputText() throws Throwable {
performTestForJsfComponent("components/outputText.jsp"); // $NON-NLS-1$
}
=
- public void testPanelGrid() throws PartInitException, Throwable {
+ public void testPanelGrid() throws Throwable {
performTestForJsfComponent("components/panelGrid.jsp"); // $NON-NLS-1$
}
=
- public void testPanelGroup() throws PartInitException, Throwable {
+ public void testPanelGroup() throws Throwable {
performTestForJsfComponent("components/panelGroup.jsp"); // $NON-NLS-1$
}
=
- public void testSelectBooleanCheckbox() throws PartInitException, Throwab=
le {
+ public void testSelectBooleanCheckbox() throws Throwable {
performTestForJsfComponent("components/selectBooleanCheckbox.jsp"); // $=
NON-NLS-1$
}
=
- public void testSelectManyCheckbox() throws PartInitException, Throwable {
+ public void testSelectManyCheckbox() throws Throwable {
performTestForJsfComponent("components/selectManyCheckbox.jsp"); // $NON=
-NLS-1$
}
=
- public void testSelectManyListbox() throws PartInitException, Throwable {
+ public void testSelectManyListbox() throws Throwable {
performTestForJsfComponent("components/selectManyListbox.jsp"); // $NON-=
NLS-1$
}
=
- public void testSelectManyMenu() throws PartInitException, Throwable {
+ public void testSelectManyMenu() throws Throwable {
performTestForJsfComponent("components/selectManyMenu.jsp"); // $NON-NLS=
-1$
}
=
- public void testSelectOneListbox() throws PartInitException, Throwable {
+ public void testSelectOneListbox() throws Throwable {
performTestForJsfComponent("components/selectOneListbox.jsp"); // $NON-N=
LS-1$
}
=
- public void testSelectOneMenu() throws PartInitException, Throwable {
+ public void testSelectOneMenu() throws Throwable {
performTestForJsfComponent("components/selectOneMenu.jsp"); // $NON-NLS-=
1$
}
=
- public void testSelectOneRadio() throws PartInitException, Throwable {
+ public void testSelectOneRadio() throws Throwable {
performTestForJsfComponent("components/selectOneRadio.jsp"); // $NON-NLS=
-1$
}
=
@@ -132,84 +131,83 @@
* JSF Core test cases
*/
=
- public void testActionListener() throws PartInitException, Throwable {
+ public void testActionListener() throws Throwable {
performTestForJsfComponent("components/actionListener.jsp"); // $NON-NLS=
-1$
}
=
- public void testAttribute() throws PartInitException, Throwable {
+ public void testAttribute() throws Throwable {
performTestForJsfComponent("components/attribute.jsp"); // $NON-NLS-1$
}
=
- public void testConvertDateTime() throws PartInitException, Throwable {
+ public void testConvertDateTime() throws Throwable {
performTestForJsfComponent("components/convertDateTime.jsp"); // $NON-NL=
S-1$
}
=
- public void testConvertNumber() throws PartInitException, Throwable {
+ public void testConvertNumber() throws Throwable {
performTestForJsfComponent("components/convertNumber.jsp"); // $NON-NLS-=
1$
}
=
- public void testConverter() throws PartInitException, Throwable {
+ public void testConverter() throws Throwable {
performTestForJsfComponent("components/converter.jsp"); // $NON-NLS-1$
}
=
- public void testFacet() throws PartInitException, Throwable {
+ public void testFacet() throws Throwable {
performTestForJsfComponent("components/facet.jsp"); // $NON-NLS-1$
}
=
- public void testLoadBundle() throws PartInitException, Throwable {
+ public void testLoadBundle() throws Throwable {
performTestForJsfComponent("components/loadBundle.jsp"); // $NON-NLS-1$
}
=
- public void testParam() throws PartInitException, Throwable {
+ public void testParam() throws Throwable {
performTestForJsfComponent("components/param.jsp"); // $NON-NLS-1$
}
=
- public void testPhaseListener() throws PartInitException, Throwable {
+ public void testPhaseListener() throws Throwable {
performTestForJsfComponent("components/phaseListener.jsp"); // $NON-NLS-=
1$
}
=
- public void testSelectItem() throws PartInitException, Throwable {
+ public void testSelectItem() throws Throwable {
performTestForJsfComponent("components/selectItem.jsp"); // $NON-NLS-1$
}
=
- public void testSelectItems() throws PartInitException, Throwable {
+ public void testSelectItems() throws Throwable {
performTestForJsfComponent("components/selectItems.jsp"); // $NON-NLS-1$
}
=
- public void testSetPropertyActionListener() throws PartInitException,
- Throwable {
+ public void testSetPropertyActionListener() throws Throwable {
performTestForJsfComponent("components/setPropertyActionListener.jsp"); =
// $NON-NLS-1$
}
=
- public void testSubview() throws PartInitException, Throwable {
+ public void testSubview() throws Throwable {
performTestForJsfComponent("components/subview.jsp"); // $NON-NLS-1$
}
=
- public void testValidateDoubleRange() throws PartInitException, Throwable=
{
+ public void testValidateDoubleRange() throws Throwable {
performTestForJsfComponent("components/validateDoubleRange.jsp"); // $NO=
N-NLS-1$
}
=
- public void testValidateLength() throws PartInitException, Throwable {
+ public void testValidateLength() throws Throwable {
performTestForJsfComponent("components/validateLength.jsp"); // $NON-NLS=
-1$
}
=
- public void testValidateLongRange() throws PartInitException, Throwable {
+ public void testValidateLongRange() throws Throwable {
performTestForJsfComponent("components/validateLongRange.jsp"); // $NON-=
NLS-1$
}
=
- public void testValidator() throws PartInitException, Throwable {
+ public void testValidator() throws Throwable {
performTestForJsfComponent("components/validator.jsp"); // $NON-NLS-1$
}
=
- public void testValueChangeListener() throws PartInitException, Throwable=
{
+ public void testValueChangeListener() throws Throwable {
performTestForJsfComponent("components/valueChangeListener.jsp"); // $NO=
N-NLS-1$
}
=
- public void testVerbatim() throws PartInitException, Throwable {
+ public void testVerbatim() throws Throwable {
performTestForJsfComponent("components/verbatim.jsp"); // $NON-NLS-1$
}
=
- public void testView() throws PartInitException, Throwable {
+ public void testView() throws Throwable {
performTestForJsfComponent("components/view.jsp"); // $NON-NLS-1$
}
}
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/too=
ls/jsf/vpe/jsf/test/JsfJbideTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfJbideTest.java 2008-01-09 13:09:05 UTC (rev 5551)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfJbideTest.java 2008-01-09 13:17:09 UTC (rev 5552)
@@ -1,308 +0,0 @@
-/*************************************************************************=
****** =
- * Copyright (c) 2007 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.jsf.vpe.jsf.test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
-import org.jboss.tools.vpe.editor.util.HTML;
-import org.jboss.tools.vpe.ui.test.TestUtil;
-import org.jboss.tools.vpe.ui.test.VpeTest;
-import org.mozilla.interfaces.nsIDOMDocument;
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNamedNodeMap;
-import org.mozilla.interfaces.nsIDOMNode;
-import org.mozilla.interfaces.nsIDOMNodeList;
-/**
- * Class for testing all jsf bugs
- * =
- * @author sdzmitrovich
- * =
- */
-public class JsfJbideTest extends VpeTest {
-
- // type of input tag
- private static final String ATTR_TYPE_VALUE =3D "radio";
- =
- //import project name
- =
- private static final String IMPORT_PROJECT_NAME =3D "jsfTest"; =
-
- public JsfJbideTest(String name) {
- super(name,IMPORT_PROJECT_NAME,JsfTestPlugin.getPluginResourcePath());
- }
-
-
- /*
- * JBIDE's test cases
- */
-
- /**
- * test for http://jira.jboss.com/jira/browse/JBIDE-1467
- * =
- * the cause of bug : tags ( which vpe template for=
ms
- * when process "selectOneRadio" jsf tag ) didn't have equal "name"
- * attribute
- * =
- * REQUIREMENT :test page must has only one tag
- * =
- * test checks that all "radio" elements ( of xulRunner DOMDocument ) have
- * equal "name" attributes
- */
- public void testJBIDE_1467() throws PartInitException, Throwable {
-
- // wait
- TestUtil.waitForJobs();
- // set exception
- setException(null);
-
- // get test page path
- IFile file =3D (IFile) TestUtil
- .getComponentPath("JBIDE/1467/JBIDE-1467.jsp",getImportProjectName());
- =
- assertNotNull("Could not open specified file "+file.getFullPath(), file);
- =
- IEditorInput input =3D new FileEditorInput(file);
- =
- assertNotNull("Editor input is null",input);
- // open and get editor
- JSPMultiPageEditor part =3D openEditor(input);
-
- // get dom document
- nsIDOMDocument document =3D getVpeVisualDocument(part);
- nsIDOMElement element =3D document.getDocumentElement();
-
- if (element !=3D null) {
-
- // get root node
- nsIDOMNode node =3D (nsIDOMNode) element
- .queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
-
- List elements =3D new ArrayList();
-
- // find "input" elements
- findElementsByName(node, elements, HTML.TAG_INPUT);
-
- // check that "radio" elements have equal names
- // (size of list of names =3D=3D 1 )
- assertEquals(1, getRadioNames(elements).size());
-
- }
-
- // check exception
- if (getException() !=3D null) {
- throw getException();
- }
-
- }
-
- /**
- * test for http://jira.jboss.com/jira/browse/JBIDE-1467
- * =
- * the cause of bug :
- * =
- * 1. tag ( which vpe template forms when process
- * "selectManyMenu" and "selectManyListbox" jsf tags ) didn't have
- * multiple=3D"multiple" attribute
- * =
- * 2. tag ( which vpe template forms when process
- * "selectOneListbox" and "selectManyListbox" jsf tags ) sometimes had
- * incorrect "size" attribute
- * =
- * DISCRIPTION: test consist of two part
- * =
- * 1. The first page (JBIDE-1501_multiple.jsp) has "selectManyMenu" and
- * "selectManyListbox" jsf tags. And test checks that all "select" elemen=
ts
- * have "multiple" attribute
- * =
- * 2. The second page (JBIDE-1501_size.jsp) has "selectOneListbox" and
- * "selectManyListbox" jsf tags and they was formed so that all "select"
- * elements must have size=3D"2" attribute . And test checks "size" attri=
bute
- */
- public void testJBIDE_1501() throws PartInitException, Throwable {
-
- // wait
- TestUtil.waitForJobs();
- // set exception
- setException(null);
-
- // _____1st Part____//
-
- // get test page path
- IFile file =3D (IFile) TestUtil
- .getComponentPath("JBIDE/1501/JBIDE-1501_multiple.jsp",getImportProjec=
tName());
-
- IEditorInput input =3D new FileEditorInput(file);
-
- // open and get editor
- JSPMultiPageEditor part =3D openEditor(input);
-
- // get dom document
- nsIDOMDocument document =3D getVpeVisualDocument(part);
- assertNotNull(document);
-
- // get dom element
- nsIDOMElement element =3D document.getDocumentElement();
- assertNotNull(element);
-
- // get root node
- nsIDOMNode node =3D (nsIDOMNode) element
- .queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
-
- List elements =3D new ArrayList();
-
- // find "select" elements
- findElementsByName(node, elements, HTML.TAG_SELECT);
-
- for (nsIDOMNode select : elements) {
-
- // get attributes
- nsIDOMNamedNodeMap attributes =3D select.getAttributes();
-
- // "select" must have attributes
- assertNotNull(attributes);
-
- // select must have "multiple" attribute
- assertNotNull(attributes.getNamedItem(HTML.ATTR_MULTIPLE));
-
- }
-
- // _____2nd Part____//
-
- // get test page path
- file =3D (IFile) TestUtil
- .getComponentPath("JBIDE/1501/JBIDE-1501_size.jsp",getImportProjectNam=
e());
-
- input =3D new FileEditorInput(file);
-
- // open and get editor
- part =3D openEditor(input);
-
- // get dom document
- document =3D getVpeVisualDocument(part);
- assertNotNull(document);
-
- // get dom element
- element =3D document.getDocumentElement();
- assertNotNull(element);
-
- // get root node
- node =3D (nsIDOMNode) element.queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
-
- elements =3D new ArrayList();
-
- // find "select" elements
- findElementsByName(node, elements, HTML.TAG_SELECT);
-
- for (nsIDOMNode select : elements) {
-
- // get attributes
- nsIDOMNamedNodeMap attributes =3D select.getAttributes();
-
- // "select" must have attributes
- assertNotNull(attributes);
-
- // select must have "size" attribute
- nsIDOMNode size =3D attributes.getNamedItem(HTML.ATTR_SIZE);
- assertNotNull(size);
-
- //
- assertEquals(2, Integer.parseInt(size.getNodeValue()));
-
- }
-
- // check exception
- if (getException() !=3D null) {
- throw getException();
- }
-
- }
-
- /**
- * find elements by name
- * =
- * @param node -
- * current node
- * @param elements -
- * list of found elements
- * @param name -
- * name element
- */
- private void findElementsByName(nsIDOMNode node, List element=
s,
- String name) {
-
- // get children
- nsIDOMNodeList children =3D node.getChildNodes();
- for (int i =3D 0; i < children.getLength(); i++) {
- nsIDOMNode child =3D children.item(i);
-
- // if current child is required then add his to list
- if (name.equalsIgnoreCase((child.getNodeName()))) {
-
- elements.add(child);
-
- } else {
-
- findElementsByName(child, elements, name);
-
- }
- }
-
- }
- /**
- * =
- * @param elements
- * list of "input" elements
- * @return list of names
- */
- private List getRadioNames(List elements) {
-
- // list of "name" of "radio" elements
- List radioNames =3D new ArrayList();
-
- for (nsIDOMNode element : elements) {
- // attributes
- nsIDOMNamedNodeMap attributes =3D element.getAttributes();
-
- if (attributes !=3D null) {
- // get type of element
- nsIDOMNode type =3D attributes.getNamedItem(HTML.ATTR_TYPE);
-
- // if type is "radio"
- if ((type !=3D null)
- && (ATTR_TYPE_VALUE.equalsIgnoreCase(type
- .getNodeValue()))) {
-
- // get "name" attribute
- nsIDOMNode name =3D attributes.getNamedItem(HTML.ATTR_NAME);
-
- // check for null
- assertNotNull(name);
-
- // if name is unique
- if (!radioNames.contains(name.getNodeValue()))
- radioNames.add(name.getNodeValue());
-
- }
- }
- }
-
- return radioNames;
-
- }
-
-}
--===============5810266803431900886==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 08:17:52 2008
Content-Type: multipart/mixed; boundary="===============1723271370983683117=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5553 - in
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test:
jbide and 1 other directory.
Date: Wed, 09 Jan 2008 08:17:52 -0500
Message-ID:
--===============1723271370983683117==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-09 08:17:52 -0500 (Wed, 09 Jan 2008)
New Revision: 5553
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/jbide/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/jbide/JsfJbide1467Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/jbide/JsfJbide1501Test.java
Log:
update junit (Divide JsfJbideTest)
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools=
/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JsfJbide1467Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JsfJbide1467Test.java 2008-01-09 13:17:52 UTC (rev 555=
3)
@@ -0,0 +1,155 @@
+/*************************************************************************=
****** =
+ * Copyright (c) 2007 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.jsf.vpe.jsf.test.jbide;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNamedNodeMap;
+import org.mozilla.interfaces.nsIDOMNode;
+
+/**
+ * Class for testing all jsf bugs
+ * =
+ * @author sdzmitrovich
+ * =
+ */
+public class JsfJbide1467Test extends VpeTest {
+
+ // type of input tag
+ private static final String ATTR_TYPE_VALUE =3D "radio";
+
+ // import project name
+
+ private static final String IMPORT_PROJECT_NAME =3D "jsfTest";
+
+ public JsfJbide1467Test(String name) {
+ super(name, IMPORT_PROJECT_NAME, JsfTestPlugin.getPluginResourcePath());
+ }
+
+ /*
+ * JBIDE's test cases
+ */
+
+ /**
+ * test for http://jira.jboss.com/jira/browse/JBIDE-1467
+ * =
+ * the cause of bug : tags ( which vpe template for=
ms
+ * when process "selectOneRadio" jsf tag ) didn't have equal "name"
+ * attribute
+ * =
+ * REQUIREMENT :test page must has only one tag
+ * =
+ * test checks that all "radio" elements ( of xulRunner DOMDocument ) have
+ * equal "name" attributes
+ */
+ public void testJbide() throws Throwable {
+
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+
+ // get test page path
+ IFile file =3D (IFile) TestUtil.getComponentPath(
+ "JBIDE/1467/JBIDE-1467.jsp", getImportProjectName());
+
+ assertNotNull("Could not open specified file " + file.getFullPath(),
+ file);
+
+ IEditorInput input =3D new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input);
+ // open and get editor
+ JSPMultiPageEditor part =3D openEditor(input);
+
+ // get dom document
+ nsIDOMDocument document =3D getVpeVisualDocument(part);
+ nsIDOMElement element =3D document.getDocumentElement();
+
+ if (element !=3D null) {
+
+ // get root node
+ nsIDOMNode node =3D (nsIDOMNode) element
+ .queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
+
+ List elements =3D new ArrayList();
+
+ // find "input" elements
+ TestUtil.findElementsByName(node, elements, HTML.TAG_INPUT);
+
+ // check that "radio" elements have equal names
+ // (size of list of names =3D=3D 1 )
+ assertEquals(1, getRadioNames(elements).size());
+
+ }
+
+ // check exception
+ if (getException() !=3D null) {
+ throw getException();
+ }
+
+ }
+
+ /**
+ * =
+ * @param elements
+ * list of "input" elements
+ * @return list of names
+ */
+ private List getRadioNames(List elements) {
+
+ // list of "name" of "radio" elements
+ List radioNames =3D new ArrayList();
+
+ for (nsIDOMNode element : elements) {
+ // attributes
+ nsIDOMNamedNodeMap attributes =3D element.getAttributes();
+
+ if (attributes !=3D null) {
+ // get type of element
+ nsIDOMNode type =3D attributes.getNamedItem(HTML.ATTR_TYPE);
+
+ // if type is "radio"
+ if ((type !=3D null)
+ && (ATTR_TYPE_VALUE.equalsIgnoreCase(type
+ .getNodeValue()))) {
+
+ // get "name" attribute
+ nsIDOMNode name =3D attributes.getNamedItem(HTML.ATTR_NAME);
+
+ // check for null
+ assertNotNull(name);
+
+ // if name is unique
+ if (!radioNames.contains(name.getNodeValue()))
+ radioNames.add(name.getNodeValue());
+
+ }
+ }
+ }
+
+ return radioNames;
+
+ }
+
+}
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools=
/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JsfJbide1501Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JsfJbide1501Test.java 2008-01-09 13:17:52 UTC (rev 555=
3)
@@ -0,0 +1,166 @@
+/*************************************************************************=
****** =
+ * Copyright (c) 2007 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.jsf.vpe.jsf.test.jbide;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNamedNodeMap;
+import org.mozilla.interfaces.nsIDOMNode;
+
+/**
+ * Class for testing all jsf bugs
+ * =
+ * @author sdzmitrovich
+ * =
+ */
+public class JsfJbide1501Test extends VpeTest {
+
+ private static final String IMPORT_PROJECT_NAME =3D "jsfTest";
+
+ public JsfJbide1501Test(String name) {
+ super(name, IMPORT_PROJECT_NAME, JsfTestPlugin.getPluginResourcePath());
+ }
+
+ /**
+ * test for http://jira.jboss.com/jira/browse/JBIDE-1467
+ * =
+ * the cause of bug :
+ * =
+ * 1. tag ( which vpe template forms when process
+ * "selectManyMenu" and "selectManyListbox" jsf tags ) didn't have
+ * multiple=3D"multiple" attribute
+ * =
+ * 2. tag ( which vpe template forms when process
+ * "selectOneListbox" and "selectManyListbox" jsf tags ) sometimes had
+ * incorrect "size" attribute
+ * =
+ * DISCRIPTION: test consist of two part
+ * =
+ * 1. The first page (JBIDE-1501_multiple.jsp) has "selectManyMenu" and
+ * "selectManyListbox" jsf tags. And test checks that all "select" elemen=
ts
+ * have "multiple" attribute
+ * =
+ * 2. The second page (JBIDE-1501_size.jsp) has "selectOneListbox" and
+ * "selectManyListbox" jsf tags and they was formed so that all "select"
+ * elements must have size=3D"2" attribute . And test checks "size" attri=
bute
+ */
+ public void testJbide() throws Throwable {
+
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+
+ // _____1st Part____//
+
+ // get test page path
+ IFile file =3D (IFile) TestUtil.getComponentPath(
+ "JBIDE/1501/JBIDE-1501_multiple.jsp", getImportProjectName());
+
+ IEditorInput input =3D new FileEditorInput(file);
+
+ // open and get editor
+ JSPMultiPageEditor part =3D openEditor(input);
+
+ // get dom document
+ nsIDOMDocument document =3D getVpeVisualDocument(part);
+ assertNotNull(document);
+
+ // get dom element
+ nsIDOMElement element =3D document.getDocumentElement();
+ assertNotNull(element);
+
+ // get root node
+ nsIDOMNode node =3D (nsIDOMNode) element
+ .queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
+
+ List elements =3D new ArrayList();
+
+ // find "select" elements
+ TestUtil.findElementsByName(node, elements, HTML.TAG_SELECT);
+
+ for (nsIDOMNode select : elements) {
+
+ // get attributes
+ nsIDOMNamedNodeMap attributes =3D select.getAttributes();
+
+ // "select" must have attributes
+ assertNotNull(attributes);
+
+ // select must have "multiple" attribute
+ assertNotNull(attributes.getNamedItem(HTML.ATTR_MULTIPLE));
+
+ }
+
+ // _____2nd Part____//
+
+ // get test page path
+ file =3D (IFile) TestUtil.getComponentPath(
+ "JBIDE/1501/JBIDE-1501_size.jsp", getImportProjectName());
+
+ input =3D new FileEditorInput(file);
+
+ // open and get editor
+ part =3D openEditor(input);
+
+ // get dom document
+ document =3D getVpeVisualDocument(part);
+ assertNotNull(document);
+
+ // get dom element
+ element =3D document.getDocumentElement();
+ assertNotNull(element);
+
+ // get root node
+ node =3D (nsIDOMNode) element.queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
+
+ elements =3D new ArrayList();
+
+ // find "select" elements
+ TestUtil.findElementsByName(node, elements, HTML.TAG_SELECT);
+
+ for (nsIDOMNode select : elements) {
+
+ // get attributes
+ nsIDOMNamedNodeMap attributes =3D select.getAttributes();
+
+ // "select" must have attributes
+ assertNotNull(attributes);
+
+ // select must have "size" attribute
+ nsIDOMNode size =3D attributes.getNamedItem(HTML.ATTR_SIZE);
+ assertNotNull(size);
+
+ //
+ assertEquals(2, Integer.parseInt(size.getNodeValue()));
+
+ }
+
+ // check exception
+ if (getException() !=3D null) {
+ throw getException();
+ }
+
+ }
+
+}
--===============1723271370983683117==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 08:19:29 2008
Content-Type: multipart/mixed; boundary="===============8485137425693540514=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5554 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test.
Date: Wed, 09 Jan 2008 08:19:29 -0500
Message-ID:
--===============8485137425693540514==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-09 08:19:29 -0500 (Wed, 09 Jan 2008)
New Revision: 5554
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/=
ui/test/TestUtil.java
Log:
update junit (Divide JsfJbideTest)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/too=
ls/vpe/ui/test/TestUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/TestUtil.java 2008-01-09 13:17:52 UTC (rev 5553)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/TestUtil.java 2008-01-09 13:19:29 UTC (rev 5554)
@@ -25,6 +25,8 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.IOverwriteQuery;
import org.eclipse.ui.wizards.datatransfer.ImportOperation;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.interfaces.nsIDOMNodeList;
=
/**
* Class for importing project from jar file
@@ -141,5 +143,37 @@
while (Job.getJobManager().currentJob() !=3D null)
delay(100);
}
+ =
+ /**
+ * find elements by name
+ * =
+ * @param node -
+ * current node
+ * @param elements -
+ * list of found elements
+ * @param name -
+ * name element
+ */
+ static public void findElementsByName(nsIDOMNode node, List e=
lements,
+ String name) {
=
+ // get children
+ nsIDOMNodeList children =3D node.getChildNodes();
+ for (int i =3D 0; i < children.getLength(); i++) {
+ nsIDOMNode child =3D children.item(i);
+
+ // if current child is required then add his to list
+ if (name.equalsIgnoreCase((child.getNodeName()))) {
+
+ elements.add(child);
+
+ } else {
+
+ findElementsByName(child, elements, name);
+
+ }
+ }
+
+ }
+
}
--===============8485137425693540514==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 09:25:00 2008
Content-Type: multipart/mixed; boundary="===============2236266658581956241=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5555 -
trunk/jsf/docs/userguide/en/images/more_editors.
Date: Wed, 09 Jan 2008 09:21:00 -0500
Message-ID:
--===============2236266658581956241==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ykryvinchanka
Date: 2008-01-09 09:21:00 -0500 (Wed, 09 Jan 2008)
New Revision: 5555
Modified:
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_15.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_16.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_17.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_18.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_19.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_20.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_21.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_22.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_23.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_24.png
Log:
http://jira.jboss.com/jira/browse/JBDS-226 Screens retaken in 96 resolution=
+ scale parameter is defined
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_15.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_16.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_17.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_18.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_19.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_20.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_21.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_22.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_23.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_24.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
--===============2236266658581956241==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 09:29:55 2008
Content-Type: multipart/mixed; boundary="===============3953813211096688464=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5556 -
trunk/jsf/docs/userguide/en/modules.
Date: Wed, 09 Jan 2008 09:25:55 -0500
Message-ID:
--===============3953813211096688464==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ykryvinchanka
Date: 2008-01-09 09:25:54 -0500 (Wed, 09 Jan 2008)
New Revision: 5556
Modified:
trunk/jsf/docs/userguide/en/modules/editors.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-226 Screens retaken in 96 resolution=
+ scale parameter is defined
Modified: trunk/jsf/docs/userguide/en/modules/editors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/docs/userguide/en/modules/editors.xml 2008-01-09 14:21:00 UTC=
(rev 5555)
+++ trunk/jsf/docs/userguide/en/modules/editors.xml 2008-01-09 14:25:54 UTC=
(rev 5556)
@@ -1450,7 +1450,7 @@
Content Assist
-
+
@@ -1460,7 +1460,7 @@
Error Reporting
-
+
@@ -1473,7 +1473,7 @@
Outline View
-
+
--===============3953813211096688464==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 09:52:45 2008
Content-Type: multipart/mixed; boundary="===============7249851675835466652=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5557 -
trunk/jsf/docs/userguide/en/images/more_editors.
Date: Wed, 09 Jan 2008 09:52:44 -0500
Message-ID:
--===============7249851675835466652==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ykryvinchanka
Date: 2008-01-09 09:52:44 -0500 (Wed, 09 Jan 2008)
New Revision: 5557
Modified:
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_26.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_27.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_28.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_29.png
Log:
http://jira.jboss.com/jira/browse/JBDS-226 Screens retaken in 96 resolution=
+ scale parameter is defined
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_26.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_27.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_28.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_29.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
--===============7249851675835466652==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 09:52:57 2008
Content-Type: multipart/mixed; boundary="===============2431633470454664136=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5558 -
trunk/jsf/docs/userguide/en/modules.
Date: Wed, 09 Jan 2008 09:52:56 -0500
Message-ID:
--===============2431633470454664136==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ykryvinchanka
Date: 2008-01-09 09:52:56 -0500 (Wed, 09 Jan 2008)
New Revision: 5558
Modified:
trunk/jsf/docs/userguide/en/modules/editors.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-226 Screens retaken in 96 resolution=
+ scale parameter is defined
Modified: trunk/jsf/docs/userguide/en/modules/editors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/docs/userguide/en/modules/editors.xml 2008-01-09 14:52:44 UTC=
(rev 5557)
+++ trunk/jsf/docs/userguide/en/modules/editors.xml 2008-01-09 14:52:56 UTC=
(rev 5558)
@@ -1450,7 +1450,7 @@
Content Assist
-
+
@@ -1557,7 +1557,7 @@
Validation Rules
-
+
@@ -1568,7 +1568,7 @@
Validation Rules in Source Viewer
-
+
--===============2431633470454664136==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 09:58:19 2008
Content-Type: multipart/mixed; boundary="===============4313713070574015519=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5559 - in
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test:
resources/jsfTest/WebContent/pages/JBIDE/1484 and 2 other directories.
Date: Wed, 09 Jan 2008 09:58:14 -0500
Message-ID:
--===============4313713070574015519==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: mareshkau
Date: 2008-01-09 09:58:14 -0500 (Wed, 09 Jan 2008)
New Revision: 5559
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/JBIDE/1484/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/JBIDE/1484/JBIDE-1484.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/jbide/JBIDE1484Test.java
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo=
ntent/pages/JBIDE/JBIDE-1484.jsp
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfAllTests.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1484, junit was added
Copied: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/=
WebContent/pages/JBIDE/1484/JBIDE-1484.jsp (from rev 5543, trunk/jsf/tests/=
org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/J=
BIDE-1484.jsp)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/JBIDE/1484/JBIDE-1484.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/JBIDE/1484/JBIDE-1484.jsp 2008-01-09 14:58:14 UTC (rev 5559)
@@ -0,0 +1,15 @@
+<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%>
+<%@ taglib uri=3D"http://jboss.com/products/seam/taglib" prefix=3D"s"%>
+
+
+
+
+
+
+
+
+ =
+
+
+
+
\ No newline at end of file
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest=
/WebContent/pages/JBIDE/JBIDE-1484.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/JBIDE/JBIDE-1484.jsp 2008-01-09 14:52:56 UTC (rev 5558)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC=
ontent/pages/JBIDE/JBIDE-1484.jsp 2008-01-09 14:58:14 UTC (rev 5559)
@@ -1,14 +0,0 @@
-<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%>
-<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%>
-
-
-
-
-
-
-
- =
-
-
-
-
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfAllTests.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfAllTests.java 2008-01-09 14:52:56 UTC (rev 5558)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfAllTests.java 2008-01-09 14:58:14 UTC (rev 5559)
@@ -13,6 +13,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
=
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1484Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1467Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1501Test;
=
@@ -32,6 +33,7 @@
suite.addTestSuite(JsfComponentTest.class);
suite.addTestSuite(JsfJbide1467Test.class);
suite.addTestSuite(JsfJbide1501Test.class);
+ suite.addTestSuite(JBIDE1484Test.class);
//cleanUpTests();
// $JUnit-END$
return suite;
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools=
/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JBIDE1484Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-01-09 14:58:14 UTC (rev 5559)
@@ -0,0 +1,93 @@
+/*************************************************************************=
****** =
+* Copyright (c) 2007 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.jsf.vpe.jsf.test.jbide;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+
+/**
+ * @author Max Areshkau
+ * =
+ * junit for JBIDE-1484(http://jira.jboss.com/jira/browse/JBIDE-1484)
+ */
+public class JBIDE1484Test extends VpeTest {
+
+ private static final String IMPORT_PROJECT_NAME =3D "jsfTest";
+ =
+ private static final String TEST_PAGE_NAME =3D "JBIDE/1484/JBIDE-1484.jsp=
";
+ =
+ public JBIDE1484Test(String name) {
+ =
+ super(name, IMPORT_PROJECT_NAME, JsfTestPlugin.getPluginResourcePath());
+ }
+ =
+ //test method for JBIDE 1484
+ public void testJBIDE_1484() throws Throwable{
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+
+ // get test page path
+ IFile file =3D (IFile) TestUtil.getComponentPath(
+ TEST_PAGE_NAME, getImportProjectName());
+
+ assertNotNull("Could not open specified file " + file.getFullPath(),
+ file);
+
+ IEditorInput input =3D new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input);
+ // open and get editor
+ JSPMultiPageEditor part =3D openEditor(input);
+
+ // get dom document
+ nsIDOMDocument document =3D getVpeVisualDocument(part);
+ nsIDOMElement element =3D document.getDocumentElement();
+ =
+ //check that element is not null
+ assertNotNull(element);
+
+ // get root node
+ nsIDOMNode node =3D (nsIDOMNode) element
+ .queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
+
+ List elements =3D new ArrayList();
+ =
+ // find "input" elements
+ TestUtil.findElementsByName(node, elements, HTML.TAG_INPUT);
+ =
+ assertEquals(3, elements.size());
+ nsIDOMElement elementInput0 =3D (nsIDOMElement) elements.get(0).queryInt=
erface(nsIDOMElement.NS_IDOMELEMENT_IID);
+ nsIDOMElement elementInput1 =3D (nsIDOMElement) elements.get(1).queryInt=
erface(nsIDOMElement.NS_IDOMELEMENT_IID);
+ nsIDOMElement elementInput2 =3D (nsIDOMElement) elements.get(2).queryInt=
erface(nsIDOMElement.NS_IDOMELEMENT_IID);
+ =
+ assertEquals(elementInput0.getAttribute("value"),"");
+ assertNotNull(elementInput1.getAttribute("value"),"");
+ assertNotNull(elementInput2.getAttribute("value"),"test");
+ if(getException()!=3Dnull) {
+ throw getException();
+ }
+ }
+
+}
--===============4313713070574015519==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 09:58:54 2008
Content-Type: multipart/mixed; boundary="===============1496944210977996073=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5560 -
trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld.
Date: Wed, 09 Jan 2008 09:58:54 -0500
Message-ID:
--===============1496944210977996073==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: sdzmitrovich
Date: 2008-01-09 09:58:54 -0500 (Wed, 09 Jan 2008)
New Revision: 5560
Modified:
trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JBossSeam1_2.=
xml
trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JBossSeam2_0.=
xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1493 =
Modified: trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JBossS=
eam1_2.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JBossSeam1_2=
.xml 2008-01-09 14:58:14 UTC (rev 5559)
+++ trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JBossSeam1_2=
.xml 2008-01-09 14:58:54 UTC (rev 5560)
@@ -702,7 +702,10 @@
HTML: The URL of an image that renders in place o=
f the button.
-
+
+
+
+
Modified: trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JBossS=
eam2_0.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JBossSeam2_0=
.xml 2008-01-09 14:58:14 UTC (rev 5559)
+++ trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JBossSeam2_0=
.xml 2008-01-09 14:58:54 UTC (rev 5560)
@@ -109,7 +109,10 @@
-
+
+
+
+
--===============1496944210977996073==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 10:17:45 2008
Content-Type: multipart/mixed; boundary="===============3895243665921124467=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5561 - trunk/hibernatetools.
Date: Wed, 09 Jan 2008 10:17:45 -0500
Message-ID:
--===============3895243665921124467==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: max.andersen(a)jboss.com
Date: 2008-01-09 10:17:45 -0500 (Wed, 09 Jan 2008)
New Revision: 5561
Removed:
trunk/hibernatetools/.project
Log:
There should not be a overall hibernatetools project since that will confus=
e one-shot import of plugins.
Deleted: trunk/hibernatetools/.project
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/.project 2008-01-09 14:58:54 UTC (rev 5560)
+++ trunk/hibernatetools/.project 2008-01-09 15:17:45 UTC (rev 5561)
@@ -1,11 +0,0 @@
-
-
- hibernatetools
-
-
-
-
-
-
-
-
--===============3895243665921124467==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 10:26:20 2008
Content-Type: multipart/mixed; boundary="===============2483232192960276078=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5562 -
trunk/jsf/docs/userguide/en/modules.
Date: Wed, 09 Jan 2008 10:26:20 -0500
Message-ID:
--===============2483232192960276078==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ykryvinchanka
Date: 2008-01-09 10:26:20 -0500 (Wed, 09 Jan 2008)
New Revision: 5562
Modified:
trunk/jsf/docs/userguide/en/modules/editors.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-226 Screens retaken in 96 resolution=
+ scale parameter is defined
Modified: trunk/jsf/docs/userguide/en/modules/editors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/docs/userguide/en/modules/editors.xml 2008-01-09 15:17:45 UTC=
(rev 5561)
+++ trunk/jsf/docs/userguide/en/modules/editors.xml 2008-01-09 15:26:20 UTC=
(rev 5562)
@@ -191,7 +191,7 @@
+ fileref=3D"images/editors_features=
/editors_features_9.png" scale=3D"85"/>
@@ -201,7 +201,7 @@
+ fileref=3D"images/editors_features=
/editors_features_10.png" scale=3D"85"/>
@@ -211,7 +211,7 @@
+ fileref=3D"images/editors_features=
/editors_features_11.png" scale=3D"85"/>
@@ -299,7 +299,7 @@
+ fileref=3D"images/editors_features=
/editors_features_15.png" scale=3D"85"/>
--===============2483232192960276078==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 11:20:47 2008
Content-Type: multipart/mixed; boundary="===============6742477360586768794=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5563 -
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces.
Date: Wed, 09 Jan 2008 11:20:46 -0500
Message-ID:
--===============6742477360586768794==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: akazakov
Date: 2008-01-09 11:20:46 -0500 (Wed, 09 Jan 2008)
New Revision: 5563
Added:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFac=
es/richfaces-api-3.1.3.GA.jar
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFac=
es/richfaces-impl-3.1.3.GA.jar
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFac=
es/richfaces-ui-3.1.3.GA.jar
Removed:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFac=
es/richfaces-api-3.1.0.jar
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFac=
es/richfaces-impl-3.1.0.jar
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFac=
es/richfaces-ui-3.1.0.jar
Log:
http://jira.jboss.com/jira/browse/JBIDE-1599 Updated RichFaces jars.
Deleted: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/R=
ichFaces/richfaces-api-3.1.0.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/Ric=
hFaces/richfaces-api-3.1.3.GA.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttem=
plates/lib/RichFaces/richfaces-api-3.1.3.GA.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/R=
ichFaces/richfaces-impl-3.1.0.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/Ric=
hFaces/richfaces-impl-3.1.3.GA.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttem=
plates/lib/RichFaces/richfaces-impl-3.1.3.GA.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/R=
ichFaces/richfaces-ui-3.1.0.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/Ric=
hFaces/richfaces-ui-3.1.3.GA.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttem=
plates/lib/RichFaces/richfaces-ui-3.1.3.GA.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
--===============6742477360586768794==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 11:27:33 2008
Content-Type: multipart/mixed; boundary="===============5350962384610812887=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5564 -
trunk/hibernatetools/docs/reference/en/modules.
Date: Wed, 09 Jan 2008 11:27:32 -0500
Message-ID:
--===============5350962384610812887==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ochikvina
Date: 2008-01-09 11:27:32 -0500 (Wed, 09 Jan 2008)
New Revision: 5564
Modified:
trunk/hibernatetools/docs/reference/en/modules/ant.xml
trunk/hibernatetools/docs/reference/en/modules/codegen.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-173 - highlighting some meaningful w=
ords
Modified: trunk/hibernatetools/docs/reference/en/modules/ant.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/ant.xml 2008-01-09 16:20=
:46 UTC (rev 5563)
+++ trunk/hibernatetools/docs/reference/en/modules/ant.xml 2008-01-09 16:27=
:32 UTC (rev 5564)
@@ -142,6 +142,10 @@
=
+
+
+
+ =
]]>
Modified: trunk/hibernatetools/docs/reference/en/modules/codegen.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/codegen.xml 2008-01-09 1=
6:20:46 UTC (rev 5563)
+++ trunk/hibernatetools/docs/reference/en/modules/codegen.xml 2008-01-09 1=
6:27:32 UTC (rev 5564)
@@ -2,34 +2,34 @@
Controlling POJO code generation
=
- When using
- <hbm2java> or the eclipse plugin=
to generate POJO
- java code you have the possibility to control certain aspects of the code
- generation. This is primarily done through the <meta> tag in the
- mapping files. The following section describes the possible meta tags and
- their use.
+ When using
+ <hbm2java>
+ or the eclipse plugin to generate POJO java code you have =
the possibility to control
+ certain aspects of the code generation. This is primarily done through=
the <meta>
+ tag in the mapping files. The following section describes the possible=
meta tags and their use.
=
The <meta> attribute
=
- The
- <meta> tag is a simple way of
- annotating the
- hbm.xml with information, so tools=
have
- a natural place to store/read information that is not directly related=
to
- the Hibernate core.
+ The
+ <meta>
+ tag is a simple way of annotating the
+ hbm.xml
+ with information, so tools have a natural place to store=
/read information that is
+ not directly related to the Hibernate core.
=
- You can use the
- <meta> tag to e.g. tell
-
- <hbm2java> to only generate =
- "protected" setters, have
- classes always implement a certain set of interfaces or even have them
- extend a certain base class and even more.
+ You can use the
+ <meta>
+ tag to e.g. tell
+ <hbm2java>
+ to only generate
+ "protected"
+ setters, have classes always implement a certain set of =
interfaces or even have
+ them extend a certain base class and even more.
=
The following example shows how to use various
- <meta>
- attributes and the resulting java code.
+ <meta>
+ attributes and the resulting java code.
=
<class name=3D"Person">
<meta attribute=3D"class-description">
@@ -47,9 +47,9 @@
</class>
=
The above
- hbm.xml will produce something like =
the following (code
- shortened for better understanding). Notice the Javadoc comment and the
- protected set methods:
+ hbm.xml
+ will produce something like the following (code shortene=
d for better
+ understanding). Notice the Javadoc comment and the protected set met=
hods:
=
// default package
=
@@ -100,9 +100,9 @@
Supported meta tags
=
-
+
=
-
+
=
@@ -114,172 +114,200 @@
=
- class-description
+
+ class-description
+
=
inserted into the javadoc for classes
=
- field-description
+
+ field-description
+
=
inserted into the javadoc for fields/properties
=
- interface
+
+ interface
+
=
- If true an interface is generated instead of an
- class.
+ If true an interface is generated instead of an class.<=
/entry>
=
- implements
+
+ implements
+
=
interface the class should implement
=
- extends
+
+ extends
+
=
- class the class should extend (ignored for
- subclasses)
+ class the class should extend (ignored for subclasses)<=
/entry>
=
- generated-class
+
+ generated-class
+
=
overrule the name of the actual class generated
=
- scope-class
+
+ scope-class
+
=
scope for class
=
- scope-set
+
+ scope-set
+
=
scope for setter method
=
- scope-get
+
+ scope-get
+
=
scope for getter method
=
- scope-field
+
+ scope-field
+
=
scope for actual field
=
- default-value
+
+ default-value
+
=
default initialization value for a field
=
- use-in-tostring
+
+ use-in-tostring
+
=
- include this property in the
- toString()
+ include this property in the toString()
=
- use-in-equals
+
+ use-in-equals
+
=
- include this property in the equals()
- and hashCode() method. If no use-in-equals =
is
- specified, no equals/hashcode will be generated.
+ include this property in the equals() and
+ hashCode() method. If no use-in-equals is=
specified, no
+ equals/hashcode will be generated.
=
- gen-property
+
+ gen-property
+
=
- property will not be generated if false (use with
- care)
+ property will not be generated if false (use with care)=
=
- property-type
+
+ property-type
+
=
- Overrides the default type of property. Use this with a=
ny
- tag's to specify the concrete type instead of just Object.
+ Overrides the default type of property. Use this with a=
ny tag's to specify the
+ concrete type instead of just Object.
=
- class-code
+
+ class-code
+
=
- Extra code that will inserted at the end of the
- class
+ Extra code that will inserted at the end of the class=
entry>
=
- extra-import
+
+ extra-import
+
=
- Extra import that will inserted at the end of all other
- imports
+ Extra import that will inserted at the end of all other=
imports
=
Attributes declared via the
- <meta> tag are
- per default
- "inherited" inside an
- hbm.xml file.
+ <meta>
+ tag are per default
+ "inherited"
+ inside an
+ hbm.xml
+ file.
=
- What does that mean? It means that if you e.g want to have all y=
our
- classes implement IAuditable then you just add an
-
- <meta
- attribute=3D"implements">IAuditable</meta> in the =
top of
- the
- hbm.xml file, just after
-
- <hibernate-mapping>. Now all=
classes defined in
- that
- hbm.xml file will implement
- IAuditable!
+ What does that mean? It means that if you e.g want to have all y=
our classes implement
+ IAuditable then you just add an <=
meta
+ attribute=3D"implements">IAuditable</meta> in =
the top of the
+ hbm.xml
+ file, just after
+ <hibernate-mapping>
+ . Now all classes defined in that
+ hbm.xml
+ file will implement IAuditable!
=
- This applies to all
- <meta>-tags. Thus it can also e.g. be used to
- specify that all fields should be declare protected, instead of the
- default private. This is done by adding <meta
- attribute=3D"scope-field">protected</meta> at e.g. =
just
- under the <class> tag and all fields of that
- class will be protected.
-
+
+ This applies to all
+ <meta>-tags. Thus it can also e.g. be use=
d to specify that
+ all fields should be declare protected, instead of the default pri=
vate. This is done by
+ adding <meta
+ attribute=3D"scope-field">protected</meta> at e=
.g. just under
+ the <class> tag and all fields of that cl=
ass will be
+ protected.
+
=
To avoid having a
- <meta> tag inherited then
- you can simply specify
- inherit =3D "false" for the
- attribute, e.g.
- <meta attribute =3D "scope-class"
- inherit =3D "false">public abstract</meta> will r=
estrict
- the
- "class-scope" to the cu=
rrent class, not the subclasses.
+ <meta>
+ tag inherited then you can simply specify inh=
erit =3D "false"
+ for the attribute, e.g. <meta attribute =3D "scope-cla=
ss" inherit =3D
+ "false">public abstract</meta> will restrict t=
he
+ "class-scope"
+ to the current class, not the subclasses.
=
Recommendations
=
- The following are some good practices when using
-
- <meta> attributes.
+ The following are some good practices when using
+ <meta>
+ attributes.
=
- Dangers of a class level use-in-string and
- use-in-equals meta attributes when having bi-directional
- associations
+ Dangers of a class level use-in-string and use-in-=
equals meta
+ attributes when having bi-directional associations
=
- If we have two entities with a bi-directional association
- between them and define at class scope level the meta attributes:
- use-in-string, use-in-equals:
+ If we have two entities with a bi-directional association be=
tween them and define at
+ class scope level the meta attributes:
+ use-in-string
+ ,
+ use-in-equals
+ :
=
<hibernate-mapping>
<class name=3D"Person">
@@ -290,7 +318,8 @@
</hibernate-mapping>
=
And for
- Event.hbm file:
+ Event.hbm
+ file:
=
<hibernate-mapping> =
<class name=3D"events.Event" table=3D"EVENTS">
@@ -309,19 +338,21 @@
</hibernate-mapping>
=
Then
- <hbm2java> will assume you=
want to
- include all properties and collections in the
- toString()/equals() methods and this can result=
in
- infinite recursive calls.
+ <hbm2java>
+ will assume you want to include all properties and c=
ollections in the
+ toString()/equals() =
methods and this can
+ result in infinite recursive calls.
=
- To remedy this you have to decide which side of the associat=
ion
- will include the other part (if at all) in the
- toString()/equals() methods. Therefore it is no=
t a
- good practice to put at class scope such meta attributes, unless y=
ou
- are defining a class without bi-directional associations.
+ To remedy this you have to decide which side of the associat=
ion will include the other
+ part (if at all) in the toString()/equals()
+ methods. Therefore it is not a good practice to put at class sco=
pe such
+ meta
+ attributes, unless you are defining a class without =
bi-directional
+ associations.
=
- We recomend instead to add the meta
- attributes at the property level:
+ We recomend instead to add the
+ meta
+ attributes at the property level:
=
<hibernate-mapping> =
<class name=3D"events.Event" table=3D"EVENTS"> =
@@ -364,75 +395,68 @@
=
- Be aware of putting at class scope level
- <meta> attribute
- use-in-equals
+ Be aware of putting at class scope level <meta&=
gt;
+ attribute use-in-equals
=
- For equal()/hashCode() method generation,=
you
- have to take into account that the attributes that participate on =
such
- method definition, should take into account only attributes with
- business meaning (the name, social security number, etc, but no
- generated id's, for example).
+ For equal()/hashCode() method generatio=
n,
+ you have to take into account that the attributes that participa=
te on such method
+ definition, should take into account only attributes with busine=
ss meaning (the name,
+ social security number, etc, but no generated id's, for example)=
.
=
This is important because Java's hashbased collections, such=
as
- java.util.Set relies on equals() and hashcode() to be correct and =
not
- change for objects in the set; this can be a problem if the id gets
- assigned for an object after you inserted it into a set.
+ java.util.Set relies on equals(=
) and
+ hashcode() to be correct and not change f=
or objects in the set;
+ this can be a problem if the id gets assigned for an object afte=
r you inserted it into a
+ set.
=
Therefore automatically configuration the generation of
- equals()/hashCode() methods specifying at class
- scope level the
- <meta> attribute
- use-in-equals could be a dangerous decision that
- could produce non expected side-effect.
+ equals()/hashCode() methods specifying at c=
lass scope level the
+ <meta>
+ attribute use-in-equals could be a dangerous decision that
+ could produce non expected side-effect.
=
- Here you can =
get more in-depth
- explanation on the subject of equals() and hashcode().
+ Here you can get more in-depth
+ explanation on the subject of equals() and =
hashcode().
=
- Advanced <meta> attribute
- examples
+ Advanced <meta> attribute examples
=
- This section shows an example for using meta attributes (inclu=
ding
- userspecific attributes) together with the code generation features =
in
- Hibernate Tools.
+ This section shows an example for using meta attributes (inclu=
ding userspecific
+ attributes) together with the code generation features in Hibernate
+ Tools.
=
- The usecase being implemented is to automatically insert some =
pre-
- and post-conditions into the getter and setters of the generated POJ=
O.
-
+ The usecase being implemented is to automatically insert some =
pre- and post-conditions
+ into the getter and setters of the generated POJO.
=
Generate pre/post-conditions for methods
=
- With an
- <meta attribute=3D"class-code">,
- you can add additional methods on a given class, nevertheless such
-
- <meta> attribute can not=
be used at property
- scope level and Hibernate Tools does not prov=
ide such
-
- <meta> attributes.
+ With an <meta attribute=3D"class-code">, you can add
+ additional methods on a given class, nevertheless such
+ <meta>
+ attribute can not be used at property scope level an=
d Hibernate
+ Tools does not provide such
+ <meta>
+ attributes.
=
- A possibly solution for this is to modify the freemarker
- templates responsible for generating the POJO's. If you look inside
-
- hibernate-tools.jar, you can f=
ind the template:
-
- pojo/PojoPropertyAccessor.ftl<=
/para>
+ A possibly solution for this is to modify the freemarker tem=
plates responsible for
+ generating the POJO's. If you look inside
+ hibernate-tools.jar
+ , you can find the template:
+ pojo/PojoPropertyAccessor.ftl
+
=
- This file is as the named indicates used to generate property
- accessors for pojo's.
+ This file is as the named indicates used to generate propert=
y accessors for pojo's.
=
Extract the
- PojoPropertyAccessor.ftl into a
- local folder i.e.
- ${hbm.template.path}, respecti=
ng
- the whole path, for example:
-
- ${hbm.template.path}/pojo/PojoPropertyAccessor.ftl=
property>
+ PojoPropertyAccessor.ftl
+ into a local folder i.e.
+ ${hbm.template.path}
+ , respecting the whole path, for example:
+ ${hbm.template.path}/pojo/PojoPropertyAccessor.ftl=
property>
+
=
The contents of the file is something like this:
=
@@ -446,9 +470,8 @@
}
</#foreach>
=
- We can add conditionally pre/post-conditions on our
- set method generation just adding a little
- Freemarker syntax to the above source code:
+ We can add conditionally pre/post-conditions on our set method
+ generation just adding a little Freemarker syntax to the above s=
ource code:
=
<#foreach property in pojo.getAllPropertiesIter=
ator()>
${pojo.getPropertyGetModifiers(property)} ${pojo.getJavaTypeName(prope=
rty, jdk5)} ${pojo.getGetterSignature(property)}() {
@@ -468,18 +491,16 @@
=
Now if in any
- *hbm.xml file we define the
-
- <meta> attributes:
- pre-cond or post-cond, their
- contents will be generated into the body of the relevant
- set method.
+ *hbm.xml
+ file we define the
+ <meta>
+ attributes: pre-cond or =
post-cond, their
+ contents will be generated into the body of the relevant set method.
=
- As an example let us add a pre-condition for property
- name preventing no Person can
- have an empty name. So we have to modify the
-
- Person.hbm.xml file like this:=
+ As an example let us add a pre-condition for property name
+ preventing no Person can have an empty name. =
So we have to modify the
+ Person.hbm.xml
+ file like this:
=
<hibernate-mapping>
<class name=3D"Person">
@@ -496,20 +517,19 @@
</class>
</hibernate-mapping>
=
- I) If you don'' use <[[CDATA[]]>=
literal>
- you have to scape the & symbol, i.e.: &
- II). Note that we
- are referring to "firstName" directly and this is the parameter na=
me
- not the actual field name. If you want to refer the field you have=
to
- use "this.firstName" instead.
-
+
+ I) If you don'' use <[[CDATA[]]> you have
+ to scape the & symbol, i.e.: &
+ II). Note that we are referring to "firstName" directly an=
d this is the parameter
+ name not the actual field name. If you want to refer the field=
you have to use
+ "this.firstName" instead.
+
=
- Finally we have to generate the Person.java
- class, for this we can use both Eclipse and Ant as long as you
- remember to set or fill in the templatepath setting. For Ant we
- configure
- <hibernatetool> task via
- the templatepath attribute as in:
+ Finally we have to generate the Person.java class, for this we
+ can use both Eclipse and Ant as long as you remember to set or f=
ill in the templatepath
+ setting. For Ant we configure
+ <hibernatetool>
+ task via the templatepath attribu=
te as in:
=
<target name=3D"hbm2java">
@@ -531,10 +551,10 @@
</target>
=
Invoking the target
- <hbm2java> will
- generate on the
- ${hbm2java.dest.dir} the file
- Person.java:
+ <hbm2java>
+ will generate on the
+ ${hbm2java.dest.dir}
+ the file Person.java:
=
// default package
import java.io.Serializable;
@@ -571,8 +591,8 @@
}
}
=
-
+
-
\ No newline at end of file
+
--===============5350962384610812887==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 11:58:44 2008
Content-Type: multipart/mixed; boundary="===============0598747736414800019=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5565 -
trunk/jsf/docs/userguide/en/images/more_editors.
Date: Wed, 09 Jan 2008 11:58:44 -0500
Message-ID:
--===============0598747736414800019==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ykryvinchanka
Date: 2008-01-09 11:58:44 -0500 (Wed, 09 Jan 2008)
New Revision: 5565
Modified:
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_1.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_10.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_11.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_12.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_13.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_14.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_2.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_3.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_4.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_5.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_6.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_7.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_9.png
Log:
http://jira.jboss.com/jira/browse/JBDS-226 Screens retaken in 96 resolution=
+ scale parameter is defined
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_1.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_10.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_11.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_12.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_13.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_14.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_2.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_3.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_4.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_5.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_6.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_7.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_9.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
--===============0598747736414800019==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 11:58:53 2008
Content-Type: multipart/mixed; boundary="===============9196612850444490699=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5566 -
trunk/jsf/docs/userguide/en/modules.
Date: Wed, 09 Jan 2008 11:58:53 -0500
Message-ID:
--===============9196612850444490699==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ykryvinchanka
Date: 2008-01-09 11:58:53 -0500 (Wed, 09 Jan 2008)
New Revision: 5566
Modified:
trunk/jsf/docs/userguide/en/modules/editors.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-226 Screens retaken in 96 resolution=
+ scale parameter is defined
Modified: trunk/jsf/docs/userguide/en/modules/editors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/docs/userguide/en/modules/editors.xml 2008-01-09 16:58:44 UTC=
(rev 5565)
+++ trunk/jsf/docs/userguide/en/modules/editors.xml 2008-01-09 16:58:53 UTC=
(rev 5566)
@@ -1196,7 +1196,7 @@
Adding a New Tag
-
+
@@ -1207,7 +1207,7 @@
Adding a New Attribute
-
+
@@ -1217,7 +1217,7 @@
Content Assist
-
+
@@ -1303,7 +1303,7 @@
Content Assist
-
+
--===============9196612850444490699==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 12:21:15 2008
Content-Type: multipart/mixed; boundary="===============8652723661774766683=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5567 - in
trunk/jsf/docs/userguide/en/images: web_projects and 1 other directory.
Date: Wed, 09 Jan 2008 12:21:15 -0500
Message-ID:
--===============8652723661774766683==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ykryvinchanka
Date: 2008-01-09 12:21:15 -0500 (Wed, 09 Jan 2008)
New Revision: 5567
Modified:
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_25.png
trunk/jsf/docs/userguide/en/images/web_projects/web_projects_14.png
trunk/jsf/docs/userguide/en/images/web_projects/web_projects_15.png
trunk/jsf/docs/userguide/en/images/web_projects/web_projects_16.png
Log:
http://jira.jboss.com/jira/browse/JBDS-226 Screens retaken in 96 resolution=
+ scale parameter is defined
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_25.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/web_projects/web_projects_14.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/web_projects/web_projects_15.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/web_projects/web_projects_16.p=
ng
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
--===============8652723661774766683==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 14:05:11 2008
Content-Type: multipart/mixed; boundary="===============3765457591573776625=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5568 - in
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console:
viewers and 1 other directories.
Date: Wed, 09 Jan 2008 14:05:11 -0500
Message-ID:
--===============3765457591573776625==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: vyemialyanchyk
Date: 2008-01-09 14:05:11 -0500 (Wed, 09 Jan 2008)
New Revision: 5568
Added:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hiber=
nate/eclipse/console/viewers/
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hiber=
nate/eclipse/console/viewers/MTreeViewer.java
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hiber=
nate/eclipse/console/views/KnownConfigurationsView.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1482
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/h=
ibernate/eclipse/console/viewers/MTreeViewer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe=
rnate/eclipse/console/viewers/MTreeViewer.java (rev=
0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe=
rnate/eclipse/console/viewers/MTreeViewer.java 2008-01-09 19:05:11 UTC (rev=
5568)
@@ -0,0 +1,196 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
+package org.hibernate.eclipse.console.viewers;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.TreePath;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Item;
+import org.eclipse.swt.widgets.Widget;
+
+public class MTreeViewer extends TreeViewer {
+
+ public MTreeViewer(Composite parent, int style) {
+ super(parent, style);
+ }
+
+ // some little hack
+ public boolean isBusy() {
+ =
+ Object obj =3D null;
+ Class clazz =3D org.eclipse.jface.viewers.ColumnViewer.class;
+ try {
+ Method hiddenMethod =3D clazz.getDeclaredMethod("isBusy");
+ if (null !=3D hiddenMethod) {
+ hiddenMethod.setAccessible(true);
+ obj =3D hiddenMethod.invoke(this);
+ }
+ } catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ } catch (SecurityException e) {
+ e.printStackTrace();
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ }
+ if (obj instanceof Boolean) {
+ return ((Boolean)obj).booleanValue();
+ }
+ return false;
+ }
+
+ /**
+ * Adds the given child elements to this viewer as children of the given
+ * parent element. If this viewer does not have a sorter, the elements are
+ * added at the end of the parent's list of children in the order given;
+ * otherwise, the elements are inserted at the appropriate positions.
+ *
+ * This method should be called (by the content provider) when elements h=
ave
+ * been added to the model, in order to cause the viewer to accurately
+ * reflect the model. This method only affects the viewer, not the model.
+ *
+ * =
+ * @param parentElementOrTreePath
+ * the parent element
+ * @param childElements
+ * the child elements to add
+ */
+ public void add(Object parentElementOrTreePath, Object[] childElements) {
+ Assert.isNotNull(parentElementOrTreePath);
+ assertElementsNotNull(childElements);
+ if (isBusy())
+ return;
+ Widget[] widgets =3D internalFindItems2(parentElementOrTreePath);
+ // If parent hasn't been realized yet, just ignore the add.
+ if (widgets.length =3D=3D 0) {
+ return;
+ }
+
+ for (int i =3D 0; i < widgets.length; i++) {
+ internalAdd(widgets[i], parentElementOrTreePath, childElements);
+ }
+ }
+
+ /**
+ * Find the items for the given element of tree path
+ * =
+ * @param parentElementOrTreePath
+ * the element or tree path
+ * @return the items for that element
+ */
+ protected Widget[] internalFindItems2(Object parentElementOrTreePath) {
+ Widget[] widgets;
+ if (parentElementOrTreePath instanceof TreePath) {
+ widgets =3D internalFindItems(parentElementOrTreePath);
+ } else {
+ widgets =3D findItems2(parentElementOrTreePath);
+ }
+ return widgets;
+ }
+ =
+ /**
+ * Finds the widgets which represent the given element. The returned array
+ * must not be changed by clients; it might change upon calling other
+ * methods on this viewer.
+ *
+ * This method was introduced to support multiple equal elements in a vie=
wer
+ * (@see {@link AbstractTreeViewer}). Multiple equal elements are only
+ * supported if the element map is enabled by calling
+ * {@link #setUseHashlookup(boolean)} and passing true.
+ *
+ *
+ * The default implementation of this method tries first to find the widg=
et
+ * for the given element assuming that it is the viewer's input; this is
+ * done by calling doFindInputItem. If it is not found
+ * there, the widgets are looked up in the internal element map provided
+ * that this feature has been enabled. If the element map is disabled, the
+ * widget is found via doFindInputItem.
+ *
+
+
+
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/face=
letsTest/WebContent/pages/components/include.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet=
sTest/WebContent/pages/components/include.xhtml (re=
v 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet=
sTest/WebContent/pages/components/include.xhtml 2008-01-09 21:00:20 UTC (re=
v 5569)
@@ -0,0 +1,15 @@
+
+
+
+
+Debug Test
+
+
+
+
ui:include test page
+
+
+
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/face=
letsTest/WebContent/pages/components/insert.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet=
sTest/WebContent/pages/components/insert.xhtml (rev=
0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet=
sTest/WebContent/pages/components/insert.xhtml 2008-01-09 21:00:20 UTC (rev=
5569)
@@ -0,0 +1,66 @@
+
+
+
+
+Page Title
+
+
+
+
+
+
+
+
+
Page=
Header
+
+
+
+
+
+
+
+
+
+
+
+
Page Body
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/face=
letsTest/WebContent/pages/components/param.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet=
sTest/WebContent/pages/components/param.xhtml (rev =
0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet=
sTest/WebContent/pages/components/param.xhtml 2008-01-09 21:00:20 UTC (rev =
5569)
@@ -0,0 +1,17 @@
+
+
+
+
+Param Test
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/face=
letsTest/WebContent/pages/components/remove.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet=
sTest/WebContent/pages/components/remove.xhtml (rev=
0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet=
sTest/WebContent/pages/components/remove.xhtml 2008-01-09 21:00:20 UTC (rev=
5569)
@@ -0,0 +1,18 @@
+
+
+
+
+Remove Test
+
+
+
+
+ This will be removed.
+
+ This won't be compiled either
+
+
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/face=
letsTest/WebContent/pages/components/repeat.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet=
sTest/WebContent/pages/components/repeat.xhtml (rev=
0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/facelet=
sTest/WebContent/pages/components/repeat.xhtml 2008-01-09 21:00:20 UTC (rev=
5569)
@@ -0,0 +1,20 @@
+
+
+
+
+Repeat Test
+
+
+
+
+
#{dept.name}
+
+
#{emp.lastName}, #{emp.firstName}
+
+
+
+
+
\ No newline at end of file
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/fa=
celetstest.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jbo=
ss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsAllTests.java 2008-01-09 19:05:11 UTC (rev=
5568)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsAllTests.java 2008-01-09 21:00:20 UTC (rev=
5569)
@@ -7,7 +7,7 @@
=
public static Test suite() {
=
- TestSuite suite =3D new TestSuite("Tests for Vpe Facelets components"); /=
/ $NON-NLS-1$
+ TestSuite suite =3D new TestSuite("Tests for Vpe Facelets components");
// $JUnit-BEGIN$
=
suite.addTestSuite(FaceletsComponentTest.class);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jbo=
ss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-09 19:05:11 UTC=
(rev 5568)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-09 21:00:20 UTC=
(rev 5569)
@@ -10,20 +10,19 @@
*************************************************************************=
*****/
package org.jboss.tools.jsf.vpe.facelets.test;
=
-import junit.framework.TestCase;
+import java.util.ArrayList;
+import java.util.List;
=
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.ILogListener;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
=
/**
* Class for testing all Seam components
@@ -31,187 +30,79 @@
* @author dsakovich(a)exadel.com
* =
*/
-public class FaceletsComponentTest extends TestCase implements ILogListene=
r {
+public class FaceletsComponentTest extends VpeTest {
=
- private final static String EDITOR_ID =3D "org.jboss.tools.jst.jsp.jsp=
editor.JSPTextEditor"; // $NON-NLS-1$
- private final static String TEST_PROJECT_JAR_PATH =3D "/faceletstest.j=
ar"; // $NON-NLS-1$
+ // import project name
+ private static final String IMPORT_PROJECT_NAME =3D "faceletsTest";
=
- // check warning log
- private final static boolean checkWarning =3D false;
- private Throwable exception;
-
public FaceletsComponentTest(String name) {
- super(name);
+ super(name, IMPORT_PROJECT_NAME, FaceletsTestPlugin
+ .getPluginResourcePath());
}
=
- /**
- * Perform pre-test initialization.
- * =
- * @throws Exception
- * =
- * @see TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
-
- // TODO: Use TestSetup to create and remove project once for all tests
- // not for every one
- if (ResourcesPlugin.getWorkspace().getRoot().findMember("faceletsTest") =
=3D=3D null) {
-
- ImportFaceletsComponents.importFaceletsPages(FaceletsTestPlugin
- .getPluginResourcePath()
- + TEST_PROJECT_JAR_PATH);
-
- waitForJobs();
- delay(5000);
- }
- Platform.addLogListener(this);
+ public void testDebug() throws Throwable {
+ performTestForJsfComponent("components/debug.xhtml"); // $NON-NLS-1$
}
=
- /**
- * Perform post-test cleanup.
- * =
- * @throws Exception
- * =
- * @see TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- super.tearDown();
- if (ResourcesPlugin.getWorkspace().getRoot().findMember("faceletsTest") !=
=3D null) {
- ImportFaceletsComponents.removeProject();
- }
- Platform.removeLogListener(this);
- }
+ public void testDefine() throws Throwable {
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
=
- /**
- * Process UI input but do not return for the specified time interval.
- * =
- * @param waitTimeMillis
- * the number of milliseconds
- */
- private void delay(long waitTimeMillis) {
- Display display =3D Display.getCurrent();
- if (display !=3D null) {
- long endTimeMillis =3D System.currentTimeMillis() + waitTimeMillis;
- while (System.currentTimeMillis() < endTimeMillis) {
- if (!display.readAndDispatch())
- display.sleep();
- }
- display.update();
- }
- // Otherwise, perform a simple sleep.
- else {
- try {
- Thread.sleep(waitTimeMillis);
- } catch (InterruptedException e) {
- // Ignored.
- }
- }
- }
+ // get test page path
+ IFile file =3D (IFile) TestUtil.getComponentPath(
+ "components/define.xhtml", getImportProjectName());
=
- /**
- * Wait until all background tasks are complete.
- */
- public void waitForJobs() {
- while (Job.getJobManager().currentJob() !=3D null)
- delay(5000);
- }
+ assertNotNull("Could not open specified file " + file.getFullPath(),
+ file);
=
- public void testInsert() throws PartInitException, Throwable {
- performTestForFaceletComponent("insert.xhtml"); // $NON-NLS-1$
- }
+ IEditorInput input =3D new FileEditorInput(file);
=
- public void testDefine() throws PartInitException, Throwable {
- performTestForFaceletComponent("define.xhtml"); // $NON-NLS-1$
- // TODO check that content from ui:defime element is shown
- assertTrue("Defined content is not shown",false);
- }
+ assertNotNull("Editor input is null", input);
+ // open and get editor
+ JSPMultiPageEditor part =3D openEditor(input);
=
- public void testComposite() throws PartInitException, Throwable {
- performTestForFaceletComponent("composition.xhtml"); // $NON-NLS-1$
- // TODO check that related and absolute path is processed
- assertTrue("Template with absolute path is not included",false);
- assertTrue("Template with related path is not included",false); =
- }
+ // get dom document
+ nsIDOMDocument document =3D getVpeVisualDocument(part);
+ nsIDOMElement element =3D document.getDocumentElement();
=
- public void testComponent() throws PartInitException, Throwable {
- performTestForFaceletComponent("component.xhtml"); // $NON-NLS-1$
- // TODO check that content from ui:defime element is shown
- //assertTrue("Component's content is not shown",false);
- }
- =
- public void testRemove() throws PartInitException, Throwable {
- performTestForFaceletComponent("remove.xhtml"); // $NON-NLS-1$
- // TODO check that content in ui:remove isn't shown in VPE
- assertTrue("Content inside ui:remove tag shouldn't be shown",false);
- }
- =
- public void testDecorate() throws PartInitException, Throwable {
- performTestForFaceletComponent("decorate.xhtml"); // $NON-NLS-1$
- // TODO check that related and absolute path is processed
- assertTrue("Template with absolute path is not included",false);
- assertTrue("Template with related path is not included",false); =
- }
+ // check that element is not null
+ assertNotNull(element);
=
- public void testRepeat() throws PartInitException, Throwable {
- performTestForFaceletComponent("repeat.xhtml"); // $NON-NLS-1$
- assertTrue("Component's content is not shown",false); =
- } =
- =
- public void testDebug() throws PartInitException, Throwable {
- performTestForFaceletComponent("debug.xhtml"); // $NON-NLS-1$
- }
- =
- public void testInclude() throws PartInitException, Throwable {
- performTestForFaceletComponent("include.xhtml"); // $NON-NLS-1$
- // TODO check that absolute and related path is processed
- assertTrue("Template with absolute path is not included",false);
- assertTrue("Template with related path is not included",false); =
- }
- =
- public void testFragment() throws PartInitException, Throwable {
- performTestForFaceletComponent("fragment.xhtml"); // $NON-NLS-1$
- // TODO check that fragment's content is showed
- assertTrue("Fragment's content is not sown",false);
- }
- private void performTestForFaceletComponent(String componentPage)
- throws PartInitException, Throwable {
- waitForJobs();
+ // get root node
+ nsIDOMNode node =3D (nsIDOMNode) element
+ .queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
=
- exception =3D null;
- IPath componentPath =3D ImportFaceletsComponents
- .getComponentPath(componentPage);
+ List elements =3D new ArrayList();
=
- IFile file =3D ResourcesPlugin.getWorkspace().getRoot().getFile(
- componentPath);
- IEditorInput input =3D new FileEditorInput(file);
+ // find "span" elements
+ TestUtil.findElementsByName(node, elements, HTML.TAG_SPAN);
=
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .openEditor(input, EDITOR_ID, true);
+ assertEquals(2, elements.size());
=
- waitForJobs();
- delay(5000);
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .closeAllEditors(true);
+ nsIDOMElement elementSpan0 =3D (nsIDOMElement) elements.get(0)
+ .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+ nsIDOMElement elementSpan1 =3D (nsIDOMElement) elements.get(1)
+ .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
=
- if (exception !=3D null) {
- throw exception;
+ /*
+ * nsIDOMText text0 =3D (nsIDOMText) elementSpan0.getFirstChild();
+ * nsIDOMText text1 =3D (nsIDOMText) elementSpan1.getFirstChild();
+ * System.out.println(text0.getNodeValue());
+ * assertEquals(elementInput0.getAttribute("value"), "");
+ * assertNotNull(elementInput1.getAttribute("value"), "");
+ * assertNotNull(elementInput2.getAttribute("value"), "test");
+ */
+
+ // TODO Dzmitry Sakovich Test not complete
+ assertTrue("Defined content is not shown", false);
+ if (getException() !=3D null) {
+ throw getException();
}
}
=
- public void logging(IStatus status, String plugin) {
- switch (status.getSeverity()) {
- case IStatus.ERROR:
- exception =3D status.getException();
- break;
- case IStatus.WARNING:
- if (checkWarning)
- exception =3D status.getException();
- break;
- default:
- break;
- }
-
+ public void testInsert() throws Throwable {
+ performTestForJsfComponent("components/insert.xhtml"); // $NON-NLS-1$
}
=
}
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jbos=
s/tools/jsf/vpe/facelets/test/ImportFaceletsComponents.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/ImportFaceletsComponents.java 2008-01-09 19:05:11 =
UTC (rev 5568)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/ImportFaceletsComponents.java 2008-01-09 21:00:20 =
UTC (rev 5569)
@@ -1,92 +0,0 @@
-package org.jboss.tools.jsf.vpe.facelets.test;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.internal.wizards.datatransfer.ZipLeveledStructurePro=
vider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-
-/**
- * Class for importing project from jar file
- * =
- * @author dsakovich(a)exadel.com
- * =
- */
-public class ImportFaceletsComponents {
- private static final String PROJECT_NAME =3D "faceletsTest"; // $NON-N=
LS-1$
- private static final String COMPONENTS_PATH =3D "WebContent/pages"; //=
$NON-NLS-1$
-
- @SuppressWarnings("restriction")
- static void importFaceletsPages(String path) {
- IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject(
- PROJECT_NAME);
- ZipLeveledStructureProvider zipStructureProvider;
- try {
- zipStructureProvider =3D new ZipLeveledStructureProvider(new ZipFile(
- path));
-
- IOverwriteQuery overwrite =3D new IOverwriteQuery() {
- public String queryOverwrite(String pathString) {
- return ALL;
- }
- };
-
- ImportOperation importOp =3D new ImportOperation(project
- .getFullPath(), zipStructureProvider.getRoot(),
- zipStructureProvider, overwrite);
-
- importOp.setContext(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell());
-
- importOp.run(new NullProgressMonitor());
- } catch (InvocationTargetException ite) {
- FaceletsTestPlugin.getPluginLog().logError(ite.getCause());
- } catch (InterruptedException ie) {
- FaceletsTestPlugin.getPluginLog().logError(ie);
- } catch (IOException e) {
- FaceletsTestPlugin.getPluginLog().logError(e);
- }
- }
-
- /**
- * =
- * @return
- * @throws CoreException
- */
- static IPath getComponentPath(String componentPage) throws CoreExcepti=
on {
- IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject(
- PROJECT_NAME);
- if (project !=3D null) {
- IResource resource =3D project.getFolder(COMPONENTS_PATH).findMember(
- componentPage);
- if (resource !=3D null) {
- return resource.getFullPath();
- }
-
- }
-
- return null;
- }
-
- /**
- * =
- * @throws CoreException
- */
- static void removeProject() throws CoreException {
- IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject(
- PROJECT_NAME);
- if (project !=3D null) {
- project.delete(IResource.ALWAYS_DELETE_PROJECT_CONTENT,
- new NullProgressMonitor());
- }
- }
-}
--===============7033952880415213934==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 16:32:32 2008
Content-Type: multipart/mixed; boundary="===============1107048538787227755=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5570 -
trunk/tests/features/org.jboss.tools.test.feature.
Date: Wed, 09 Jan 2008 16:32:32 -0500
Message-ID:
--===============1107048538787227755==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-09 16:32:32 -0500 (Wed, 09 Jan 2008)
New Revision: 5570
Modified:
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
Log:
New test plugins have been added to the test beature
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-01-0=
9 21:00:20 UTC (rev 5569)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-01-0=
9 21:32:32 UTC (rev 5570)
@@ -308,4 +308,31 @@
install-size=3D"0"
version=3D"0.0.0"/>
=
+
+
+
+
+
+
+
+
--===============1107048538787227755==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 18:55:43 2008
Content-Type: multipart/mixed; boundary="===============3105897985675883969=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5571 -
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject.
Date: Wed, 09 Jan 2008 18:55:43 -0500
Message-ID:
--===============3105897985675883969==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-09 18:55:43 -0500 (Wed, 09 Jan 2008)
New Revision: 5571
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java
Log:
Fix compilation error
HibernateNatureAddTest class is missing
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src=
/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java 2008-01=
-09 21:32:32 UTC (rev 5570)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java 2008-01=
-09 23:55:43 UTC (rev 5571)
@@ -9,7 +9,7 @@
public class TestSetAfterSetup {
public static TestSuite getTests(){
TestSuite suite =3D new TestSuite("Test for MappingTestProject" );
- suite.addTestSuite( HibernateNatureAddTest.class );
+ //suite.addTestSuite( HibernateNatureAddTest.class );
//suite.addTestSuite( CreateConsoleConfigTest.class );
return suite;
}
--===============3105897985675883969==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 20:07:36 2008
Content-Type: multipart/mixed; boundary="===============3898991019575111711=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5572 -
trunk/tests/features/org.jboss.tools.test.feature.
Date: Wed, 09 Jan 2008 20:07:35 -0500
Message-ID:
--===============3898991019575111711==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-09 20:07:35 -0500 (Wed, 09 Jan 2008)
New Revision: 5572
Modified:
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
Log:
include new tests in build
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-01-0=
9 23:55:43 UTC (rev 5571)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-01-1=
0 01:07:35 UTC (rev 5572)
@@ -281,8 +281,7 @@
id=3D"org.jboss.tools.jst.web.ui.test"
download-size=3D"0"
install-size=3D"0"
- version=3D"0.0.0"
- unpack=3D"false"/>
+ version=3D"0.0.0"/>
=
+ version=3D"0.0.0"/>
=
+ version=3D"0.0.0"/>
=
--===============3898991019575111711==--
From jbosstools-commits at lists.jboss.org Wed Jan 9 20:07:39 2008
Content-Type: multipart/mixed; boundary="===============6415641205763921608=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5573 - in
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test: META-INF and 1 other
directory.
Date: Wed, 09 Jan 2008 20:07:39 -0500
Message-ID:
--===============6415641205763921608==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgolovin
Date: 2008-01-09 20:07:39 -0500 (Wed, 09 Jan 2008)
New Revision: 5573
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/build.properties
Log:
include new tests in build
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFE=
ST.MF
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF =
2008-01-10 01:07:35 UTC (rev 5572)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF =
2008-01-10 01:07:39 UTC (rev 5573)
@@ -12,3 +12,4 @@
org.junit,
org.jboss.tools.vpe
Eclipse-LazyStart: true
+Bundle-ClassPath: vpe-seam-test.jar
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/build.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/build.properties 2008=
-01-10 01:07:35 UTC (rev 5572)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/build.properties 2008=
-01-10 01:07:39 UTC (rev 5573)
@@ -1,4 +1,13 @@
-source.. =3D src/
-output.. =3D bin/
bin.includes =3D META-INF/,\
- .
+ vpe-seam-test.jar,\
+ resources/
+jars.compile.order =3D vpe-seam-test.jar
+source.vpe-seam-test.jar =3D src/
+output.vpe-seam-test.jar =3D bin/
+src.includes =3D src/,\
+ resources/,\
+ build.properties,\
+ META-INF/,\
+ .project,\
+ .classpath
+source.vpe-seam-test.jar =3D src/
--===============6415641205763921608==--
From jbosstools-commits at lists.jboss.org Thu Jan 10 04:49:37 2008
Content-Type: multipart/mixed; boundary="===============6468585158817347361=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5574 -
trunk/core/util/packaging-convert.
Date: Thu, 10 Jan 2008 04:49:35 -0500
Message-ID:
--===============6468585158817347361==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: max.andersen(a)jboss.com
Date: 2008-01-10 04:49:35 -0500 (Thu, 10 Jan 2008)
New Revision: 5574
Modified:
trunk/core/util/packaging-convert/
trunk/core/util/packaging-convert/build.xml
Log:
updated bin ignore and build.xml
Property changes on: trunk/core/util/packaging-convert
___________________________________________________________________
Name: svn:ignore
+ bin
build
packaging-convert.zip
packaging-converter.jar
Modified: trunk/core/util/packaging-convert/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/core/util/packaging-convert/build.xml 2008-01-10 01:07:39 UTC (re=
v 5573)
+++ trunk/core/util/packaging-convert/build.xml 2008-01-10 09:49:35 UTC (re=
v 5574)
@@ -25,7 +25,13 @@
=
=
-
+
+ =
+
+
+
+
+
=
--===============6468585158817347361==--
From jbosstools-commits at lists.jboss.org Thu Jan 10 08:04:57 2008
Content-Type: multipart/mixed; boundary="===============3440397894921997575=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5576 - in
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test:
src/org/jboss/tools/vpe/ui/test and 1 other directories.
Date: Thu, 10 Jan 2008 08:00:56 -0500
Message-ID:
--===============3440397894921997575==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: mareshkau
Date: 2008-01-10 08:00:56 -0500 (Thu, 10 Jan 2008)
New Revision: 5576
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/=
ui/test/VpeTestSetup.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/=
ui/test/beans/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/=
ui/test/beans/ImportBean.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/=
ui/test/VpeTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1562, junit tests was adjusted, was=
added VpeTest setup class which allows correctly import-remove test projec=
t from workspace(only once for each test suite, not for every test case).So=
me code was refactored.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/META-INF/MANIFEST=
.MF
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/META-INF/MANIFEST.MF 20=
08-01-10 10:29:54 UTC (rev 5575)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/META-INF/MANIFEST.MF 20=
08-01-10 13:00:56 UTC (rev 5576)
@@ -18,4 +18,5 @@
org.mozilla.xpcom
Eclipse-LazyStart: true
Bundle-ClassPath: .
-Export-Package: org.jboss.tools.vpe.ui.test
+Export-Package: org.jboss.tools.vpe.ui.test,
+ org.jboss.tools.vpe.ui.test.beans
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/too=
ls/vpe/ui/test/VpeTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/VpeTest.java 2008-01-10 10:29:54 UTC (rev 5575)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/VpeTest.java 2008-01-10 13:00:56 UTC (rev 5576)
@@ -11,15 +11,13 @@
package org.jboss.tools.vpe.ui.test;
=
=
-import java.io.File;
-
import junit.framework.TestCase;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.ILogListener;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
@@ -50,24 +48,14 @@
private Boolean checkWarning;
=
/**
- * Contains project name with information for testing
- */
- private String importProjectName;
- =
- /**
- * Contains plugin resource path
- */
- private String pluginResourcePath;
- /**
* =
* @param name
* @param importProjectName
*/
=
- public VpeTest(String name, String importProjectName,String pluginResourc=
ePath) {
+ public VpeTest(String name) {
super(name);
- setImportProjectName(importProjectName);
- setPluginResourcePath(pluginResourcePath);
+
}
/**
* Perform pre-test initialization.
@@ -79,13 +67,9 @@
protected void setUp() throws Exception {
=
super.setUp();
- closeEditors();
- if (ResourcesPlugin.getWorkspace().getRoot().findMember(getImportProject=
Name()) =3D=3D null) {
- closeEditors();
- TestUtil.importProjectIntoWorkspace((getPluginResourcePath()
- + File.separator+getImportProjectName()),getImportProjectName());
- }
+
Platform.addLogListener(this);
+
closeEditors();
}
/**
@@ -101,7 +85,6 @@
=
closeEditors();
=
- TestUtil.removeProject(getImportProjectName());
Platform.removeLogListener(this);
=
}
@@ -165,22 +148,24 @@
* @throws PartInitException
* @throws Throwable
*/
- protected void performTestForJsfComponent(String componentPage)
+ protected void performTestForVpeComponent(IFile componentPage)
throws PartInitException, Throwable {
TestUtil.waitForJobs();
=
setException(null);
=
- IFile file =3D (IFile) TestUtil.getComponentPath(componentPage,getImport=
ProjectName());
- IEditorInput input =3D new FileEditorInput(file);
+// IFile file =3D (IFile) TestUtil.getComponentPath(componentPage,getImpo=
rtProjectName());
+ IEditorInput input =3D new FileEditorInput(componentPage);
=
TestUtil.waitForJobs();
=
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ IEditorPart editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindo=
w().getActivePage()
.openEditor(input, EDITOR_ID, true);
-
+ =
+ assertNotNull(editor);
+ =
TestUtil.waitForJobs();
- TestUtil.delay(3000);
+ TestUtil.delay(1000);
=
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.closeAllEditors(true);
@@ -207,7 +192,7 @@
// wait for jobs
TestUtil.waitForJobs();
// // wait full initialization of vpe
- TestUtil.delay(3000);
+ TestUtil.delay(100);
=
return part;
=
@@ -236,29 +221,5 @@
protected void setCheckWarning(Boolean checkWarning) {
this.checkWarning =3D checkWarning;
}
- /**
- * @return the importProjectName
- */
- protected String getImportProjectName() {
- return importProjectName;
- }
- /**
- * @param importProjectName the importProjectName to set
- */
- protected void setImportProjectName(String importProjectName) {
- this.importProjectName =3D importProjectName;
- }
- /**
- * @return the pluginResourcePath
- */
- protected String getPluginResourcePath() {
- return pluginResourcePath;
- }
- /**
- * @param pluginResourcePath the pluginResourcePath to set
- */
- protected void setPluginResourcePath(String pluginResourcePath) {
- this.pluginResourcePath =3D pluginResourcePath;
- }
=
}
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/=
vpe/ui/test/VpeTestSetup.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/VpeTestSetup.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/VpeTestSetup.java 2008-01-10 13:00:56 UTC (rev 5576)
@@ -0,0 +1,81 @@
+/*************************************************************************=
****** =
+* Copyright (c) 2007 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.vpe.ui.test;
+
+import java.io.File;
+import java.util.List;
+
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.vpe.ui.test.beans.ImportBean;
+
+import junit.extensions.TestSetup;
+import junit.framework.TestSuite;
+
+/**
+ * @author Max Areshkau
+ * =
+ * Class for setup-tear down junit tests(import project =
+ * into workspace and remove project from workspace)
+ */
+public class VpeTestSetup extends TestSetup {
+ =
+ /**
+ * Contains test project names, which will be imported =
+ * in setUp method and removed in tear down method
+ */
+ private List testProjectNames;
+ =
+ public VpeTestSetup(TestSuite test, List testProjectNames) {
+ super(test);
+ setTestProjects(testProjectNames);
+ }
+
+ /* (non-Javadoc)
+ * @see junit.extensions.TestSetup#setUp()
+ */
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ for (ImportBean importBean : getTestProjects()) { =
+ if (ResourcesPlugin.getWorkspace().getRoot().findMember(importBean.getI=
mportProjectName()) =3D=3D null) {
+ TestUtil.importProjectIntoWorkspace((importBean.getImportProjectPath()
+ + File.separator+importBean.getImportProjectName()),importBean.getIm=
portProjectName());
+ } =
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see junit.extensions.TestSetup#tearDown()
+ */
+ @Override
+ protected void tearDown() throws Exception {
+ =
+ for(ImportBean importBean:getTestProjects()) {
+ TestUtil.removeProject(importBean.getImportProjectName());
+ }
+ super.tearDown();
+ }
+
+ /**
+ * @return the testProjectNames
+ */
+ private List getTestProjects() {
+ return testProjectNames;
+ }
+
+ /**
+ * @param testProjectNames the testProjectNames to set
+ */
+ private void setTestProjects(List testProjectNames) {
+ this.testProjectNames =3D testProjectNames;
+ }
+
+}
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/=
vpe/ui/test/beans/ImportBean.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/beans/ImportBean.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe=
/ui/test/beans/ImportBean.java 2008-01-10 13:00:56 UTC (rev 5576)
@@ -0,0 +1,52 @@
+/*************************************************************************=
****** =
+* Copyright (c) 2007 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.vpe.ui.test.beans;
+
+/**
+ * @author Max Areshkau
+ * =
+ * Contains information about projects which should be imported
+ */
+public class ImportBean {
+ /**
+ * Contains import project Name
+ */
+ private String importProjectName;
+ /**
+ * Contains import project path
+ */
+ private String importProjectPath;
+ /**
+ * @return the importProjectName
+ */
+ public String getImportProjectName() {
+ return importProjectName;
+ }
+ /**
+ * @param importProjectName the importProjectName to set
+ */
+ public void setImportProjectName(String importProjectName) {
+ this.importProjectName =3D importProjectName;
+ }
+ /**
+ * @return the importProjectPath
+ */
+ public String getImportProjectPath() {
+ return importProjectPath;
+ }
+ /**
+ * @param importProjectPath the importProjectPath to set
+ */
+ public void setImportProjectPath(String importProjectPath) {
+ this.importProjectPath =3D importProjectPath;
+ }
+
+}
--===============3440397894921997575==--
From jbosstools-commits at lists.jboss.org Thu Jan 10 08:05:02 2008
Content-Type: multipart/mixed; boundary="===============4084463871356366145=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5577 -
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test.
Date: Thu, 10 Jan 2008 08:01:02 -0500
Message-ID:
--===============4084463871356366145==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: mareshkau
Date: 2008-01-10 08:01:02 -0500 (Thu, 10 Jan 2008)
New Revision: 5577
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tool=
s/jsf/vpe/facelets/test/FaceletsAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tool=
s/jsf/vpe/facelets/test/FaceletsComponentTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1562, junit tests was adjusted, was=
added VpeTest setup class which allows correctly import-remove test projec=
t from workspace(only once for each test suite, not for every test case).So=
me code was refactored.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jbo=
ss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsAllTests.java 2008-01-10 13:00:56 UTC (rev=
5576)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsAllTests.java 2008-01-10 13:01:02 UTC (rev=
5577)
@@ -1,5 +1,11 @@
package org.jboss.tools.jsf.vpe.facelets.test;
=
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.vpe.ui.test.VpeTestSetup;
+import org.jboss.tools.vpe.ui.test.beans.ImportBean;
+
import junit.framework.Test;
import junit.framework.TestSuite;
=
@@ -13,7 +19,12 @@
suite.addTestSuite(FaceletsComponentTest.class);
=
// $JUnit-END$
- return suite;
+ List importProjects =3D new ArrayList();
+ ImportBean importBean =3D new ImportBean();
+ importBean.setImportProjectName(FaceletsComponentTest.IMPORT_PROJECT_NAME=
);
+ importBean.setImportProjectPath(FaceletsTestPlugin.getPluginResourcePath(=
));
+ importProjects.add(importBean);
+ return new VpeTestSetup(suite,importProjects);
=
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jbo=
ss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-10 13:00:56 UTC=
(rev 5576)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/too=
ls/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-10 13:01:02 UTC=
(rev 5577)
@@ -33,15 +33,14 @@
public class FaceletsComponentTest extends VpeTest {
=
// import project name
- private static final String IMPORT_PROJECT_NAME =3D "faceletsTest";
+ public static final String IMPORT_PROJECT_NAME =3D "faceletsTest";
=
public FaceletsComponentTest(String name) {
- super(name, IMPORT_PROJECT_NAME, FaceletsTestPlugin
- .getPluginResourcePath());
+ super(name);
}
=
public void testDebug() throws Throwable {
- performTestForJsfComponent("components/debug.xhtml"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/=
debug.xhtml",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testDefine() throws Throwable {
@@ -51,7 +50,7 @@
=
// get test page path
IFile file =3D (IFile) TestUtil.getComponentPath(
- "components/define.xhtml", getImportProjectName());
+ "components/define.xhtml", IMPORT_PROJECT_NAME);
=
assertNotNull("Could not open specified file " + file.getFullPath(),
file);
@@ -102,7 +101,7 @@
}
=
public void testInsert() throws Throwable {
- performTestForJsfComponent("components/insert.xhtml"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/=
insert.xhtml",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
}
--===============4084463871356366145==--
From jbosstools-commits at lists.jboss.org Thu Jan 10 08:05:08 2008
Content-Type: multipart/mixed; boundary="===============5523796943950990645=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5578 - in
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test:
jbide and 1 other directory.
Date: Thu, 10 Jan 2008 08:01:08 -0500
Message-ID:
--===============5523796943950990645==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: mareshkau
Date: 2008-01-10 08:01:08 -0500 (Thu, 10 Jan 2008)
New Revision: 5578
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfComponentTest.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/jbide/JBIDE1484Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/jbide/JsfJbide1467Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/jbide/JsfJbide1501Test.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1562, junit tests was adjusted, was=
added VpeTest setup class which allows correctly import-remove test projec=
t from workspace(only once for each test suite, not for every test case).So=
me code was refactored.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfAllTests.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfAllTests.java 2008-01-10 13:01:02 UTC (rev 5577)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfAllTests.java 2008-01-10 13:01:08 UTC (rev 5578)
@@ -13,9 +13,13 @@
import junit.framework.Test;
import junit.framework.TestSuite;
=
+import java.util.ArrayList;
+import java.util.List;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1484Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1467Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1501Test;
+import org.jboss.tools.vpe.ui.test.VpeTestSetup;
+import org.jboss.tools.vpe.ui.test.beans.ImportBean;
=
/**
* Class for testing all RichFaces components
@@ -34,9 +38,15 @@
suite.addTestSuite(JsfJbide1467Test.class);
suite.addTestSuite(JsfJbide1501Test.class);
suite.addTestSuite(JBIDE1484Test.class);
- //cleanUpTests();
// $JUnit-END$
- return suite;
+ //added by Max Areshkau
+ //add here projects which should be imported for junit tests
+ List projectToImport =3D new ArrayList();
+ ImportBean importBean =3D new ImportBean();
+ importBean.setImportProjectName("jsfTest");
+ importBean.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
+ =
+ return new VpeTestSetup(suite,projectToImport);
=
}
=
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfComponentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfComponentTest.java 2008-01-10 13:01:02 UTC (rev 5577)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfComponentTest.java 2008-01-10 13:01:08 UTC (rev 5578)
@@ -10,6 +10,8 @@
*************************************************************************=
*****/
package org.jboss.tools.jsf.vpe.jsf.test;
=
+import org.eclipse.core.resources.IFile;
+import org.jboss.tools.vpe.ui.test.TestUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
=
/**
@@ -21,10 +23,11 @@
public class JsfComponentTest extends VpeTest {
=
// import project name
- private static final String IMPORT_PROJECT_NAME =3D "jsfTest";
+ public static final String IMPORT_PROJECT_NAME =3D "jsfTest";
=
public JsfComponentTest(String name) {
- super(name, IMPORT_PROJECT_NAME, JsfTestPlugin.getPluginResourcePath());
+ super(name);
+ setCheckWarning(false);
}
=
/*
@@ -32,99 +35,99 @@
*/
=
public void testCommandButton() throws Throwable {
- performTestForJsfComponent("components/commandButton.jsp"); // $NON-NLS-=
1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/commandButton.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testCommandLink() throws Throwable {
- performTestForJsfComponent("components/commandLink.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/commandLink.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testDataTable() throws Throwable {
- performTestForJsfComponent("components/dataTable.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/dataTable.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testForm() throws Throwable {
- performTestForJsfComponent("components/form.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/form.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testGraphicImage() throws Throwable {
- performTestForJsfComponent("components/graphicImage.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/graphicImage.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testInputHidden() throws Throwable {
- performTestForJsfComponent("components/inputHidden.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/inputHidden.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testInputSecret() throws Throwable {
- performTestForJsfComponent("components/inputSecret.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/inputSecret.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testInputText() throws Throwable {
- performTestForJsfComponent("components/inputText.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/inputText.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testInputTextArea() throws Throwable {
- performTestForJsfComponent("components/inputTextArea.jsp"); // $NON-NLS-=
1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/inputTextArea.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testMessage() throws Throwable {
- performTestForJsfComponent("components/message.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/message.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testMessages() throws Throwable {
- performTestForJsfComponent("components/messages.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/messages.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testOutputFormat() throws Throwable {
- performTestForJsfComponent("components/outputFormat.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/outputFormat.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testOutputLabel() throws Throwable {
- performTestForJsfComponent("components/outputLabel.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/outputLabel.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testOutputLink() throws Throwable {
- performTestForJsfComponent("components/outputLink.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/outputLink.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testOutputText() throws Throwable {
- performTestForJsfComponent("components/outputText.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/outputText.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testPanelGrid() throws Throwable {
- performTestForJsfComponent("components/panelGrid.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/panelGrid.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testPanelGroup() throws Throwable {
- performTestForJsfComponent("components/panelGroup.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/panelGroup.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testSelectBooleanCheckbox() throws Throwable {
- performTestForJsfComponent("components/selectBooleanCheckbox.jsp"); // $=
NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/selectBooleanCheckbox.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testSelectManyCheckbox() throws Throwable {
- performTestForJsfComponent("components/selectManyCheckbox.jsp"); // $NON=
-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/selectManyCheckbox.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testSelectManyListbox() throws Throwable {
- performTestForJsfComponent("components/selectManyListbox.jsp"); // $NON-=
NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/selectManyListbox.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testSelectManyMenu() throws Throwable {
- performTestForJsfComponent("components/selectManyMenu.jsp"); // $NON-NLS=
-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/selectManyMenu.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testSelectOneListbox() throws Throwable {
- performTestForJsfComponent("components/selectOneListbox.jsp"); // $NON-N=
LS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/selectOneListbox.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testSelectOneMenu() throws Throwable {
- performTestForJsfComponent("components/selectOneMenu.jsp"); // $NON-NLS-=
1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/selectOneMenu.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testSelectOneRadio() throws Throwable {
- performTestForJsfComponent("components/selectOneRadio.jsp"); // $NON-NLS=
-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/selectOneRadio.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
/*
@@ -132,82 +135,82 @@
*/
=
public void testActionListener() throws Throwable {
- performTestForJsfComponent("components/actionListener.jsp"); // $NON-NLS=
-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/actionListener.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testAttribute() throws Throwable {
- performTestForJsfComponent("components/attribute.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/attribute.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testConvertDateTime() throws Throwable {
- performTestForJsfComponent("components/convertDateTime.jsp"); // $NON-NL=
S-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/convertDateTime.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testConvertNumber() throws Throwable {
- performTestForJsfComponent("components/convertNumber.jsp"); // $NON-NLS-=
1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/convertNumber.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testConverter() throws Throwable {
- performTestForJsfComponent("components/converter.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/converter.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testFacet() throws Throwable {
- performTestForJsfComponent("components/facet.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/facet.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testLoadBundle() throws Throwable {
- performTestForJsfComponent("components/loadBundle.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/loadBundle.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testParam() throws Throwable {
- performTestForJsfComponent("components/param.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/param.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testPhaseListener() throws Throwable {
- performTestForJsfComponent("components/phaseListener.jsp"); // $NON-NLS-=
1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/phaseListener.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testSelectItem() throws Throwable {
- performTestForJsfComponent("components/selectItem.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/selectItem.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testSelectItems() throws Throwable {
- performTestForJsfComponent("components/selectItems.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/selectItems.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testSetPropertyActionListener() throws Throwable {
- performTestForJsfComponent("components/setPropertyActionListener.jsp"); =
// $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/setPropertyActionListener.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testSubview() throws Throwable {
- performTestForJsfComponent("components/subview.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/subview.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testValidateDoubleRange() throws Throwable {
- performTestForJsfComponent("components/validateDoubleRange.jsp"); // $NO=
N-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/validateDoubleRange.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testValidateLength() throws Throwable {
- performTestForJsfComponent("components/validateLength.jsp"); // $NON-NLS=
-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/validateLength.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testValidateLongRange() throws Throwable {
- performTestForJsfComponent("components/validateLongRange.jsp"); // $NON-=
NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/validateLongRange.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testValidator() throws Throwable {
- performTestForJsfComponent("components/validator.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/validator.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testValueChangeListener() throws Throwable {
- performTestForJsfComponent("components/valueChangeListener.jsp"); // $NO=
N-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/valueChangeListener.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testVerbatim() throws Throwable {
- performTestForJsfComponent("components/verbatim.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/verbatim.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
=
public void testView() throws Throwable {
- performTestForJsfComponent("components/view.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components=
/view.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-01-10 13:01:02 UTC (rev 5577)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-01-10 13:01:08 UTC (rev 5578)
@@ -16,7 +16,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
-import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.ui.test.TestUtil;
@@ -32,13 +31,13 @@
*/
public class JBIDE1484Test extends VpeTest {
=
- private static final String IMPORT_PROJECT_NAME =3D "jsfTest";
+ public static final String IMPORT_PROJECT_NAME =3D "jsfTest";
=
private static final String TEST_PAGE_NAME =3D "JBIDE/1484/JBIDE-1484.jsp=
";
=
public JBIDE1484Test(String name) {
=
- super(name, IMPORT_PROJECT_NAME, JsfTestPlugin.getPluginResourcePath());
+ super(name);
}
=
//test method for JBIDE 1484
@@ -50,7 +49,7 @@
=
// get test page path
IFile file =3D (IFile) TestUtil.getComponentPath(
- TEST_PAGE_NAME, getImportProjectName());
+ TEST_PAGE_NAME, IMPORT_PROJECT_NAME);
=
assertNotNull("Could not open specified file " + file.getFullPath(),
file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JsfJbide1467Test.java 2008-01-10 13:01:02 UTC (rev 557=
7)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JsfJbide1467Test.java 2008-01-10 13:01:08 UTC (rev 557=
8)
@@ -17,7 +17,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
-import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.ui.test.TestUtil;
@@ -40,10 +39,10 @@
=
// import project name
=
- private static final String IMPORT_PROJECT_NAME =3D "jsfTest";
+ public static final String IMPORT_PROJECT_NAME =3D "jsfTest";
=
public JsfJbide1467Test(String name) {
- super(name, IMPORT_PROJECT_NAME, JsfTestPlugin.getPluginResourcePath());
+ super(name);
}
=
/*
@@ -71,7 +70,7 @@
=
// get test page path
IFile file =3D (IFile) TestUtil.getComponentPath(
- "JBIDE/1467/JBIDE-1467.jsp", getImportProjectName());
+ "JBIDE/1467/JBIDE-1467.jsp", IMPORT_PROJECT_NAME);
=
assertNotNull("Could not open specified file " + file.getFullPath(),
file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JsfJbide1501Test.java 2008-01-10 13:01:02 UTC (rev 557=
7)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JsfJbide1501Test.java 2008-01-10 13:01:08 UTC (rev 557=
8)
@@ -17,7 +17,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
-import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.ui.test.TestUtil;
@@ -35,10 +34,10 @@
*/
public class JsfJbide1501Test extends VpeTest {
=
- private static final String IMPORT_PROJECT_NAME =3D "jsfTest";
+ public static final String IMPORT_PROJECT_NAME =3D "jsfTest";
=
public JsfJbide1501Test(String name) {
- super(name, IMPORT_PROJECT_NAME, JsfTestPlugin.getPluginResourcePath());
+ super(name);
}
=
/**
@@ -75,7 +74,7 @@
=
// get test page path
IFile file =3D (IFile) TestUtil.getComponentPath(
- "JBIDE/1501/JBIDE-1501_multiple.jsp", getImportProjectName());
+ "JBIDE/1501/JBIDE-1501_multiple.jsp", IMPORT_PROJECT_NAME);
=
IEditorInput input =3D new FileEditorInput(file);
=
@@ -116,7 +115,7 @@
=
// get test page path
file =3D (IFile) TestUtil.getComponentPath(
- "JBIDE/1501/JBIDE-1501_size.jsp", getImportProjectName());
+ "JBIDE/1501/JBIDE-1501_size.jsp", IMPORT_PROJECT_NAME);
=
input =3D new FileEditorInput(file);
=
--===============5523796943950990645==--
From jbosstools-commits at lists.jboss.org Thu Jan 10 08:10:25 2008
Content-Type: multipart/mixed; boundary="===============5887302640075172868=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5579 -
branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces.
Date: Thu, 10 Jan 2008 08:06:25 -0500
Message-ID:
--===============5887302640075172868==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dmaliarevich
Date: 2008-01-10 08:06:25 -0500 (Thu, 10 Jan 2008)
New Revision: 5579
Modified:
branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfa=
ces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java
Log:
new constants added
Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe=
.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richf=
aces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java 2008-01-1=
0 13:01:08 UTC (rev 5578)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richf=
aces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java 2008-01-1=
0 13:06:25 UTC (rev 5579)
@@ -161,4 +161,8 @@
=
/** HTML_ATTR_VALIGN_MIDDLE_VALUE */
public static final String HTML_ATTR_VALIGN_MIDDLE_VALUE =3D "middle";
+ =
+ /** HTML_TYPE_ATTR_BUTTON_VALUE */
+ public static final String HTML_TYPE_ATTR_BUTTON_VALUE =3D "button";
+ =
}
--===============5887302640075172868==--
From jbosstools-commits at lists.jboss.org Thu Jan 10 08:11:07 2008
Content-Type: multipart/mixed; boundary="===============7586770924102849063=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5580 -
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject.
Date: Thu, 10 Jan 2008 08:11:06 -0500
Message-ID:
--===============7586770924102849063==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgeraskov
Date: 2008-01-10 08:11:06 -0500 (Thu, 10 Jan 2008)
New Revision: 5580
Added:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1594
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/or=
g/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java =
(rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2008-=
01-10 13:11:06 UTC (rev 5580)
@@ -0,0 +1,46 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
+package org.hibernate.eclipse.console.test.mappingproject;
+
+import junit.framework.TestCase;
+
+import org.hibernate.cfg.Configuration;
+import org.hibernate.console.ConsoleConfiguration;
+import org.hibernate.console.KnownConfigurations;
+import org.hibernate.eclipse.console.actions.OpenMappingAction;
+import org.hibernate.eclipse.console.actions.OpenSourceAction;
+import org.hibernate.eclipse.console.workbench.ConfigurationWorkbenchAdapt=
er;
+import org.hibernate.eclipse.console.workbench.ConsoleConfigurationWorkben=
chAdapter;
+import org.hibernate.mapping.PersistentClass;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class OpenMappingFileTest extends TestCase {
+ public void testOpenMappingFileTest(){
+ KnownConfigurations knownConfigurations =3D KnownConfigurations.getInsta=
nce();
+ final ConsoleConfiguration consCFG =3D knownConfigurations.find(CreateCo=
nsoleConfigTest.ConsoleCFGName);
+ assertNotNull(consCFG);
+ consCFG.reset();
+ Object[] configs =3D new ConsoleConfigurationWorkbenchAdapter().getChild=
ren(consCFG);
+ assertTrue(configs[0] instanceof Configuration);
+ Object[] persClasses =3D new ConfigurationWorkbenchAdapter().getChildren=
(configs[0]);
+ if (persClasses.length > 0){
+ for (int i =3D 0; i < persClasses.length; i++) {
+ assertTrue(persClasses[0] instanceof PersistentClass);
+ PersistentClass persClass =3D (PersistentClass) persClasses[i];
+ OpenMappingAction.run(persClass, consCFG);
+ } =
+ }
+ //close all editors
+ }
+}
Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.conso=
le.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFi=
leTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/or=
g/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java =
(rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java 2008-0=
1-10 13:11:06 UTC (rev 5580)
@@ -0,0 +1,53 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
+package org.hibernate.eclipse.console.test.mappingproject;
+
+import org.hibernate.cfg.Configuration;
+import org.hibernate.console.ConsoleConfiguration;
+import org.hibernate.console.KnownConfigurations;
+import org.hibernate.console.execution.ExecutionContext;
+import org.hibernate.eclipse.console.actions.OpenFileActionUtils;
+import org.hibernate.eclipse.console.actions.OpenSourceAction;
+import org.hibernate.eclipse.console.workbench.ConfigurationWorkbenchAdapt=
er;
+import org.hibernate.eclipse.console.workbench.ConsoleConfigurationWorkben=
chAdapter;
+import org.hibernate.mapping.PersistentClass;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class OpenSourceFileTest extends TestCase {
+ =
+ public void testOpenSourceFileTest(){
+ //fail("test fail");
+ KnownConfigurations knownConfigurations =3D KnownConfigurations.getInsta=
nce();
+ final ConsoleConfiguration consCFG =3D knownConfigurations.find(CreateCo=
nsoleConfigTest.ConsoleCFGName);
+ assertNotNull(consCFG);
+ consCFG.reset();
+ Object[] configs =3D new ConsoleConfigurationWorkbenchAdapter().getChild=
ren(consCFG);
+ assertTrue(configs[0] instanceof Configuration);
+ Object[] persClasses =3D new ConfigurationWorkbenchAdapter().getChildren=
(configs[0]);
+ if (persClasses.length > 0){
+ for (int i =3D 0; i < persClasses.length; i++) {
+ assertTrue(persClasses[0] instanceof PersistentClass);
+ PersistentClass persClass =3D (PersistentClass) persClasses[i];
+ new OpenSourceAction().run(persClass, MappingTestProject.getTestProjec=
t().getIJavaProject(), =
+ ProjectUtil.getPersistentClassName(persClass));
+ } =
+ }
+ //close all editors
+ }
+ =
+ =
+
+}
Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.conso=
le.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFil=
eTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
--===============7586770924102849063==--
From jbosstools-commits at lists.jboss.org Thu Jan 10 08:15:30 2008
Content-Type: multipart/mixed; boundary="===============6770284492033832212=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5581 -
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject.
Date: Thu, 10 Jan 2008 08:15:29 -0500
Message-ID:
--===============6770284492033832212==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dgeraskov
Date: 2008-01-10 08:15:28 -0500 (Thu, 10 Jan 2008)
New Revision: 5581
Added:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/CloaseAllEditorsTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/HibernateNatureAddTest.java
Removed:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/HibernateMappingTests.java
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/HibernateNatureRemoveTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/MappingTestProject.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/OpenJavaEditors.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/ProjectUtil.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/TestSet.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hi=
bernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1571
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/or=
g/hibernate/eclipse/console/test/mappingproject/CloaseAllEditorsTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/CloaseAllEditorsTest.java =
(rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/CloaseAllEditorsTest.java 2008=
-01-10 13:15:28 UTC (rev 5581)
@@ -0,0 +1,27 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
+package org.hibernate.eclipse.console.test.mappingproject;
+
+import junit.framework.TestCase;
+
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class CloaseAllEditorsTest extends TestCase {
+ =
+ public void testCloseAllEditors(){
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().clo=
seAllEditors(false);
+ }
+ =
+}
Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.conso=
le.test/src/org/hibernate/eclipse/console/test/mappingproject/CloaseAllEdit=
orsTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src=
/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java =
2008-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java =
2008-01-10 13:15:28 UTC (rev 5581)
@@ -1,15 +1,20 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
package org.hibernate.eclipse.console.test.mappingproject;
=
-import java.util.Enumeration;
-
-import junit.framework.AssertionFailedError;
import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestFailure;
import junit.framework.TestResult;
import junit.framework.TestSuite;
=
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IPackageFragment;
@@ -21,6 +26,7 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
+import org.hibernate.eclipse.console.HibernateConsolePerspectiveFactory;
=
public class HibernateAllMappingTests extends TestCase {
=
@@ -38,9 +44,6 @@
super.setUp();
this.project =3D MappingTestProject.getTestProject();
=
- //PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().c=
loseAllPerspectives(false, true);
- =
- =
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().set=
Perspective(
PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWith=
Id("org.eclipse.ui.resourcePerspective"));
=
@@ -54,8 +57,14 @@
=
packageExplorer.selectAndReveal(project.getIJavaProject());
=
+ PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage().setPerspective(
+ PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWith=
Id(HibernateConsolePerspectiveFactory.ID_CONSOLE_PERSPECTIVE));
+
+ =
waitForJobs();
runTestsAfterSetup();
+ ProjectUtil.createConsoleCFG();
}
=
private void runTestsAfterSetup() {
@@ -139,16 +148,16 @@
} =
=
public void testEachPackWithTestSet() throws JavaModelException {
- /*if (result.failureCount() > 0 || result.errorCount() > 0){
- // we have failed tests after setup
- fail("One or more setup test failed.");
- }*/
+ /*
+ * (1) All test runs show as one
+ * Comment this and uncomment (2) if you want to see each test run indepe=
ndent
+ */
TestSuite suite =3D TestSet.getTests();
IPackageFragmentRoot[] roots =3D project.getIJavaProject().getAllPackage=
FragmentRoots(); =
for (int i =3D 0; i < roots.length; i++) {
if (roots[i].getClass() !=3D PackageFragmentRoot.class) continue;
PackageFragmentRoot packageFragmentRoot =3D (PackageFragmentRoot) roots=
[i];
- IJavaElement[] els =3D packageFragmentRoot.getChildren();//.getCompilat=
ionUnits();
+ IJavaElement[] els =3D packageFragmentRoot.getChildren();
for (int j =3D 0; j < els.length; j++) {
IJavaElement javaElement =3D els[j];
if (javaElement instanceof IPackageFragment){
@@ -156,6 +165,12 @@
// use packages only with compilation units
if (pack.getCompilationUnits().length =3D=3D 0) continue;
=
+ /* =
+ * (2) Each test run shows independent
+ * Comment this and uncomment (1) if you want to see all test runs a=
s one
+ * TestSuite suite =3D TestSet.getTests();
+ */
+ =
activePackage =3D pack;
//=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D =
//run all tests for package
@@ -166,10 +181,13 @@
}
//=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D
}
- } =
+ waitForJobs();
+ delay(15000);
+ }
+ =
}
waitForJobs();
- //delay(2000);
+ delay(10000);
}
=
/**
Deleted: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/=
org/hibernate/eclipse/console/test/mappingproject/HibernateMappingTests.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/HibernateMappingTests.java 200=
8-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/HibernateMappingTests.java 200=
8-01-10 13:15:28 UTC (rev 5581)
@@ -1,133 +0,0 @@
-package org.hibernate.eclipse.console.test.mappingproject;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.ui.IPackagesViewPart;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-public class HibernateMappingTests extends TestCase {
-
- private MappingTestProject project;
-
- public HibernateMappingTests(String name) {
- super(name);
- }
- =
- private TestResult result =3D null;
-
- protected void setUp() throws Exception {
- super.setUp();
- this.project =3D MappingTestProject.getTestProject();
-
- //PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().c=
loseAllPerspectives(false, true);
- =
- =
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().set=
Perspective(
- PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWith=
Id("org.eclipse.ui.resourcePerspective"));
- =
- IPackagesViewPart packageExplorer =3D null; =
- try {
- packageExplorer =3D (IPackagesViewPart) PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage().showView(JavaUI.ID_PACKAGE=
S);
- } catch (PartInitException e) {
- throw new RuntimeException(e);
- }
- =
- packageExplorer.selectAndReveal(project.getIJavaProject());
- =
- waitForJobs();
- delay(2000);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#run(junit.framework.TestResult)
- */
- @Override
- public void run(TestResult result) {
- this.result =3D result;
- super.run(result);
- =
- }
- =
- public void tearDown() throws Exception { =
- waitForJobs();
- this.project.deleteIProject();
- waitForJobs();
- super.tearDown();
- }
- =
-
- /**
- * Process UI input but do not return for the specified time interval.
- * =
- * @param waitTimeMillis
- * the number of milliseconds
- */
- protected void delay(long waitTimeMillis) {
- Display display =3D Display.getCurrent();
-
- // If this is the UI thread,
- // then process input.
- if (display !=3D null) {
- long endTimeMillis =3D System.currentTimeMillis() + waitTimeMillis;
- while (System.currentTimeMillis() < endTimeMillis) {
- if (!display.readAndDispatch())
- display.sleep();
- }
- display.update();
- }
-
- // Otherwise, perform a simple sleep.
- else {
- try {
- Thread.sleep(waitTimeMillis);
- } catch (InterruptedException e) {
- // Ignored.
- }
- }
- }
-
- /**
- * Wait until all background tasks are complete.
- */
- public void waitForJobs() {
- while (Platform.getJobManager().currentJob() !=3D null)
- delay(1000);
- }
- =
- protected MappingTestProject getProject() {
- return this.project;
- } =
- =
- public void testRunTestSet() {
- TestSuite suite =3D TestSet.getTests();
- //is waytForJob() necessary between each test?
- //suite.run(result);
- for (int i =3D 0; i < suite.testCount(); i++) {
- Test test =3D suite.testAt(i);
- test.run(result);
- /*if (result.failureCount() > 0){
- fail("Test " + test.getClass().getName() + " failed.");
- }
- if (result.errorCount() > 0){
- fail("Test " + test.getClass().getName() + " has errors.");
- }*/
- waitForJobs();
- delay(20000);
- }
- if (result.failureCount() > 0){
- fail("One or more test failed.");
- }
- if (result.errorCount() > 0){
- fail("One or more test has error(s).");
- }
- }
-}
- =
\ No newline at end of file
Copied: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/o=
rg/hibernate/eclipse/console/test/mappingproject/HibernateNatureAddTest.jav=
a (from rev 5484, trunk/hibernatetools/tests/org.hibernate.eclipse.console.=
test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureT=
est.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/HibernateNatureAddTest.java =
(rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/HibernateNatureAddTest.java 20=
08-01-10 13:15:28 UTC (rev 5581)
@@ -0,0 +1,43 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
+package org.hibernate.eclipse.console.test.mappingproject;
+
+import org.eclipse.core.resources.ProjectScope;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.jdt.core.IJavaProject;
+import org.hibernate.eclipse.console.utils.ProjectUtils;
+import org.osgi.service.prefs.BackingStoreException;
+import org.osgi.service.prefs.Preferences;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class HibernateNatureAddTest extends TestCase {
+ public void testEnableHibernateNature() throws BackingStoreException, Cor=
eException {
+ MappingTestProject project =3D MappingTestProject.getTestProject();
+ IJavaProject prj =3D project.getIJavaProject();
+ IScopeContext scope =3D new ProjectScope(prj.getProject() );
+ //fail("HibernateNatureAdd testfail");
+ Preferences node =3D scope.getNode("org.hibernate.eclipse.console");
+
+ node.putBoolean("hibernate3.enabled", true );
+ node.put("default.configuration", "testcfg" );
+ node.flush();
+
+ ProjectUtils.addProjectNature(prj.getProject(), "org.hibernate.eclipse.c=
onsole.hibernateNature", new NullProgressMonitor() );
+ //ProjectUtils.removeProjectNature(prj.getProject(), "org.hibernate.ecli=
pse.console.hibernateNature", new NullProgressMonitor() );
+ }
+}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src=
/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureRemoveTes=
t.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/HibernateNatureRemoveTest.java=
2008-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/HibernateNatureRemoveTest.java=
2008-01-10 13:15:28 UTC (rev 5581)
@@ -1,3 +1,13 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
package org.hibernate.eclipse.console.test.mappingproject;
=
import junit.framework.TestCase;
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src=
/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/MappingTestProject.java 2008-0=
1-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/MappingTestProject.java 2008-0=
1-10 13:15:28 UTC (rev 5581)
@@ -1,3 +1,13 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
package org.hibernate.eclipse.console.test.mappingproject;
=
import java.io.File;
@@ -35,6 +45,8 @@
*/
public class MappingTestProject{
=
+ public static final String SRC_FOLDER =3D "src";
+
private static MappingTestProject singleton=3D null;
=
private static final Path JRE_CONTAINER =3D new Path("org.eclipse.jdt.lau=
nching.JRE_CONTAINER");
@@ -99,7 +111,7 @@
throw new RuntimeException("Folder " + RESOURCE_PATH + " does not found=
!");
=
IPackageFragmentRoot sourceFolder =3D buildSourceFolder(project, javaPro=
ject);
- recursiveCopyFiles(resourceFolder, (IFolder) sourceFolder.getResource());
+ recursiveCopyFiles(resourceFolder, (IFolder) sourceFolder.getResource())=
; =
project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgr=
essMonitor());
}
=
@@ -185,7 +197,7 @@
=
private IPackageFragmentRoot buildSourceFolder(IProject project,
IJavaProject javaProject) throws CoreException {
- IFolder folder =3D project.getFolder("src");
+ IFolder folder =3D project.getFolder(SRC_FOLDER);
if (!folder.exists()){
folder.create(false, true, null);
IPackageFragmentRoot root =3D javaProject.getPackageFragmentRoot(folder=
);
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src=
/org/hibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java 2008-01-1=
0 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java 2008-01-1=
0 13:15:28 UTC (rev 5581)
@@ -1,3 +1,13 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
package org.hibernate.eclipse.console.test.mappingproject;
=
import junit.framework.TestCase;
@@ -17,6 +27,7 @@
=
/**
* @author Dmitry Geraskov
+ * @deprecated - never used
* just to test that our external Unit tests work right with MappingTestPr=
oject
*/
public class OpenJavaEditors extends TestCase {
@@ -40,7 +51,7 @@
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(=
).openEditor(input, JavaUI.ID_CU_EDITOR );
} catch (PartInitException e) {
fail("Error opening CompilationUnit: " + e.getMessage());
- } =
+ }
}
}
} =
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src=
/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/ProjectUtil.java 2008-01-10 13=
:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/ProjectUtil.java 2008-01-10 13=
:15:28 UTC (rev 5581)
@@ -1,14 +1,25 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
package org.hibernate.eclipse.console.test.mappingproject;
=
-import java.util.Iterator;
-
import org.apache.tools.ant.filters.StringInputStream;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
+import org.hibernate.console.preferences.ConsoleConfigurationPreferences;
+import org.hibernate.eclipse.console.wizards.ConsoleConfigurationCreationW=
izard;
import org.hibernate.mapping.PersistentClass;
=
/**
@@ -23,9 +34,7 @@
.append("\"http://hibernate.sourceforge.net/hibernate-configu=
ration-3.0.dtd\">\n");
=
private static final StringBuilder XML_CFG_START =3D new StringBuilder("<=
hibernate-configuration>\n")
- .append("\n")
- .append("\n")
- .append("org.hibernate.dialect.SQLServerDialect\n"=
);
+ .append("\n");
=
private static final StringBuilder XML_CFG_END =3D new StringBuilder("\n")
.append("\n"); =
@@ -33,6 +42,8 @@
=
public static final String CFG_FILE_NAME =3D "hibernate.cfg.xml";
=
+ public static final String ConsoleCFGName =3D "testConfigName";
+ =
public static void customizeCFGFileForPack(IPackageFragment pack) throws =
CoreException{
IFolder srcFolder =3D (IFolder) pack.getParent().getResource();
IFile iFile =3D srcFolder.getFile(CFG_FILE_NAME);
@@ -77,5 +88,21 @@
return persClass.getEntityName() !=3D null ? persClass.getEntityName() =
: persClass.getClassName();
}
}
+ =
+ public static void createConsoleCFG() throws CoreException{
+ new ConsoleConfigurationCreationWizard2().run();
+ }
+ =
+ private static class ConsoleConfigurationCreationWizard2 extends ConsoleC=
onfigurationCreationWizard{
+ =
+ public void run() throws CoreException {
+ IPath cfgFilePath =3D new Path(MappingTestProject.PROJECT_NAME + "/" + =
+ MappingTestProject.SRC_FOLDER + "/" + ProjectUtil.CFG_FILE_NAME);
+ createConsoleConfiguration(null, null, ConsoleCFGName, ConsoleConfigura=
tionPreferences.ConfigurationMode.CORE, =
+ MappingTestProject.PROJECT_NAME, true, "",
+ null, cfgFilePath, new Path[0], new Path[0], "", "", new NullProgress=
Monitor());
=
+ }
+ }
+
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src=
/org/hibernate/eclipse/console/test/mappingproject/TestSet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSet.java 2008-01-10 13:11:=
06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSet.java 2008-01-10 13:15:=
28 UTC (rev 5581)
@@ -1,3 +1,13 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
package org.hibernate.eclipse.console.test.mappingproject;
=
import junit.framework.TestSuite;
@@ -28,11 +38,12 @@
}
=
private static void addPackTests(TestSuite suite){
- =
+ suite.addTestSuite( OpenSourceFileTest.class );
+ suite.addTestSuite( OpenMappingFileTest.class );
}
=
private static void addTestsPackTearDown(TestSuite suite){
- //suite.addTestSuite( CloaseAllEditorsTest.class );
+ suite.addTestSuite( CloaseAllEditorsTest.class );
}
=
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src=
/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java 2008-01=
-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java 2008-01=
-10 13:15:28 UTC (rev 5581)
@@ -1,3 +1,14 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
+
package org.hibernate.eclipse.console.test.mappingproject;
=
import junit.framework.TestSuite;
@@ -9,7 +20,7 @@
public class TestSetAfterSetup {
public static TestSuite getTests(){
TestSuite suite =3D new TestSuite("Test for MappingTestProject" );
- //suite.addTestSuite( HibernateNatureAddTest.class );
+ suite.addTestSuite( HibernateNatureAddTest.class );
//suite.addTestSuite( CreateConsoleConfigTest.class );
return suite;
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src=
/org/hibernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java 200=
8-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java 200=
8-01-10 13:15:28 UTC (rev 5581)
@@ -1,3 +1,13 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
package org.hibernate.eclipse.console.test.mappingproject;
=
import junit.framework.TestSuite;
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src=
/org/hibernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java 2=
008-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/h=
ibernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java 2=
008-01-10 13:15:28 UTC (rev 5581)
@@ -1,3 +1,13 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
package org.hibernate.eclipse.console.test.mappingproject;
=
import junit.framework.TestCase;
--===============6770284492033832212==--
From jbosstools-commits at lists.jboss.org Thu Jan 10 08:31:52 2008
Content-Type: multipart/mixed; boundary="===============3712104755383616953=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5582 - in
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test:
jbide and 1 other directory.
Date: Thu, 10 Jan 2008 08:31:52 -0500
Message-ID:
--===============3712104755383616953==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: mareshkau
Date: 2008-01-10 08:31:52 -0500 (Thu, 10 Jan 2008)
New Revision: 5582
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/jbide/JBIDE1484Test.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1562, junit code adjustment
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/JsfAllTests.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfAllTests.java 2008-01-10 13:15:28 UTC (rev 5581)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/JsfAllTests.java 2008-01-10 13:31:52 UTC (rev 5582)
@@ -43,9 +43,9 @@
//add here projects which should be imported for junit tests
List projectToImport =3D new ArrayList();
ImportBean importBean =3D new ImportBean();
- importBean.setImportProjectName("jsfTest");
+ importBean.setImportProjectName(JsfComponentTest.IMPORT_PROJECT_NAME);
importBean.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
- =
+ projectToImport.add(importBean);
return new VpeTestSetup(suite,projectToImport);
=
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-01-10 13:15:28 UTC (rev 5581)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-01-10 13:31:52 UTC (rev 5582)
@@ -82,8 +82,8 @@
nsIDOMElement elementInput2 =3D (nsIDOMElement) elements.get(2).queryInt=
erface(nsIDOMElement.NS_IDOMELEMENT_IID);
=
assertEquals(elementInput0.getAttribute("value"),"");
- assertNotNull(elementInput1.getAttribute("value"),"");
- assertNotNull(elementInput2.getAttribute("value"),"test");
+ assertEquals(elementInput1.getAttribute("value"),"");
+ assertEquals(elementInput2.getAttribute("value"),"test");
if(getException()!=3Dnull) {
throw getException();
}
--===============3712104755383616953==--
From jbosstools-commits at lists.jboss.org Thu Jan 10 10:14:40 2008
Content-Type: multipart/mixed; boundary="===============3870116858155548859=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r5583 -
trunk/hibernatetools/docs/reference/en/modules.
Date: Thu, 10 Jan 2008 10:14:40 -0500
Message-ID:
--===============3870116858155548859==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ochikvina
Date: 2008-01-10 10:14:39 -0500 (Thu, 10 Jan 2008)
New Revision: 5583
Modified:
trunk/hibernatetools/docs/reference/en/modules/ant.xml
trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml
trunk/hibernatetools/docs/reference/en/modules/plugins.xml
trunk/hibernatetools/docs/reference/en/modules/reverseengineering.xml
trunk/hibernatetools/docs/reference/en/modules/setup.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-238 - correcting the chapters accord=
ing to the Svetlana Mukhina remarks
Modified: trunk/hibernatetools/docs/reference/en/modules/ant.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/ant.xml 2008-01-10 13:31=
:52 UTC (rev 5582)
+++ trunk/hibernatetools/docs/reference/en/modules/ant.xml 2008-01-10 15:14=
:39 UTC (rev 5583)
@@ -17,7 +17,7 @@
of eclipse.
=
- There might be incapabilities with respect to the Hibernate3.j=
ar bundled with the tools
+ There might be incompatibilities with respect to the Hibernate=
3.jar bundled with the tools
and your own jar. Thus to avoid any confusion it is recommended to=
use the hibernate3.jar
and hibernate-annotations.jar bundled with the tools when you want=
to use the Ant tasks. Do
not worry about using e.g. Hibernate 3.2 jar's with e.g. a Hiberna=
te 3.1 project since the
Modified: trunk/hibernatetools/docs/reference/en/modules/codegenarchitectur=
e.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml =
2008-01-10 13:31:52 UTC (rev 5582)
+++ trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml =
2008-01-10 15:14:39 UTC (rev 5583)
@@ -62,8 +62,10 @@
=
In most projects you will normally use only one of the Core, Ann=
otation or JPA
configuration and possibly the JDBC configuration if you are using t=
he reverse engineering
- facilities of Hibernate Tools. The important th=
ing to note is that no matter which Hibernate
- Configuration type you are using Hibernate Tools supports them.
+ facilities of Hibernate Tools.
+ =
+ No matter which Hibernate
+ Configuration type you are using Hibernate Tools supports them.
=
The following drawing illustrates the core concepts:
=
Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2008-01-10 1=
3:31:52 UTC (rev 5582)
+++ trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2008-01-10 1=
5:14:39 UTC (rev 5583)
@@ -80,7 +80,8 @@
=
Enter your configuration information in this dialog. Details abo=
ut the configuration
- options can be found in Hibernate reference documentation<=
/property>.
+ options can be found in Hibernate Reference Documentation.
=
Press Finish
@@ -89,7 +90,7 @@
hibernate.cfg.xml will be automatically opened in an editor. The last opti=
on Create Console Configuration
- is enabled by default and when enabled i will automatica=
lly use the
+ is enabled by default and when enabled it will automatic=
ally use the hibernate.cfg.xml for the basis of a Console Configuration.
@@ -97,9 +98,9 @@
Creating a Hibernate Console configuration
=
- A Console Configuration describes to the Hibernate plugin how it
+ A Console Configuration describes how the Hibernate
plugin =
should configure Hibernate and what configurati=
on files, including which
- classpath is needed to load the POJO's, JDBC drivers etc. It is requ=
ired to make usage of
+ classpath are needed to load the POJO's, JDBC drivers etc. It is req=
uired to make usage of
query prototyping, reverse engineering and code generation. You can =
have multiple named
console configurations. Normally you would just need one per project=
, but more is definitely
possible.
@@ -930,14 +931,14 @@
=
-
+ Hibernate Mapping and Configuration File Editor
=
The Hibernate Mapping file editor provides XML editing functiona=
lity for the hbm.xml and cfg.xml
- files. The editor is based on the Eclipse WTP tools and =
extend its functionality
+ files. The editor is based on the Eclipse WTP tools and =
extends its functionality
to provide Hibernate specific code completion.
=