You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cm...@apache.org on 2011/01/16 15:26:57 UTC

svn commit: r1059571 - /karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml

Author: cmoulliard
Date: Sun Jan 16 14:26:56 2011
New Revision: 1059571

URL: http://svn.apache.org/viewvc?rev=1059571&view=rev
Log:
KARAF-394: add aries-application in features enterprise file + made small enhancements

Modified:
    karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml

Modified: karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml?rev=1059571&r1=1059570&r2=1059571&view=diff
==============================================================================
--- karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml (original)
+++ karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml Sun Jan 16 14:26:56 2011
@@ -1,46 +1,72 @@
 <?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.
-    -->
+    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 name="karaf-enterprise-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
-        <feature name='transaction' description='OSGi Transaction Manager' version='${aries.blueprint.version}' resolver='(obr)'>
-            <details>The Aries JTA</details>
-            <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
-            <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.blueprint.version}</bundle>
-            <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.blueprint.version}</bundle>
-        </feature>
-
-       <feature name='persistence' description='OSGi Persistence Container' version='${aries.blueprint.version}' resolver='(obr)'>
-            <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
-            <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
-            <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/${aries.blueprint.version}</bundle>
-            <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.blueprint.version}</bundle>
-            <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries.blueprint.version}</bundle>
-            <bundle>mvn:org.apache.aries/org.apache.aries.util/${aries.blueprint.version}</bundle>
-        </feature>
-
-        <feature name='jndi' description='OSGi Service Registry JNDI access' version='${aries.blueprint.version}' resolver='(obr)'>
-            <bundle>mvn:org.apache.aries/org.apache.aries.util/${aries.blueprint.version}</bundle>
-            <bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.api/${aries.blueprint.version}</bundle>
-            <bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.core/${aries.blueprint.version}</bundle>
-            <bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.rmi/${aries.blueprint.version}</bundle>
-            <bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.url/${aries.blueprint.version}</bundle>
-            <bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.legacy.support/${aries.blueprint.version}</bundle>
-        </feature>
+    <feature name='transaction' description='OSGi Transaction Manager' version='${aries.transaction.version}'
+             resolver='(obr)'>
+        <details>The Aries JTA</details>
+        <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+        <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.version}</bundle>
+        <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.version}</bundle>
+        <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.wrappers/${aries.transaction.version}</bundle>
+    </feature>
+
+    <feature name='jpa' description='OSGi Persistence Container' version='${aries.jpa.version}'
+             resolver='(obr)'>
+        <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
+        <bundle>mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
+        <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.version}</bundle>
+        <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/${aries.jpa.version}</bundle>
+        <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.version}</bundle>
+        <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries.jpa.version}</bundle>
+    </feature>
+
+    <feature name='jndi' description='OSGi Service Registry JNDI access' version='${aries.jndi.version}'
+             resolver='(obr)'>
+        <bundle>mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
+        <bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.api/${aries.jndi.version}</bundle>
+        <bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.core/${aries.jndi.version}</bundle>
+        <bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.rmi/${aries.jndi.version}</bundle>
+        <bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.url/${aries.jndi.version}</bundle>
+        <bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.legacy.support/${aries.jndi.version}</bundle>
+    </feature>
+
+    <feature name="application-without-isolation" version="${aries.application.version}">
+        <!-- pre-requisites-->
+        <bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries.blueprint.version}</bundle>
+        <bundle>mvn:org.apache.aries.proxy/org.apache.aries.proxy/aries.proxy.version</bundle>
+        <bundle>mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
+        <feature version="${project.version}">obr</feature>
+        <!-- commom -->
+        <bundle>mvn:org.apache.aries.application/org.apache.aries.application.resolver.obr/${aries.application.version}</bundle>
+        <bundle>mvn:org.apache.aries.application/org.apache.aries.application.install/${aries.application.version}</bundle>
+        <bundle>mvn:org.apache.aries.application/org.apache.aries.application.api/${aries.application.version}</bundle>
+        <bundle>mvn:org.apache.aries.application/org.apache.aries.application.management/${aries.application.version}</bundle>
+        <bundle>mvn:org.apache.aries.application/org.apache.aries.application.utils/${aries.application.version}</bundle>
+        <bundle>mvn:org.apache.aries.application/org.apache.aries.application.modeller/${aries.application.version}</bundle>
+        <bundle>mvn:org.apache.aries.application/org.apache.aries.application.default.local.platform/${aries.application.version}</bundle>
+        <bundle>mvn:org.apache.aries.application/org.apache.aries.application.noop.platform.repo/${aries.application.version}</bundle>
+        <bundle>mvn:org.apache.aries.application/org.apache.aries.application.noop.postresolve.process/${aries.application.version}</bundle>
+        <bundle>mvn:org.apache.aries.application/org.apache.aries.application.deployment.management/${aries.application.version}</bundle>
+        <!-- without isolation -->
+        <bundle>mvn:org.apache.aries.application/org.apache.aries.application.runtime/${aries.application.version}</bundle>
+    </feature>
 </features>