[OLINGO-236] Refactor complete

fit/pom.xml

@@ -35,7 +35,6 @@
   </parent>
   
   <properties>
-    <main.basedir>${project.parent.basedir}</main.basedir>
     <war.maven.plugin.version>2.4</war.maven.plugin.version>
   </properties>
 	
@@ -45,7 +44,7 @@
       <artifactId>olingo-commons-core</artifactId>
       <version>${project.version}</version>
     </dependency>
-
+    
     <!-- REST services CXF -->
     <dependency>
       <groupId>org.apache.cxf</groupId>
@@ -91,11 +90,20 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-vfs2</artifactId>
     </dependency>
+    
+    <dependency>
+      <groupId>org.apache.olingo</groupId>
+      <artifactId>olingo-client-core</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>        
   </dependencies>
   
   <build>
-    <defaultGoal>clean package cargo:run</defaultGoal>
-    
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -113,31 +121,47 @@
           <packagingExcludes>WEB-INF/classes/esigate.properties,WEB-INF/classes/META-INF/LICENSE*,WEB-INF/classes/META-INF/DEPENDENCIES*</packagingExcludes>
         </configuration>
       </plugin>
-          
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <inherited>true</inherited>
+        <configuration>
+          <systemPropertyVariables>
+            <propertyName>org.slf4j.simpleLogger.defaultLogLevel</propertyName>
+            <org.slf4j.simpleLogger.defaultLogLevel>DEBUG</org.slf4j.simpleLogger.defaultLogLevel>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+              
       <plugin>
         <groupId>org.codehaus.cargo</groupId>
         <artifactId>cargo-maven2-plugin</artifactId>
         <inherited>true</inherited>
         <configuration>
           <configuration>
+            <type>standalone</type>
             <properties>
-              <cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
-                -noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=256m</cargo.jvmargs>
+              <cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>
+              <cargo.tomcat.ajp.port>${cargo.tomcat.ajp.port}</cargo.tomcat.ajp.port>
+              <cargo.rmi.port>${cargo.rmi.port}</cargo.rmi.port>
+
+              <cargo.jvmargs>-noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=256m</cargo.jvmargs>
             </properties>
             <files>
               <file>
-                <file>${project.build.directory}/classes/esigate.properties</file>
+                <file>${project.build.outputDirectory}/esigate.properties</file>
                 <todir>lib</todir>
               </file>
             </files>
             <configfiles>
               <configfile>
-                <file>${project.build.directory}/classes/context.xml</file>
+                <file>${project.build.outputDirectory}/context.xml</file>
                 <todir>conf/</todir>
                 <tofile>context.xml</tofile>
               </configfile>
               <configfile>
-                <file>${project.build.directory}/classes/tomcat-users.xml</file>
+                <file>${project.build.outputDirectory}/tomcat-users.xml</file>
                 <todir>conf/</todir>
                 <tofile>tomcat-users.xml</tofile>
               </configfile>
@@ -147,10 +171,26 @@
             <deployable>
               <properties>
                 <context>/</context>
-              </properties>
+              </properties>              
             </deployable>
           </deployables>
         </configuration>
+        <executions>
+          <execution>
+            <id>start-container</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>stop-container</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
     

fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it;
+package org.apache.olingo.fit;
 
 import java.io.IOException;
 import java.io.InputStream;

fit/src/test/java/org/apache/olingo/fit/AbstractMetadataTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it;
+package org.apache.olingo.fit;
 
 import org.apache.olingo.client.api.CommonODataClient;
 

fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -49,7 +49,7 @@ import org.apache.olingo.client.api.http.HttpMethod;
 import org.apache.olingo.client.api.uri.v3.URIBuilder;
 import org.apache.olingo.client.api.v3.ODataClient;
 import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.client.core.it.AbstractBaseTestITCase;
+import org.apache.olingo.fit.AbstractBaseTestITCase;
 import org.apache.olingo.client.core.uri.URIUtils;
 import org.apache.olingo.commons.api.domain.CommonODataEntity;
 import org.apache.olingo.commons.api.domain.CommonODataEntitySet;

fit/src/test/java/org/apache/olingo/fit/v3/ActionOverloadingTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

fit/src/test/java/org/apache/olingo/fit/v3/AuthEntityRetrieveTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
 import org.apache.olingo.client.core.http.DefaultHttpClientFactory;

fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.*;
 import org.junit.Test;

fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;

fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

fit/src/test/java/org/apache/olingo/fit/v3/MetadataTestITCase.java

@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import org.apache.olingo.client.api.v3.ODataClient;
 import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.client.core.it.AbstractMetadataTestITCase;
+import org.apache.olingo.fit.AbstractMetadataTestITCase;
 import org.apache.olingo.commons.api.edm.Edm;
 import static org.junit.Assert.assertNotNull;
 import org.junit.Test;

fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;

fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import java.io.IOException;
 import org.apache.olingo.client.api.communication.ODataClientErrorException;

fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import static org.junit.Assert.assertEquals;
 

fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodEntityUpdateTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodPropertyUpdateTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v3;
+package org.apache.olingo.fit.v3;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import java.io.IOException;
 import java.net.URI;
@@ -28,7 +28,7 @@ import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse
 import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
 import org.apache.olingo.client.api.v4.ODataClient;
 import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.client.core.it.AbstractBaseTestITCase;
