cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1306457 - in /cxf/trunk: distribution/manifest/pom.xml distribution/pom.xml osgi/bundle/all/pom.xml
Date Wed, 28 Mar 2012 16:35:30 GMT
Author: dkulp
Date: Wed Mar 28 16:35:29 2012
New Revision: 1306457

URL: http://svn.apache.org/viewvc?rev=1306457&view=rev
Log:
Add the additional modules to all bundle and the distribution.

Modified:
    cxf/trunk/distribution/manifest/pom.xml
    cxf/trunk/distribution/pom.xml
    cxf/trunk/osgi/bundle/all/pom.xml

Modified: cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/manifest/pom.xml?rev=1306457&r1=1306456&r2=1306457&view=diff
==============================================================================
--- cxf/trunk/distribution/manifest/pom.xml (original)
+++ cxf/trunk/distribution/manifest/pom.xml Wed Mar 28 16:35:29 2012
@@ -75,6 +75,7 @@
             <version>${project.version}</version>
         </dependency>
         
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
@@ -87,12 +88,14 @@
             <version>${project.version}</version>
         </dependency>
         
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cxf-tools-java2ws</artifactId>
             <version>${project.version}</version>
-        </dependency>       
+        </dependency>
         
+
         <dependency>
             <groupId>${project.groupId}.xjcplugins</groupId>
             <artifactId>cxf-xjc-dv</artifactId>
@@ -114,6 +117,11 @@
             <version>${cxf.xjc-utils.version}</version>
         </dependency>
         <dependency>
+            <groupId>${project.groupId}.xjc-utils</groupId>
+            <artifactId>cxf-xjc-runtime</artifactId>
+            <version>${cxf.xjc-utils.version}</version>
+        </dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cxf-api</artifactId>
             <version>${project.version}</version>
@@ -124,6 +132,11 @@
             <artifactId>cxf-rt-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-features-clustering</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -216,6 +229,36 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-rs-extension-providers</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-rs-extension-search</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-rs-security-cors</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-rs-security-oauth</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-rs-security-oauth2</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-rs-security-xml</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>cxf-rt-ws-addr</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -234,7 +277,7 @@
             <artifactId>cxf-rt-ws-mex</artifactId>
             <version>${project.version}</version>
         </dependency>
-		<dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
             <version>${project.version}</version>
@@ -258,12 +301,12 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cxf-rt-javascript</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cxf-bundle</artifactId>
@@ -300,8 +343,8 @@
             <artifactId>commons-logging</artifactId>
         </dependency>
         <dependency>
-             <groupId>com.sun.xml.fastinfoset</groupId>
-             <artifactId>FastInfoset</artifactId>
+            <groupId>com.sun.xml.fastinfoset</groupId>
+            <artifactId>FastInfoset</artifactId>
         </dependency>
 
         <dependency>
@@ -341,13 +384,13 @@
                             <addClasspath>true</addClasspath>
                         </manifest>
                         <manifestEntries>
-                          <!-- Add an entry for the renamed bundle jar in the distro -->
-                          <!-- Add entries for the stuff that needs to be endorsed on
Java6, but not on java5 -->
-                          <!-- Stick both versions of jaxb xjc/impl on classpath to make
it easier to flip back and forth -->
-			              <Class-Path>
+                            <!-- Add an entry for the renamed bundle jar in the distro
-->
+                            <!-- Add entries for the stuff that needs to be endorsed on
Java6, but not on java5 -->
+                            <!-- Stick both versions of jaxb xjc/impl on classpath to
make it easier to flip back and forth -->
+                            <Class-Path>
                           cxf-${project.version}.jar endorsed/jaxb-api-${cxf.jaxb22.version}.jar
endorsed/geronimo-jaxws_2.2_spec-${cxf.specs.jaxws.api.version}.jar jaxb-impl-${cxf.jaxb22.impl.version}.jar
jaxb-impl-${cxf.jaxb21.impl.version}.jar jaxb-xjc-${cxf.jaxb22.xjc.version}.jar jaxb-xjc-${cxf.jaxb21.xjc.version}.jar
-                          </Class-Path>
-			            </manifestEntries>
+                            </Class-Path>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>

Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=1306457&r1=1306456&r2=1306457&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Wed Mar 28 16:35:29 2012
@@ -106,6 +106,11 @@
         </dependency>
 
         <dependency>
