Return-Path: 
 <commits-return-14386-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 91722 invoked from network); 1 Apr 2011 16:52:31 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 1 Apr 2011 16:52:31 -0000
Received: (qmail 3658 invoked by uid 500); 1 Apr 2011 16:52:31 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 3617 invoked by uid 500); 1 Apr 2011 16:52:31 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 3610 invoked by uid 99); 1 Apr 2011 16:52:31 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Apr 2011 16:52:31 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Apr 2011 16:52:29 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1EBD123889EA; Fri,  1 Apr 2011 16:52:09 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1087803 - in /cxf/trunk:
 distribution/karaf/features/pom.xml
 distribution/karaf/features/src/main/resources/features.xml parent/pom.xml
Date: Fri, 01 Apr 2011 16:52:09 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110401165209.1EBD123889EA@eris.apache.org>

Author: dkulp
Date: Fri Apr  1 16:52:08 2011
New Revision: 1087803

URL: http://svn.apache.org/viewvc?rev=1087803&view=rev
Log:
Update for Karaf 2.2/Aries blueprint 0.3/etc...

Modified:
    cxf/trunk/distribution/karaf/features/pom.xml
    cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
    cxf/trunk/parent/pom.xml

Modified: cxf/trunk/distribution/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/karaf/features/pom.xml?rev=1087803&r1=1087802&r2=1087803&view=diff
==============================================================================
--- cxf/trunk/distribution/karaf/features/pom.xml (original)
+++ cxf/trunk/distribution/karaf/features/pom.xml Fri Apr  1 16:52:08 2011
@@ -32,7 +32,7 @@
     <packaging>pom</packaging>
     <name>CXF :: Apache Karaf :: Features</name>
     
-    <!-- The validate plugin will export these provided dependencies bundles' export packages first -->  
+    <!-- The validate plugin will export these provided dependencies bundles' export packages first -->
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -45,7 +45,7 @@
             <artifactId>pax-logging-api</artifactId>
             <version>${cxf.pax.logging.version}</version>
             <scope>provided</scope>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-service</artifactId>
