Author: dmaliarevich Date: 2010-11-25 10:34:08 -0500 (Thu, 25 Nov 2010) New Revision: 26939 Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.classpath trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.project trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/.jsdtscope trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.jdt.core.prefs trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.component trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/demo/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/demo/Person.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/resources.properties trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/META-INF/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/demo/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/demo/Person.class trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/resources.properties trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/faces-config.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/common-annotations.jar trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-beanutils.jar trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-collections.jar trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-digester.jar trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-logging.jar trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jsf-facelets.jar trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jsf-tlds.jar trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jstl.jar trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/primefaces-2.0.0.RC.jar trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/standard.jar trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/web.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/index.jsp trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/greeting.xhtml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/inputname.xhtml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/templates/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/templates/common.xhtml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.properties trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.xml Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TaglibXMLUnformatedDTD_JBIDE5642.java Log: https://jira.jboss.org/browse/JBIDE-7704 , Test project for TaglibXMLUnformatedDTD_JBIDE5642 was added. Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.classpath (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.classpath 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="JavaSource"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"> + <attributes> + <attribute name="owner.project.facets" value="jst.web;jst.jsf"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_20"> + <attributes> + <attribute name="owner.project.facets" value="java"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.project (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.project 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>ShowJarLibrariesTest</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + <nature>org.jboss.tools.jsf.jsfnature</nature> + </natures> +</projectDescription> Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/.jsdtscope =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/.jsdtscope (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/.jsdtscope 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="WebContent"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.jdt.core.prefs 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,8 @@ +#Thu Nov 25 16:57:00 GMT+02:00 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.component 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="ShowJarLibrariesTest"> + <wb-resource deploy-path="/" source-path="/WebContent"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> + <property name="context-root" value="ShowJarLibrariesTest"/> + <property name="java-output-path" value="/ShowJarLibrariesTest/WebContent/WEB-INF/classes"/> + </wb-module> +</project-modules> Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,7 @@ +<root> + <facet id="jst.jsf"> + <node name="libprov"> + <attribute name="provider-id" value="jsf-user-library-provider"/> + </node> + </facet> +</root> Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 4.2 Runtime"/> + <fixed facet="wst.jsdt.web"/> + <fixed facet="jst.web"/> + <fixed facet="java"/> + <fixed facet="jst.jsf"/> + <installed facet="java" version="1.6"/> + <installed facet="jst.web" version="2.5"/> + <installed facet="jst.jsf" version="1.2"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.container 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.name 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/demo/Person.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/demo/Person.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/demo/Person.java 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package demo; + +/** + * Created by JBoss Tools + */ +public class Person { + private String name; + + public Person() { + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/resources.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/resources.properties (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/resources.properties 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,2 @@ +prompt=Your Name\: +greeting=Hello Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/META-INF/MANIFEST.MF 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/demo/Person.class =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/demo/Person.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/resources.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/resources.properties (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/resources.properties 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,2 @@ +prompt=Your Name\: +greeting=Hello Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/faces-config.xml 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + <managed-bean> + <managed-bean-name>person</managed-bean-name> + <managed-bean-class>demo.Person</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>name</property-name> + <value/> + </managed-property> + </managed-bean> + <navigation-rule> + <from-view-id>/pages/inputname.xhtml</from-view-id> + <navigation-case> + <from-outcome>greeting</from-outcome> + <to-view-id>/pages/greeting.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + <locale-config/> + </application> + <factory/> + <lifecycle/> +</faces-config> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/common-annotations.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/common-annotations.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-beanutils.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-beanutils.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-collections.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-collections.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-digester.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-digester.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-logging.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jsf-facelets.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jsf-facelets.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jsf-tlds.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jsf-tlds.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jstl.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jstl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/primefaces-2.0.0.RC.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/primefaces-2.0.0.RC.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/standard.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/standard.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/web.xml 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,39 @@ +<?xml version="1.0"?> +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <description>Facelets StarterKit</description> + <display-name>ShowJarLibrariesTest</display-name> + <context-param> + <param-name>com.sun.faces.validateXml</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.verifyObjects</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>facelets.REFRESH_PERIOD</param-name> + <param-value>2</param-value> + </context-param> + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>client</param-value> + </context-param> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> +</web-app> Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/index.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/index.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/index.jsp 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,7 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> +<html> +<head></head> + <body> + <jsp:forward page="pages/inputname.jsf" /> + </body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/greeting.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/greeting.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/greeting.xhtml 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,15 @@ +<!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" /> + <ui:composition template="/templates/common.xhtml"> + <ui:define name="pageTitle">Greeting to User</ui:define> + <ui:define name="pageHeader">Greeting Page</ui:define> + <ui:define name="body"> + #{msg.greeting} #{person.name}! + </ui:define> + </ui:composition> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/inputname.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/inputname.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/inputname.xhtml 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,27 @@ +<!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: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.ui.test/projects/ShowJarLibrariesTest/WebContent/templates/common.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/templates/common.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/templates/common.xhtml 2010-11-25 15:34:08 UTC (rev 26939) @@ -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.ui.test/projects/ShowJarLibrariesTest/ant/build.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.properties (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.properties 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,3 @@ +# +#Thu Nov 25 16:56:58 GMT+02:00 2010 +classpath.external= Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.xml 2010-11-25 15:34:08 UTC (rev 26939) @@ -0,0 +1,87 @@ +<project name="ShowJarLibrariesTest" basedir="../" default="deploy"> + + <!-- Project settings --> + <property name="project.distname" value="ShowJarLibrariesTest"/> + + <!-- Local system paths --> + <property file="${basedir}/ant/build.properties"/> + <property name="webroot.dir" value="${basedir}/WebContent"/> + <property name="webinf.dir" value="${webroot.dir}/WEB-INF"/> + <property name="build.dir" value="build"/> + + + <!-- classpath for JSF 1.0 --> + <path id="compile.classpath"> + <pathelement path ="${webinf.dir}/lib/commons-beanutils.jar"/> + <pathelement path ="${webinf.dir}/lib/commons-collections.jar"/> + <pathelement path ="${webinf.dir}/lib/commons-digester.jar"/> + <pathelement path ="${webinf.dir}/lib/commons-logging.jar"/> + <pathelement path ="${webinf.dir}/lib/jsf-api.jar"/> + <pathelement path ="${webinf.dir}/lib/jsf-impl.jar"/> + <pathelement path ="${webinf.dir}/lib/jstl.jar"/> + <pathelement path ="${webinf.dir}/lib/standard.jar"/> + <pathelement path ="${webinf.dir}/classes"/> + <pathelement path ="${classpath.external}"/> + <pathelement path ="${classpath}"/> + </path> + + <!-- define your folder for deployment --> + <property name="deploy.dir" value="deploy"/> + + <!-- Check timestamp on files --> + <target name="prepare"> + <tstamp/> + </target> + + <!-- Copy any resource or configuration files --> + <target name="resources"> + <copy todir="${webinf.dir}/classes" includeEmptyDirs="no"> + <fileset dir="JavaSource"> + <patternset> + <include name="**/*.conf"/> + <include name="**/*.properties"/> + <include name="**/*.xml"/> + </patternset> + </fileset> + </copy> + </target> + + <!-- Normal build of application --> + <target name="compile" depends="prepare,resources"> + <javac srcdir="JavaSource" destdir="${webinf.dir}/classes"> + <classpath refid="compile.classpath"/> + </javac> + </target> + + <!-- Remove classes directory for clean build --> + <target name="clean" + description="Prepare for clean build"> + <delete dir="${webinf.dir}/classes"/> + <mkdir dir="${webinf.dir}/classes"/> + </target> + + <!-- Build entire project --> + <target name="build" depends="prepare,compile"/> + <target name="rebuild" depends="clean,prepare,compile"/> + + <!-- Create binary distribution --> + <target name="war" depends="build"> + <mkdir dir="${build.dir}"/> + <war + basedir="${webroot.dir}" + warfile="${build.dir}/${project.distname}.war" + webxml="${webinf.dir}/web.xml"> + <exclude name="WEB-INF/${build.dir}/**"/> + <exclude name="WEB-INF/src/**"/> + <exclude name="WEB-INF/web.xml"/> + </war> + + </target> + + <target name="deploy" depends="war"> + <delete file="${deploy.dir}/${project.distname}.war"/> + <delete dir="${deploy.dir}/${project.distname}"/> + <copy file="${build.dir}/${project.distname}.war" todir="${deploy.dir}"/> + </target> + +</project> Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-11-25 14:41:05 UTC (rev 26938) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-11-25 15:34:08 UTC (rev 26939) @@ -52,8 +52,6 @@ suite.addTestSuite(JsfJspJbide6259Test.class); suite.addTestSuite(JsfJspJbide1704Test.class); suite.addTestSuite(JsfJspJbide1717Test.class); - suite.addTestSuite(TaglibXMLUnformatedDTD_JBIDE5642.class); - suite.addTest( new ProjectImportTestSetup(WebContentAssistProviderTest.suite(), "org.jboss.tools.jsf.ui.test", @@ -79,7 +77,10 @@ "org.jboss.tools.jsf.ui.test", new String[]{"projects/test_jsf_project"}, new String[]{"test_jsf_project"})); - + suite.addTest(new ProjectImportTestSetup(new TestSuite(TaglibXMLUnformatedDTD_JBIDE5642.class), + "org.jboss.tools.jsf.ui.test", + new String[]{"projects/ShowJarLibrariesTest"}, + new String[]{"ShowJarLibrariesTest"})); suite.addTestSuite(JsfUiPreferencesPagesTest.class); return new TestWizardsProject(suite); Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TaglibXMLUnformatedDTD_JBIDE5642.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TaglibXMLUnformatedDTD_JBIDE5642.java 2010-11-25 14:41:05 UTC (rev 26938) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TaglibXMLUnformatedDTD_JBIDE5642.java 2010-11-25 15:34:08 UTC (rev 26939) @@ -15,6 +15,10 @@ import junit.framework.TestCase; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; @@ -22,6 +26,8 @@ import org.eclipse.ui.IViewPart; import org.eclipse.ui.PlatformUI; import org.jboss.tools.jst.web.ui.navigator.WebProjectsNavigator; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ProjectImportTestSetup; /** * @@ -30,15 +36,17 @@ */ public class TaglibXMLUnformatedDTD_JBIDE5642 extends TestCase { - + + private static final String PROJECT_NAME = "ShowJarLibrariesTest"; //$NON-NLS-1$ private static final String WEB_PROJECTS_VIEW_ID = "org.jboss.tools.jst.web.ui.navigator.WebProjectsView"; //$NON-NLS-1$ private static final String PACKAGE_EXPLORER_VIEW_ID = "org.eclipse.jdt.ui.PackageExplorer"; //$NON-NLS-1$ - private static final String LIB_PATH = "jsfTest/Tag Libraries/"; //$NON-NLS-1$ + private static final String LIB_PATH = "/Tag Libraries/"; //$NON-NLS-1$ private static final String LIB_NAME_I = "primefaces-i.taglib.xml - primefaces-2.0.0.RC.jar"; //$NON-NLS-1$ private static final String LIB_NAME_P = "primefaces-p.taglib.xml - primefaces-2.0.0.RC.jar"; //$NON-NLS-1$ private IViewPart webProjectsView; - + private IProject project = null; + public TaglibXMLUnformatedDTD_JBIDE5642(String name) { super(name); } @@ -49,17 +57,17 @@ assertNotNull("Web Projects view is not available", webProjectsView); //$NON-NLS-1$ TestUtil.delay(2000); TestUtil.waitForIdle(); - + WebProjectsNavigator projectsNavigator = (WebProjectsNavigator) webProjectsView; TreeViewer treeViewer = projectsNavigator.getViewer(); assertNotNull(treeViewer); - - Object testLibI = findElementByPath(LIB_PATH + LIB_NAME_I, treeViewer); - assertNotNull("The tag library " + LIB_NAME_I + " was not found", //$NON-NLS-1$ //$NON-NLS-2$ + String taglibName = PROJECT_NAME + LIB_PATH + LIB_NAME_I; + Object testLibI = findElementByPath(taglibName, treeViewer); + assertNotNull("The tag library [" + taglibName + "] was not found", //$NON-NLS-1$ //$NON-NLS-2$ testLibI); - - Object testLibP = findElementByPath(LIB_PATH + LIB_NAME_P, treeViewer); - assertNotNull("The tag library " + LIB_NAME_P + " was not found", //$NON-NLS-1$ //$NON-NLS-2$ + taglibName = PROJECT_NAME + LIB_PATH + LIB_NAME_P; + Object testLibP = findElementByPath(taglibName, treeViewer); + assertNotNull("The tag library [" + LIB_NAME_P + "] was not found", //$NON-NLS-1$ //$NON-NLS-2$ testLibP); } @@ -108,12 +116,21 @@ } @Override - protected void tearDown() throws Exception { - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() - .hideView(webProjectsView); - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() - .showView(PACKAGE_EXPLORER_VIEW_ID); - super.tearDown(); + protected void setUp() throws Exception { + super.setUp(); + JobUtils.waitForIdle(); + IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember(PROJECT_NAME); + if(project == null) { + ProjectImportTestSetup setup = new ProjectImportTestSetup( + this, + "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$ + "projects/" + PROJECT_NAME, //$NON-NLS-1$ + PROJECT_NAME); + project = setup.importProject(); + } + this.project = project.getProject(); + this.project.build(IncrementalProjectBuilder.FULL_BUILD, null); + JobUtils.waitForIdle(); } }