+import org.apache.olingo.fit.AbstractBaseTestITCase;
 import org.apache.olingo.commons.api.domain.ODataCollectionValue;
 import org.apache.olingo.commons.api.domain.v4.ODataEntity;
 import org.apache.olingo.commons.api.domain.v4.ODataProperty;

fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import java.net.URI;
 import java.util.List;
@@ -30,7 +30,7 @@ import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse
 import org.apache.olingo.client.api.communication.response.v4.AsyncResponseWrapper;
 import org.apache.olingo.client.api.uri.CommonURIBuilder;
 import org.apache.olingo.client.api.uri.v4.URIBuilder;
-import static org.apache.olingo.client.core.it.v4.AbstractTestITCase.client;
+import static org.apache.olingo.fit.v4.AbstractTestITCase.client;
 import org.apache.olingo.commons.api.domain.CommonODataEntity;
 import org.apache.olingo.commons.api.domain.CommonODataProperty;
 import org.apache.olingo.commons.api.domain.ODataInlineEntity;

fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;

fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java

@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
-import org.apache.olingo.client.api.communication.header.ODataPreferences;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -28,7 +27,6 @@ import org.apache.olingo.client.api.communication.request.retrieve.v4.ODataDelta
 import org.apache.olingo.commons.api.domain.v4.ODataDelta;
 import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;
 import org.apache.olingo.commons.api.domain.v4.ODataProperty;
-import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
 import org.apache.olingo.commons.api.format.ODataPubFormat;
 import org.junit.Test;
 

fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java

@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertEquals;
-import static org.apache.olingo.client.core.it.v4.AbstractTestITCase.client;
+import static org.apache.olingo.fit.v4.AbstractTestITCase.client;
 
 import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
 import org.apache.olingo.client.api.uri.URIFilter;

fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertEquals;

fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java

@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.apache.olingo.client.api.v4.ODataClient;
 import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.client.core.it.AbstractMetadataTestITCase;
+import org.apache.olingo.fit.AbstractMetadataTestITCase;
 import org.apache.olingo.commons.api.edm.Edm;
 import org.apache.olingo.commons.api.edm.EdmEntityContainer;
 import org.apache.olingo.commons.api.edm.EdmEntitySet;

fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v4/OperationImportInvokeTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/v4/PropertyTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import java.io.IOException;
 import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest;

fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -29,7 +29,7 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRe
 import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
 import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
 import org.apache.olingo.client.api.uri.v4.URIBuilder;
-import static org.apache.olingo.client.core.it.v4.AbstractTestITCase.client;
+import static org.apache.olingo.fit.v4.AbstractTestITCase.client;
 import org.apache.olingo.commons.api.domain.ODataInlineEntitySet;
 import org.apache.olingo.commons.api.domain.v4.ODataEntity;
 import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;

fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.client.core.it.v4;
+package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertEquals;
 

lib/client-core/pom.xml

@@ -62,14 +62,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
     </dependency>      
-    
-    <dependency>
-      <groupId>org.apache.olingo</groupId>
-      <artifactId>olingo-fit</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   
   <build>
@@ -85,39 +77,6 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <inherited>true</inherited>
-        <configuration>
-          <systemPropertyVariables>
-            <propertyName>org.slf4j.simpleLogger.defaultLogLevel</propertyName>
-            <org.slf4j.simpleLogger.defaultLogLevel>DEBUG</org.slf4j.simpleLogger.defaultLogLevel>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
-        <inherited>true</inherited>
-        <executions>
-          <execution>
-            <id>start-container</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>start</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>stop-container</id>
-            <phase>post-integration-test</phase>
-            <goals>
-              <goal>stop</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
     
     <resources>
@@ -131,10 +90,6 @@
         <directory>src/test/resources</directory>
         <filtering>false</filtering>
       </testResource>
-      <testResource>
-        <directory>${basedir}/../../fit/src/main/resources</directory>
-        <filtering>true</filtering>
-      </testResource>
     </testResources>
   </build>
 </project>

pom.xml

@@ -265,46 +265,6 @@
               <log>${cargo.log}</log>
               <output>${cargo.output}</output>
             </container>
-
-            <configuration>
-              <type>standalone</type>
-              <properties>
-                <cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>
-                <cargo.tomcat.ajp.port>${cargo.tomcat.ajp.port}</cargo.tomcat.ajp.port>
-                <cargo.rmi.port>${cargo.rmi.port}</cargo.rmi.port>
-
-                <!--<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</cargo.jvmargs> -->
-                <cargo.jvmargs>-noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=256m</cargo.jvmargs>
-              </properties>
-              <files>
-                <file>
-                  <file>${project.build.directory}/test-classes/esigate.properties</file>
-                  <todir>lib</todir>
-                </file>
-              </files>
-              <configfiles>
-                <configfile>
-                  <file>${project.build.directory}/test-classes/context.xml</file>
-                  <todir>conf/</todir>
-                  <tofile>context.xml</tofile>
-                </configfile>
-                <configfile>
-                  <file>${project.build.directory}/test-classes/tomcat-users.xml</file>
-                  <todir>conf/</todir>
-                  <tofile>tomcat-users.xml</tofile>
-                </configfile>
-              </configfiles>
-            </configuration>
-            <deployables>
-              <deployable>
-                <groupId>org.apache.olingo</groupId>
-                <artifactId>olingo-fit</artifactId>
-                <type>war</type>
-                <properties>
-                  <context>/</context>
-                </properties>
-              </deployable>
-            </deployables>
           </configuration>
         </plugin>