cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject [2/2] cxf-dosgi git commit: [DOSGI-240] Fix checkstyle in eclipse
Date Tue, 28 Jun 2016 13:34:20 GMT
[DOSGI-240] Fix checkstyle in eclipse


Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/8d58f3e1
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/8d58f3e1
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/8d58f3e1

Branch: refs/heads/master
Commit: 8d58f3e1879dae1c69b57191ecd144477694cfad
Parents: c62f33a
Author: Christian Schneider <chris@die-schneider.net>
Authored: Tue Jun 28 15:34:08 2016 +0200
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Tue Jun 28 15:34:08 2016 +0200

----------------------------------------------------------------------
 buildtools/cxf-checkstyle-suppressions.xml      |  38 ++
 buildtools/cxf-checkstyle.xml                   | 303 +++++++++++
 buildtools/notice-supplements.xml               | 531 +++++++++++++++++++
 decorator/pom.xml                               |   2 +-
 parent/pom.xml                                  |  58 +-
 pom.xml                                         |   2 +-
 samples/discovery/client/pom.xml                |  66 ---
 .../samples/discovery/consumer/Activator.java   |  86 ---
 samples/discovery/impl/pom.xml                  |  61 ---
 .../dosgi/samples/discovery/impl/Activator.java |  71 ---
 .../discovery/impl/DisplayServiceImpl.java      |  40 --
 samples/discovery/interface/pom.xml             |  52 --
 .../dosgi/samples/discovery/DisplayService.java |  24 -
 samples/discovery/pom.xml                       |  42 --
 samples/ds/client/pom.xml                       |   5 +
 samples/ds/impl/pom.xml                         |   5 +
 samples/ds/interface/pom.xml                    |   5 +
 samples/greeter/client/pom.xml                  |   1 +
 samples/greeter/impl/pom.xml                    |   1 +
 samples/greeter/interface/pom.xml               |   1 +
 samples/greeter_rest/client/pom.xml             |   1 +
 samples/greeter_rest/impl/pom.xml               |   1 +
 samples/greeter_rest/impl2/pom.xml              |   1 +
 samples/greeter_rest/interface/pom.xml          |   1 +
 samples/pom.xml                                 |   2 -
 samples/security_filter/pom.xml                 |   4 +
 samples/spring_dm/client/pom.xml                |  60 ---
 .../springdm/client/DinnerServiceConsumer.java  |  38 --
 .../resources/META-INF/spring/client-spring.xml |  31 --
 .../OSGI-INF/remote-service/remote-services.xml |  29 -
 samples/spring_dm/impl/pom.xml                  |  60 ---
 .../springdm/impl/DinnerServiceImpl.java        |  39 --
 .../main/resources/META-INF/spring/spring.xml   |  32 --
 samples/spring_dm/interface/pom.xml             |  52 --
 .../dosgi/samples/springdm/DinnerService.java   |  25 -
 .../cxf/dosgi/samples/springdm/Restaurant.java  |  59 ---
 samples/spring_dm/pom.xml                       |  41 --
 systests2/common/pom.xml                        |   4 +
 systests2/multi-bundle/pom.xml                  |   5 +-
 39 files changed, 924 insertions(+), 955 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/buildtools/cxf-checkstyle-suppressions.xml
