cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r474178 - in /incubator/cxf/trunk: distribution/pom.xml distribution/src/main/assembly/bin.xml distribution/src/main/release/NOTICE distribution/src/main/release/licenses/bsd.txt integration/jca/pom.xml rt/transports/jms/pom.xml
Date Mon, 13 Nov 2006 07:38:13 GMT
Author: blin
Date: Sun Nov 12 23:38:12 2006
New Revision: 474178

URL: http://svn.apache.org/viewvc?view=rev&rev=474178
Log:
1. removed some more geronimo spec jars from distribution. These jars usually are provided
by the integrated components.
2. removed some CXF integration components (jbi, jca, jms) from default manifest classpath
3. add MTTOSI wsdl and schema NOTICE and its BSD license txt

Added:
    incubator/cxf/trunk/distribution/src/main/release/licenses/bsd.txt   (with props)
Modified:
    incubator/cxf/trunk/distribution/pom.xml
    incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
    incubator/cxf/trunk/distribution/src/main/release/NOTICE
    incubator/cxf/trunk/integration/jca/pom.xml
    incubator/cxf/trunk/rt/transports/jms/pom.xml

Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=474178&r1=474177&r2=474178
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Sun Nov 12 23:38:12 2006
@@ -39,11 +39,6 @@
     <dependencies>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>cxf-integration-jca</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-common-utilities</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -102,12 +97,6 @@
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>cxf-integration-jbi</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-core</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -132,12 +121,6 @@
 
         <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>
@@ -228,6 +211,35 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+		    <execution>
+		        <!-- copy additional jars. These are jars we want included, but don't 
+                             really don't want tem on the classpath in the normal case -->
+			<id>add-jars</id>
+			<phase>package</phase>
+			<goals>
+			    <goal>copy</goal>
+			</goals>
+			<configuration>
+			    <outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
+			    <artifactItems>
+			        <artifactItem>
+				    <groupId>${pom.groupId}</groupId>
+				    <artifactId>cxf-integration-jbi</artifactId>
+				    <version>${pom.version}</version>
+				</artifactItem>
+				<artifactItem>
+				    <groupId>${pom.groupId}</groupId>
+				    <artifactId>cxf-integration-jca</artifactId>
+				    <version>${pom.version}</version>
+				</artifactItem>
+				<artifactItem>
+				    <groupId>${pom.groupId}</groupId>
+				    <artifactId>cxf-rt-transports-jms</artifactId>
+				    <version>${pom.version}</version>
+				</artifactItem>
+		            </artifactItems>
+			</configuration>
+		    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -315,4 +327,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

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=474178&r1=474177&r2=474178
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/bin.xml Sun Nov 12 23:38:12 2006
@@ -77,6 +77,13 @@
              </includes>
 	</fileSet>
 	<fileSet>
+	    <directory>target/additional-libs</directory>
+	    <outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
+	    <includes>
+	        <include>**/*</include>
+	    </includes>
+	</fileSet>
+	<fileSet>
 	     <directory>target</directory>
 	     <outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
 	     <includes>

Modified: incubator/cxf/trunk/distribution/src/main/release/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/NOTICE?view=diff&rev=474178&r1=474177&r2=474178
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/NOTICE (original)
+++ incubator/cxf/trunk/distribution/src/main/release/NOTICE Sun Nov 12 23:38:12 2006
@@ -51,6 +51,10 @@
    This product also includes software developed by Codehause
    (http://woodstox.codehaus.org/)
 
+   This product also includes MTOSI wsdl and schemas developed to TeleManagement
+   Forum (http://www.tmforum.org/browse.aspx). The original MTOSI wsdl and schemas
+   can be download here (http://sourceforge.net/projects/mtosi-ri)
+
    This product also includes WS-* schemas developed by International
    Business Machines Corporation, Microsoft Corporation, BEA Systems, 
    TIBCO Software, SAP AG, Sonic Software, and VeriSign

Added: incubator/cxf/trunk/distribution/src/main/release/licenses/bsd.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/licenses/bsd.txt?view=auto&rev=474178
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/licenses/bsd.txt (added)
+++ incubator/cxf/trunk/distribution/src/main/release/licenses/bsd.txt Sun Nov 12 23:38:12
2006
@@ -0,0 +1,12 @@
+The BSD License
+
+   Copyright (c) <YEAR>, <OWNER>
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without modification, are permitted
provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list of
conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, this list
of conditions and the following disclaimer in the documentation and/or other materials provided
with the distribution.
+    * Neither the name of the <ORGANIZATION> nor the names of its contributors may
be used to endorse or promote products derived from this software without specific prior written
permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
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 COPYRIGHT OWNER
OR 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.

Propchange: incubator/cxf/trunk/distribution/src/main/release/licenses/bsd.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/licenses/bsd.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/cxf/trunk/integration/jca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/pom.xml?view=diff&rev=474178&r1=474177&r2=474178
==============================================================================
--- incubator/cxf/trunk/integration/jca/pom.xml (original)
+++ incubator/cxf/trunk/integration/jca/pom.xml Sun Nov 12 23:38:12 2006
@@ -113,6 +113,7 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
             <version>1.0.1</version>
+	    <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: incubator/cxf/trunk/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/pom.xml?view=diff&rev=474178&r1=474177&r2=474178
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/jms/pom.xml Sun Nov 12 23:38:12 2006
@@ -98,6 +98,7 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
             <version>1.0.1</version>
+	    <scope>provided</scope>
         </dependency>
         <dependency>
                 <groupId>incubator-activemq</groupId>



Mime
View raw message