Author: [email protected] Date: Tue May 1 15:40:52 2012 New Revision: 2299
Log: [AMDATUAUTH-113] Added bamboo config / Added clover in itest Added: trunk/amdatu-auth/maven-settings-bamboo.xml Modified: trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/launcher/AuthTest.java Added: trunk/amdatu-auth/maven-settings-bamboo.xml ============================================================================== --- (empty file) +++ trunk/amdatu-auth/maven-settings-bamboo.xml Tue May 1 15:40:52 2012 @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2010-2012 The Amdatu Foundation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.verning permissions and limitations + under the License. +--> +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd";> + + <!-- This is the Maven settings file for the bamboo build server --> + + <localRepository>/vol/www/bamboo/build/maven-repository</localRepository> + + <servers> + <server> + <id>amdatu.nightly</id> + <username>anonymous</username> + </server> + <server> + <id>amdatu.releases</id> + <username>anonymous</username> + </server> + <server> + <id>amdatu.sites</id> + <username>anonymous</username> + </server> + </servers> + + <mirrors> + <mirror> + <id>central</id> + <name>Mirror to central</name> + <url>http://repo1.maven.org/maven2</url> + <mirrorOf>java.net</mirrorOf> + </mirror> + </mirrors> + +</settings> Modified: trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/launcher/AuthTest.java ============================================================================== --- trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/launcher/AuthTest.java (original) +++ trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/launcher/AuthTest.java Tue May 1 15:40:52 2012 @@ -19,7 +19,9 @@ import static org.amdatu.tenant.Constants.NAME_KEY; import static org.amdatu.tenant.Constants.PID_KEY; import static org.amdatu.web.tenantresolver.hostname.Constants.HOSTNAMES_KEY; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.options; +import static org.ops4j.pax.exam.CoreOptions.wrappedBundle; import java.io.IOException; import java.util.Dictionary; @@ -95,6 +97,7 @@ @Configuration public Option[] config() { return options( + wrappedBundle(mavenBundle().groupId("com.cenqua.clover").artifactId("clover").versionAsInProject()), CoreOptions.junitBundles(), CoreBundles.provisionAll(), WebBundles.provisionAll(), _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