----------------------------------------------------------------------
diff --git a/buildtools/cxf-checkstyle-suppressions.xml b/buildtools/cxf-checkstyle-suppressions.xml
new file mode 100644
index 0000000..60c70ab
--- /dev/null
+++ b/buildtools/cxf-checkstyle-suppressions.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+    "-//Puppy Crawl//DTD Suppressions 1.0//EN"
+    "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+<!--
+  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.
+-->
+<suppressions>
+    <suppress checks=".*"
+              files=".+[\\\/]generated-sources[\\\/].+\.java"
+              />
+    <suppress checks=".*"
+              files=".+[\\\/]build[\\\/]src[\\\/].+\.java"
+              />
+              
+    <suppress checks=".*"
+              files=".+[\\\/]contrib[\\\/].+\.java"
+              />
+
+    <suppress checks=".*"
+              files=".+log4j.properties"
+              />
+</suppressions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/buildtools/cxf-checkstyle.xml
----------------------------------------------------------------------
diff --git a/buildtools/cxf-checkstyle.xml b/buildtools/cxf-checkstyle.xml
new file mode 100644
index 0000000..87dd736
--- /dev/null
+++ b/buildtools/cxf-checkstyle.xml
@@ -0,0 +1,303 @@
+<?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.
+-->
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<!--
+	Checks to make sure the code meets the CXF coding guidelines which 
+	are similar to the Sun guidelines at:
+	http://java.sun.com/docs/codeconv/index.html
+	
+	It also enforces aa bunch of other "BestPractices like method
+	lengths, if/try depths, etc...
+-->
+
+<module name="Checker">
+    <property name="severity" value="error"/>
+    
+	<!-- Checks whether files end with a new line.                        -->
+	<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+	<!--
+		<module name="NewlineAtEndOfFile"/>
+	-->
+
+	<!-- Checks that property files contain the same keys.         -->
+	<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+	<module name="Translation" />
+
+	<!--<module name="StrictDuplicateCode"/>-->
+
+	<module name="TreeWalker">
+		<!-- Enable FileContentsHolder to allow us to in turn turn on suppression comments -->
+		<module name="FileContentsHolder" />
+		<!-- Checks for Javadoc comments.                     -->
+		<!-- See http://checkstyle.sf.net/config_javadoc.html -->
+		<!--
+			<module name="PackageHtml"/>
+			<module name="JavadocMethod"/>
+			<module name="JavadocType"/>
+			<module name="JavadocVariable"/>
+			<module name="JavadocStyle"/>
+		-->
+
+
+		<!-- Checks for Naming Conventions.                  -->
+		<!-- See http://checkstyle.sf.net/config_naming.html -->
+		<module name="ConstantName" />
+		<module name="LocalFinalVariableName" />
+		<module name="LocalVariableName" />
+		<module name="MemberName" />
+		<module name="MethodName" />
+		<module name="PackageName" />
+		<module name="ParameterName" />
+		<module name="StaticVariableName" />
+		<module name="TypeName" />
+
+
+		<!-- Checks for imports                              -->
+		<!-- See http://checkstyle.sf.net/config_import.html -->
+		<module name="AvoidStarImport">
+			<property name="excludes"
+				value="java.io,java.util,java.net,java.nio,java.nio.channels,java.lang.reflect,org.w3c.dom,org.xml.sax,java.awt,javax.swing,junit.framework" />
+		</module>
+		<module name="IllegalImport" /><!-- defaults to sun.* packages -->
+		<module name="RedundantImport" />
+		<module name="UnusedImports" />
+		<!--
+			<module name="ImportControl">
+			<property name="file" value="etc/import-control.xml"/>
+			</module>
+		-->
+
+
+		<!-- Checks for Size Violations.                    -->
+		<!-- See http://checkstyle.sf.net/config_sizes.html -->
+		<module name="AnonInnerLength">
+			<property name="max" value="40" />
+		</module>
+		<module name="ExecutableStatementCount">
+			<property name="max" value="75" />
+		</module>
+		<module name="LineLength">
+			<property name="max" value="120" />
+		</module>
+		<module name="MethodLength">
+			<property name="max" value="150" />
+			<property name="countEmpty" value="false" />
+		</module>
+		<module name="ParameterNumber">
+			<property name="max" value="7" />
+            <property name="ignoreOverriddenMethods" value="true"/>
+		</module>
+
+		<!-- Checks for whitespace                               -->
+		<!-- See http://checkstyle.sf.net/config_whitespace.html -->
+		<module name="EmptyForIteratorPad" />
+		<module name="EmptyForInitializerPad" />
+		<module name="MethodParamPad" />
+		<module name="NoWhitespaceAfter">
+			<property name="tokens"
+				value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS" />
+		</module>
+		<module name="NoWhitespaceBefore" />
+		<module name="OperatorWrap" />
+		<module name="ParenPad" />
+		<module name="TypecastParenPad" />
+		<module name="WhitespaceAfter">
+			<property name="tokens" value="COMMA, SEMI" />
+		</module>
+		<module name="WhitespaceAround">
+			<property name="tokens"
+				value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND" />
+		</module>
+
+
+		<!-- Modifier Checks                                    -->
+		<!-- See http://checkstyle.sf.net/config_modifiers.html -->
+		<!-- <module name="ModifierOrder" />-->
+		<module name="RedundantModifier" />
+
+
+		<!-- Checks for blocks. You know, those {}'s         -->
+		<!-- See http://checkstyle.sf.net/config_blocks.html -->
+		<module name="AvoidNestedBlocks">
+			<property name="allowInSwitchCase" value="true" />
+		</module>
+		<module name="EmptyBlock">
+			<property name="option" value="text" />
+		</module>
+		<module name="LeftCurly" />
+		<module name="NeedBraces" />
+		<module name="RightCurly" />
+
+
+		<!-- Checks for common coding problems               -->
+		<!-- See http://checkstyle.sf.net/config_coding.html -->
+		<!--<module name="ArrayTrailingComma"/>-->
+		<!--<module name="AvoidInlineConditionals"/>-->
+		<module name="CovariantEquals" />
+		<module name="EmptyStatement" />
+		<module name="EqualsHashCode" />
+		<!--<module name="FinalLocalVariable"/>-->
+		<module name="HiddenField">
+			<property name="ignoreConstructorParameter" value="true" />
+			<property name="ignoreSetter" value="true" />
+		</module>
+		<module name="IllegalInstantiation" />
+		<!--<module name="IllegalToken"/>-->
+		<!--<module name="IllegalTokenText"/>-->
+		<module name="InnerAssignment" />
+		<!--<module name="MagicNumber"/>-->
+		<module name="MissingSwitchDefault" />
+		<!--module name="ModifiedControlVariable"/-->
+		<module name="SimplifyBooleanExpression" />
+		<module name="SimplifyBooleanReturn" />
+		<module name="StringLiteralEquality" />
+		<module name="NestedIfDepth">
+			<property name="max" value="3" />
+		</module>
+		<module name="NestedTryDepth">
+			<property name="max" value="3" />
+		</module>
+		<module name="SuperClone" />
+		<module name="SuperFinalize" />
+		<!--<module name="IllegalCatch"/>-->
+		<module name="IllegalThrows">
+			<property name="illegalClassNames"
+				value="java.lang.Error,java.lang.RuntimeException" />
+		</module>
+		<!--<module name="RedundantThrows"/>-->
+		<module name="PackageDeclaration" />
+
+		<module name="IllegalType">
+			<property name="format" value="^xxx$" />
+			<property name="illegalClassNames"
+				value="java.util.GregorianCalendar, java.util.Hashtable, java.util.HashSet, java.util.HashMap, java.util.ArrayList, java.util.LinkedList, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap" />
+		</module>
+		<module name="DeclarationOrder" />
+		<!--<module name="ParameterAssignment"/>-->
+		<module name="ExplicitInitialization" />
+		<module name="DefaultComesLast" />
+		<!--<module name="MissingCtor"/>-->
+		<module name="FallThrough" />
+		<!--<module name="MultipleStringLiterals"/>-->
+		<module name="MultipleVariableDeclarations" />
+		<!--<module name="RequireThis"/>-->
+		<module name="UnnecessaryParentheses" />
+
+
+
+		<!-- Checks for class design                         -->
+		<!-- See http://checkstyle.sf.net/config_design.html -->
+		<!--<module name="DesignForExtension"/>-->
+		<module name="FinalClass" />
+		<module name="HideUtilityClassConstructor" />
+		<module name="InterfaceIsType" />
+		<!--<module name="MutableException"/>-->
+		<module name="ThrowsCount">
+			<property name="max" value="5" />
+		</module>
+		<module name="VisibilityModifier">
+			<property name="protectedAllowed" value="true" />
+			<property name="packageAllowed" value="true" />
+			<!-- this is needed for the resource injection unit tests.  It will removed 
+				when private member inject is supported.
+			-->
+			<property name="publicMemberPattern" value="resource[12].*" />
+		</module>
+
+
+
+		<!-- Metrics checks.                   -->
+		<!-- See http://checkstyle.sf.net/config_metrics.html -->
+		<module name="BooleanExpressionComplexity">
+			<property name="max" value="6" />
+		</module>
+		<!--<module name="ClassDataAbstractionCoupling"/>-->
+		<!--<module name="ClassFanOutComplexity"/>-->
+		<!--<module name="CyclomaticComplexity"/>-->
+		<!--<module name="NPathComplexity"/>-->
+		<module name="JavaNCSS">
+			<property name="methodMaximum" value="100" />
+		</module>
+
+
+		<!-- Miscellaneous other checks.                   -->
+		<!-- See http://checkstyle.sf.net/config_misc.html -->
+		<!-- 
+			<module name="ArrayTypeStyle"/>
+			<module name="FinalParameters"/>
+		-->
+		<!--
+			<module name="GenericIllegalRegexp">
+			<property name="format" value="\s+$"/>
+			<property name="message" value="Line has trailing spaces."/>
+			</module>
+		-->
+		<module name="TodoComment">
+			<property name="format" value="WARNING" />
+		</module>
+
+		<module name="UpperEll" />
+
+		<!--Assert statement may have side effects:-->
+		<module name="DescendantToken">
+			<property name="tokens" value="LITERAL_ASSERT" />
+			<property name="limitedTokens"
+				value="ASSIGN,DEC,INC,POST_DEC,POST_INC,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,DIV_ASSIGN,MOD_ASSIGN,BSR_ASSIGN,SR_ASSIGN,SL_ASSIGN,BAND_ASSIGN,BXOR_ASSIGN,BOR_ASSIGN" />
+			<property name="maximumNumber" value="0" />
+		</module>
+
+		<!--<module name="UncommentedMain"/>-->
+		<!--module name="TrailingComment"/-->
+		<module name="Indentation">
+            <property name="caseIndent" value="0" />
+            <property name="lineWrappingIndentation" value="0"/>
+		</module>
+		<!--<module name="RequiredRegexp">-->
+        <module name="SuppressWarningsHolder" />
+	</module>
+    <module name="SuppressionCommentFilter">
+        <property name="offCommentFormat" value="CHECKSTYLE\:OFF"/>
+        <property name="onCommentFormat" value="CHECKSTYLE\:ON"/>
+    </module>
+    <module name="SuppressionCommentFilter">
+        <property name="offCommentFormat" value="CHECKSTYLE.OFF\:([\w\|]+)"/>
+        <property name="onCommentFormat" value="CHECKSTYLE.ON\:([\w\|]+)"/>
+        <property name="checkFormat" value="$1"/>
+    </module>
+    <module name="SuppressWarningsFilter"/>
+    <module name="SuppressionFilter">
+        <property name="file" value="${checkstyle.suppressions.file}" />
+    </module>
+    <!-- Header checks -->
+    <module name="Header">
+      <property name="header"
+                value="/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * &quot;License&quot;); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied. See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n" />
+    </module>
+    <!-- <module name="RegexpHeader"/> -->
+    <module name="FileLength">
+      <property name="max" value="3000" />
+    </module>
+    <module name="FileTabCharacter">
+      <property name="eachLine" value="true"/>
+    </module>
+</module>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/buildtools/notice-supplements.xml
----------------------------------------------------------------------
diff --git a/buildtools/notice-supplements.xml b/buildtools/notice-supplements.xml
new file mode 100644
index 0000000..06caf61
--- /dev/null
+++ b/buildtools/notice-supplements.xml
@@ -0,0 +1,531 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<supplementalDataModels>
+    <supplement>
+        <project>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+            <name>JSR 311 API</name>
+            <url>https://jsr311.dev.java.net/</url>
+            <organization>
+                <name>Sun Microsystems</name>
+                <url>http://www.sun.com/</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+                    <url>http://www.sun.com/cddl/cddl.html</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <name>Sun JAXB Reference Implementation Runtime</name>
+            <organization>
+                <name>Sun Microsystems</name>
+                <url>http://www.sun.com/</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+                    <url>http://www.sun.com/cddl/cddl.html</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+            <name>Sun JAXB Reference Implementation Tools</name>
+            <organization>
+                <name>Sun Microsystems</name>
+                <url>http://www.sun.com/</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+                    <url>http://www.sun.com/cddl/cddl.html</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>com.sun.xml.fastinfoset</groupId>
+            <artifactId>FastInfoset</artifactId>
+            <name>Sun FastInfoset Implementation</name>
+            <organization>
+                <name>Sun Microsystems</name>
+                <url>http://www.sun.com/</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>com.sun.xml.messaging.saaj</groupId>
+            <artifactId>saaj-impl</artifactId>
+            <name>Sun SAAJ Reference Implementation</name>
+            <organization>
+                <name>Sun Microsystems</name>
+                <url>http://www.sun.com/</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+                    <url>http://www.sun.com/cddl/cddl.html</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>javax.xml.soap</groupId>
+            <artifactId>saaj-api</artifactId>
+            <name>Sun SAAJ API</name>
+            <organization>
+                <name>Sun Microsystems</name>
+                <url>http://www.sun.com/</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+                    <url>http://www.sun.com/cddl/cddl.html</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <name>Java Architecture for XML Binding (JAXB API)</name>
+            <organization>
+                <name>Sun Microsystems</name>
+                <url>http://www.sun.com/</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+                    <url>http://www.sun.com/cddl/cddl.html</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <name>Apache Xalan-Java</name>
+            <organization>
+                <name>The Apache Software Foundation</name>
+                <url>http://www.apache.org</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <name>Simple Logging Facade for Java - API</name>
+            <licenses>
+                <license>
+                    <name>MIT License</name>
+                    <url>http://www.slf4j.org/license.html</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <name>Simple Logging Facade for Java - JDK Logging</name>
+            <licenses>
+                <license>
+                    <name>MIT License</name>
+                    <url>http://www.slf4j.org/license.html</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+
+    <supplement>
+        <project>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+            <name>Jaxen</name>
+            <licenses>
+                <license>
+                    <name>BSD</name>
+                    <url>http://jaxen.codehaus.org/license.html</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <name>ASM</name>
+            <licenses>
+                <license>
+                    <name>BSD</name>
+                    <url>http://asm.ow2.org/license.html</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+
+
+    <supplement>
+        <project>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <name>Apache Commons - collections</name>
+            <organization>
+                <name>The Apache Software Foundation</name>
+                <url>http://www.apache.org</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>net.java.dev.stax-utils</groupId>
+            <artifactId>stax-utils</artifactId>
+            <name>StAX Utilities</name>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
+            <name>JDOM</name>
+            <organization>
+                <name>jdom.org</name>
+                <url>http://www.jdom.org</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>Modified Apache Software License</name>
+                    <url>licenses/jdom.txt</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.apache.santuario</groupId>
+            <artifactId>xmlsec</artifactId>
+            <name>XML Security</name>
+            <organization>
+                <name>The Apache Software Foundation</name>
+                <url>http://www.apache.org</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant-launcher</artifactId>
+            <name>Ant Launcher</name>
+            <organization>
+                <name>The Apache Software Foundation</name>
+                <url>http://www.apache.org</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <name>Ant</name>
+            <organization>
+                <name>The Apache Software Foundation</name>
+                <url>http://www.apache.org</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>oro</groupId>
+            <artifactId>oro</artifactId>
+            <name>Jakarta-ORO</name>
+            <organization>
+                <name>The Apache Software Foundation</name>
+                <url>http://www.apache.org</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>opensaml</groupId>
+            <artifactId>opensaml</artifactId>
+            <name>OpenSAML</name>
+            <organization>
+                <name>Internet2</name>
+                <url>http://www.opensaml.org</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.codehaus.jettison</groupId>
+            <artifactId>jettison</artifactId>
+            <name>Jettison</name>
+            <organization>
+                <name>Envoi Solutions LLC</name>
+                <url>http://www.envoisolutions.com</url>
+            </organization>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://jettison.codehaus.org/License</url>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <name>Spring Core</name>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                    <distribution>repo</distribution>
+                </license>
+            </licenses>
+            <organization>
+                <name>Spring Framework</name>
+                <url>http://www.springframework.org/</url>
+            </organization>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <name>Spring AOP</name>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                    <distribution>repo</distribution>
+                </license>
+            </licenses>
+            <organization>
+                <name>Spring Framework</name>
+                <url>http://www.springframework.org/</url>
+            </organization>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-asm</artifactId>
+            <name>Spring ASM</name>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                    <distribution>repo</distribution>
+                </license>
+            </licenses>
+            <organization>
+                <name>Spring Framework</name>
+                <url>http://www.springframework.org/</url>
+            </organization>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <name>Spring Context</name>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                    <distribution>repo</distribution>
+                </license>
+            </licenses>
+            <organization>
+                <name>Spring Framework</name>
+                <url>http://www.springframework.org/</url>
+            </organization>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <name>Spring Beans</name>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                    <distribution>repo</distribution>
+                </license>
+            </licenses>
+            <organization>
+                <name>Spring Framework</name>
+                <url>http://www.springframework.org/</url>
+            </organization>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+            <name>Spring Expression</name>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                    <distribution>repo</distribution>
+                </license>
+            </licenses>
+            <organization>
+                <name>Spring Framework</name>
+                <url>http://www.springframework.org/</url>
+            </organization>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jms</artifactId>
+            <name>Spring JMS</name>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                    <distribution>repo</distribution>
+                </license>
+            </licenses>
+            <organization>
+                <name>Spring Framework</name>
+                <url>http://www.springframework.org/</url>
+            </organization>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <name>Spring Transactions</name>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                    <distribution>repo</distribution>
+                </license>
+            </licenses>
+            <organization>
+                <name>Spring Framework</name>
+                <url>http://www.springframework.org/</url>
+            </organization>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <name>Spring Web</name>
+            <licenses>
+                <license>
+                    <name>The Apache Software License, Version 2.0</name>
+                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+                    <distribution>repo</distribution>
+                </license>
+            </licenses>
+            <organization>
+                <name>Spring Framework</name>
+                <url>http://www.springframework.org/</url>
+            </organization>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>isorelax</groupId>
+            <artifactId>isorelax</artifactId>
+            <name>ISO Relax</name>
+            <url>http://iso-relax.sourceforge.net/</url>
+            <licenses>
+                <license>
+                    <name>MIT</name>
+                    <url>http://www.opensource.org/licenses/mit-license.html</url>
+                    <distribution>repo</distribution>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+    <supplement>
+        <project>
+            <groupId>relaxngDatatype</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+            <name>RELAX NG Datatype</name>
+            <url>http://sourceforge.net/projects/relaxng/</url>
+            <licenses>
+                <license>
+                    <name>BSD</name>
+                    <url>http://www.opensource.org/licenses/bsd-license.php</url>
+                    <distribution>repo</distribution>
+                </license>
+            </licenses>
+        </project>
+    </supplement>
+
+</supplementalDataModels>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/decorator/pom.xml
----------------------------------------------------------------------
diff --git a/decorator/pom.xml b/decorator/pom.xml
index fbe14a3..e86e5bb 100644
--- a/decorator/pom.xml
+++ b/decorator/pom.xml
@@ -134,7 +134,7 @@
                         <Export-Package>
                             !*
                         </Export-Package>
