continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1659069 - in /continuum/trunk/continuum-webapp-test: pom.xml src/test/resources/testng.properties
Date Wed, 11 Feb 2015 21:08:42 GMT
Author: batkinson
Date: Wed Feb 11 21:08:42 2015
New Revision: 1659069

URL: http://svn.apache.org/r1659069
Log:
Created property for sample projects to enable non-localhost URLs.

Modified:
    continuum/trunk/continuum-webapp-test/pom.xml
    continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties

Modified: continuum/trunk/continuum-webapp-test/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/pom.xml?rev=1659069&r1=1659068&r2=1659069&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/pom.xml (original)
+++ continuum/trunk/continuum-webapp-test/pom.xml Wed Feb 11 21:08:42 2015
@@ -610,6 +610,7 @@
     <seleniumPort>4444</seleniumPort>
     <continuum.port>9595</continuum.port>
     <baseUrl>http://localhost:${continuum.port}/continuum</baseUrl>
+    <sampleProjectsUrl>http://localhost:${continuum.port}</sampleProjectsUrl>
     <buildAgentUrl>http://localhost:${continuum.port}/continuum-buildagent/xmlrpc</buildAgentUrl>
     <appserverBase>${project.build.directory}</appserverBase>
     <browser>*firefox</browser>

Modified: continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties?rev=1659069&r1=1659068&r2=1659069&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties (original)
+++ continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties Wed Feb 11
21:08:42 2015
@@ -33,7 +33,7 @@ ADMIN_MAIL=admin@mail.com
 
 # Maven 2 projects to load
 
-MAVEN2_POM_URL=http://localhost:${continuum.port}/example-projects/simple-example/pom.xml
+MAVEN2_POM_URL=${sampleProjectsUrl}/example-projects/simple-example/pom.xml
 MAVEN2_POM_USERNAME=
 MAVEN2_POM_PASSWORD=
 MAVEN2_POM_PROJECT_NAME=Continuum Simple Example Project
@@ -43,20 +43,20 @@ MAVEN2_POM_PROJECT_GROUP_ID=org.apache.c
 MAVEN2_POM_PROJECT_GROUP_DESCRIPTION=
 MAVEN2_POM_PROJECT_GROUP_SCM_ROOT_URL=scm:svn:${svn.base.url}/trunk/simple-example
 
-MAVEN2_PROJECT_WITH_TAG_POM_URL=http://localhost:${continuum.port}/example-projects/continuum-2437-example/pom.xml
+MAVEN2_PROJECT_WITH_TAG_POM_URL=${sampleProjectsUrl}/example-projects/continuum-2437-example/pom.xml
 MAVEN2_PROJECT_WITH_TAG_POM_PROJECT_NAME=Continuum 2437 Example Project
 # values used for "Defined by POM" - tests should clean up this group afterwards if added
 MAVEN2_PROJECT_WITH_TAG_POM_PROJECT_GROUP_NAME=Continuum 2437 Example Project
 MAVEN2_PROJECT_WITH_TAG_POM_PROJECT_GROUP_ID=org.apache.continuum.examples
 MAVEN2_PROJECT_WITH_TAG_POM_PROJECT_GROUP_DESCRIPTION=
 
-MAVEN2_FAILING_PROJECT_POM_URL=http://localhost:${continuum.port}/example-projects/continuum-failing-project/pom.xml
+MAVEN2_FAILING_PROJECT_POM_URL=${sampleProjectsUrl}/example-projects/continuum-failing-project/pom.xml
 # values used for "Defined by POM" - tests should clean up this group afterwards if added
 MAVEN2_FAILING_PROJECT_POM_PROJECT_GROUP_NAME=Continuum Sample Failing Project
 MAVEN2_FAILING_PROJECT_POM_PROJECT_GROUP_ID=org.apache.continuum.failing.project
 MAVEN2_FAILING_PROJECT_POM_PROJECT_GROUP_DESCRIPTION=Sample project that has a build failure
 
-MAVEN2_QUEUE_TEST_POM_URL=http://localhost:${continuum.port}/example-projects/continuum-build-queue-test-data/pom.xml
+MAVEN2_QUEUE_TEST_POM_URL=${sampleProjectsUrl}/example-projects/continuum-build-queue-test-data/pom.xml
 MAVEN2_QUEUE_TEST_POM_USERNAME=
 MAVEN2_QUEUE_TEST_POM_PASSWORD=
 # values used for "Defined by POM" - tests should clean up this group afterwards if added
@@ -70,13 +70,13 @@ ANT_NAME=Sample Ant Project
 ANT_DESCRIPTION=This is a sample Ant Project used for testing
 ANT_VERSION=1.0.0-SNAPSHOT
 ANT_TAG=
-ANT_SCM_URL=http://localhost:${continuum.port}/example-projects/ant/
+ANT_SCM_URL=${sampleProjectsUrl}/example-projects/ant/
 ANT_SCM_USERNAME=
 ANT_SCM_PASSWORD=
 
 # Maven 1 projects to load
 
