Modified: cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestExportService.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestExportService.java?rev=1421990&r1=1421989&r2=1421990&view=diff ============================================================================== --- cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestExportService.java (original) +++ cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestExportService.java Fri Dec 14 17:20:24 2012 @@ -1,20 +1,20 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. */ package org.apache.cxf.dosgi.systests2.single; @@ -26,7 +26,7 @@ import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; -@RunWith( JUnit4TestRunner.class ) +@RunWith(JUnit4TestRunner.class) public class TestExportService extends AbstractTestExportService { @Configuration public static Option[] configure() { @@ -40,14 +40,18 @@ public class TestExportService extends A // Run this one in Felix CoreOptions.frameworks(CoreOptions.felix()), - CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-singlebundle-distribution").versionAsInProject(), + CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi") + .artifactId("cxf-dosgi-ri-singlebundle-distribution").versionAsInProject(), // The following two bundles start the greeter demo which registers a remote service - CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.samples").artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject(), - CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.samples").artifactId("cxf-dosgi-ri-samples-greeter-impl").versionAsInProject(), + CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.samples") + .artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject(), + CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.samples") + .artifactId("cxf-dosgi-ri-samples-greeter-impl").versionAsInProject(), // This bundle contains the common system testing code - CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.systests").artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject() + CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.systests") + .artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject() ); }
Modified: cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestImportService.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestImportService.java?rev=1421990&r1=1421989&r2=1421990&view=diff ============================================================================== --- cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestImportService.java (original) +++ cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestImportService.java Fri Dec 14 17:20:24 2012 @@ -1,20 +1,20 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. */ package org.apache.cxf.dosgi.systests2.single; @@ -28,10 +28,10 @@ import org.ops4j.pax.exam.junit.Configur import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.osgi.framework.BundleContext; -@RunWith( JUnit4TestRunner.class ) +@RunWith(JUnit4TestRunner.class) public class TestImportService extends AbstractTestImportService { @Inject - BundleContext bundleContext = null; + BundleContext bundleContext; @Configuration public static Option[] configure() { @@ -39,11 +39,14 @@ public class TestImportService extends A // Run this one in Equinox CoreOptions.frameworks(CoreOptions.equinox()), - CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-singlebundle-distribution").versionAsInProject(), - CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.samples").artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject(), + CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi") + .artifactId("cxf-dosgi-ri-singlebundle-distribution").versionAsInProject(), + CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.samples") + .artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject(), // This bundle contains the common system testing code - CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.systests").artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject(), + CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.systests") + .artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject(), CoreOptions.provision(getTestClientBundle()) );
