You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/08/04 23:22:03 UTC
svn commit: r1615796 - in /tomee/tomee/branches/tomee-1.7.0:
examples/applicationcomposer-jaxws-cdi/ maven/tomee-webapp-archetype/
server/openejb-ssh/ server/openejb-ssh/src/main/assembly/
server/openejb-ssh/src/main/resources/META-INF/ tomee/apache-to...
Author: andygumbrecht
Date: Mon Aug 4 21:22:03 2014
New Revision: 1615796
URL: http://svn.apache.org/r1615796
Log:
Fix openejb-ssh license.
Remove gson from others.
Added:
tomee/tomee/branches/tomee-1.7.0/server/openejb-ssh/src/main/resources/META-INF/LICENSE
- copied unchanged from r1615795, tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/resources/META-INF/LICENSE
tomee/tomee/branches/tomee-1.7.0/server/openejb-ssh/src/main/resources/META-INF/NOTICE
- copied unchanged from r1615795, tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/resources/META-INF/NOTICE
Modified:
tomee/tomee/branches/tomee-1.7.0/examples/applicationcomposer-jaxws-cdi/ (props changed)
tomee/tomee/branches/tomee-1.7.0/maven/tomee-webapp-archetype/ (props changed)
tomee/tomee/branches/tomee-1.7.0/server/openejb-ssh/ (props changed)
tomee/tomee/branches/tomee-1.7.0/server/openejb-ssh/src/main/assembly/ssh.xml
tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE
tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/webprofile/NOTICE
tomee/tomee/branches/tomee-1.7.0/tomee/tomee-jaxrs-webapp/src/main/resources/META-INF/NOTICE
tomee/tomee/branches/tomee-1.7.0/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE
tomee/tomee/branches/tomee-1.7.0/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
tomee/tomee/branches/tomee-1.7.0/tomee/tomee-webapp/src/main/resources/META-INF/NOTICE
tomee/tomee/branches/tomee-1.7.0/utils/openejb-provisionning/src/main/legal/NOTICE
Propchange: tomee/tomee/branches/tomee-1.7.0/examples/applicationcomposer-jaxws-cdi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 4 21:22:03 2014
@@ -0,0 +1 @@
+*.iml
Propchange: tomee/tomee/branches/tomee-1.7.0/maven/tomee-webapp-archetype/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 4 21:22:03 2014
@@ -1,2 +1,3 @@
target
*.iml
+.idea
Propchange: tomee/tomee/branches/tomee-1.7.0/server/openejb-ssh/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 4 21:22:03 2014
@@ -1,2 +1,3 @@
*.iml
target
+.idea
Modified: tomee/tomee/branches/tomee-1.7.0/server/openejb-ssh/src/main/assembly/ssh.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.0/server/openejb-ssh/src/main/assembly/ssh.xml?rev=1615796&r1=1615795&r2=1615796&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.0/server/openejb-ssh/src/main/assembly/ssh.xml (original)
+++ tomee/tomee/branches/tomee-1.7.0/server/openejb-ssh/src/main/assembly/ssh.xml Mon Aug 4 21:22:03 2014
@@ -30,6 +30,14 @@
</includes>
<outputDirectory>/</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>${project.basedir}/target/classes/META-INF</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Modified: tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE?rev=1615796&r1=1615795&r2=1615796&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE (original)
+++ tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE Mon Aug 4 21:22:03 2014
@@ -130,9 +130,6 @@ This product includes software Copyright
- HawtBuf (http://fusesource.com/forge/projects/hawtbuf)
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================
-Gson (https://code.google.com/p/google-gson/) - A Java library that can be used to convert Java Objects into their JSON representation
-License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-=========================================================================
FastInfoset (https://fi.java.net/)
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================
Modified: tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE?rev=1615796&r1=1615795&r2=1615796&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE (original)
+++ tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE Mon Aug 4 21:22:03 2014
@@ -130,9 +130,6 @@ This product includes software Copyright
- HawtBuf (http://fusesource.com/forge/projects/hawtbuf)
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================
-Gson (https://code.google.com/p/google-gson/) - A Java library that can be used to convert Java Objects into their JSON representation
-License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-=========================================================================
FastInfoset (https://fi.java.net/)
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================
Modified: tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/webprofile/NOTICE
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/webprofile/NOTICE?rev=1615796&r1=1615795&r2=1615796&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/webprofile/NOTICE (original)
+++ tomee/tomee/branches/tomee-1.7.0/tomee/apache-tomee/src/main/resources/META-INF/webprofile/NOTICE Mon Aug 4 21:22:03 2014
@@ -96,9 +96,6 @@ which is licensed under ASL 2.0.
- JAnsi (http://http://jansi.fusesource.org/) org.fusesource.jansi:jansi:jar:1.8
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================
-Gson (https://code.google.com/p/google-gson/) - A Java library that can be used to convert Java Objects into their JSON representation
-License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-=========================================================================
FastInfoset (https://fi.java.net/)
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================
Modified: tomee/tomee/branches/tomee-1.7.0/tomee/tomee-jaxrs-webapp/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.0/tomee/tomee-jaxrs-webapp/src/main/resources/META-INF/NOTICE?rev=1615796&r1=1615795&r2=1615796&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.0/tomee/tomee-jaxrs-webapp/src/main/resources/META-INF/NOTICE (original)
+++ tomee/tomee/branches/tomee-1.7.0/tomee/tomee-jaxrs-webapp/src/main/resources/META-INF/NOTICE Mon Aug 4 21:22:03 2014
@@ -80,9 +80,6 @@ which is licensed under ASL 2.0.
- JAnsi (http://http://jansi.fusesource.org/) org.fusesource.jansi:jansi:jar:1.8
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================
-Gson (https://code.google.com/p/google-gson/) - A Java library that can be used to convert Java Objects into their JSON representation
-License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-=========================================================================
FastInfoset (https://fi.java.net/)
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================
Modified: tomee/tomee/branches/tomee-1.7.0/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.0/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE?rev=1615796&r1=1615795&r2=1615796&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.0/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE (original)
+++ tomee/tomee/branches/tomee-1.7.0/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE Mon Aug 4 21:22:03 2014
@@ -84,9 +84,6 @@ which is licensed under ASL 2.0.
- HawtBuf (http://fusesource.com/forge/projects/hawtbuf)
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================
-Gson (https://code.google.com/p/google-gson/) - A Java library that can be used to convert Java Objects into their JSON representation
-License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-=========================================================================
FastInfoset (https://fi.java.net/)
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================
Modified: tomee/tomee/branches/tomee-1.7.0/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.0/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE?rev=1615796&r1=1615795&r2=1615796&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.0/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE (original)
+++ tomee/tomee/branches/tomee-1.7.0/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE Mon Aug 4 21:22:03 2014
@@ -84,9 +84,6 @@ which is licensed under ASL 2.0.
- HawtBuf (http://fusesource.com/forge/projects/hawtbuf)
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================
-Gson (https://code.google.com/p/google-gson/) - A Java library that can be used to convert Java Objects into their JSON representation
-License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-=========================================================================
FastInfoset (https://fi.java.net/)
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================
Modified: tomee/tomee/branches/tomee-1.7.0/tomee/tomee-webapp/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.0/tomee/tomee-webapp/src/main/resources/META-INF/NOTICE?rev=1615796&r1=1615795&r2=1615796&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.0/tomee/tomee-webapp/src/main/resources/META-INF/NOTICE (original)
+++ tomee/tomee/branches/tomee-1.7.0/tomee/tomee-webapp/src/main/resources/META-INF/NOTICE Mon Aug 4 21:22:03 2014
@@ -110,9 +110,6 @@ This product includes software Copyright
- JAnsi (http://http://jansi.fusesource.org/) org.fusesource.jansi:jansi:jar:1.8
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================
-Gson (https://code.google.com/p/google-gson/) - A Java library that can be used to convert Java Objects into their JSON representation
-License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-=========================================================================
FastInfoset (https://fi.java.net/)
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================
Modified: tomee/tomee/branches/tomee-1.7.0/utils/openejb-provisionning/src/main/legal/NOTICE
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.0/utils/openejb-provisionning/src/main/legal/NOTICE?rev=1615796&r1=1615795&r2=1615796&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.0/utils/openejb-provisionning/src/main/legal/NOTICE (original)
+++ tomee/tomee/branches/tomee-1.7.0/utils/openejb-provisionning/src/main/legal/NOTICE Mon Aug 4 21:22:03 2014
@@ -74,9 +74,6 @@ Copyright 2006 Google, Inc.
- License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- https://github.com/sonatype/sisu-guice
=========================================================================
-Gson (https://code.google.com/p/google-gson/) - A Java library that can be used to convert Java Objects into their JSON representation
-License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-=========================================================================
FastInfoset (https://fi.java.net/)
License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
=========================================================================