You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2016/03/11 20:43:27 UTC
[28/50] [abbrv] aries-rsa git commit: Switch project setup to Aries
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/profiles/resources/OSGI-INF/remote-service/multi-services.xml
----------------------------------------------------------------------
diff --git a/felix/profiles/resources/OSGI-INF/remote-service/multi-services.xml b/felix/profiles/resources/OSGI-INF/remote-service/multi-services.xml
deleted file mode 100644
index 3d20c08..0000000
--- a/felix/profiles/resources/OSGI-INF/remote-service/multi-services.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0">
- <service-description>
- <provide interface="org.apache.cxf.dosgi.dsw.hooks.TestService" />
- <provide interface="org.apache.cxf.dosgi.dsw.hooks.CxfPublishHookTest$AdditionalInterface" />
- <property name="osgi.remote.interfaces">org.apache.cxf.dosgi.dsw.hooks.TestService,org.apache.cxf.dosgi.dsw.hooks.CxfPublishHookTest$AdditionalInterface</property>
- <property name="osgi.remote.requires.intents">SOAP HTTP</property>
- <property name="osgi.remote.configuration.type">pojo</property>
- <property name="osgi.remote.configuration.pojo.address"
- interface="org.apache.cxf.dosgi.dsw.hooks.TestService">
- http://localhost:9001/hello
- </property>
- <property name="osgi.remote.configuration.pojo.address"
- interface="org.apache.cxf.dosgi.dsw.hooks.CxfPublishHookTest$AdditionalInterface">
- http://localhost:9002/hello
- </property>
- </service-description>
-</service-descriptions>
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/profiles/resources/OSGI-INF/remote-service/remote-services.xml
----------------------------------------------------------------------
diff --git a/felix/profiles/resources/OSGI-INF/remote-service/remote-services.xml b/felix/profiles/resources/OSGI-INF/remote-service/remote-services.xml
deleted file mode 100644
index 45b2a20..0000000
--- a/felix/profiles/resources/OSGI-INF/remote-service/remote-services.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.
--->
-
-<service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0">
- <service-description>
- <provide interface="org.apache.cxf.dosgi.dsw.hooks.TestService" />
- <provide interface="org.apache.cxf.dosgi.dsw.hooks.CxfPublishHookTest$AdditionalInterface" />
-
- <property name="osgi.remote.interfaces">*</property>
- <property name="osgi.remote.requires.intents">SOAP HTTP</property>
- <property name="osgi.remote.configuration.type">pojo</property>
- <property name="osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
- </service-description>
-</service-descriptions>
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/profiles/resources/test-resources/rs1.xml
----------------------------------------------------------------------
diff --git a/felix/profiles/resources/test-resources/rs1.xml b/felix/profiles/resources/test-resources/rs1.xml
deleted file mode 100644
index f67a833..0000000
--- a/felix/profiles/resources/test-resources/rs1.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0">
- <service-description>
- <provide interface="SomeService" />
- <property name="osgi.remote.requires.intents">confidentiality</property>
- </service-description>
- <service-description>
- <provide interface="SomeOtherService" />
- <provide interface="WithSomeSecondInterface" />
- </service-description>
-</service-descriptions>
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/profiles/resources/test-resources/rs2.xml
----------------------------------------------------------------------
diff --git a/felix/profiles/resources/test-resources/rs2.xml b/felix/profiles/resources/test-resources/rs2.xml
deleted file mode 100644
index 098aa21..0000000
--- a/felix/profiles/resources/test-resources/rs2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0">
- <service-description>
- <provide interface="org.example.Service" />
- <property name="deployment.intents">confidentiality.message integrity</property>
- <property name="osgi.remote.interfaces">*</property>
- </service-description>
-</service-descriptions>
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/profiles/resources/test-resources/sd-1.xml
----------------------------------------------------------------------
diff --git a/felix/profiles/resources/test-resources/sd-1.xml b/felix/profiles/resources/test-resources/sd-1.xml
deleted file mode 100644
index 483b196..0000000
--- a/felix/profiles/resources/test-resources/sd-1.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<test>
- <some-other-tag/>
-</test>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/profiles/resources/test-resources/sd.xml
----------------------------------------------------------------------
diff --git a/felix/profiles/resources/test-resources/sd.xml b/felix/profiles/resources/test-resources/sd.xml
deleted file mode 100644
index c7cebfb..0000000
--- a/felix/profiles/resources/test-resources/sd.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<service-decorations xmlns="http://cxf.apache.org/xmlns/service-decoration/1.0.0">
- <service-decoration>
- <match interface="org.acme.foo.*">
- <match-property name="test.prop" value="xyz"/>
- <add-property name="test.too" value="ahaha" type="java.lang.String"/>
- </match>
- </service-decoration>
-</service-decorations>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/profiles/resources/test-resources/sd0.xml
----------------------------------------------------------------------
diff --git a/felix/profiles/resources/test-resources/sd0.xml b/felix/profiles/resources/test-resources/sd0.xml
deleted file mode 100644
index 0ad0ad1..0000000
--- a/felix/profiles/resources/test-resources/sd0.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<service-decorations xmlns="http://cxf.apache.org/xmlns/service-decoration/1.0.0">
-</service-decorations>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/profiles/resources/test-resources/sd1.xml
----------------------------------------------------------------------
diff --git a/felix/profiles/resources/test-resources/sd1.xml b/felix/profiles/resources/test-resources/sd1.xml
deleted file mode 100644
index 6a5e811..0000000
--- a/felix/profiles/resources/test-resources/sd1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<service-decorations xmlns="http://cxf.apache.org/xmlns/service-decoration/1.0.0">
- <service-decoration>
- <match interface="org.test.A">
- <add-property name="A" value="B"/>
- <add-property name="C" value="2" type="java.lang.Integer"/>
- </match>
- </service-decoration>
-</service-decorations>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/profiles/resources/test-resources/sd2.xml
----------------------------------------------------------------------
diff --git a/felix/profiles/resources/test-resources/sd2.xml b/felix/profiles/resources/test-resources/sd2.xml
deleted file mode 100644
index fb6a93a..0000000
--- a/felix/profiles/resources/test-resources/sd2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<service-decorations xmlns="http://cxf.apache.org/xmlns/service-decoration/1.0.0">
- <service-decoration>
- <match interface="org.test.(B|C)">
- <match-property name="x" value="y"/>
- <add-property name="bool" value="true" type="java.lang.Boolean"/>
- </match>
- </service-decoration>
- <service-decoration>
- <match interface="org.test.(B|C)">
- <match-property name="x" value="z"/>
- <add-property name="bool" value="false" type="java.lang.Boolean"/>
- </match>
- </service-decoration>
-</service-decorations>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/profiles/src/main/java/felix/EmptyClass.java
----------------------------------------------------------------------
diff --git a/felix/profiles/src/main/java/felix/EmptyClass.java b/felix/profiles/src/main/java/felix/EmptyClass.java
deleted file mode 100644
index 58758f7..0000000
--- a/felix/profiles/src/main/java/felix/EmptyClass.java
+++ /dev/null
@@ -1,22 +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 felix;
-
-public class EmptyClass {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/profiles/src/main/resources/client_bundles.txt
----------------------------------------------------------------------
diff --git a/felix/profiles/src/main/resources/client_bundles.txt b/felix/profiles/src/main/resources/client_bundles.txt
deleted file mode 100644
index 0bf6534..0000000
--- a/felix/profiles/src/main/resources/client_bundles.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.1.1/geronimo-annotation_1.0_spec-1.1.1.jar
-
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.1/geronimo-activation_1.1_spec-1.1.jar
-
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1.jar
-
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-ws-metadata_2.0_spec/1.1.3/geronimo-ws-metadata_2.0_spec-1.1.3.jar
-
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-servlet_3.0_spec/1.0/geronimo-servlet_3.0_spec-1.0.jar
-
-start file:${maven.repo.local}/org/apache/commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar
-
-start file:${maven.repo.local}/org/jdom/com.springsource.org.jdom/1.1.0/com.springsource.org.jdom-1.1.0.jar
-
-start file:${maven.repo.local}/org/jaxen/com.springsource.org.jaxen/1.1.1/com.springsource.org.jaxen-1.1.1.jar
-
-start file:${maven.repo.local}/org/springframework/spring-core/${spring.version}/spring-core-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/spring-beans/${spring.version}/spring-beans-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/spring-context/${spring.version}/spring-context-${spring.version}.jar
-
-start file:${maven.repo.local}/org/aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar
-
-start file:${maven.repo.local}/org/springframework/spring-aop/${spring.version}/spring-aop-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/spring-expression/${spring.version}/spring-expression-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/spring-asm/${spring.version}/spring-asm-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-io/${spring.osgi.version}/spring-osgi-io-${spring.osgi.version}.jar
-
-start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-core/${spring.osgi.version}/spring-osgi-core-${spring.osgi.version}.jar
-
-start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-extender/${spring.osgi.version}/spring-osgi-extender-${spring.osgi.version}.jar
-
-start file:${maven.repo.local}/org/eclipse/jetty/aggregate/jetty-all-server/${jetty.version}/jetty-all-server-${jetty.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.locator/${servicemix.specs.version}/org.apache.servicemix.specs.locator-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}/org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxws-api-2.1/${servicemix.specs.version}/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxbimpl.bundle.version}/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}/org.apache.servicemix.bundles.xmlsec-${xmlsec.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wss4j/${wss4j.bundle.version}/org.apache.servicemix.bundles.wss4j-${wss4j.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/sws/xmlschema/xmlschema-core/${xmlschema.bundle.version}/xmlschema-core-${xmlschema.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/neethi/neethi/${neethi.bundle.version}/neethi-${neethi.bundle.version}.jar
-
-start file:${maven.repo.local}/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar
-
-start file:${maven.repo.local}/org/codehaus/woodstox/woodstox-core-asl/${woodstox.bundle.version}/woodstox-core-asl-${woodstox.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.joda-time/1.5.2_4/org.apache.servicemix.bundles.joda-time-1.5.2_4.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.opensaml/2.4.1_1/org.apache.servicemix.bundles.opensaml-2.4.1_1.jar
-
-start file:${maven.repo.local}/org/apache/cxf/cxf-bundle-minimal/${cxf.version}/cxf-bundle-minimal-${cxf.version}.jar
-
-start file:${maven.repo.local}/org/apache/cxf/cxf-dosgi-ri-discovery-local/${project.version}/cxf-dosgi-ri-discovery-local-${project.version}.jar
-
-start file:${maven.repo.local}/org/apache/cxf/cxf-dosgi-ri-dsw-cxf/${project.version}/cxf-dosgi-ri-dsw-cxf-${project.version}.jar
-
-start file:${maven.repo.local}/org/apache/cxf/cxf-dosgi-ri-samples-greeter-interface/${project.version}/cxf-dosgi-ri-samples-greeter-interface-${project.version}.jar
-
-start file:${maven.repo.local}/org/apache/cxf/cxf-dosgi-ri-samples-greeter-client/${project.version}/cxf-dosgi-ri-samples-greeter-client-${project.version}.jar
-
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/profiles/src/main/resources/dosgi_bundles.txt
----------------------------------------------------------------------
diff --git a/felix/profiles/src/main/resources/dosgi_bundles.txt b/felix/profiles/src/main/resources/dosgi_bundles.txt
deleted file mode 100644
index 8506239..0000000
--- a/felix/profiles/src/main/resources/dosgi_bundles.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.1.1/geronimo-annotation_1.0_spec-1.1.1.jar
-
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.1/geronimo-activation_1.1_spec-1.1.jar
-
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1.jar
-
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-ws-metadata_2.0_spec/1.1.3/geronimo-ws-metadata_2.0_spec-1.1.3.jar
-
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-servlet_3.0_spec/1.0/geronimo-servlet_3.0_spec-1.0.jar
-
-start file:${maven.repo.local}/org/apache/commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar
-
-start file:${maven.repo.local}/org/jdom/com.springsource.org.jdom/1.1.0/com.springsource.org.jdom-1.1.0.jar
-
-start file:${maven.repo.local}/org/jaxen/com.springsource.org.jaxen/1.1.1/com.springsource.org.jaxen-1.1.1.jar
-
-start file:${maven.repo.local}/org/springframework/spring-core/${spring.version}/spring-core-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/spring-beans/${spring.version}/spring-beans-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/spring-context/${spring.version}/spring-context-${spring.version}.jar
-
-start file:${maven.repo.local}/org/aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar
-
-start file:${maven.repo.local}/org/springframework/spring-aop/${spring.version}/spring-aop-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/spring-expression/${spring.version}/spring-expression-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/spring-asm/${spring.version}/spring-asm-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-io/${spring.osgi.version}/spring-osgi-io-${spring.osgi.version}.jar
-
-start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-core/${spring.osgi.version}/spring-osgi-core-${spring.osgi.version}.jar
-
-start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-extender/${spring.osgi.version}/spring-osgi-extender-${spring.osgi.version}.jar
-
-start file:${maven.repo.local}/org/eclipse/jetty/aggregate/jetty-all-server/${jetty.version}/jetty-all-server-${jetty.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.locator/${servicemix.specs.version}/org.apache.servicemix.specs.locator-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}/org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxws-api-2.1/${servicemix.specs.version}/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxbimpl.bundle.version}/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}/org.apache.servicemix.bundles.xmlsec-${xmlsec.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wss4j/${wss4j.bundle.version}/org.apache.servicemix.bundles.wss4j-${wss4j.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/sws/xmlschema/xmlschema-core/${xmlschema.bundle.version}/xmlschema-core-${xmlschema.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/neethi/neethi/${neethi.bundle.version}/neethi-${neethi.bundle.version}.jar
-
-start file:${maven.repo.local}/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar
-
-start file:${maven.repo.local}/org/codehaus/woodstox/woodstox-core-asl/${woodstox.bundle.version}/woodstox-core-asl-${woodstox.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.joda-time/1.5.2_4/org.apache.servicemix.bundles.joda-time-1.5.2_4.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.opensaml/2.4.1_1/org.apache.servicemix.bundles.opensaml-2.4.1_1.jar
-
-start file:${maven.repo.local}/org/apache/cxf/cxf-bundle-minimal/${cxf.version}/cxf-bundle-minimal-${cxf.version}.jar
-
-start file:${maven.repo.local}/org/apache/cxf/cxf-dosgi-ri-discovery-local/${project.version}/cxf-dosgi-ri-discovery-local-${project.version}.jar
-
-start file:${maven.repo.local}/org/apache/cxf/cxf-dosgi-ri-dsw-cxf/${project.version}/cxf-dosgi-ri-dsw-cxf-${project.version}.jar
-
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/profiles/src/main/resources/server_bundles.txt
----------------------------------------------------------------------
diff --git a/felix/profiles/src/main/resources/server_bundles.txt b/felix/profiles/src/main/resources/server_bundles.txt
deleted file mode 100644
index b15a054..0000000
--- a/felix/profiles/src/main/resources/server_bundles.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.1.1/geronimo-annotation_1.0_spec-1.1.1.jar
-
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.1/geronimo-activation_1.1_spec-1.1.jar
-
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1.jar
-
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-ws-metadata_2.0_spec/1.1.3/geronimo-ws-metadata_2.0_spec-1.1.3.jar
-
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-servlet_3.0_spec/1.0/geronimo-servlet_3.0_spec-1.0.jar
-
-start file:${maven.repo.local}/org/apache/commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar
-
-start file:${maven.repo.local}/org/jdom/com.springsource.org.jdom/1.1.0/com.springsource.org.jdom-1.1.0.jar
-
-start file:${maven.repo.local}/org/jaxen/com.springsource.org.jaxen/1.1.1/com.springsource.org.jaxen-1.1.1.jar
-
-start file:${maven.repo.local}/org/springframework/spring-core/${spring.version}/spring-core-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/spring-beans/${spring.version}/spring-beans-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/spring-context/${spring.version}/spring-context-${spring.version}.jar
-
-start file:${maven.repo.local}/org/aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar
-
-start file:${maven.repo.local}/org/springframework/spring-aop/${spring.version}/spring-aop-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/spring-expression/${spring.version}/spring-expression-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/spring-asm/${spring.version}/spring-asm-${spring.version}.jar
-
-start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-io/${spring.osgi.version}/spring-osgi-io-${spring.osgi.version}.jar
-
-start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-core/${spring.osgi.version}/spring-osgi-core-${spring.osgi.version}.jar
-
-start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-extender/${spring.osgi.version}/spring-osgi-extender-${spring.osgi.version}.jar
-
-start file:${maven.repo.local}/org/eclipse/jetty/aggregate/jetty-all-server/${jetty.version}/jetty-all-server-${jetty.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.locator/${servicemix.specs.version}/org.apache.servicemix.specs.locator-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}/org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxws-api-2.1/${servicemix.specs.version}/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxbimpl.bundle.version}/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}/org.apache.servicemix.bundles.xmlsec-${xmlsec.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wss4j/${wss4j.bundle.version}/org.apache.servicemix.bundles.wss4j-${wss4j.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/sws/xmlschema/xmlschema-core/${xmlschema.bundle.version}/xmlschema-core-${xmlschema.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/neethi/neethi/${neethi.bundle.version}/neethi-${neethi.bundle.version}.jar
-
-start file:${maven.repo.local}/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar
-
-start file:${maven.repo.local}/org/codehaus/woodstox/woodstox-core-asl/${woodstox.bundle.version}/woodstox-core-asl-${woodstox.bundle.version}.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.joda-time/1.5.2_4/org.apache.servicemix.bundles.joda-time-1.5.2_4.jar
-
-start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.opensaml/2.4.1_1/org.apache.servicemix.bundles.opensaml-2.4.1_1.jar
-
-start file:${maven.repo.local}/org/apache/cxf/cxf-bundle-minimal/${cxf.version}/cxf-bundle-minimal-${cxf.version}.jar
-
-start file:${maven.repo.local}/org/apache/cxf/cxf-dosgi-ri-discovery-local/${project.version}/cxf-dosgi-ri-discovery-local-${project.version}.jar
-
-start file:${maven.repo.local}/org/apache/cxf/cxf-dosgi-ri-dsw-cxf/${project.version}/cxf-dosgi-ri-dsw-cxf-${project.version}.jar
-
-start file:${maven.repo.local}/org/apache/cxf/cxf-dosgi-ri-samples-greeter-interface/${project.version}/cxf-dosgi-ri-samples-greeter-interface-${project.version}.jar
-
-start file:${maven.repo.local}/org/apache/cxf/cxf-dosgi-ri-samples-greeter-impl/${project.version}/cxf-dosgi-ri-samples-greeter-impl-${project.version}.jar
-
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/remote-debug.txt
----------------------------------------------------------------------
diff --git a/felix/remote-debug.txt b/felix/remote-debug.txt
deleted file mode 100644
index 229262b..0000000
--- a/felix/remote-debug.txt
+++ /dev/null
@@ -1 +0,0 @@
--Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/shell.tui/LICENSE
----------------------------------------------------------------------
diff --git a/felix/shell.tui/LICENSE b/felix/shell.tui/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/felix/shell.tui/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/shell.tui/NOTICE
----------------------------------------------------------------------
diff --git a/felix/shell.tui/NOTICE b/felix/shell.tui/NOTICE
deleted file mode 100644
index d96621a..0000000
--- a/felix/shell.tui/NOTICE
+++ /dev/null
@@ -1,20 +0,0 @@
-Apache Felix Shell Textual Interface
-Copyright 2006-2008 The Apache Software Foundation
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
-Licensed under the Apache License 2.0.
-
-
-III. License Summary
-- Apache License 2.0
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/shell.tui/pom.xml
----------------------------------------------------------------------
diff --git a/felix/shell.tui/pom.xml b/felix/shell.tui/pom.xml
deleted file mode 100644
index e0a6d6f..0000000
--- a/felix/shell.tui/pom.xml
+++ /dev/null
@@ -1,92 +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>
- <packaging>bundle</packaging>
- <name>Distributed OSGi Temporary Private Apache Felix Shell TUI Build</name>
- <description>A simple textual user interface for Felix' shell service.</description>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>felix-shell-extension</artifactId>
- <version>1.8-SNAPSHOT</version>
-
- <parent>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
- <version>1.8-SNAPSHOT</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell</artifactId>
- <version>1.4.3</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <excludes>**/*.java</excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Private-Package>org.apache.felix.shell.tui.*</Private-Package>
- <Bundle-Activator>org.apache.felix.shell.tui.Activator</Bundle-Activator>
- <Bundle-DocURL>http://oscar-osgi.sf.net/obr2/${project.artifactId}/</Bundle-DocURL>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- <Import-Service>org.apache.felix.shell.ShellService</Import-Service>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/felix/shell.tui/src/main/java/org/apache/felix/shell/tui/Activator.java
----------------------------------------------------------------------
diff --git a/felix/shell.tui/src/main/java/org/apache/felix/shell/tui/Activator.java b/felix/shell.tui/src/main/java/org/apache/felix/shell/tui/Activator.java
deleted file mode 100644
index c41ca32..0000000
--- a/felix/shell.tui/src/main/java/org/apache/felix/shell/tui/Activator.java
+++ /dev/null
@@ -1,187 +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.felix.shell.tui;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import org.apache.felix.shell.ShellService;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-
-public class Activator implements BundleActivator {
-
- private static final String RUN_CMD = "run ";
-
- private BundleContext context;
- private ShellTuiRunnable shellRunnable;
- private Thread thread;
- private ServiceListener listener;
- private ServiceReference shellRef;
- private ShellService shell;
-
- public void start(BundleContext bcontext) {
- context = bcontext;
-
- // Listen for registering/unregistering impl service.
- listener = new ShellServiceListener();
- try {
- context.addServiceListener(listener,
- "(objectClass=" + org.apache.felix.shell.ShellService.class.getName() + ")");
- } catch (InvalidSyntaxException ex) {
- System.err.println("ShellTui: Cannot add service listener.");
- System.err.println("ShellTui: " + ex);
- }
-
- // Now try to manually initialize the impl service
- // since one might already be available.
- initializeService();
-
- // Start impl thread.
- shellRunnable = new ShellTuiRunnable();
- thread = new Thread(shellRunnable, "Felix Shell TUI");
- thread.start();
- }
-
- public void stop(BundleContext bcontext) {
- if (shellRunnable != null) {
- shellRunnable.stop();
- thread.interrupt();
- }
- if (listener != null) {
- context.removeServiceListener(listener);
- }
- uninitializeService();
- }
-
- private synchronized void initializeService() {
- if (shell != null) {
- return;
- }
- shellRef = context.getServiceReference(org.apache.felix.shell.ShellService.class.getName());
- if (shellRef == null) {
- return;
- }
- shell = (ShellService)context.getService(shellRef);
- }
-
- private synchronized void uninitializeService() {
- if (shellRef != null) {
- context.ungetService(shellRef);
- }
- shellRef = null;
- shell = null;
- }
-
- private class ShellServiceListener implements ServiceListener {
- public void serviceChanged(ServiceEvent event) {
- synchronized (Activator.this) {
- if (event.getType() == ServiceEvent.REGISTERED) {
- // Ignore additional services if we already have one.
- if (shellRef == null) {
- // Initialize the service if we don't have one.
- initializeService();
- }
- } else if (event.getType() == ServiceEvent.UNREGISTERING
- && event.getServiceReference().equals(shellRef)) {
- // Unget the service if it is unregistering.
- uninitializeService();
- // Try to get another service.
- initializeService();
- }
- }
- }
- }
-
- private class ShellTuiRunnable implements Runnable {
-
- private volatile boolean stop;
-
- public void stop() {
- stop = true;
- }
-
- public void run() {
- String line;
- BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
-
- while (!stop) {
- System.out.print("-> ");
-
- try {
- line = in.readLine();
- } catch (IOException ex) {
- System.err.println("Could not read input, please try again.");
- continue;
- }
-
- synchronized (Activator.this) {
- if (shell == null) {
- System.out.println("No impl service available.");
- continue;
- }
-
- if (line == null) {
- continue;
- }
-
- line = line.trim();
-
- if (line.isEmpty()) {
- continue;
- }
-
- try {
- if (line.startsWith(RUN_CMD)) {
- String path = line.substring(RUN_CMD.length()).trim();
- System.out.println("loading commands from: " + path);
- File commands = new File(path);
- if (commands.exists()) {
- BufferedReader reader = new BufferedReader(new FileReader(commands));
- String command = reader.readLine().trim();
- while (command != null) {
- if (!command.isEmpty()) {
- System.out.println("\nexecuting: " + command);
- shell.executeCommand(command.trim(), System.out, System.err);
- }
- command = reader.readLine();
- }
- reader.close();
- } else {
- System.err.println(path + " not found");
- }
- } else {
- shell.executeCommand(line, System.out, System.err);
- }
- } catch (Exception ex) {
- System.err.println("ShellTui: " + ex);
- ex.printStackTrace();
- }
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/osgi-api/pom.xml
----------------------------------------------------------------------
diff --git a/osgi-api/pom.xml b/osgi-api/pom.xml
deleted file mode 100644
index 6a123eb..0000000
--- a/osgi-api/pom.xml
+++ /dev/null
@@ -1,70 +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>
- <artifactId>cxf-dosgi-ri-osgi-api</artifactId>
- <packaging>bundle</packaging>
- <name>CXF dOSGi Required OSGi Compendium APIs</name>
- <description>The minimal set of OSGi Compendium APIs required by DOSGi</description>
- <!--
- This bundle should be deployed instead of the full OSGi Compendium bundle to prevent issues
- caused by multiple exports of other OSGi APIs that are not used by DOSGi. See DOSGI-208.
- -->
-
- <parent>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
- <version>1.8-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <properties>
- <!-- the minimal set of OSGi Compendium packages that is required for DOSGi to run -->
- <required-packages>org.osgi.service.remoteserviceadmin,org.osgi.service.event</required-packages>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <!-- we must both import and export to prevent trouble if another bundle exports them too -->
- <Import-Package>${required-packages},*</Import-Package>
- <Export-Package>${required-packages}</Export-Package>
- <!-- embed the packages in this bundle -->
- <Private-Package>${required-packages}</Private-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ea56f96..256e06f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -9,77 +9,93 @@
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">
+<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>
<parent>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>14</version>
+ <relativePath />
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
-
+ <groupId>org.apache.aries.rsa</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.8-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Distributed OSGI Reference Implementation Parent</name>
-
- <!-- Some versions of libraries used are different to the ones from CXF,
- this is generally caused by the fact that not all versions are available
- yet as OSGi bundles. -->
-
- <!-- Note: the Felix Framework bundle contains the org.osgi core packages,
- which may override the standalone org.osgi dependency bundles - so if the
- org.osgi bundle versions are modified below, the corresponding Felix Framework
- version must be updated as well. -->
+ <name>Aries Remote Service Admin Parent</name>
<properties>
- <!-- portable text resource processing -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <osgi.version>4.3.1</osgi.version>
- <osgi.compendium.version>4.3.1</osgi.compendium.version>
- <cxf.version>3.1.5</cxf.version>
- <cxf.build-utils.version>3.1.0</cxf.build-utils.version>
- <felix.version>5.4.0</felix.version>
- <spring.version>4.2.4.RELEASE</spring.version>
- <spring.osgi.version>1.2.1</spring.osgi.version>
+ <baseline>1.8.0</baseline>
+ <baseline.skip>true</baseline.skip>
<zookeeper.version>3.4.8</zookeeper.version>
-
- <remote.service.admin.interfaces.version>1.0.0</remote.service.admin.interfaces.version>
-
- <servicemix.specs.version>2.6.0</servicemix.specs.version>
- <pax.web.version>1.0.11</pax.web.version>
- <pax.logging.version>1.7.0</pax.logging.version>
- <servlet.version>3.0</servlet.version>
- <log4j.version>1.2.17</log4j.version>
- <jetty.version>9.3.7.v20160115</jetty.version>
- <xmlschema.bundle.version>2.2.1</xmlschema.bundle.version>
- <xmlresolver.bundle.version>1.2_5</xmlresolver.bundle.version>
- <neethi.bundle.version>3.0.3</neethi.bundle.version>
- <wsdl4j.bundle.version>1.6.2_6</wsdl4j.bundle.version>
- <xmlsec.version>2.0.5</xmlsec.version>
- <asm.bundle.version>3.3.1_1</asm.bundle.version>
- <commons.pool.bundle.version>1.5.4_1</commons.pool.bundle.version>
- <woodstox.bundle.version>4.4.1</woodstox.bundle.version>
- <jaxbimpl.bundle.version>2.2.1.1_2</jaxbimpl.bundle.version>
+ <rsa.version>1.0.0</rsa.version>
<slf4j.version>1.7.14</slf4j.version>
- <felix.plugin.version>2.4.0</felix.plugin.version>
+ <log4j.version>1.2.6</log4j.version>
<exam.version>4.8.0</exam.version>
<cxf.resources.base.path />
<cxf.checkstyle.extension />
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.rsa</groupId>
+ <artifactId>spi</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${osgi.version}</version>
+ <version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${osgi.compendium.version}</version>
+ <version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -109,63 +125,14 @@
<version>3.2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>1.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit4</artifactId>
- <version>${exam.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-inject</artifactId>
- <version>${exam.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-forked</artifactId>
- <version>${exam.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-mvn</artifactId>
- <version>${exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.8.0.v20120529-1548</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${felix.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.tinybundles</groupId>
- <artifactId>tinybundles</artifactId>
- <version>2.1.1</version>
- </dependency>
</dependencies>
</dependencyManagement>
<build>
<defaultGoal>install</defaultGoal>
+
+
<pluginManagement>
<plugins>
<plugin>
@@ -176,16 +143,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.8.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
@@ -197,170 +154,41 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- </plugin>
-
- <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>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <supplementalModels>
- <supplementalModel>notice-supplements.xml</supplementalModel>
- </supplementalModels>
- <properties>
- <projectName>Apache CXF Distributed
- OSGi DSW Reference
- Implementation</projectName>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf.build-utils</groupId>
- <artifactId>cxf-buildtools</artifactId>
- <version>${cxf.build-utils.version}</version>
- </dependency>
- </dependencies>
+ <version>2.7</version>
<configuration>
- <buildcommands>
- <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
- <java.lang.String>net.sf.eclipsecs.core.CheckstyleBuilder</java.lang.String>
- <java.lang.String>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</java.lang.String>
- </buildcommands>
- <projectnatures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
- </projectnatures>
- <ajdtVersion>none</ajdtVersion>
- <additionalConfig>
- <file>
- <name>.checkstyle</name>
- <location>/cxf-eclipse-checkstyle</location>
- </file>
- <file>
- <name>.pmd</name>
- <location>/cxf-eclipse-pmd</location>
- </file>
- <file>
- <name>.ruleset</name>
- <location>/cxf-pmd-ruleset.xml</location>
- </file>
- </additionalConfig>
+ <encoding>UTF-8</encoding>
</configuration>
</plugin>
+
</plugins>
</pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf.build-utils</groupId>
- <artifactId>cxf-buildtools</artifactId>
- <version>${cxf.build-utils.version}</version>
- </dependency>
- </dependencies>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.0.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <_include>-bnd.bnd</_include>
+ </instructions>
+ </configuration>
<executions>
<execution>
+ <id>baseline</id>
<goals>
- <goal>process</goal>
+ <goal>baseline</goal>
</goals>
<configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <supplementalModels>
- <supplementalModel>notice-supplements.xml</supplementalModel>
- </supplementalModels>
- <properties>
- <projectName>Apache CXF Distributed OSGi
- DSW Reference Implementation</projectName>
- </properties>
+ <comparisonVersion>${baseline}</comparisonVersion>
+ <skip>${baseline.skip}</skip>
+ <failOnError>true</failOnError>
</configuration>
</execution>
</executions>
</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>
- <configuration>
- <encoding>UTF-8</encoding>
- <includeResources>false</includeResources>
- </configuration>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
- <configLocation>${cxf.resources.base.path}cxf-checkstyle${cxf.checkstyle.extension}.xml</configLocation>
- <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</excludes>
- </configuration>
- <goals>
- <goal>checkstyle</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 039c837..3078411 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,26 +19,26 @@
-->
<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</groupId>
- <artifactId>cxf-dosgi-ri</artifactId>
+ <groupId>org.apache.aries.rsa</groupId>
+ <artifactId>main</artifactId>
<version>1.8-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Distributed OSGI Reference Implementation</name>
-
+ <name>Aries Remote Service Admin Main</name>
+
<scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/cxf-dosgi.git</connection>
- <developerConnection>scm:git:http://git-wip-us.apache.org/repos/asf/cxf-dosgi.git</developerConnection>
- <tag>HEAD</tag>
- </scm>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/aries-rsa.git</connection>
+ <developerConnection>scm:git:http://git-wip-us.apache.org/repos/asf/aries-rsa.git</developerConnection>
+ <tag>HEAD</tag>
+ </scm>
<issueManagement>
<system>jira</system>
- <url>https://issues.apache.org/jira/browse/DOSGI</url>
+ <url>https://issues.apache.org/jira/browse/ARIES</url>
</issueManagement>
<prerequisites>
- <maven>3.0</maven>
+ <maven>3.2</maven>
</prerequisites>
<distributionManagement>
@@ -56,37 +56,6 @@
</distributionManagement>
<inceptionYear>2008</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>Apache CXF User List</name>
- <subscribe>users-subscribe@cxf.apache.org</subscribe>
- <unsubscribe>users-unsubscribe@cxf.apache.org</unsubscribe>
- <post>users@cxf.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/cxf-users</archive>
- </mailingList>
- <mailingList>
- <name>Apache CXF Developer List</name>
- <subscribe>dev-subscribe@cxf.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@cxf.apache.org</unsubscribe>
- <post>dev@cxf.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/cxf-dev</archive>
- </mailingList>
- <mailingList>
- <name>Apache CXF Commits List</name>
- <subscribe>commits-subscribe@cxf.apache.org</subscribe>
- <unsubscribe>commits-unsubscribe@cxf.apache.org</unsubscribe>
- <post>commits@cxf.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/cxf-commits</archive>
- </mailingList>
- <mailingList>
- <name>Apache CXF Issues List</name>
- <subscribe>issues-subscribe@cxf.apache.org</subscribe>
- <unsubscribe>issues-unsubscribe@cxf.apache.org</unsubscribe>
- <post>issues@cxf.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/cxf-issues</archive>
- </mailingList>
- </mailingLists>
-
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -102,13 +71,13 @@
<modules>
<module>parent</module>
- <module>felix</module>
- <module>dsw</module>
+ <module>rsa-api</module>
+ <module>spi</module>
+ <module>rsa</module>
+ <module>topology-manager</module>
+ <module>provider</module>
<module>discovery</module>
- <module>samples</module>
- <module>osgi-api</module>
- <module>distribution</module>
- <module>systests2</module>
+ <module>features</module>
</modules>
<profiles>
@@ -141,6 +110,61 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>rat</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.6</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <reportFile>${project.build.directory}/${project.build.finalName}.rat</reportFile>
+ <excludeSubProjects>true</excludeSubProjects>
+ <excludes>
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/appended-resources/**/*</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <exclude>**/velocity.log</exclude>
+ <exclude>**/DEPENDENCIES</exclude>
+ <!-- exclude IntelliJ IDEA generated files -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/.idea/**/*</exclude>
+ <!-- exclude Eclipse IDE generated files -->
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/eclipse-classes/**/*</exclude>
+ <!-- manifest files don't support comments so don't contain the ASL2.0 header -->
+ <exclude>**/APPLICATION.MF</exclude>
+ <exclude>**/MANIFEST.MF</exclude>
+ <exclude>**/*.MF</exclude>
+ <!--RAT doesn't seem to recognize MIT style licenses -->
+ <exclude>manual/src/styles/print.css</exclude>
+ <!-- RAT doesn't recognize BSD license in transaction-manager logger -->
+ <exclude>**/objectweb/howl/log/Logger.java</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>osgi.bnd</exclude>
+ <exclude>README.md</exclude>
+ <exclude>*.cfg</exclude>
+ <exclude>derby.log</exclude>
+ <exclude>**/*.sql</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<build>
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/provider/pom.xml
----------------------------------------------------------------------
diff --git a/provider/pom.xml b/provider/pom.xml
new file mode 100644
index 0000000..ffee5b4
--- /dev/null
+++ b/provider/pom.xml
@@ -0,0 +1,43 @@
+<?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>
+
+ <parent>
+ <groupId>org.apache.aries.rsa</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.8-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>provider</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Aries Remote Service Admin Provider</name>
+
+ <properties>
+ <topDirectoryLocation>..</topDirectoryLocation>
+ </properties>
+
+ <modules>
+ <module>tcp</module>
+ </modules>
+</project>
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d73a3a7f/provider/tcp/bnd.bnd
----------------------------------------------------------------------
diff --git a/provider/tcp/bnd.bnd b/provider/tcp/bnd.bnd
new file mode 100644
index 0000000..1884efd
--- /dev/null
+++ b/provider/tcp/bnd.bnd
@@ -0,0 +1 @@
+Bundle-Activator: org.apache.aries.rsa.provider.tcp.Activator