cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r530783 - in /incubator/cxf/trunk: ./ buildtools/src/main/resources/ bundle/ distribution/ distribution/bundle/ distribution/manifest/ distribution/src/main/assembly/ distribution/src/main/release/licenses/ rt/databinding/aegis/
Date Fri, 20 Apr 2007 13:00:31 GMT
Author: blin
Date: Fri Apr 20 06:00:29 2007
New Revision: 530783

URL: http://svn.apache.org/viewvc?view=rev&rev=530783
Log:
* make bundle be sub-module of distribution
* NOTICE and license cleanup
* In rt/databindings/aegis/pom.xml for xerces exclusion, i guess artifactId and groupId were
not right, please correct me if this is wrong.


Added:
    incubator/cxf/trunk/distribution/bundle/
      - copied from r530662, incubator/cxf/trunk/bundle/
    incubator/cxf/trunk/distribution/bundle/pom.xml
      - copied, changed from r530748, incubator/cxf/trunk/bundle/pom.xml
    incubator/cxf/trunk/distribution/manifest/
    incubator/cxf/trunk/distribution/manifest/pom.xml
    incubator/cxf/trunk/distribution/src/main/release/licenses/jdom.txt
Removed:
    incubator/cxf/trunk/bundle/
Modified:
    incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml
    incubator/cxf/trunk/distribution/pom.xml
    incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
    incubator/cxf/trunk/pom.xml
    incubator/cxf/trunk/rt/databinding/aegis/pom.xml

Modified: incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml?view=diff&rev=530783&r1=530782&r2=530783
==============================================================================
--- incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml (original)
+++ incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml Fri Apr 20 06:00:29
2007
@@ -80,4 +80,113 @@
       </licenses>
     </project>
   </supplement>
+  <supplement>
+    <project>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <name>Apache Xalan-Java</name>
+      <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>The Apache Software License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>net.java.dev.stax-utils</groupId>
+      <artifactId>stax-utils</artifactId>
+      <name>StAX Utilities</name>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>wss4j</groupId>
+      <artifactId>wss4j</artifactId>
+      <name>Apache WSS4J</name>
+      <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>The Apache Software License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
+      <name>JDOM</name>
+      <organization>
+        <name>jdom.org</name>
+        <url>http://www.jdom.org</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>Modified Apache Software License</name>
+          <url>licenses/jdom.txt</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>xml-security</groupId>
+      <artifactId>xmlsec</artifactId>
+      <name>XML Security</name>
+      <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>The Apache Software License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <name>XML APIs</name>
+      <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>The Apache Software License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>bouncycastle</groupId>
+      <artifactId>bcprov-jdk14</artifactId>
+      <name>Bouncy Castle Crypto APIs for Java</name>
+      <organization>
+        <name>The Legion of the Bouncy Castle</name>
+        <url>http://www.bouncycastle.org</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>Bouncy Castle License</name>
+          <url>http://www.bouncycastle.org/licence.html</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
 </supplementalDataModels>

