May 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r22175 - trunk/smooks/plugins/org.jboss.tools.smooks.core.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-18 11:43:28 -0400 (Tue, 18 May 2010) New Revision: 22175 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/pom.xml Log: https://jira.jboss.org/browse/JBDS-1212 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/pom.xml =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/pom.xml 2010-05-18 15:41:56 UTC (rev 22174) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/pom.xml 2010-05-18 15:43:28 UTC (rev 22175) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.smooks.core</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r22174 - trunk/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-18 11:41:56 -0400 (Tue, 18 May 2010) New Revision: 22174 Modified: trunk/build/build.xml Log: move drools down pending outcome of https://jira.jboss.org/browse/JBIDE-6300 Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2010-05-18 15:12:36 UTC (rev 22173) +++ trunk/build/build.xml 2010-05-18 15:41:56 UTC (rev 22174) @@ -9,9 +9,9 @@ value="tests,common; flow,jbpm; jmx,archives,as; - drools,bpel,smooks,freemarker,profiler,portlet,modeshape; + bpel,smooks,freemarker,profiler,portlet,modeshape; xulrunner,jst,vpe,jsf; - esb,tptp,ws; + drools,esb,tptp,ws; cdi,struts,hibernatetools,seam; examples,birt; maven"

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r22173 - in branches/hibernatetools-multiversion/hibernatetools/plugins: org.hibernate.mediator and 23 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-05-18 11:12:36 -0400 (Tue, 18 May 2010) New Revision: 22173 Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/asm-3.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/bsh-core-2.0b4.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/commons-logging-1.0.4.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/freemarker.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/hibernate-tools.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/jtidy-r8-20060801.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/log4j-1.2.15.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/slf4j-api-1.5.8.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/slf4j-log4j12-1.5.8.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/cglib/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/cglib/cglib-2.2.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/javassist/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/javassist/javassist-3.9.0.GA.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/hibernate3.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/jpa/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/c3p0/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/c3p0/c3p0-0.9.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/ehcache/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/ehcache/ehcache-1.5.0.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/infinispan/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/jbosscache/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/oscache/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/oscache/oscache-2.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/proxool/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/proxool/proxool-0.8.3.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/swarmcache/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/swarmcache/swarmcache-1.0RC2.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/antlr-2.7.6.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/commons-collections-3.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/dom4j-1.6.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/javassist-3.9.0.GA.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/jta-1.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/slf4j-api-1.5.8.jar Removed: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bsh-core-2.0b4.jar Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/META-INF/MANIFEST.MF branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/base/HObject.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PersistentClassFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SingleTableSubclass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/HibernateMappingExporter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/pojo/POJOClass.java Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - use Hibernate 3.5 and Hibernate Tools compatiable libs, fix issues with hbm exporter Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -65,6 +65,7 @@ import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.RootClass; import org.hibernate.mediator.x.mapping.SimpleValue; +import org.hibernate.mediator.x.mapping.SingleTableSubclass; import org.hibernate.mediator.x.mapping.Subclass; import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.ToOne; @@ -178,7 +179,7 @@ Subclass subclass = null; if (pc != null){ if (pc.isAbstract()){ - subclass = (Subclass)PersistentClassFactory.createPersistentClassStub(pc); + subclass = SingleTableSubclass.newInstance(pc); if (pc instanceof RootClass && pc.getDiscriminator() == null){ SimpleValue discr = SimpleValue.newInstance(); discr.setTypeName("string"); //$NON-NLS-1$ Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath 2010-05-18 15:12:36 UTC (rev 22173) @@ -3,42 +3,30 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry exported="true" kind="lib" path="lib/hibernate/cglib-2.2.jar"/> - <classpathentry exported="true" kind="lib" path="lib/hibernate/log4j-1.2.15.jar"/> - <classpathentry kind="lib" path="lib/bsh-core-2.0b4.jar"/> - <classpathentry kind="lib" path="lib/hibernate/slf4j-api-1.5.8.jar"/> - <classpathentry kind="lib" path="lib/hibernate/slf4j-log4j12-1.5.8.jar"/> - <classpathentry kind="lib" path="lib/hibernate/commons-logging-1.0.4.jar"/> - <classpathentry kind="lib" path="lib/hibernate/antlr-2.7.6.jar"/> - <classpathentry kind="lib" path="lib/hibernate/hibernate3.jar" sourcepath="D:/Temp/_hibernate/hibernate-core-3.3.2.GA-sources.jar "/> - <classpathentry kind="lib" path="lib/hibernate/dom4j-1.6.1.jar" sourcepath="D:/Temp/_hibernate/dom4j-1.6.1-sources.jar "/> - <classpathentry kind="lib" path="lib/annotations/ejb3-persistence.jar"/> - <classpathentry kind="lib" path="lib/annotations/hibernate-annotations.jar"/> - <classpathentry kind="lib" path="lib/annotations/hibernate-commons-annotations.jar"/> - <classpathentry kind="lib" path="lib/annotations/hibernate-entitymanager.jar"/> - <classpathentry kind="lib" path="lib/annotations/hibernate-validator.jar"/> - <classpathentry kind="lib" path="lib/hibernate/asm-attrs.jar"/> - <classpathentry kind="lib" path="lib/hibernate/asm.jar"/> - <classpathentry kind="lib" path="lib/hibernate/c3p0-0.9.1.jar"/> - <classpathentry kind="lib" path="lib/hibernate/commons-collections-3.1.jar"/> - <classpathentry kind="lib" path="lib/hibernate/concurrent-1.3.2.jar"/> - <classpathentry kind="lib" path="lib/hibernate/connector.jar"/> - <classpathentry kind="lib" path="lib/hibernate/ehcache-1.2.3.jar"/> - <classpathentry kind="lib" path="lib/hibernate/hibernate-jmx.jar"/> - <classpathentry kind="lib" path="lib/hibernate/jaas.jar"/> - <classpathentry kind="lib" path="lib/hibernate/javassist.jar"/> - <classpathentry kind="lib" path="lib/hibernate/jboss-cache.jar"/> - <classpathentry kind="lib" path="lib/hibernate/jboss-common.jar"/> - <classpathentry kind="lib" path="lib/hibernate/jboss-jmx.jar"/> - <classpathentry kind="lib" path="lib/hibernate/jboss-system.jar"/> - <classpathentry kind="lib" path="lib/hibernate/jdbc2_0-stdext.jar"/> - <classpathentry kind="lib" path="lib/hibernate/jgroups-2.2.8.jar"/> - <classpathentry kind="lib" path="lib/hibernate/jta.jar"/> - <classpathentry kind="lib" path="lib/hibernate/oscache-2.1.jar"/> - <classpathentry kind="lib" path="lib/hibernate/proxool-0.8.3.jar"/> - <classpathentry kind="lib" path="lib/hibernate/swarmcache-1.0rc2.jar"/> - <classpathentry kind="lib" path="lib/tools/freemarker.jar"/> - <classpathentry kind="lib" path="lib/tools/hibernate-tools.jar"/> - <classpathentry kind="lib" path="lib/tools/jtidy-r8-20060801.jar"/> + <classpathentry kind="lib" path="lib/_add/commons-logging-1.0.4.jar"/> + <classpathentry kind="lib" path="lib/_add/freemarker.jar"/> + <classpathentry kind="lib" path="lib/_add/hibernate-tools.jar" sourcepath="C:/RHDS/hibernate/trunk/HibernateExt/tools/src"/> + <classpathentry kind="lib" path="lib/_add/jtidy-r8-20060801.jar"/> + <classpathentry exported="true" kind="lib" path="lib/_add/log4j-1.2.15.jar"/> + <classpathentry kind="lib" path="lib/_add/slf4j-api-1.5.8.jar"/> + <classpathentry kind="lib" path="lib/_add/slf4j-log4j12-1.5.8.jar"/> + <classpathentry exported="true" kind="lib" path="lib/bytecode/cglib/cglib-2.2.jar" sourcepath="D:/Temp/_hibernate/cglib-src-2.2.jar"/> + <classpathentry kind="lib" path="lib/bytecode/javassist/javassist-3.9.0.GA.jar"/> + <classpathentry kind="lib" path="lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar"/> + <classpathentry kind="lib" path="lib/optional/c3p0/c3p0-0.9.1.jar"/> + <classpathentry kind="lib" path="lib/optional/ehcache/ehcache-1.5.0.jar"/> + <classpathentry kind="lib" path="lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar"/> + <classpathentry kind="lib" path="lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar"/> + <classpathentry kind="lib" path="lib/optional/oscache/oscache-2.1.jar"/> + <classpathentry kind="lib" path="lib/optional/proxool/proxool-0.8.3.jar"/> + <classpathentry kind="lib" path="lib/optional/swarmcache/swarmcache-1.0RC2.jar"/> + <classpathentry kind="lib" path="lib/required/antlr-2.7.6.jar"/> + <classpathentry kind="lib" path="lib/required/commons-collections-3.1.jar"/> + <classpathentry kind="lib" path="lib/required/dom4j-1.6.1.jar"/> + <classpathentry kind="lib" path="lib/required/javassist-3.9.0.GA.jar"/> + <classpathentry kind="lib" path="lib/required/jta-1.1.jar"/> + <classpathentry kind="lib" path="lib/hibernate3.jar" sourcepath="D:/Temp/_hibernate/hibernate-distribution-3.5.0-Final-dist.zip"/> + <classpathentry kind="lib" path="lib/_add/bsh-core-2.0b4.jar"/> + <classpathentry exported="true" kind="lib" path="lib/_add/asm-3.1.jar"/> <classpathentry kind="output" path="build/eclipse"/> </classpath> Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/META-INF/MANIFEST.MF =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/META-INF/MANIFEST.MF 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/META-INF/MANIFEST.MF 2010-05-18 15:12:36 UTC (rev 22173) @@ -4,48 +4,32 @@ Bundle-SymbolicName: org.hibernate.mediator;singleton:=true Bundle-Version: 3.3.0.qualifier Bundle-ClassPath: org.hibernate.mediator.jar, - lib/hibernate/asm.jar, - lib/hibernate/asm-attrs.jar, - lib/hibernate/commons-collections-2.1.1.jar, - lib/hibernate/commons-logging-1.0.4.jar, - lib/hibernate/concurrent-1.3.2.jar, - lib/hibernate/connector.jar, - lib/hibernate/dom4j-1.6.1.jar, - lib/hibernate/hibernate3.jar, - lib/hibernate/jboss-cache.jar, - lib/hibernate/jboss-common.jar, - lib/hibernate/jboss-jmx.jar, - lib/hibernate/jboss-system.jar, - lib/hibernate/jdbc2_0-stdext.jar, - lib/hibernate/jta.jar, - lib/hibernate/jaas.jar, - lib/hibernate/oscache-2.1.jar, - lib/hibernate/proxool-0.8.3.jar, - lib/hibernate/swarmcache-1.0rc2.jar, - lib/tools/hibernate-tools.jar, - lib/tools/bsh-2.0b1.jar, - lib/tools/freemarker.jar, - lib/bsh-core-2.0b4.jar, - lib/annotations/ejb3-persistence.jar, - lib/annotations/hibernate-annotations.jar, - lib/hibernate/cglib-2.1.3.jar, - lib/hibernate/jgroups-2.2.8.jar, - lib/hibernate/antlr-2.7.6.jar, - lib/tools/jtidy-r8-20060801.jar, - lib/annotations/hibernate-entitymanager.jar, - lib/hibernate/javassist.jar, - lib/hibernate/ehcache-1.2.3.jar, - lib/hibernate/c3p0-0.9.1.jar, - lib/annotations/hibernate-commons-annotations.jar, - lib/annotations/hibernate-validator.jar, - lib/annotations/hibernate-search.jar, - lib/annotations/lucene-core-2.2.0.jar, - lib/hibernate/log4j-1.2.15.jar, - lib/hibernate/cglib-2.2.jar, - lib/hibernate/commons-collections-3.1.jar, - lib/hibernate/hibernate-jmx.jar, - lib/hibernate/slf4j-api-1.5.8.jar, - lib/hibernate/slf4j-log4j12-1.5.8.jar + lib/_add/bsh-core-2.0b4.jar, + lib/_add/commons-logging-1.0.4.jar, + lib/_add/freemarker.jar, + lib/_add/hibernate-tools.jar, + lib/_add/jtidy-r8-20060801.jar, + lib/_add/log4j-1.2.15.jar, + lib/_add/slf4j-api-1.5.8.jar, + lib/_add/slf4j-log4j12-1.5.8.jar, + lib/bytecode/cglib/cglib-2.2.jar, + lib/bytecode/javassist/javassist-3.9.0.GA.jar, + lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar, + lib/optional/c3p0/c3p0-0.9.1.jar, + lib/optional/ehcache/ehcache-1.5.0.jar, + lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar, + lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar, + lib/optional/oscache/oscache-2.1.jar, + lib/optional/proxool/proxool-0.8.3.jar, + lib/optional/swarmcache/swarmcache-1.0RC2.jar, + lib/required/antlr-2.7.6.jar, + lib/required/commons-collections-3.1.jar, + lib/required/dom4j-1.6.1.jar, + lib/required/javassist-3.9.0.GA.jar, + lib/required/jta-1.1.jar, + lib/required/slf4j-api-1.5.8.jar, + lib/hibernate3.jar, + lib/_add/asm-3.1.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Export-Package: org.hibernate.mediator, @@ -75,6 +59,8 @@ org.hibernate.mediator.x.util, org.dom4j.mediator.x, org.dom4j.mediator.x.io, + org.objectweb.asm, + org.objectweb.asm.signature, net.sf.cglib.core, net.sf.cglib.proxy, net.sf.cglib.reflect Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties 2010-05-18 15:12:36 UTC (rev 22173) @@ -4,24 +4,37 @@ META-INF/,\ hibernate-log4j.properties,\ about.html,\ - lib/tools/jtidy-r8-20060801.jar,\ - lib/annotations/hibernate-entitymanager.jar,\ - lib/hibernate/javassist.jar,\ - lib/hibernate/ehcache-1.2.3.jar,\ - lib/hibernate/c3p0-0.9.1.jar,\ - lib/annotations/hibernate-commons-annotations.jar,\ - lib/annotations/hibernate-validator.jar,\ - lib/hibernate/log4j-1.2.15.jar,\ - lib/hibernate/slf4j-api-1.5.8.jar,\ - lib/hibernate/slf4j-log4j12-1.5.8.jar,\ about.ini,\ about.mappings,\ about.properties,\ hibernate_icon.gif,\ plugin.properties,\ - lib/hibernate/cglib-2.2.jar,\ - lib/hibernate/commons-collections-3.1.jar,\ - lib/hibernate/hibernate-jmx.jar + lib/_add/asm-3.1.jar,\ + lib/_add/bsh-core-2.0b4.jar,\ + lib/_add/commons-logging-1.0.4.jar,\ + lib/_add/freemarker.jar,\ + lib/_add/hibernate-tools.jar,\ + lib/_add/jtidy-r8-20060801.jar,\ + lib/_add/log4j-1.2.15.jar,\ + lib/_add/slf4j-api-1.5.8.jar,\ + lib/_add/slf4j-log4j12-1.5.8.jar,\ + lib/bytecode/cglib/cglib-2.2.jar,\ + lib/bytecode/javassist/javassist-3.9.0.GA.jar,\ + lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar,\ + lib/optional/c3p0/c3p0-0.9.1.jar,\ + lib/optional/ehcache/ehcache-1.5.0.jar,\ + lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar,\ + lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar,\ + lib/optional/oscache/oscache-2.1.jar,\ + lib/optional/proxool/proxool-0.8.3.jar,\ + lib/optional/swarmcache/swarmcache-1.0RC2.jar,\ + lib/required/antlr-2.7.6.jar,\ + lib/required/commons-collections-3.1.jar,\ + lib/required/dom4j-1.6.1.jar,\ + lib/required/javassist-3.9.0.GA.jar,\ + lib/required/jta-1.1.jar,\ + lib/required/slf4j-api-1.5.8.jar,\ + lib/hibernate3.jar jars.compile.order = org.hibernate.mediator.jar source.org.hibernate.mediator.jar = src/ output.org.hibernate.mediator.jar = bin/ Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/asm-3.1.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/asm-3.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/bsh-core-2.0b4.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/bsh-core-2.0b4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/commons-logging-1.0.4.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/commons-logging-1.0.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/freemarker.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/freemarker.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/hibernate-tools.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/hibernate-tools.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/jtidy-r8-20060801.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/jtidy-r8-20060801.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/log4j-1.2.15.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/log4j-1.2.15.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/slf4j-api-1.5.8.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/slf4j-api-1.5.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/slf4j-log4j12-1.5.8.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/slf4j-log4j12-1.5.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bsh-core-2.0b4.jar =================================================================== (Binary files differ) Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/cglib/cglib-2.2.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/cglib/cglib-2.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/javassist/javassist-3.9.0.GA.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/javassist/javassist-3.9.0.GA.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/hibernate3.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/hibernate3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/c3p0/c3p0-0.9.1.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/c3p0/c3p0-0.9.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/ehcache/ehcache-1.5.0.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/ehcache/ehcache-1.5.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/oscache/oscache-2.1.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/oscache/oscache-2.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/proxool/proxool-0.8.3.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/proxool/proxool-0.8.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/swarmcache/swarmcache-1.0RC2.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/swarmcache/swarmcache-1.0RC2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/antlr-2.7.6.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/antlr-2.7.6.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/commons-collections-3.1.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/commons-collections-3.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/dom4j-1.6.1.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/dom4j-1.6.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/javassist-3.9.0.GA.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/javassist-3.9.0.GA.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/jta-1.1.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/jta-1.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/slf4j-api-1.5.8.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/slf4j-api-1.5.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/base/HObject.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/base/HObject.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/base/HObject.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -266,4 +266,28 @@ throw new HibernateConsoleRuntimeException(e); } } + + public static final Object readStaticFieldValueNoException(final String className, String fieldName) { + Class<?> clazz; + try { + clazz = ReflectHelper.classForName(className); + } catch (ClassNotFoundException e) { + return null; + } + Field fld; + try { + fld = clazz.getDeclaredField(fieldName); + } catch (SecurityException e) { + return null; + } catch (NoSuchFieldException e) { + return null; + } + try { + return fld.get(null); + } catch (IllegalArgumentException e) { + return null; + } catch (IllegalAccessException e) { + return null; + } + } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -203,10 +203,10 @@ //result[0] - detect classes //result[1] - detect hbm boolean[] result = { false, false }; - String detect = overridenProperties != null ? + String detect = overridenProperties != null && HibernatePersistence.AUTODETECTION != null ? (String) overridenProperties.get(HibernatePersistence.AUTODETECTION) : null; - detect = detect == null ? - properties.getProperty( HibernatePersistence.AUTODETECTION) : detect; + detect = detect == null && HibernatePersistence.AUTODETECTION != null ? + properties.getProperty(HibernatePersistence.AUTODETECTION) : detect; if (detect == null && excludeIfNotOverriden) { //not overridden through HibernatePersistence.AUTODETECTION so we comply with the spec excludeUnlistedClasses return result; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -1,6 +1,7 @@ package org.hibernate.mediator.x.cfg; import java.io.File; +import java.lang.reflect.Method; import java.sql.Driver; import java.sql.DriverManager; import java.sql.SQLException; @@ -10,6 +11,8 @@ import java.util.Map; import java.util.Properties; +import net.sf.cglib.proxy.MethodProxy; + import org.eclipse.osgi.util.NLS; import org.hibernate.mediator.HibernateConsoleRuntimeException; import org.hibernate.mediator.Messages; @@ -132,19 +135,22 @@ } public HibernateMappingExporter createHibernateMappingExporter(File folder2Gen, final IExporterNewOutputDir enod) { - return new HibernateMappingExporter(this, folder2Gen) { + return HibernateMappingExporter.newInstance(this, folder2Gen, new HibernateMappingExporter.IExportPOJOInterceptor() { @SuppressWarnings("unchecked") - protected void exportPOJO(Map additionalContext, POJOClass element) { - File outputdir4FileOld = getOutputDirectory(); + public Object exportPOJO(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable { + HibernateMappingExporter hme = HibernateMappingExporter.newInstance(obj); + POJOClass element = POJOClass.newInstance(args[1]); + File outputdir4FileOld = hme.getOutputDirectory(); File outputdir4FileNew = enod.getNewOutputDir(element, outputdir4FileOld); if (!outputdir4FileNew.exists()) { outputdir4FileNew.mkdirs(); } - setOutputDirectory(outputdir4FileNew); - super.exportPOJO(additionalContext, element); - setOutputDirectory(outputdir4FileOld); + hme.setOutputDirectory(outputdir4FileNew); + Object res = proxy.invokeSuper(obj, args); + hme.setOutputDirectory(outputdir4FileOld); + return res; } - }; + }); } @SuppressWarnings("unchecked") Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -10,6 +10,6 @@ super(hibernatePersistence, CL); } - public static final String AUTODETECTION = (String)HObject.readStaticFieldValue(CL, "AUTODETECTION"); //$NON-NLS-1$ + public static final String AUTODETECTION = (String)HObject.readStaticFieldValueNoException(CL, "AUTODETECTION"); //$NON-NLS-1$ } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PersistentClassFactory.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PersistentClassFactory.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PersistentClassFactory.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -1,6 +1,8 @@ package org.hibernate.mediator.x.mapping; +import org.hibernate.mediator.stubs.util.ClassHelper; + public class PersistentClassFactory { @SuppressWarnings("unchecked") public static PersistentClass createPersistentClassStub(Object value) { @@ -8,18 +10,16 @@ return null; } final Class cl = value.getClass(); - if (0 == RootClass.CL.compareTo(cl.getName())) { - return new RootClass(value); - //} else if (0 == PersistentClassStub.CL.compareTo(cl.getName())) { - // return new PersistentClassStub(value); - } else if (0 == Subclass.CL.compareTo(cl.getName())) { - return new Subclass(value); - } else if (0 == JoinedSubclass.CL.compareTo(cl.getName())) { + if (ClassHelper.isClassOrOffspring(cl, JoinedSubclass.CL)) { return new JoinedSubclass(value); - } else if (0 == SingleTableSubclass.CL.compareTo(cl.getName())) { + } else if (ClassHelper.isClassOrOffspring(cl, SingleTableSubclass.CL)) { return new SingleTableSubclass(value); - } else if (0 == UnionSubclass.CL.compareTo(cl.getName())) { + } else if (ClassHelper.isClassOrOffspring(cl, UnionSubclass.CL)) { return new UnionSubclass(value); + } else if (ClassHelper.isClassOrOffspring(cl, Subclass.CL)) { + return new Subclass(value); + } else if (ClassHelper.isClassOrOffspring(cl, RootClass.CL)) { + return new RootClass(value); } return null; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SingleTableSubclass.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SingleTableSubclass.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SingleTableSubclass.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -7,4 +7,8 @@ protected SingleTableSubclass(Object singleTableSubclass) { super(singleTableSubclass, CL); } + + public static SingleTableSubclass newInstance(PersistentClass superclass) { + return new SingleTableSubclass(newInstance(CL, superclass)); + } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/HibernateMappingExporter.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/HibernateMappingExporter.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/HibernateMappingExporter.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -5,18 +5,78 @@ import java.lang.reflect.Method; import java.util.Map; +import net.sf.cglib.proxy.Callback; +import net.sf.cglib.proxy.CallbackFilter; +import net.sf.cglib.proxy.Enhancer; +import net.sf.cglib.proxy.MethodInterceptor; +import net.sf.cglib.proxy.MethodProxy; + import org.hibernate.mediator.HibernateConsoleRuntimeException; import org.hibernate.mediator.base.HObject; +import org.hibernate.mediator.stubs.util.ReflectHelper; import org.hibernate.mediator.x.cfg.Configuration; import org.hibernate.mediator.x.tool.hbm2x.pojo.POJOClass; public class HibernateMappingExporter extends HObject { public static final String CL = "org.hibernate.tool.hbm2x.HibernateMappingExporter"; //$NON-NLS-1$ + + public interface IExportPOJOInterceptor { + public Object exportPOJO(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable; + } - protected HibernateMappingExporter(Configuration cfg, File outputdir) { - super(HObject.newInstance(CL, cfg, outputdir), CL); + protected HibernateMappingExporter(Object hibernateMappingExporter) { + super(hibernateMappingExporter, CL); } + public static HibernateMappingExporter newInstance(Object hibernateMappingExporter) { + return new HibernateMappingExporter(hibernateMappingExporter); + } + + public static HibernateMappingExporter newInstance(Configuration cfg, File outputdir, final IExportPOJOInterceptor exportPOJOInterceptor) { + Class<?> clazz; + try { + clazz = ReflectHelper.classForName(CL); + } catch (ClassNotFoundException ex) { + throw new HibernateConsoleRuntimeException(ex); + } + MethodInterceptor mi = new MethodInterceptor() { + public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable { + return exportPOJOInterceptor.exportPOJO(obj, method, args, proxy); + } + }; + Enhancer e = createEnhancer(clazz, mi); + try { + clazz = ReflectHelper.classForName(Configuration.CL); + } catch (ClassNotFoundException ex) { + throw new HibernateConsoleRuntimeException(ex); + } + Object hibernateMappingExporter = e.create(new Class[] { clazz, File.class }, + new Object[] { cfg.Obj(), outputdir } ); + return new HibernateMappingExporter(hibernateMappingExporter); + } + + private static final CallbackFilter baseExportPOJO = new CallbackFilter() { + public int accept(Method method) { + if ("exportPOJO".equals(method.getName() ) ) { + return 1; + } + return 0; + } + }; + + public static Enhancer createEnhancer(Class<?> clazz, MethodInterceptor mi) { + Enhancer e = new Enhancer(); + e.setSuperclass(clazz); + MethodInterceptor miDef = new MethodInterceptor() { + public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable { + return proxy.invokeSuper(obj, args); + } + }; + e.setCallbacks(new Callback[] { miDef, mi }); + e.setCallbackFilter(baseExportPOJO); + return e; + } + public void setGlobalSettings(HibernateMappingGlobalSettings hmgs) { invoke(mn(), hmgs); } @@ -25,16 +85,16 @@ invoke(mn()); } - protected File getOutputDirectory() { + public File getOutputDirectory() { return (File)invoke(mn()); } - protected void setOutputDirectory(File outputdir) { + public void setOutputDirectory(File outputdir) { invoke(mn(), outputdir); } @SuppressWarnings("unchecked") - protected void exportPOJO(Map additionalContext, POJOClass element) { + public void exportPOJO(Map additionalContext, POJOClass element) { // protected -> call via reflection Method m = null; try { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/pojo/POJOClass.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/pojo/POJOClass.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/pojo/POJOClass.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -9,6 +9,10 @@ super(pojoClass, CL); } + public static POJOClass newInstance(Object pojoClass) { + return new POJOClass(pojoClass); + } + public String getQualifiedDeclarationName() { return (String)invoke(mn()); }

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r22172 - in trunk/seam: plugins/org.jboss.tools.seam.xml/resources/help and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-05-18 10:37:22 -0400 (Tue, 18 May 2010) New Revision: 22172 Added: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-navigation.meta trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/ trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/ trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components22.xml trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLAllTests.java trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSuite.java Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/PropertyListFormLayoutData.java trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/SeamComponentsCoreFormLayoutData.java trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties Log: https://jira.jboss.org/browse/JBIDE-6224 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2010-05-18 13:02:14 UTC (rev 22171) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2010-05-18 14:37:22 UTC (rev 22172) @@ -11,6 +11,7 @@ <meta path="meta/seam-international.meta"/> <meta path="meta/seam-mail.meta"/> <meta path="meta/seam-pdf.meta"/> + <meta path="meta/seam-navigation.meta"/> <meta path="meta/seam-persistence.meta"/> <meta path="meta/seam-theme.meta"/> <meta path="meta/seam-web.meta"/> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties 2010-05-18 13:02:14 UTC (rev 22171) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties 2010-05-18 14:37:22 UTC (rev 22172) @@ -73,6 +73,8 @@ Seam.AddContextLoader.menu=Context Loader... Seam.AddTaskDispatcher.menu=Task Dispatcher... Seam.AddTransaction.menu=Transaction... +Seam.Navigation.menu=Navigation +Seam.AddNavigationPages.menu=Navigation Pages... Seam.Theme.menu=Theme Seam.AddThemeSelector.menu=Theme Selector... Seam.Transaction.menu=Transaction Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2010-05-18 13:02:14 UTC (rev 22171) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2010-05-18 14:37:22 UTC (rev 22172) @@ -975,6 +975,9 @@ FileSeamComponents20_AddThemeSelector.WindowTitle=Add Theme Selector FileSeamComponents20_AddThemeSelector.Title=Seam Theme Selector +FileSeamComponents20_AddNavigationPages.WindowTitle=Add Navigation Pages +FileSeamComponents20_AddNavigationPages.Title=Seam Navigation Pages + FileSeamComponents20_EditorActionList_AddThemeSelector.WindowTitle=Add Theme Selector FileSeamComponents20_EditorActionList_AddThemeSelector.Title=Seam Theme Selector @@ -1317,6 +1320,9 @@ FileSeamComponents21_AddThemeSelector.WindowTitle=Add Theme Selector FileSeamComponents21_AddThemeSelector.Title=Seam Theme Selector +FileSeamComponents21_AddNavigationPages.WindowTitle=Add Navigation Pages +FileSeamComponents21_AddNavigationPages.Title=Seam Navigation Pages + FileSeamComponents21_AddEjb.WindowTitle=Add Ejb FileSeamComponents21_AddEjb.Title=Seam Transaction Ejb @@ -1413,6 +1419,9 @@ FileSeamComponents22_AddThemeSelector.WindowTitle=Add Theme Selector FileSeamComponents22_AddThemeSelector.Title=Seam Theme Selector +FileSeamComponents22_AddNavigationPages.WindowTitle=Add Navigation Pages +FileSeamComponents22_AddNavigationPages.Title=Seam Navigation Pages + FileSeamComponents22_AddEjb.WindowTitle=Add Ejb FileSeamComponents22_AddEjb.Title=Seam Transaction Ejb Added: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-navigation.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-navigation.meta (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-navigation.meta 2010-05-18 14:37:22 UTC (rev 22172) @@ -0,0 +1,226 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN" + "meta.dtd"> +<XModelEntityGroup> + <VERSION DEPENDS="Model:1.0" MODULE="Seam" VERSION="1.0"/> + <MAPPINGS> + <MAPPING name="Handlers"/> + <MAPPING name="SeamNamespaces"> + <PAIR name="navigation" value="http://jboss.com/products/seam/navigation"/> + </MAPPING> + <MAPPING name="SeamSchemas"> + <PAIR name="navigation$20" value="http://jboss.com/products/seam/navigation-2.0.xsd"/> + <PAIR name="navigation$21" value="http://jboss.com/products/seam/navigation-2.1.xsd"/> + <PAIR name="navigation$22" value="http://jboss.com/products/seam/navigation-2.2.xsd"/> + </MAPPING> + </MAPPINGS> + <ICONS> + <GROUP name="action"> + <GROUP name="new"> + <GROUP name="navigation"/> + </GROUP> + </GROUP> + <GROUP name="main"> + <GROUP name="seam"> + <GROUP name="navigation"> + <ICON name="pages" path="images/struts/plug_in.gif"/> + </GROUP> + </GROUP> + </GROUP> + </ICONS> + <GlobalActions kind="list"/> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="navigation:pages" name="SeamNavigationPages"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="SeamNavigationResources" required="yes"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.navigation.pages" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="navigation pages" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + default="org.jboss.seam.navigation.pages" name="name" xmlname="name"/> + <XModelAttributeReference + attributes="class,scope,precedence,installed,auto-create" + entity="SeamComponent" name="component"/> + <XModelAttribute PROPERTIES="category=general" + name="no-conversation-view-id" xmlname="no-conversation-view-id"/> + <XModelAttribute PROPERTIES="category=general" name="login-view-id" xmlname="login-view-id"/> + <XModelAttribute PROPERTIES="category=advanced" name="http-port" xmlname="http-port"> + <Constraint loader="%IntEL%"> + <value name="minimum=0"/> + </Constraint> + <Editor name="Int"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="https-port" xmlname="https-port"> + <Constraint loader="%IntEL%"> + <value name="minimum=0"/> + </Constraint> + <Editor name="Int"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"> + <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData;children=%Ordered%;childrenLoader=list;saveDefault=false" + XMLSUBPATH="navigation:resources" name="SeamNavigationResources"> + <XChildrenEntities> + <XChildEntity name="SeamListEntry"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="resources" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + default="resources" name="name"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Add Entry..." + kind="action" name="AddEntry"> + <EntityData EntityName="SeamListEntry"> + <AttributeData AttributeName="value"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XEntityExtension name="FileSeamComponents20"> + <XChildrenEntities> + <XChildEntity name="SeamNavigationPages"/> + </XChildrenEntities> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem ICON="action.empty" displayName="Navigation" group="1" + kind="list" name="Navigation"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Navigation Pages..." kind="action" name="AddNavigationPages"> + <EntityData EntityName="SeamNavigationPages"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="no-conversation-view-id" Mandatory="no"/> + <AttributeData AttributeName="login-view-id" Mandatory="no"/> + <AttributeData AttributeName="http-port" Mandatory="no"/> + <AttributeData AttributeName="https-port" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + </XActionItem> + </XActionItem> + </XEntityExtension> + <XEntityExtension name="FileSeamComponents21"> + <XChildrenEntities> + <XChildEntity name="SeamNavigationPages"/> + </XChildrenEntities> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem ICON="action.empty" displayName="Navigation" group="1" + kind="list" name="Navigation"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Navigation Pages..." kind="action" name="AddNavigationPages"> + <EntityData EntityName="SeamNavigationPages"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="no-conversation-view-id" Mandatory="no"/> + <AttributeData AttributeName="login-view-id" Mandatory="no"/> + <AttributeData AttributeName="http-port" Mandatory="no"/> + <AttributeData AttributeName="https-port" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + </XActionItem> + </XActionItem> + </XEntityExtension> + <XEntityExtension name="FileSeamComponents22"> + <XChildrenEntities> + <XChildEntity name="SeamNavigationPages"/> + </XChildrenEntities> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem ICON="action.empty" displayName="Navigation" group="1" + kind="list" name="Navigation"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Navigation Pages..." kind="action" name="AddNavigationPages"> + <EntityData EntityName="SeamNavigationPages"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="no-conversation-view-id" Mandatory="no"/> + <AttributeData AttributeName="login-view-id" Mandatory="no"/> + <AttributeData AttributeName="http-port" Mandatory="no"/> + <AttributeData AttributeName="https-port" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + </XActionItem> + </XActionItem> + </XEntityExtension> +</XModelEntityGroup> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/PropertyListFormLayoutData.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/PropertyListFormLayoutData.java 2010-05-18 13:02:14 UTC (rev 22171) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/PropertyListFormLayoutData.java 2010-05-18 14:37:22 UTC (rev 22172) @@ -33,6 +33,9 @@ static String ENT_RESTRICTIONS = "SeamFrameworkRestrictions"; //$NON-NLS-1$ static String ENT_HINTS = "SeamFrameworkHints"; //$NON-NLS-1$ + static String ENT_NAVIGATION_PAGES = "SeamNavigationPages"; //$NON-NLS-1$ + static String ENT_NAVIGATION_RESOURCES = "SeamNavigationResources"; //$NON-NLS-1$ + static String ENT_THEME_SELECTOR = "SeamThemeSelector"; //$NON-NLS-1$ static String ENT_AVAILABLE_THEMES = "SeamThemeAvailableThemes"; //$NON-NLS-1$ @@ -225,6 +228,23 @@ ENT_FILTER, new String[]{null}, FILTER_DEFINITIONS); /** + * Navigation + */ + private final static IFormData[] NAVIGATION_RESOURCES_DEFINITIONS = new IFormData[] { + createListDefinition("Resources") //$NON-NLS-1$ + }; + + final static IFormData NAVIGATION_RESOURCES_FORM_DEFINITION = new FormData( + ENT_NAVIGATION_RESOURCES, new String[]{null}, NAVIGATION_RESOURCES_DEFINITIONS); + + private final static IFormData[] NAVIGATION_PAGES_DEFINITIONS = + createDefinitionsForListHolder("Navigation Pages", ENT_NAVIGATION_PAGES, "Resources", "resources"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + final static IFormData NAVIGATION_PAGES_FORM_DEFINITION = new FormData( + ENT_NAVIGATION_PAGES, new String[]{null}, NAVIGATION_PAGES_DEFINITIONS); + + + /** * Theme */ private final static IFormData[] AVAILABLE_THEMES_DEFINITIONS = new IFormData[] { Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/SeamComponentsCoreFormLayoutData.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/SeamComponentsCoreFormLayoutData.java 2010-05-18 13:02:14 UTC (rev 22171) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/SeamComponentsCoreFormLayoutData.java 2010-05-18 14:37:22 UTC (rev 22172) @@ -43,6 +43,9 @@ PropertyListFormLayoutData.HINTS_FORM_DEFINITION, PropertyListFormLayoutData.RESTRICTIONS_FORM_DEFINITION, + PropertyListFormLayoutData.NAVIGATION_PAGES_FORM_DEFINITION, + PropertyListFormLayoutData.NAVIGATION_RESOURCES_FORM_DEFINITION, + PropertyListFormLayoutData.THEME_SELECTOR_FORM_DEFINITION, PropertyListFormLayoutData.AVAILABLE_THEMES_FORM_DEFINITION, Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF 2010-05-18 13:02:14 UTC (rev 22171) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF 2010-05-18 14:37:22 UTC (rev 22172) @@ -3,6 +3,10 @@ Bundle-Name: Seam XML Tests Bundle-SymbolicName: org.jboss.tools.seam.xml.test;singleton:=true Bundle-Version: 3.1.0.qualifier -Require-Bundle: org.eclipse.core.runtime +Require-Bundle: org.eclipse.core.runtime, + org.junit, + org.jboss.tools.seam.xml, + org.jboss.tools.common.test, + org.jboss.tools.tests Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties 2010-05-18 13:02:14 UTC (rev 22171) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties 2010-05-18 14:37:22 UTC (rev 22172) @@ -1,4 +1,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + projects/ Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components22.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components22.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components22.xml 2010-05-18 14:37:22 UTC (rev 22172) @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:framework="http://jboss.com/products/seam/framework" + xmlns:navigation="http://jboss.com/products/seam/navigation" + xmlns:pdf="http://jboss.com/products/seam/pdf" + xmlns:remoting="http://jboss.com/products/seam/remoting" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.2.xsd http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.2.xsd http://jboss.com/products/seam/remoting http://jboss.com/products/seam/remoting-2.2.xsd http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.2.xsd http://jboss.com/products/seam/navigation http://jboss.com/products/seam/navigation-2.2.xsd http://jboss.com/products/seam/pdf http://jboss.com/products/seam/pdf-2.2.xsd"> + <component class="MyCls" name="component1"/> + <framework:entity-query name="entityQuery"/> + <remoting:remoting poll-interval="1" poll-timeout="2"/> + <core:manager/> + <navigation:pages http-port="1111" https-port="1112" + login-view-id="b.xhtml" no-conversation-view-id="a.xhtml"> + <navigation:resources> + <value>v2</value> + </navigation:resources> + </navigation:pages> + <pdf:document-store name="mypdfStore"/> +</components> Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components22.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLAllTests.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLAllTests.java 2010-05-18 14:37:22 UTC (rev 22172) @@ -0,0 +1,31 @@ +/******************************************************************************* + * 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.seam.xml.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + + +/** + * @author V.Kabanovich + * + */ +public class SeamXMLAllTests { + public static final String PLUGIN_ID = "org.jboss.tools.seam.xml"; + + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.setName("All tests for " + PLUGIN_ID); + suite.addTest(new SeamXMLTestSetup(SeamXMLTestSuite.suite())); + + return suite; + } +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLAllTests.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java 2010-05-18 14:37:22 UTC (rev 22172) @@ -0,0 +1,100 @@ +/******************************************************************************* + * 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.seam.xml.test; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.Path; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.seam.xml.components.model.SeamComponentConstants; + +public class SeamXMLModelTest extends TestCase { + IProject project = null; + + public SeamXMLModelTest() { + super("Seam Scanner test"); + project = getTestProject(); + } + + public IProject getTestProject() { + if(project==null) { + try { + project = findTestProject(); + if(project==null || !project.exists()) { +// project = importPreparedProject("/"); + } + } catch (Exception e) { + e.printStackTrace(); + fail("Can't import Seam XML test project: " + e.getMessage()); + } + } + return project; + } + + public static IProject findTestProject() { + return ResourcesPlugin.getWorkspace().getRoot().getProject("Test"); + } + + + /** + * This test is to check different cases of declaring components in xml. + * It does not check interaction of xml declaration with other declarations. + */ + public void testXMLModel() { + IFile f = project.getFile(new Path("components22.xml")); + assertNotNull("File components22.xml is not found in Test project.", f); + + XModelObject fileObject = EclipseResourceUtil.createObjectForResource(f); + assertNotNull("Cannot create XModel object for file components22.xml.", fileObject); + + String entity = fileObject.getModelEntity().getName(); + assertEquals("File components22.xml is incorrectly parsed by XModel.", SeamComponentConstants.ENT_SEAM_COMPONENTS_22, entity); + + //TODO continue test + } + + protected XModelObject getComponents22Object() { + if(project == null) return null; + IFile f = project.getFile(new Path("components22.xml")); + return f == null ? null : EclipseResourceUtil.createObjectForResource(f); + + } + + public void testNavigationPagesComponent() { + XModelObject fileObject = getComponents22Object(); + assertNotNull("Cannot create XModel object for file components22.xml.", fileObject); + + XModelObject navigationPages = fileObject.getChildByPath("org.jboss.seam.navigation.pages"); + assertNotNull("Cannot find org.jboss.seam.navigation.pages", navigationPages); + + XModelObject resources = navigationPages.getChildByPath("resources"); + assertNotNull("Cannot find resources in org.jboss.seam.navigation.pages", resources); + + XModelObject[] resourcesList = resources.getChildren(); + assertEquals(1, resourcesList.length); + + assertAttribute(navigationPages, "no-conversation-view-id", "a.xhtml"); + assertAttribute(navigationPages, "login-view-id", "b.xhtml"); + assertAttribute(navigationPages, "http-port", "1111"); + assertAttribute(navigationPages, "https-port", "1112"); + + } + + protected void assertAttribute(XModelObject object, String name, String value) { + String actual = object.getAttributeValue(name); + assertEquals("Attribute " + name + " in " + object.getPresentationString() + " is incorrect.", value, actual); + } + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java 2010-05-18 14:37:22 UTC (rev 22172) @@ -0,0 +1,50 @@ +/******************************************************************************* + * Copyright (c) 2010 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.seam.xml.test; + +import junit.extensions.TestSetup; +import junit.framework.Test; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; +import org.jboss.tools.test.util.xpl.EditorTestHelper; + +/** + * @author Viacheslav Kabanovich + */ +public class SeamXMLTestSetup extends TestSetup { + + protected IProject project; + + public SeamXMLTestSetup(Test test) { + super(test); + } + + @Override + protected void setUp() throws Exception { + project = ResourcesUtils.importProject( + "org.jboss.tools.seam.xml.test","/projects/Test" , new NullProgressMonitor()); + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + EditorTestHelper.joinBackgroundActivities(); + } + + @Override + protected void tearDown() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(); + project.delete(true, true, null); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSuite.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSuite.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSuite.java 2010-05-18 14:37:22 UTC (rev 22172) @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2010 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.seam.xml.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * @author V. Kabanovich + */ +public class SeamXMLTestSuite extends TestSuite { + + public static Test suite() { + TestSuite suite = new TestSuite("Seam XML Tests"); + suite.addTestSuite(SeamXMLModelTest.class); + return suite; + } +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSuite.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r22171 - trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2010-05-18 09:02:14 -0400 (Tue, 18 May 2010) New Revision: 22171 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/ConfigureRuntimePage.java Log: JBDS-1181 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/ConfigureRuntimePage.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/ConfigureRuntimePage.java 2010-05-18 12:59:24 UTC (rev 22170) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/ConfigureRuntimePage.java 2010-05-18 13:02:14 UTC (rev 22171) @@ -61,7 +61,7 @@ Composite composite = createClientArea(parent); createLocateJbpmRuntimeGroup(composite); createSpace(composite); - createDownloadJbpmRuntimeLink(composite); +// createDownloadJbpmRuntimeLink(composite); setControl(composite); } @@ -85,19 +85,19 @@ label.setLayoutData(new GridData(GridData.FILL_BOTH)); } - private void createDownloadJbpmRuntimeLink(Composite composite) { - Link link = new Link(composite, SWT.NONE); - link.setText("<a>Download the JBoss jBPM package if you have none available yet.</a>"); - GridData gridData = new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalAlignment = SWT.CENTER; - gridData.verticalIndent = 5; - link.setLayoutData(gridData); - link.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - Program.launch("http://labs.jboss.com/jbossjbpm/downloads/"); - } - }); - } +// private void createDownloadJbpmRuntimeLink(Composite composite) { +// Link link = new Link(composite, SWT.NONE); +// link.setText("<a>Download the JBoss jBPM package if you have none available yet.</a>"); +// GridData gridData = new GridData(GridData.FILL_HORIZONTAL); +// gridData.horizontalAlignment = SWT.CENTER; +// gridData.verticalIndent = 5; +// link.setLayoutData(gridData); +// link.addSelectionListener(new SelectionAdapter() { +// public void widgetSelected(SelectionEvent e) { +// Program.launch("http://labs.jboss.com/jbossjbpm/downloads/"); +// } +// }); +// } private void createLocateJbpmRuntimeGroup(Composite composite) { Group group = new Group(composite, SWT.NONE);

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r22170 - branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2010-05-18 08:59:24 -0400 (Tue, 18 May 2010) New Revision: 22170 Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/ConfigureRuntimePage.java Log: JBDS-1181 Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/ConfigureRuntimePage.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/ConfigureRuntimePage.java 2010-05-18 12:57:26 UTC (rev 22169) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/ConfigureRuntimePage.java 2010-05-18 12:59:24 UTC (rev 22170) @@ -61,7 +61,7 @@ Composite composite = createClientArea(parent); createLocateJbpmRuntimeGroup(composite); createSpace(composite); - createDownloadJbpmRuntimeLink(composite); +// createDownloadJbpmRuntimeLink(composite); setControl(composite); } @@ -85,19 +85,19 @@ label.setLayoutData(new GridData(GridData.FILL_BOTH)); } - private void createDownloadJbpmRuntimeLink(Composite composite) { - Link link = new Link(composite, SWT.NONE); - link.setText("<a>Download the JBoss jBPM package if you have none available yet.</a>"); - GridData gridData = new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalAlignment = SWT.CENTER; - gridData.verticalIndent = 5; - link.setLayoutData(gridData); - link.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - Program.launch("http://labs.jboss.com/jbossjbpm/downloads/"); - } - }); - } +// private void createDownloadJbpmRuntimeLink(Composite composite) { +// Link link = new Link(composite, SWT.NONE); +// link.setText("<a>Download the JBoss jBPM package if you have none available yet.</a>"); +// GridData gridData = new GridData(GridData.FILL_HORIZONTAL); +// gridData.horizontalAlignment = SWT.CENTER; +// gridData.verticalIndent = 5; +// link.setLayoutData(gridData); +// link.addSelectionListener(new SelectionAdapter() { +// public void widgetSelected(SelectionEvent e) { +// Program.launch("http://labs.jboss.com/jbossjbpm/downloads/"); +// } +// }); +// } private void createLocateJbpmRuntimeGroup(Composite composite) { Group group = new Group(composite, SWT.NONE);

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r22169 - in workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces: src/org/jboss/tools/jsf/vpe/icefaces/utill and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2010-05-18 08:57:26 -0400 (Tue, 18 May 2010) New Revision: 22169 Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IcePanelGridTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeHtmlPanelGrid.java Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputSecretTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeUIComponent.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templates-icefaces.xml Log: Working under processing complex jsf elements, https://jira.jboss.org/browse/JBIDE-4710 Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java 2010-05-18 12:17:44 UTC (rev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java 2010-05-18 12:57:26 UTC (rev 22169) @@ -34,7 +34,7 @@ Renderer render = new com.icesoft.faces.component.ext.renderkit.ButtonRenderer(); VpeUICommand uiComponent = new VpeUICommand( (Element) sourceNode); - return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument, render, uiComponent); + return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, visualDocument, render, uiComponent); } } Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-18 12:17:44 UTC (rev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-18 12:57:26 UTC (rev 22169) @@ -35,7 +35,7 @@ Renderer render = new com.icesoft.faces.renderkit.dom_html_basic.TextRenderer(); VpeUIComponent uiComponent = new VpeUIComponent( (Element) sourceNode); - return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument, render, uiComponent); + return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, visualDocument, render, uiComponent); } } Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java 2010-05-18 12:17:44 UTC (rev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java 2010-05-18 12:57:26 UTC (rev 22169) @@ -34,7 +34,7 @@ Renderer render = new com.icesoft.faces.renderkit.dom_html_basic.CheckboxRenderer(); VpeUIComponent uiComponent = new VpeUIComponent( (Element) sourceNode); - return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument, render, uiComponent); + return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, visualDocument, render, uiComponent); } } Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputSecretTemplate.java =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputSecretTemplate.java 2010-05-18 12:17:44 UTC (rev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputSecretTemplate.java 2010-05-18 12:57:26 UTC (rev 22169) @@ -15,7 +15,6 @@ import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlInputSecret; -import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlInputText; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeCreationData; @@ -35,7 +34,7 @@ Renderer render = new com.icesoft.faces.component.ext.renderkit.SecretRenderer(); VpeHtmlInputSecret uiComponent = new VpeHtmlInputSecret( (Element) sourceNode); - return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument, render, uiComponent); + return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, visualDocument, render, uiComponent); } } Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-18 12:17:44 UTC (rev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-18 12:57:26 UTC (rev 22169) @@ -34,7 +34,7 @@ Renderer render = new com.icesoft.faces.component.ext.renderkit.InputTextRenderer(); VpeHtmlInputText uiComponent = new VpeHtmlInputText( (Element) sourceNode); - return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument, render, uiComponent); + return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, visualDocument, render, uiComponent); } } Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IcePanelGridTemplate.java =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IcePanelGridTemplate.java (rev 0) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IcePanelGridTemplate.java 2010-05-18 12:57:26 UTC (rev 22169) @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.icefaces.template; + +import javax.faces.render.Renderer; +import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlPanelGrid; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.mozilla.interfaces.nsIDOMDocument; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * @author mareshkau + * + */ +public class IcePanelGridTemplate extends VpeAbstractTemplate{ + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + VpeFacesContext.getInstance().setResponseWriter(null); + Renderer render = new com.icesoft.faces.component.ext.renderkit.GridRenderer(); + VpeHtmlPanelGrid uiComponent = new VpeHtmlPanelGrid( + (Element) sourceNode); + return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, visualDocument, render, uiComponent); + } + +} Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-18 12:17:44 UTC (rev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-18 12:57:26 UTC (rev 22169) @@ -37,7 +37,7 @@ */ public class VpeRendererUtil { - public static final VpeCreationData createVisualEditorDate( + public static final VpeCreationData createVisualEditorData( VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, final Renderer render, final UIComponent uiComponent) { @@ -69,6 +69,7 @@ try { render.encodeBegin(VpeFacesContext.getInstance(), uiComponent); + render.encodeChildren(VpeFacesContext.getInstance(), uiComponent); render.encodeEnd(VpeFacesContext.getInstance(), uiComponent); } catch (Throwable e) { IceFacesActivator.getDefault().logError(e); Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeHtmlPanelGrid.java =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeHtmlPanelGrid.java (rev 0) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeHtmlPanelGrid.java 2010-05-18 12:57:26 UTC (rev 22169) @@ -0,0 +1,149 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.template.mock.impl; + +import java.util.HashMap; +import java.util.Map; + +import javax.el.ELContext; +import javax.el.ELException; +import javax.el.PropertyNotWritableException; +import javax.el.ValueExpression; +import javax.faces.component.html.HtmlPanelGrid; +import javax.faces.context.FacesContext; +import javax.el.PropertyNotFoundException; + +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * @author mareshkau + * + */ +public class VpeHtmlPanelGrid extends HtmlPanelGrid { + + private Map<String,String> attributesMap; + + private Element sourceElement; + + public VpeHtmlPanelGrid(Element sourceElement) { + this.attributesMap = new HashMap<String,String>(); + NamedNodeMap attributes = sourceElement.getAttributes(); + for(int i=0;i<attributes.getLength();i++){ + Node item = attributes.item(i); + this.attributesMap.put(item.getNodeName(), item.getNodeValue()); + } + setSourceElement(sourceElement); + } + + @Override + public int getChildCount() { + return getSourceElement().getChildNodes().getLength(); + } + /* (non-Javadoc) + * @see javax.faces.component.UIComponent#getClientId(javax.faces.context.FacesContext) + */ + @Override + public String getClientId(FacesContext arg0) { + return (String) getAttributes().get("id"); //$NON-NLS-1$ + } + /* (non-Javadoc) + * @see javax.faces.component.UIComponent#getAttributes() + */ + @Override + public Map getAttributes() { + return this.attributesMap; + } + /* (non-Javadoc) + * @see javax.faces.component.UIComponent#getValueExpression(java.lang.String) + */ + @Override + public ValueExpression getValueExpression(final String name) { + return new ValueExpression(){ + + @Override + public Class<?> getExpectedType() { + // TODO Auto-generated method stub + return String.class; + } + + @Override + public Class<?> getType(ELContext arg0) + throws NullPointerException, PropertyNotFoundException, + ELException { + // TODO Auto-generated method stub + return String.class; + } + + @Override + public Object getValue(ELContext arg0) throws NullPointerException, + PropertyNotFoundException, ELException { + return getAttributes().get(name); + } + + @Override + public boolean isReadOnly(ELContext arg0) + throws NullPointerException, PropertyNotFoundException, + ELException { + // TODO Auto-generated method stub + return false; + } + + @Override + public void setValue(ELContext arg0, Object arg1) + throws NullPointerException, PropertyNotFoundException, + PropertyNotWritableException, ELException { + // TODO Auto-generated method stub + + } + + @Override + public boolean equals(Object arg0) { + // TODO Auto-generated method stub + return false; + } + + @Override + public String getExpressionString() { + // TODO Auto-generated method stub + return (String) getAttributes().get(name); + } + + @Override + public int hashCode() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public boolean isLiteralText() { + // TODO Auto-generated method stub + return false; + } + + }; + } + + /** + * @param sourceElement the sourceElement to set + */ + private void setSourceElement(Element sourceElement) { + this.sourceElement = sourceElement; + } + + /** + * @return the sourceElement + */ + private Element getSourceElement() { + return this.sourceElement; + } +} Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeUIComponent.java =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeUIComponent.java 2010-05-18 12:17:44 UTC (rev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeUIComponent.java 2010-05-18 12:57:26 UTC (rev 22169) @@ -18,9 +18,7 @@ import javax.el.PropertyNotWritableException; import javax.el.ValueExpression; import javax.faces.context.FacesContext; -import javax.faces.el.EvaluationException; import javax.faces.el.PropertyNotFoundException; -import javax.faces.el.ValueBinding; import org.jboss.tools.jsf.vpe.template.mock.abstr.VpeAbstractUIComponent; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templates-icefaces.xml =================================================================== --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templates-icefaces.xml 2010-05-18 12:17:44 UTC (rev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templates-icefaces.xml 2010-05-18 12:57:26 UTC (rev 22169) @@ -70,4 +70,17 @@ </vpe:dnd> </vpe:template> </vpe:tag> + <vpe:tag name="ice:panelGrid" case-sensitive="yes"> + <vpe:template children="yes" modify="yes" + class="org.jboss.tools.jsf.vpe.icefaces.template.IcePanelGridTemplate"> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + <vpe:drop container="no"></vpe:drop> + </vpe:dnd> + </vpe:template> + </vpe:tag> </vpe:templates>

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r22168 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test: resources/jbossws and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jlukas(a)redhat.com Date: 2010-05-18 08:17:44 -0400 (Tue, 18 May 2010) New Revision: 22168 Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message_soap_out.xml trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WsTesterTest.java Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF Log: tests for ws tester feature Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF 2010-05-18 12:03:37 UTC (rev 22167) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF 2010-05-18 12:17:44 UTC (rev 22168) @@ -16,7 +16,8 @@ org.eclipse.swtbot.swt.finder;bundle-version="2.0.0", org.eclipse.ui.ide;bundle-version="3.5.1", org.eclipse.ui.forms;bundle-version="3.4.1", - org.junit4;bundle-version="4.5.0" + org.junit4;bundle-version="4.5.0", + org.jboss.tools.ws.ui;bundle-version="1.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Eclipse-RegisterBuddy: org.apache.log4j Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message_soap_out.xml =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message_soap_out.xml (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message_soap_out.xml 2010-05-18 12:17:44 UTC (rev 22168) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"> + <soap:Body> + <GetBibleWordsByChapterAndVerse xmlns="http://www.webserviceX.NET"> + <BookTitle>Mark</BookTitle> + <chapter>1</chapter> + <Verse>1</Verse> + </GetBibleWordsByChapterAndVerse> + </soap:Body> +</soap:Envelope> Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WsTesterTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WsTesterTest.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WsTesterTest.java 2010-05-18 12:17:44 UTC (rev 22168) @@ -0,0 +1,471 @@ +/******************************************************************************* + * Copyright (c) 2010 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.ws.ui.bot.test; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.eclipse.core.runtime.Platform; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.waits.Conditions; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTabItem; +import org.eclipse.ui.internal.WorkbenchMessages; +import org.eclipse.ui.internal.ide.IDEWorkbenchMessages; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.gen.IView; +import org.jboss.tools.ui.bot.ext.view.ViewBase; +import org.jboss.tools.ws.ui.messages.JBossWSUIMessages; +import org.junit.Assert; +import org.junit.Test; +import org.osgi.framework.Bundle; + +/** + * Tests for Web Service Tester + * + * @author jlukas + */ +@SuppressWarnings("restriction") +public class WsTesterTest extends SWTTestExt { + + private static final Logger L = Logger.getLogger(WsTesterTest.class.getName()); + private static final String SERVICE_URL = "http://www.webservicex.net/BibleWebservice.asmx"; + + /** + * Test behavior of UI + */ + @Test + public void testUI() { + WsTesterView wstv = new WsTesterView(); + SWTBotView viewBot = wstv.show(); + Assert.assertTrue("Tester View is not active", viewBot.isActive()); + Assert.assertFalse(wstv.isHttpMethodSelectionEnabled()); + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_RS); + Assert.assertTrue(wstv.isHttpMethodSelectionEnabled()); + wstv.setHttpMethod(WsTesterView.Http_Method.PUT); + Assert.assertEquals(WsTesterView.Http_Method.PUT, wstv.getHttpMethod()); + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_WS); + Assert.assertFalse(wstv.isHttpMethodSelectionEnabled()); + Assert.assertEquals(WsTesterView.Http_Method.POST, wstv.getHttpMethod()); + + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_RS); + Assert.assertTrue(wstv.isHttpMethodSelectionEnabled()); + wstv.setHttpMethod(WsTesterView.Http_Method.DELETE); + Assert.assertEquals(WsTesterView.Http_Method.DELETE, wstv.getHttpMethod()); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.HEADER, "a", "1"); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.HEADER, "b", "2"); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.HEADER, "c", "3"); + Assert.assertEquals(3, wstv.getRequestArgs(WsTesterView.Request_Arg_Type.HEADER).keySet().size()); + Assert.assertTrue(wstv.getRequestArgs(WsTesterView.Request_Arg_Type.HEADER).containsKey("b")); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.HEADER, "d", "4"); + Assert.assertEquals(4, wstv.getRequestArgs(WsTesterView.Request_Arg_Type.HEADER).keySet().size()); + Assert.assertTrue(wstv.getRequestArgs(WsTesterView.Request_Arg_Type.HEADER).containsKey("d")); + wstv.upRequestArg(WsTesterView.Request_Arg_Type.HEADER, "c", "3"); + wstv.downRequestArg(WsTesterView.Request_Arg_Type.HEADER, "b", "2"); + Assert.assertEquals(4, wstv.getRequestArgs(WsTesterView.Request_Arg_Type.HEADER).keySet().size()); + wstv.removeRequestArg(WsTesterView.Request_Arg_Type.HEADER, "a", "1"); + wstv.removeRequestArg(WsTesterView.Request_Arg_Type.HEADER, "c", "3"); + Assert.assertEquals(2, wstv.getRequestArgs(WsTesterView.Request_Arg_Type.HEADER).keySet().size()); + wstv.clearRequestArgs(WsTesterView.Request_Arg_Type.HEADER); + Assert.assertEquals(0, wstv.getRequestArgs(WsTesterView.Request_Arg_Type.HEADER).keySet().size()); + viewBot.close(); + } + + /** + * Test SOAP service invocation + */ + @Test + public void testSOAPService() { + WsTesterView wstv = new WsTesterView(); + wstv.show(); + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_WS); + Assert.assertFalse(wstv.isHttpMethodSelectionEnabled()); + Assert.assertEquals(WsTesterView.Http_Method.POST, wstv.getHttpMethod()); + String actionUrl = "http://www.webserviceX.NET/GetBibleWordsByChapterAndVerse"; + wstv.setServiceURL(SERVICE_URL); + wstv.setActionURL(actionUrl); + InputStream is = WsTesterTest.class.getResourceAsStream("/resources/jbossws/message_soap_out.xml"); + wstv.setRequestBody(readResource(is)); + wstv.invoke(); + String rsp = wstv.getResponseBody(); + L.log(Level.FINE, "SOAP response: {0}", rsp); + Assert.assertTrue(rsp.trim().length() > 0); + checkResponse(rsp, "<BookTitle>Mark</BookTitle>"); + } + + /** + * Test REST service invocation (GET request) + */ + @Test + public void testRESTGETService() { + WsTesterView wstv = new WsTesterView(); + wstv.show(); + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_RS); + wstv.setHttpMethod(WsTesterView.Http_Method.GET); + wstv.setServiceURL(SERVICE_URL + "/GetBibleWordsByChapterAndVerse"); + wstv.clearRequestArgs(WsTesterView.Request_Arg_Type.PARAMETER); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.PARAMETER, "BookTitle", "Luke"); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.PARAMETER, "chapter", "2"); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.PARAMETER, "Verse", "2"); + wstv.editRequestArg(WsTesterView.Request_Arg_Type.PARAMETER, "chapter", "2", "chapter", "1"); + wstv.invoke(); + String rsp = wstv.getResponseBody(); + String[] rspHeaders = wstv.getResponseHeaders(); + L.log(Level.FINE, "REST response: {0}", rsp); + L.log(Level.FINE, "Response headers: {0}", Arrays.asList(rspHeaders)); + Assert.assertTrue(rsp.trim().length() > 0); + checkResponse(rsp, "<Chapter>1</Chapter>"); + checkResponse(rsp, "ministers of the word"); + } + + /** + * Test REST service invocation (POST request) + */ + @Test + public void testRESTPOSTService() { + WsTesterView wstv = new WsTesterView(); + wstv.show(); + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_RS); + wstv.setHttpMethod(WsTesterView.Http_Method.POST); + wstv.setServiceURL(SERVICE_URL + "/GetBibleWordsByChapterAndVerse"); + String requestBody = "BookTitle=John&chapter=3&Verse=1\r"; + wstv.setRequestBody(requestBody); + wstv.clearRequestArgs(WsTesterView.Request_Arg_Type.PARAMETER); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.HEADER, "Content-Type", "application/x-www-form-urlencoded"); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.HEADER, "Content-Length", String.valueOf(requestBody.length())); + wstv.invoke(); + String rsp = wstv.getResponseBody(); + String[] rspHeaders = wstv.getResponseHeaders(); + L.log(Level.FINE, "REST response: {0}", rsp); + L.log(Level.FINE, "Response headers: {0}", Arrays.asList(rspHeaders)); + Assert.assertTrue(rsp.trim().length() > 0); + checkResponse(rsp, "<Chapter>3</Chapter>"); + checkResponse(rsp, "There was a man of the Pharisees, named Nicodemus, a ruler of the Jews"); + } + +// @Test +// @Ignore +// public void testSOAPSample() { +// WsTesterView wstv = new WsTesterView(); +// wstv.show(); +// wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_WS); +// wstv.setSampleContent(); +// wstv.invoke(); +// String rsp = wstv.getResponseBody(); +// L.log(Level.FINE, "SOAP Sample response: {0}", rsp); +// checkResponse(rsp, "To be, or not to be: that is the question"); +// } +// +// @Test +// @Ignore +// public void testRESTSample() { +// WsTesterView wstv = new WsTesterView(); +// SWTBotView viewBot = wstv.show(); +// wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_RS); +// wstv.setSampleContent(); +// wstv.invoke(); +// String rsp = wstv.getResponseBody(); +// String[] rspHeaders = wstv.getResponseHeaders(); +// L.log(Level.FINE, "REST Sample response: {0}", rsp); +// L.log(Level.FINE, "Response headers: {0}", Arrays.asList(rspHeaders)); +// checkResponse(rsp, "Colorado Springs"); +// viewBot.close(); +// } + @Test + public void testOpenMonitor() { + WsTesterView wstv = new WsTesterView(); + SWTBotView tv = wstv.show(); + wstv.openMonitor(); + SWTBotView av = bot.activeView(); + Assert.assertEquals("TCP/IP Monitor", av.getTitle()); + av.close(); + tv.close(); + } + + @Test + public void testConfigureMonitor() { + WsTesterView wstv = new WsTesterView(); + SWTBotView tv = wstv.show(); + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_WS); + Assert.assertFalse(wstv.isHttpMethodSelectionEnabled()); + Assert.assertEquals(WsTesterView.Http_Method.POST, wstv.getHttpMethod()); + String actionUrl = "http://www.webserviceX.NET/GetBibleWordsByChapterAndVerse"; + wstv.setServiceURL(SERVICE_URL); + wstv.setActionURL(actionUrl); + InputStream is = WsTesterTest.class.getResourceAsStream("/resources/jbossws/message_soap_out.xml"); + wstv.setRequestBody(readResource(is)); + wstv.configureMonitor(); + SWTBotShell sh = bot.activeShell(); + Assert.assertEquals("New Monitor", sh.getText()); + sh.bot().spinner("80", 0).setSelection(8077); + sh.bot().button("OK").click(); + tv.show(); + wstv.invoke(); + tv.show(); + String rsp = wstv.getResponseBody(); + L.log(Level.FINE, "SOAP response: {0}", rsp); + Assert.assertTrue(rsp.trim().length() > 0); + checkResponse(rsp, "<BookTitle>Mark</BookTitle>"); + } + + @Test + public void testErrorResponse() { + WsTesterView wstv = new WsTesterView(); + wstv.show(); + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_RS); + wstv.setHttpMethod(WsTesterView.Http_Method.GET); + wstv.setServiceURL("http://www.zvents.com/rest/event_update"); + wstv.invoke(); + Assert.assertEquals(0, wstv.getRequestArgs(WsTesterView.Request_Arg_Type.PARAMETER).size()); + String rsp = wstv.getResponseBody(); + String[] rspHeaders = wstv.getResponseHeaders(); + L.log(Level.FINE, "REST response: {0}", rsp); + L.log(Level.FINE, "Response headers: {0}", Arrays.asList(rspHeaders)); + Assert.assertTrue(rsp.trim().length() > 0); + checkResponse(rsp, "Invalid API Key."); + } + + private String readResource(InputStream is) { + StringBuilder sb = new StringBuilder(); + BufferedReader br = null; + try { + br = new BufferedReader(new InputStreamReader(is)); + String s; + while ((s = br.readLine()) != null) { + sb.append(s); + sb.append('\n'); + } + } catch (IOException e) { + L.log(Level.WARNING, e.getMessage(), e); + } finally { + if (br != null) { + try { + br.close(); + } catch (IOException e) { + L.log(Level.FINEST, e.getMessage(), e); + } + } + } + return sb.toString(); + } + + private void checkResponse(String rsp, String expContent) { + try { + Assert.assertTrue(rsp, rsp.contains(expContent)); + } catch (AssertionError t) { + if (rsp.contains("503")) { + L.log(Level.WARNING, "Service Unavailable: {0}", SERVICE_URL); + } else { + throw t; + } + } + } + + private static class WsTesterView extends ViewBase { + + private static final Bundle WSUI_BUNDLE = Platform.getBundle("org.jboss.tools.ws.ui"); + + enum Ws_Type { + + JAX_WS, JAX_RS; + + String getLabel() { + switch (this) { + case JAX_WS: + return "JAX-WS"; + case JAX_RS: + return "JAX-RS"; + } + throw new AssertionError("Invalid Web Service Type"); + } + } + + enum Http_Method { + + GET, POST, PUT, DELETE; + } + + enum Request_Arg_Type { + + HEADER(JBossWSUIMessages.JAXRSWSTestView_Request_Header_Label), + PARAMETER(JBossWSUIMessages.JAXRSWSTestView_Request_Parameters_Label); + private String type; + + private Request_Arg_Type(String s) { + type = s; + } + + private String getType() { + return type; + } + } + + public WsTesterView() { + super(); + viewObject = new IView() { + + public String getName() { + // Web Service Tester + return getStringFromBundle("%test.view.name"); + } + + public List<String> getGroupPath() { + // JBoss Tools Web Services + return Collections.singletonList(getStringFromBundle("%test.view.category.name")); + } + }; + } + + @Override + public SWTBotView show() { + SWTBotView b = super.show(); + // maximize tester view + menu(IDEWorkbenchMessages.Workbench_window).menu(WorkbenchMessages.MaximizePartAction_text).click(); + return b; + } + + public void setWebServiceType(Ws_Type type) { + comboBox(0).setSelection(type.getLabel()); + } + +// public void setSampleContent() { +// button(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data_Label).click(); +// } + public void setHttpMethod(Http_Method m) { + comboBox(1).setSelection(m.toString()); + } + + public Http_Method getHttpMethod() { + return Enum.valueOf(Http_Method.class, comboBox(1).getText()); + } + + public boolean isHttpMethodSelectionEnabled() { + return comboBox(1).isEnabled(); + } + + public void setServiceURL(String url) { + comboBox(2).typeText(url); + } + + public void setActionURL(String s) { + text(0).typeText(s); + } + + public void setRequestBody(String s) { + SWTBotTabItem ti = tabItem(JBossWSUIMessages.JAXRSWSTestView_Request_Body_Label); + ti.activate(); + text(1).setText(s); + } + + public void addRequestArg(Request_Arg_Type type, String name, String value) { + SWTBotTabItem ti = bot.tabItem(type.getType()); + ti.activate(); + text(1).typeText(name + "=" + value); + bot.button("Add").click(); + text(1).setText(""); + } + + public Map<String, String> getRequestArgs(Request_Arg_Type type) { + SWTBotTabItem ti = bot.tabItem(type.getType()); + ti.activate(); + String[] args = list(0).getItems(); + Map<String, String> result = new HashMap<String, String>(); + for (String s : args) { + int i = s.indexOf('='); + result.put(s.substring(0, i), s.substring(i + 1)); + } + return result; + } + + public void editRequestArg(Request_Arg_Type type, String oldName, + String oldValue, String newName, String newValue) { + SWTBotTabItem ti = bot.tabItem(type.getType()); + ti.activate(); + bot.list(0).select(oldName + "=" + oldValue); + bot.button("Edit").click(); + SWTBot sh = bot.activeShell().bot(); + sh.text(0).typeText(newName + "=" + newValue); + sh.button("OK").click(); + } + + public void upRequestArg(Request_Arg_Type type, String name, String value) { + SWTBotTabItem ti = bot.tabItem(type.getType()); + ti.activate(); + list(0).select(name + "=" + value); + bot.button("Up").click(); + } + + public void downRequestArg(Request_Arg_Type type, String name, String value) { + SWTBotTabItem ti = bot.tabItem(type.getType()); + ti.activate(); + list(0).select(name + "=" + value); + bot.button("Down").click(); + } + + public void removeRequestArg(Request_Arg_Type type, String name, String value) { + SWTBotTabItem ti = bot.tabItem(type.getType()); + ti.activate(); + list(0).select(name + "=" + value); + bot.button("Remove").click(); + } + + public void clearRequestArgs(Request_Arg_Type type) { + SWTBotTabItem ti = bot.tabItem(type.getType()); + ti.activate(); + SWTBotButton b = bot.button("Clear All"); + if (b.isEnabled()) { + b.click(); + } + } + + public String getResponseBody() { + SWTBotTabItem ti = tabItem(JBossWSUIMessages.JAXRSWSTestView_Results_Body_Label); + ti.activate(); + return bot.text(2).getText(); + } + + public String[] getResponseHeaders() { + SWTBotTabItem ti = tabItem(JBossWSUIMessages.JAXRSWSTestView_Results_Header_Label); + ti.activate(); + return list(1).getItems(); + } + + public void invoke() { + String dlgTitle = JBossWSUIMessages.JAXRSWSTestView_Invoke_Label; + button(dlgTitle).click(); + waitWhile(Conditions.shellIsActive(dlgTitle), 120000); + sleep(500); + } + + public void openMonitor() { + button(JBossWSUIMessages.JAXRSWSTestView_Open_Monitor_Button).click(); + } + + public void configureMonitor() { + button(JBossWSUIMessages.JAXRSWSTestView_Configure_Monitor_Button).click(); + } + + private String getStringFromBundle(String key) { + return Platform.getResourceString(WSUI_BUNDLE, key); + } + } +}

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r22166 - trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-05-18 03:05:56 -0400 (Tue, 18 May 2010) New Revision: 22166 Modified: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/MetaModelTest.java Log: testEntytyExtensions method is useless in tycho tests because it runs only model plugin without clients and thus there is n extensions found Modified: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/MetaModelTest.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/MetaModelTest.java 2010-05-18 06:08:16 UTC (rev 22165) +++ trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/MetaModelTest.java 2010-05-18 07:05:56 UTC (rev 22166) @@ -184,8 +184,11 @@ /** * Check that extensions reference existing entities. + * This test make sense only in client plug-ins. It should be moved to jst,jsf and + * others plug-ins which are using model plug-in. + * */ - public void testEntityExtensionsFixMe() { + public void fixmeTestEntityExtensions() { XModelMetaDataImpl meta = (XModelMetaDataImpl)XModelMetaDataImpl.getInstance(); XExtensions s = meta.getExtensions(); //TODO - should be tested through public interface

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r22165 - trunk/tests/features/org.jboss.tools.test.sdk.feature.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-18 02:08:16 -0400 (Tue, 18 May 2010) New Revision: 22165 Modified: trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml Log: mark plugins to be unpacked (help resolving test projects within plugins) Modified: trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml =================================================================== --- trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-05-18 06:05:31 UTC (rev 22164) +++ trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-05-18 06:08:16 UTC (rev 22165) @@ -244,7 +244,7 @@ install-size="0" version="0.0.0" fragment="true" - unpack="false"/> + unpack="true"/> <plugin id="org.jboss.tools.jst.web.kb.test"

15 years, 11 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2010