+            <groupId>${project.groupId}.xjc-utils</groupId>
+            <artifactId>cxf-xjc-runtime</artifactId>
+            <version>${cxf.xjc-utils.version}</version>
+        </dependency>
+        <dependency>
             <groupId>${project.groupId}.xjcplugins</groupId>
             <artifactId>cxf-xjc-dv</artifactId>
             <version>${cxf.xjc-utils.version}</version>
@@ -136,6 +141,11 @@
             <artifactId>cxf-rt-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-features-clustering</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -303,17 +313,27 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>cxf-rt-javascript</artifactId>
+            <artifactId>cxf-rt-rs-extension-providers</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>cxf-rt-rs-extension-providers</artifactId>
+            <artifactId>cxf-rt-rs-extension-search</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>cxf-rt-rs-extension-search</artifactId>
+            <artifactId>cxf-rt-rs-security-cors</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-rs-security-oauth</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-rs-security-oauth2</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -321,6 +341,11 @@
             <artifactId>cxf-rt-rs-security-xml</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-javascript</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <!-- services jars -->
         <dependency>
@@ -362,8 +387,8 @@
             <artifactId>commons-logging</artifactId>
         </dependency>
         <dependency>
-             <groupId>com.sun.xml.fastinfoset</groupId>
-             <artifactId>FastInfoset</artifactId>
+            <groupId>com.sun.xml.fastinfoset</groupId>
+            <artifactId>FastInfoset</artifactId>
         </dependency>
     </dependencies>
 
@@ -497,17 +522,17 @@
                 </executions>
             </plugin>
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-checkstyle-plugin</artifactId>
-              <executions>
-                <execution>
-                  <phase>validate</phase>
-                  <id>validate</id>
-                  <configuration>
-                    <excludes>**/target/generated-sources/**</excludes>
-                  </configuration>
-                </execution>
-              </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <id>validate</id>
+                        <configuration>
+                            <excludes>**/target/generated-sources/**</excludes>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

Modified: cxf/trunk/osgi/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/all/pom.xml?rev=1306457&r1=1306456&r2=1306457&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/all/pom.xml (original)
+++ cxf/trunk/osgi/bundle/all/pom.xml Wed Mar 28 16:35:29 2012
@@ -33,8 +33,8 @@
         <version>2.6.0-SNAPSHOT</version>
     </parent>
     <properties>
-         <bundle.symbolic.name>${project.groupId}.bundle</bundle.symbolic.name>
-     </properties>
+        <bundle.symbolic.name>${project.groupId}.bundle</bundle.symbolic.name>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -145,6 +145,11 @@
             <artifactId>cxf-rt-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-features-clustering</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -257,6 +262,26 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-rs-security-cors</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-rs-security-oauth</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-rs-security-oauth2</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-rs-security-xml</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>cxf-rt-ws-mex</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -286,11 +311,10 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-               <groupId>com.sun.xml.fastinfoset</groupId>
-               <artifactId>FastInfoset</artifactId>
-               <optional>true</optional>
-          </dependency>
-
+            <groupId>com.sun.xml.fastinfoset</groupId>
+            <artifactId>FastInfoset</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -341,10 +365,12 @@
                             javax.xml.soap,
                             junit.framework*;resolution:=optional,
                             net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)",
+                            net.oauth*;resolution:=optional,
                             org.apache.abdera*;resolution:=optional;version="[1.0,2)",
                             org.apache.aries*;resolution:=optional;version="[0.2,2)",
                             org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
                             org.apache.commons.codec*;resolution:=optional,
+                            org.apache.commons.logging*;resolution:=optional,
                             org.apache.commons.pool*;resolution:=optional,
                             org.apache.log4j*;resolution:=optional,
                             org.apache.mina*;resolution:=optional,
@@ -357,9 +383,11 @@
                             org.codehaus.jettison*;resolution:=optional,
                             org.eclipse.emf*;resolution:=optional,
                             org.eclipse.jetty*;resolution:=optional;version="${cxf.jetty.osgi.version}",
+                            org.ietf.jgss*;resolution:=optional,
                             org.jaxen*;resolution:=optional,
                             org.jdom*;resolution:=optional,
                             org.jibx*;resolution:=optional;version="[1.2.3,2)",
+                            org.joda.time;resolution:=optional,
                             org.junit*;resolution:=optional,
                             org.mozilla.javascript*;resolution:=optional,
                             org.objectweb.asm*;version="[2.0,4)";resolution:=optional,



Mime
View raw message