geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1221379 - in /geronimo/server/trunk: ./ framework/assemblies/geronimo-framework/ framework/features/ framework/features/declarative-services/ framework/features/declarative-services/src/ framework/features/declarative-services/src/main/ fr...
Date Tue, 20 Dec 2011 18:03:47 GMT
Author: djencks
Date: Tue Dec 20 18:03:46 2011
New Revision: 1221379

URL: http://svn.apache.org/viewvc?rev=1221379&view=rev
Log:
GERONIMO-6240 add some features from osgi branch, framework server almost all starts

Added:
    geronimo/server/trunk/framework/features/declarative-services/
    geronimo/server/trunk/framework/features/declarative-services/pom.xml   (with props)
    geronimo/server/trunk/framework/features/declarative-services/src/
    geronimo/server/trunk/framework/features/declarative-services/src/main/
    geronimo/server/trunk/framework/features/declarative-services/src/main/history/
    geronimo/server/trunk/framework/features/declarative-services/src/main/history/dependencies.xml
  (with props)
    geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/
    geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/pom.xml   (with
props)
    geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/src/
    geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/src/main/
    geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/src/main/history/
    geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/src/main/history/dependencies.xml
  (with props)
    geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/
    geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/pom.xml   (with
props)
    geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/src/
    geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/src/main/
    geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/src/main/history/
    geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/src/main/history/dependencies.xml
  (with props)
Modified:
    geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/framework/features/framework/pom.xml
    geronimo/server/trunk/framework/features/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml?rev=1221379&r1=1221378&r2=1221379&view=diff
==============================================================================
--- geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml Tue Dec 20 18:03:46
2011
@@ -186,6 +186,7 @@
                         <feature>ssh</feature>
                         <feature>config</feature>
                         <feature>kar</feature>
+                        <feature>obr</feature>
                         <feature>framework</feature>
                     </startupFeatures>
                 </configuration>

Added: geronimo/server/trunk/framework/features/declarative-services/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/declarative-services/pom.xml?rev=1221379&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/declarative-services/pom.xml (added)
+++ geronimo/server/trunk/framework/features/declarative-services/pom.xml Tue Dec 20 18:03:46
2011
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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.geronimo.framework.features</groupId>
+        <artifactId>features</artifactId>
+        <version>3.0-beta-1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>declarative-services</artifactId>
+    <name>Geronimo Framework, Feature :: DS and Metatype</name>
+    <packaging>feature</packaging>
+
+    <description>DS and Metatype support</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.shell</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.metatype</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <configuration>
+                    <startLevel>30</startLevel>
+                    <checkDependencyChange>true</checkDependencyChange>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
+                    <logDependencyChanges>true</logDependencyChanges>
+                    <overwriteChangedDependencies>true</overwriteChangedDependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

Propchange: geronimo/server/trunk/framework/features/declarative-services/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/declarative-services/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/declarative-services/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/features/declarative-services/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/declarative-services/src/main/history/dependencies.xml?rev=1221379&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/declarative-services/src/main/history/dependencies.xml
(added)
+++ geronimo/server/trunk/framework/features/declarative-services/src/main/history/dependencies.xml
Tue Dec 20 18:03:46 2011
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="declarative-services">
+    <feature/>
+</features>

