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-240] Fix checkstyle in eclipse
Date Tue, 28 Jun 2016 13:34:19 GMT
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master c62f33a94 -> 8d58f3e18


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/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/cxf-dosgi/blob/8d58f3e1/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 5b21e0e..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.9-SNAPSHOT</version>
-
-  <parent>
-    <groupId>org.apache.cxf.dosgi.samples</groupId>
-    <artifactId>cxf-dosgi-ri-samples-spring-dm-parent</artifactId>
-    <version>1.9-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/cxf-dosgi/blob/8d58f3e1/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);
-}

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/Restaurant.java
----------------------------------------------------------------------
diff --git a/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/Restaurant.java
b/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/Restaurant.java
deleted file mode 100644
index f6f06b1..0000000
--- a/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/Restaurant.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.springdm;
-
-public class Restaurant {
-
-    private String name;
-    private String address;
-    private int rating;
-
-    public Restaurant() {
-    }
-
-    public Restaurant(String name, String address, int rating) {
-        this.name = name;
-        this.address = address;
-        this.rating = rating;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getRating() {
-        return rating;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public void setRating(int rating) {
-        this.rating = rating;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/spring_dm/pom.xml
----------------------------------------------------------------------
diff --git a/samples/spring_dm/pom.xml b/samples/spring_dm/pom.xml
deleted file mode 100644
index 36b73a6..0000000
--- a/samples/spring_dm/pom.xml
+++ /dev/null
@@ -1,41 +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-parent</artifactId>
-    <packaging>pom</packaging>
-    <name>Distributed OSGI Spring-DM Sample</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>
-
-    <modules>
-      <module>interface</module>
-      <module>impl</module>
-      <module>client</module>
-    </modules>
-</project>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/systests2/common/pom.xml
----------------------------------------------------------------------
diff --git a/systests2/common/pom.xml b/systests2/common/pom.xml
index c5e8247..b3aacb3 100644
--- a/systests2/common/pom.xml
+++ b/systests2/common/pom.xml
@@ -26,6 +26,10 @@
         <version>1.9-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
+    
+    <properties>
+        <topDirectoryLocation>../..</topDirectoryLocation>
+    </properties>
 
     <groupId>org.apache.cxf.dosgi.systests</groupId>
     <artifactId>cxf-dosgi-ri-systests2-common</artifactId>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/systests2/multi-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/systests2/multi-bundle/pom.xml b/systests2/multi-bundle/pom.xml
index f601559..642c58f 100644
--- a/systests2/multi-bundle/pom.xml
+++ b/systests2/multi-bundle/pom.xml
@@ -31,9 +31,12 @@
     <groupId>org.apache.cxf.dosgi.systests</groupId>
     <artifactId>cxf-dosgi-ri-systests2-multibundle</artifactId>
     <packaging>jar</packaging>
-
     <name>Distributed OSGi System Tests Multi-Bundle</name>
     
+    <properties>
+        <topDirectoryLocation>../..</topDirectoryLocation>
+    </properties>
+    
     <!-- 
         When changing code make sure to run the distro before testing
         or you will be testing the old code.


Mime
View raw message