-                        <Bundle-Activator>org.apache.cxf.dosgi.dsw.Activator</Bundle-Activator>
+                        <Bundle-Activator>org.apache.cxf.dosgi.dsw.decorator.Activator</Bundle-Activator>
                     </instructions>
                 </configuration>
             </plugin>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 361985b..5ae1bab 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -58,8 +58,6 @@
         <slf4j.version>1.7.14</slf4j.version>
         <felix.plugin.version>2.4.0</felix.plugin.version>
         <exam.version>4.8.0</exam.version>
-        <cxf.resources.base.path />
-        <cxf.checkstyle.extension />
     </properties>
 
     <dependencyManagement>
@@ -161,15 +159,7 @@
 
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>${felix.plugin.version}</version>
-                    <extensions>true</extensions>
-                    <configuration>
-                        <obrRepository>NONE</obrRepository>
-                    </configuration>
-                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
@@ -217,14 +207,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-remote-resources-plugin</artifactId>
-                    <version>1.2</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.cxf.build-utils</groupId>
-                            <artifactId>cxf-buildtools</artifactId>
-                            <version>${cxf.build-utils.version}</version>
-                        </dependency>
-                    </dependencies>
+                    <version>1.5</version>
                     <executions>
                         <execution>
                             <goals>
@@ -234,12 +217,6 @@
                                 <resourceBundles>
                                     <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
                                 </resourceBundles>
