Author: scabanovich Date: 2009-06-08 11:22:07 -0400 (Mon, 08 Jun 2009) New Revision: 15778 Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.classpath trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.project trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/.jsdtscope trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/JavaSource/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/JavaSource/demo/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/JavaSource/demo/Messages.properties trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/JavaSource/demo/User.java trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/META-INF/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/.faces-config.xml.jsfdia trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/classes/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/classes/demo/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/classes/demo/Messages.properties trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/classes/demo/User.class trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/faces-config.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/common-annotations.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-beanutils.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-collections.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-digester.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-logging.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jsf-api.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jsf-impl.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jstl.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/standard.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/taglib2.tld trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/web.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/facelet-taglib.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/index.jsp trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/hello.jsp trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/inputUserName.jsp trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/ant/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/ant/build.properties trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/ant/build.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-2808 Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2009-06-08 15:08:14 UTC (rev 15777) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2009-06-08 15:22:07 UTC (rev 15778) @@ -5,9 +5,13 @@ Bundle-Version: 1.0.0 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, + org.eclipse.core.resources, org.jboss.tools.jst.web.kb, - org.junit + org.junit, + org.jboss.tools.common.test, + org.jboss.tools.tests;bundle-version="2.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.jst.web.kb.test +Bundle-ClassPath: jst-web-kb-tests.jar Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.classpath =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.classpath (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.classpath 2009-06-08 15:22:07 UTC (rev 15778) @@ -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"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.6.0_04"> + <attributes> + <attribute name="owner.project.facets" value="jst.java"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.project (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.project 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>TestKbModel</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.common.verification.verifybuilder</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.jboss.tools.jsf.jsfnature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + </natures> +</projectDescription> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/.jsdtscope =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/.jsdtscope (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/.jsdtscope 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <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/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.jdt.core.prefs 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,7 @@ +#Thu Jun 04 11:17:46 MSD 2009 +eclipse.preferences.version=1 +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/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.common.component 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="TestKbModel"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> +<property name="context-root" value="TestKbModel"/> +<property name="java-output-path"/> +</wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.common.project.facet.core.xml 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 4.2 Runtime"/> + <fixed facet="jst.web"/> + <fixed facet="jst.java"/> + <installed facet="jst.java" version="6.0"/> + <installed facet="jst.web" version="2.5"/> +</faceted-project> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.jsdt.ui.superType.container 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.settings/org.eclipse.wst.jsdt.ui.superType.name 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/JavaSource/demo/Messages.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/JavaSource/demo/Messages.properties (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/JavaSource/demo/Messages.properties 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,3 @@ +header=Hello Demo Application +prompt_message=Name: +hello_message=Hello \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/JavaSource/demo/User.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/JavaSource/demo/User.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/JavaSource/demo/User.java 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package demo; + +/** + * Created by JBoss Developer Studio + */ +public class User { + + private String name; + + /** + * @return User Name + */ + public String getName() { + return name; + } + + /** + * @param User Name + */ + public void setName(String name) { + this.name = name; + } +} \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/META-INF/MANIFEST.MF 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/.faces-config.xml.jsfdia =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/.faces-config.xml.jsfdia (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/.faces-config.xml.jsfdia 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<PROCESS model-entity="JSFProcess"> + <PROCESS-ITEM NAME="rules:#pages#inputUserName.jsp" + PATH="/pages/inputUserName.jsp" SHAPE="32,17,0,0" model-entity="JSFProcessGroup"> + <PROCESS-ITEM ID="rules:#pages#inputUserName.jsp:0" NAME="item" + PATH="/pages/inputUserName.jsp" model-entity="JSFProcessItem"> + <PROCESS-ITEM-OUTPUT ID="hello::#pages#hello.jsp" NAME="output" + PATH="/pages/hello.jsp" TARGET="rules:#pages#hello.jsp" + TITLE="hello" model-entity="JSFProcessItemOutput"/> + </PROCESS-ITEM> + </PROCESS-ITEM> + <PROCESS-ITEM NAME="rules:#pages#hello.jsp" PATH="/pages/hello.jsp" + SHAPE="240,33,0,0" model-entity="JSFProcessGroup"/> +</PROCESS> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/classes/demo/Messages.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/classes/demo/Messages.properties (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/classes/demo/Messages.properties 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,3 @@ +header=Hello Demo Application +prompt_message=Name: +hello_message=Hello \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/classes/demo/User.class =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/classes/demo/User.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/faces-config.xml 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> +<faces-config> + <component> + <component-type>Component1</component-type> + <component-class>com.Component1</component-class> + </component> + <managed-bean> + <description>User Name Bean</description> + <managed-bean-name>user</managed-bean-name> + <managed-bean-class>demo.User</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>name</property-name> + <property-class>java.lang.String</property-class> + <value/> + </managed-property> + </managed-bean> + <navigation-rule> + <from-view-id>/pages/inputUserName.jsp</from-view-id> + <navigation-case> + <from-outcome>hello</from-outcome> + <to-view-id>/pages/hello.jsp</to-view-id> + </navigation-case> + </navigation-rule> +</faces-config> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/common-annotations.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/common-annotations.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-beanutils.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-beanutils.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-collections.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-collections.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-digester.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-digester.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-logging.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jsf-api.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jsf-api.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jsf-impl.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jsf-impl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jstl.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jstl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/standard.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/standard.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/taglib2.tld =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/taglib2.tld (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/taglib2.tld 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" + "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> +<taglib> + <tlib-version>1.0</tlib-version> + <jsp-version>1.2</jsp-version> + <short-name>taglib2</short-name> + <uri>taglib2</uri> + <tag> + <name>tagA</name> + <tag-class>com.TagA</tag-class> + <body-content>empty</body-content> + <description>Tag A</description> + </tag> +</taglib> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/web.xml 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,26 @@ +<?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"> + <display-name>TestKbModel</display-name> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> + <!-- Faces Servlet --> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <!-- Faces Servlet Mapping --> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/facelet-taglib.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/facelet-taglib.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/facelet-taglib.xml 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,17 @@ +<?xml version="1.0"?> +<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "facelet-taglib_1_0.dtd"> +<facelet-taglib> + <namespace>facelet_taglib</namespace> + <tag> + <tag-name>tag1</tag-name> + <handler-class/> + </tag> + <tag> + <tag-name>tag2</tag-name> + <component> + <component-type>ctype1</component-type> + <handler-class/> + </component> + </tag> +</facelet-taglib> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/index.jsp =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/index.jsp (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/index.jsp 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,7 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> + +<html> + <body> + <jsp:forward page="/pages/inputUserName.jsf" /> + </body> +</html> \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/hello.jsp =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/hello.jsp (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/hello.jsp 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,20 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> + +<f:loadBundle var="Message" basename="demo.Messages" /> + +<html> + <head> + <title>Hello!</title> + </head> + + <body> + <f:view> + <h3> + <h:outputText value="#{Message.hello_message}" />, + <h:outputText value="#{user.name}" />! + </h3> + </f:view> + </body> + +</html> \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/inputUserName.jsp =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/inputUserName.jsp (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/inputUserName.jsp 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,28 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> + +<f:loadBundle var="Message" basename="demo.Messages"/> + +<html> + <head> + <title>Input User Name Page</title> + </head> + <body> + + <f:view> + <h1><h:outputText value="#{Message.header}"/></h1> + + <h:messages style="color: red"/> + + <h:form id="greetingForm"> + <h:outputText value="#{Message.prompt_message}"/> + <h:inputText value="#{user.name}" required="true"> + <f:validateLength maximum="30" minimum="3"/> + </h:inputText> + + <h:commandButton action="hello" value="Say Hello!" /> + + </h:form> + </f:view> + </body> +</html> \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/ant/build.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/ant/build.properties (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/ant/build.properties 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,3 @@ +# +#Thu Jun 04 11:17:44 MSD 2009 +classpath.external= Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/ant/build.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/ant/build.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/ant/build.xml 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,74 @@ +<project name="KickStart" default="deploy" basedir="../"> + + <!-- Project settings --> + <property file="${basedir}/ant/build.properties" /> + + <property name="project.name" value="KickStart" /> + <property name="web.content.dir" value="${basedir}/WebContent" /> + <property name="web-inf.dir" value="${web.content.dir}/WEB-INF" /> + <property name="build.dir" value="build" /> + <property name="war.name" value="${build.dir}/${project.name}.war" /> + + <!-- Define a folder for deployment --> + <property name="deploy.dir" value="deploy" /> + + <!-- Compile classpath --> + <path id="compile.classpath"> + <fileset dir="${webinf.dir}/lib"> + <include name="**/*.jar" /> + </fileset> + <pathelement path="${classpath}" /> + <pathelement path="${classpath.external}" /> + <pathelement path="${webinf.dir}/classes" /> + </path> + + <!-- Copy any resource or configuration files --> + <target name="copyResources"> + <copy todir="${web-inf.dir}/classes" includeEmptyDirs="no"> + <fileset dir="JavaSource"> + <patternset> + <include name="**/*.*" /> + <exclude name="**/*.java" /> + </patternset> + </fileset> + </copy> + </target> + + <!-- Check timestamp on files --> + <target name="prepare"> + <tstamp /> + </target> + + <!-- Remove classes directory for clean build --> + <target name="clean" description="Prepare for clean build"> + <delete dir="${web-inf.dir}/classes" failonerror="false"/> + <mkdir dir="${web-inf.dir}/classes" /> + </target> + + <!-- Normal build of application --> + <target name="compile" depends="prepare, copyResources"> + <javac srcdir="JavaSource" destdir="${web-inf.dir}/classes"> + <classpath refid="compile.classpath" /> + </javac> + </target> + + <!-- Build Project --> + <target name="build" depends="prepare, compile" /> + + <!-- Rebuild Project --> + <target name="rebuild" depends="clean, prepare, compile" /> + + <!-- Build WAR --> + <target name="war" depends="build"> + <mkdir dir="${build.dir}" /> + <war warfile="${war.name}" basedir="${web.content.dir}" webxml="${web-inf.dir}/web.xml"> + <exclude name="WEB-INF/web.xml" /> + </war> + </target> + + <target name="deploy" depends="war"> + <delete dir="${deploy.dir}/${project.name}" failonerror="false"/> + <copy file="${war.name}" todir="${deploy.dir}" /> + </target> + +</project> \ No newline at end of file Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2009-06-08 15:08:14 UTC (rev 15777) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2009-06-08 15:22:07 UTC (rev 15778) @@ -21,6 +21,7 @@ public static Test suite() { TestSuite suite = new TestSuite(JstWebKbAllTests.class.getName()); suite.addTest(WebKbTest.suite()); + suite.addTestSuite(KbModelTest.class); return suite; } } \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java 2009-06-08 15:22:07 UTC (rev 15778) @@ -0,0 +1,121 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.web.kb.test; + +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.jst.web.kb.IKbProject; +import org.jboss.tools.jst.web.kb.internal.scanner.LoadedDeclarations; +import org.jboss.tools.jst.web.kb.internal.scanner.ScannerException; +import org.jboss.tools.jst.web.kb.internal.scanner.XMLScanner; +import org.jboss.tools.jst.web.kb.taglib.ITagLibrary; +import org.jboss.tools.test.util.JUnitUtils; + +import junit.framework.TestCase; + +public class KbModelTest extends TestCase { + + TestProjectProvider provider = null; + IProject project = null; + boolean makeCopy = true; + + public KbModelTest() { + super("Kb Model Test"); + } + + public void setUp() throws Exception { + provider = new TestProjectProvider("org.jboss.tools.jst.web.kb.test", + null,"TestKbModel" ,true); + project = provider.getProject(); + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + this.project.build(IncrementalProjectBuilder.FULL_BUILD, null); + } + + private IKbProject getKbProject() { + IKbProject kbProject = null; + try { + kbProject = (IKbProject)project.getNature(IKbProject.NATURE_ID); + } catch (Exception e) { + JUnitUtils.fail("Cannot get seam nature.",e); + } + return kbProject; + } + + public void testXMLScanner() { + IKbProject kbProject = getKbProject(); + + IFile f = project.getFile("WebContent/WEB-INF/faces-config.xml"); + assertNotNull(f); + XMLScanner scanner = new XMLScanner(); + List<ITagLibrary> ls = null; + try { + LoadedDeclarations ds = scanner.parse(f, kbProject); + ls = ds.getLibraries(); + } catch (ScannerException e) { + JUnitUtils.fail("Error in xml scanner",e); + } + assertEquals(1, ls.size()); + assertTrue(ls.get(0).getComponents().length > 0); + + ls = null; + f = project.getFile("WebContent/facelet-taglib.xml"); + assertNotNull(f); + try { + LoadedDeclarations ds = scanner.parse(f, kbProject); + ls = ds.getLibraries(); + } catch (ScannerException e) { + JUnitUtils.fail("Error in xml scanner",e); + } + assertEquals(1, ls.size()); + assertTrue(ls.get(0).getComponents().length > 0); + + ls = null; + f = project.getFile("WebContent/WEB-INF/taglib2.tld"); + assertNotNull(f); + try { + LoadedDeclarations ds = scanner.parse(f, kbProject); + ls = ds.getLibraries(); + } catch (ScannerException e) { + JUnitUtils.fail("Error in xml scanner",e); + } + assertEquals(1, ls.size()); + assertTrue(ls.get(0).getComponents().length > 0); + +// System.out.println("Libraries found=" + ls.size()); +// for (ITagLibrary l: ls) { +// System.out.println(l + ":=>" + l.getComponents().length + " " + l.getURI()); +// } + } + + public void testKbProjectObjects() { + + } + + public void testXMLSerialization() { + + } + + public void testCleanBuild() { + + } + + protected void tearDown() throws Exception { + if(provider != null) { + provider.dispose(); + } + } +}