You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ja...@apache.org on 2012/07/13 15:44:11 UTC
svn commit: r1361218 - in /ace/sandbox/marrs: org.apache.ace.authentication.itest/ org.apache.ace.client.repository.itest/ org.apache.ace.configurator.useradmin.itest/ org.apache.ace.deployment.itest/ org.apache.ace.http.itest/ org.apache.ace.log.itest...

Author: jawi
Date: Fri Jul 13 13:44:11 2012
New Revision: 1361218

URL: http://svn.apache.org/viewvc?rev=1361218&view=rev
Log:
Fixed the itest run from ant. Made the default test port 8080 to avoid having to set the HTTP explicitly for each run configuration (which doesn't work in Bnd when called from Ant).

Modified:
    ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.client.repository.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.deployment.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.http.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.log.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.repository.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java

Modified: ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd?rev=1361218&r1=1361217&r2=1361218&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd Fri Jul 13 13:44:11 2012
@@ -64,4 +64,3 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.scheduler;version=latest,\
 	org.apache.ace.log.servlet;version=latest
 Private-Package: org.apache.ace.it.authentication
--runvm: -Dorg.osgi.service.http.port=9000
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.client.repository.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.repository.itest/bnd.bnd?rev=1361218&r1=1361217&r2=1361218&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.client.repository.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.client.repository.itest/bnd.bnd Fri Jul 13 13:44:11 2012
@@ -68,4 +68,3 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.client.repository.helper.configuration;version=latest,\
 	org.apache.ace.client.repository.impl;version=latest
 Private-Package: org.apache.ace.it.repositoryadmin
--runvm: -Dorg.osgi.service.http.port=9000 -ea
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd?rev=1361218&r1=1361217&r2=1361218&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd Fri Jul 13 13:44:11 2012
@@ -35,4 +35,3 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.repository.servlet;version=latest,\
 	org.apache.ace.configurator.useradmin.task;version=latest
 Private-Package: org.apache.ace.it.useradminconfigurator
--runvm: -Dorg.osgi.service.http.port=9000 -ea

Modified: ace/sandbox/marrs/org.apache.ace.deployment.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.deployment.itest/bnd.bnd?rev=1361218&r1=1361217&r2=1361218&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.deployment.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.deployment.itest/bnd.bnd Fri Jul 13 13:44:11 2012
@@ -46,4 +46,3 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.deployment.provider.base;version=latest,\
 	org.apache.ace.test;version=latest
 Private-Package: org.apache.ace.it.deployment
--runvm: -Dorg.osgi.service.http.port=9000 -ea
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.http.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.http.itest/bnd.bnd?rev=1361218&r1=1361217&r2=1361218&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.http.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.http.itest/bnd.bnd Fri Jul 13 13:44:11 2012
@@ -13,15 +13,16 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.server.log.store;version=latest,\
 	javax.servlet
 -runfw: org.apache.felix.framework;version='[4,5)'
--runbundles: org.apache.ace.test;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.itest/generated/org.apache.ace.itest.jar;version=latest,\
-	org.apache.felix.dependencymanager;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar;version='[3.1.0,3.1.1)',\
-	org.apache.felix.configadmin;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.configadmin/org.apache.felix.configadmin-1.2.8.jar;version='[1.2.8,1.2.9)',\
-	org.apache.ace.httplistener;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.httplistener/generated/org.apache.ace.httplistener.jar;version=latest,\
-	osgi.cmpn;resolution=http://bundles.bndtools.org.s3.amazonaws.com/osgi.cmpn/osgi.cmpn-4.2.1.jar;version='[4.2.1,4.2.2)',\
-	org.apache.felix.eventadmin;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.apache.felix.eventadmin/org.apache.felix.eventadmin-1.2.14.jar;version='[1.2.14,1.2.15)',\
+-runbundles: \
+	osgi.cmpn;version='[4.2.1,4.2.2)',\
+	org.apache.felix.eventadmin;version='[1.2.14,1.2.15)',\
 	org.apache.felix.http.jetty,\
 	org.apache.felix.shell,\
 	org.apache.felix.shell.tui,\
-	org.apache.felix.dependencymanager.shell
+	org.apache.felix.dependencymanager.shell,\
+	org.apache.felix.dependencymanager;version='[3.1.0,3.1.1)',\
+	org.apache.felix.configadmin;version='[1.2.8,1.2.9)',\
+	org.apache.ace.test;version=latest,\
+	org.apache.ace.httplistener;version=latest,\
+	org.apache.ace.deployment.provider.api;version=latest
 Private-Package: org.apache.ace.it.http
--runvm: -Dorg.osgi.service.http.port=9000 -ea
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.log.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.log.itest/bnd.bnd?rev=1361218&r1=1361217&r2=1361218&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.log.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.log.itest/bnd.bnd Fri Jul 13 13:44:11 2012
@@ -45,4 +45,3 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.felix.shell.tui,\
 	org.apache.felix.dependencymanager.shell
 Private-Package: org.apache.ace.it.log
--runvm: -Dorg.osgi.service.http.port=9000 -ea
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.repository.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.repository.itest/bnd.bnd?rev=1361218&r1=1361217&r2=1361218&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.repository.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.repository.itest/bnd.bnd Fri Jul 13 13:44:11 2012
@@ -17,6 +17,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.felix.configadmin;version='[1.2.8,1.2.9)',\
 	org.apache.felix.prefs;version='[1.0.4,1.0.5)',\
 	org.apache.felix.http.jetty;version='[2.2.0,2.2.1)',\
+	org.apache.ace.deployment.provider.api;version=latest,\
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.test;version=latest,\
@@ -25,4 +26,3 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.repository.impl;version=latest,\
 	org.apache.ace.repository.servlet;version=latest
 Private-Package: org.apache.ace.it.repository
--runvm: -Dorg.osgi.service.http.port=9000 -ea

Modified: ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java?rev=1361218&r1=1361217&r2=1361218&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java (original)
+++ ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java Fri Jul 13 13:44:11 2012
@@ -25,5 +25,5 @@ package org.apache.ace.test.constants;
  */
 public interface TestConstants {
     /** The port the webserver is running on for testing. */
-    public static final int PORT = 9000;
+    public static final int PORT = 8080;
 }