cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject [1/2] cxf-dosgi git commit: [DOSGI-241] Simplify examples
Date Thu, 30 Jun 2016 13:09:17 GMT
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 8d58f3e18 -> 90f706e37


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/samples/greeter_rest/impl2/pom.xml
----------------------------------------------------------------------
diff --git a/samples/greeter_rest/impl2/pom.xml b/samples/greeter_rest/impl2/pom.xml
deleted file mode 100644
index 1d84d2f..0000000
--- a/samples/greeter_rest/impl2/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!--
-  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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.cxf.dosgi.samples</groupId>
-    <artifactId>cxf-dosgi-ri-samples-greeter-rest-impl2</artifactId>
-    <packaging>bundle</packaging>
-    <name>Distributed OSGI Greeter Implementation2 Bundle</name>
-    <version>1.9-SNAPSHOT</version>
-
-    <parent>
-      <groupId>org.apache.cxf.dosgi</groupId>
-      <artifactId>cxf-dosgi-ri-parent</artifactId>
-      <version>1.9-SNAPSHOT</version>
-      <relativePath>../../../parent/pom.xml</relativePath>
-    </parent>
-
-    <properties>
-        <bundle.import.package>javax.ws.rs.*,*</bundle.import.package>
-        <bundle.private.package>org.apache.cxf.dosgi.samples.greeter.impl2.rest</bundle.private.package>
-        <topDirectoryLocation>..</topDirectoryLocation>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf.dosgi.samples</groupId>
-            <artifactId>cxf-dosgi-ri-samples-greeter-rest-interface</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-      <plugins>
-        <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-Name>CXF Distributed OSGi Greeter Demo Service REST
Implementation2 Bundle</Bundle-Name>
-                        <Bundle-Description>The 2nd server-side implementation of the
CXF Distributed OSGi Greeter REST demo</Bundle-Description>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Activator>org.apache.cxf.dosgi.samples.greeter.impl2.rest.Activator</Bundle-Activator>
-                        <Import-Package>${bundle.import.package}</Import-Package>
-                        <Private-Package>${bundle.private.package}</Private-Package>
-                        <DynamicImport-Package>org.apache.cxf.dosgi.dsw.qos,org.apache.cxf</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-         </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/Activator.java
----------------------------------------------------------------------
diff --git a/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/Activator.java
b/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/Activator.java
deleted file mode 100644
index 6076701..0000000
--- a/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/Activator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * 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.samples.greeter.impl2.rest;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.apache.cxf.dosgi.samples.greeter.rest.GreeterService;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-public class Activator implements BundleActivator {
-
-    private ServiceRegistration registration;
-
-    public void start(BundleContext bc) throws Exception {
-        Dictionary<String, Object> props = getProperties("/rest");
-        registration = bc.registerService(GreeterService.class.getName(),
-                                          new GreeterServiceImpl2(), props);
-    }
-
-    private Dictionary<String, Object> getProperties(String address) {
-        Dictionary<String, Object> props = new Hashtable<String, Object>();
-
-        props.put("service.exported.interfaces", "*");
-        props.put("service.exported.configs", "org.apache.cxf.rs");
-        props.put("service.exported.intents", "HTTP");
-        props.put("org.apache.cxf.rs.httpservice.context", address);
-        props.put("org.apache.cxf.rs.address", "/service");
-        return props;
-    }
-
-    public void stop(BundleContext bc) throws Exception {
-        registration.unregister();
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/GreeterServiceImpl2.java
----------------------------------------------------------------------
diff --git a/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/GreeterServiceImpl2.java
b/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/GreeterServiceImpl2.java
deleted file mode 100644
index 2b0881f..0000000
--- a/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/GreeterServiceImpl2.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * 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.samples.greeter.impl2.rest;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.cxf.dosgi.samples.greeter.rest.GreeterException;
-import org.apache.cxf.dosgi.samples.greeter.rest.GreeterInfo;
-import org.apache.cxf.dosgi.samples.greeter.rest.GreeterService;
-import org.apache.cxf.dosgi.samples.greeter.rest.GreetingPhrase;
-
-public class GreeterServiceImpl2 implements GreeterService {
-
-    private static final String STRANGER_NAME = "Stranger";
-
-    public GreeterInfo greetMe(String name) throws GreeterException {
-        System.out.println("Invoking from GreeterServiceImpl2: greetMe(" + name + ")");
-
-        if (name.equals(STRANGER_NAME)) {
-            throw new GreeterException(name);
-        }
-
-        GreeterInfo info = new GreeterInfo();
-        List<GreetingPhrase> list = new ArrayList<GreetingPhrase>();
-        list.add(new GreetingPhrase("Hello", name));
-        list.add(new GreetingPhrase("Hoi", name));
-        list.add(new GreetingPhrase("Hola", name));
-        list.add(new GreetingPhrase("Bonjour", name));
-        info.setGreetings(list);
-        return info;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/samples/greeter_rest/interface/pom.xml
----------------------------------------------------------------------
diff --git a/samples/greeter_rest/interface/pom.xml b/samples/greeter_rest/interface/pom.xml
index fcd1f65..c312f43 100644
--- a/samples/greeter_rest/interface/pom.xml
+++ b/samples/greeter_rest/interface/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.apache.cxf.dosgi.samples</groupId>
     <artifactId>cxf-dosgi-ri-samples-greeter-rest-interface</artifactId>
     <packaging>bundle</packaging>
-    <name>Distributed OSGI Greeter Rest Interface Bundle</name>
+    <name>Distributed OSGI Greeter REST Interface</name>
     <version>1.9-SNAPSHOT</version>
 
     <parent>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService2.java
----------------------------------------------------------------------
diff --git a/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService2.java
b/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService2.java
deleted file mode 100644
index 453157c..0000000
--- a/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * 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.samples.greeter.rest;
-
-public interface GreeterService2 {
-
-    GreeterInfo greetMe(String name) throws GreeterException;
-}

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/samples/greeter_rest/pom.xml
----------------------------------------------------------------------
diff --git a/samples/greeter_rest/pom.xml b/samples/greeter_rest/pom.xml
index d8f5e0c..f0dcad0 100644
--- a/samples/greeter_rest/pom.xml
+++ b/samples/greeter_rest/pom.xml
@@ -1,43 +1,47 @@
 <?xml version='1.0' encoding='UTF-8' ?>
-<!--
-  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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<!-- 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.dosgi.samples</groupId>
     <artifactId>cxf-dosgi-ri-samples-greeter-rest-parent</artifactId>
     <packaging>pom</packaging>
-    <name>Distributed OSGI Greeter Rest Bundles</name>
-    <version>1.9-SNAPSHOT</version>
+    <name>Distributed OSGI Greeter REST</name>
 
     <parent>
-      <groupId>org.apache.cxf.dosgi</groupId>
-      <artifactId>cxf-dosgi-ri-parent</artifactId>
-      <version>1.9-SNAPSHOT</version>
-      <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.cxf.dosgi</groupId>
+        <artifactId>cxf-dosgi-ri-parent</artifactId>
+        <version>1.9-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <modules>
-      <module>interface</module>
-      <module>impl</module>
-      <module>impl2</module>
-      <module>client</module>
+        <module>interface</module>
+        <module>impl</module>
+        <module>client</module>
     </modules>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
 </project>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 46812bb..3b0bcb1 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -22,7 +22,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.dosgi.samples</groupId>
     <artifactId>cxf-dosgi-ri-samples</artifactId>
-    <version>1.9-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Distributed OSGI RI Sample Bundles</name>
     <url>http://cxf.apache.org/</url>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/systests2/multi-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/systests2/multi-bundle/pom.xml b/systests2/multi-bundle/pom.xml
index 642c58f..6ee3186 100644
--- a/systests2/multi-bundle/pom.xml
+++ b/systests2/multi-bundle/pom.xml
@@ -74,7 +74,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse</groupId>
+            <groupId>org.eclipse.tycho</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
         </dependency>
         <!-- 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java
----------------------------------------------------------------------
diff --git a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java
b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java
index 09e3ba5..b7ae6f3 100644
--- a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java
+++ b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java
@@ -31,9 +31,6 @@ import java.util.concurrent.TimeoutException;
 
 import javax.inject.Inject;
 
-import org.apache.cxf.aegis.databinding.AegisDatabinding;
-import org.apache.cxf.dosgi.samples.greeter.GreeterService;
-import org.apache.cxf.frontend.ClientProxyFactoryBean;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
@@ -106,14 +103,6 @@ public class AbstractDosgiTest {
         }
     }
 
-    protected GreeterService createGreeterServiceProxy(String serviceUri) {
-        ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
-        factory.setServiceClass(GreeterService.class);
-        factory.setAddress(serviceUri);
-        factory.getServiceFactory().setDataBinding(new AegisDatabinding());
-        return (GreeterService)factory.create();
-    }
-
     protected Bundle getBundleByName(BundleContext bc, String name) {
         for (Bundle bundle : bc.getBundles()) {
             if (bundle.getSymbolicName().equals(name)) {
@@ -163,7 +152,7 @@ public class AbstractDosgiTest {
 
     protected void assertBundlesStarted() {
         for (Bundle bundle : bundleContext.getBundles()) {
-            //System.out.println(bundle.getSymbolicName() + ":" + bundle.getVersion() + ":
" + bundle.getState());
+            System.out.println(bundle.getSymbolicName() + ":" + bundle.getVersion() + ":
" + bundle.getState());
             if (bundle.getState() != Bundle.ACTIVE) {
                 try {
                     bundle.start();

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/GreeterServiceProxyFactory.java
----------------------------------------------------------------------
diff --git a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/GreeterServiceProxyFactory.java
b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/GreeterServiceProxyFactory.java
new file mode 100644
index 0000000..87ccb0f
--- /dev/null
+++ b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/GreeterServiceProxyFactory.java
@@ -0,0 +1,38 @@
+/**
+ * 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.multi;
+
+import org.apache.cxf.aegis.databinding.AegisDatabinding;
+import org.apache.cxf.dosgi.samples.greeter.GreeterService;
+import org.apache.cxf.frontend.ClientProxyFactoryBean;
+
+public final class GreeterServiceProxyFactory {
+    
+    private GreeterServiceProxyFactory() {
+    }
+
+    protected static GreeterService createGreeterServiceProxy(String serviceUri) {
+        ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
+        factory.setServiceClass(GreeterService.class);
+        factory.setAddress(serviceUri);
+        factory.getServiceFactory().setDataBinding(new AegisDatabinding());
+        return (GreeterService)factory.create();
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
----------------------------------------------------------------------
diff --git a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
index 1e4bf39..70e4816 100644
--- a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
+++ b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
@@ -96,10 +96,6 @@ public final class MultiBundleTools {
         return opts.toArray(new Option[opts.size()]);
     }
 
-    public static Option getDistroWithDiscovery() throws Exception {
-        return getDistro();
-    }
-
     public static Option getDistro() throws Exception {
         return CoreOptions.composite(getDistroBundleOptions());
     }

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestCustomIntent.java
----------------------------------------------------------------------
diff --git a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestCustomIntent.java
b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestCustomIntent.java
index 04ddcdc..0a94a65 100644
--- a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestCustomIntent.java
+++ b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestCustomIntent.java
@@ -41,6 +41,7 @@ import org.ops4j.pax.tinybundles.core.TinyBundles;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 
+import static org.apache.cxf.dosgi.systests2.multi.GreeterServiceProxyFactory.createGreeterServiceProxy;
 import static org.ops4j.pax.exam.CoreOptions.frameworkStartLevel;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.provision;

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java
----------------------------------------------------------------------
diff --git a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java
b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java
index b1a7f07..f3e3f41 100644
--- a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java
+++ b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java
@@ -54,7 +54,7 @@ public class TestDiscoveryExport extends AbstractDosgiTest {
     @Configuration
     public static Option[] configure() throws Exception {
         return new Option[] {
-                MultiBundleTools.getDistroWithDiscovery(),
+                MultiBundleTools.getDistro(),
                 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"),

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportRestService.java
----------------------------------------------------------------------
diff --git a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportRestService.java
b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportRestService.java
index ad601b5..26c1640 100644
--- a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportRestService.java
+++ b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportRestService.java
@@ -56,7 +56,7 @@ public class TestExportRestService extends AbstractDosgiTest {
     @Configuration
     public Option[] configure() throws Exception {
         return new Option[] {
-                MultiBundleTools.getDistroWithDiscovery(),
+                MultiBundleTools.getDistro(),
                 systemProperty("org.osgi.service.http.port").value(webPort),
                 systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
                 mavenBundle().groupId("org.apache.cxf.dosgi.samples")

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
----------------------------------------------------------------------
diff --git a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
index fa4a63e..e3a832f 100644
--- a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
+++ b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
@@ -51,7 +51,7 @@ public class TestExportService extends AbstractDosgiTest {
     @Configuration
     public static Option[] configure() throws Exception {
         return new Option[] {
-            MultiBundleTools.getDistroWithDiscovery(),
+            MultiBundleTools.getDistro(),
             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"),
@@ -82,7 +82,7 @@ public class TestExportService extends AbstractDosgiTest {
     }
 
     private void checkServiceCall(String serviceUri) {
-        GreeterService client = createGreeterServiceProxy(serviceUri);
+        GreeterService client = GreeterServiceProxyFactory.createGreeterServiceProxy(serviceUri);
 
         Map<GreetingPhrase, String> greetings = client.greetMe("Fred");
         Assert.assertEquals("Fred", greetings.get(new GreetingPhrase("Hello")));

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/90f706e3/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
----------------------------------------------------------------------
diff --git a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
index efc334b..f7775d9 100644
--- a/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
+++ b/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
@@ -62,7 +62,7 @@ public class TestImportService extends AbstractDosgiTest {
     @Configuration
     public static Option[] configure() throws Exception {
         return new Option[] {
-                MultiBundleTools.getDistroWithDiscovery(),
+                MultiBundleTools.getDistro(),
                 systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
                 mavenBundle().groupId("org.apache.cxf.dosgi.samples")
                     .artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject(),


Mime
View raw message