[infinispan-commits] Infinispan SVN: r819 - trunk/server/rest.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Tue Sep 15 08:21:07 EDT 2009
Author: michael.neale at jboss.com
Date: 2009-09-15 08:21:07 -0400 (Tue, 15 Sep 2009)
New Revision: 819
Modified:
trunk/server/rest/Infinispan-rest-server.ipr
trunk/server/rest/Infinispan-rest-server.iws
trunk/server/rest/pom.xml
trunk/server/rest/rest-server.iml
Log:
ISPN-29 - switch to testNG
Modified: trunk/server/rest/Infinispan-rest-server.ipr
===================================================================
--- trunk/server/rest/Infinispan-rest-server.ipr 2009-09-15 11:12:31 UTC (rev 818)
+++ trunk/server/rest/Infinispan-rest-server.ipr 2009-09-15 12:21:07 UTC (rev 819)
@@ -244,7 +244,7 @@
</component>
<component name="ProjectFileVersion" converted="true" />
<component name="ProjectKey">
- <option name="state" value="project:///Users/Shared/projects/infinispan-rest/Infinispan-rest-server.ipr" />
+ <option name="state" value="project:///Users/Shared/projects/infinispan/server/rest/Infinispan-rest-server.ipr" />
</component>
<component name="ProjectModuleManager">
<modules>
@@ -518,6 +518,10 @@
<root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-javadoc.jar!/" />
@@ -540,6 +544,10 @@
<root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-javadoc.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-javadoc.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-javadoc.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-javadoc.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-sources.jar!/" />
@@ -562,6 +570,10 @@
<root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: org.jboss.resteasy:resteasy-jaxrs:1.1.GA">
Modified: trunk/server/rest/Infinispan-rest-server.iws
===================================================================
--- trunk/server/rest/Infinispan-rest-server.iws 2009-09-15 11:12:31 UTC (rev 818)
+++ trunk/server/rest/Infinispan-rest-server.iws 2009-09-15 12:21:07 UTC (rev 819)
@@ -91,28 +91,46 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="Server.scala" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/scala/org/infinispan/rest/Server.scala">
+ <file leaf-file-name="IntegrationTest.scala" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/test/scala/org/infinispan/rest/IntegrationTest.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="53" column="33" selection-start="2116" selection-end="2116" vertical-scroll-proportion="0.0">
+ <state line="29" column="25" selection-start="839" selection-end="839" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="IntegrationTest.scala" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/scala/org/infinispan/rest/IntegrationTest.scala">
+ <file leaf-file-name="Test.class" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15.jar!/org/testng/annotations/Test.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="43" column="16" selection-start="1392" selection-end="1392" vertical-scroll-proportion="0.0">
+ <state line="5" column="253" selection-start="400" selection-end="400" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="Assert.class" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15.jar!/org/testng/Assert.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="5" column="13" selection-start="148" selection-end="148" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="HttpServletResponse.class" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar://$MAVEN_REPOSITORY$/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/javax/servlet/http/HttpServletResponse.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="5" column="17" selection-start="160" selection-end="160" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="97" column="55" selection-start="2627" selection-end="2627" vertical-scroll-proportion="0.0">
+ <state line="119" column="0" selection-start="3218" selection-end="3218" vertical-scroll-proportion="0.868">
<folding />
</state>
</provider>
@@ -145,10 +163,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="infinispan-config.xml" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="infinispan-config.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/infinispan-config.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="30" column="0" selection-start="813" selection-end="813" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -199,6 +217,14 @@
<option name="myItemId" value="Libraries" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Maven: org.testng:testng:jdk15:5.9" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="testng-5.9-jdk15.jar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -214,13 +240,17 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="Maven: org.infinispan:infinispan-core:4.0.0-SNAPSHOT" />
+ <option name="myItemId" value="Maven: org.testng:testng:jdk15:5.9" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="infinispan-core-4.0.0-SNAPSHOT.jar" />
+ <option name="myItemId" value="testng-5.9-jdk15.jar" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="testng" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -235,18 +265,6 @@
<option name="myItemId" value="Libraries" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="Maven: org.infinispan:infinispan-core:4.0.0-SNAPSHOT" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="infinispan-core-4.0.0-SNAPSHOT.jar" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="infinispan" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -262,21 +280,13 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="Maven: org.infinispan:infinispan-core:4.0.0-SNAPSHOT" />
+ <option name="myItemId" value="Maven: javax.servlet:servlet-api:2.5" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="infinispan-core-4.0.0-SNAPSHOT.jar" />
+ <option name="myItemId" value="servlet-api-2.5.jar" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="infinispan" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="manager" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -288,9 +298,21 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="infinispan-rest" />
+ <option name="myItemId" value="Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Maven: javax.servlet:servlet-api:2.5" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="servlet-api-2.5.jar" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="servlet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -302,23 +324,23 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="infinispan-rest" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="Maven: javax.servlet:servlet-api:2.5" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="test" />
+ <option name="myItemId" value="servlet-api-2.5.jar" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="scala" />
+ <option name="myItemId" value="servlet" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="rest" />
+ <option name="myItemId" value="http" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -332,21 +354,9 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="infinispan-rest" />
+ <option name="myItemId" value="rest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="webapp" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -358,7 +368,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="infinispan-rest" />
+ <option name="myItemId" value="rest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -366,15 +376,15 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="main" />
+ <option name="myItemId" value="test" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="webapp" />
+ <option name="myItemId" value="scala" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="WEB-INF" />
+ <option name="myItemId" value="rest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -388,7 +398,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="infinispan-rest" />
+ <option name="myItemId" value="rest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -399,14 +409,6 @@
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="scala" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="rest" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -418,7 +420,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="infinispan-rest" />
+ <option name="myItemId" value="rest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -454,7 +456,7 @@
</navigator>
</component>
<component name="PropertiesComponent">
- <property name="project.structure.last.edited" value="Project" />
+ <property name="project.structure.last.edited" value="Modules" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="project.structure.proportion" value="0.15" />
<property name="options.splitter.main.proportions" value="0.3" />
@@ -471,29 +473,32 @@
<property name="options.splitter.details.proportions" value="0.2" />
<property name="dynamic.classpath" value="false" />
</component>
- <component name="RunManager" selected="JUnit.IntegrationTest">
- <tempConfiguration default="false" name="IntegrationTest" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma">
- <pattern>
- <option name="PATTERN" value="org.infinispan.rest.*" />
- <option name="ENABLED" value="true" />
- </pattern>
+ <component name="RunManager" selected="TestNG.IntegrationTest">
+ <tempConfiguration default="false" name="IntegrationTest" type="TestNG" factoryName="TestNG" enabled="false" merge="false" runner="emma">
<module name="rest-server" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" value="" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SUITE_NAME" />
<option name="PACKAGE_NAME" value="org.infinispan.rest" />
<option name="MAIN_CLASS_NAME" value="org.infinispan.rest.IntegrationTest" />
- <option name="METHOD_NAME" value="" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PARAMETERS" value="" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+ <option name="METHOD_NAME" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" />
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="ANNOTATION_TYPE" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="ADDITIONAL_CLASS_PATH" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="moduleWithDependencies" />
</option>
+ <option name="PROPERTIES_FILE" />
<envs />
+ <properties />
+ <listeners />
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
<method>
@@ -601,7 +606,7 @@
<setting name="params" value="" />
</configuration>
<list size="1">
- <item index="0" class="java.lang.String" itemvalue="JUnit.IntegrationTest" />
+ <item index="0" class="java.lang.String" itemvalue="TestNG.IntegrationTest" />
</list>
<configuration name="<template>" type="WebApp" default="true" selected="false">
<Host>localhost</Host>
@@ -648,8 +653,8 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="0" y="22" width="1920" height="878" extended-state="0" />
- <editor active="true" />
+ <frame x="0" y="22" width="1440" height="874" extended-state="0" />
+ <editor active="false" />
<layout>
<window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
@@ -661,16 +666,16 @@
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26364848" sideWeight="0.5" order="7" side_tool="false" />
+ <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2623169" sideWeight="0.5" order="7" side_tool="false" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3297414" sideWeight="0.72569907" order="3" side_tool="false" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28685898" sideWeight="0.60264903" order="0" side_tool="false" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28663793" sideWeight="0.7283622" order="0" side_tool="false" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
<window_info id="Web Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.38807946" sideWeight="0.5" order="2" side_tool="false" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3861518" sideWeight="0.5" order="2" side_tool="false" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.6711052" order="2" side_tool="false" />
@@ -709,27 +714,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar!/org/apache/commons/httpclient/methods/StringRequestEntity.class">
- <provider selected="true" editor-type-id="text-editor">
- <state line="15" column="11" selection-start="499" selection-end="499" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar!/org/apache/commons/httpclient/HttpMethodBase.class">
- <provider selected="true" editor-type-id="text-editor">
- <state line="5" column="36" selection-start="176" selection-end="190" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar!/javax/servlet/http/HttpServletResponse.class">
- <provider selected="true" editor-type-id="text-editor">
- <state line="8" column="8" selection-start="293" selection-end="293" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/index.html">
<provider selected="true" editor-type-id="text-editor">
<state line="61" column="54" selection-start="8774" selection-end="8818" vertical-scroll-proportion="0.0">
@@ -745,20 +729,20 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
- <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorProvider">
+ <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleGeneralEditorProvider">
<state />
</provider>
+ <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorReferencesProvider">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
<state line="3" column="100" selection-start="157" selection-end="157" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
- <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorReferencesProvider">
+ <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorProvider">
<state />
</provider>
- <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleGeneralEditorProvider">
- <state />
- </provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-library/2.7.5/scala-library-2.7.5.jar!/scala/Predef.class">
<provider selected="true" editor-type-id="text-editor">
@@ -767,6 +751,13 @@
</state>
</provider>
</entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/infinispan/infinispan-core/4.0.0-SNAPSHOT/infinispan-core-4.0.0-SNAPSHOT-sources.jar!/org/infinispan/manager/DefaultCacheManager.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="262" column="0" selection-start="13340" selection-end="13340" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/main/scala/org/infinispan/rest/Server.scala">
<provider selected="true" editor-type-id="text-editor">
<state line="53" column="33" selection-start="2116" selection-end="2116" vertical-scroll-proportion="0.0">
@@ -774,9 +765,9 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/scala/org/infinispan/rest/StartupListener.scala">
+ <entry file="jar://$MAVEN_REPOSITORY$/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/javax/servlet/http/HttpServletResponse.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="78" selection-start="478" selection-end="501" vertical-scroll-proportion="0.0">
+ <state line="5" column="17" selection-start="160" selection-end="160" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -795,16 +786,16 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/scala/org/infinispan/rest/IntegrationTest.scala">
+ <entry file="file://$PROJECT_DIR$/src/main/scala/org/infinispan/rest/StartupListener.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="43" column="16" selection-start="1392" selection-end="1392" vertical-scroll-proportion="0.0">
+ <state line="13" column="78" selection-start="478" selection-end="501" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/infinispan-config.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="97" column="55" selection-start="2627" selection-end="2627" vertical-scroll-proportion="0.0">
+ <state line="30" column="0" selection-start="813" selection-end="813" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -816,20 +807,34 @@
</state>
</provider>
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/infinispan/infinispan-core/4.0.0-SNAPSHOT/infinispan-core-4.0.0-SNAPSHOT-sources.jar!/org/infinispan/manager/DefaultCacheManager.java">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15.jar!/org/testng/annotations/Test.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="262" column="0" selection-start="13340" selection-end="13340" vertical-scroll-proportion="0.0">
+ <state line="5" column="253" selection-start="400" selection-end="400" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/infinispan-config.xml">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/testng/testng/5.9/testng-5.9-jdk15.jar!/org/testng/Assert.class">
<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="5" column="13" selection-start="148" selection-end="148" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/test/scala/org/infinispan/rest/IntegrationTest.scala">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="29" column="25" selection-start="839" selection-end="839" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pom.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="119" column="0" selection-start="3218" selection-end="3218" vertical-scroll-proportion="0.868">
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<option name="states">
Modified: trunk/server/rest/pom.xml
===================================================================
--- trunk/server/rest/pom.xml 2009-09-15 11:12:31 UTC (rev 818)
+++ trunk/server/rest/pom.xml 2009-09-15 12:21:07 UTC (rev 819)
@@ -117,13 +117,15 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.9</version>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ </dependency>
+
</dependencies>
</project>
Modified: trunk/server/rest/rest-server.iml
===================================================================
--- trunk/server/rest/rest-server.iml 2009-09-15 11:12:31 UTC (rev 818)
+++ trunk/server/rest/rest-server.iml 2009-09-15 12:21:07 UTC (rev 819)
@@ -45,10 +45,6 @@
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/" />
</containerElement>
- <containerElement type="library" name="Maven: org.testng:testng:jdk15:5.9" level="project">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/" />
- </containerElement>
<containerElement type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/" />
@@ -127,7 +123,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../apps/scala-2.7.5.final/lib/scala-compiler.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../apps/scala-2.7.5.final/lib/scala-compiler.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -139,7 +135,7 @@
<orderEntry type="library" exported="" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
<orderEntry type="library" exported="" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" exported="" name="Maven: jgroups:jgroups:2.8.0.CR1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.testng:testng:jdk15:5.9" level="project" />
+ <orderEntry type="library" name="Maven: org.testng:testng:jdk15:5.9" level="project" />
<orderEntry type="library" name="Maven: junit:junit:3.8.1" level="project" />
<orderEntry type="library" exported="" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
<orderEntry type="library" exported="" name="Maven: org.jboss.marshalling:river:1.2.0.CR3" level="project" />
More information about the infinispan-commits
mailing list