You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/12/24 09:21:54 UTC
svn commit: r1222936 - in /openejb/trunk/openejb/osgi: ./ openejb-core-osgi/
openejb-core-osgi/src/main/filtered-resources/ openejb-feature/
openejb-feature/src/ openejb-feature/src/main/
openejb-feature/src/main/feature/
Author: rmannibucau
Date: Sat Dec 24 08:21:54 2011
New Revision: 1222936
URL: http://svn.apache.org/viewvc?rev=1222936&view=rev
Log:
moving karaf feature in a dedicated module
Added:
openejb/trunk/openejb/osgi/openejb-feature/
openejb/trunk/openejb/osgi/openejb-feature/pom.xml
openejb/trunk/openejb/osgi/openejb-feature/src/
openejb/trunk/openejb/osgi/openejb-feature/src/main/
openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/
openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml
Removed:
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/filtered-resources/
Modified:
openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml
openejb/trunk/openejb/osgi/pom.xml
Modified: openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml?rev=1222936&r1=1222935&r2=1222936&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml (original)
+++ openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml Sat Dec 24 08:21:54 2011
@@ -48,18 +48,6 @@
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- </resource>
- <resource>
- <directory>${pom.basedir}/src/main/filtered-resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -202,29 +190,6 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>target/classes/features.xml</file>
- <type>xml</type>
- <classifier>features</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
-
</project>
Added: openejb/trunk/openejb/osgi/openejb-feature/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-feature/pom.xml?rev=1222936&view=auto
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-feature/pom.xml (added)
+++ openejb/trunk/openejb/osgi/openejb-feature/pom.xml Sat Dec 24 08:21:54 2011
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <parent>
+ <artifactId>osgi</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>4.0.0-beta-2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>openejb-feature</artifactId>
+ <name>OpenEJB :: OSGi :: Feature</name>
+ <packaging>pom</packaging>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/feature</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>features-generate-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml?rev=1222936&view=auto
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml (added)
+++ openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml Sat Dec 24 08:21:54 2011
@@ -0,0 +1,129 @@
+<?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>
+ <repository>mvn:org.apache.openejb/javaee-api/${javaee-api.version}/xml/features</repository>
+ <repository>mvn:org.apache.openejb/openejb-core-osgi/${project.version}/xml/features</repository>
+ <repository>mvn:org.apache.activemq/activemq-karaf/${org.apache.activemq.version}/xml/features</repository>
+
+ <feature name="org.apache.commons">
+ <bundle>mvn:commons-cli/commons-cli/${commons-cli.version}</bundle>
+ <bundle>wrap:mvn:commons-logging/commons-logging/${commons-logging.version}</bundle>
+ <bundle>wrap:mvn:commons-logging/commons-logging-api/${commons-logging-api.version}</bundle>
+ <bundle>mvn:commons-pool/commons-pool/${commons-pool.version}</bundle>
+ <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
+ <bundle>mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+ <bundle>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
+ <bundle>mvn:commons-fileupload/commons-fileupload/${commons-fileupload.version}</bundle>
+ <bundle>mvn:commons-discovery/commons-discovery/${commons-discovery.version}</bundle>
+ <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
+ <bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle>
+ </feature>
+
+ <feature name="xbean" version="${xbeanVersion}">
+ <bundle>mvn:org.apache.xbean/xbean-asm-shaded/${xbeanVersion}</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-finder-shaded/${xbeanVersion}</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-naming/${xbeanVersion}</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-reflect/${xbeanVersion}</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-bundleutils/${xbeanVersion}</bundle>
+ </feature>
+
+ <feature name="org.apache.openwebbeans" version="${org.apache.openwebbeans.version}">
+ <bundle>wrap:mvn:net.sf.scannotation/scannotation/${scannotation.version}</bundle>
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-spi/${org.apache.openwebbeans.version}</bundle>
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-impl/${org.apache.openwebbeans.version}</bundle>
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-ee/${org.apache.openwebbeans.version}</bundle>
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-ejb-common</bundle>
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-ejb/${org.apache.openwebbeans.version}</bundle>
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-osgi/${org.apache.openwebbeans.version}</bundle>
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-web/${org.apache.openwebbeans.version}</bundle>
+ </feature>
+
+ <feature name="geronimo-osgi" version="${geronimo-osgi.version}">
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-osgi-registry/${geronimo-osgi.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-osgi-locator/${geronimo-osgi.version}</bundle>
+ </feature>
+
+ <feature name="org.apache.activemq" version="${org.apache.activemq.version}">
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.6_1</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-core/${org.apache.activemq.version}</bundle>
+ <bundle>mvn:org.apache.activemq/kahadb/${org.apache.activemq.version}</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-ra/${org.apache.activemq.version}</bundle>
+ </feature>
+
+ <feature name="openjpa" version="${openjpa.version}">
+ <bundle>wrap:mvn:net.sourceforge.serp/serp/1.13.1</bundle>
+ <bundle>mvn:org.apache.openjpa/openjpa/${openjpa.version}</bundle>
+ </feature>
+
+ <feature name="openejb-core-dep" version="${project.version}">
+ <feature version="${javaee-api.version}">javaee-api</feature>
+
+ <!-- that shoudn't be necessary as we already have a stax bundle in javaee-api,
+ but unfortunately, it does not export javax.xml.namespace -->
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-stax-api_1.0_spec/1.0.1</bundle>
+
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.8.2_2</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/1.8.3_2</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/3.12.1.GA_2</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/1.6.2_5</bundle>
+
+ <bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo.connector.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.components/geronimo-transaction/${geronimo.connector.version}</bundle>
+
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-javamail_1.4_spec/${geronimo-javamail_1.4_spec.version}</bundle>
+
+ <bundle>mvn:org.apache.geronimo.bundles/jaxb-impl/2.2.3-1_1</bundle>
+
+ <feature>org.apache.commons</feature>
+ <feature version="${xbeanVersion}">xbean</feature>
+ <feature version="${geronimo-osgi.version}">geronimo-osgi</feature>
+ <feature version="${org.apache.openwebbeans.version}">org.apache.openwebbeans</feature>
+ <feature version="${openjpa.version}">openjpa</feature>
+
+ <!-- the activemq feature from activemq-karaf seems broken. Let's use our in the mid time -->
+ <!--<feature version="${org.apache.activemq.version}">activemq</feature>-->
+ <feature version="${org.apache.activemq.version}">org.apache.activemq</feature>
+
+ <bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle>
+ <bundle>mvn:org.apache.bval/org.apache.bval.bundle/${bval.version}</bundle>
+ <bundle>mvn:org.hsqldb/hsqldb/${hsqldb.version}</bundle>
+
+ <bundle>mvn:org.apache.openejb/mbean-annotation-api/${project.version}</bundle>
+ <bundle>mvn:org.apache.openejb/openejb-api/${project.version}</bundle>
+ <bundle>mvn:org.apache.openejb/openejb-javaagent/${project.version}</bundle>
+ <bundle>mvn:org.apache.openejb/openejb-jee/${project.version}</bundle>
+ <bundle>mvn:org.apache.openejb/openejb-loader/${project.version}</bundle>
+ <bundle>mvn:org.apache.openejb/openejb-core-osgi/${project.version}</bundle>
+ </feature>
+
+ <feature name="openejb-core" version="${project.version}">
+ <feature version="${project.version}">openejb-core-dep</feature>
+ <bundle>mvn:org.apache.openejb/openejb-core/${project.version}</bundle>
+ </feature>
+
+
+ <feature name="openejb-server" version="${project.version}">
+ <feature version="${project.version}">openejb-core-dep</feature>
+ <bundle>mvn:org.apache.openejb/openejb-ejbd/${project.version}</bundle>
+ <bundle>mvn:org.apache.openejb/openejb-server/${project.version}</bundle>
+ <bundle>mvn:org.apache.openejb/openejb-client/${project.version}</bundle>
+ <bundle>mvn:org.apache.openejb/openejb-core/${project.version}</bundle> <!-- after openejb-client -->
+ </feature>
+</features>
Modified: openejb/trunk/openejb/osgi/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/pom.xml?rev=1222936&r1=1222935&r2=1222936&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/pom.xml (original)
+++ openejb/trunk/openejb/osgi/pom.xml Sat Dec 24 08:21:54 2011
@@ -15,5 +15,6 @@
<modules>
<module>openejb-core-osgi</module>
+ <module>openejb-feature</module>
</modules>
</project>