Author: heiko.braun(a)jboss.com Date: 2009-08-03 15:59:38 -0400 (Mon, 03 Aug 2009) New Revision: 727 Added: bpm-console/trunk/bpm/profiles/riftsaw/ bpm-console/trunk/bpm/profiles/riftsaw/pom.xml bpm-console/trunk/bpm/profiles/riftsaw/src/ bpm-console/trunk/bpm/profiles/riftsaw/src/main/ bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/ bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/ bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/ bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/ bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/ bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/public/ bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/public/console.config.js bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/public/riftsaw_logo.png bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/workspace.cfg Removed: bpm-console/trunk/bpm/server/server-core/src/main/resources/org/ bpm-console/trunk/sam/profile/src/main/resources/jmaki/ Modified: bpm-console/trunk/BPMC.ipr bpm-console/trunk/BPMC.iws bpm-console/trunk/bpm/profiles/pom.xml bpm-console/trunk/bpm/server/server-core/bpm-server-core.iml bpm-console/trunk/bpm/server/server-core/pom.xml bpm-console/trunk/bpm/server/server-core/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java bpm-console/trunk/bpm/server/server-core/src/main/webapp/WEB-INF/jboss-web.xml bpm-console/trunk/bpm/server/server-core/src/main/webapp/WEB-INF/web.xml bpm-console/trunk/bpm/server/server-integration/bpm-server-integration.iml bpm-console/trunk/console/war/pom.xml bpm-console/trunk/console/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/LoginView.java bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/process/DeploymentPanel.java bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java Log: Added riftsaw profile Modified: bpm-console/trunk/BPMC.ipr =================================================================== --- bpm-console/trunk/BPMC.ipr 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/BPMC.ipr 2009-08-03 19:59:38 UTC (rev 727) @@ -349,9 +349,7 @@ <module fileurl="file://$PROJECT_DIR$/bpm/server/server-integration/bpm-server-integration.iml" filepath="$PROJECT_DIR$/bpm/server/server-integration/bpm-server-integration.iml" group="BPM Contrib" /> <module fileurl="file://$PROJECT_DIR$/workspace/common/common.iml" filepath="$PROJECT_DIR$/workspace/common/common.iml" group="Framework" /> <module fileurl="file://$PROJECT_DIR$/console/war/console-war.iml" filepath="$PROJECT_DIR$/console/war/console-war.iml" group="Framework" /> - <module fileurl="file://$PROJECT_DIR$/sam/gui/sam-gui.iml" filepath="$PROJECT_DIR$/sam/gui/sam-gui.iml" group="SAM Contrib" /> <module fileurl="file://$PROJECT_DIR$/sam/profile/sam-profile.iml" filepath="$PROJECT_DIR$/sam/profile/sam-profile.iml" group="SAM Contrib" /> - <module fileurl="file://$PROJECT_DIR$/toplevel.iml" filepath="$PROJECT_DIR$/toplevel.iml" /> <module fileurl="file://$PROJECT_DIR$/workspace/workspace-api/workspace-api.iml" filepath="$PROJECT_DIR$/workspace/workspace-api/workspace-api.iml" group="Framework" /> </modules> </component> Modified: bpm-console/trunk/BPMC.iws =================================================================== --- bpm-console/trunk/BPMC.iws 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/BPMC.iws 2009-08-03 19:59:38 UTC (rev 727) @@ -17,8 +17,47 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bpm/server/server-core/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java" afterPath="$PROJECT_DIR$/bpm/server/server-core/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/public" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bpm/profiles/pom.xml" afterPath="$PROJECT_DIR$/bpm/profiles/pom.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bpm/profiles/riftsaw/src/main/resources/org" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/bpm/server/server-core/src/main/resources/org/jboss" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/sam/profile/src/main/resources/jmaki" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/bpm/server/server-core/src/main/resources/org" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bpm/server/server-core/src/main/webapp/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/bpm/server/server-core/src/main/webapp/WEB-INF/web.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/workspace.cfg" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/bpm/server/server-core/src/main/resources/org/jboss/bpm/console/server" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/public/console.config.js" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/public/riftsaw_logo.png" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bpm/profiles/riftsaw/src" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/bpm/server/server-core/src/main/resources/org/jboss/bpm" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.ipr" afterPath="$PROJECT_DIR$/BPMC.ipr" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java" afterPath="$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bpm/server/server-integration/bpm-server-integration.iml" afterPath="$PROJECT_DIR$/bpm/server/server-integration/bpm-server-integration.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" afterPath="$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bpm/profiles/riftsaw/src/main/resources/org/jboss" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/bpm/server/server-core/src/main/resources/org/jboss/bpm/console" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/process/DeploymentPanel.java" afterPath="$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/process/DeploymentPanel.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/sam/profile/src/main/resources/jmaki/xhp" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/bpm/server/server-core/src/main/resources/org/jboss/bpm/console/server/jbpm3/dao" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/sam/profile/src/main/resources/jmaki/xhp/xhp.json" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bpm/profiles/riftsaw/src/main/resources" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bpm/profiles/riftsaw/src/main" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/bpm/server/server-core/src/main/resources/org/jboss/bpm/console/server/jbpm3" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/bpm/server/server-core/src/main/resources/org/jboss/bpm/console/server/jbpm3/dao/internal/1.jpg" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bpm/server/server-core/src/main/webapp/WEB-INF/jboss-web.xml" afterPath="$PROJECT_DIR$/bpm/server/server-core/src/main/webapp/WEB-INF/jboss-web.xml" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/bpm/server/server-core/src/main/resources/org/jboss/bpm/console/server/jbpm3/dao/internal" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bpm/profiles/riftsaw/pom.xml" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/bpm/server/server-core/src/main/resources/org/jboss/bpm/console/server/jbpm3/dao/internal/gpd.xml" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bpm/server/server-core/bpm-server-core.iml" afterPath="$PROJECT_DIR$/bpm/server/server-core/bpm-server-core.iml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/console/war/pom.xml" afterPath="$PROJECT_DIR$/console/war/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java" afterPath="$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bpm/profiles/riftsaw" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/console/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java" afterPath="$PROJECT_DIR$/console/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bpm/server/server-core/pom.xml" afterPath="$PROJECT_DIR$/bpm/server/server-core/pom.xml" /> </list> <list name="Failed commit: Default" comment="remove dependency on DTOParser" /> </component> @@ -90,6 +129,21 @@ <disable_hints /> </component> <component name="DebuggerManager"> + <line_breakpoints> + <breakpoint url="file://$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java" line="106" class="org.jboss.bpm.console.client.process.ProcessDetailView" package="org.jboss.bpm.console.client.process"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + </line_breakpoints> <breakpoint_any> <breakpoint> <option name="NOTIFY_CAUGHT" value="true" /> @@ -147,7 +201,7 @@ <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/console/war/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="489" column="56" selection-start="15322" selection-end="15322" vertical-scroll-proportion="0.87346435"> + <state line="359" column="30" selection-start="0" selection-end="19209" vertical-scroll-proportion="0.8495298"> <folding /> </state> </provider> @@ -191,7 +245,13 @@ <option name="myItemId" value="BPMC.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> + <option name="myItemId" value="BPMC.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="Framework" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleGroupNode" /> </PATH_ELEMENT> @@ -303,6 +363,14 @@ <option name="myItemId" value="BPMC.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="SAM Contrib" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sam-profile" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -317,6 +385,10 @@ <option name="myItemId" value="sam-profile" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/profile" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -335,6 +407,18 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/profile" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/profile/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/profile/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/profile/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -345,6 +429,22 @@ <option name="myItemId" value="SAM Contrib" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sam-profile" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/profile" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/profile/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/sam/profile/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -394,20 +494,22 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="Framework" /> + <option name="myItemId" value="BPM Contrib" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="console-war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemId" value="BPMC.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="BPM Contrib" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="bpm-server-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> </PATH> <PATH> @@ -416,29 +518,17 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="Framework" /> + <option name="myItemId" value="BPM Contrib" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="console-war" /> + <option name="myItemId" value="bpm-server-core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main/webapp" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -446,25 +536,21 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="Framework" /> + <option name="myItemId" value="BPM Contrib" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="console-war" /> + <option name="myItemId" value="bpm-server-core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -472,27 +558,27 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="Framework" /> + <option name="myItemId" value="BPM Contrib" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="console-war" /> + <option name="myItemId" value="bpm-server-core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core/src/main/webapp" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -502,45 +588,33 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="Framework" /> + <option name="myItemId" value="BPM Contrib" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="console-war" /> + <option name="myItemId" value="bpm-server-core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core/src/main/webapp" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main/resources/org" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core/src/main/webapp/WEB-INF" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main/resources/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main/resources/org/jboss/bpm" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main/resources/org/jboss/bpm/console" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -548,49 +622,39 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="Framework" /> + <option name="myItemId" value="BPM Contrib" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="console-war" /> + <option name="myItemId" value="bpm-server-core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/server/server-core/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="BPMC.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main/resources/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="BPM Contrib" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main/resources/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="bpm-profiles" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main/resources/org/jboss/bpm" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main/resources/org/jboss/bpm/console" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/console/war/src/main/resources/org/jboss/bpm/console/public" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -601,6 +665,14 @@ <option name="myItemId" value="BPM Contrib" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="bpm-profiles" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bpm/profiles" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> </subPane> </component> @@ -615,7 +687,7 @@ <showLibraryContents /> <hideEmptyPackages PackagesPane="false" ProjectPane="false" /> <abbreviatePackageNames /> - <showStructure ProjectPane="false" PackagesPane="false" Favorites="false" /> + <showStructure Favorites="false" ProjectPane="false" Scope="false" PackagesPane="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -626,8 +698,10 @@ <property name="GoToClass.includeLibraries" value="false" /> <property name="MemberChooser.showClasses" value="true" /> <property name="MemberChooser.sorted" value="false" /> + <property name="RunManagerConfig.compileBeforeRunning" value="false" /> <property name="GoToFile.includeJavaFiles" value="false" /> <property name="GoToClass.toSaveIncludeLibraries" value="false" /> + <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> </component> <component name="ReadonlyStatusHandler"> <option name="SHOW_DIALOG" value="true" /> @@ -641,7 +715,26 @@ </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager"> + <component name="RunManager" selected="Remote.GWT"> + <configuration default="true" type="Applet" factoryName="Applet"> + <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + </configuration> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -661,18 +754,6 @@ <option name="Make" value="true" /> </method> </configuration> - <configuration default="true" type="Applet" factoryName="Applet"> - <module name="" /> - <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="VM_PARAMETERS" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - </configuration> <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> @@ -682,20 +763,41 @@ <option name="ALTERNATIVE_JRE_PATH" /> <option name="ENABLE_SWING_INSPECTOR" value="false" /> <module name="" /> + <method> + <option name="Make" value="true" /> + </method> </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> + <configuration default="false" name="GWT" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> <option name="SHMEM_ADDRESS" value="javadebug" /> <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> + <option name="PORT" value="8000" /> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="8000" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="false" /> + </RunnerSettings> + <ConfigurationWrapper RunnerId="Debug" /> + <method> + <option name="Make" value="true" /> + </method> </configuration> <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false"> <Host>localhost</Host> <Port>5050</Port> </configuration> </component> - <component name="ScopeViewComponent" /> + <component name="ScopeViewComponent"> + <subPane subId="Project"> + <PATH> + <PATH_ELEMENT USER_OBJECT="Root"> + <option name="myItemId" value="" /> + <option name="myItemType" value="" /> + </PATH_ELEMENT> + </PATH> + </subPane> + </component> <component name="SelectInManager" /> <component name="StarteamConfiguration"> <option name="SERVER" value="" /> @@ -761,15 +863,15 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="353" y="37" width="1240" height="976" extended-state="0" /> + <frame x="358" y="192" width="1280" height="800" extended-state="0" /> <editor active="true" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.38539043" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4152446" order="1" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3647441" order="0" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4144354" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24937028" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> @@ -782,7 +884,7 @@ <window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24937028" order="2" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="4" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3995381" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> @@ -865,126 +967,118 @@ <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1"> <option name="myLastEditedConfigurable" /> </component> - <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.11111111,0.5" version="1"> + <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.11111111" version="1"> <option name="myPlainMode" value="false" /> - <option name="myLastEditedConfigurable" value="sam-gui" /> + <option name="myLastEditedConfigurable" value="Modules" /> </component> <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1"> <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> + <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="110" column="57" selection-start="3185" selection-end="3185" vertical-scroll-proportion="0.74570024"> + <state line="168" column="21" selection-start="4855" selection-end="4855" vertical-scroll-proportion="0.732834"> <folding /> </state> </provider> </entry> - <entry file="jar:///Users/hbraun/.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/com/mvc4g/client/ActionInterface.class"> + <entry file="file://$PROJECT_DIR$/console/war/src/main/resources/jmaki/xhp/xhp.json"> <provider selected="true" editor-type-id="text-editor"> - <state line="5" column="17" selection-start="158" selection-end="158" vertical-scroll-proportion="0.07720145"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/engine/ViewDeploymentAction.java"> + <entry file="file://$PROJECT_DIR$/bpm/profiles/riftsaw/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="57" column="6" selection-start="2075" selection-end="2075" vertical-scroll-proportion="0.6176116"> + <state line="19" column="0" selection-start="680" selection-end="680" vertical-scroll-proportion="0.3795256"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java"> + <entry file="file://$PROJECT_DIR$/console/war/src/main/java/jmaki/xhp/HttpClient.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="22" selection-start="1453" selection-end="1453" vertical-scroll-proportion="0.28950542"> + <state line="23" column="13" selection-start="860" selection-end="860" vertical-scroll-proportion="-3.9937577"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java"> + <entry file="file://$PROJECT_DIR$/console/war/src/main/java/jmaki/xhp/XmlHttpProxy.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="295" column="0" selection-start="9413" selection-end="9413" vertical-scroll-proportion="0.31326783"> + <state line="26" column="13" selection-start="984" selection-end="984" vertical-scroll-proportion="0.19975032"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java"> + <entry file="file://$PROJECT_DIR$/console/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="9" selection-start="2296" selection-end="2296" vertical-scroll-proportion="0.8255528"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="277" column="0" selection-start="10501" selection-end="10501" vertical-scroll-proportion="0.18601748"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/bpm/rpc/src/main/java/org/jboss/bpm/console/client/model/ServerStatus.java"> + <entry file="file://$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="0" selection-start="1342" selection-end="1342" vertical-scroll-proportion="0.32810616"> + <state line="66" column="39" selection-start="2527" selection-end="2527" vertical-scroll-proportion="0.3258427"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java"> + <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="40" column="5" selection-start="1925" selection-end="1925" vertical-scroll-proportion="0.33292383"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="82" column="0" selection-start="2289" selection-end="2289" vertical-scroll-proportion="-0.29411766"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/bpm/profiles/pom.xml"> + <entry file="file://$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="7" column="34" selection-start="361" selection-end="381" vertical-scroll-proportion="0.13759214"> + <state line="117" column="24" selection-start="3886" selection-end="3886" vertical-scroll-proportion="0.64044946"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/sam/profile/pom.xml"> + <entry file="file://$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/process/DeploymentPanel.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="19" column="0" selection-start="656" selection-end="656" vertical-scroll-proportion="0.37346438"> + <state line="95" column="47" selection-start="2811" selection-end="2811" vertical-scroll-proportion="0.60784316"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <entry file="file://$PROJECT_DIR$/bpm/server/server-core/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="297" column="36" selection-start="9542" selection-end="9542" vertical-scroll-proportion="0.7432432"> - <folding> - <element signature="tag#properties#0;tag#project#0" expanded="false" /> - <element signature="tag#dependencies#0;tag#dependencyManagement#0;tag#project#0" expanded="false" /> - <element signature="tag#build#0;tag#project#0" expanded="false" /> - <element signature="tag#repositories#0;tag#project#0" expanded="false" /> - <element signature="tag#pluginRepositories#0;tag#project#0" expanded="false" /> - <element signature="tag#distributionManagement#0;tag#project#0" expanded="false" /> - </folding> + <state line="89" column="30" selection-start="3095" selection-end="3095" vertical-scroll-proportion="0.54057425"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/war/src/main/java/org/jboss/bpm/console/client/Header.java"> + <entry file="file://$PROJECT_DIR$/bpm/server/server-core/src/main/webapp/index.html"> <provider selected="true" editor-type-id="text-editor"> - <state line="104" column="39" selection-start="3439" selection-end="3439" vertical-scroll-proportion="1.0405406"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> + <provider editor-type-id="HtmlPreview"> + <state /> + </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/war/src/main/resources/org/jboss/bpm/console/public/console.css"> + <entry file="file://$PROJECT_DIR$/bpm/server/server-core/src/main/webapp/WEB-INF/web.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="111" column="41" selection-start="1503" selection-end="1503" vertical-scroll-proportion="0.70638824"> + <state line="78" column="17" selection-start="2248" selection-end="2248" vertical-scroll-proportion="0.7742947"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/console/war/GWT_TEST_README.txt"> + <entry file="file://$PROJECT_DIR$/bpm/server/server-core/src/main/webapp/WEB-INF/jboss-web.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="13" column="0" selection-start="312" selection-end="312" vertical-scroll-proportion="0.31852987"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/console/war/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="489" column="56" selection-start="15322" selection-end="15322" vertical-scroll-proportion="0.87346435"> + <state line="359" column="30" selection-start="0" selection-end="19209" vertical-scroll-proportion="0.8495298"> <folding /> </state> </provider> Modified: bpm-console/trunk/bpm/profiles/pom.xml =================================================================== --- bpm-console/trunk/bpm/profiles/pom.xml 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/bpm/profiles/pom.xml 2009-08-03 19:59:38 UTC (rev 727) @@ -21,5 +21,6 @@ <modules> <module>jbpm</module> <module>drools</module> + <module>riftsaw</module> </modules> </project> Added: bpm-console/trunk/bpm/profiles/riftsaw/pom.xml =================================================================== --- bpm-console/trunk/bpm/profiles/riftsaw/pom.xml (rev 0) +++ bpm-console/trunk/bpm/profiles/riftsaw/pom.xml 2009-08-03 19:59:38 UTC (rev 727) @@ -0,0 +1,19 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <name>JBoss BPM - BPM Console (GUI Profile RiftSaw)</name> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-profile-riftsaw</artifactId> + <packaging>jar</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-profiles</artifactId> + <version>1.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + +</project> Added: bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/public/console.config.js =================================================================== --- bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/public/console.config.js (rev 0) +++ bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/public/console.config.js 2009-08-03 19:59:38 UTC (rev 727) @@ -0,0 +1,9 @@ +var consoleConfig = { + profileName: "BPEL Console", + logo: "riftsaw_logo.png", + serverWebContext: "/gwt-console-server", + defaultEditor: "org.jboss.bpm.console.client.process.ProcessEditor", + overallReportFile: "", + processSummaryReportFile: "", + instanceSummaryReportFile: "" +}; \ No newline at end of file Added: bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/public/riftsaw_logo.png =================================================================== (Binary files differ) Property changes on: bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/public/riftsaw_logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/workspace.cfg =================================================================== --- bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/workspace.cfg (rev 0) +++ bpm-console/trunk/bpm/profiles/riftsaw/src/main/resources/org/jboss/bpm/console/workspace.cfg 2009-08-03 19:59:38 UTC (rev 727) @@ -0,0 +1,5 @@ +#org.jboss.bpm.console.client.task.TaskEditor +org.jboss.bpm.console.client.process.ProcessEditor +#org.jboss.bpm.console.client.report.ReportEditor +#org.jboss.bpm.console.client.engine.EngineEditor +org.jboss.bpm.console.client.SettingsEditor \ No newline at end of file Modified: bpm-console/trunk/bpm/server/server-core/bpm-server-core.iml =================================================================== --- bpm-console/trunk/bpm/server/server-core/bpm-server-core.iml 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/bpm/server/server-core/bpm-server-core.iml 2009-08-03 19:59:38 UTC (rev 727) @@ -10,7 +10,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="toplevel" /> <orderEntry type="module" module-name="bpm-rpc" /> <orderEntry type="module-library"> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> Modified: bpm-console/trunk/bpm/server/server-core/pom.xml =================================================================== --- bpm-console/trunk/bpm/server/server-core/pom.xml 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/bpm/server/server-core/pom.xml 2009-08-03 19:59:38 UTC (rev 727) @@ -33,7 +33,6 @@ <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-common</artifactId> <version>${version}</version> - <scope>provided</scope> </dependency> <!-- GWT related --> Modified: bpm-console/trunk/bpm/server/server-core/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java =================================================================== --- bpm-console/trunk/bpm/server/server-core/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/bpm/server/server-core/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java 2009-08-03 19:59:38 UTC (rev 727) @@ -50,99 +50,99 @@ public class UserMgmtFacade { - private static final Log log = LogFactory.getLog(UserMgmtFacade.class); + private static final Log log = LogFactory.getLog(UserMgmtFacade.class); - private UserManagement userManagement; + private UserManagement userManagement; - private UserManagement getUserManagement() - { - if(null==userManagement) - { - ManagementFactory factory = ManagementFactory.newInstance(); - this.userManagement = factory.createUserManagement(); - } + private UserManagement getUserManagement() + { + if(null==userManagement) + { + ManagementFactory factory = ManagementFactory.newInstance(); + this.userManagement = factory.createUserManagement(); + } - return this.userManagement; - } + return this.userManagement; + } - @GET - @Path("user/roles") - @Produces("application/json") - public Response getRolesForJAASPrincipal( - @Context - HttpServletRequest request, - @QueryParam("roleCheck") - String roleCheck - ) - { - // TODO: Why not use the identity DB right away? - // These roles are security roles - if(null==roleCheck) - throw new WebApplicationException( new IllegalArgumentException("Missing parameter 'roleCheck'") ); + @GET + @Path("user/roles") + @Produces("application/json") + public Response getRolesForJAASPrincipal( + @Context + HttpServletRequest request, + @QueryParam("roleCheck") + String roleCheck + ) + { + // TODO: Why not use the identity DB right away? + // These roles are security roles + if(null==roleCheck) + throw new WebApplicationException( new IllegalArgumentException("Missing parameter 'roleCheck'") ); - log.debug("Role check user: " + request.getUserPrincipal().getName() + ", actualRoles requested: " + roleCheck); + log.debug("Role check user: " + request.getUserPrincipal().getName() + ", actualRoles requested: " + roleCheck); - List<RoleAssignmentRef> actualRoles = new ArrayList<RoleAssignmentRef>(); + List<RoleAssignmentRef> actualRoles = new ArrayList<RoleAssignmentRef>(); - StringTokenizer tok = new StringTokenizer(roleCheck, ","); - while(tok.hasMoreTokens()) - { - String possibleRole = tok.nextToken(); - actualRoles.add( new RoleAssignmentRef(possibleRole, request.isUserInRole(possibleRole))); - } - return createJsonResponse( new RoleAssignmentRefWrapper(actualRoles)); - } + StringTokenizer tok = new StringTokenizer(roleCheck, ","); + while(tok.hasMoreTokens()) + { + String possibleRole = tok.nextToken(); + actualRoles.add( new RoleAssignmentRef(possibleRole, request.isUserInRole(possibleRole))); + } + return createJsonResponse( new RoleAssignmentRefWrapper(actualRoles)); + } - @GET - @Path("user/{actorId}/groups/") - @Produces("application/json") - public Response getGroupsForActor( - @PathParam("actorId") - String actorId - ) - { - List<String> groups = getUserManagement().getGroupsForActor(actorId); - return createJsonResponse(groups); - } + @GET + @Path("user/{actorId}/groups/") + @Produces("application/json") + public Response getGroupsForActor( + @PathParam("actorId") + String actorId + ) + { + List<String> groups = getUserManagement().getGroupsForActor(actorId); + return createJsonResponse(groups); + } - @GET - @Path("group/{groupName}/members") - @Produces("application/json") - public Response getActorsForGroup( - @PathParam("groupName") - String groupName - ) - { - List<String> groups = getUserManagement().getActorsForGroup(groupName); - return createJsonResponse(groups); - } + @GET + @Path("group/{groupName}/members") + @Produces("application/json") + public Response getActorsForGroup( + @PathParam("groupName") + String groupName + ) + { + List<String> groups = getUserManagement().getActorsForGroup(groupName); + return createJsonResponse(groups); + } - @GET - @Path("user/{actorId}/actors") - @Produces("application/json") - public Response getAvailableActors( - @PathParam("actorId") - String actorId - ) - { - Set<String> users = new HashSet<String>(); - List<String> groups = getUserManagement().getGroupsForActor(actorId); - for(String group : groups) - { - List<String> actors = getUserManagement().getActorsForGroup(group); - users.addAll(actors); - } + @GET + @Path("user/{actorId}/actors") + @Produces("application/json") + public Response getAvailableActors( + @PathParam("actorId") + String actorId + ) + { + Set<String> users = new HashSet<String>(); + List<String> groups = getUserManagement().getGroupsForActor(actorId); + for(String group : groups) + { + List<String> actors = getUserManagement().getActorsForGroup(group); + users.addAll(actors); + } - List<String> availableActors = new ArrayList<String>(); - availableActors.addAll(users); - availableActors.addAll(groups); - return createJsonResponse(availableActors); - } + List<String> availableActors = new ArrayList<String>(); + availableActors.addAll(users); + availableActors.addAll(groups); + return createJsonResponse(availableActors); + } - private Response createJsonResponse(Object wrapper) - { - Gson gson = GsonFactory.createInstance(); - String json = gson.toJson(wrapper); - return Response.ok(json).type("application/json").build(); - } + private Response createJsonResponse(Object wrapper) + { + Gson gson = GsonFactory.createInstance(); + String json = gson.toJson(wrapper); + return Response.ok(json).type("application/json").build(); + } } \ No newline at end of file Modified: bpm-console/trunk/bpm/server/server-core/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- bpm-console/trunk/bpm/server/server-core/src/main/webapp/WEB-INF/jboss-web.xml 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/bpm/server/server-core/src/main/webapp/WEB-INF/jboss-web.xml 2009-08-03 19:59:38 UTC (rev 727) @@ -6,7 +6,7 @@ <jboss-web> - <security-domain>java:/jaas/jbpm-console</security-domain> + <security-domain>java:/jaas/bpel-console</security-domain> <context-root>gwt-console-server</context-root> Modified: bpm-console/trunk/bpm/server/server-core/src/main/webapp/WEB-INF/web.xml =================================================================== --- bpm-console/trunk/bpm/server/server-core/src/main/webapp/WEB-INF/web.xml 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/bpm/server/server-core/src/main/webapp/WEB-INF/web.xml 2009-08-03 19:59:38 UTC (rev 727) @@ -52,7 +52,7 @@ <web-resource-name>Resteasy</web-resource-name> <url-pattern>/rs/process/*</url-pattern> <url-pattern>/rs/task/*</url-pattern> - <!--url-pattern>/rs/form/*</url-pattern https://jira.jboss.org/jira/browse/JBPM-2229--> + <!--url-pattern>/rs/form/*</url-pattern--> <url-pattern>/rs/tasks/*</url-pattern> <url-pattern>/rs/identity/*</url-pattern> </web-resource-collection> Modified: bpm-console/trunk/bpm/server/server-integration/bpm-server-integration.iml =================================================================== --- bpm-console/trunk/bpm/server/server-integration/bpm-server-integration.iml 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/bpm/server/server-integration/bpm-server-integration.iml 2009-08-03 19:59:38 UTC (rev 727) @@ -8,7 +8,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="bpm-rpc" /> + <orderEntry type="module" module-name="bpm-rpc" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> <CLASSES> Modified: bpm-console/trunk/console/war/pom.xml =================================================================== --- bpm-console/trunk/console/war/pom.xml 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/console/war/pom.xml 2009-08-03 19:59:38 UTC (rev 727) @@ -353,6 +353,13 @@ </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <classifier>jbpm</classifier> + </configuration> + </plugin> </plugins> </build> @@ -411,6 +418,14 @@ </executions> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <classifier>drools</classifier> + </configuration> + </plugin> </plugins> </build> </profile> @@ -486,16 +501,90 @@ </configuration> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <classifier>sam</classifier> + </configuration> + </plugin> </plugins> </build> </profile> <!-- ======================================================= - OS Switch used for GWT SDK selection + Riftsaw Profile ======================================================= --> + <profile> + <id>riftsaw-console.profile</id> + <activation> + <property> + <name>console.profile</name> + <value>riftsaw</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-profile-riftsaw</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + <properties> + <console.app.webcontext>bpel-console</console.app.webcontext> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack-profile-riftsaw</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-profile-riftsaw</artifactId> + <version>${version}</version> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>target/classes</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <classifier>riftsaw</classifier> + </configuration> + </plugin> + + </plugins> + </build> + </profile> + + <!-- + ======================================================= + OS Switch used for GWT SDK selection + ======================================================= + --> + <profile> <id>gwt-dev-windows</id> <properties> Modified: bpm-console/trunk/console/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java =================================================================== --- bpm-console/trunk/console/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/console/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java 2009-08-03 19:59:38 UTC (rev 727) @@ -33,473 +33,485 @@ public class XmlHttpProxyServlet extends HttpServlet { - public static String REMOTE_USER = "REMOTE_USER"; + public static String REMOTE_USER = "REMOTE_USER"; - private static String XHP_LAST_MODIFIED = "xhp_last_modified_key"; - private static String XHP_CONFIG = "xhp.json"; + private static String XHP_LAST_MODIFIED = "xhp_last_modified_key"; + private static String XHP_CONFIG = "xhp.json"; - private static boolean allowXDomain = false; - private static boolean requireSession = false; - private static boolean createSession = false; - private static String defaultContentType = "application/json;charset=UTF-8"; - private static boolean rDebug = false; - private Logger logger = null; - private XmlHttpProxy xhp = null; - private ServletContext ctx; - private JSONObject services = null; - private String resourcesDir = "/resources/"; - private String classpathResourcesDir = "/META-INF/resources/"; - private String headerToken = "jmaki-"; - private String testToken = "xtest-"; - - public XmlHttpProxyServlet() { - if (rDebug) { - logger = getLogger(); - } - } + private static boolean allowXDomain = false; + private static boolean requireSession = false; + private static boolean createSession = false; + private static String defaultContentType = "application/json;charset=UTF-8"; + private static boolean rDebug = false; + private Logger logger = null; + private XmlHttpProxy xhp = null; + private ServletContext ctx; + private JSONObject services = null; + private String resourcesDir = "/resources/"; + private String classpathResourcesDir = "/META-INF/resources/"; + private String headerToken = "jmaki-"; + private String testToken = "xtest-"; - public void init(ServletConfig config) throws ServletException { - super.init(config); - ctx = config.getServletContext(); - // set the response content type - if (ctx.getInitParameter("responseContentType") != null) { - defaultContentType = ctx.getInitParameter("responseContentType"); + private static String testUser; + private static String testPass; + + public XmlHttpProxyServlet() { + if (rDebug) { + logger = getLogger(); + } + } + + public void init(ServletConfig config) throws ServletException { + super.init(config); + ctx = config.getServletContext(); + // set the response content type + if (ctx.getInitParameter("responseContentType") != null) { + defaultContentType = ctx.getInitParameter("responseContentType"); + } + // allow for resources dir over-ride at the xhp level otherwise allow + // for the jmaki level resources + if (ctx.getInitParameter("jmaki-xhp-resources") != null) { + resourcesDir = ctx.getInitParameter("jmaki-xhp-resources"); + } else if (ctx.getInitParameter("jmaki-resources") != null) { + resourcesDir = ctx.getInitParameter("jmaki-resources"); + } + // allow for resources dir over-ride + if (ctx.getInitParameter("jmaki-classpath-resources") != null) { + classpathResourcesDir = ctx.getInitParameter("jmaki-classpath-resources"); + } + String requireSessionString = ctx.getInitParameter("requireSession"); + if (requireSessionString == null) requireSessionString = ctx.getInitParameter("jmaki-requireSession"); + if (requireSessionString != null) { + if ("false".equals(requireSessionString)) { + requireSession = false; + getLogger().severe("XmlHttpProxyServlet: intialization. Session requirement disabled."); + } else if ("true".equals(requireSessionString)) { + requireSession = true; + getLogger().severe("XmlHttpProxyServlet: intialization. Session requirement enabled."); } - // allow for resources dir over-ride at the xhp level otherwise allow - // for the jmaki level resources - if (ctx.getInitParameter("jmaki-xhp-resources") != null) { - resourcesDir = ctx.getInitParameter("jmaki-xhp-resources"); - } else if (ctx.getInitParameter("jmaki-resources") != null) { - resourcesDir = ctx.getInitParameter("jmaki-resources"); + } + String xdomainString = ctx.getInitParameter("allowXDomain"); + if (xdomainString == null) xdomainString = ctx.getInitParameter("jmaki-allowXDomain"); + if (xdomainString != null) { + if ("true".equals(xdomainString)) { + allowXDomain = true; + getLogger().severe("XmlHttpProxyServlet: intialization. xDomain access is enabled."); + } else if ("false".equals(xdomainString)) { + allowXDomain = false; + getLogger().severe("XmlHttpProxyServlet: intialization. xDomain access is disabled."); } - // allow for resources dir over-ride - if (ctx.getInitParameter("jmaki-classpath-resources") != null) { - classpathResourcesDir = ctx.getInitParameter("jmaki-classpath-resources"); + } + String createSessionString = ctx.getInitParameter("jmaki-createSession"); + if (createSessionString != null) { + if ("true".equals(createSessionString)) { + createSession = true; + getLogger().severe("XmlHttpProxyServlet: intialization. create session is enabled."); + } else if ("false".equals(xdomainString)) { + createSession = false; + getLogger().severe("XmlHttpProxyServlet: intialization. create session is disabled."); } - String requireSessionString = ctx.getInitParameter("requireSession"); - if (requireSessionString == null) requireSessionString = ctx.getInitParameter("jmaki-requireSession"); - if (requireSessionString != null) { - if ("false".equals(requireSessionString)) { - requireSession = false; - getLogger().severe("XmlHttpProxyServlet: intialization. Session requirement disabled."); - } else if ("true".equals(requireSessionString)) { - requireSession = true; - getLogger().severe("XmlHttpProxyServlet: intialization. Session requirement enabled."); - } + } + // if there is a proxyHost and proxyPort specified create an HttpClient with the proxy + String proxyHost = ctx.getInitParameter("proxyHost"); + String proxyPortString = ctx.getInitParameter("proxyPort"); + if (proxyHost != null && proxyPortString != null) { + int proxyPort = 8080; + try { + proxyPort= new Integer(proxyPortString).intValue(); + xhp = new XmlHttpProxy(proxyHost, proxyPort); + } catch (NumberFormatException nfe) { + getLogger().severe("XmlHttpProxyServlet: intialization error. The proxyPort must be a number"); + throw new ServletException("XmlHttpProxyServlet: intialization error. The proxyPort must be a number"); } - String xdomainString = ctx.getInitParameter("allowXDomain"); - if (xdomainString == null) xdomainString = ctx.getInitParameter("jmaki-allowXDomain"); - if (xdomainString != null) { - if ("true".equals(xdomainString)) { - allowXDomain = true; - getLogger().severe("XmlHttpProxyServlet: intialization. xDomain access is enabled."); - } else if ("false".equals(xdomainString)) { - allowXDomain = false; - getLogger().severe("XmlHttpProxyServlet: intialization. xDomain access is disabled."); - } - } - String createSessionString = ctx.getInitParameter("jmaki-createSession"); - if (createSessionString != null) { - if ("true".equals(createSessionString)) { - createSession = true; - getLogger().severe("XmlHttpProxyServlet: intialization. create session is enabled."); - } else if ("false".equals(xdomainString)) { - createSession = false; - getLogger().severe("XmlHttpProxyServlet: intialization. create session is disabled."); - } - } - // if there is a proxyHost and proxyPort specified create an HttpClient with the proxy - String proxyHost = ctx.getInitParameter("proxyHost"); - String proxyPortString = ctx.getInitParameter("proxyPort"); - if (proxyHost != null && proxyPortString != null) { - int proxyPort = 8080; - try { - proxyPort= new Integer(proxyPortString).intValue(); - xhp = new XmlHttpProxy(proxyHost, proxyPort); - } catch (NumberFormatException nfe) { - getLogger().severe("XmlHttpProxyServlet: intialization error. The proxyPort must be a number"); - throw new ServletException("XmlHttpProxyServlet: intialization error. The proxyPort must be a number"); - } - } else { - xhp = new XmlHttpProxy(); - } - } + } else { + xhp = new XmlHttpProxy(); + } + } - private void getServices(HttpServletResponse res) - { - InputStream is = null; + private void getServices(HttpServletResponse res) + { + InputStream is = null; + try + { + URL url = ctx.getResource(resourcesDir + XHP_CONFIG); + // use classpath if not found locally. + //if (url == null) url = XmlHttpProxyServlet.class.getResource(classpathResourcesDir + XHP_CONFIG); + if (url == null) url = XmlHttpProxyServlet.class.getResource(XHP_CONFIG); // same package + is = url.openStream(); + } + catch (Exception ex) + { try { - URL url = ctx.getResource(resourcesDir + XHP_CONFIG); - // use classpath if not found locally. - //if (url == null) url = XmlHttpProxyServlet.class.getResource(classpathResourcesDir + XHP_CONFIG); - if (url == null) url = XmlHttpProxyServlet.class.getResource(XHP_CONFIG); // same package - is = url.openStream(); + getLogger().severe("XmlHttpProxyServlet error loading xhp.json : " + ex); + PrintWriter writer = res.getWriter(); + writer.write("XmlHttpProxyServlet Error: Error loading xhp.json. Make sure it is available in the /resources directory of your applicaton."); + writer.flush(); } - catch (Exception ex) - { - try - { - getLogger().severe("XmlHttpProxyServlet error loading xhp.json : " + ex); - PrintWriter writer = res.getWriter(); - writer.write("XmlHttpProxyServlet Error: Error loading xhp.json. Make sure it is available in the /resources directory of your applicaton."); - writer.flush(); - } - catch (Exception iox) {} - } - services = xhp.loadServices(is); - } + catch (Exception iox) {} + } + services = xhp.loadServices(is); + } - public void doDelete(HttpServletRequest req, HttpServletResponse res) { - doProcess(req,res, XmlHttpProxy.DELETE); - } + public void doDelete(HttpServletRequest req, HttpServletResponse res) { + doProcess(req,res, XmlHttpProxy.DELETE); + } - public void doGet(HttpServletRequest req, HttpServletResponse res) { - doProcess(req,res, XmlHttpProxy.GET); - } + public void doGet(HttpServletRequest req, HttpServletResponse res) { + doProcess(req,res, XmlHttpProxy.GET); + } - public void doPost(HttpServletRequest req, HttpServletResponse res) { - doProcess(req,res, XmlHttpProxy.POST); - } + public void doPost(HttpServletRequest req, HttpServletResponse res) { + doProcess(req,res, XmlHttpProxy.POST); + } - public void doPut(HttpServletRequest req, HttpServletResponse res) { - doProcess(req,res, XmlHttpProxy.PUT); - } + public void doPut(HttpServletRequest req, HttpServletResponse res) { + doProcess(req,res, XmlHttpProxy.PUT); + } - public void doProcess(HttpServletRequest req, HttpServletResponse res, String method) - { + public void doProcess(HttpServletRequest req, HttpServletResponse res, String method) + { - boolean isPost = XmlHttpProxy.POST.equals(method); - StringBuffer bodyContent = null; - OutputStream out = null; - 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); + boolean isPost = XmlHttpProxy.POST.equals(method); + StringBuffer bodyContent = null; + OutputStream out = null; + 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) { + } + + try + { + HttpSession session = null; + // it really does not make sense to use create session with require session as + // the create session will always result in a session created and the requireSession + // will always succeed. Leaving the logic for now. + if (createSession) { + session = req.getSession(true); + } + if (requireSession) { + // check to see if there was a session created for this request + // if not assume it was from another domain and blow up + // Wrap this to prevent Portlet exeptions + session = req.getSession(false); + if (session == null) { + res.setStatus(HttpServletResponse.SC_FORBIDDEN); + return; } - } catch (Exception e) { - } + } + serviceKey = req.getParameter("id"); + // only to preven regressions - Remove before 1.0 + if (serviceKey == null) serviceKey = req.getParameter("key"); + // check if the services have been loaded or if they need to be reloaded + if (services == null || configUpdated()) { + getServices(res); + } + String urlString = null; + String xslURLString = null; + String userName = null; + String password = null; + String format = "json"; + 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(' ', '+'); + } + // get the headers to pass through + Map headers = null; + // Forward all request headers starting with the header token jmaki- + // and chop off the jmaki- + Enumeration hnum = req.getHeaderNames(); - try - { - HttpSession session = null; - // it really does not make sense to use create session with require session as - // the create session will always result in a session created and the requireSession - // will always succeed. Leaving the logic for now. - if (createSession) { - session = req.getSession(true); - } - if (requireSession) { - // check to see if there was a session created for this request - // if not assume it was from another domain and blow up - // Wrap this to prevent Portlet exeptions - session = req.getSession(false); - if (session == null) { - res.setStatus(HttpServletResponse.SC_FORBIDDEN); - return; - } - } - serviceKey = req.getParameter("id"); - // only to preven regressions - Remove before 1.0 - if (serviceKey == null) serviceKey = req.getParameter("key"); - // check if the services have been loaded or if they need to be reloaded - if (services == null || configUpdated()) { - getServices(res); - } - String urlString = null; - String xslURLString = null; - String userName = null; - String password = null; - String format = "json"; - 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(' ', '+'); - } - // get the headers to pass through - Map headers = null; - // Forward all request headers starting with the header token jmaki- - // and chop off the jmaki- - Enumeration hnum = req.getHeaderNames(); + // test hack - // test hack + while (hnum.hasMoreElements()) { + String name = (String)hnum.nextElement(); + if (name.startsWith(headerToken)) + { + if (headers == null) headers = new HashMap(); - while (hnum.hasMoreElements()) { - String name = (String)hnum.nextElement(); - if (name.startsWith(headerToken)) - { - if (headers == null) headers = new HashMap(); + String value = ""; + // handle multi-value headers + Enumeration vnum = req.getHeaders(name); + while (vnum.hasMoreElements()) { + value += (String)vnum.nextElement(); + if (vnum.hasMoreElements()) value += ";"; + } + String sname = name.substring(headerToken.length(), name.length()); + headers.put(sname,value); + } + else if(name.startsWith(testToken)) + { + // hack test capabilities for authentication + if("xtest-user".equals(name)) testUser = req.getHeader("xtest-user"); + if("xtest-pass".equals(name)) testPass = req.getHeader("xtest-pass"); + } + } - String value = ""; - // handle multi-value headers - Enumeration vnum = req.getHeaders(name); - while (vnum.hasMoreElements()) { - value += (String)vnum.nextElement(); - if (vnum.hasMoreElements()) value += ";"; - } - String sname = name.substring(headerToken.length(), name.length()); - headers.put(sname,value); - } - else if(name.startsWith(testToken)) - { - // hack test capabilities for authentication - if("xtest-user".equals(name)) userName = req.getHeader("xtest-user"); - if("xtest-pass".equals(name)) password = req.getHeader("xtest-pass"); - } - } + String contentType = null; + try + { + String actualServiceKey = serviceKey != null ? serviceKey : "default"; + if (services.has(actualServiceKey)) + { - String contentType = null; - try - { - String actualServiceKey = serviceKey != null ? serviceKey : "default"; - if (services.has(actualServiceKey)) - { + JSONObject service = services.getJSONObject(actualServiceKey); + String serviceURL = service.getString("url"); + if(null==serviceURL) + throw new IllegalArgumentException("xhp.json: service url is mising"); - JSONObject service = services.getJSONObject(actualServiceKey); - String serviceURL = service.getString("url"); - 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("passthrough")) passthrough = - Boolean.valueOf(service.getString("passthrough")); + if(service.has("contentType")) contentType = service.getString("contentType"); - if(service.has("contentType")) contentType = service.getString("contentType"); - - if (service.has("username")) userName = service.getString("username"); - if (service.has("password")) password = service.getString("password"); + if(null==testUser) + { + System.out.println("Ignore service configuration credentials"); + if (service.has("username")) userName = service.getString("username"); + if (service.has("password")) password = service.getString("password"); + } + else + { + userName = testUser; + password = testPass; + } + + String apikey = ""; + if (service.has("apikey")) apikey = service.getString("apikey"); + if (service.has("xslStyleSheet")) xslURLString = service.getString("xslStyleSheet"); - String apikey = ""; - if (service.has("apikey")) apikey = service.getString("apikey"); - 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"); + } - // 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 += "&"; + } - // build the URL - if (urlParams != null && serviceURL.indexOf("?") == -1){ - serviceURL += "?"; - } else if (urlParams != null) { - serviceURL += "&"; - } + urlString = serviceURL + apikey; + if (urlParams != null) urlString += "&" + urlParams; + } - urlString = serviceURL + apikey; - if (urlParams != null) urlString += "&" + urlParams; - } + if(passthrough) + { + StringBuffer sb = new StringBuffer(); + sb.append(serviceURL); - if(passthrough) - { - StringBuffer sb = new StringBuffer(); - sb.append(serviceURL); + // override service url and url params + String path = req.getPathInfo(); + path = path.substring(path.indexOf("xhp/")+3, path.length()); - // override service url and url params - String path = req.getPathInfo(); - path = path.substring(path.indexOf("xhp/")+3, path.length()); + StringTokenizer tok = new StringTokenizer(path, "/"); + while(tok.hasMoreTokens()) + { + sb.append("/").append(URLEncoder.encode(tok.nextToken())); + } - StringTokenizer tok = new StringTokenizer(path, "/"); - while(tok.hasMoreTokens()) - { - sb.append("/").append(URLEncoder.encode(tok.nextToken())); - } + sb.append("?").append(req.getQueryString()); - sb.append("?").append(req.getQueryString()); + urlString = sb.toString(); + } + } + else + { + writer = res.getWriter(); + if (serviceKey == null) writer.write("XmlHttpProxyServlet Error: id parameter specifying serivce required."); + else writer.write("XmlHttpProxyServlet Error : service for id '" + serviceKey + "' not found."); + writer.flush(); + return; + } + } + catch (Exception ex) + { + getLogger().severe("XmlHttpProxyServlet Error loading service: " + ex); + res.setStatus(500); + } - urlString = sb.toString(); - } - } - else - { - writer = res.getWriter(); - if (serviceKey == null) writer.write("XmlHttpProxyServlet Error: id parameter specifying serivce required."); - else writer.write("XmlHttpProxyServlet Error : service for id '" + serviceKey + "' not found."); - writer.flush(); - return; - } - } - catch (Exception ex) - { - getLogger().severe("XmlHttpProxyServlet Error loading service: " + ex); - res.setStatus(500); - } + Map paramsMap = new HashMap(); + paramsMap.put("format", format); + // do not allow for xdomain unless the context level setting is enabled. + if (callback != null && allowXDomain) { + paramsMap.put("callback", callback); + } + if (countString != null) { + paramsMap.put("count", countString); + } - Map paramsMap = new HashMap(); - paramsMap.put("format", format); - // do not allow for xdomain unless the context level setting is enabled. - if (callback != null && allowXDomain) { - paramsMap.put("callback", callback); - } - if (countString != null) { - paramsMap.put("count", countString); - } + InputStream xslInputStream = null; - InputStream xslInputStream = null; + if (urlString == null) { + writer = res.getWriter(); + writer.write("XmlHttpProxyServlet parameters: id[Required] urlparams[Optional] format[Optional] callback[Optional]"); + writer.flush(); + return; + } + // support for session properties and also authentication name + if (urlString.indexOf("${") != -1) { + urlString = processURL(urlString, req, res); + } + // default to JSON + String actualContentType = contentType!=null ? contentType : defaultContentType; + res.setContentType(actualContentType); - if (urlString == null) { - writer = res.getWriter(); - writer.write("XmlHttpProxyServlet parameters: id[Required] urlparams[Optional] format[Optional] callback[Optional]"); - writer.flush(); + out = res.getOutputStream(); + // get the stream for the xsl stylesheet + if (xslURLString != null) { + // check the web root for the resource + URL xslURL = null; + xslURL = ctx.getResource(resourcesDir + "xsl/"+ xslURLString); + // if not in the web root check the classpath + if (xslURL == null) { + xslURL = XmlHttpProxyServlet.class.getResource(classpathResourcesDir + "xsl/" + xslURLString); + } + if (xslURL != null) { + xslInputStream = xslURL.openStream(); + } else { + String message = "Could not locate the XSL stylesheet provided for service id " + serviceKey + ". Please check the XMLHttpProxy configuration."; + getLogger().severe(message); + res.setStatus(500); + try { + out.write(message.getBytes()); + out.flush(); return; - } - // support for session properties and also authentication name - if (urlString.indexOf("${") != -1) { - urlString = processURL(urlString, req, res); - } - // default to JSON - String actualContentType = contentType!=null ? contentType : defaultContentType; - res.setContentType(actualContentType); - - out = res.getOutputStream(); - // get the stream for the xsl stylesheet - if (xslURLString != null) { - // check the web root for the resource - URL xslURL = null; - xslURL = ctx.getResource(resourcesDir + "xsl/"+ xslURLString); - // if not in the web root check the classpath - if (xslURL == null) { - xslURL = XmlHttpProxyServlet.class.getResource(classpathResourcesDir + "xsl/" + xslURLString); - } - if (xslURL != null) { - xslInputStream = xslURL.openStream(); - } else { - String message = "Could not locate the XSL stylesheet provided for service id " + serviceKey + ". Please check the XMLHttpProxy configuration."; - getLogger().severe(message); - res.setStatus(500); - try { - out.write(message.getBytes()); - out.flush(); - return; - } catch (java.io.IOException iox){ - } - } - } + } catch (java.io.IOException iox){ + } + } + } - if (!isPost) - { - xhp.processRequest(urlString, out, xslInputStream, paramsMap, headers, method, userName, password); - } - 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); - } + if (!isPost) + { + xhp.processRequest(urlString, out, xslInputStream, paramsMap, headers, method, userName, password); } - catch (Exception iox) + else { - iox.printStackTrace(); - getLogger().severe("XmlHttpProxyServlet: caught " + iox); - res.setStatus(500); - /*try { - writer = res.getWriter(); - writer.write("XmlHttpProxyServlet error loading service for " + serviceKey + " . Please notify the administrator."); - writer.flush(); - } catch (java.io.IOException ix) { - ix.printStackTrace(); - }*/ - return; + 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); } - finally + } + catch (Exception iox) + { + iox.printStackTrace(); + getLogger().severe("XmlHttpProxyServlet: caught " + iox); + res.setStatus(500); + /*try { + writer = res.getWriter(); + writer.write("XmlHttpProxyServlet error loading service for " + serviceKey + " . Please notify the administrator."); + writer.flush(); + } catch (java.io.IOException ix) { + ix.printStackTrace(); + }*/ + return; + } + finally + { + try { - try - { - if (out != null) out.close(); - if (writer != null) writer.close(); - } catch (java.io.IOException iox){} + if (out != null) out.close(); + if (writer != null) writer.close(); + } catch (java.io.IOException iox){} + } + } + + /* Allow for a EL style replacements in the serviceURL + * + * The constant REMOTE_USER will replace the contents of ${REMOTE_USER} + * with the return value of request.getRemoteUserver() if it is not null + * otherwise the ${REMOTE_USER} is replaced with a blank. + * + * If you use ${session.somekey} the ${session.somekey} will be replaced with + * the String value of the session varialble somekey or blank if the session key + * does not exist. + * + */ + private String processURL(String url, HttpServletRequest req, HttpServletResponse res) { + String serviceURL = url; + int start = url.indexOf("${"); + int end = url.indexOf("}", start); + if (end != -1) { + String prop = url.substring(start + 2, end).trim(); + // no matter what we will remove the ${} + // default to blank like the JSP EL + String replace = ""; + if (REMOTE_USER.equals(prop)) { + if (req.getRemoteUser() != null) replace = req.getRemoteUser(); } - } + if (prop.toLowerCase().startsWith("session.")) { + String sessionKey = prop.substring("session.".length(), prop.length()); + if (req.getSession().getAttribute(sessionKey) != null) { + // force to a string + replace = req.getSession().getAttribute(sessionKey).toString(); + } + } + serviceURL = serviceURL.substring(0, start) + + 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); + return serviceURL; + } - /* Allow for a EL style replacements in the serviceURL - * - * The constant REMOTE_USER will replace the contents of ${REMOTE_USER} - * with the return value of request.getRemoteUserver() if it is not null - * otherwise the ${REMOTE_USER} is replaced with a blank. - * - * If you use ${session.somekey} the ${session.somekey} will be replaced with - * the String value of the session varialble somekey or blank if the session key - * does not exist. - * + /** + * Check to see if the configuration file has been updated so that it may be reloaded. */ - private String processURL(String url, HttpServletRequest req, HttpServletResponse res) { - String serviceURL = url; - int start = url.indexOf("${"); - int end = url.indexOf("}", start); - if (end != -1) { - String prop = url.substring(start + 2, end).trim(); - // no matter what we will remove the ${} - // default to blank like the JSP EL - String replace = ""; - if (REMOTE_USER.equals(prop)) { - if (req.getRemoteUser() != null) replace = req.getRemoteUser(); - } - if (prop.toLowerCase().startsWith("session.")) { - String sessionKey = prop.substring("session.".length(), prop.length()); - if (req.getSession().getAttribute(sessionKey) != null) { - // force to a string - replace = req.getSession().getAttribute(sessionKey).toString(); - } - } - serviceURL = serviceURL.substring(0, start) + - replace + - serviceURL.substring(end + 1, serviceURL.length()); + private boolean configUpdated() { + try { + URL url = ctx.getResource(resourcesDir + XHP_CONFIG); + URLConnection con; + if (url == null) return false ; + con = url.openConnection(); + long lastModified = con.getLastModified(); + long XHP_LAST_MODIFIEDModified = 0; + if (ctx.getAttribute(XHP_LAST_MODIFIED) != null) { + XHP_LAST_MODIFIEDModified = ((Long)ctx.getAttribute(XHP_LAST_MODIFIED)).longValue(); + } else { + ctx.setAttribute(XHP_LAST_MODIFIED, new Long(lastModified)); + return false; } - // call recursively to process more than one instance of a ${ in the serviceURL - if (serviceURL.indexOf("${") != -1) serviceURL = processURL(serviceURL, req, res); - return serviceURL; - } - - /** - * Check to see if the configuration file has been updated so that it may be reloaded. - */ - private boolean configUpdated() { - try { - URL url = ctx.getResource(resourcesDir + XHP_CONFIG); - URLConnection con; - if (url == null) return false ; - con = url.openConnection(); - long lastModified = con.getLastModified(); - long XHP_LAST_MODIFIEDModified = 0; - if (ctx.getAttribute(XHP_LAST_MODIFIED) != null) { - XHP_LAST_MODIFIEDModified = ((Long)ctx.getAttribute(XHP_LAST_MODIFIED)).longValue(); - } else { - ctx.setAttribute(XHP_LAST_MODIFIED, new Long(lastModified)); - return false; - } - if (XHP_LAST_MODIFIEDModified < lastModified) { - ctx.setAttribute(XHP_LAST_MODIFIED, new Long(lastModified)); - return true; - } - } catch (Exception ex) { - getLogger().severe("XmlHttpProxyServlet error checking configuration: " + ex); + if (XHP_LAST_MODIFIEDModified < lastModified) { + ctx.setAttribute(XHP_LAST_MODIFIED, new Long(lastModified)); + return true; } - return false; - } + } catch (Exception ex) { + getLogger().severe("XmlHttpProxyServlet error checking configuration: " + ex); + } + return false; + } - public Logger getLogger() { - if (logger == null) { - logger = Logger.getLogger("jmaki.services.xhp.Log"); + public Logger getLogger() { + if (logger == null) { + logger = Logger.getLogger("jmaki.services.xhp.Log"); - // TODO: the logger breaks the GWT tests, because it writes to stderr - // we'll turn it off for now. - System.out.println("WARN: XHP proxy logging is turned off"); - logger.setLevel(Level.OFF); - } - return logger; - } + // TODO: the logger breaks the GWT tests, because it writes to stderr + // we'll turn it off for now. + System.out.println("WARN: XHP proxy logging is turned off"); + logger.setLevel(Level.OFF); + } + return logger; + } - private void logMessage(String message) { - if (rDebug) { - getLogger().info(message); - } - } + private void logMessage(String message) { + if (rDebug) { + getLogger().info(message); + } + } } \ No newline at end of file Modified: bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/LoginView.java =================================================================== --- bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-08-03 19:59:38 UTC (rev 727) @@ -174,7 +174,7 @@ public void onLoginFailed(Request request, Throwable t) { // auth failed - ConsoleLog.error("Authentication failed.", t); + ConsoleLog.error("Authentication failed", t); } } ); Modified: bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java =================================================================== --- bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-08-03 19:59:38 UTC (rev 727) @@ -55,11 +55,17 @@ String name = JSONWalk.on(root).next("name").asString(); boolean isSuspended = JSONWalk.on(root).next("suspended").asBool(); - String dplId = JSONWalk.on(root).next("deploymentId").asString(); + JSONWalk.JSONWrapper dplIdJson = JSONWalk.on(root).next("deploymentId"); + String dplId = dplIdJson!=null ? dplIdJson.asString() : null; + ProcessDefinitionRef ref = new ProcessDefinitionRef(id, name, version); ref.setDeploymentId(dplId); ref.setSuspended(isSuspended); + JSONWalk.JSONWrapper pkg = JSONWalk.on(root).next("packageName"); + if(pkg !=null) + ref.setPackageName(pkg.asString()); + // optional start form url JSONWalk.JSONWrapper formUrl = JSONWalk.on(root).next("formUrl"); if(formUrl !=null) Modified: bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/process/DeploymentPanel.java =================================================================== --- bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/process/DeploymentPanel.java 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/process/DeploymentPanel.java 2009-08-03 19:59:38 UTC (rev 727) @@ -31,6 +31,7 @@ import org.gwt.mosaic.ui.client.layout.LayoutPanel; import org.jboss.bpm.console.client.common.PropertyGrid; import org.jboss.bpm.console.client.engine.ViewDeploymentAction; +import org.jboss.bpm.console.client.util.ConsoleLog; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; @@ -83,8 +84,16 @@ public void update(String id) { initialize(); - this.deploymentId = id; - propGrid.update(new String[]{id}); + + if(id!=null) + { + this.deploymentId = id; + propGrid.update(new String[]{id}); + } + else + { + ConsoleLog.warn("deploymentId is null"); + } } public void clearView() Modified: bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java =================================================================== --- bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java 2009-07-31 10:45:59 UTC (rev 726) +++ bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java 2009-08-03 19:59:38 UTC (rev 727) @@ -114,13 +114,16 @@ }; grid.update(values); - deploymentPanel.update(process.getDeploymentId()); + + if(ServerPlugins.has("org.jboss.bpm.console.server.plugin.ProcessEnginePlugin")) + deploymentPanel.update(process.getDeploymentId()); } public void clearView() { grid.clear(); - deploymentPanel.clearView(); + if(ServerPlugins.has("org.jboss.bpm.console.server.plugin.ProcessEnginePlugin")) + deploymentPanel.clearView(); this.currentProcess = null; } }