[jbpm-commits] JBoss JBPM SVN: r2627 - in projects/gwt-console/trunk: war/src/main/java/jmaki/xhp and 4 other directories.

Author: heiko.braun(a)jboss.com Date: 2008-10-27 11:49:45 -0400 (Mon, 27 Oct 2008) New Revision: 2627 Added: projects/gwt-console/trunk/gwt-console.iml projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/DeferredExecution.java projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestDTOParser.java Modified: projects/gwt-console/trunk/war/src/main/java/jmaki/xhp/HttpClient.java projects/gwt-console/trunk/war/src/main/java/jmaki/xhp/XmlHttpProxy.java projects/gwt-console/trunk/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Authentication.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java projects/gwt-console/trunk/war/src/main/resources/jmaki/xhp/xhp.json projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestApplication.java Log: Added passthrough capabilities and default proxy configuration to XmlHttpProxy. Configure URLBuilder according to GWT.isScript() Added: projects/gwt-console/trunk/gwt-console.iml =================================================================== --- projects/gwt-console/trunk/gwt-console.iml (rev 0) +++ projects/gwt-console/trunk/gwt-console.iml 2008-10-27 15:49:45 UTC (rev 2627) @@ -0,0 +1,555 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/rpc/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/server/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/server/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/war/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/war/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/war/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/war/src/test/resources" isTestSource="true" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module-library"> + <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: nekohtml:nekohtml:jar:0.9.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/nekohtml/nekohtml/0.9.4/nekohtml-0.9.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.derby:derby:jar:10.2.1.6:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: poi:poi:jar:2.5.1-final-20040804:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-httpclient:commons-httpclient:jar:3.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gchart:jar:2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gchart/2.2/gchart-2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: xml-apis:xml-apis:jar:1.3.03:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.sun.xml.stream:sjsxp:jar:1.0.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/sun/xml/stream/sjsxp/1.0.1/sjsxp-1.0.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jbpm.jbpm3:jbpm-core:jar:3.3.0-SNAPSHOT:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jbpm/jbpm3/jbpm-core/3.3.0-SNAPSHOT/jbpm-core-3.3.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jbpm/jbpm3/jbpm-core/3.3.0-SNAPSHOT/jbpm-core-3.3.0-SNAPSHOT-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-text-extractors:jar:1.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-api:jar:1.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.mail:mail:jar:1.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: tjws:webserver:jar:1.3.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/tjws/webserver/1.3.3/webserver-1.3.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jyaml:jyaml:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jyaml/jyaml/1.3/jyaml-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0-beta-8:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0-beta-8/jaxrs-api-1.0-beta-8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-spi-commons:jar:1.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.2/jaxb-impl-2.1.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-spi:jar:1.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: concurrent:concurrent:jar:1.3.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-core:jar:1.4.5:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: junit:junit:jar:3.8.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.2/gwt-dev-1.5.2-mac.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: bsh:bsh:jar:1.3.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/bsh/bsh/1.3.0/bsh-1.3.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jbpm.jbpm3:jbpm-enterprise-beans:jar:3.3.0-SNAPSHOT:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jbpm/jbpm3/jbpm-enterprise-beans/3.3.0-SNAPSHOT/jbpm-enterprise-beans-3.3.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jbpm/jbpm3/jbpm-enterprise-beans/3.3.0-SNAPSHOT/jbpm-enterprise-beans-3.3.0-SNAPSHOT-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: pdfbox:pdfbox:jar:0.6.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/pdfbox/pdfbox/0.6.4/pdfbox-0.6.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-codec:commons-codec:jar:1.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.sun.xml.fastinfoset:FastInfoset:jar:1.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/sun/xml/fastinfoset/FastInfoset/1.2.2/FastInfoset-1.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: xerces:xercesImpl:jar:2.8.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.codehaus.jettison:jettison:jar:1.0.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/codehaus/jettison/jettison/1.0.1/jettison-1.0.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.jackrabbit:jackrabbit-jcr-commons:jar:1.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0-beta-8:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0-beta-8/resteasy-jaxrs-1.0-beta-8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.apache.lucene:lucene-core:jar:2.2.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.textmining:tm-extractors:jar:0.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/textmining/tm-extractors/0.4/tm-extractors-0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Modified: projects/gwt-console/trunk/war/src/main/java/jmaki/xhp/HttpClient.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/jmaki/xhp/HttpClient.java 2008-10-27 11:34:07 UTC (rev 2626) +++ projects/gwt-console/trunk/war/src/main/java/jmaki/xhp/HttpClient.java 2008-10-27 15:49:45 UTC (rev 2627) @@ -33,20 +33,26 @@ * @param url URL string * @param headers Map */ - public HttpClient(String phost, - int pport, - String url, - Map headers, - String method) - throws MalformedURLException { - if (phost != null && pport != -1) { + public HttpClient( + String phost, + int pport, + String url, + Map headers, + String method) + throws MalformedURLException + { + if (phost != null && pport != -1) + { this.isProxy = true; } + this.proxyHost = phost; this.proxyPort = pport; + if (url.trim().startsWith("https:")) { isHttps = true; } + this.urlConnection = getURLConnection(url); try { this.urlConnection.setRequestMethod(method); @@ -88,7 +94,7 @@ if (phost != null && pport != -1) { this.isProxy = true; } - + this.proxyHost = phost; this.proxyPort = pport; if (url.trim().startsWith("https:")) { @@ -129,6 +135,7 @@ private HttpURLConnection getURLConnection(String str) throws MalformedURLException { try { + if (isHttps) { /* when communicating with the server which has unsigned or invalid * certificate (https), SSLException or IOException is thrown. @@ -140,12 +147,16 @@ System.setProperty("https.proxyHost", proxyHost); System.setProperty("https.proxyPort", proxyPort + ""); } - } else { - if (isProxy) { + } + else + { + if (isProxy) + { System.setProperty("http.proxyHost", proxyHost); System.setProperty("http.proxyPort", proxyPort + ""); } } + URL url = new URL(str); HttpURLConnection uc = (HttpURLConnection)url.openConnection(); // if this header has not been set by a request set the user agent. @@ -156,12 +167,15 @@ uc.setRequestProperty("user-agent", ua); } return uc; - } catch (MalformedURLException me) { + } + catch (MalformedURLException me) + { throw new MalformedURLException(str + " is not a valid URL"); - } catch (Exception e) { - e.printStackTrace(); - return null; } + catch (Exception e) + { + throw new RuntimeException("Unknown error creating UrlConnection: " + e); + } } /** Modified: projects/gwt-console/trunk/war/src/main/java/jmaki/xhp/XmlHttpProxy.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/jmaki/xhp/XmlHttpProxy.java 2008-10-27 11:34:07 UTC (rev 2626) +++ projects/gwt-console/trunk/war/src/main/java/jmaki/xhp/XmlHttpProxy.java 2008-10-27 15:49:45 UTC (rev 2627) @@ -130,10 +130,12 @@ HttpClient httpclient = null; - if (userName != null && - password != null) { + if (userName != null && password != null) + { httpclient = new HttpClient(proxyHost, proxyPort, urlString, headers, method, userName, password); - } else { + } + else + { httpclient = new HttpClient(proxyHost, proxyPort, urlString, headers, method); } Modified: projects/gwt-console/trunk/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java 2008-10-27 11:34:07 UTC (rev 2626) +++ projects/gwt-console/trunk/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java 2008-10-27 15:49:45 UTC (rev 2627) @@ -68,7 +68,7 @@ if (requireSessionString != null) { if ("false".equals(requireSessionString)) { requireSession = false; - getLogger().severe("XmlHttpProxyServlet: intialization. Session requirement disabled."); + getLogger().severe("XmlHttpProxyServlet: intialization. Session requirement disabled."); } else if ("true".equals(requireSessionString)) { requireSession = true; getLogger().severe("XmlHttpProxyServlet: intialization. Session requirement enabled."); @@ -162,14 +162,14 @@ PrintWriter writer = null; String serviceKey = null; /*try { - BufferedReader in = req.getReader(); - String line = null; - while ((line = in.readLine()) != null) { - if (bodyContent == null) bodyContent = new StringBuffer(); - bodyContent.append(line); - } - } catch (Exception e) { - } */ + BufferedReader in = req.getReader(); + String line = null; + while ((line = in.readLine()) != null) { + if (bodyContent == null) bodyContent = new StringBuffer(); + bodyContent.append(line); + } + } catch (Exception e) { + } */ try { @@ -205,6 +205,7 @@ String callback = req.getParameter("callback"); String urlParams = req.getParameter("urlparams"); String countString = req.getParameter("count"); + boolean passthrough = false; // encode the url to prevent spaces from being passed along if (urlParams != null) { urlParams = urlParams.replace(' ', '+'); @@ -232,30 +233,48 @@ } try { - - if (services.has(serviceKey)) + String actualServiceKey = serviceKey != null ? serviceKey : "default"; + if (services.has(actualServiceKey)) { - JSONObject service = services.getJSONObject(serviceKey); - // default to the service default if no url parameters are specified - if (urlParams == null && service.has("defaultURLParams")) { - urlParams = service.getString("defaultURLParams"); - } + JSONObject service = services.getJSONObject(actualServiceKey); String serviceURL = service.getString("url"); - // build the URL - if (urlParams != null && serviceURL.indexOf("?") == -1){ - serviceURL += "?"; - } else if (urlParams != null) { - serviceURL += "&"; - } - String apikey = ""; + if(null==serviceURL) + throw new IllegalArgumentException("xhp.json: service url is mising"); + + if (service.has("passthrough")) passthrough = + Boolean.valueOf(service.getString("passthrough")); if (service.has("username")) userName = service.getString("username"); if (service.has("password")) password = service.getString("password"); + String apikey = ""; if (service.has("apikey")) apikey = service.getString("apikey"); - urlString = serviceURL + apikey; - if (urlParams != null) urlString += "&" + urlParams; - if (service.has("xslStyleSheet")) { - xslURLString = service.getString("xslStyleSheet"); + if (service.has("xslStyleSheet")) xslURLString = service.getString("xslStyleSheet"); + + // default to the service default if no url parameters are specified + if(!passthrough) + { + if (urlParams == null && service.has("defaultURLParams")) { + urlParams = service.getString("defaultURLParams"); + } + + // build the URL + if (urlParams != null && serviceURL.indexOf("?") == -1){ + serviceURL += "?"; + } else if (urlParams != null) { + serviceURL += "&"; + } + + urlString = serviceURL + apikey; + if (urlParams != null) urlString += "&" + urlParams; } + + if(passthrough) + { + // override service url and url params + String path = req.getPathInfo(); + path = path.substring(path.indexOf("xhp/")+3, path.length()); + + urlString = serviceURL + path + "?" + req.getQueryString(); + } } else { @@ -320,13 +339,23 @@ } } } - if (!isPost) { + + getLogger().info("XmlHttpProxy target url: " + urlString); + + if (!isPost) + { xhp.processRequest(urlString, out, xslInputStream, paramsMap, headers, method, userName, password); - } else { - if (bodyContent == null) getLogger().info("XmlHttpProxyServlet attempting to post to url " + urlString + " with no body content"); - xhp.doPost(urlString, out, xslInputStream, paramsMap, headers, bodyContent.toString(), req.getContentType(), userName, password); } - } catch (Exception iox) { + else + { + final String content = bodyContent != null ? bodyContent.toString() : ""; + if (bodyContent == null) + getLogger().info("XmlHttpProxyServlet attempting to post to url " + urlString + " with no body content"); + xhp.doPost(urlString, out, xslInputStream, paramsMap, headers, content, req.getContentType(), userName, password); + } + } + catch (Exception iox) + { iox.printStackTrace(); getLogger().severe("XmlHttpProxyServlet: caught " + iox); res.setStatus(500); @@ -338,12 +367,14 @@ ix.printStackTrace(); } return; - } finally { - try { + } + finally + { + try + { if (out != null) out.close(); if (writer != null) writer.close(); - } catch (java.io.IOException iox){ - } + } catch (java.io.IOException iox){} } } @@ -378,8 +409,8 @@ } } serviceURL = serviceURL.substring(0, start) + - replace + - serviceURL.substring(end + 1, serviceURL.length()); + replace + + serviceURL.substring(end + 1, serviceURL.length()); } // call recursively to process more than one instance of a ${ in the serviceURL if (serviceURL.indexOf("${") != -1) serviceURL = processURL(serviceURL, req, res); @@ -408,7 +439,7 @@ return true; } } catch (Exception ex) { - getLogger().severe("XmlHttpProxyServlet error checking configuration: " + ex); + getLogger().severe("XmlHttpProxyServlet error checking configuration: " + ex); } return false; } Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Authentication.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Authentication.java 2008-10-27 11:34:07 UTC (rev 2626) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Authentication.java 2008-10-27 15:49:45 UTC (rev 2627) @@ -82,16 +82,13 @@ public void onResponseReceived(Request request, Response response) { - System.out.println("! Auth Success"); // parse roles rolesAssigned = DTOParser.parseRolesAssigned(response.getText()); if(callback!=null) callback.onLoginSuccess(request, response); } public void onError(Request request, Throwable t) - { - System.out.println("! Auth failed"); - + { // auth failed if(callback!=null) callback.onLoginFailed(request, t); Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java 2008-10-27 11:34:07 UTC (rev 2626) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java 2008-10-27 15:49:45 UTC (rev 2627) @@ -51,7 +51,7 @@ private HeaderPanel header; private MainMenu mainMenu; private EditorPanel editorPanel; - private URLBuilder URLBuilder = new URLBuilder( "http://localhost:8080", "gwt-console-server"); + private URLBuilder urlBuilder; private String[] rolesAssigned = new String[] {}; public final static String[] KNOWN_ROLES = {"admin", "user"}; @@ -63,6 +63,11 @@ public ConsoleView() { + if(!GWT.isScript()) // hosted mode used proxy by default + urlBuilder = new URLBuilder(GWT.getModuleBaseURL(), "xhp"); + else + urlBuilder = new URLBuilder( "http://localhost:8080", "gwt-console-server"); // TODO: make configureable + Panel mainPanel = createMainPanel(); assembleMainApplication(mainPanel); forceLogin(mainPanel); @@ -136,54 +141,41 @@ window.setCloseAction(Window.CLOSE); final Button submitBtn = new Button("Login", - new ButtonListenerAdapter() - { - public void onClick(Button button, EventObject e) - { + new ButtonListenerAdapter() + { + public void onClick(Button button, EventObject e) + { + String url = getUrlBuilder().getUserInRoleURL(KNOWN_ROLES); + final Authentication authentication = new Authentication(url); + authentication.setCallback( + new Authentication.AuthCallback() + { - if(GWT.isScript()) - { - String url = getRestURL().getUserInRoleURL(KNOWN_ROLES); - final Authentication authentication = new Authentication(url); - authentication.setCallback( - new Authentication.AuthCallback() - { + public void onLoginSuccess(Request request, Response response) + { + // parse roles + rolesAssigned = authentication.getRolesAssigned().toArray(new String[] {}); - public void onLoginSuccess(Request request, Response response) - { - // parse roles - rolesAssigned = authentication.getRolesAssigned().toArray(new String[] {}); + // display main console + window.close(); + mainPanel.show(); + mainPanel.doLayout(); + } - // display main console - window.close(); - mainPanel.show(); - mainPanel.doLayout(); - } + public void onLoginFailed(Request request, Throwable t) + { + // auth failed + setError("Authentication failed."); + t.printStackTrace(System.out); + } + } + ); - public void onLoginFailed(Request request, Throwable t) - { - // auth failed - setError("Authentication failed."); - t.printStackTrace(System.out); - } - } - ); + authentication.doLogin(); - authentication.doLogin(); - } - else - { - // hosted mode roles grant any role - // will popup BASIC Auth windows when required - rolesAssigned = KNOWN_ROLES; + } + }); - window.close(); - mainPanel.show(); - mainPanel.doLayout(); - } - } - }); - panel.add(submitBtn); BorderLayoutData centerData = new BorderLayoutData(RegionPosition.CENTER); @@ -206,9 +198,9 @@ return editorPanel.hasEditor(id); } - public URLBuilder getRestURL() + public URLBuilder getUrlBuilder() { - return URLBuilder; + return this.urlBuilder; } public void showEditor(String id) Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-10-27 11:34:07 UTC (rev 2626) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-10-27 15:49:45 UTC (rev 2627) @@ -47,7 +47,7 @@ private static String getResourceUrl(ConsoleView view) { - return view.getRestURL().getProcessDefinitionURL(); + return view.getUrlBuilder().getProcessDefinitionURL(); } protected ColumnModel createColumnModel() @@ -105,7 +105,7 @@ if("yes".equals( btnID) ) { ProcessDefinition proc = (ProcessDefinition)row2ProcessMap.get(row); - String url = view.getRestURL().getRemoveDefinitionURL(proc.getProcessId()); + String url = view.getUrlBuilder().getRemoveDefinitionURL(proc.getProcessId()); RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, url); try Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-10-27 11:34:07 UTC (rev 2626) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-10-27 15:49:45 UTC (rev 2627) @@ -98,7 +98,7 @@ public void onClick(Button button, EventObject e) { formPanel.getForm().submit( - view.getRestURL().getUploadDefinitionURL(), null, + view.getUrlBuilder().getUploadDefinitionURL(), null, Connection.POST, "Uploading definition ...", false); } }); Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java 2008-10-27 11:34:07 UTC (rev 2626) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java 2008-10-27 15:49:45 UTC (rev 2627) @@ -91,7 +91,7 @@ private void loadActiveNodeInfo() { - String url = view.getRestURL().getActiveNodeInfoURL(this.instance.getInstanceId()); + String url = view.getUrlBuilder().getActiveNodeInfoURL(this.instance.getInstanceId()); System.out.println("Loading activeNodeInfo: " + url); JSONRequest.get(url, @@ -131,7 +131,7 @@ this.activeNodeInfo = activeNodeInfo; DiagramNodeInfo activeNode = activeNodeInfo.getActiveNode(); - String imageUrl = view.getRestURL().getProcessImageURL(instance.getParentId()); + String imageUrl = view.getUrlBuilder().getProcessImageURL(instance.getParentId()); HTML html = new HTML( "<div id=\"imageContainer\" style=\"position:relative;top:-1;left:-1;height:"+activeNodeInfo.getHeight()+"px;width:"+activeNodeInfo.getWidth()+"px\">" + Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-10-27 11:34:07 UTC (rev 2626) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-10-27 15:49:45 UTC (rev 2627) @@ -81,7 +81,7 @@ { ProcessInstance instance = row2InstanceMap.get(row); instance.setState(ProcessInstance.STATE.ENDED); - String url = view.getRestURL().getStateChangeURL(instance.getInstanceId(), instance.getState()); + String url = view.getUrlBuilder().getStateChangeURL(instance.getInstanceId(), instance.getState()); RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, url); try @@ -127,7 +127,7 @@ { if("yes".equals( btnID) ) { - String url = view.getRestURL().getStartNewInstanceURL(parent.getProcessId()); + String url = view.getUrlBuilder().getStartNewInstanceURL(parent.getProcessId()); RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, url); try @@ -226,7 +226,7 @@ private static String getResourceUrl(ConsoleView view, long parentId) { - return view.getRestURL().getProcessInstanceURL(parentId); + return view.getUrlBuilder().getProcessInstanceURL(parentId); } } Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java 2008-10-27 11:34:07 UTC (rev 2626) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java 2008-10-27 15:49:45 UTC (rev 2627) @@ -206,7 +206,7 @@ private void persistStateChange() { - RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, view.getRestURL().getStateChangeURL( + RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, view.getUrlBuilder().getStateChangeURL( selectedInstance.getInstanceId(), selectedInstance.getState()) ); Modified: projects/gwt-console/trunk/war/src/main/resources/jmaki/xhp/xhp.json =================================================================== --- projects/gwt-console/trunk/war/src/main/resources/jmaki/xhp/xhp.json 2008-10-27 11:34:07 UTC (rev 2626) +++ projects/gwt-console/trunk/war/src/main/resources/jmaki/xhp/xhp.json 2008-10-27 15:49:45 UTC (rev 2627) @@ -1,8 +1,14 @@ {"xhp": { "version": "1.1", "services": [ + {"id": "default", + "url":"http://localhost:8080/gwt-console-server", + "passthrough":true, + "username":"admin", + "password":"admin" + }, {"id": "jboss", - "url":"http://localhost:8080", + "url":"http://localhost:8080/gwt-console-server", "passthrough":true } ] Added: projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/DeferredExecution.java =================================================================== --- projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/DeferredExecution.java (rev 0) +++ projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/DeferredExecution.java 2008-10-27 15:49:45 UTC (rev 2627) @@ -0,0 +1,26 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client; + +public interface DeferredExecution { + void execute(); +} Modified: projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestApplication.java =================================================================== --- projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestApplication.java 2008-10-27 11:34:07 UTC (rev 2626) +++ projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestApplication.java 2008-10-27 15:49:45 UTC (rev 2627) @@ -22,78 +22,78 @@ package org.jboss.bpm.console.client; import com.google.gwt.junit.client.GWTTestCase; -import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Timer; -import com.gwtext.client.widgets.ComponentMgr; -import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor; -import org.jboss.bpm.console.client.process.ProcessDefinitionList; -import org.jboss.bpm.console.client.model.ProcessDefinition; +import com.google.gwt.http.client.Request; +import com.google.gwt.http.client.Response; -import java.util.List; - /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ public class GwtTestApplication extends GWTTestCase { - private static Application application = null; + private static Application application = null; - public String getModuleName() - { - return "org.jboss.bpm.console.Application"; - } + public String getModuleName() + { + return "org.jboss.bpm.console.Application"; + } - protected void gwtSetUp() throws Exception - { - super.gwtSetUp(); - if(null==application) - { - application = new Application(); - application.onModuleLoad(); - } + protected void gwtSetUp() throws Exception + { + super.gwtSetUp(); + if(null==application) + { + application = new Application(); + application.onModuleLoad(); + } - } + } - public void testInitialisation() - { - ConsoleView view = application.getConsoleView(); - assertNotNull("View not initialized", view); + public void testAuthentication() + { + final ConsoleView view = application.getConsoleView(); + assertNotNull("View not initialized", view); + DeferredExecution authTestPiece = new DeferredExecution() + { + public void execute() { - Timer timer = new Timer() - { - public void run() - { - System.out.println("! Execute timer"); - URLBuilder urlBuilder = new URLBuilder(GWT.getModuleBaseURL(), "xhp"); - String inRoleURL = urlBuilder.getUserInRoleURL(ConsoleView.KNOWN_ROLES); - Authentication auth = new Authentication(inRoleURL+"&id=jboss"); - auth.doLogin("admin", "admin"); - System.out.println("Assigned roles: " + auth.getRolesAssigned() ); - finishTest(); - } - }; - - timer.schedule(200); - delayTestFinish(500); - } + String inRoleURL = view.getUrlBuilder().getUserInRoleURL(ConsoleView.KNOWN_ROLES); + final Authentication auth = new Authentication(inRoleURL); + auth.setCallback( + new Authentication.AuthCallback() { - /*ProcessDefinitionListEditor procListEditor = - (ProcessDefinitionListEditor)ComponentMgr.getComponent(ProcessDefinitionListEditor.ID); - assertNotNull("ProcessDefinitionListEditor not initialized", procListEditor); + public void onLoginSuccess(Request request, Response response) { + System.out.println("Assigned roles: " + auth.getRolesAssigned() ); + } - // load process definitions - ProcessDefinitionList procDefList = procListEditor.getProcessDefinitionList(); - procDefList.reloadStore(); + public void onLoginFailed(Request request, Throwable t) { - List<ProcessDefinition> available = procDefList.getAvailableProcessDefinitions(); - assertFalse("No process definitions available", available.isEmpty()); + throw new RuntimeException("Login failed", t); + } + } + ); + auth.doLogin(); + } + }; - for(ProcessDefinition def : available) - { - System.out.println(def); - } */ - + deferredExec(authTestPiece); + } + + private void deferredExec(final DeferredExecution testPiece) { + Timer timer = new Timer() + { + public void run() + { + + testPiece.execute(); + finishTest(); + } + }; + + timer.schedule(300); + delayTestFinish(500); + } } Added: projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestDTOParser.java =================================================================== --- projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestDTOParser.java (rev 0) +++ projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestDTOParser.java 2008-10-27 15:49:45 UTC (rev 2627) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client; + +import com.google.gwt.junit.client.GWTTestCase; +import org.jboss.bpm.console.client.model.DTOParser; + +import java.util.List; + + +public class GwtTestDTOParser extends GWTTestCase { + + public String getModuleName() { + return "org.jboss.bpm.console.Application"; + } + + public void testRolesAssgnedParsing() + { + + // {"roles":[{"assigned":true,"role":"admin"},{"assigned":true,"role":"user"}]} + + String json = "{\"roles\":[{\"assigned\":true,\"role\":\"admin\"},{\"assigned\":true,\"role\":\"user\"}]}"; + List<String> roles = DTOParser.parseRolesAssigned(json); + assertTrue(roles.size() == 2); + } +}