http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreetingPhrase.java ---------------------------------------------------------------------- diff --git a/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreetingPhrase.java b/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreetingPhrase.java deleted file mode 100644 index 857ed70..0000000 --- a/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreetingPhrase.java +++ /dev/null @@ -1,50 +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; - -public class GreetingPhrase { - - private String phrase; - - public GreetingPhrase() { - } - - public GreetingPhrase(String phrase) { - this.phrase = phrase; - } - - public void setPhrase(String thePhrase) { - this.phrase = thePhrase; - } - - public String getPhrase() { - return phrase; - } - - @Override - public int hashCode() { - return phrase.hashCode(); - } - - @Override - public boolean equals(Object other) { - return GreetingPhrase.class.isAssignableFrom(other.getClass()) - && phrase.equals(((GreetingPhrase) other).phrase); - } -}
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/greeter/pom.xml ---------------------------------------------------------------------- diff --git a/samples/greeter/pom.xml b/samples/greeter/pom.xml deleted file mode 100644 index 2b7764a..0000000 --- a/samples/greeter/pom.xml +++ /dev/null @@ -1,42 +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-parent</artifactId> - <packaging>pom</packaging> - <name>Distributed OSGI Greeter Bundles</name> - <version>1.8-SNAPSHOT</version> - - <parent> - <groupId>org.apache.cxf.dosgi</groupId> - <artifactId>cxf-dosgi-ri-parent</artifactId> - <version>1.8-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> - </parent> - - <modules> - <module>interface</module> - <module>impl</module> - <module>client</module> - </modules> - -</project> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/greeter_rest/client/pom.xml ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/client/pom.xml b/samples/greeter_rest/client/pom.xml deleted file mode 100644 index b0fe7d3..0000000 --- a/samples/greeter_rest/client/pom.xml +++ /dev/null @@ -1,76 +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-client</artifactId> - <packaging>bundle</packaging> - <name>Distributed OSGI Greeter Bundle Client</name> - <version>1.8-SNAPSHOT</version> - - <parent> - <groupId>org.apache.cxf.dosgi</groupId> - <artifactId>cxf-dosgi-ri-parent</artifactId> - <version>1.8-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.client.rest</bundle.private.package> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.cxf.dosgi.samples</groupId> - <artifactId>cxf-dosgi-ri-samples-greeter-rest-interface</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-Name>CXF Distributed OSGi Greeter REST Demo Client Bundle</Bundle-Name> - <Bundle-Description>The client-side implementation of the Distributed OSGi Greeter REST demo</Bundle-Description> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Bundle-Activator>org.apache.cxf.dosgi.samples.greeter.client.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/aries-rsa/blob/d73a3a7f/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java b/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java deleted file mode 100644 index 0fc7802..0000000 --- a/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java +++ /dev/null @@ -1,126 +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.client.rest; - -import javax.swing.JOptionPane; - -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.GreeterService2; -import org.apache.cxf.dosgi.samples.greeter.rest.GreetingPhrase; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.util.tracker.ServiceTracker; - -public class Activator implements BundleActivator { - - private ServiceTracker<GreeterService, GreeterService> tracker; - private ServiceTracker<GreeterService2, GreeterService2> tracker2; - - public void start(final BundleContext bc) { - tracker = new ServiceTracker<GreeterService, GreeterService>(bc, GreeterService.class, null) { - @Override - public GreeterService addingService(ServiceReference<GreeterService> reference) { - GreeterService service = super.addingService(reference); - useGreeterService(service); - return service; - } - }; - tracker.open(); - - tracker2 = new ServiceTracker<GreeterService2, GreeterService2>(bc, GreeterService2.class, null) { - @Override - public GreeterService2 addingService(ServiceReference<GreeterService2> reference) { - GreeterService2 service = super.addingService(reference); - useGreeterService2(service); - return service; - } - }; - tracker2.open(); - } - - protected void useGreeterService(final GreeterService greeter) { - Thread t = new Thread(new Runnable() { - public void run() { - greeterUI(greeter); - } - }); - t.start(); - } - - protected void useGreeterService2(final GreeterService2 greeter) { - Thread t = new Thread(new Runnable() { - public void run() { - greeter2UI(greeter); - } - }); - t.start(); - } - - private void greeterUI(final GreeterService greeter) { - while (true) { - System.out.println("*** Opening greeter client dialog ***"); - String name = JOptionPane.showInputDialog("Enter name:"); - if (name == null) { - break; - } - System.out.println("*** Invoking greeter ***"); - try { - GreeterInfo info = greeter.greetMe(name); - - System.out.println("greetMe(\"" + name + "\") returns:"); - for (GreetingPhrase greeting: info.getGreetings()) { - System.out.println(" " + greeting.getPhrase() - + " " + greeting.getName()); - } - } catch (GreeterException ex) { - System.out.println("GreeterException: " + ex.toString()); - } - } - } - - private void greeter2UI(final GreeterService2 greeter) { - while (true) { - System.out.println("*** Opening greeter2 client dialog ***"); - String name = JOptionPane.showInputDialog("Greeter2: Enter name"); - if (name == null) { - break; - } - System.out.println("*** Invoking greeter2 ***"); - try { - GreeterInfo info = greeter.greetMe(name); - - System.out.println("greetMe(\"" + name + "\") returns:"); - for (GreetingPhrase greeting: info.getGreetings()) { - System.out.println(" " + greeting.getPhrase() - + " " + greeting.getName()); - } - } catch (GreeterException ex) { - System.out.println("GreeterException: " + ex.toString()); - } - } - } - - public void stop(BundleContext bc) throws Exception { - tracker.close(); - tracker2.close(); - } -} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/greeter_rest/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml b/samples/greeter_rest/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml deleted file mode 100644 index 1b2ec65..0000000 --- a/samples/greeter_rest/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml +++ /dev/null @@ -1,31 +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. - --> -<service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0";> - <service-description> - <provide interface="org.apache.cxf.dosgi.samples.greeter.rest.GreeterService" /> - <property name="service.exported.interfaces">*</property> - <property name="service.exported.configs">org.apache.cxf.rs</property> - <property name="service.exported.intents">HTTP</property> - <property name="org.apache.cxf.rs.address">http://localhost:8080/greeter</property> - </service-description> - <service-description> - <provide interface="org.apache.cxf.dosgi.samples.greeter.rest.GreeterService2" /> - <property name="service.exported.interfaces">*</property> - <property name="service.exported.configs">org.apache.cxf.rs</property> - <property name="service.exported.intents">HTTP</property> - <property name="org.apache.cxf.rs.address">http://localhost:8080/greeter2</property> - </service-description> -</service-descriptions> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/greeter_rest/impl/pom.xml ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/impl/pom.xml b/samples/greeter_rest/impl/pom.xml deleted file mode 100644 index f357327..0000000 --- a/samples/greeter_rest/impl/pom.xml +++ /dev/null @@ -1,77 +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-impl</artifactId> - <packaging>bundle</packaging> - <name>Distributed OSGI Greeter Implementation Bundle</name> - <version>1.8-SNAPSHOT</version> - - <parent> - <groupId>org.apache.cxf.dosgi</groupId> - <artifactId>cxf-dosgi-ri-parent</artifactId> - <version>1.8-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.impl.rest</bundle.private.package> - </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 Implementation Bundle</Bundle-Name> - <Bundle-Description>The 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.impl.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/aries-rsa/blob/d73a3a7f/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/Activator.java ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/Activator.java b/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/Activator.java deleted file mode 100644 index 5ee239b..0000000 --- a/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/Activator.java +++ /dev/null @@ -1,59 +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.impl.rest; - -import java.util.Dictionary; -import java.util.Hashtable; - -import org.apache.cxf.dosgi.samples.greeter.rest.GreeterService; -import org.apache.cxf.dosgi.samples.greeter.rest.GreeterService2; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceRegistration; - -public class Activator implements BundleActivator { - - private ServiceRegistration registration; - private ServiceRegistration registration2; - - public void start(BundleContext bc) throws Exception { - Dictionary<String, Object> props = getProperties("/greeter"); - registration = bc.registerService(GreeterService.class.getName(), - new GreeterServiceImpl(), props); - - props = getProperties("/greeter2"); - registration2 = bc.registerService(GreeterService2.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); - return props; - } - - public void stop(BundleContext bc) throws Exception { - registration.unregister(); - registration2.unregister(); - } -} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl.java ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl.java b/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl.java deleted file mode 100644 index cf8df84..0000000 --- a/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl.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.impl.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 GreeterServiceImpl implements GreeterService { - - private static final String STRANGER_NAME = "Stranger"; - - public GreeterInfo greetMe(String name) throws GreeterException { - System.out.println("Invoking: 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/aries-rsa/blob/d73a3a7f/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl2.java ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl2.java b/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl2.java deleted file mode 100644 index 83731c5..0000000 --- a/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl2.java +++ /dev/null @@ -1,33 +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.impl.rest; - -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.GreeterService2; - -public class GreeterServiceImpl2 implements GreeterService2 { - - private GreeterServiceImpl greeter = new GreeterServiceImpl(); - - public GreeterInfo greetMe(String name) throws GreeterException { - System.out.println("Delegating from GreeterServiceImpl2 to GreeterServiceImpl"); - return greeter.greetMe(name); - } -} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/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 f74896c..0000000 --- a/samples/greeter_rest/impl2/pom.xml +++ /dev/null @@ -1,77 +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.8-SNAPSHOT</version> - - <parent> - <groupId>org.apache.cxf.dosgi</groupId> - <artifactId>cxf-dosgi-ri-parent</artifactId> - <version>1.8-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> - </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/aries-rsa/blob/d73a3a7f/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/aries-rsa/blob/d73a3a7f/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/aries-rsa/blob/d73a3a7f/samples/greeter_rest/interface/pom.xml ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/interface/pom.xml b/samples/greeter_rest/interface/pom.xml deleted file mode 100644 index ebc19f9..0000000 --- a/samples/greeter_rest/interface/pom.xml +++ /dev/null @@ -1,81 +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-interface</artifactId> - <packaging>bundle</packaging> - <name>Distributed OSGI Greeter Rest Interface Bundle</name> - <version>1.8-SNAPSHOT</version> - - <parent> - <groupId>org.apache.cxf.dosgi</groupId> - <artifactId>cxf-dosgi-ri-parent</artifactId> - <version>1.8-SNAPSHOT</version> - <relativePath>../../../parent/pom.xml</relativePath> - </parent> - - <properties> - <bundle.import.package>javax.ws.rs,javax.xml.bind.annotation,*</bundle.import.package> - <bundle.export.package>org.apache.cxf.dosgi.samples.greeter.rest</bundle.export.package> - </properties> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.servicemix.specs</groupId> - <artifactId>org.apache.servicemix.specs.jsr339-api-m10</artifactId> - <version>${servicemix.specs.version}</version> - </dependency> - <dependency> - <groupId>org.apache.servicemix.specs</groupId> - <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId> - <version>${servicemix.specs.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 REST Demo Interface Bundle</Bundle-Name> - <Bundle-Description>The interfaces of the CXF Distributed OSGi Greeter REST demo</Bundle-Description> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Import-Package>${bundle.import.package}</Import-Package> - <Export-Package>${bundle.export.package}</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - -</project> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterException.java ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterException.java b/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterException.java deleted file mode 100644 index fb83637..0000000 --- a/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterException.java +++ /dev/null @@ -1,45 +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 class GreeterException extends Exception { - - private static final long serialVersionUID = 1L; - private String name; - - public GreeterException() { - } - - public GreeterException(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setName(String theName) { - name = theName; - } - - @Override - public String toString() { - return "GreeterService can not greet " + name; - } -} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterInfo.java ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterInfo.java b/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterInfo.java deleted file mode 100644 index 6dba206..0000000 --- a/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterInfo.java +++ /dev/null @@ -1,37 +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; - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlRootElement; -@XmlRootElement -public class GreeterInfo { - - private List<GreetingPhrase> greetings = new ArrayList<GreetingPhrase>(); - - public void setGreetings(List<GreetingPhrase> list) { - greetings = list; - } - - public List<GreetingPhrase> getGreetings() { - return greetings; - } -} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService.java ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService.java b/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService.java deleted file mode 100644 index 7e67bd4..0000000 --- a/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService.java +++ /dev/null @@ -1,31 +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; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - -@Path("greeter") -public interface GreeterService { - - @GET - @Path("greeting/{name}") - GreeterInfo greetMe(@PathParam("name") String name) throws GreeterException; -} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/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/aries-rsa/blob/d73a3a7f/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreetingPhrase.java ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreetingPhrase.java b/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreetingPhrase.java deleted file mode 100644 index 545e091..0000000 --- a/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreetingPhrase.java +++ /dev/null @@ -1,64 +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; - -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class GreetingPhrase { - - private String phrase; - private String name; - - public GreetingPhrase() { - } - - public GreetingPhrase(String phrase, String name) { - this.phrase = phrase; - this.name = name; - } - - public void setPhrase(String thePhrase) { - this.phrase = thePhrase; - } - - public String getPhrase() { - return phrase; - } - - public void setName(String theName) { - this.name = theName; - } - - public String getName() { - return name; - } - - @Override - public int hashCode() { - return phrase.hashCode() + 37 * name.hashCode(); - } - - @Override - public boolean equals(Object other) { - return GreetingPhrase.class.isAssignableFrom(other.getClass()) - && phrase.equals(((GreetingPhrase) other).phrase) - && name.equals(((GreetingPhrase) other).name); - } -} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/greeter_rest/interface/src/main/resources/OSGI-INF/cxf/jaxrs/GreeterService2-model.xml ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/interface/src/main/resources/OSGI-INF/cxf/jaxrs/GreeterService2-model.xml b/samples/greeter_rest/interface/src/main/resources/OSGI-INF/cxf/jaxrs/GreeterService2-model.xml deleted file mode 100644 index 2c4da17..0000000 --- a/samples/greeter_rest/interface/src/main/resources/OSGI-INF/cxf/jaxrs/GreeterService2-model.xml +++ /dev/null @@ -1,7 +0,0 @@ -<model xmlns="http://cxf.apache.org/jaxrs";> - <resource name="org.apache.cxf.dosgi.samples.greeter.rest.GreeterService2" path="greeter"> - <operation name="greetMe" verb="GET" path="greeting/{name}"> - <param name="name" type="PATH"/> - </operation> - </resource> -</model> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/greeter_rest/pom.xml ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/pom.xml b/samples/greeter_rest/pom.xml deleted file mode 100644 index 7c8a6af..0000000 --- a/samples/greeter_rest/pom.xml +++ /dev/null @@ -1,43 +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-parent</artifactId> - <packaging>pom</packaging> - <name>Distributed OSGI Greeter Rest Bundles</name> - <version>1.8-SNAPSHOT</version> - - <parent> - <groupId>org.apache.cxf.dosgi</groupId> - <artifactId>cxf-dosgi-ri-parent</artifactId> - <version>1.8-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> - </parent> - - <modules> - <module>interface</module> - <module>impl</module> - <module>impl2</module> - <module>client</module> - </modules> - -</project> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/pom.xml ---------------------------------------------------------------------- diff --git a/samples/pom.xml b/samples/pom.xml deleted file mode 100644 index 697769e..0000000 --- a/samples/pom.xml +++ /dev/null @@ -1,45 +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</artifactId> - <version>1.8-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Distributed OSGI RI Sample Bundles</name> - <url>http://cxf.apache.org/</url> - - <parent> - <groupId>org.apache.cxf.dosgi</groupId> - <artifactId>cxf-dosgi-ri-parent</artifactId> - <version>1.8-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <modules> - <module>greeter</module> - <module>greeter_rest</module> - <module>spring_dm</module> - <module>ds</module> - <module>discovery</module> - <module>security_filter</module> - </modules> -</project> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/security_filter/pom.xml ---------------------------------------------------------------------- diff --git a/samples/security_filter/pom.xml b/samples/security_filter/pom.xml deleted file mode 100644 index f931ee0..0000000 --- a/samples/security_filter/pom.xml +++ /dev/null @@ -1,73 +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-security</artifactId> - <packaging>bundle</packaging> - <name>Distributed OSGI Security Sample Bundle</name> - <version>1.8-SNAPSHOT</version> - - <parent> - <groupId>org.apache.cxf.dosgi</groupId> - <artifactId>cxf-dosgi-ri-parent</artifactId> - <version>1.8-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> - </parent> - - <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.geronimo.specs</groupId> - <artifactId>geronimo-servlet_${servlet.version}_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.apache.servicemix.specs</groupId> - <artifactId>org.apache.servicemix.specs.jsr311-api-1.0</artifactId> - <version>${servicemix.specs.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-Name>${project.name}</Bundle-Name> - <Bundle-Description>An example Distributed OSGi - endpoint that passes requests through a - security filter</Bundle-Description> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Private-Package>org.apache.cxf.dosgi.samples.security</Private-Package> - <Bundle-Activator>org.apache.cxf.dosgi.samples.security.Activator</Bundle-Activator> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - -</project> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/Activator.java ---------------------------------------------------------------------- diff --git a/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/Activator.java b/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/Activator.java deleted file mode 100644 index 2514106..0000000 --- a/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/Activator.java +++ /dev/null @@ -1,65 +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.security; - -import java.util.Dictionary; -import java.util.Hashtable; - -import javax.servlet.Filter; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceRegistration; - -/** - * Registers a REST endpoint and a servlet filter to control access to the - * endpoint. - */ -public class Activator implements BundleActivator { - - private ServiceRegistration restRegistration; - private ServiceRegistration filterRegistration; - - public void start(BundleContext bundleContext) throws Exception { - // Register a rest endpoint - Dictionary<String, Object> restProps = new Hashtable<String, Object>(); - restProps.put("service.exported.interfaces", SecureRestEndpoint.class.getName()); - restProps.put("service.exported.configs", "org.apache.cxf.rs"); - restProps.put("org.apache.cxf.rs.httpservice.context", "/secure"); - restRegistration = bundleContext.registerService(SecureRestEndpoint.class.getName(), - new SecureRestEndpoint(), restProps); - - // Register a servlet filter (this could be done in another OSGi bundle, - // too) - Dictionary<String, Object> filterProps = new Hashtable<String, Object>(); - filterProps.put("org.apache.cxf.httpservice.filter", Boolean.TRUE); - // Pax-Web whiteboard (if deployed) will attempt to apply this filter to - // servlets by name or URL, and will complain - // if neither servletName or urlPatterns are specified. The felix http - // service whiteboard may do something similar. - filterProps.put("servletNames", "none"); - filterRegistration = bundleContext.registerService(Filter.class.getName(), - new SampleSecurityFilter(), filterProps); - } - - public void stop(BundleContext bundleContext) throws Exception { - restRegistration.unregister(); - filterRegistration.unregister(); - } -} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SampleSecurityFilter.java ---------------------------------------------------------------------- diff --git a/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SampleSecurityFilter.java b/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SampleSecurityFilter.java deleted file mode 100644 index bfc8504..0000000 --- a/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SampleSecurityFilter.java +++ /dev/null @@ -1,61 +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.security; - -import java.io.IOException; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * A filter that requires a query string of "secure" to invoke the protected - * resource. - */ -public class SampleSecurityFilter implements Filter { - - private static final Logger LOG = LoggerFactory.getLogger(SampleSecurityFilter.class); - - public void destroy() { - LOG.info("destroy()"); - } - - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException { - if ("secure".equals(((HttpServletRequest)request).getQueryString())) { - LOG.info("Access granted"); - chain.doFilter(request, response); - } else { - LOG.warn("Access denied"); - ((HttpServletResponse)response).sendError(HttpServletResponse.SC_FORBIDDEN); - } - } - - public void init(FilterConfig config) throws ServletException { - LOG.info("init()"); - } -} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SecureRestEndpoint.java ---------------------------------------------------------------------- diff --git a/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SecureRestEndpoint.java b/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SecureRestEndpoint.java deleted file mode 100644 index 8c066ac..0000000 --- a/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SecureRestEndpoint.java +++ /dev/null @@ -1,35 +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.security; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -@Path("/") -public class SecureRestEndpoint { - - @GET - @Path("hello") - @Produces(MediaType.TEXT_PLAIN) - public String sayHello() { - return "Hello and congratulations, you made it past the security filter"; - } -} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/spring_dm/client/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring_dm/client/pom.xml b/samples/spring_dm/client/pom.xml deleted file mode 100644 index 93e0168..0000000 --- a/samples/spring_dm/client/pom.xml +++ /dev/null @@ -1,60 +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-spring-dm-client</artifactId> - <packaging>bundle</packaging> - <name>Distributed OSGI Spring-DM Sample Client Bundle</name> - <version>1.8-SNAPSHOT</version> - - <parent> - <groupId>org.apache.cxf.dosgi.samples</groupId> - <artifactId>cxf-dosgi-ri-samples-spring-dm-parent</artifactId> - <version>1.8-SNAPSHOT</version> - </parent> - - <dependencies> - <dependency> - <groupId>org.apache.cxf.dosgi.samples</groupId> - <artifactId>cxf-dosgi-ri-samples-spring-dm-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 Spring-DM Sample Client Bundle</Bundle-Name> - <Bundle-Description>The client-side implementation of the Distributed OSGi with Spring-DM sample</Bundle-Description> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Import-Package>org.apache.cxf.dosgi.samples.springdm</Import-Package> - <Private-Package>org.apache.cxf.dosgi.samples.springdm.client</Private-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/spring_dm/client/src/main/java/org/apache/cxf/dosgi/samples/springdm/client/DinnerServiceConsumer.java ---------------------------------------------------------------------- diff --git a/samples/spring_dm/client/src/main/java/org/apache/cxf/dosgi/samples/springdm/client/DinnerServiceConsumer.java b/samples/spring_dm/client/src/main/java/org/apache/cxf/dosgi/samples/springdm/client/DinnerServiceConsumer.java deleted file mode 100644 index 8fe34c8..0000000 --- a/samples/spring_dm/client/src/main/java/org/apache/cxf/dosgi/samples/springdm/client/DinnerServiceConsumer.java +++ /dev/null @@ -1,38 +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.springdm.client; - -import org.apache.cxf.dosgi.samples.springdm.DinnerService; -import org.apache.cxf.dosgi.samples.springdm.Restaurant; - -public class DinnerServiceConsumer { - - DinnerService dinnerService; - - public void setDinnerService(DinnerService ds) { - dinnerService = ds; - } - - public void start() { - System.out.println("Found the following restaurants:"); - for (Restaurant r : dinnerService.findRestaurants("nice and not too expensive!")) { - System.out.format(" %s (%s) Rating: %d\n", r.getName(), r.getAddress(), r.getRating()); - } - } -} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/spring_dm/client/src/main/resources/META-INF/spring/client-spring.xml ---------------------------------------------------------------------- diff --git a/samples/spring_dm/client/src/main/resources/META-INF/spring/client-spring.xml b/samples/spring_dm/client/src/main/resources/META-INF/spring/client-spring.xml deleted file mode 100644 index 252df7b..0000000 --- a/samples/spring_dm/client/src/main/resources/META-INF/spring/client-spring.xml +++ /dev/null @@ -1,31 +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. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd";> - <osgi:reference id="dinnerServiceRef" interface="org.apache.cxf.dosgi.samples.springdm.DinnerService"/> - - <bean class="org.apache.cxf.dosgi.samples.springdm.client.DinnerServiceConsumer" - init-method="start"> - <property name="dinnerService" ref="dinnerServiceRef"/> - </bean> -</beans> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml ---------------------------------------------------------------------- diff --git a/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml b/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml deleted file mode 100644 index 19c44db..0000000 --- a/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml +++ /dev/null @@ -1,29 +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. ---> -<endpoint-descriptions xmlns="http://www.osgi.org/xmlns/rsa/v1.0.0";> - <endpoint-description> - <property name="objectClass"> - <array> - <value>org.apache.cxf.dosgi.samples.springdm.DinnerService</value> - </array> - </property> - <property name="endpoint.id">http://localhost:9000/org/apache/cxf/dosgi/samples/springdm/DinnerService</property> - <property name="service.imported.configs">org.apache.cxf.ws</property> - </endpoint-description> -</endpoint-descriptions> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/spring_dm/impl/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring_dm/impl/pom.xml b/samples/spring_dm/impl/pom.xml deleted file mode 100644 index cf42e16..0000000 --- a/samples/spring_dm/impl/pom.xml +++ /dev/null @@ -1,60 +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-spring-dm-impl</artifactId> - <packaging>bundle</packaging> - <name>Distributed OSGI Spring-DM Sample Implementation Bundle</name> - <version>1.8-SNAPSHOT</version> - - <parent> - <groupId>org.apache.cxf.dosgi.samples</groupId> - <artifactId>cxf-dosgi-ri-samples-spring-dm-parent</artifactId> - <version>1.8-SNAPSHOT</version> - </parent> - - <dependencies> - <dependency> - <groupId>org.apache.cxf.dosgi.samples</groupId> - <artifactId>cxf-dosgi-ri-samples-spring-dm-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 Spring-DM Sample Implementation Bundle</Bundle-Name> - <Bundle-Description>The server-side implementation of the Distributed OSGi with Spring-DM sample</Bundle-Description> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Import-Package>org.apache.cxf.dosgi.samples.springdm</Import-Package> - <Private-Package>org.apache.cxf.dosgi.samples.springdm.impl</Private-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/spring_dm/impl/src/main/java/org/apache/cxf/dosgi/samples/springdm/impl/DinnerServiceImpl.java ---------------------------------------------------------------------- diff --git a/samples/spring_dm/impl/src/main/java/org/apache/cxf/dosgi/samples/springdm/impl/DinnerServiceImpl.java b/samples/spring_dm/impl/src/main/java/org/apache/cxf/dosgi/samples/springdm/impl/DinnerServiceImpl.java deleted file mode 100644 index e98e192..0000000 --- a/samples/spring_dm/impl/src/main/java/org/apache/cxf/dosgi/samples/springdm/impl/DinnerServiceImpl.java +++ /dev/null @@ -1,39 +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.springdm.impl; - -import java.util.Arrays; -import java.util.List; - -import org.apache.cxf.dosgi.samples.springdm.DinnerService; -import org.apache.cxf.dosgi.samples.springdm.Restaurant; - -public class DinnerServiceImpl implements DinnerService { - - List<Restaurant> restaurants = Arrays.asList( - new Restaurant("Jojo's", "1 food way", 3), - new Restaurant("Boohaa's", "95 forage ave", 1), - new Restaurant("MicMac", "Plastic Plaza", 1) - ); - - public List<Restaurant> findRestaurants(String query) { - System.out.println("Hey! Someone's using the Dinner Service! Query: " + query); - return restaurants; - } -} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml ---------------------------------------------------------------------- diff --git a/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml b/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml deleted file mode 100644 index 7c798c4..0000000 --- a/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml +++ /dev/null @@ -1,32 +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. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd";> - <osgi:service interface="org.apache.cxf.dosgi.samples.springdm.DinnerService"> - <osgi:service-properties> - <entry key="service.exported.interfaces" value="*" /> - </osgi:service-properties> - - <bean class="org.apache.cxf.dosgi.samples.springdm.impl.DinnerServiceImpl" /> - </osgi:service> -</beans> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/spring_dm/interface/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring_dm/interface/pom.xml b/samples/spring_dm/interface/pom.xml deleted file mode 100644 index 72233b5..0000000 --- a/samples/spring_dm/interface/pom.xml +++ /dev/null @@ -1,52 +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-spring-dm-interface</artifactId> - <packaging>bundle</packaging> - <name>Distributed OSGI Spring-DM Sample Interface Bundle</name> - <version>1.8-SNAPSHOT</version> - - <parent> - <groupId>org.apache.cxf.dosgi.samples</groupId> - <artifactId>cxf-dosgi-ri-samples-spring-dm-parent</artifactId> - <version>1.8-SNAPSHOT</version> - </parent> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-Name>CXF Distributed OSGi Spring-DM Sample Interface Bundle</Bundle-Name> - <Bundle-Description>The interfaces of the Distributed OSGi with Spring-DM sample</Bundle-Description> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Import-Package /> - <Export-Package>org.apache.cxf.dosgi.samples.springdm</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/DinnerService.java ---------------------------------------------------------------------- diff --git a/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/DinnerService.java b/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/DinnerService.java deleted file mode 100644 index da296b3..0000000 --- a/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/DinnerService.java +++ /dev/null @@ -1,25 +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.springdm; - -import java.util.List; - -public interface DinnerService { - List<Restaurant> findRestaurants(String searchQuery); -}