@@ -64,87 +64,105 @@
             <version>${cxf.felix.configadmin.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>${cxf.javax.mail.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
-
+    <repositories>
+        <repository>
+            <id>java.net.maven2</id>
+            <url>http://download.java.net/maven/2</url>
+            <name>java.net maven 2 repo</name>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
     <build>
-      <resources>
-        <resource>
-          <directory>src/main/resources</directory>
-          <filtering>true</filtering>
-        </resource>
-      </resources>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <executions>
-             <execution>
-                <id>filter</id>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>resources</goal>
-                </goals>
-             </execution>
-          </executions>
-        </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>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>filter</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </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>
 
     <profiles>
-       <profile>
-          <id>validate</id>
-          <build>
-             <plugins>
-                <plugin>
-                   <groupId>org.apache.karaf.tooling</groupId>
-                   <artifactId>features-maven-plugin</artifactId>
-                   <version>${karaf-version}</version>
-                   <configuration>
-                       <file>${project.build.directory}/classes/features.xml</file>
-                       <karafConfig>${project.build.directory}/classes/config.properties</karafConfig>
-                   </configuration>
-                   <executions>
-                     <execution>
-                       <id>validate</id>
-                       <phase>process-resources</phase>
-                       <goals>
-                         <goal>validate</goal>
-                       </goals>
-                     </execution>
-                   </executions>
-                   <dependencies>
-                    <dependency>
-                     <groupId>org.slf4j</groupId>
-                     <artifactId>slf4j-simple</artifactId>
-                     <version>1.4.3</version>
-                </dependency>
-                 </dependencies>
-               </plugin>
-              </plugins>
-           </build>
+        <profile>
+            <id>validate</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.karaf.tooling</groupId>
+                        <artifactId>features-maven-plugin</artifactId>
+                        <version>${karaf-version}</version>
+                        <configuration>
+                            <file>${project.build.directory}/classes/features.xml</file>
+                            <karafConfig>${project.build.directory}/classes/config.properties</karafConfig>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>validate</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>validate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.slf4j</groupId>
+                                <artifactId>slf4j-simple</artifactId>
+                                <version>1.4.3</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
-     </profiles>
+    </profiles>
 
 </project>

Modified: cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/karaf/features/src/main/resources/features.xml?rev=1087803&r1=1087802&r2=1087803&view=diff
==============================================================================
--- cxf/trunk/distribution/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/distribution/karaf/features/src/main/resources/features.xml Fri Apr  1 16:52:08 2011
@@ -17,8 +17,7 @@
       limitations under the License.
 -->
 <features>
-    <repository>mvn:org.apache.karaf/apache-karaf/${cxf.karaf.version}/xml/features</repository>
-
+    <repository>mvn:org.apache.karaf.assemblies.features/standard/${cxf.karaf.version}/xml/features</repository>
 
     <feature name="cxf-specs" version="${project.version}">
         <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle>
@@ -30,7 +29,6 @@
         <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version}</bundle>
         <bundle>mvn:http://download.java.net/maven/2!javax.mail/mail/${cxf.javax.mail.version}</bundle>
         <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/${cxf.servicemix.specs.version}</bundle>
-        <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${cxf.geronimo.servlet.version}</bundle>
     </feature>
 
     <feature name='cxf-jaxb' version='${cxf.jaxb.bundle.version}'>
@@ -47,16 +45,9 @@
         <bundle>mvn:org.springframework/spring-tx/${cxf.spring.version}</bundle>
         <bundle>mvn:org.springframework/spring-web/${cxf.spring.version}</bundle>
     </feature>
-    <feature name="spring-dm" version="${cxf.spring.osgi.version}">
-        <feature version="${cxf.spring.version}">spring</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cxf.cglib.bundle.version}</bundle>
-        <bundle>mvn:org.springframework.osgi/spring-osgi-io/${cxf.spring.osgi.version}</bundle>
-        <bundle>mvn:org.springframework.osgi/spring-osgi-core/${cxf.spring.osgi.version}</bundle>
-        <bundle>mvn:org.springframework.osgi/spring-osgi-extender/${cxf.spring.osgi.version}</bundle>
-        <bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${cxf.spring.osgi.version}</bundle>
-        <bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${cxf.karaf.version}</bundle>
-    </feature>
-    <feature name='jetty7' version='${cxf.jetty.version}'>
+    <feature name='jetty' version='${cxf.jetty.version}'>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${cxf.geronimo.servlet25.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${cxf.asm.bundle.version}</bundle>
         <bundle>mvn:org.eclipse.jetty/jetty-util/${cxf.jetty.version}</bundle>
         <bundle>mvn:org.eclipse.jetty/jetty-io/${cxf.jetty.version}</bundle>
         <bundle>mvn:org.eclipse.jetty/jetty-http/${cxf.jetty.version}</bundle>
@@ -104,13 +95,13 @@
         <bundle start-level='20'>mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle>
 
         <feature version='${cxf.jaxb.bundle.version}'>cxf-jaxb</feature>
-        <feature version="${cxf.spring.osgi.version}">spring-dm</feature>
         <feature version="${cxf.karaf.version}">http</feature>
         <feature version="${cxf.karaf.version}">war</feature>
         <feature version="${cxf.spring.version}">spring</feature>
+        <feature version="${cxf.spring.osgi.version}">spring-dm</feature>
         <feature version="${cxf.spring.version}">spring-jms</feature>
         <feature version="${cxf.wss4j.version}">wss4j</feature>
-        <feature version="${cxf.jetty.version}">jetty7</feature>
+        <feature version="${cxf.jetty.version}">jetty</feature>
         <feature version='${cxf.abdera.version}'>abdera</feature>
 
         <bundle>mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle>

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1087803&r1=1087802&r2=1087803&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Apr  1 16:52:08 2011
@@ -101,6 +101,7 @@
         <cxf.geronimo.transaction.version>1.1.1</cxf.geronimo.transaction.version>
         <cxf.geronimo.ws.metadata.version>1.1.3</cxf.geronimo.ws.metadata.version>
         <cxf.geronimo.servlet.version>1.0</cxf.geronimo.servlet.version>
+        <cxf.geronimo.servlet25.version>1.1.2</cxf.geronimo.servlet25.version>
 
         <cxf.commons-codec.version>1.4</cxf.commons-codec.version>
         <cxf.commons-lang.version>2.6</cxf.commons-lang.version>
@@ -110,9 +111,9 @@
         <cxf.fastinfoset.bundle.version>1.2.7_3</cxf.fastinfoset.bundle.version>
 
         <!-- various OSGi related versions -->
-        <cxf.aries.version>0.2-incubating</cxf.aries.version>
+        <cxf.aries.version>0.3</cxf.aries.version>
         <cxf.osgi.version>4.2.0</cxf.osgi.version>
-        <cxf.karaf.version>2.1.4</cxf.karaf.version>
+        <cxf.karaf.version>2.2.0</cxf.karaf.version>
         <cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
         <cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>
         <cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>