-MAVEN1_POM_URL=http://localhost:${continuum.port}/example-projects/maven-one-projects/valid-project.xml
+MAVEN1_POM_URL=${sampleProjectsUrl}/example-projects/maven-one-projects/valid-project.xml
 MAVEN1_POM_USERNAME=
 MAVEN1_POM_PASSWORD=
 
@@ -134,13 +134,13 @@ MAVEN1_PROJECT_GROUP_NAME=Maven One Proj
 MAVEN1_PROJECT_GROUP_ID=maven-one-project
 MAVEN1_PROJECT_GROUP_DESCRIPTION=This is a sample Maven One Project
 
-MAVEN1_MISSING_REPO_POM_URL=http://localhost:${continuum.port}/example-projects/maven-one-projects/missing-repository-element-project.xml
-MAVEN1_EXTENDED_POM_URL=http://localhost:${continuum.port}/example-projects/maven-one-projects/extend-element-project.xml
-MAVEN1_UNPARSEABLE_POM_URL=http://localhost:${continuum.port}/example-projects/maven-one-projects/unparseable-content-project.xml
+MAVEN1_MISSING_REPO_POM_URL=${sampleProjectsUrl}/example-projects/maven-one-projects/missing-repository-element-project.xml
+MAVEN1_EXTENDED_POM_URL=${sampleProjectsUrl}/example-projects/maven-one-projects/extend-element-project.xml
+MAVEN1_UNPARSEABLE_POM_URL=${sampleProjectsUrl}/example-projects/maven-one-projects/unparseable-content-project.xml
 
 # Maven 2 test properties
 
-MAVEN2_SAME_LETTER_FLAT_POM_URL=http://localhost:${continuum.port}/example-projects/flat-example/flat-parent/pom.xml
+MAVEN2_SAME_LETTER_FLAT_POM_URL=${sampleProjectsUrl}/example-projects/flat-example/flat-parent/pom.xml
 MAVEN2_SAME_LETTER_FLAT_PROJECT_GROUP_NAME=Flat Example
 MAVEN2_SAME_LETTER_FLAT_PROJECT_GROUP_ID=com.example.flat
 MAVEN2_SAME_LETTER_FLAT_PROJECT_GROUP_DESCRIPTION=
@@ -155,10 +155,10 @@ MAVEN2_MOVE_PROJECT_TARGET_PROJECT_GROUP
 MAVEN2_MOVE_PROJECT_TARGET_PROJECT_GROUP_DESCRIPTION=
 
 # SCM element is missing from pom
-MAVEN2_NO_SCM_POM_URL=http://localhost:${continuum.port}/example-projects/maven-two-projects/missing-scm-element-pom.xml
-MAVEN2_MISS_CONNECTION_POM_URL=http://localhost:${continuum.port}/example-projects/maven-two-projects/missing-connection-element-pom.xml
-MAVEN2_MISS_PARENT_POM_URL=http://localhost:${continuum.port}/example-projects/maven-two-projects/missing-parent-pom.xml
-MAVEN2_MISS_SUBPRO_POM_URL=http://localhost:${continuum.port}/example-projects/maven-two-projects/missing-modules-pom.xml
+MAVEN2_NO_SCM_POM_URL=${sampleProjectsUrl}/example-projects/maven-two-projects/missing-scm-element-pom.xml
+MAVEN2_MISS_CONNECTION_POM_URL=${sampleProjectsUrl}/example-projects/maven-two-projects/missing-connection-element-pom.xml
+MAVEN2_MISS_PARENT_POM_URL=${sampleProjectsUrl}/example-projects/maven-two-projects/missing-parent-pom.xml
+MAVEN2_MISS_SUBPRO_POM_URL=${sampleProjectsUrl}/example-projects/maven-two-projects/missing-modules-pom.xml
 
 # Ant test properties
 
@@ -241,12 +241,12 @@ DEFAULT_PROJ_GRP_DESCRIPTION=Contains al
 ########################
 
 # Properties for testAddMavenTwoProject
-M2_POM_URL=http://localhost:${continuum.port}/example-projects/continuum-build-queue-test-data/pom.xml
+M2_POM_URL=${sampleProjectsUrl}/example-projects/continuum-build-queue-test-data/pom.xml
 M2_POM_USERNAME=
 M2_POM_PASSWORD=
 
 # Properties for testDeleteMavenTwoProject
-M2_DELETE_POM_URL=http://localhost:${continuum.port}/example-projects/simple-example/pom.xml
+M2_DELETE_POM_URL=${sampleProjectsUrl}/example-projects/simple-example/pom.xml
 M2_DELETE_PROJ_GRP_NAME=Continuum Simple Example Project
 M2_DELETE_PROJ_GRP_ID=org.apache.continuum.examples.simple
 
@@ -258,7 +258,7 @@ SHELL_NAME=Shell Project
 SHELL_DESCRIPTION=This is a sample Shell Project used for testing
 SHELL_VERSION=1.0.0-SNAPSHOT
 SHELL_TAG=
-SHELL_SCM_URL=http://localhost:${continuum.port}/example-projects/shell/
+SHELL_SCM_URL=${sampleProjectsUrl}/example-projects/shell/
 SHELL_SCM_USERNAME=
 SHELL_SCM_PASSWORD=
 



Mime
View raw message