[OLINGO-691] Refactored karaf module structure
This commit is contained in:
Michael Bolz
parent
7ab54a2b85
commit
e59b5082ff
|
|
@ -1,59 +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.
|
||||
-->
|
||||
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="olingo-${project.version}">
|
||||
|
||||
<feature name="olingo-server" version="${project.version}" resolver="(obr)" start-level="50">
|
||||
<feature>war</feature>
|
||||
<bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle>
|
||||
<bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle>
|
||||
<bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2-api.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml/aalto-xml/${aalto-xml.version}</bundle>
|
||||
<bundle>wrap:mvn:org.antlr/antlr4-runtime/${antlr.version}/$Bundle-SymbolicName=antlr4-runtime&Bundle-Version=${antlr.version}&Export-Package=org.antlr.v4.runtime*</bundle>
|
||||
|
||||
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
|
||||
|
||||
<bundle>mvn:org.apache.olingo/odata-commons-api/${project.version}</bundle>
|
||||
<bundle>mvn:org.apache.olingo/odata-commons-core/${project.version}</bundle>
|
||||
<bundle>mvn:org.apache.olingo/odata-server-api/${project.version}</bundle>
|
||||
<bundle>mvn:org.apache.olingo/odata-server-core/${project.version}</bundle>
|
||||
</feature>
|
||||
|
||||
<feature name="olingo-client" version="${project.version}" resolver="(obr)" start-level="50">
|
||||
<bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle>
|
||||
<bundle>mvn:commons-io/commons-io/${commons.io.version}</bundle>
|
||||
<bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle>
|
||||
<bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2-api.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml/aalto-xml/${aalto-xml.version}</bundle>
|
||||
<bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${hc.core.version}</bundle>
|
||||
<bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${hc.client.version}</bundle>
|
||||
|
||||
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson.version}</bundle>
|
||||
|
||||
<bundle>mvn:org.apache.olingo/odata-commons-api/${project.version}</bundle>
|
||||
<bundle>mvn:org.apache.olingo/odata-commons-core/${project.version}</bundle>
|
||||
<bundle>mvn:org.apache.olingo/odata-client-api/${project.version}</bundle>
|
||||
<bundle>mvn:org.apache.olingo/odata-client-core/${project.version}</bundle>
|
||||
</feature>
|
||||
</features>
|
||||
|
|
@ -29,9 +29,9 @@
|
|||
|
||||
<parent>
|
||||
<groupId>org.apache.olingo</groupId>
|
||||
<artifactId>odata-ext</artifactId>
|
||||
<artifactId>odata-karaf</artifactId>
|
||||
<version>4.0.0-SNAPSHOT</version>
|
||||
<relativePath>../..</relativePath>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
<build>
|
||||
<resources>
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
<?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.
|
||||
-->
|
||||
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="olingo-${project.version}">
|
||||
|
||||
<feature name="olingo-server" version="${project.version}" resolver="(obr)" start-level="50">
|
||||
<feature>war</feature>
|
||||
<bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle>
|
||||
<bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle>
|
||||
<bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2-api.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml/aalto-xml/${aalto-xml.version}</bundle>
|
||||
<bundle>wrap:mvn:org.antlr/antlr4-runtime/${antlr.version}/$Bundle-SymbolicName=antlr4-runtime&Bundle-Version=${antlr.version}&Export-Package=org.antlr.v4.runtime*</bundle>
|
||||
|
||||
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
|
||||
|
||||
<bundle>mvn:org.apache.olingo/odata-commons-api/${project.version}</bundle>
|
||||
<bundle>mvn:org.apache.olingo/odata-commons-core/${project.version}</bundle>
|
||||
<bundle>mvn:org.apache.olingo/odata-server-api/${project.version}</bundle>
|
||||
<bundle>mvn:org.apache.olingo/odata-server-core/${project.version}</bundle>
|
||||
</feature>
|
||||
|
||||
<feature name="olingo-client" version="${project.version}" resolver="(obr)" start-level="50">
|
||||
<bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle>
|
||||
<bundle>mvn:commons-io/commons-io/${commons.io.version}</bundle>
|
||||
<bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle>
|
||||
<bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2-api.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml/aalto-xml/${aalto-xml.version}</bundle>
|
||||
<bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${hc.core.version}</bundle>
|
||||
<bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${hc.client.version}</bundle>
|
||||
|
||||
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson.version}</bundle>
|
||||
<bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson.version}</bundle>
|
||||
|
||||
<bundle>mvn:org.apache.olingo/odata-commons-api/${project.version}</bundle>
|
||||
<bundle>mvn:org.apache.olingo/odata-commons-core/${project.version}</bundle>
|
||||
<bundle>mvn:org.apache.olingo/odata-client-api/${project.version}</bundle>
|
||||
<bundle>mvn:org.apache.olingo/odata-client-core/${project.version}</bundle>
|
||||
</feature>
|
||||
</features>
|
||||
|
|
@ -23,21 +23,21 @@
|
|||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>odata-karaf-itests</artifactId>
|
||||
<artifactId>odata-karaf-fit</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<name>${project.artifactId}</name>
|
||||
|
||||
<parent>
|
||||
<groupId>org.apache.olingo</groupId>
|
||||
<artifactId>odata-ext</artifactId>
|
||||
<artifactId>odata-karaf</artifactId>
|
||||
<version>4.0.0-SNAPSHOT</version>
|
||||
<relativePath>../..</relativePath>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
<dependencies>
|
||||
<!-- Karaf features -->
|
||||
<dependency>
|
||||
<groupId>org.apache.olingo</groupId>
|
||||
<artifactId>odata-karaf-features</artifactId>
|
||||
<artifactId>odata-karaf-feature</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>xml</type>
|
||||
<classifier>features</classifier>
|
||||
|
|
@ -19,7 +19,6 @@
|
|||
|
||||
package org.apache.olingo.osgi.itests;
|
||||
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.ops4j.pax.exam.Configuration;
|
||||
|
|
@ -16,11 +16,8 @@
|
|||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
******************************************************************************/
|
||||
|
||||
package org.apache.olingo.osgi.itests;
|
||||
|
||||
|
||||
|
||||
import java.io.File;
|
||||
import java.io.InputStream;
|
||||
import java.util.Properties;
|
||||
|
|
@ -102,7 +99,7 @@ public class OlingoOSGiTestSupport {
|
|||
protected Option olingoBaseConfig() {
|
||||
karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf").version(getKarafVersion())
|
||||
.type("tar.gz");
|
||||
olingoUrl = maven().groupId("org.apache.olingo").artifactId("odata-karaf-features").versionAsInProject()
|
||||
olingoUrl = maven().groupId("org.apache.olingo").artifactId("odata-karaf-feature").versionAsInProject()
|
||||
.type("xml").classifier("features");
|
||||
String localRepo = System.getProperty("localRepository");
|
||||
return composite(karafDistributionConfiguration()
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
<?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/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>odata-karaf</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<name>${project.artifactId}</name>
|
||||
|
||||
<parent>
|
||||
<groupId>org.apache.olingo</groupId>
|
||||
<artifactId>odata-ext</artifactId>
|
||||
<version>4.0.0-SNAPSHOT</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
<modules>
|
||||
<module>karaf-features</module>
|
||||
<module>karaf-fit</module>
|
||||
</modules>
|
||||
</project>
|
||||
10
ext/pom.xml
10
ext/pom.xml
|
|
@ -39,6 +39,14 @@
|
|||
<module>pojogen-maven-plugin</module>
|
||||
<module>client-proxy</module>
|
||||
<module>client-android</module>
|
||||
<module>karaf/features</module>
|
||||
</modules>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>karaf</id>
|
||||
<modules>
|
||||
<module>karaf</module>
|
||||
</modules>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
|
|
|
|||
2
pom.xml
2
pom.xml
|
|
@ -100,7 +100,7 @@
|
|||
<!-- for osgi integration testing -->
|
||||
<osgi.version>4.2.0</osgi.version>
|
||||
<karaf.version>3.0.3</karaf.version>
|
||||
<pax.exam.version>4.5.0</pax.exam.version>
|
||||
<pax.exam.version>3.4.0</pax.exam.version>
|
||||
|
||||
<!-- Project build settings -->
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>org.apache.olingo</groupId>
|
||||
<artifactId>odata-samples</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<name>${project.artifactId}</name>
|
||||
|
|
@ -37,6 +36,14 @@
|
|||
|
||||
<modules>
|
||||
<module>server</module>
|
||||
<module>osgi/server</module>
|
||||
</modules>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>samples</id>
|
||||
<modules>
|
||||
<module>osgi/server</module>
|
||||
</modules>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
|
|
|
|||
Loading…
Reference in New Issue