JBoss Tools SVN: r22592 - branches/3.2.helios/jmx/docs/reference/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-06-06 22:09:45 -0400 (Sun, 06 Jun 2010)
New Revision: 22592
Modified:
branches/3.2.helios/jmx/docs/reference/en-US/introduction.xml
branches/3.2.helios/jmx/docs/reference/en-US/tasks.xml
Log:
updated to correct build errors
Modified: branches/3.2.helios/jmx/docs/reference/en-US/introduction.xml
===================================================================
--- branches/3.2.helios/jmx/docs/reference/en-US/introduction.xml 2010-06-07 00:03:03 UTC (rev 22591)
+++ branches/3.2.helios/jmx/docs/reference/en-US/introduction.xml 2010-06-07 02:09:45 UTC (rev 22592)
@@ -1,4 +1,3 @@
-<<<<<<< .mine
<?xml version="1.0" encoding="ISO-8859-1"?>
<chapter id="intruduction" xreflabel="introduction">
<?dbhtml filename="introduction.html"?>
@@ -22,142 +21,8 @@
<para>
Using the JMX technology, a given resource is instrumented by one or more Java objects known as Managed Beans, or MBeans. These MBeans are registered in a core-managed object server, known as an MBean server. The MBean server acts as a management agent and can run on most devices that have been enabled for the Java programming language.
</para>
-
- <para>
-The specifications define JMX agents that you use to manage any resources that have been correctly configured for management. A JMX agent consists of an MBean server, in which MBeans are registered, and a set of services for handling the MBeans. In this way, JMX agents directly control resources and make them available to remote management applications.
-</para>
- <para>
-The way in which resources are instrumented is completely independent from the management infrastructure. Resources can therefore be rendered manageable regardless of how their management applications are implemented.
-</para>
- <para>
-The JMX technology defines standard connectors (known as JMX connectors) that enable you to access JMX agents from remote management applications. JMX connectors using different protocols provide the same management interface. Consequently, a management application can manage resources transparently, regardless of the communication protocol used. JMX agents can also be used by systems or applications that are not compliant with the JMX specification, as long as those systems or applications support JMX agents.
-</para>
-<ulink
- url="http://java.sun.com/docs/books/tutorial/jmx/overview/index.html">Read more about JMX</ulink>.
- </section>
-
- <section>
- <title>What is JMX Tools?</title>
- <para><property>JBoss JMX Tools</property> allow to setup multiple JMX connections and provide view
- for exploring the JMX tree and execute operations directly from Eclipse.</para>
- <para>This chapter covers the basics of working with <property>JMX plugin</property>, which is
- used to manage Java applications (with Managed Beans) through JMX and its RMI Connector.</para>
-
- <figure>
- <title>JMX Tools</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/eclipse-jmx_0.2.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- </section>
-
- <section><title>Key Features of JMX Tools</title>
- <para>For a start, we propose you to look through the table of main features of JBoss JMX Tools:</para>
- <table>
-
- <title>Key Functionality for JBoss JMX Tools</title>
- <tgroup cols="3">
-
- <colspec colnum="1" align="left" colwidth="2*"/>
- <colspec colnum="2" colwidth="4*"/>
- <colspec colnum="3" align="left" colwidth="2*"/>
-
- <thead>
- <row>
- <entry>Feature</entry>
- <entry>Benefit</entry>
- <entry>Chapter</entry>
- </row>
- </thead>
-
- <tbody>
-
- <row>
- <entry><para>MBean Explorer</para></entry>
- <entry><para>MBean Explorer is a useful view with a text filter that displays domains, mbeans, attributes, and operations inside a connection.</para></entry>
- <entry>
- <link linkend="mbean_explorer">MBean Explorer</link>
- </entry>
- </row>
-
- <row>
- <entry><para>MBean Editor</para></entry>
- <entry><para>MBean Editor is a multi-page editor to manage MBeans.</para></entry>
- <entry>
- <link linkend="mbean_editor">MBean Editor</link>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </section>
-
- <section>
- <title>Requirements and Installation</title>
- <section>
- <title> Requirements</title>
- <para>Requirements to use <property>JBoss JMX Tools</property> are the following:</para>
-
- <itemizedlist>
- <listitem>
- <para><property>JBoss JMX Tools</property> is developed on Eclipse 3.4.x milestones</para>
- </listitem>
- <listitem>
- <para><property>JBoss JMX Tools</property> requires that Eclipse is run on a JDK 1.5.0 or above
- (due to dependencies on JMX packages which were introduced in Java 1.5.0)</para>
- </listitem>
- </itemizedlist>
- </section>
- <section>
- <title>Installation</title>
- <para>Here, we are going to explain how to install the <property>JMX plugin</property> into
- Eclipse.</para>
-
- <para><property>JBoss JMX Tools</property> is one module of the <property>JBoss Tools</property>
- project. <property> JBoss JMX Tools</property> has no dependency on any other part of <property>JBoss
- Tools</property>, and can be downloaded as a standalone Eclipse plugin. Even though the <property>JMX
- Tools</property> have no dependencies on other plugins, such as <property>AS Tools</property>,
- <property>JBoss JMX Tools</property> do depend on the JMX Tooling and even extend it. </para>
-
- <para>You can find the <property>JBoss JBoss Tools</property> plugins over at the <ulink
- url="http://labs.jboss.com/tools/download.html">download pages</ulink>. The only
- package you'll need to get is the JBoss JMX Tooling, however the <property>AS
- Tools</property> would give you a wider experience and more options when using JMX with JBoss Servers.
- You can find further download and installation instructions on the JBoss Wiki in the <ulink
- url="http://www.jboss.org/tools/download/installation">InstallingJBossTools</ulink>
- section.</para>
- </section>
- </section>
-</chapter>
-=======
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="intruduction" xreflabel="introduction">
- <?dbhtml filename="introduction.html"?>
-
- <title>Introduction</title>
- <para><property>JBoss Tools</property>' JMX project is a fork of <ulink
- url="http://code.google.com/p/eclipse-jmx/">eclipse-jmx</ulink>, a project by Jeff Mesnil.
- It was forked with permission. </para>
-
- <section>
- <title>What is JMX?</title>
<para>
-The Java Management Extensions (JMX) technology is a standard part of the Java Platform, Standard Edition (Java SE platform). The JMX technology was added to the platform in the Java 2 Platform, Standard Edition (J2SE) 5.0 release.
-</para>
- <para>
-The JMX technology provides a simple, standard way of managing resources such as applications, devices, and services. Because the JMX technology is dynamic, you can use it to monitor and manage resources as they are created, installed and implemented. You can also use the JMX technology to monitor and manage the Java Virtual Machine (Java VM).
-</para>
- <para>
-The JMX specification defines the architecture, design patterns, APIs, and services in the Java programming language for management and monitoring of applications and networks.
-</para>
- <para>
-Using the JMX technology, a given resource is instrumented by one or more Java objects known as Managed Beans, or MBeans. These MBeans are registered in a core-managed object server, known as an MBean server. The MBean server acts as a management agent and can run on most devices that have been enabled for the Java programming language.
-</para>
-
- <para>
The specifications define JMX agents that you use to manage any resources that have been correctly configured for management. A JMX agent consists of an MBean server, in which MBeans are registered, and a set of services for handling the MBeans. In this way, JMX agents directly control resources and make them available to remote management applications.
</para>
<para>
@@ -166,8 +31,10 @@
<para>
The JMX technology defines standard connectors (known as JMX connectors) that enable you to access JMX agents from remote management applications. JMX connectors using different protocols provide the same management interface. Consequently, a management application can manage resources transparently, regardless of the communication protocol used. JMX agents can also be used by systems or applications that are not compliant with the JMX specification, as long as those systems or applications support JMX agents.
</para>
+<para>
<ulink
url="http://java.sun.com/docs/books/tutorial/jmx/overview/index.html">Read more about JMX</ulink>.
+</para>
</section>
<section>
@@ -265,4 +132,4 @@
section.</para>
</section>
</section>
-</chapter>>>>>>>> .r22100
+</chapter>
Modified: branches/3.2.helios/jmx/docs/reference/en-US/tasks.xml
===================================================================
--- branches/3.2.helios/jmx/docs/reference/en-US/tasks.xml 2010-06-07 00:03:03 UTC (rev 22591)
+++ branches/3.2.helios/jmx/docs/reference/en-US/tasks.xml 2010-06-07 02:09:45 UTC (rev 22592)
@@ -41,7 +41,7 @@
a sample Java application and run the <property>sayHello()</property> method remotely from inside of the <property>MBean Explorer</property>.</para>
<orderedlist>
-http://java.sun.com/docs/books/tutorial/jmx/examples/jmx_examples.zip
+<!--http://java.sun.com/docs/books/tutorial/jmx/examples/jmx_examples.zip-->
<listitem><para>Save the bundle of JMX API sample classes, <ulink url="http://java.sun.com/docs/books/tutorial/jmx/examples/jmx_examples.zip">jmx_examples.zip</ulink>, to your working directory</para></listitem>
<listitem><para>Unzip the bundle of sample classes.</para></listitem>
14 years, 7 months
JBoss Tools SVN: r22591 - branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-06-06 20:03:03 -0400 (Sun, 06 Jun 2010)
New Revision: 22591
Modified:
branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
Log:
correcting product number
Modified: branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2010-06-06 22:17:08 UTC (rev 22590)
+++ branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2010-06-07 00:03:03 UTC (rev 22591)
@@ -1,3 +1,3 @@
<?xml version='1.0' encoding='utf-8' ?>
-<articleinfo><title>3.0.0 Release Notes</title><subtitle>Information about the changes made for this release of the JBoss Developer Studio.</subtitle><productname>JBoss Developer Studio</productname><productnumber>3</productnumber><edition>0</edition><pubsnumber>1</pubsnumber><abstract><para>These release notes contain important information related to the JBoss Developer Studio. New features,<!-- known problems,--> resources, and other current issues are addressed here.</para></abstract><corpauthor><inlinemediaobject><imageobject><imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata></imageobject></inlinemediaobject></corpauthor><xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></articleinfo>
+<articleinfo><title>3.0.0 Release Notes</title><subtitle>Information about the changes made for this release of the JBoss Developer Studio.</subtitle><productname>JBoss Developer Studio</productname><productnumber>3.0</productnumber><edition>0</edition><pubsnumber>1</pubsnumber><abstract><para>These release notes contain important information related to the JBoss Developer Studio. New features,<!-- known problems,--> resources, and other current issues are addressed here.</para></abstract><corpauthor><inlinemediaobject><imageobject><imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata></imageobject></inlinemediaobject></corpauthor><xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></articleinfo>
14 years, 7 months
JBoss Tools SVN: r22590 - branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-06-06 18:17:08 -0400 (Sun, 06 Jun 2010)
New Revision: 22590
Modified:
branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
Log:
updated product number for new website system
Modified: branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2010-06-06 22:15:41 UTC (rev 22589)
+++ branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2010-06-06 22:17:08 UTC (rev 22590)
@@ -4,7 +4,7 @@
<title>3.0.1 Release Notes</title>
<subtitle>Information about the changes made for this release of the JBoss Developer Studio.</subtitle>
<productname>JBoss Developer Studio</productname>
- <productnumber>3.0</productnumber>
+ <productnumber>3</productnumber>
<edition>0</edition>
<pubsnumber>0</pubsnumber>
<abstract>
14 years, 7 months
JBoss Tools SVN: r22589 - branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-06-06 18:15:41 -0400 (Sun, 06 Jun 2010)
New Revision: 22589
Added:
branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/3.0.0_Release_Notes.ent
branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/3.0.0_Release_Notes.xml
Removed:
branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.ent
branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.xml
Modified:
branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
Log:
Update for new red hat doc system
-This line, and thilow, will be ignored--
D en-US/Release_Notes.xml
A en-US/3.0.0_Release_Notes.ent
M en-US/Article_Info.xml
M en-US/Overview.xml
A en-US/3.0.0_Release_Notes.xml
D en-US/Release_Notes.ent
Added: branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/3.0.0_Release_Notes.ent
===================================================================
--- branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/3.0.0_Release_Notes.ent (rev 0)
+++ branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/3.0.0_Release_Notes.ent 2010-06-06 22:15:41 UTC (rev 22589)
@@ -0,0 +1,4 @@
+<!ENTITY PRODUCT "JBoss Developer Studio">
+<!ENTITY BOOKID "Release_Notes">
+<!ENTITY YEAR "2010">
+<!ENTITY HOLDER "Red Hat">
Added: branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/3.0.0_Release_Notes.xml
===================================================================
--- branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/3.0.0_Release_Notes.xml (rev 0)
+++ branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/3.0.0_Release_Notes.xml 2010-06-06 22:15:41 UTC (rev 22589)
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+<article>
+ <xi:include href="Article_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+<!-- <xi:include href="New_Features.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
+ <xi:include href="Component_Versions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Fixed_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Known_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+</article>
Modified: branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2010-06-06 22:11:58 UTC (rev 22588)
+++ branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2010-06-06 22:15:41 UTC (rev 22589)
@@ -1,3 +1,3 @@
<?xml version='1.0' encoding='utf-8' ?>
-<articleinfo><title>Release Notes</title><subtitle>Information about the changes made for this release of the JBoss Developer Studio.</subtitle><productname>JBoss Developer Studio</productname><productnumber>3.0</productnumber><edition>0</edition><pubsnumber>0</pubsnumber><abstract><para>These release notes contain important information related to the JBoss Developer Studio. New features,<!-- known problems,--> resources, and other current issues are addressed here.</para></abstract><corpauthor><inlinemediaobject><imageobject><imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata></imageobject></inlinemediaobject></corpauthor><xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></articleinfo>
+<articleinfo><title>3.0.0 Release Notes</title><subtitle>Information about the changes made for this release of the JBoss Developer Studio.</subtitle><productname>JBoss Developer Studio</productname><productnumber>3</productnumber><edition>0</edition><pubsnumber>1</pubsnumber><abstract><para>These release notes contain important information related to the JBoss Developer Studio. New features,<!-- known problems,--> resources, and other current issues are addressed here.</para></abstract><corpauthor><inlinemediaobject><imageobject><imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata></imageobject></inlinemediaobject></corpauthor><xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></articleinfo>
Modified: branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
===================================================================
--- branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2010-06-06 22:11:58 UTC (rev 22588)
+++ branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2010-06-06 22:15:41 UTC (rev 22589)
@@ -42,7 +42,7 @@
</listitem>
</itemizedlist>
<para>
- JBoss Developer Studio includes both certified visual tooling and a runtime platform that Red Hat supports for 5 years, ensuring developers of a stable, upgradable, deployable and supportable platform.
+ JBoss Developer Studio includes both certified visual tooling and a runtime platform (that Red Hat supports for 3 years (Limited) and 5 years respectively), ensuring developers of a stable, upgradable, deployable and supportable platform.
</para>
<para>
JBoss Developer Studio is available for Windows, Linux and MacOS.
Deleted: branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.ent
===================================================================
--- branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.ent 2010-06-06 22:11:58 UTC (rev 22588)
+++ branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.ent 2010-06-06 22:15:41 UTC (rev 22589)
@@ -1,4 +0,0 @@
-<!ENTITY PRODUCT "JBoss Developer Studio">
-<!ENTITY BOOKID "Release_Notes">
-<!ENTITY YEAR "2010">
-<!ENTITY HOLDER "Red Hat">
Deleted: branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.xml
===================================================================
--- branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.xml 2010-06-06 22:11:58 UTC (rev 22588)
+++ branches/jbosstools-3.1.x/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.xml 2010-06-06 22:15:41 UTC (rev 22589)
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<article>
- <xi:include href="Article_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-<!-- <xi:include href="New_Features.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
- <xi:include href="Component_Versions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Fixed_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Known_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-</article>
14 years, 7 months
JBoss Tools SVN: r22588 - branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-06-06 18:11:58 -0400 (Sun, 06 Jun 2010)
New Revision: 22588
Added:
branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/3.0.1_Release_Notes.ent
branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/3.0.1_Release_Notes.xml
Removed:
branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.ent
branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.xml
Modified:
branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
Log:
updated for new red hat docs system
Added: branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/3.0.1_Release_Notes.ent
===================================================================
--- branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/3.0.1_Release_Notes.ent (rev 0)
+++ branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/3.0.1_Release_Notes.ent 2010-06-06 22:11:58 UTC (rev 22588)
@@ -0,0 +1,4 @@
+<!ENTITY PRODUCT "JBoss Developer Studio">
+<!ENTITY BOOKID "Release_Notes">
+<!ENTITY YEAR "2010">
+<!ENTITY HOLDER "Red Hat">
Added: branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/3.0.1_Release_Notes.xml
===================================================================
--- branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/3.0.1_Release_Notes.xml (rev 0)
+++ branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/3.0.1_Release_Notes.xml 2010-06-06 22:11:58 UTC (rev 22588)
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+<article>
+ <xi:include href="Article_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+<!-- <xi:include href="New_Features.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
+ <xi:include href="Component_Versions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Updating_to_the_new_Web_Tools_Platform_packages.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Fixed_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+<!-- <xi:include href="Known_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
+ <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+</article>
Modified: branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2010-06-06 22:04:11 UTC (rev 22587)
+++ branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2010-06-06 22:11:58 UTC (rev 22588)
@@ -1,10 +1,10 @@
<?xml version='1.0' encoding='utf-8' ?>
<articleinfo>
- <title>Release Notes</title>
+ <title>3.0.1 Release Notes</title>
<subtitle>Information about the changes made for this release of the JBoss Developer Studio.</subtitle>
<productname>JBoss Developer Studio</productname>
- <productnumber>3.0.1</productnumber>
+ <productnumber>3.0</productnumber>
<edition>0</edition>
<pubsnumber>0</pubsnumber>
<abstract>
Deleted: branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.ent
===================================================================
--- branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.ent 2010-06-06 22:04:11 UTC (rev 22587)
+++ branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.ent 2010-06-06 22:11:58 UTC (rev 22588)
@@ -1,4 +0,0 @@
-<!ENTITY PRODUCT "JBoss Developer Studio">
-<!ENTITY BOOKID "Release_Notes">
-<!ENTITY YEAR "2010">
-<!ENTITY HOLDER "Red Hat">
Deleted: branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.xml
===================================================================
--- branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.xml 2010-06-06 22:04:11 UTC (rev 22587)
+++ branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.xml 2010-06-06 22:11:58 UTC (rev 22588)
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<article>
- <xi:include href="Article_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-<!-- <xi:include href="New_Features.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
- <xi:include href="Component_Versions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Updating_to_the_new_Web_Tools_Platform_packages.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Fixed_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-<!-- <xi:include href="Known_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
- <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-</article>
14 years, 7 months
JBoss Tools SVN: r22587 - in branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US: images and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-06-06 18:04:11 -0400 (Sun, 06 Jun 2010)
New Revision: 22587
Added:
branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Updating_to_the_new_Web_Tools_Platform_packages.xml
branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/images/WTP_Update_Site.png
Modified:
branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml
branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.xml
branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/master.xml
Log:
updated to latest release notes version for JBDS 3.0.1
Modified: branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2010-06-06 09:25:50 UTC (rev 22586)
+++ branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2010-06-06 22:04:11 UTC (rev 22587)
@@ -15,8 +15,7 @@
<corpauthor>
<inlinemediaobject>
<imageobject>
- <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG">
- </imagedata>
+ <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
</imageobject>
</inlinemediaobject>
</corpauthor>
Modified: branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-06-06 09:25:50 UTC (rev 22586)
+++ branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-06-06 22:04:11 UTC (rev 22587)
@@ -144,6 +144,18 @@
</itemizedlist>
</para>
</formalpara> -->
+ <formalpara id="Fixed_Issues-Web_Tools_Platform">
+ <title>Web Tools Platform</title>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBDS-1155">JBDS-1155</ulink>: A regression existed in the Eclipse 3.5.2 Web Tools Platform (WTP) 3.1.2. The bug would break EAR deployments that used classpath variables by deploying dependent artifacts to <filename><root_ear>/lib/lib/lib</filename> instead of <filename><root_ear>/lib</filename>. The issue has been corrected with these updated packages so that the regression no longer exists and EAR deployments function correctly.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </formalpara>
<!-- <formalpara>
<title>XHTML Editor</title>
<para>
@@ -174,6 +186,11 @@
<itemizedlist>
<listitem>
<para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBDS-1228">JBDS-1228</ulink>: The JBoss Developer Studio installation wizard would display incorrect step numbering, seeming to jump sporadically. This occurred because steps the installer takes that are invisible to the user were still included in the displayed step numbering on each screen. In this release the step numbering has been corrected to count only the steps the user participates in.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
<ulink url="http://jira.jboss.com/jira/browse/JBDS-1220">JBDS-1220</ulink>: Within the JBoss Developer Studio, the browse button that allowed a user to select the location of the JBoss Application Server would not default to the location where the JBoss Enterprise Application Platform was installed. The consequence of this was that a user would have to search for the installed location of the JBoss Enterprise Application Platform. Though installation of the JBoss Enterprise Application Platform is optional, if it is installed it can be assumed that this will be the Application Server a user will wish to use. In order to improve the user experience, when the JBoss Enterprise Application Platform is installed, the server location browse button will default to that directory.
</para>
</listitem>
@@ -199,14 +216,14 @@
</listitem>
<listitem>
<para>
- <ulink url="http://jira.jboss.com/jira/browse/JBDS-1155">JBDS-1155</ulink>: A regression existed in the Eclipse 3.5.2 Web Tools Platform (WTP) 3.1.2. The bug would break EAR deployments that used classpath variables by deploying dependent artifacts to <filename><root_ear>/lib/lib/lib</filename> instead of <filename><root_ear>/lib</filename>. The issue has been corrected with these updated packages so that the regression no longer exists and EAR deployments function correctly.
+ <ulink url="https://jira.jboss.org/jira/browse/JBDS-1222">JBDS-1222</ulink>: A bug existed in the JBoss Developer Studio that caused stylesheets to not render correctly in the JBoss Enterprise Application Platform 5 and a <exceptionname>org.ajax4jsf.resource.ResourceNotFoundException: Static resource not found for path <resource name></exceptionname> exception when using the JBoss Enterprise Portal Platform 5 to load a JSF page through a Portlet. These errors were caused by the code to load the style sheet being: <code><a:loadStyle src="resource:///stylesheet/theme.xcss"/></code> instead of <code><a:loadStyle src="/stylesheet/theme.xcss"/></code>. This issue has now been corrected for this release.
</para>
</listitem>
- <listitem>
+ <!-- Reopened <listitem>
<para>
<ulink url="http://jira.jboss.com/jira/browse/JBDS-1147">JBDS-1147</ulink>: An incorrect link to the Guvnor Rules repository was included in the JBoss Developer Studio. This bug caused the repository to become unreachable. This has been fixed by correcting the link to be <ulink url="http://localhost:8080/drools-guvnor/org.drools.guvnor.Guvnor/webdav">http://localhost:8080/drools-guvnor/org.drools.guvnor.Guvnor/webdav</ulink>. The JBoss Developer Studio is now able to connect to the Guvnor Rules repository.
</para>
- </listitem>
+ </listitem> -->
<listitem>
<para>
<ulink url="http://jira.jboss.com/jira/browse/JBDS-1091">JBDS-1091</ulink>: Two bugs were found. A problem was found in the <filename>org.jboss.tools.runtime_1.1.0</filename> plug-in and the visibility of the <property>Instance</property> field was changed from public to private. These bugs respectively caused the JBoss Developer Studio <guilabel>Server View</guilabel> to not display all available servers on occasion after using the installer and jBPM runtimes to not be initialized correctly. The <filename>org.jboss.tools.runtime_1.1.0</filename> plug-in has now been updated to force a refresh of the <guilabel>Server View</guilabel> post installation, which can be verified by a refresh message appearing in the log file and the <filename>org.jboss.tools.jbpm.common</filename> plug-in has been updated to set <code>public static final PreferencesManager INSTANCE = new PreferencesManager();</code>. By correcting the <filename>org.jboss.tools.runtime_1.1.0</filename> plug-!
in, all installed servers now appear in the <guilabel>Server View</guilabel> directly after installation of the JBoss Developer Studio through the installer. Fixing the <filename>org.jboss.tools.jbpm.common</filename> plug-in now allows for jBPM runtimes to be initialized correctly. Both issues are fixed with this update.
Modified: branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml
===================================================================
--- branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 2010-06-06 09:25:50 UTC (rev 22586)
+++ branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 2010-06-06 22:04:11 UTC (rev 22587)
@@ -10,11 +10,7 @@
<title>General Known Issues</title>
<para>
<itemizedlist>
- <listitem>
- <para>
- <ulink url="https://jira.jboss.org/jira/browse/JBDS-"> </ulink>
- </para>
- </listitem>
+
</itemizedlist>
</para>
</formalpara>
Modified: branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.xml
===================================================================
--- branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.xml 2010-06-06 09:25:50 UTC (rev 22586)
+++ branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Release_Notes.xml 2010-06-06 22:04:11 UTC (rev 22587)
@@ -5,7 +5,8 @@
<xi:include href="Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<!-- <xi:include href="New_Features.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
<xi:include href="Component_Versions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Updating_to_the_new_Web_Tools_Platform_packages.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="Fixed_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Known_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+<!-- <xi:include href="Known_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</article>
Added: branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Updating_to_the_new_Web_Tools_Platform_packages.xml
===================================================================
--- branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Updating_to_the_new_Web_Tools_Platform_packages.xml (rev 0)
+++ branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/Updating_to_the_new_Web_Tools_Platform_packages.xml 2010-06-06 22:04:11 UTC (rev 22587)
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<section id="Updating-to-the-new-Web-Tools-Platform-packages">
+ <title>Updating to the new Web Tools Platform packages</title>
+ <para>
+ In order to receive the updated Web Tools Platform packages for the JBoss Developer Studio 3.0.1 (<xref linkend="Fixed_Issues-Web_Tools_Platform" />) the following location needs to be added or enabled as part of the update process: <ulink url="http://download.eclipse.org/webtools/updates/">http://download.eclipse.org/webtools/updates/</ulink>. From this location install the two patches that appear under the <guimenuitem>Patches</guimenuitem> menu and labeled as <filename>Patches 2010 04 13</filename>.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/WTP_Update_Site.png"/>
+ </imageobject>
+ <caption>Selecting the Web Tools Platform patches from the update site</caption>
+ </mediaobject>
+ <important>
+ <para>
+ You can only use the update method if the JBoss Developer Studio 3.0 is currently installed.
+ </para>
+ <para>
+ If the JBoss Developer Studio 3.0.1 will be a new installation, the Web Tools Platform patches are included with the install and no extra update or patches are necessary.
+ </para>
+ </important>
+</section>
\ No newline at end of file
Added: branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/images/WTP_Update_Site.png
===================================================================
(Binary files differ)
Property changes on: branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/images/WTP_Update_Site.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/master.xml
===================================================================
--- branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/master.xml 2010-06-06 09:25:50 UTC (rev 22586)
+++ branches/3.2.helios/documentation/guides/JBDS_Release_Notes/en-US/master.xml 2010-06-06 22:04:11 UTC (rev 22587)
@@ -13,16 +13,7 @@
<articleinfo>
<title>Release Notes</title>
- <corpauthor>
- <inlinemediaobject>
- <imageobject role="fo">
- <imagedata format="PNG" fileref="images/jbosstools_logo.png" />
- </imageobject>
- <imageobject role="html">
- <imagedata/>
- </imageobject>
- </inlinemediaobject>
- </corpauthor>
+
<author>
<firstname>Isaac</firstname>
@@ -51,6 +42,6 @@
<!-- &NewFeatures; -->
&ComponentVersions;
&FixedIssues;
- &KnownIssues;
+<!-- &KnownIssues; -->
</article>
14 years, 7 months
JBoss Tools SVN: r22586 - in workspace/smooks-dmb/smooks: plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core and 7 other directories.
by jbosstools-commits@lists.jboss.org
Author: tfennelly
Date: 2010-06-06 05:25:50 -0400 (Sun, 06 Jun 2010)
New Revision: 22586
Added:
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Param.java
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java
workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java
workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/
workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java
workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/
workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml
workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml
Modified:
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml
workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java
workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java
workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-01.xml
workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-04.xml
workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-04.xml
workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java
Log:
Added model for <params>
Modified: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java 2010-06-05 15:11:38 UTC (rev 22585)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java 2010-06-06 09:25:50 UTC (rev 22586)
@@ -20,9 +20,12 @@
package org.jboss.tools.smooks.model;
import org.jboss.tools.smooks.model.core.Component;
+import org.jboss.tools.smooks.model.core.Params;
import org.jboss.tools.smooks.model.core.Reader;
+import org.milyn.javabean.dynamic.Model;
import org.milyn.javabean.dynamic.serialize.DefaultNamespace;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
@@ -36,10 +39,19 @@
public static final String MODEL_DESCRIPTOR = "org/jboss/tools/smooks/model/descriptor.properties";
+ private Params params;
private List<Reader> readers = new ArrayList<Reader>();
private List<Component> components = new ArrayList<Component>();
- public List<Reader> getReaders() {
+ public Params getParams() {
+ return params;
+ }
+
+ public void setParams(Params params) {
+ this.params = params;
+ }
+
+ public List<Reader> getReaders() {
return readers;
}
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java (rev 0)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java 2010-06-06 09:25:50 UTC (rev 22586)
@@ -0,0 +1,56 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2009, JBoss Inc.
+ */
+package org.jboss.tools.smooks.model;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+
+import org.milyn.javabean.dynamic.Model;
+import org.milyn.javabean.dynamic.ModelBuilder;
+import org.xml.sax.SAXException;
+
+/**
+ * {@link SmooksModel} Builder.
+ * <p/>
+ * Simple wrapper for the {@link ModelBuilder}.
+ *
+ * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
+ */
+public class SmooksModelBuilder {
+
+ private ModelBuilder modelBuilder;
+
+ public SmooksModelBuilder() throws SAXException, IOException {
+ modelBuilder = new ModelBuilder(SmooksModel.MODEL_DESCRIPTOR, false);
+ }
+
+ public ModelBuilder getModelBuilder() {
+ return modelBuilder;
+ }
+
+ public Model<SmooksModel> readModel(InputStream configStream) throws SAXException, IOException {
+ return modelBuilder.readModel(configStream, SmooksModel.class);
+ }
+
+ public Model<SmooksModel> readModel(Reader configStream) throws SAXException, IOException {
+ return modelBuilder.readModel(configStream, SmooksModel.class);
+ }
+}
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Param.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Param.java (rev 0)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Param.java 2010-06-06 09:25:50 UTC (rev 22586)
@@ -0,0 +1,49 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2009, JBoss Inc.
+ */
+package org.jboss.tools.smooks.model.core;
+
+/**
+ * Param.
+ *
+ * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
+ */
+public class Param {
+
+ private String name;
+ private String value;
+
+ public String getName() {
+ return name;
+ }
+
+ public Param setName(String name) {
+ this.name = name;
+ return this;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public Param setValue(String value) {
+ this.value = value;
+ return this;
+ }
+}
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Param.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java (rev 0)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-06-06 09:25:50 UTC (rev 22586)
@@ -0,0 +1,107 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2009, JBoss Inc.
+ */
+package org.jboss.tools.smooks.model.core;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.milyn.StreamFilterType;
+import org.milyn.delivery.Filter;
+
+/**
+ * Params.
+ *
+ * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
+ */
+public class Params {
+
+ private List<Param> params;
+
+ public List<Param> getParams() {
+ return params;
+ }
+
+ public void setParams(List<Param> params) {
+ this.params = params;
+ }
+
+ public String getParam(String name) {
+ if(params == null) {
+ return null;
+ }
+
+ for(Param param : params) {
+ String paramName = param.getName();
+ if(paramName != null && paramName.equals(name)) {
+ return param.getValue();
+ }
+ }
+
+ return null;
+ }
+
+ public Params setParam(String name, String value) {
+ if(params == null) {
+ params = new ArrayList<Param>();
+ }
+
+ removeParam(name);
+ params.add(new Param().setName(name).setValue(value));
+ return this;
+ }
+
+ public Params removeParam(String name) {
+ if(params == null) {
+ return this;
+ }
+
+ Iterator<Param> paramsIterator = params.iterator();
+
+ while(paramsIterator.hasNext()) {
+ String paramName = paramsIterator.next().getName();
+ if(paramName != null && paramName.equals(name)) {
+ paramsIterator.remove();
+ return this;
+ }
+ }
+
+ return this;
+ }
+
+ public Params setFilterType(StreamFilterType filterType) {
+ setParam(Filter.STREAM_FILTER_TYPE, filterType.toString());
+ return this;
+ }
+
+ public StreamFilterType getFilterType() {
+ String filterType = getParam(Filter.STREAM_FILTER_TYPE);
+
+ if(filterType == null) {
+ return null;
+ }
+
+ try {
+ return StreamFilterType.valueOf(filterType);
+ } catch(Exception e) {
+ return null;
+ }
+ }
+}
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl 2010-06-05 15:11:38 UTC (rev 22585)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl 2010-06-06 09:25:50 UTC (rev 22586)
@@ -1,6 +1,13 @@
<?xml version="1.0"?>
<smooks-resource-list <@writeNamespaces indent="22"/>>
+<#if bean.params??>
+ <params>
+ <#list bean.params.params as param>
+ <param name="${param.name}">${param.value}</param>
+ </#list>
+ </params>
+</#if>
<#list bean.readers as reader><@writeBean bean=reader /></#list>
<#list bean.components as component><@writeBean bean=component /></#list>
Modified: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml 2010-06-05 15:11:38 UTC (rev 22585)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml 2010-06-06 09:25:50 UTC (rev 22586)
@@ -7,6 +7,7 @@
Main Smooks model bean.
-->
<jb:bean beanId="smooksModel" class="org.jboss.tools.smooks.model.SmooksModel" createOnElement="#document">
+ <jb:wiring property="params" beanIdRef="params" />
<jb:wiring property="readers" beanIdRef="readers" />
<jb:wiring property="components" beanIdRef="components" />
</jb:bean>
@@ -17,6 +18,18 @@
<jb:wiring beanType="org.jboss.tools.smooks.model.core.Component" />
</jb:bean>
+ <!-- params -->
+ <jb:bean beanId="params" class="org.jboss.tools.smooks.model.core.Params" createOnElement="/smooks-resource-list/params">
+ <jb:wiring property="params" beanIdRef="paramsList" />
+ </jb:bean>
+ <jb:bean beanId="paramsList" class="java.util.ArrayList" createOnElement="/smooks-resource-list/params">
+ <jb:wiring beanIdRef="param" />
+ </jb:bean>
+ <jb:bean beanId="param" class="org.jboss.tools.smooks.model.core.Param" createOnElement="/smooks-resource-list/params/param">
+ <jb:value property="name" data="/smooks-resource-list/params/param/@name" />
+ <jb:value property="value" data="/smooks-resource-list/params/param" />
+ </jb:bean>
+
<!--
Top level writer...
-->
Added: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java (rev 0)
+++ workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java 2010-06-06 09:25:50 UTC (rev 22586)
@@ -0,0 +1,70 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2009, JBoss Inc.
+ */
+package org.jboss.tools.smooks.model;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import org.custommonkey.xmlunit.XMLAssert;
+import org.custommonkey.xmlunit.XMLUnit;
+import org.jboss.tools.smooks.model.SmooksModel;
+import org.jboss.tools.smooks.model.SmooksModelBuilder;
+import org.milyn.javabean.dynamic.Model;
+import org.xml.sax.SAXException;
+
+import junit.framework.TestCase;
+
+/**
+ * Abstract SmooksModel test case.
+ *
+ * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
+ */
+public abstract class SmooksModelTestCase extends TestCase {
+
+ protected SmooksModelBuilder smooksModelBuilder;
+
+ public SmooksModelTestCase() throws IOException, SAXException {
+ smooksModelBuilder = new SmooksModelBuilder();
+ }
+
+ public SmooksModelBuilder getSmooksModelBuilder() {
+ return smooksModelBuilder;
+ }
+
+ public void setReportPath(String reportPath) {
+ smooksModelBuilder.getModelBuilder().setReportPath(reportPath);
+ }
+
+ public Model<SmooksModel> test(String messageFile) throws IOException, SAXException {
+ Model<SmooksModel> model = smooksModelBuilder.readModel(getClass().getResourceAsStream(messageFile));
+ assertModelEquals(model, messageFile);
+ return model;
+ }
+
+ public void assertModelEquals(Model<SmooksModel> model, String messageFile) throws IOException, SAXException {
+ StringWriter modelWriter = new StringWriter();
+ model.writeModel(modelWriter);
+ System.out.println(modelWriter);
+ XMLUnit.setIgnoreWhitespace( true );
+ XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream(messageFile)), new StringReader(modelWriter.toString()));
+ }
+}
\ No newline at end of file
Property changes on: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java (rev 0)
+++ workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-06-06 09:25:50 UTC (rev 22586)
@@ -0,0 +1,74 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2009, JBoss Inc.
+ */
+package org.jboss.tools.smooks.model.core;
+
+import org.jboss.tools.smooks.model.SmooksModel;
+import org.jboss.tools.smooks.model.SmooksModelTestCase;
+import org.milyn.StreamFilterType;
+import org.milyn.javabean.dynamic.Model;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly(a)gmail.com</a>
+ */
+public class ParamsTest extends SmooksModelTestCase {
+
+ public ParamsTest() throws IOException, SAXException {
+ super();
+ }
+
+ public void test_manual() {
+ Params params = new Params();
+ assertEquals(null, params.getParam("a"));
+ params.removeParam("a"); // make sure there's no exception
+ params.setParam("a", "aVal");
+ assertEquals("aVal", params.getParam("a"));
+ params.setParam("a", "bVal");
+ assertEquals("bVal", params.getParam("a"));
+ params.setFilterType(StreamFilterType.SAX);
+ assertTrue(params.getFilterType() == StreamFilterType.SAX);
+ params.setFilterType(StreamFilterType.DOM);
+ assertTrue(params.getFilterType() == StreamFilterType.DOM);
+ }
+
+ public void test_config_v11_01() throws IOException, SAXException {
+ Model<SmooksModel> model = test("v1_1/config-01.xml");
+
+ Params params = model.getModelRoot().getParams();
+
+ assertTrue(params.getFilterType() == StreamFilterType.SAX);
+
+ params.setFilterType(StreamFilterType.DOM);
+ assertModelEquals(model, "v1_1/config-02.xml");
+ }
+
+ public void test_config_v11_02() throws IOException, SAXException {
+ Model<SmooksModel> model = test("v1_1/config-02.xml");
+
+ Params params = model.getModelRoot().getParams();
+
+ assertTrue(params.getFilterType() == StreamFilterType.DOM);
+
+ params.setFilterType(StreamFilterType.SAX);
+ assertModelEquals(model, "v1_1/config-01.xml");
+ }
+}
\ No newline at end of file
Property changes on: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml (rev 0)
+++ workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml 2010-06-06 09:25:50 UTC (rev 22586)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd">
+
+ <params>
+ <param name="a">aVal</param>
+ <param name="b">bVal</param>
+ <param name="stream.filter.type">SAX</param>
+ </params>
+
+</smooks-resource-list>
\ No newline at end of file
Property changes on: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml (rev 0)
+++ workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml 2010-06-06 09:25:50 UTC (rev 22586)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd">
+
+ <params>
+ <param name="a">aVal</param>
+ <param name="b">bVal</param>
+ <param name="stream.filter.type">DOM</param>
+ </params>
+
+</smooks-resource-list>
\ No newline at end of file
Property changes on: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java 2010-06-05 15:11:38 UTC (rev 22585)
+++ workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java 2010-06-06 09:25:50 UTC (rev 22586)
@@ -19,12 +19,11 @@
*/
package org.jboss.tools.smooks.model.csv;
-import junit.framework.TestCase;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
import org.jboss.tools.smooks.model.SmooksModel;
+import org.jboss.tools.smooks.model.SmooksModelTestCase;
import org.milyn.javabean.dynamic.Model;
-import org.milyn.javabean.dynamic.ModelBuilder;
import org.xml.sax.SAXException;
import java.io.IOException;
@@ -35,12 +34,10 @@
/**
* @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly(a)gmail.com</a>
*/
-public class CSVReader_1_2_Test extends TestCase {
+public class CSVReader_1_2_Test extends SmooksModelTestCase {
- private ModelBuilder modelBuilder;
-
public CSVReader_1_2_Test() throws IOException, SAXException {
- modelBuilder = new ModelBuilder(SmooksModel.MODEL_DESCRIPTOR, false);
+ super();
}
public void test_01() throws IOException, SAXException {
@@ -59,19 +56,9 @@
test("v1_2/csv-config-04.xml");
}
- public void test(String messageFile) throws IOException, SAXException {
- Model<SmooksModel> model = modelBuilder.readModel(getClass().getResourceAsStream(messageFile), SmooksModel.class);
-
- StringWriter modelWriter = new StringWriter();
- model.writeModel(modelWriter);
-// System.out.println(modelWriter);
- XMLUnit.setIgnoreWhitespace( true );
- XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream(messageFile)), new StringReader(modelWriter.toString()));
- }
-
public void test_programmatic_build() throws IOException, SAXException {
SmooksModel smooksModel = new SmooksModel();
- Model<SmooksModel> model = new Model<SmooksModel>(smooksModel, modelBuilder);
+ Model<SmooksModel> model = new Model<SmooksModel>(smooksModel, getSmooksModelBuilder().getModelBuilder());
CSVReader csvReader = new CSVReader();
// Populate it...
Modified: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java 2010-06-05 15:11:38 UTC (rev 22585)
+++ workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java 2010-06-06 09:25:50 UTC (rev 22586)
@@ -19,12 +19,11 @@
*/
package org.jboss.tools.smooks.model.csv;
-import junit.framework.TestCase;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
import org.jboss.tools.smooks.model.SmooksModel;
+import org.jboss.tools.smooks.model.SmooksModelTestCase;
import org.milyn.javabean.dynamic.Model;
-import org.milyn.javabean.dynamic.ModelBuilder;
import org.xml.sax.SAXException;
import java.io.IOException;
@@ -35,12 +34,10 @@
/**
* @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly(a)gmail.com</a>
*/
-public class CSVReader_1_3_Test extends TestCase {
+public class CSVReader_1_3_Test extends SmooksModelTestCase {
- private ModelBuilder modelBuilder;
-
public CSVReader_1_3_Test() throws IOException, SAXException {
- modelBuilder = new ModelBuilder(SmooksModel.MODEL_DESCRIPTOR, false);
+ super();
}
public void test_01() throws IOException, SAXException {
@@ -63,19 +60,9 @@
test("v1_3/csv-config-05.xml");
}
- public void test(String messageFile) throws IOException, SAXException {
- Model<SmooksModel> model = modelBuilder.readModel(getClass().getResourceAsStream(messageFile), SmooksModel.class);
-
- StringWriter modelWriter = new StringWriter();
- model.writeModel(modelWriter);
-// System.out.println(modelWriter);
- XMLUnit.setIgnoreWhitespace( true );
- XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream(messageFile)), new StringReader(modelWriter.toString()));
- }
-
public void test_programmatic_build() throws IOException, SAXException {
SmooksModel smooksModel = new SmooksModel();
- Model<SmooksModel> model = new Model<SmooksModel>(smooksModel, modelBuilder);
+ Model<SmooksModel> model = new Model<SmooksModel>(smooksModel, getSmooksModelBuilder().getModelBuilder());
CSVReader csvReader = new CSVReader();
// Populate it...
Modified: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-01.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-01.xml 2010-06-05 15:11:38 UTC (rev 22585)
+++ workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-01.xml 2010-06-06 09:25:50 UTC (rev 22586)
@@ -2,6 +2,10 @@
<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd">
+ <params>
+ <param name="stream.filter.type">SAX</param>
+ </params>
+
<csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true"/>
</smooks-resource-list>
\ No newline at end of file
Modified: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-04.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-04.xml 2010-06-05 15:11:38 UTC (rev 22585)
+++ workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-04.xml 2010-06-06 09:25:50 UTC (rev 22586)
@@ -2,6 +2,10 @@
<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd">
+ <params>
+ <param name="stream.filter.type">DOM</param>
+ </params>
+
<!-- CSV Reader config... -->
<csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
<csv:mapBinding beanId="beanX" class="com.acme.XClass" keyField="name" />
Modified: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-04.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-04.xml 2010-06-05 15:11:38 UTC (rev 22585)
+++ workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-04.xml 2010-06-06 09:25:50 UTC (rev 22586)
@@ -2,6 +2,10 @@
<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.3.xsd">
+ <params>
+ <param name="stream.filter.type">SAX</param>
+ </params>
+
<!-- CSV Reader config... -->
<csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
<csv:mapBinding beanId="beanX" class="com.acme.XClass" keyField="name" />
Modified: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java 2010-06-05 15:11:38 UTC (rev 22585)
+++ workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java 2010-06-06 09:25:50 UTC (rev 22586)
@@ -19,31 +19,21 @@
*/
package org.jboss.tools.smooks.model.javabean;
-import junit.framework.TestCase;
-import org.custommonkey.xmlunit.XMLAssert;
-import org.custommonkey.xmlunit.XMLUnit;
-import org.jboss.tools.smooks.model.SmooksModel;
-import org.milyn.javabean.dynamic.Model;
-import org.milyn.javabean.dynamic.ModelBuilder;
+import org.jboss.tools.smooks.model.SmooksModelTestCase;
import org.xml.sax.SAXException;
import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.io.StringWriter;
/**
* @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly(a)gmail.com</a>
*/
-public class BeanTest extends TestCase {
+public class BeanTest extends SmooksModelTestCase {
- private ModelBuilder modelBuilder;
+ public BeanTest() throws IOException, SAXException {
+ super();
+ }
- public BeanTest() throws IOException, SAXException {
- modelBuilder = new ModelBuilder(SmooksModel.MODEL_DESCRIPTOR, false);
- }
-
- public void test_v11() throws IOException, SAXException {
+ public void test_v11() throws IOException, SAXException {
test("v1_1/config-01.xml");
}
@@ -64,14 +54,4 @@
// mixed namespaces...
test("v1_3/config-02.xml");
}
-
- public void test(String messageFile) throws IOException, SAXException {
- Model<SmooksModel> model = modelBuilder.readModel(getClass().getResourceAsStream(messageFile), SmooksModel.class);
-
- StringWriter modelWriter = new StringWriter();
- model.writeModel(modelWriter);
- System.out.println(modelWriter);
- XMLUnit.setIgnoreWhitespace( true );
- XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream(messageFile)), new StringReader(modelWriter.toString()));
- }
}
\ No newline at end of file
14 years, 7 months
JBoss Tools SVN: r22585 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test: src/org/jboss/tools/jsf/ui/bot/test and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: yzhishko
Date: 2010-06-05 11:11:38 -0400 (Sat, 05 Jun 2010)
New Revision: 22585
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/compositeComponent.html
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2RenameAttrTestPageRefactor.html
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5943 - SWTBotTests were added.
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/compositeComponent.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/compositeComponent.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/compositeComponent.html 2010-06-05 15:11:38 UTC (rev 22585)
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:composite="http://java.sun.com/jsf/composite">
+
+<!-- INTERFACE -->
+<composite:interface>
+ <composite:attribute name="echo"></composite:attribute>
+</composite:interface>
+
+<!-- IMPLEMENTATION -->
+<composite:implementation></composite:implementation>
+
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2RenameAttrTestPageRefactor.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2RenameAttrTestPageRefactor.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2RenameAttrTestPageRefactor.html 2010-06-05 15:11:38 UTC (rev 22585)
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:mycomp="http://java.sun.com/jsf/composite/mycomp">
+
+<mycomp:echo echo1="test" />
+
+</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2010-06-05 14:42:59 UTC (rev 22584)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2010-06-05 15:11:38 UTC (rev 22585)
@@ -9,6 +9,7 @@
import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3579Test;
import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3920Test;
import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE4391Test;
+import org.jboss.tools.jsf.ui.bot.test.jsf2.refactor.JSF2AttributeRenameTest;
import org.jboss.tools.jsf.ui.bot.test.jsf2.refactor.JSF2MoveParticipantTest;
import org.jboss.tools.jsf.ui.bot.test.jsf2.refactor.JSF2RenameParticipantTest;
import org.jboss.tools.jsf.ui.bot.test.smoke.AddRemoveJSFCapabilitiesTest;
@@ -36,6 +37,7 @@
suite.addTestSuite(CSSSelectorJBIDE3288.class);
suite.addTestSuite(JSF2MoveParticipantTest.class);
suite.addTestSuite(JSF2RenameParticipantTest.class);
+ suite.addTestSuite(JSF2AttributeRenameTest.class);
return suite;
}
}
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java 2010-06-05 14:42:59 UTC (rev 22584)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java 2010-06-05 15:11:38 UTC (rev 22585)
@@ -91,7 +91,7 @@
StringBuilder builder = new StringBuilder(""); //$NON-NLS-1$
Scanner scanner = new Scanner(file);
while (scanner.hasNextLine()) {
- builder.append(scanner.nextLine());
+ builder.append(scanner.nextLine()+"\n"); //$NON-NLS-1$
}
return builder.toString();
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java 2010-06-05 14:42:59 UTC (rev 22584)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java 2010-06-05 15:11:38 UTC (rev 22585)
@@ -63,7 +63,7 @@
bot.textWithLabel("File name:").setText("echo"); //$NON-NLS-1$ //$NON-NLS-2$
bot.button("Finish").click(); //$NON-NLS-1$
bot.sleep(2000);
- bot.editorByTitle("echo.xhtml").close(); //$NON-NLS-1$
+ bot.editorByTitle("echo.xhtml").saveAndClose(); //$NON-NLS-1$
}
}
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java 2010-06-05 15:11:38 UTC (rev 22585)
@@ -0,0 +1,80 @@
+package org.jboss.tools.jsf.ui.bot.test.jsf2.refactor;
+
+import java.io.IOException;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
+
+public class JSF2AttributeRenameTest extends JSF2AbstractRefactorTest {
+
+ public void testJSF2AttributeRename() throws Exception {
+ createCompositeComponent();
+ createTestPage();
+ renameCompositeAttribute();
+ checkContent();
+ }
+
+ private void renameCompositeAttribute() {
+ SWTBotEclipseEditor editor = bot
+ .editorByTitle("echo.xhtml").toTextEditor(); //$NON-NLS-1$
+ editor.selectRange(9, 29, 1);
+ bot.menu("Refactor").menu("Rename").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.shell("Rename Composite Attribute").activate(); //$NON-NLS-1$
+ bot.textWithLabel("New name:").setText("echo1"); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("OK").click(); //$NON-NLS-1$
+ }
+
+ private void checkContent() throws IOException {
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
+ SWTBotTree tree = innerBot.tree();
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ delay();
+ SWTBotEclipseEditor editor = bot.editorByTitle(
+ JSF2_Test_Page_Name + ".xhtml").toTextEditor(); //$NON-NLS-1$
+ assertEquals(
+ loadFileContent("refactor/jsf2RenameAttrTestPageRefactor.html"), editor.getText()); //$NON-NLS-1$
+ delay();
+ editor.close();
+ }
+
+ @Override
+ protected void createCompositeComponent() throws Exception {
+ super.createCompositeComponent();
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
+ SWTBotTree tree = innerBot.tree();
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ SWTBotEclipseEditor editor = bot
+ .editorByTitle("echo.xhtml").toTextEditor(); //$NON-NLS-1$
+ bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$//$NON-NLS-2$
+ bot.sleep(2000);
+ editor.setText(loadFileContent("refactor/compositeComponent.html")); //$NON-NLS-1$
+ editor.save();
+ bot.sleep(2000);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
+ SWTBotTree tree = innerBot.tree();
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("OK").click(); //$NON-NLS-1$
+ delay();
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("OK").click(); //$NON-NLS-1$
+ delay();
+ super.tearDown();
+ }
+
+}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java 2010-06-05 14:42:59 UTC (rev 22584)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java 2010-06-05 15:11:38 UTC (rev 22585)
@@ -8,8 +8,8 @@
public class JSF2RenameParticipantTest extends JSF2AbstractRefactorTest {
public void testJSF2RenameParticipant() throws Exception {
+ createCompositeComponent();
createTestPage();
- createCompositeComponent();
renameCompositeComponent();
checkContent();
}
14 years, 7 months
JBoss Tools SVN: r22584 - trunk/seam/tests.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-06-05 10:42:59 -0400 (Sat, 05 Jun 2010)
New Revision: 22584
Modified:
trunk/seam/tests/pom.xml
Log:
reenable empty plugins so that seam test feature can be built
Modified: trunk/seam/tests/pom.xml
===================================================================
--- trunk/seam/tests/pom.xml 2010-06-05 14:42:19 UTC (rev 22583)
+++ trunk/seam/tests/pom.xml 2010-06-05 14:42:59 UTC (rev 22584)
@@ -14,12 +14,12 @@
<modules>
<module>org.jboss.tools.seam.core.test</module>
<module>org.jboss.tools.seam.pages.xml.test</module>
- <!-- <module>org.jboss.tools.seam.text.ext.test</module> -->
+ <module>org.jboss.tools.seam.text.ext.test</module>
<module>org.jboss.tools.seam.ui.bot.test</module>
- <!-- <module>org.jboss.tools.seam.ui.pages.test</module> -->
+ <module>org.jboss.tools.seam.ui.pages.test</module>
<module>org.jboss.tools.seam.ui.test</module>
<module>org.jboss.tools.seam.xml.test</module>
- <!-- <module>org.jboss.tools.seam.xml.ui.test</module> -->
+ <module>org.jboss.tools.seam.xml.ui.test</module>
</modules>
</project>
14 years, 7 months
JBoss Tools SVN: r22583 - branches/3.2.helios/seam/tests.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-06-05 10:42:19 -0400 (Sat, 05 Jun 2010)
New Revision: 22583
Modified:
branches/3.2.helios/seam/tests/pom.xml
Log:
reenable empty plugins so that seam test feature can be built
Modified: branches/3.2.helios/seam/tests/pom.xml
===================================================================
--- branches/3.2.helios/seam/tests/pom.xml 2010-06-05 09:16:11 UTC (rev 22582)
+++ branches/3.2.helios/seam/tests/pom.xml 2010-06-05 14:42:19 UTC (rev 22583)
@@ -14,12 +14,12 @@
<modules>
<module>org.jboss.tools.seam.core.test</module>
<module>org.jboss.tools.seam.pages.xml.test</module>
- <!-- <module>org.jboss.tools.seam.text.ext.test</module> -->
+ <module>org.jboss.tools.seam.text.ext.test</module>
<module>org.jboss.tools.seam.ui.bot.test</module>
- <!-- <module>org.jboss.tools.seam.ui.pages.test</module> -->
+ <module>org.jboss.tools.seam.ui.pages.test</module>
<module>org.jboss.tools.seam.ui.test</module>
<module>org.jboss.tools.seam.xml.test</module>
- <!-- <module>org.jboss.tools.seam.xml.ui.test</module> -->
+ <module>org.jboss.tools.seam.xml.ui.test</module>
</modules>
</project>
14 years, 7 months