Copied: incubator/cxf/trunk/distribution/bundle/pom.xml (from r530748, incubator/cxf/trunk/bundle/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/bundle/pom.xml?view=diff&rev=530783&p1=incubator/cxf/trunk/bundle/pom.xml&r1=530748&p2=incubator/cxf/trunk/distribution/bundle/pom.xml&r2=530783
==============================================================================
--- incubator/cxf/trunk/bundle/pom.xml (original)
+++ incubator/cxf/trunk/distribution/bundle/pom.xml Fri Apr 20 06:00:29 2007
@@ -21,7 +21,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.apache.cxf</groupId>
-	<artifactId>cxf-bundle</artifactId>
+	<artifactId>cxf-distribution-bundle</artifactId>
 	<packaging>jar</packaging>
 	<name>Apache CXF Bundle Jar</name>
 	<version>2.0-incubator-RC-SNAPSHOT</version>
@@ -31,7 +31,7 @@
 		<groupId>org.apache.cxf</groupId>
 		<artifactId>cxf-parent</artifactId>
 		<version>2.0-incubator-RC-SNAPSHOT</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../../parent</relativePath>
 	</parent>
 
 	<properties>

Added: incubator/cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/manifest/pom.xml?view=auto&rev=530783
==============================================================================
--- incubator/cxf/trunk/distribution/manifest/pom.xml (added)
+++ incubator/cxf/trunk/distribution/manifest/pom.xml Fri Apr 20 06:00:29 2007
@@ -0,0 +1,236 @@
+<!--
+  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 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>
+    <groupId>org.apache.cxf</groupId>
+    <artifactId>cxf-distribution-manifest</artifactId>
+    <packaging>jar</packaging>
+    <name>Apache CXF Manifest Jar</name>
+    <version>2.0-incubator-RC-SNAPSHOT</version>
+    <url>http://cwiki.apache.org/CXF</url>
+
+    <parent>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-parent</artifactId>
+        <version>2.0-incubator-RC-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
+    </parent>
+
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+        <cxf.version>${pom.version}</cxf.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-common-utilities</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-common-schemas</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-tools-common</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-tools-validator</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-tools-wsdlto-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-tools-misctools</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-tools-java2wsdl</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-xjc-dv</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-api</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-management</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-transports-local</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-transports-http-jetty</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-transports-jms</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-bindings-soap</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-bindings-xml</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-bindings-object</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-bindings-coloc</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-bindings-http</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-databinding-aegis</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-ws-addr</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-ws-rm</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-ws-policy</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+		<dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-ws-security</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-frontend-js</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-frontend-simple</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <finalName>cxf-manifest-incubator</finalName>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/distribution</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/distribution</developerConnection>
+    </scm>
+
+</project>

Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=530783&r1=530782&r2=530783
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Fri Apr 20 06:00:29 2007
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-distribution</artifactId>
-    <packaging>jar</packaging>
+    <packaging>pom</packaging>
     <name>Apache CXF Distribution</name>
     <version>2.0-incubator-RC-SNAPSHOT</version>
     <url>http://cwiki.apache.org/CXF</url>
@@ -37,6 +37,11 @@
         <cxf.version>${pom.version}</cxf.version>
     </properties>
 
+    <modules>
+        <module>bundle</module>
+        <module>manifest</module>
+    </modules>
+
     <dependencies>
         <dependency>
             <groupId>${pom.groupId}</groupId>
@@ -208,7 +213,7 @@
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>cxf-bundle</artifactId>
+            <artifactId>cxf-distribution-bundle</artifactId>
             <version>${pom.version}</version>
         </dependency>
     </dependencies>
@@ -268,7 +273,12 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>${pom.groupId}</groupId>
-                                    <artifactId>cxf-bundle</artifactId>
+                                    <artifactId>cxf-rt-bindings-jbi</artifactId>
+                                    <version>${pom.version}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>cxf-rt-transports-jbi</artifactId>
                                     <version>${pom.version}</version>
                                 </artifactItem>
                             </artifactItems>
@@ -309,18 +319,6 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <finalName>cxf-manifest-incubator</finalName>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                        </manifest>
-                    </archive>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

Modified: incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/bin.xml?view=diff&rev=530783&r1=530782&r2=530783
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/bin.xml Fri Apr 20 06:00:29 2007
@@ -94,11 +94,11 @@
 			<directory>target/additional-libs</directory>
 			<outputDirectory>cxf-${cxf.version}/modules</outputDirectory>
 			<includes>
-				<include>**/cxf-integration*</include>
+				<include>**/*</include>
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>target</directory>
+			<directory>manifest/target</directory>
 			<outputDirectory>cxf-${cxf.version}/modules</outputDirectory>
 			<includes>
 				<include>cxf-manifest-incubator.jar</include>
@@ -203,10 +203,7 @@
 		        <exclude>org.apache.cxf:cxf-rt-frontend-jaxws</exclude>
 		        <exclude>org.apache.cxf:cxf-rt-frontend-js</exclude>
 		        <exclude>org.apache.cxf:cxf-rt-frontend-simple</exclude>
-		        <exclude>org.apache.cxf:cxf-integration-jbi</exclude>
-		        <exclude>org.apache.cxf:cxf-integration-jca</exclude>
-		        <exclude>org.apache.cxf:cxf-distribution</exclude>
-		        <exclude>org.apache.cxf:cxf-bundle</exclude>
+		        <exclude>org.apache.cxf:cxf-distribution-bundle</exclude>
 		    </excludes>
 			<scope>runtime</scope>
 		</dependencySet>
@@ -245,12 +242,9 @@
 		        <include>org.apache.cxf:cxf-rt-frontend-jaxws</include>
 		        <include>org.apache.cxf:cxf-rt-frontend-js</include>
 		        <include>org.apache.cxf:cxf-rt-frontend-simple</include>
-		        <include>org.apache.cxf:cxf-integration-jbi</include>
-		        <include>org.apache.cxf:cxf-integration-jca</include>
 		    </includes>
 		    <excludes>
-		        <exclude>org.apache.cxf:cxf-distribution</exclude>
-		        <exclude>org.apache.cxf:cxf-bundle</exclude>
+		        <exclude>org.apache.cxf:cxf-distribution-bundle</exclude>
 		    </excludes>
 		    <scope>runtime</scope>
 		</dependencySet>
@@ -258,7 +252,7 @@
 		    <outputDirectory>cxf-${cxf.version}/</outputDirectory>
 		    <unpack>false</unpack>
 		    <includes>
-		        <include>org.apache.cxf:cxf-bundle</include>
+		        <include>org.apache.cxf:cxf-distribution-bundle</include>
 		    </includes>
 		    <scope>runtime</scope>
 		    <outputFileNameMapping>cxf-${version}.${extension}</outputFileNameMapping>

Added: incubator/cxf/trunk/distribution/src/main/release/licenses/jdom.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/licenses/jdom.txt?view=auto&rev=530783
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/licenses/jdom.txt (added)
+++ incubator/cxf/trunk/distribution/src/main/release/licenses/jdom.txt Fri Apr 20 06:00:29
2007
@@ -0,0 +1,56 @@
+/*-- 
+
+ $Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
+
+ Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>. 
+
+ */
+

Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=530783&r1=530782&r2=530783
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Fri Apr 20 06:00:29 2007
@@ -143,7 +143,6 @@
             <!-- default profile enables checkstyle and Xlint stuff -->
             <id>everything</id>
             <modules>
-                <module>bundle</module>
                 <module>distribution</module>
                 <module>tools/eclipse-plugin</module>
                 <module>tools/eclipse3.1-plugin</module>
@@ -298,7 +297,6 @@
         <profile>
             <id>deploy</id>
             <modules> 
-                <module>bundle</module>
                 <module>distribution</module>
                 <module>tools/eclipse-plugin</module>
                 <module>tools/eclipse3.1-plugin</module>

Modified: incubator/cxf/trunk/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/pom.xml?view=diff&rev=530783&r1=530782&r2=530783
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/pom.xml (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/pom.xml Fri Apr 20 06:00:29 2007
@@ -106,12 +106,12 @@
                     <groupId>dom4j</groupId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>xerces</artifactId>
-                    <groupId>xmlParserAPIs</groupId>
+                    <artifactId>xmlParserAPIs</artifactId>
+                    <groupId>xerces</groupId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>xerces</artifactId>
-                    <groupId>xercesImpl</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                    <groupId>xerces</groupId>
                 </exclusion>
                 <exclusion>
                     <artifactId>xom</artifactId>



Mime
View raw message