You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by am...@apache.org on 2013/06/05 02:40:58 UTC
svn commit: r1489675 [7/7] - in /cxf/dosgi/trunk: ./ discovery/
discovery/distributed/ discovery/distributed/cxf-discovery/
discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/
discovery/distributed/cxf-discovery/...
Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java Wed Jun 5 00:40:54 2013
@@ -38,21 +38,22 @@ import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
public final class MultiBundleTools {
+
private MultiBundleTools() {
}
-
+
private static int getDistroBundles(Map<Integer, String> bundles, boolean discovery) throws Exception {
- File root = getRootDirectory();
+ File root = getRootDirectory();
File mdRoot = new File(root, "distribution/multi-bundle");
String pomVersion = getPomVersion(mdRoot);
-
+
return getDistroBundles(mdRoot, pomVersion, bundles, discovery);
}
-
- private static int getDistroBundles(File mdRoot,
- String pomVersion,
+
+ private static int getDistroBundles(File mdRoot,
+ String pomVersion,
Map<Integer,
- String> bundles,
+ String> bundles,
boolean discovery) throws Exception {
File distroDir = new File(mdRoot, "target/cxf-dosgi-ri-multibundle-distribution-" + pomVersion + "-dir");
Properties p = new Properties();
@@ -61,7 +62,7 @@ public final class MultiBundleTools {
if (discovery) {
p.load(new FileInputStream(new File(confDir, "felix.discovery.config.properties.append")));
}
-
+
int startLevel = Integer.parseInt(p.getProperty("org.osgi.framework.startlevel.beginning"));
for (int i = 0; i <= startLevel; i++) {
String val = p.getProperty("felix.auto.start." + i);
@@ -84,7 +85,7 @@ public final class MultiBundleTools {
String resourceName = "/" + MultiBundleTools.class.getName().replace('.', '/') + ".class";
URL curURL = MultiBundleTools.class.getResource(resourceName);
File curFile = new File(curURL.getFile());
- String curString = curFile.getAbsolutePath();
+ String curString = curFile.getAbsolutePath();
File curBase = new File(curString.substring(0, curString.length() - resourceName.length()));
return curBase.getParentFile().getParentFile().getParentFile().getParentFile();
}
@@ -128,7 +129,7 @@ public final class MultiBundleTools {
public static Option getDistroWithDiscovery() throws Exception {
return CoreOptions.composite(getDistroBundleOptions(true));
}
-
+
public static Option getDistro() throws Exception {
return CoreOptions.composite(getDistroBundleOptions(false));
}
Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestCustomIntent.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestCustomIntent.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestCustomIntent.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestCustomIntent.java Wed Jun 5 00:40:54 2013
@@ -48,9 +48,9 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.streamBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-
@RunWith(JUnit4TestRunner.class)
public class TestCustomIntent extends AbstractDosgiTest {
+
@Inject
BundleContext bundleContext;
@@ -82,8 +82,8 @@ public class TestCustomIntent extends Ab
mavenBundle().groupId("org.apache.cxf.dosgi.samples")
.artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject(),
mavenBundle().groupId("org.apache.cxf.dosgi.systests")
- .artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject(),
- streamBundle(getCustomIntentBundle()).noStart(),
+ .artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject(),
+ streamBundle(getCustomIntentBundle()).noStart(),
provision(getServiceBundle()),
frameworkStartLevel(100) };
}
@@ -107,5 +107,4 @@ public class TestCustomIntent extends Ab
Thread.currentThread().setContextClassLoader(cl);
}
}
-
}
Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java Wed Jun 5 00:40:54 2013
@@ -48,11 +48,10 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-
@RunWith(JUnit4TestRunner.class)
public class TestDiscoveryExport extends AbstractDosgiTest {
- private static final String GREETER_ZOOKEEPER_NODE
+ private static final String GREETER_ZOOKEEPER_NODE
= "/osgi/service_registry/org/apache/cxf/dosgi/samples/greeter/GreeterService/localhost#9090##greeter";
@Inject
@@ -70,8 +69,8 @@ public class TestDiscoveryExport extends
.artifactId("org.apache.servicemix.bundles.junit").version("4.9_2"),
mavenBundle().groupId("org.apache.cxf.dosgi.samples")
.artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject(),
- mavenBundle().groupId("org.apache.cxf.dosgi.samples").
- artifactId("cxf-dosgi-ri-samples-greeter-impl").versionAsInProject(),
+ mavenBundle().groupId("org.apache.cxf.dosgi.samples")
+ .artifactId("cxf-dosgi-ri-samples-greeter-impl").versionAsInProject(),
mavenBundle().groupId("org.apache.cxf.dosgi.systests")
.artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject(),
frameworkStartLevel(100)
@@ -90,7 +89,7 @@ public class TestDiscoveryExport extends
private void assertNodeExists(ZooKeeper zk, String zNode, int timeout) {
long endTime = System.currentTimeMillis() + timeout;
Stat stat = null;
- while (stat == null && System.currentTimeMillis() < endTime) {
+ while (stat == null && System.currentTimeMillis() < endTime) {
try {
stat = zk.exists(zNode, null);
Thread.sleep(200);
@@ -123,10 +122,10 @@ public class TestDiscoveryExport extends
protected void configureZookeeper(ConfigurationAdmin ca, int zkPort) throws IOException {
System.out.println("*** Port for Zookeeper Server: " + zkPort);
- updateZkServerConfig(zkPort, ca);
+ updateZkServerConfig(zkPort, ca);
updateZkClientConfig(zkPort, ca);
}
-
+
protected void updateZkClientConfig(final int zkPort, ConfigurationAdmin cadmin) throws IOException {
Dictionary<String, Object> cliProps = new Hashtable<String, Object>();
cliProps.put("zookeeper.host", "127.0.0.1");
@@ -139,5 +138,4 @@ public class TestDiscoveryExport extends
svrProps.put("clientPort", zkPort);
cadmin.getConfiguration("org.apache.cxf.dosgi.discovery.zookeeper.server", null).update(svrProps);
}
-
}
Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportRestService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportRestService.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportRestService.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportRestService.java Wed Jun 5 00:40:54 2013
@@ -33,6 +33,7 @@ import static org.ops4j.pax.exam.CoreOpt
@RunWith(JUnit4TestRunner.class)
public class TestExportRestService extends AbstractDosgiTest {
+
@Inject
BundleContext bundleContext;
@@ -50,10 +51,9 @@ public class TestExportRestService exten
frameworkStartLevel(100)
};
}
-
+
@Test
public void testEndpointAvailable() throws Exception {
waitPort(8080);
}
-
}
Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java Wed Jun 5 00:40:54 2013
@@ -50,23 +50,24 @@ import static org.ops4j.pax.exam.CoreOpt
@RunWith(JUnit4TestRunner.class)
public class TestExportService extends AbstractDosgiTest {
+
@Inject
BundleContext bundleContext;
@Configuration
public static Option[] configure() throws Exception {
return new Option[] {
- MultiBundleTools.getDistroWithDiscovery(),
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
- mavenBundle().groupId("org.apache.servicemix.bundles")
- .artifactId("org.apache.servicemix.bundles.junit").version("4.9_2"),
- mavenBundle().groupId("org.apache.cxf.dosgi.samples")
- .artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject(),
- mavenBundle().groupId("org.apache.cxf.dosgi.samples")
- .artifactId("cxf-dosgi-ri-samples-greeter-impl").versionAsInProject(),
- mavenBundle().groupId("org.apache.cxf.dosgi.systests")
- .artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject(),
- frameworkStartLevel(100)};
+ MultiBundleTools.getDistroWithDiscovery(),
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+ mavenBundle().groupId("org.apache.servicemix.bundles")
+ .artifactId("org.apache.servicemix.bundles.junit").version("4.9_2"),
+ mavenBundle().groupId("org.apache.cxf.dosgi.samples")
+ .artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject(),
+ mavenBundle().groupId("org.apache.cxf.dosgi.samples")
+ .artifactId("cxf-dosgi-ri-samples-greeter-impl").versionAsInProject(),
+ mavenBundle().groupId("org.apache.cxf.dosgi.systests")
+ .artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject(),
+ frameworkStartLevel(100)};
}
@Test
@@ -114,6 +115,7 @@ public class TestExportService extends A
}
class GreeterDataImpl implements GreeterData {
+
private String name;
private int age;
private boolean exception;
Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java Wed Jun 5 00:40:54 2013
@@ -53,9 +53,9 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-
@RunWith(JUnit4TestRunner.class)
public class TestImportService extends AbstractDosgiTest {
+
@Inject
BundleContext bundleContext;
@@ -73,11 +73,11 @@ public class TestImportService extends A
provision(createServiceConsumerBundle()),
// increase for debugging
systemProperty("org.apache.cxf.dosgi.test.serviceWaitTimeout").value(
- System.getProperty("org.apache.cxf.dosgi.test.serviceWaitTimeout", "20")),
+ System.getProperty("org.apache.cxf.dosgi.test.serviceWaitTimeout", "20")),
frameworkStartLevel(100)
};
}
-
+
protected static InputStream createServiceConsumerBundle() {
return TinyBundles.newBundle()
.add(MyActivator.class)
@@ -88,55 +88,56 @@ public class TestImportService extends A
.set(Constants.BUNDLE_SYMBOLICNAME, "testClientBundle")
.set(Constants.EXPORT_PACKAGE, "org.apache.cxf.dosgi.systests2.common.test1")
.set(Constants.BUNDLE_ACTIVATOR, MyActivator.class.getName())
- .build(TinyBundles.withBnd());
+ .build(TinyBundles.withBnd());
}
-
+
@Test
public void testClientConsumer() throws Exception {
// This test tests the consumer side of Distributed OSGi. It works as follows:
- // 1. It creates a little test bundle on the fly and starts that in the framework
- // (this happens in the configure() method above). The test bundle waits until its
- // instructed to start doing stuff. It's give this instruction via a service that is
+ // 1. It creates a little test bundle on the fly and starts that in the framework
+ // (this happens in the configure() method above). The test bundle waits until its
+ // instructed to start doing stuff. It's give this instruction via a service that is
// registered by this test (the service is of type java.lang.Object and has testName=test1).
// 2. The test manually creates a CXF server of the appropriate type (using ServerFactoryBean)
// 3. It signals the client bundle by registering a service to start doing its work.
- // This registers a ServiceTracker in the client bundle for the remote service that is created
- // by the test in step 2. The client bundle knows about the address through the
+ // This registers a ServiceTracker in the client bundle for the remote service that is created
+ // by the test in step 2. The client bundle knows about the address through the
// remote-services.xml file.
// 4. The client bundle will invoke the remote service and record the results in a service that it
// registers in the Service Registry.
// 5. The test waits for this service to appear and then checks the results which are available as
// a service property.
-
+
// Set up a Server in the test
ServerFactoryBean factory = new ServerFactoryBean();
factory.setServiceClass(GreeterService.class);
factory.setAddress("http://localhost:9191/grrr");
factory.getServiceFactory().setDataBinding(new AegisDatabinding());
factory.setServiceBean(new TestGreeter());
-
+
Server server = null;
ClassLoader cl = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(ServerFactoryBean.class.getClassLoader());
server = factory.create();
-
+
Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put("testName", "test1");
bundleContext.registerService(Object.class.getName(), new Object(), props);
-
+
// Wait for the service tracker in the test bundle to register a service with the test result
ServiceReference ref = waitService(bundleContext, String.class, "(testResult=test1)", 20);
Assert.assertEquals("HiOSGi;exception", ref.getProperty("result"));
} finally {
if (server != null) {
server.stop();
- }
+ }
Thread.currentThread().setContextClassLoader(cl);
}
}
-
+
public static class TestGreeter implements GreeterService {
+
public Map<GreetingPhrase, String> greetMe(String name) {
Map<GreetingPhrase, String> m = new HashMap<GreetingPhrase, String>();
GreetingPhrase gp = new GreetingPhrase("Hi");
@@ -146,6 +147,6 @@ public class TestImportService extends A
public GreetingPhrase[] greetMe(GreeterData gd) throws GreeterException {
throw new GreeterException("TestGreeter");
- }
+ }
}
}
Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/AddGreetingPhraseInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/AddGreetingPhraseInterceptor.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/AddGreetingPhraseInterceptor.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/AddGreetingPhraseInterceptor.java Wed Jun 5 00:40:54 2013
@@ -29,6 +29,7 @@ import org.apache.cxf.message.MessageCon
import org.apache.cxf.phase.AbstractPhaseInterceptor;
public final class AddGreetingPhraseInterceptor extends AbstractPhaseInterceptor<Message> {
+
AddGreetingPhraseInterceptor(String phase) {
super(phase);
}
@@ -40,4 +41,4 @@ public final class AddGreetingPhraseInte
//Object content1 = contents.iterator().next();
System.out.println(message);
}
-}
\ No newline at end of file
+}
Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/CustomFeature.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/CustomFeature.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/CustomFeature.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/CustomFeature.java Wed Jun 5 00:40:54 2013
@@ -24,9 +24,10 @@ import org.apache.cxf.interceptor.Interc
import org.apache.cxf.phase.Phase;
public final class CustomFeature extends AbstractFeature {
+
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
provider.getOutInterceptors().add(0, new AddGreetingPhraseInterceptor(Phase.USER_LOGICAL));
super.initializeProvider(provider, bus);
}
-}
\ No newline at end of file
+}
Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/CustomIntentActivator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/CustomIntentActivator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/CustomIntentActivator.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/CustomIntentActivator.java Wed Jun 5 00:40:54 2013
@@ -34,5 +34,4 @@ public class CustomIntentActivator imple
public void stop(BundleContext context) throws Exception {
}
-
}
Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/service/EmptyGreeterService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/service/EmptyGreeterService.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/service/EmptyGreeterService.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/service/EmptyGreeterService.java Wed Jun 5 00:40:54 2013
@@ -27,6 +27,7 @@ import org.apache.cxf.dosgi.samples.gree
import org.apache.cxf.dosgi.samples.greeter.GreetingPhrase;
public final class EmptyGreeterService implements GreeterService {
+
/**
* Return an empty array. Our custom intent should add a GreetingPhrase
*/
@@ -37,4 +38,4 @@ public final class EmptyGreeterService i
public Map<GreetingPhrase, String> greetMe(String name) {
return new HashMap<GreetingPhrase, String>();
}
-}
\ No newline at end of file
+}
Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/service/GreeterServiceWithCustomIntentActivator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/service/GreeterServiceWithCustomIntentActivator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/service/GreeterServiceWithCustomIntentActivator.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/service/GreeterServiceWithCustomIntentActivator.java Wed Jun 5 00:40:54 2013
@@ -39,5 +39,4 @@ public class GreeterServiceWithCustomInt
public void stop(BundleContext context) throws Exception {
}
-
}
Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/resources/log4j.properties?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/resources/log4j.properties (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/resources/log4j.properties Wed Jun 5 00:40:54 2013
@@ -10,4 +10,4 @@ log4j.appender.A1.layout.ConversionPatte
log4j.logger.org.ops4j.pax.scanner=WARN
log4j.logger.org.ops4j.pax.runner=WARN
-log4j.logger.org.ops4j.pax.url=WARN
\ No newline at end of file
+log4j.logger.org.ops4j.pax.url=WARN
Modified: cxf/dosgi/trunk/systests2/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/pom.xml Wed Jun 5 00:40:54 2013
@@ -40,4 +40,3 @@
<module>multi-bundle</module>
</modules>
</project>
-
Modified: cxf/dosgi/trunk/tck/apply-to-tck.sh.template
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/tck/apply-to-tck.sh.template?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/tck/apply-to-tck.sh.template (original)
+++ cxf/dosgi/trunk/tck/apply-to-tck.sh.template Wed Jun 5 00:40:54 2013
@@ -1,6 +1,6 @@
#This script pretends the current build to be the same as the version in the R5 TCK repo.
#This puts the wrong version numbers on the files copied to the repo, so it could be improved
-#but it keeps changes to a minimum.
+#but it keeps changes to a minimum.
#
#Run this script before executing the CT tests to get the CT tests to run with the current CXF DOSGi build