JBoss Tools SVN: r8692 - in branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test: inputs/projects/JBIDE2315 and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-06-10 14:42:17 -0400 (Tue, 10 Jun 2008)
New Revision: 8692
Added:
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.classpath
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.packages
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.project
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/bin/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/folder/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/src/
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java
Modified:
branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
Log:
JBIDE-2315 - NPE test
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.classpath
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.classpath (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.classpath 2008-06-10 18:42:17 UTC (rev 8692)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.packages
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.packages (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.packages 2008-06-10 18:42:17 UTC (rev 8692)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<packages>
+ <package name="worksnot.jar" type="jar" todir="/JBIDE2315" exploded="false" inWorkspace="true">
+ <fileset dir="/JBIDE2315/folder" includes="**/*" inWorkspace="true" flatten="false">
+ <properties></properties>
+ </fileset>
+ <properties>
+ <property name="org.jboss.ide.eclipse.as.core.packages.ModuleIDPropertyKey" value="1213079049734"></property>
+ </properties>
+ </package>
+ <properties></properties>
+</packages>
\ No newline at end of file
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.project
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.project (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.project 2008-06-10 18:42:17 UTC (rev 8692)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JBIDE2315</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.ide.eclipse.archives.core.archivesBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.jboss.ide.eclipse.archives.core.archivesNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2008-06-10 17:05:04 UTC (rev 8691)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2008-06-10 18:42:17 UTC (rev 8692)
@@ -11,6 +11,7 @@
import org.jboss.ide.eclipse.archives.test.model.XBUnmarshallTest;
import org.jboss.ide.eclipse.archives.test.projects.JBIDE2099Test;
import org.jboss.ide.eclipse.archives.test.projects.JBIDE2311Test;
+import org.jboss.ide.eclipse.archives.test.projects.JBIDE2315Test;
import org.jboss.ide.eclipse.archives.test.util.TruezipUtilTest;
public class ArchivesTestSuite extends TestSuite {
@@ -27,6 +28,7 @@
// jiras
suite.addTestSuite(JBIDE2099Test.class);
suite.addTestSuite(JBIDE2311Test.class);
+ suite.addTestSuite(JBIDE2315Test.class);
return suite;
}
Added: branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java
===================================================================
--- branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java (rev 0)
+++ branches/jbosstools-2.1.x/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java 2008-06-10 18:42:17 UTC (rev 8692)
@@ -0,0 +1,37 @@
+package org.jboss.ide.eclipse.archives.test.projects;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate;
+import org.jboss.ide.eclipse.archives.test.ArchivesTest;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+
+public class JBIDE2315Test extends TestCase {
+ private TestProjectProvider provider;
+ private IProject project;
+
+ protected void setUp() throws Exception {
+ provider = new TestProjectProvider(ArchivesTest.PLUGIN_ID,
+ "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2315",
+ null, true);
+ project = provider.getProject();
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ }
+
+ protected void tearDown() throws Exception {
+ provider.dispose();
+ }
+
+ public void testJBIDE2311() {
+ ArchiveBuildDelegate delegate = new ArchiveBuildDelegate();
+ try {
+ delegate.fullProjectBuild(project.getLocation());
+ } catch( RuntimeException re ) {
+ fail(re.getMessage());
+ }
+ }
+}
17 years, 10 months
JBoss Tools SVN: r8691 - trunk/ws/features/org.jboss.tools.ws.feature.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-06-10 13:05:04 -0400 (Tue, 10 Jun 2008)
New Revision: 8691
Added:
trunk/ws/features/org.jboss.tools.ws.feature/.project
Log:
adding .project
Added: trunk/ws/features/org.jboss.tools.ws.feature/.project
===================================================================
--- trunk/ws/features/org.jboss.tools.ws.feature/.project (rev 0)
+++ trunk/ws/features/org.jboss.tools.ws.feature/.project 2008-06-10 17:05:04 UTC (rev 8691)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.ws.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/ws/features/org.jboss.tools.ws.feature/.project
___________________________________________________________________
Name: svn:executable
+ *
17 years, 10 months
JBoss Tools SVN: r8690 - in trunk/ws/features: org.jboss.tools.ws.feature and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-06-10 13:04:29 -0400 (Tue, 10 Jun 2008)
New Revision: 8690
Added:
trunk/ws/features/org.jboss.tools.ws.feature/
trunk/ws/features/org.jboss.tools.ws.feature/build.properties
trunk/ws/features/org.jboss.tools.ws.feature/feature.xml
Log:
[JBIDE-2301] adding feature for JBossWS tools
Added: trunk/ws/features/org.jboss.tools.ws.feature/build.properties
===================================================================
--- trunk/ws/features/org.jboss.tools.ws.feature/build.properties (rev 0)
+++ trunk/ws/features/org.jboss.tools.ws.feature/build.properties 2008-06-10 17:04:29 UTC (rev 8690)
@@ -0,0 +1 @@
+bin.includes = feature.xml
Property changes on: trunk/ws/features/org.jboss.tools.ws.feature/build.properties
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/ws/features/org.jboss.tools.ws.feature/feature.xml
===================================================================
--- trunk/ws/features/org.jboss.tools.ws.feature/feature.xml (rev 0)
+++ trunk/ws/features/org.jboss.tools.ws.feature/feature.xml 2008-06-10 17:04:29 UTC (rev 8690)
@@ -0,0 +1,456 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.ws.feature"
+ label="WebServices Tools Feature"
+ version="1.0.0"
+ provider-name="JBoss, a division of Red Hat">
+
+ <description url="http://www.jboss.org/tools">
+ JBoss WebServices Tools
+ </description>
+
+ <copyright>
+ JBoss, Home of Professional Open Source
+Copyright 2006, JBoss Inc., and individual contributors as indicated
+by the @authors tag. See the copyright.txt in the distribution
+for a full listing of individual contributors.
+ </copyright>
+
+ <license url="http://osdn.dl.sourceforge.net/sourceforge/jboss/LGPL.html">
+ JBossTools is under the LGPL Licence
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 2.1, February 1999
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+[This is the first released version of the Lesser GPL. It also
+counts
+as the successor of the GNU Library Public License, version 2,
+hence
+the version number 2.1.]
+Preamble
+The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General
+Public Licenses are intended to guarantee your freedom to share
+and change free software--to make sure the software is free for
+all its users.
+This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of
+the Free Software Foundation and other authors who decide to
+use it. You can use it too, but we suggest you first think carefully
+about whether this license or the ordinary General Public License
+is the better strategy to use in any particular case, based on
+the explanations below.
+When we speak of free software, we are referring to freedom of
+use, not price. Our General Public Licenses are designed to make
+sure that you have the freedom to distribute copies of free software
+(and charge for this service if you wish); that you receive source
+code or can get it if you want it; that you can change the software
+and use pieces of it in new free programs; and that you are informed
+that you can do these things.
+To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender
+these rights. These restrictions translate to certain responsibilities
+for you if you distribute copies of the library or if you modify
+it.
+For example, if you distribute copies of the library, whether
+gratis or for a fee, you must give the recipients all the rights
+that we gave you. You must make sure that they, too, receive
+or can get the source code. If you link other code with the library,
+you must provide complete object files to the recipients, so
+that they can relink them with the library after making changes
+to the library and recompiling it. And you must show them these
+terms so they know their rights.
+We protect your rights with a two-step method: (1) we copyright
+the library, and (2) we offer you this license, which gives you
+legal permission to copy, distribute and/or modify the library.
+To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library
+is modified by someone else and passed on, the recipients should
+know that what they have is not the original version, so that
+the original author's reputation will not be affected by problems
+that might be introduced by others.
+Finally, software patents pose a constant threat to the existence
+of any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining
+a restrictive license from a patent holder. Therefore, we insist
+that any patent license obtained for a version of the library
+must be consistent with the full freedom of use specified in
+this license.
+Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries,
+and is quite different from the ordinary General Public License.
+We use this license for certain libraries in order to permit
+linking those libraries into non-free programs.
+When a program is linked with a library, whether statically or
+using a shared library, the combination of the two is legally
+speaking a combined work, a derivative of the original library.
+The ordinary General Public License therefore permits such linking
+only if the entire combination fits its criteria of freedom.
+The Lesser General Public License permits more lax criteria for
+linking other code with the library.
+We call this license the "Lesser" General Public License because
+it does Less to protect the user's freedom than the ordinary
+General Public License. It also provides other free software
+developers Less of an advantage over competing non-free programs.
+These disadvantages are the reason we use the ordinary General
+Public License for many libraries. However, the Lesser license
+provides advantages in certain special circumstances.
+For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that
+it becomes a de-facto standard. To achieve this, non-free programs
+must be allowed to use the library. A more frequent case is that
+a free library does the same job as widely used non-free libraries.
+In this case, there is little to gain by limiting the free library
+to free software only, so we use the Lesser General Public License.
+In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body
+of free software. For example, permission to use the GNU C Library
+in non-free programs enables many more people to use the whole
+GNU operating system, as well as its variant, the GNU/Linux operating
+system.
+Although the Lesser General Public License is Less protective
+of the users' freedom, it does ensure that the user of a program
+that is linked with the Library has the freedom and the wherewithal
+to run that program using a modified version of the Library.
+The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between
+a "work based on the library" and a "work that uses the library".
+The former contains code derived from the library, whereas the
+latter must be combined with the library in order to run.
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+0. This License Agreement applies to any software library or
+other program which contains a notice placed by the copyright
+holder or other authorized party saying it may be distributed
+under the terms of this Lesser General Public License (also called
+"this License"). Each licensee is addressed as "you".
+A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+The "Library", below, refers to any such software library or
+work which has been distributed under these terms. A "work based
+on the Library" means either the Library or any derivative work
+under copyright law: that is to say, a work containing the Library
+or a portion of it, either verbatim or with modifications and/or
+translated straightforwardly into another language. (Hereinafter,
+translation is included without limitation in the term "modification".)
+"Source code" for a work means the preferred form of the work
+for making modifications to it. For a library, complete source
+code means all the source code for all modules it contains, plus
+any associated interface definition files, plus the scripts used
+to control compilation and installation of the library.
+Activities other than copying, distribution and modification
+are not covered by this License; they are outside its scope.
+The act of running a program using the Library is not restricted,
+and output from such a program is covered only if its contents
+constitute a work based on the Library (independent of the use
+of the Library in a tool for writing it). Whether that is true
+depends on what the Library does and what the program that uses
+the Library does.
+1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided
+that you conspicuously and appropriately publish on each copy
+an appropriate copyright notice and disclaimer of warranty; keep
+intact all the notices that refer to this License and to the
+absence of any warranty; and distribute a copy of this License
+along with the Library.
+You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange
+for a fee.
+2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section
+1 above, provided that you also meet all of these conditions:
+a) The modified work must itself be a software library.
+b) You must cause the files modified to carry prominent notices
+stating that you changed the files and the date of any change.
+c) You must cause the whole of the work to be licensed at no
+charge to all third parties under the terms of this License.
+d) If a facility in the modified Library refers to a function
+or a table of data to be supplied by an application program that
+uses the facility, other than as an argument passed when the
+facility is invoked, then you must make a good faith effort to
+ensure that, in the event an application does not supply such
+function or table, the facility still operates, and performs
+whatever part of its purpose remains meaningful.
+(For example, a function in a library to compute square roots
+has a purpose that is entirely well-defined independent of the
+application. Therefore, Subsection 2d requires that any application-supplied
+function or table used by this function must be optional: if
+the application does not supply it, the square root function
+must still compute square roots.)
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works
+in themselves, then this License, and its terms, do not apply
+to those sections when you distribute them as separate works.
+But when you distribute the same sections as part of a whole
+which is a work based on the Library, the distribution of the
+whole must be on the terms of this License, whose permissions
+for other licensees extend to the entire whole, and thus to each
+and every part regardless of who wrote it.
+Thus, it is not the intent of this section to claim rights or
+contest your rights to work written entirely by you; rather,
+the intent is to exercise the right to control the distribution
+of derivative or collective works based on the Library.
+In addition, mere aggregation of another work not based on the
+Library with the Library (or with a work based on the Library)
+on a volume of a storage or distribution medium does not bring
+the other work under the scope of this License.
+3. You may opt to apply the terms of the ordinary GNU General
+Public License instead of this License to a given copy of the
+Library. To do this, you must alter all the notices that refer
+to this License, so that they refer to the ordinary GNU General
+Public License, version 2, instead of to this License. (If a
+newer version than version 2 of the ordinary GNU General Public
+License has appeared, then you can specify that version instead
+if you wish.) Do not make any other change in these notices.
+Once this change is made in a given copy, it is irreversible
+for that copy, so the ordinary GNU General Public License applies
+to all subsequent copies and derivative works made from that
+copy.
+This option is useful when you wish to copy part of the code
+of the Library into a program that is not a library.
+4. You may copy and distribute the Library (or a portion or derivative
+of it, under Section 2) in object code or executable form under
+the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code,
+which must be distributed under the terms of Sections 1 and 2
+above on a medium customarily used for software interchange.
+If distribution of object code is made by offering access to
+copy from a designated place, then offering equivalent access
+to copy the source code from the same place satisfies the requirement
+to distribute the source code, even though third parties are
+not compelled to copy the source along with the object code.
+5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled
+or linked with it, is called a "work that uses the Library".
+Such a work, in isolation, is not a derivative work of the Library,
+and therefore falls outside the scope of this License.
+However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because
+it contains portions of the Library), rather than a "work that
+uses the library". The executable is therefore covered by this
+License. Section 6 states terms for distribution of such executables.
+When a "work that uses the Library" uses material from a header
+file that is part of the Library, the object code for the work
+may be a derivative work of the Library even though the source
+code is not. Whether this is true is especially significant if
+the work can be linked without the Library, or if the work is
+itself a library. The threshold for this to be true is not precisely
+defined by law.
+If such an object file uses only numerical parameters, data structure
+layouts and accessors, and small macros and small inline functions
+(ten lines or less in length), then the use of the object file
+is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions
+of the Library will still fall under Section 6.)
+Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section
+6. Any executables containing that work also fall under Section
+6, whether or not they are linked directly with the Library itself.
+6. As an exception to the Sections above, you may also combine
+or link a "work that uses the Library" with the Library to produce
+a work containing portions of the Library, and distribute that
+work under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+You must give prominent notice with each copy of the work that
+the Library is used in it and that the Library and its use are
+covered by this License. You must supply a copy of this License.
+If the work during execution displays copyright notices, you
+must include the copyright notice for the Library among them,
+as well as a reference directing the user to the copy of this
+License. Also, you must do one of these things:
+a) Accompany the work with the complete corresponding machine-readable
+source code for the Library including whatever changes were used
+in the work (which must be distributed under Sections 1 and 2
+above); and, if the work is an executable linked with the Library,
+with the complete machine-readable "work that uses the Library",
+as object code and/or source code, so that the user can modify
+the Library and then relink to produce a modified executable
+containing the modified Library. (It is understood that the user
+who changes the contents of definitions files in the Library
+will not necessarily be able to recompile the application to
+use the modified definitions.)
+b) Use a suitable shared library mechanism for linking with the
+Library. A suitable mechanism is one that (1) uses at run time
+a copy of the library already present on the user's computer
+system, rather than copying library functions into the executable,
+and (2) will operate properly with a modified version of the
+library, if the user installs one, as long as the modified version
+is interface-compatible with the version that the work was made
+with.
+c) Accompany the work with a written offer, valid for at least
+three years, to give the same user the materials specified in
+Subsection 6a, above, for a charge no more than the cost of performing
+this distribution.
+d) If distribution of the work is made by offering access to
+copy from a designated place, offer equivalent access to copy
+the above specified materials from the same place.
+e) Verify that the user has already received a copy of these
+materials or that you have already sent this user a copy.
+For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that
+is normally distributed (in either source or binary form) with
+the major components (compiler, kernel, and so on) of the operating
+system on which the executable runs, unless that component itself
+accompanies the executable.
+It may happen that this requirement contradicts the license restrictions
+of other proprietary libraries that do not normally accompany
+the operating system. Such a contradiction means you cannot use
+both them and the Library together in an executable that you
+distribute.
+7. You may place library facilities that are a work based on
+the Library side-by-side in a single library together with other
+library facilities not covered by this License, and distribute
+such a combined library, provided that the separate distribution
+of the work based on the Library and of the other library facilities
+is otherwise permitted, and provided that you do these two things:
+a) Accompany the combined library with a copy of the same work
+based on the Library, uncombined with any other library facilities.
+This must be distributed under the terms of the Sections above.
+b) Give prominent notice with the combined library of the fact
+that part of it is a work based on the Library, and explaining
+where to find the accompanying uncombined form of the same work.
+8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.
+Any attempt otherwise to copy, modify, sublicense, link with,
+or distribute the Library is void, and will automatically terminate
+your rights under this License. However, parties who have received
+copies, or rights, from you under this License will not have
+their licenses terminated so long as such parties remain in full
+compliance.
+9. You are not required to accept this License, since you have
+not signed it. However, nothing else grants you permission to
+modify or distribute the Library or its derivative works. These
+actions are prohibited by law if you do not accept this License.
+Therefore, by modifying or distributing the Library (or any work
+based on the Library), you indicate your acceptance of this License
+to do so, and all its terms and conditions for copying, distributing
+or modifying the Library or works based on it.
+10. Each time you redistribute the Library (or any work based
+on the Library), the recipient automatically receives a license
+from the original licensor to copy, distribute, link with or
+modify the Library subject to these terms and conditions. You
+may not impose any further restrictions on the recipients' exercise
+of the rights granted herein. You are not responsible for enforcing
+compliance by third parties with this License.
+11. If, as a consequence of a court judgment or allegation of
+patent infringement or for any other reason (not limited to patent
+issues), conditions are imposed on you (whether by court order,
+agreement or otherwise) that contradict the conditions of this
+License, they do not excuse you from the conditions of this License.
+If you cannot distribute so as to satisfy simultaneously your
+obligations under this License and any other pertinent obligations,
+then as a consequence you may not distribute the Library at all.
+For example, if a patent license would not permit royalty-free
+redistribution of the Library by all those who receive copies
+directly or indirectly through you, then the only way you could
+satisfy both it and this License would be to refrain entirely
+from distribution of the Library.
+If any portion of this section is held invalid or unenforceable
+under any particular circumstance, the balance of the section
+is intended to apply, and the section as a whole is intended
+to apply in other circumstances.
+It is not the purpose of this section to induce you to infringe
+any patents or other property right claims or to contest validity
+of any such claims; this section has the sole purpose of protecting
+the integrity of the free software distribution system which
+is implemented by public license practices. Many people have
+made generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of
+that system; it is up to the author/donor to decide if he or
+she is willing to distribute software through any other system
+and a licensee cannot impose that choice.
+This section is intended to make thoroughly clear what is believed
+to be a consequence of the rest of this License.
+12. If the distribution and/or use of the Library is restricted
+in certain countries either by patents or by copyrighted interfaces,
+the original copyright holder who places the Library under this
+License may add an explicit geographical distribution limitation
+excluding those countries, so that distribution is permitted
+only in or among countries not thus excluded. In such case, this
+License incorporates the limitation as if written in the body
+of this License.
+13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+Each version is given a distinguishing version number. If the
+Library specifies a version number of this License which applies
+to it and "any later version", you have the option of following
+the terms and conditions either of that version or of any later
+version published by the Free Software Foundation. If the Library
+does not specify a license version number, you may choose any
+version ever published by the Free Software Foundation.
+14. If you wish to incorporate parts of the Library into other
+free programs whose distribution conditions are incompatible
+with these, write to the author to ask for permission. For software
+which is copyrighted by the Free Software Foundation, write to
+the Free Software Foundation; we sometimes make exceptions for
+this. Our decision will be guided by the two goals of preserving
+the free status of all derivatives of our free software and of
+promoting the sharing and reuse of software generally.
+NO WARRANTY
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS
+NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE
+LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
+AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR
+OR CORRECTION.
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO
+IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO
+MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE,
+BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS
+OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED
+BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE
+WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY
+HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+END OF TERMS AND CONDITIONS
+ </license>
+
+ <url>
+ <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/>
+ </url>
+
+ <plugin
+ id="org.jboss.tools.ws.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.ws.creation.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.ws.creation.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.ws.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Property changes on: trunk/ws/features/org.jboss.tools.ws.feature/feature.xml
___________________________________________________________________
Name: svn:executable
+ *
17 years, 10 months
JBoss Tools SVN: r8689 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-06-10 12:58:32 -0400 (Tue, 10 Jun 2008)
New Revision: 8689
Added:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDisposeException.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-675
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-06-10 16:22:52 UTC (rev 8688)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-06-10 16:58:32 UTC (rev 8689)
@@ -449,11 +449,11 @@
notifyChangedInUiThread(eventBean.getNotifier(), eventBean.getEventType(),
eventBean.getFeature(), eventBean.getOldValue(), eventBean.getNewValue(),
eventBean.getPos());
- } catch (NullPointerException ex) {
- //TODO Max Areshkau
- //JBIDE-675 find possability correctly resolve nulpointer
- //exception when we closse editor and job is executed
- VpePlugin.getPluginLog().logError(ex);
+ } catch (VpeDisposeException ex) {
+ //JBIDE-675 we will get this exception if user close editor,
+ //when update visual editor job is running, we shoud ignore this
+ //exception
+ break;
}
getChangeEvents().remove(eventBean);
}
@@ -588,10 +588,17 @@
}
break;
}
- } catch (Exception e) {
- VpePlugin.reportProblem(e);
- } finally {
- switcher.stopActiveEditor();
+ }
+ finally {
+ //fix for jbide-675, swithcer is null when vpecontroller is disposed
+
+ if(switcher!=null) {
+
+ switcher.stopActiveEditor();
+ } else {
+
+ throw new VpeDisposeException("VpeController already disposed");
+ }
}
}
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDisposeException.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDisposeException.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDisposeException.java 2008-06-10 16:58:32 UTC (rev 8689)
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * 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;
+
+/**
+ * This exception throws from vpe editor update job,
+ * when editor is disposed, but we trying to update preview
+ *
+ * Fix for JBIDE-675.
+ *
+ * @author mareshkau
+ */
+
+public class VpeDisposeException extends RuntimeException {
+
+ private static final long serialVersionUID = 2984302764077199215L;
+
+ public VpeDisposeException() {
+ super();
+ }
+
+ public VpeDisposeException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public VpeDisposeException(String message) {
+ super(message);
+ }
+
+ public VpeDisposeException(Throwable cause) {
+ super(cause);
+ }
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-06-10 16:22:52 UTC (rev 8688)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-06-10 16:58:32 UTC (rev 8689)
@@ -395,13 +395,20 @@
boolean registerFlag = isCurrentMainDocument();
//reads and dispatch events
+ //JBIDE-675, checks if editor was disposed or not
+ if(getPageContext().getSourceBuilder()==null ||includeDocuments==null) {
+
+ throw new VpeDisposeException();
+}
getPageContext().processDisplayEvents();
+
//check source node can be changed and link can be a null in this case
//we shouldn't process this node
if(sourceNode==null) {
return null;
}
+
switch (sourceNode.getNodeType()) {
case Node.ELEMENT_NODE:
// Map<?, ?> xmlnsMap = createXmlns((Element) sourceNode);
17 years, 10 months
JBoss Tools SVN: r8688 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-06-10 12:22:52 -0400 (Tue, 10 Jun 2008)
New Revision: 8688
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterSettingsTab.java
Log:
HBX-500 - add lost spaces
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterSettingsTab.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterSettingsTab.java 2008-06-10 15:54:48 UTC (rev 8687)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterSettingsTab.java 2008-06-10 16:22:52 UTC (rev 8688)
@@ -724,7 +724,7 @@
String str = (String) ef.getProperties().get("outputdir"); //$NON-NLS-1$
String msg = null;
if(str!=null) {
- msg = PathHelper.checkDirectory(str, HibernateConsoleMessages.ExporterSettingsTab_output_directory_for + ef.getExporterDefinition().getDescription(), false);
+ msg = PathHelper.checkDirectory(str, HibernateConsoleMessages.ExporterSettingsTab_output_directory_for + " " + ef.getExporterDefinition().getDescription(), false); //$NON-NLS-1$
if(msg!=null) {
updateStatus(msg);
return;
@@ -733,7 +733,7 @@
str = (String) ef.getProperties().get("template_path"); //$NON-NLS-1$
if(str!=null) {
- msg = PathHelper.checkDirectory(str, HibernateConsoleMessages.ExporterSettingsTab_template_directory_for + ef.getExporterDefinition().getDescription(), true);
+ msg = PathHelper.checkDirectory(str, HibernateConsoleMessages.ExporterSettingsTab_template_directory_for + " " + ef.getExporterDefinition().getDescription(), true); //$NON-NLS-1$
if(msg!=null) {
updateStatus(msg);
return;
17 years, 10 months
JBoss Tools SVN: r8687 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: resources/jsfTest/WebContent/pages/JBIDE/2170 and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-06-10 11:54:48 -0400 (Tue, 10 Jun 2008)
New Revision: 8687
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/template_doctype_test.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/templates/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/templates/common.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/there_is_doctype.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/there_is_not_doctype.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java
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-2170
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/template_doctype_test.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/template_doctype_test.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/template_doctype_test.xhtml 2008-06-10 15:54:48 UTC (rev 8687)
@@ -0,0 +1,26 @@
+<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:c="http://java.sun.com/jstl/core">
+
+ <f:loadBundle basename="resources" var="msg" />
+
+ <ui:composition template="templates/common.xhtml">
+
+ <ui:define name="pageTitle">Input User Name</ui:define>
+
+ <ui:define name="pageHeader">Facelets Hello Application</ui:define>
+
+ <ui:define name="body">
+ <h:message showSummary="true" showDetail="false" style="color: red; font-weight: bold;" for="name" />
+ <form jsfc="h:form" id="helloForm">
+ ${msg.prompt}
+ <input label="Name" jsfc="h:inputText" required="true" id="name" value="#{person.name}" />
+ <input type="submit" jsfc="h:commandButton" id="submit"
+ action="greeting" value="Say Hello" />
+ </form>
+
+ </ui:define>
+ </ui:composition>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/templates/common.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/templates/common.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/templates/common.xhtml 2008-06-10 15:54:48 UTC (rev 8687)
@@ -0,0 +1,65 @@
+<!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">
+
+ <f:loadBundle basename="resources" var="msg" />
+ <head>
+ <title><ui:insert name="pageTitle">Page Title</ui:insert></title>
+ <style type="text/css">
+ body {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 14px;
+ }
+ .header {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 18px;
+ }
+ .bottom {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 9px;
+ text-align: center;
+ vertical-align: middle;
+ color: #8E969D;
+ }
+ </style>
+ </head>
+
+<body bgcolor="#ffffff">
+<table style="border:1px solid #CAD6E0" align="center" cellpadding="0" cellspacing="0" border="0" width="400">
+<tbody>
+
+ <tr>
+ <td class="header" height="42" align="center" valign="middle" width="100%" bgcolor="#E4EBEB">
+ <ui:insert name="pageHeader">Page Header</ui:insert>
+ </td>
+ </tr>
+ <tr>
+ <td height="1" width="100%" bgcolor="#CAD6E0"></td>
+ </tr>
+
+ <tr>
+ <td width="100%" colspan="2">
+ <table width="100%" style="height:150px" align="left" cellpadding="0" cellspacing="0" border="0">
+ <tbody>
+ <tr>
+ <td align="center" width="100%" valign="middle">
+
+ <ui:insert name="body">Page Body</ui:insert>
+
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2" valign="bottom" height="1" width="100%" bgcolor="#CAD6E0"></td>
+ </tr>
+</tbody>
+</table>
+</body>
+
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/there_is_doctype.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/there_is_doctype.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/there_is_doctype.xhtml 2008-06-10 15:54:48 UTC (rev 8687)
@@ -0,0 +1,74 @@
+<!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">
+
+<f:loadBundle basename="resources" var="msg" />
+<head>
+<title><ui:insert name="pageTitle">Page Title</ui:insert></title>
+<style type="text/css">
+body {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 14px;
+}
+
+.header {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 18px;
+}
+
+.bottom {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 9px;
+ text-align: center;
+ vertical-align: middle;
+ color: #8E969D;
+}
+</style>
+</head>
+
+<body bgcolor="#ffffff">
+<table style="border: 1px solid #CAD6E0" align="center" cellpadding="0"
+ cellspacing="0" border="0" width="400">
+ <tbody>
+
+ <tr>
+ <td class="header" height="42" align="center" valign="middle"
+ width="100%" bgcolor="#E4EBEB">Facelets Hello Application</td>
+ </tr>
+ <tr>
+ <td height="1" width="100%" bgcolor="#CAD6E0"></td>
+ </tr>
+
+ <tr>
+ <td width="100%" colspan="2">
+ <table width="100%" style="height: 150px" align="left"
+ cellpadding="0" cellspacing="0" border="0">
+ <tbody>
+ <tr>
+ <td align="center" width="100%" valign="middle"><h:message
+ showSummary="true" showDetail="false"
+ style="color: red; font-weight: bold;" for="name" />
+ <form jsfc="h:form" id="helloForm">${msg.prompt} <input
+ label="Name" jsfc="h:inputText" required="true" id="name"
+ value="#{person.name}" /> <input type="submit"
+ jsfc="h:commandButton" id="submit" action="greeting"
+ value="Say Hello" /></form>
+
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2" valign="bottom" height="1" width="100%"
+ bgcolor="#CAD6E0"></td>
+ </tr>
+ </tbody>
+</table>
+</body>
+
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/there_is_not_doctype.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/there_is_not_doctype.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2170/there_is_not_doctype.xhtml 2008-06-10 15:54:48 UTC (rev 8687)
@@ -0,0 +1,73 @@
+<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">
+
+<f:loadBundle basename="resources" var="msg" />
+<head>
+<title><ui:insert name="pageTitle">Page Title</ui:insert></title>
+<style type="text/css">
+body {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 14px;
+}
+
+.header {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 18px;
+}
+
+.bottom {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 9px;
+ text-align: center;
+ vertical-align: middle;
+ color: #8E969D;
+}
+</style>
+</head>
+
+<body bgcolor="#ffffff">
+<table style="border: 1px solid #CAD6E0" align="center" cellpadding="0"
+ cellspacing="0" border="0" width="400">
+ <tbody>
+
+ <tr>
+ <td class="header" height="42" align="center" valign="middle"
+ width="100%" bgcolor="#E4EBEB">Facelets Hello Application</td>
+ </tr>
+ <tr>
+ <td height="1" width="100%" bgcolor="#CAD6E0"></td>
+ </tr>
+
+ <tr>
+ <td width="100%" colspan="2">
+ <table width="100%" style="height: 150px" align="left"
+ cellpadding="0" cellspacing="0" border="0">
+ <tbody>
+ <tr>
+ <td align="center" width="100%" valign="middle"><h:message
+ showSummary="true" showDetail="false"
+ style="color: red; font-weight: bold;" for="name" />
+ <form jsfc="h:form" id="helloForm">${msg.prompt} <input
+ label="Name" jsfc="h:inputText" required="true" id="name"
+ value="#{person.name}" /> <input type="submit"
+ jsfc="h:commandButton" id="submit" action="greeting"
+ value="Say Hello" /></form>
+
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2" valign="bottom" height="1" width="100%"
+ bgcolor="#CAD6E0"></td>
+ </tr>
+ </tbody>
+</table>
+</body>
+
+</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-06-10 15:52:48 UTC (rev 8686)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-06-10 15:54:48 UTC (rev 8687)
@@ -32,6 +32,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1501Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1568Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1718Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2170Test;
import org.jboss.tools.jsf.vpe.jsf.test.perfomance.PerfomanceTest;
import org.jboss.tools.vpe.ui.test.VpeTestSetup;
import org.jboss.tools.vpe.ui.test.beans.ImportBean;
@@ -66,6 +67,7 @@
suite.addTestSuite(JBIDE1730Test.class);
suite.addTestSuite(JBIDE1494Test.class);
suite.addTestSuite(JBIDE2297Test.class);
+ suite.addTestSuite(JsfJbide2170Test.class);
// $JUnit-END$
// added by Max Areshkau
// add here projects which should be imported for junit tests
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java 2008-06-10 15:54:48 UTC (rev 8687)
@@ -0,0 +1,180 @@
+/*******************************************************************************
+ * 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 org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.util.DocTypeUtil;
+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.nsIDOMDocumentType;
+
+/**
+ *
+ * @author sdzmitrovich
+ *
+ * test for http://jira.jboss.com/jira/browse/JBIDE-1718
+ *
+ */
+public class JsfJbide2170Test extends VpeTest {
+
+ public static final String IMPORT_PROJECT_NAME = "jsfTest";
+
+ private static final String WITHOUT_DOCTYPE_TEST_PAGE_NAME = "JBIDE/2170/there_is_not_doctype.xhtml";
+
+ private static final String WITH_DOCTYPE_TEST_PAGE_NAME = "JBIDE/2170/there_is_doctype.xhtml";
+
+ private static final String TEMPLATE_DOCTYPE_TEST_PAGE_NAME = "JBIDE/2170/template_doctype_test.xhtml";
+
+ public JsfJbide2170Test(String name) {
+ super(name);
+ }
+
+ /**
+ *
+ * @throws Throwable
+ */
+ public void testWithoutDoctypePage() throws Throwable {
+
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath(
+ WITHOUT_DOCTYPE_TEST_PAGE_NAME, IMPORT_PROJECT_NAME);
+
+ IEditorInput input = new FileEditorInput(file);
+
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ // get doctype from opened page
+ String basicDoctypeString = DocTypeUtil.getDoctype(input);
+
+ // doctype must be not null
+ assertNotNull(basicDoctypeString);
+
+ // length of doctype must be 0
+ assertEquals(0, basicDoctypeString.length());
+
+ // get dom document from vpe
+ nsIDOMDocument document = getVpeVisualDocument(part);
+ assertNotNull(document);
+
+ // get doctype from vpe's dom model
+ nsIDOMDocumentType vpeDocumentType = document.getDoctype();
+
+ // doctype must be null
+ assertNull(vpeDocumentType);
+
+ // check exception
+ if (getException() != null) {
+ throw getException();
+ }
+
+ }
+
+ /**
+ *
+ * @throws Throwable
+ */
+ public void testWithDoctypePage() throws Throwable {
+
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath(
+ WITH_DOCTYPE_TEST_PAGE_NAME, IMPORT_PROJECT_NAME);
+
+ IEditorInput input = new FileEditorInput(file);
+
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ // get doctype from opened page
+ String basicDoctypeString = DocTypeUtil.getDoctype(input);
+
+ // doctype must be not null
+ assertNotNull(basicDoctypeString);
+ // length of doctype must be more than 0
+ assertEquals(true, basicDoctypeString.length() > 0);
+
+ // get dom document
+ nsIDOMDocument document = getVpeVisualDocument(part);
+ assertNotNull(document);
+
+ // get doctype
+ nsIDOMDocumentType vpeDocumentType = document.getDoctype();
+
+ // doctype must be not null
+ assertNotNull(vpeDocumentType);
+
+ // check exception
+ if (getException() != null) {
+ throw getException();
+ }
+
+ }
+
+ /**
+ *
+ * @throws Throwable
+ */
+ public void testTemplateDoctypePage() throws Throwable {
+
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath(
+ TEMPLATE_DOCTYPE_TEST_PAGE_NAME, IMPORT_PROJECT_NAME);
+
+ IEditorInput input = new FileEditorInput(file);
+
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ // get doctype from opened page
+ String basicDoctypeString = DocTypeUtil.getDoctype(input);
+
+ // doctype must be not null
+ assertNotNull(basicDoctypeString);
+ // length of doctype must be more than 0
+ assertEquals(true, basicDoctypeString.length() > 0);
+
+ // get dom document
+ nsIDOMDocument document = getVpeVisualDocument(part);
+ assertNotNull(document);
+
+ // get doctype
+ nsIDOMDocumentType vpeDocumentType = document.getDoctype();
+
+ // doctype must be not null
+ assertNotNull(vpeDocumentType);
+
+ // check exception
+ if (getException() != null) {
+ throw getException();
+ }
+
+ }
+}
17 years, 10 months
JBoss Tools SVN: r8686 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-06-10 11:52:48 -0400 (Tue, 10 Jun 2008)
New Revision: 8686
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
Log:
Fix bug in JBIDE1713Test.java
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-06-10 15:48:35 UTC (rev 8685)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-06-10 15:52:48 UTC (rev 8686)
@@ -46,23 +46,17 @@
public class ComponentUtil {
- /**
- *
- */
+ /** The Constant EMPTY_SELECT_ITEM_VALUE. */
private static final String EMPTY_SELECT_ITEM_VALUE = "<f:selectItem/>";
- /**
- *
- */
+ /** The Constant EMPTY_SELECT_ITEMS_VALUE. */
private static final String EMPTY_SELECT_ITEMS_VALUE = "<f:selectItems/>";
- /**
- *
- */
+ /** The Constant SELECT_ITEMS. */
private static final String SELECT_ITEMS = "selectItems";
/** The Constant PX_SUFFIX. */
- private static final String PX_SUFFIX = "px";
+ public static final String PX_SUFFIX = "px";
/** The Constant SELECT_ITEM. */
private static final String SELECT_ITEM = "selectItem";
@@ -218,8 +212,8 @@
/**
* Returns all child source elements of component but facets.
*
- * @param sourceElement the source element
* @param returnTextNodes return child text nodes and elements or elements only;
+ * @param sourceElement the source element
*
* @return the children
*/
@@ -379,8 +373,8 @@
/**
* Returns value of attribute.
*
- * @param sourceElement the source element
* @param attributeName the attribute name
+ * @param sourceElement the source element
*
* @return the attribute
*/
@@ -395,8 +389,8 @@
/**
* Returns value of attribute.
*
- * @param sourceElement the source element
* @param attributeName the attribute name
+ * @param sourceElement the source element
*
* @return the attribute
*/
@@ -529,8 +523,8 @@
* @param sourceNode the source node
* @param htmlAttrName the html attr name
* @param defValue the def value
- * @param attrName the attr name
* @param prefValue the pref value
+ * @param attrName the attr name
*/
public static void correctAttribute(Element sourceNode, nsIDOMElement visualNode, String attrName, String htmlAttrName,
String prefValue, String defValue) {
@@ -706,8 +700,11 @@
}
/**
- * @param e
- * @return
+ * Gets the select item value.
+ *
+ * @param e the e
+ *
+ * @return the select item value
*/
public static String getSelectItemValue(Element e) {
String value = e.getAttribute(RichFaces.ATTR_SELECT_ITEM_LABEL);
17 years, 10 months
JBoss Tools SVN: r8685 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-06-10 11:48:35 -0400 (Tue, 10 Jun 2008)
New Revision: 8685
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
Log:
Add dir="{@dir}"
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-06-10 15:46:31 UTC (rev 8684)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-06-10 15:48:35 UTC (rev 8685)
@@ -279,6 +279,7 @@
<vpe:template children="yes" modify="yes">
<vpe:a class="{@styleClass}"
style="{@style}"
+ dir="{@dir}"
title="{tagstring()}"/>
<vpe:textFormatting use-default-formats="yes">
<vpe:format type="UnderlineFormat" setDefault="true">
17 years, 10 months
JBoss Tools SVN: r8684 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-06-10 11:46:31 -0400 (Tue, 10 Jun 2008)
New Revision: 8684
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelBarTemplate.java
Log:
Fix junit JBIDE-1713 and fix bug with pixels.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelBarTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelBarTemplate.java 2008-06-10 15:45:43 UTC (rev 8683)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelBarTemplate.java 2008-06-10 15:46:31 UTC (rev 8684)
@@ -113,13 +113,15 @@
* @return
*/
private String height(Element sourceElement) {
- String height = sourceElement
- .getAttribute(HtmlComponentUtil.HTML_HEIGHT_ATTR);
- if (height == null || height.length() == 0) {
+ String height = sourceElement.getAttribute(HtmlComponentUtil.HTML_HEIGHT_ATTR);
+ if (height == null || height.length() == 0) {
- height = PERCENT_100;
- }
- return "height: " + height + SEMI_COLON; //$NON-NLS-1$
+ height = PERCENT_100;
+ }
+ // added by estherbin fix not worked junit JBIDE1713Test
+ final Integer iHeight = ComponentUtil.parseWidthHeightValue(height);
+
+ return "height: " + String.valueOf(iHeight) + ComponentUtil.PX_SUFFIX + SEMI_COLON; //$NON-NLS-1$
}
/**
@@ -128,12 +130,14 @@
* @return
*/
public String width(Element sourceElement) {
- String width = sourceElement
- .getAttribute(HtmlComponentUtil.HTML_ATR_WIDTH);
- if (width == null || width.length() == 0) {
- width = PERCENT_100;
- }
- return "width: " + width + SEMI_COLON; //$NON-NLS-1$
+ String width = sourceElement.getAttribute(HtmlComponentUtil.HTML_ATR_WIDTH);
+ if (width == null || width.length() == 0) {
+ width = PERCENT_100;
+ }
+ // added by estherbin fix not worked junit JBIDE1713Test
+ final Integer iWidth = ComponentUtil.parseWidthHeightValue(width);
+
+ return "width: " + String.valueOf(iWidth) + ComponentUtil.PX_SUFFIX + SEMI_COLON; //$NON-NLS-1$
}
/**
17 years, 10 months