You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2009/05/28 15:14:19 UTC
svn commit: r779593 - in /openejb/branches/openejb-3.1.1:
assembly/openejb-standalone/src/main/resources/
assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/
server/openejb-cxf/
Author: dblevins
Date: Thu May 28 13:14:19 2009
New Revision: 779593
URL: http://svn.apache.org/viewvc?rev=779593&view=rev
Log:
Updated excluded in to trim out some CXF dependencies we didn't need.
Added the appropriate LICENSE and NOTICE entries for the new deps we do need.
Modified:
openejb/branches/openejb-3.1.1/assembly/openejb-standalone/src/main/resources/LICENSE.txt
openejb/branches/openejb-3.1.1/assembly/openejb-standalone/src/main/resources/NOTICE.txt
openejb/branches/openejb-3.1.1/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/LICENSE.txt
openejb/branches/openejb-3.1.1/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/NOTICE.txt
openejb/branches/openejb-3.1.1/server/openejb-cxf/pom.xml
Modified: openejb/branches/openejb-3.1.1/assembly/openejb-standalone/src/main/resources/LICENSE.txt
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/assembly/openejb-standalone/src/main/resources/LICENSE.txt?rev=779593&r1=779592&r2=779593&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/assembly/openejb-standalone/src/main/resources/LICENSE.txt (original)
+++ openejb/branches/openejb-3.1.1/assembly/openejb-standalone/src/main/resources/LICENSE.txt Thu May 28 13:14:19 2009
@@ -943,3 +943,29 @@
after the cause of action arose. Each party waives its rights to a jury
trial in any resulting litigation.
+=========================================================================
+== Bouncy Castle License ==
+=========================================================================
+
+
+LICENSE
+
+Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
Modified: openejb/branches/openejb-3.1.1/assembly/openejb-standalone/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/assembly/openejb-standalone/src/main/resources/NOTICE.txt?rev=779593&r1=779592&r2=779593&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/assembly/openejb-standalone/src/main/resources/NOTICE.txt (original)
+++ openejb/branches/openejb-3.1.1/assembly/openejb-standalone/src/main/resources/NOTICE.txt Thu May 28 13:14:19 2009
@@ -134,6 +134,20 @@
(https://saaj.dev.java.net/)
License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html)
+This product includes/uses sofwtare, OpenSAML (http://www.opensaml.org)
+License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+=========================================================================
+== Bouncy Castle Notice ==
+=========================================================================
+
+This product includes software (the ASN1 codec implementation in
+geronimo-crypto) developed by the Bouncy Castle project.
+(http://www.bouncycastle.org/)
+
+Copyright (c) 2000-2005
+The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
=========================================================================
== Woodstox Notice ==
=========================================================================
Modified: openejb/branches/openejb-3.1.1/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/LICENSE.txt
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/LICENSE.txt?rev=779593&r1=779592&r2=779593&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/LICENSE.txt (original)
+++ openejb/branches/openejb-3.1.1/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/LICENSE.txt Thu May 28 13:14:19 2009
@@ -943,3 +943,29 @@
after the cause of action arose. Each party waives its rights to a jury
trial in any resulting litigation.
+=========================================================================
+== Bouncy Castle License ==
+=========================================================================
+
+
+LICENSE
+
+Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
Modified: openejb/branches/openejb-3.1.1/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/NOTICE.txt
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/NOTICE.txt?rev=779593&r1=779592&r2=779593&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/NOTICE.txt (original)
+++ openejb/branches/openejb-3.1.1/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/NOTICE.txt Thu May 28 13:14:19 2009
@@ -134,6 +134,20 @@
(https://saaj.dev.java.net/)
License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html)
+This product includes/uses sofwtare, OpenSAML (http://www.opensaml.org)
+License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+=========================================================================
+== Bouncy Castle Notice ==
+=========================================================================
+
+This product includes software (the ASN1 codec implementation in
+geronimo-crypto) developed by the Bouncy Castle project.
+(http://www.bouncycastle.org/)
+
+Copyright (c) 2000-2005
+The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
=========================================================================
== Woodstox Notice ==
=========================================================================
Modified: openejb/branches/openejb-3.1.1/server/openejb-cxf/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/server/openejb-cxf/pom.xml?rev=779593&r1=779592&r2=779593&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/server/openejb-cxf/pom.xml (original)
+++ openejb/branches/openejb-3.1.1/server/openejb-cxf/pom.xml Thu May 28 13:14:19 2009
@@ -88,6 +88,11 @@
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk14</artifactId>
</exclusion>
+<!-- <exclusion>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ </exclusion>
+-->
<exclusion>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
@@ -189,6 +194,18 @@
<artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-dao</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-support</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
</exclusion>
@@ -220,13 +237,18 @@
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
- <exclusion>
- <groupId>xml-security</groupId>
+<!-- <exclusion>
+ <groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
</exclusion>
+-->
<exclusion>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>serializer</artifactId>
</exclusion>
</exclusions>
</dependency>