-                                <supplementalModels>
-                                    <supplementalModel>notice-supplements.xml</supplementalModel>
-                                </supplementalModels>
-                                <properties>
-                                    <projectName>Apache CXF Remote Service Admin provider</projectName>
-                                </properties>
                             </configuration>
                         </execution>
                     </executions>
@@ -249,25 +226,23 @@
 
         <plugins>
             <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>${felix.plugin.version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <obrRepository>NONE</obrRepository>
+                    <_include>-bnd.bnd</_include>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-remote-resources-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.15</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.cxf.build-utils</groupId>
-                        <artifactId>cxf-buildtools</artifactId>
-                        <version>${cxf.build-utils.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.puppycrawl.tools</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>6.4.1</version>
-                    </dependency>
-                </dependencies>
+                <version>2.17</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
                     <includeResources>false</includeResources>
@@ -277,13 +252,12 @@
                         <id>validate</id>
                         <phase>validate</phase>
                         <configuration>
-                            <configLocation>${cxf.resources.base.path}cxf-checkstyle${cxf.checkstyle.extension}.xml</configLocation>
+                            <configLocation>${topDirectoryLocation}/buildtools/cxf-checkstyle.xml</configLocation>
+                            <suppressionsLocation>${topDirectoryLocation}/buildtools/cxf-checkstyle-suppressions.xml</suppressionsLocation>
+                            <excludes>target/generated-sources/xjc/.*\.java</excludes>
                             <consoleOutput>true</consoleOutput>
                             <failsOnError>true</failsOnError>
-                            <linkXRef>false</linkXRef>
-                            <suppressionsLocation>${cxf.resources.base.path}cxf-checkstyle-suppressions.xml</suppressionsLocation>
                             <sourceDirectory>${basedir}/src</sourceDirectory>
-                            <excludes>**/archetype-resources/**/*.java,**/generated-sources/**</excludes>
                         </configuration>
                         <goals>
                             <goal>checkstyle</goal>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 46fc31b..703b65e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,11 +102,11 @@
 
     <modules>
         <module>parent</module>
+        <module>decorator</module>
         <module>cxf-dsw</module>
         <module>samples</module>
         <module>distribution</module>
         <module>systests2</module>
-        <module>decorator</module>
     </modules>
 
     <profiles>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/discovery/client/pom.xml
----------------------------------------------------------------------
diff --git a/samples/discovery/client/pom.xml b/samples/discovery/client/pom.xml
deleted file mode 100644
index f0881ed..0000000
--- a/samples/discovery/client/pom.xml
+++ /dev/null
@@ -1,66 +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-discovery-client</artifactId>
-    <packaging>bundle</packaging>
-    <name>Distributed OSGI Discovery Sample Client Bundle</name>
-    <version>1.9-SNAPSHOT</version>
-
-    <parent>
-        <groupId>org.apache.cxf.dosgi.samples</groupId>
-        <artifactId>cxf-dosgi-ri-samples-discovery-parent</artifactId>
-        <version>1.9-SNAPSHOT</version>
-    </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.cxf.dosgi.samples</groupId>
-            <artifactId>cxf-dosgi-ri-samples-discovery-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>${project.name}</Bundle-Name>
-                        <Bundle-Description>The client-side
-                            implementation of the Distributed OSGi
-                            Discovery sample</Bundle-Description>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Activator>org.apache.cxf.dosgi.samples.discovery.consumer.Activator</Bundle-Activator>
-                        <Import-Package>
-                            org.apache.cxf.dosgi.samples.discovery,
-                            org.osgi.framework,
-                            org.osgi.util.tracker
-                        </Import-Package>
-                        <Private-Package>org.apache.cxf.dosgi.samples.discovery.consumer</Private-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java
----------------------------------------------------------------------
diff --git a/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java b/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java
deleted file mode 100644
index cdeb360..0000000
--- a/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java
+++ /dev/null
@@ -1,86 +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.discovery.consumer;
-
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.cxf.dosgi.samples.discovery.DisplayService;
-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<DisplayService, DisplayService> tracker;
-    private Map<DisplayService, String> displays = new ConcurrentHashMap<DisplayService, String>();
-    private ScheduledExecutorService scheduler;
-    private ScheduledFuture<?> handle;
-
-    public void start(BundleContext bc) throws Exception {
-        tracker = new ServiceTracker<DisplayService, DisplayService>(bc, DisplayService.class, null) {
-
-            @Override
-            public DisplayService addingService(ServiceReference<DisplayService> reference) {
-                DisplayService service = super.addingService(reference);
-                System.out.println("Adding display: " + service.getID() + " (" + service + ")");
-                displays.put(service, service.getID());
-                return service;
-            }
-
-            @Override
-            public void removedService(ServiceReference<DisplayService> reference, DisplayService service) {
-                String value = displays.remove(service);
-                System.out.println("Removed display: " + value);
-                super.removedService(reference, service);
-            }
-        };
-        tracker.open();
-
-        scheduler = Executors.newScheduledThreadPool(1);
-        Runnable printer = new Runnable() {
-            int counter;
-            public void run() {
-                counter++;
-                String text = "some text " + counter;
-                System.out.println("Sending text to displays: " + text);
-                for (Entry<DisplayService, String> entry : displays.entrySet()) {
-                    try {
-                        entry.getKey().displayText(text);
-                    } catch (Throwable th) {
-                        System.out.println("Could not send message to display: " + entry.getValue());
-                    }
-                }
-            }
-        };
-        handle = scheduler.scheduleAtFixedRate(printer, 5, 5, TimeUnit.SECONDS);
-    }
-
-    public void stop(BundleContext bc) throws Exception {
-        handle.cancel(true);
-        scheduler.shutdown();
-        tracker.close();
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/discovery/impl/pom.xml
----------------------------------------------------------------------
diff --git a/samples/discovery/impl/pom.xml b/samples/discovery/impl/pom.xml
deleted file mode 100644
index f85c870..0000000
--- a/samples/discovery/impl/pom.xml
+++ /dev/null
@@ -1,61 +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-discovery-impl</artifactId>
-    <packaging>bundle</packaging>
-    <name>Distributed OSGI Discovery Sample Implementation Bundle</name>
-    <version>1.9-SNAPSHOT</version>
-
-    <parent>
-        <groupId>org.apache.cxf.dosgi.samples</groupId>
-        <artifactId>cxf-dosgi-ri-samples-discovery-parent</artifactId>
-        <version>1.9-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf.dosgi.samples</groupId>
-            <artifactId>cxf-dosgi-ri-samples-discovery-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>${project.name}</Bundle-Name>
-                        <Bundle-Description>The server-side
-                            implementation of the Distributed OSGi
-                            Discovery sample</Bundle-Description>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Activator>org.apache.cxf.dosgi.samples.discovery.impl.Activator</Bundle-Activator>
-                        <Import-Package>
-                            org.apache.cxf.dosgi.samples.discovery,
-                            org.osgi.framework
-                        </Import-Package>
-                        <Private-Package>org.apache.cxf.dosgi.samples.discovery.impl</Private-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java
----------------------------------------------------------------------
diff --git a/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java b/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java
deleted file mode 100644
index f9c972a..0000000
--- a/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java
+++ /dev/null
@@ -1,71 +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.discovery.impl;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.UnknownHostException;
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.apache.cxf.dosgi.samples.discovery.DisplayService;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-public class Activator implements BundleActivator {
-
-    private ServiceRegistration reg;
-
-    public void start(BundleContext bc) throws Exception {
-        Dictionary<String, Object> props = new Hashtable<String, Object>();
-
-        String host = getHostName();
-        int port = getPort();
-
-        props.put("service.exported.interfaces", "*");
-        props.put("service.exported.configs", "org.apache.cxf.ws");
-        props.put("org.apache.cxf.ws.address", getAddress(host, port)); // old obsolete value
-        props.put("endpoint.id", getAddress(host, port));
-
-        reg = bc.registerService(DisplayService.class.getName(),
-                new DisplayServiceImpl(host + ":" + port), props);
-    }
-
-    private static String getAddress(String host, int port) {
-        return "http://" + host + ":" + port + "/display";
-    }
-
-    private static String getHostName() {
-        try {
-            return InetAddress.getLocalHost().getCanonicalHostName();
-        } catch (UnknownHostException e) {
-            return "localhost";
-        }
-    }
-
-    private static int getPort() throws IOException {
-        return new ServerSocket(0).getLocalPort();
-    }
-
-    public void stop(BundleContext bc) throws Exception {
-        reg.unregister();
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/DisplayServiceImpl.java
----------------------------------------------------------------------
diff --git a/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/DisplayServiceImpl.java b/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/DisplayServiceImpl.java
deleted file mode 100644
index bd84a62..0000000
--- a/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/DisplayServiceImpl.java
+++ /dev/null
@@ -1,40 +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.discovery.impl;
-
-import org.apache.cxf.dosgi.samples.discovery.DisplayService;
-
-public class DisplayServiceImpl implements DisplayService {
-
-    private final String id;
-
-    public DisplayServiceImpl(String id) {
-        this.id = id;
-        System.out.println("Created DisplayService [" + id + "]");
-    }
-
-    public boolean displayText(String text) {
-        System.out.println("DisplayService [" + id + "]: " + text);
-        return true;
-    }
-
-    public String getID() {
-        return id;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/discovery/interface/pom.xml
----------------------------------------------------------------------
diff --git a/samples/discovery/interface/pom.xml b/samples/discovery/interface/pom.xml
deleted file mode 100644
index cdb9dda..0000000
--- a/samples/discovery/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-discovery-interface</artifactId>
-  <packaging>bundle</packaging>
-  <name>Distributed OSGI Discovery Sample Interface Bundle</name>
-  <version>1.9-SNAPSHOT</version>
-
-  <parent>
-    <groupId>org.apache.cxf.dosgi.samples</groupId>
-    <artifactId>cxf-dosgi-ri-samples-discovery-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>${project.name}</Bundle-Name>
-            <Bundle-Description>The interfaces of the Distributed OSGi Discovery sample</Bundle-Description>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Import-Package />
-            <Export-Package>org.apache.cxf.dosgi.samples.discovery</Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/discovery/interface/src/main/java/org/apache/cxf/dosgi/samples/discovery/DisplayService.java
----------------------------------------------------------------------
diff --git a/samples/discovery/interface/src/main/java/org/apache/cxf/dosgi/samples/discovery/DisplayService.java b/samples/discovery/interface/src/main/java/org/apache/cxf/dosgi/samples/discovery/DisplayService.java
deleted file mode 100644
index f05cef5..0000000
--- a/samples/discovery/interface/src/main/java/org/apache/cxf/dosgi/samples/discovery/DisplayService.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.discovery;
-
-public interface DisplayService {
-    boolean displayText(String text);
-    String getID();
-}

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/discovery/pom.xml
----------------------------------------------------------------------
diff --git a/samples/discovery/pom.xml b/samples/discovery/pom.xml
deleted file mode 100644
index 84480c1..0000000
--- a/samples/discovery/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-discovery-parent</artifactId>
-    <packaging>pom</packaging>
-    <name>Distributed OSGI Discovery 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/samples/ds/client/pom.xml
----------------------------------------------------------------------
diff --git a/samples/ds/client/pom.xml b/samples/ds/client/pom.xml
index 17b7eee..42c7e8a 100644
--- a/samples/ds/client/pom.xml
+++ b/samples/ds/client/pom.xml
@@ -22,6 +22,11 @@
         <artifactId>cxf-dosgi-ri-samples-ds-parent</artifactId>
         <version>1.9-SNAPSHOT</version>
     </parent>
+    
+    <properties>
+        <topDirectoryLocation>..</topDirectoryLocation>
+    </properties>
+
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/ds/impl/pom.xml
----------------------------------------------------------------------
diff --git a/samples/ds/impl/pom.xml b/samples/ds/impl/pom.xml
index 9a94a7b..7c8d90d 100644
--- a/samples/ds/impl/pom.xml
+++ b/samples/ds/impl/pom.xml
@@ -30,6 +30,11 @@
     <artifactId>cxf-dosgi-ri-samples-ds-parent</artifactId>
     <version>1.9-SNAPSHOT</version>
   </parent>
+  
+  <properties>
+    <topDirectoryLocation>..</topDirectoryLocation>
+  </properties>
+
 
   <dependencies>
     <dependency>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/ds/interface/pom.xml
----------------------------------------------------------------------
diff --git a/samples/ds/interface/pom.xml b/samples/ds/interface/pom.xml
index ce7aec9..2356a90 100644
--- a/samples/ds/interface/pom.xml
+++ b/samples/ds/interface/pom.xml
@@ -31,6 +31,11 @@
     <artifactId>cxf-dosgi-ri-samples-ds-parent</artifactId>
     <version>1.9-SNAPSHOT</version>
   </parent>
+  
+  <properties>
+    <topDirectoryLocation>..</topDirectoryLocation>
+  </properties>
+
 
   <build>
     <plugins>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/greeter/client/pom.xml
----------------------------------------------------------------------
diff --git a/samples/greeter/client/pom.xml b/samples/greeter/client/pom.xml
index bfe874c..520868f 100644
--- a/samples/greeter/client/pom.xml
+++ b/samples/greeter/client/pom.xml
@@ -36,6 +36,7 @@
     <properties>
         <bundle.import.package>*</bundle.import.package>
         <bundle.private.package>org.apache.cxf.dosgi.samples.greeter.client</bundle.private.package>
+        <topDirectoryLocation>../../..</topDirectoryLocation>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/greeter/impl/pom.xml
----------------------------------------------------------------------
diff --git a/samples/greeter/impl/pom.xml b/samples/greeter/impl/pom.xml
index d377f55..f8e5462 100644
--- a/samples/greeter/impl/pom.xml
+++ b/samples/greeter/impl/pom.xml
@@ -35,6 +35,7 @@
     <properties>
         <bundle.import.package>*</bundle.import.package>
         <bundle.private.package>org.apache.cxf.dosgi.samples.greeter.impl</bundle.private.package>
+        <topDirectoryLocation>..</topDirectoryLocation>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/greeter/interface/pom.xml
----------------------------------------------------------------------
diff --git a/samples/greeter/interface/pom.xml b/samples/greeter/interface/pom.xml
index 3e4421a..06627c2 100644
--- a/samples/greeter/interface/pom.xml
+++ b/samples/greeter/interface/pom.xml
@@ -36,6 +36,7 @@
     <properties>
         <bundle.import.package>*</bundle.import.package>
         <bundle.export.package>org.apache.cxf.dosgi.samples.greeter</bundle.export.package>
+        <topDirectoryLocation>..</topDirectoryLocation>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/greeter_rest/client/pom.xml
----------------------------------------------------------------------
diff --git a/samples/greeter_rest/client/pom.xml b/samples/greeter_rest/client/pom.xml
index cae8a5b..1f2c1c1 100644
--- a/samples/greeter_rest/client/pom.xml
+++ b/samples/greeter_rest/client/pom.xml
@@ -35,6 +35,7 @@
     <properties>
         <bundle.import.package>javax.ws.rs.*,*</bundle.import.package>
         <bundle.private.package>org.apache.cxf.dosgi.samples.greeter.client.rest</bundle.private.package>
+        <topDirectoryLocation>..</topDirectoryLocation>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/greeter_rest/impl/pom.xml
----------------------------------------------------------------------
diff --git a/samples/greeter_rest/impl/pom.xml b/samples/greeter_rest/impl/pom.xml
index 3a8fcab..d6c6c0b 100644
--- a/samples/greeter_rest/impl/pom.xml
+++ b/samples/greeter_rest/impl/pom.xml
@@ -36,6 +36,7 @@
     <properties>
         <bundle.import.package>javax.ws.rs.*,*</bundle.import.package>
         <bundle.private.package>org.apache.cxf.dosgi.samples.greeter.impl.rest</bundle.private.package>
+        <topDirectoryLocation>..</topDirectoryLocation>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/greeter_rest/impl2/pom.xml
----------------------------------------------------------------------
diff --git a/samples/greeter_rest/impl2/pom.xml b/samples/greeter_rest/impl2/pom.xml
index c2fbf7e..1d84d2f 100644
--- a/samples/greeter_rest/impl2/pom.xml
+++ b/samples/greeter_rest/impl2/pom.xml
@@ -36,6 +36,7 @@
     <properties>
         <bundle.import.package>javax.ws.rs.*,*</bundle.import.package>
         <bundle.private.package>org.apache.cxf.dosgi.samples.greeter.impl2.rest</bundle.private.package>
+        <topDirectoryLocation>..</topDirectoryLocation>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/greeter_rest/interface/pom.xml
----------------------------------------------------------------------
diff --git a/samples/greeter_rest/interface/pom.xml b/samples/greeter_rest/interface/pom.xml
index 53d18fa..fcd1f65 100644
--- a/samples/greeter_rest/interface/pom.xml
+++ b/samples/greeter_rest/interface/pom.xml
@@ -35,6 +35,7 @@
     <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>
+        <topDirectoryLocation>..</topDirectoryLocation>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index f43277b..46812bb 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -37,9 +37,7 @@
     <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/cxf-dosgi/blob/8d58f3e1/samples/security_filter/pom.xml
----------------------------------------------------------------------
diff --git a/samples/security_filter/pom.xml b/samples/security_filter/pom.xml
index de057ff..3598cfc 100644
--- a/samples/security_filter/pom.xml
+++ b/samples/security_filter/pom.xml
@@ -25,6 +25,10 @@
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
+    <properties>
+        <topDirectoryLocation>../..</topDirectoryLocation>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8d58f3e1/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 cb990e7..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.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>
-
-  <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/cxf-dosgi/blob/8d58f3e1/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/cxf-dosgi/blob/8d58f3e1/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/cxf-dosgi/blob/8d58f3e1/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/cxf-dosgi/blob/8d58f3e1/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 e5fabe6..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.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>
-
-  <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/cxf-dosgi/blob/8d58f3e1/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;
-    }
-}


Mime
View raw message