Propchange: geronimo/server/trunk/framework/features/declarative-services/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/declarative-services/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/declarative-services/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/framework/features/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/pom.xml?rev=1221379&r1=1221378&r2=1221379&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/features/framework/pom.xml Tue Dec 20 18:03:46 2011
@@ -70,25 +70,25 @@
                 <version>${felix.eventadmin.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.metatype</artifactId>
-                <version>${felix.metatype.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>net.sf.kxml</groupId>
-                        <artifactId>kxml2</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>org.osgi.core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>org.osgi.compendium</artifactId>
-                    </exclusion>
-               </exclusions>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.apache.felix</groupId>-->
+                <!--<artifactId>org.apache.felix.metatype</artifactId>-->
+                <!--<version>${felix.metatype.version}</version>-->
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>net.sf.kxml</groupId>-->
+                        <!--<artifactId>kxml2</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.apache.felix</groupId>-->
+                        <!--<artifactId>org.osgi.core</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.apache.felix</groupId>-->
+                        <!--<artifactId>org.osgi.compendium</artifactId>-->
+                    <!--</exclusion>-->
+               <!--</exclusions>-->
+            <!--</dependency>-->
             
 
             <dependency>
@@ -259,6 +259,28 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>declarative-services</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>org.apache.geronimo.javaee-specs</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework.features</groupId>-->
+            <!--<artifactId>org.apache.geronimo.jaxb-support</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>xml</type>-->
+            <!--<classifier>features</classifier>-->
+        <!--</dependency>-->
+
         <!--<dependency>-->
             <!--<groupId>org.apache.karaf.deployer</groupId>-->
             <!--<artifactId>org.apache.karaf.deployer.blueprint</artifactId>-->
@@ -343,14 +365,14 @@
             <!--<groupId>org.apache.mina</groupId>-->
             <!--<artifactId>mina-core</artifactId>-->
         <!--</dependency>-->
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.metatype</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.felix</groupId>-->
+            <!--<artifactId>org.apache.felix.configadmin</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.felix</groupId>-->
+            <!--<artifactId>org.apache.felix.metatype</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.prefs</artifactId>
@@ -648,6 +670,19 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <configuration>
+                    <startLevel>50</startLevel>
+                    <aggregateFeatures>true</aggregateFeatures>
+                    <checkDependencyChange>true</checkDependencyChange>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
+                    <logDependencyChanges>true</logDependencyChanges>
+                    <overwriteChangedDependencies>true</overwriteChangedDependencies>
+                </configuration>
+            </plugin>
+
             <!-- very likely we need this? -->
             <!--<plugin>-->
                 <!--<groupId>org.codehaus.mojo</groupId>-->

Added: geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/pom.xml?rev=1221379&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/pom.xml (added)
+++ geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/pom.xml Tue
Dec 20 18:03:46 2011
@@ -0,0 +1,159 @@
+<?xml version="1.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.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.framework.features</groupId>
+        <artifactId>features</artifactId>
+        <version>3.0-beta-1-SNAPSHOT</version>
+    </parent>
+    <artifactId>org.apache.geronimo.javaee-specs</artifactId>
+    <packaging>feature</packaging>
+    <dependencies>
+
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>org.apache.geronimo.jaxb-support</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
+        </dependency>
+         <dependency>
+             <groupId>org.apache.geronimo.specs</groupId>
+             <artifactId>geronimo-atinject_1.0_spec</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.apache.geronimo.specs</groupId>
+             <artifactId>geronimo-ejb_3.1_spec</artifactId>
+         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-el_2.2_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jacc_1.4_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+        </dependency>
+        <!--  todo where is this? -->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-jaxrs_1.1_spec</artifactId>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.2_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-saaj_1.3_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-validation_1.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.javamail</groupId>
+            <artifactId>geronimo-javamail_1.4_mail</artifactId>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <configuration>
+                    <startLevel>40</startLevel>
+                    <aggregateFeatures>true</aggregateFeatures>
+                    <checkDependencyChange>true</checkDependencyChange>
+                    <overwriteChangedDependencies>true</overwriteChangedDependencies>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/src/main/history/dependencies.xml?rev=1221379&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/src/main/history/dependencies.xml
(added)
+++ geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/src/main/history/dependencies.xml
Tue Dec 20 18:03:46 2011
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="org.apache.geronimo.javaee-specs">
+    <feature>
+        <bundle>mvn:org.apache.geronimo.bundles/jaxb-impl/2.2.3-1_1</bundle>
+        <bundle>mvn:org.apache.geronimo.bundles/woodstox-core-asl/4.1.2_1</bundle>
+        <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/1.8.3</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-ejb_3.1_spec/1.0.2</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-el_2.2_spec/1.0.2</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-interceptor_1.1_spec/1.0</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.6_spec/1.0</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jacc_1.4_spec/1.0</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-javaee-deployment_1.1MR3_spec/1.0.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jaxb_2.2_spec/1.0.2-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jaxr_1.0_spec/2.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jaxrpc_1.1_spec/2.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jaxws_2.2_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jcdi_1.0_spec/1.0</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jsp_2.2_spec/1.0</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-saaj_1.3_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-stax-api_1.2_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-validation_1.0_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/1.1.3</bundle>
+        <bundle>mvn:org.codehaus.woodstox/stax2-api/3.1.1</bundle>
+    </feature>
+</features>

Propchange: geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/org.apache.geronimo.javaee-specs/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/pom.xml?rev=1221379&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/pom.xml (added)
+++ geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/pom.xml Tue
Dec 20 18:03:46 2011
@@ -0,0 +1,76 @@
+<?xml version="1.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.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.framework.features</groupId>
+        <artifactId>features</artifactId>
+        <version>3.0-beta-1-SNAPSHOT</version>
+    </parent>
+    <artifactId>org.apache.geronimo.jaxb-support</artifactId>
+    <packaging>feature</packaging>
+    <dependencies>
+
+
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>woodstox-core-asl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>stax2-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-osgi-registry</artifactId>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <configuration>
+                    <startLevel>15</startLevel>
+                    <checkDependencyChange>true</checkDependencyChange>
+                    <overwriteChangedDependencies>true</overwriteChangedDependencies>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/src/main/history/dependencies.xml?rev=1221379&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/src/main/history/dependencies.xml
(added)
+++ geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/src/main/history/dependencies.xml
Tue Dec 20 18:03:46 2011
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="org.apache.geronimo.jaxb-support">
+    <feature>
+        <bundle>mvn:org.apache.geronimo.bundles/jaxb-impl/2.2.3-1_1</bundle>
+        <bundle>mvn:org.apache.geronimo.bundles/woodstox-core-asl/4.1.2_1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jaxb_2.2_spec/1.0.2-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-stax-api_1.2_spec/1.1</bundle>
+        <bundle>mvn:org.codehaus.woodstox/stax2-api/3.1.1</bundle>
+    </feature>
+</features>

Propchange: geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/org.apache.geronimo.jaxb-support/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/framework/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/pom.xml?rev=1221379&r1=1221378&r2=1221379&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/pom.xml (original)
+++ geronimo/server/trunk/framework/features/pom.xml Tue Dec 20 18:03:46 2011
@@ -34,7 +34,10 @@
     <packaging>pom</packaging>
 
     <modules>
+        <module>declarative-services</module>
         <module>framework</module>
+        <module>org.apache.geronimo.javaee-specs</module>
+        <module>org.apache.geronimo.jaxb-support</module>
     </modules>
 
 <!--

Modified: geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml?rev=1221379&r1=1221378&r2=1221379&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml Tue Dec 20 18:03:46
2011
@@ -50,6 +50,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml?rev=1221379&r1=1221378&r2=1221379&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml Tue Dec 20 18:03:46
2011
@@ -33,28 +33,32 @@
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
                 <groupId>org.apache.aries.proxy</groupId>
                 <artifactId>org.apache.aries.proxy</artifactId>
-                <version>${aries.proxy.version}</version>
-                <exclusions>
-                    <exclusion>
-                       <groupId>org.apache.aries.testsupport</groupId>
-        <artifactId>org.apache.aries.testsupport.unit</artifactId>
-                    </exclusion>
-                </exclusions> 
-            </dependency>
+                <!--<version>${aries.proxy.version}</version>-->
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                       <!--<groupId>org.apache.aries.testsupport</groupId>-->
+                       <!--<artifactId>org.apache.aries.testsupport.unit</artifactId>-->
+                    <!--</exclusion>-->
+                <!--</exclusions> -->
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.eclipse.osgi</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1221379&r1=1221378&r2=1221379&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Dec 20 18:03:46 2011
@@ -1709,6 +1709,16 @@ only found in cxf
 
             <dependency>
                 <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.scr</artifactId>
+                <version>1.6.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.shell</artifactId>
+                <version>1.4.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.bundlerepository</artifactId>
                 <version>${felix.bundlerepository.version}</version>
                 <exclusions>
@@ -2070,7 +2080,7 @@ only found in cxf
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.0.1</version>
+                    <version>2.3.4</version>
                     <extensions>true</extensions>
                     <configuration>
                         <instructions>



Mime
View raw message