fix port offset affected area and dependency issue

zanata · Dec 24, 2013 · 06fa910 · 06fa910
1 parent c063dcb
commit 06fa910
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/functional-test/pom.xml b/functional-test/pom.xml
@@ -530,7 +530,6 @@
         <includes>
           <include>**/*.properties</include>
           <include>**/*.xml</include>
-          <include>META-INF/persistence.xml</include>
         </includes>
       </testResource>
       <testResource>
@@ -603,6 +602,7 @@
             <usedDependency>mysql:mysql-connector-java</usedDependency>
             <usedDependency>org.apache.solr:solr-core</usedDependency>
             <usedDependency>org.apache.solr:solr-solrj</usedDependency>
+            <usedDependency>org.hibernate:hibernate-entitymanager</usedDependency>
             <usedDependency>org.hibernate:hibernate-testing</usedDependency>
             <usedDependency>org.javassist:javassist</usedDependency>
             <usedDependency>org.jboss.as:jboss-as-ejb-client-bom</usedDependency>

diff --git a/functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java b/functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
@@ -42,7 +42,10 @@ public static String getDocumentStoragePath() {
             env.put(Context.INITIAL_CONTEXT_FACTORY,
                     org.jboss.naming.remote.client.InitialContextFactory.class
                             .getName());
-            env.put(Context.PROVIDER_URL, "remote://localhost:4447");
+            long portOffset = Integer.parseInt(
+                PropertiesHolder.getProperty("cargo.port.offset", "0"));
+            long rmiPort = 4447 + portOffset;
+            env.put(Context.PROVIDER_URL, "remote://localhost:" + rmiPort);
             InitialContext remoteContext = null;
             try {
                 remoteContext = new InitialContext(env);

diff --git a/functional-test/src/test/resources/setup.properties b/functional-test/src/test/resources/setup.properties
@@ -11,6 +11,8 @@ zanata.instance.url=${zanata.instance.url}
 zanata.sample.projects.basedir=${zanata.sample.projects.basedir}
 zanata.apikey=${zanata.apikey}
 
+cargo.port.offset=${cargo.port.offset}
+
 #persistence.xml
 hibernate.connection.url=${ds.connection.url}
 hibernate.connection.username=${ds.username}