Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java?rev=1409451&r1=1409450&r2=1409451&view=diff ============================================================================== --- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java (original) +++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java Wed Nov 14 21:53:25 2012 @@ -28,6 +28,7 @@ import org.apache.cxf.dosgi.samples.gree import org.apache.cxf.dosgi.samples.greeter.GreeterException; import org.apache.cxf.dosgi.samples.greeter.GreeterService; import org.apache.cxf.dosgi.samples.greeter.GreetingPhrase; +import org.apache.cxf.dosgi.systests2.common.test1.GreeterDataImpl; import org.apache.cxf.dosgi.systests2.common.test1.MyActivator; import org.apache.cxf.dosgi.systests2.common.test1.MyServiceTracker; import org.apache.cxf.dosgi.systests2.common.test1.StartServiceTracker; @@ -48,6 +49,7 @@ public abstract class AbstractTestImport .add(MyActivator.class) .add(MyServiceTracker.class) .add(StartServiceTracker.class) + .add(GreeterDataImpl.class) .add("OSGI-INF/remote-service/remote-services.xml", AbstractTestImportService.class.getResource("/rs-test1.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "testClientBundle") .set(Constants.EXPORT_PACKAGE, "org.apache.cxf.dosgi.systests2.common.test1")
Added: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/GreeterDataImpl.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/GreeterDataImpl.java?rev=1409451&view=auto ============================================================================== --- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/GreeterDataImpl.java (added) +++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/GreeterDataImpl.java Wed Nov 14 21:53:25 2012 @@ -0,0 +1,22 @@ +package org.apache.cxf.dosgi.systests2.common.test1; + +import org.apache.cxf.dosgi.samples.greeter.GreeterData; + +public class GreeterDataImpl implements GreeterData { + + public int getAge() { + // TODO Auto-generated method stub + return 0; + } + + public String getName() { + // TODO Auto-generated method stub + return null; + } + + public boolean isException() { + // TODO Auto-generated method stub + return false; + } + +} \ No newline at end of file Propchange: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/GreeterDataImpl.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java?rev=1409451&r1=1409450&r2=1409451&view=diff ============================================================================== --- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java (original) +++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java Wed Nov 14 21:53:25 2012 @@ -21,12 +21,10 @@ package org.apache.cxf.dosgi.systests2.c import java.util.Hashtable; import java.util.Map; -import org.apache.cxf.dosgi.samples.greeter.GreeterData; import org.apache.cxf.dosgi.samples.greeter.GreeterException; import org.apache.cxf.dosgi.samples.greeter.GreeterService; import org.apache.cxf.dosgi.samples.greeter.GreetingPhrase; import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceException; import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTracker; @@ -59,7 +57,7 @@ public class MyServiceTracker extends Se invocationResult.append(e.getValue()); } try { - svc.greetMe(new GreeterDataImpl() {}); + svc.greetMe(new GreeterDataImpl()); } catch (GreeterException ex) { invocationResult.append(";exception"); } @@ -73,24 +71,5 @@ public class MyServiceTracker extends Se System.err.println("[client] Error during remote service invocation:"); x.printStackTrace(System.err); } - } - - private static class GreeterDataImpl implements GreeterData { - - public int getAge() { - // TODO Auto-generated method stub - return 0; - } - - public String getName() { - // TODO Auto-generated method stub - return null; - } - - public boolean isException() { - // TODO Auto-generated method stub - return false; - } - } } \ No newline at end of file Modified: cxf/dosgi/trunk/systests2/multi-bundle/pom.xml URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/pom.xml?rev=1409451&r1=1409450&r2=1409451&view=diff ============================================================================== --- cxf/dosgi/trunk/systests2/multi-bundle/pom.xml (original) +++ cxf/dosgi/trunk/systests2/multi-bundle/pom.xml Wed Nov 14 21:53:25 2012 @@ -48,13 +48,11 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> - <version>${osgi.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.enterprise</artifactId> - <version>${osgi.version}</version> <scope>test</scope> </dependency> <dependency> @@ -66,9 +64,13 @@ <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-bundle-minimal</artifactId> + <artifactId>cxf-api</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-core</artifactId> <version>${cxf.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.log4j</groupId>
