You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@geronimo.apache.org by Forrest Xia <fo...@gmail.com> on 2011/05/13 09:28:46 UTC
Re: svn commit: r1102576 - in /geronimo/server/trunk:
plugingroups/console-jetty/src/main/history/ plugingroups/console-tomcat/src/main/history/
plugingroups/javaee6-web-jetty/src/main/history/ plugingroups/javaee6-web-tomcat/src/main/history/
plugin
My bad that should not include the changed dependencies.xml for this commit.
I tried to revert, but because of the bad network performance, I cannot do
that now. I will try later. Sorry for this.
Forrest
On Fri, May 13, 2011 at 2:37 PM, <xi...@apache.org> wrote:
> Author: xiaming
> Date: Fri May 13 06:37:22 2011
> New Revision: 1102576
>
> URL: http://svn.apache.org/viewvc?rev=1102576&view=rev
> Log:
> GERONIMO-5738 user principal should be set to null when logout, fix
> provided by Shenghao Fang
>
> Modified:
>
> geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
>
> geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
>
> geronimo/server/trunk/plugingroups/javaee6-web-jetty/src/main/history/dependencies.xml
>
> geronimo/server/trunk/plugingroups/javaee6-web-tomcat/src/main/history/dependencies.xml
>
> geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
>
> geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/history/dependencies.xml
>
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
>
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
>
> geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
>
> geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml
>
> geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java
>
> geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
>
> Modified:
> geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml?rev=1102576&r1=1102575&r2=1102576&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
> Fri May 13 06:37:22 2011
> @@ -13,6 +13,11 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.plugins</groupId>
> + <artifactId>activemq-console-jetty</artifactId>
> + <type>car</type>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.geronimo.plugins</groupId>
> <artifactId>console-jetty</artifactId>
> <type>car</type>
> </dependency>
>
> Modified:
> geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml?rev=1102576&r1=1102575&r2=1102576&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
> Fri May 13 06:37:22 2011
> @@ -13,6 +13,11 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.plugins</groupId>
> + <artifactId>activemq-console-tomcat</artifactId>
> + <type>car</type>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.geronimo.plugins</groupId>
> <artifactId>console-tomcat</artifactId>
> <type>car</type>
> </dependency>
>
> Modified:
> geronimo/server/trunk/plugingroups/javaee6-web-jetty/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-web-jetty/src/main/history/dependencies.xml?rev=1102576&r1=1102575&r2=1102576&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugingroups/javaee6-web-jetty/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugingroups/javaee6-web-jetty/src/main/history/dependencies.xml
> Fri May 13 06:37:22 2011
> @@ -51,4 +51,9 @@
> <artifactId>ejb</artifactId>
> <type>car</type>
> </dependency>
> + <dependency>
> + <groupId>org.apache.geronimo.plugins</groupId>
> + <artifactId>plancreator-console-jetty</artifactId>
> + <type>car</type>
> + </dependency>
> </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/plugingroups/javaee6-web-tomcat/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-web-tomcat/src/main/history/dependencies.xml?rev=1102576&r1=1102575&r2=1102576&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugingroups/javaee6-web-tomcat/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugingroups/javaee6-web-tomcat/src/main/history/dependencies.xml
> Fri May 13 06:37:22 2011
> @@ -51,4 +51,9 @@
> <artifactId>ejb</artifactId>
> <type>car</type>
> </dependency>
> + <dependency>
> + <groupId>org.apache.geronimo.plugins</groupId>
> + <artifactId>plancreator-console-tomcat</artifactId>
> + <type>car</type>
> + </dependency>
> </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=1102576&r1=1102575&r2=1102576&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
> Fri May 13 06:37:22 2011
> @@ -17,6 +17,16 @@
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>commons-dbcp</groupId>
> + <artifactId>commons-dbcp</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>commons-pool</groupId>
> + <artifactId>commons-pool</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.apache.aries</groupId>
> <artifactId>org.apache.aries.util</artifactId>
> <type>jar</type>
> @@ -382,6 +392,11 @@
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>org.beanshell</groupId>
> + <artifactId>bsh</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.codehaus.swizzle</groupId>
> <artifactId>swizzle-stream</artifactId>
> <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/history/dependencies.xml?rev=1102576&r1=1102575&r2=1102576&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/corba/openejb-corba-deployer/src/main/history/dependencies.xml
> Fri May 13 06:37:22 2011
> @@ -26,4 +26,14 @@
> <artifactId>geronimo-corba-builder</artifactId>
> <type>jar</type>
> </dependency>
> + <dependency>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.yoko</groupId>
> + <artifactId>yoko-rmi-impl</artifactId>
> + <type>jar</type>
> + </dependency>
> </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=1102576&r1=1102575&r2=1102576&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> Fri May 13 06:37:22 2011
> @@ -76,9 +76,4 @@
> <artifactId>xbean-bundleutils</artifactId>
> <type>jar</type>
> </dependency>
> - <dependency>
> - <groupId>org.apache.xbean</groupId>
> - <artifactId>xbean-finder</artifactId>
> - <type>jar</type>
> - </dependency>
> </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=1102576&r1=1102575&r2=1102576&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> Fri May 13 06:37:22 2011
> @@ -137,13 +137,13 @@
> <type>jar</type>
> </dependency>
> <dependency>
> - <groupId>org.apache.xbean</groupId>
> - <artifactId>xbean-finder</artifactId>
> + <groupId>org.apache.yoko</groupId>
> + <artifactId>yoko-spec-corba</artifactId>
> <type>jar</type>
> </dependency>
> <dependency>
> - <groupId>org.apache.yoko</groupId>
> - <artifactId>yoko-spec-corba</artifactId>
> + <groupId>org.beanshell</groupId>
> + <artifactId>bsh</artifactId>
> <type>jar</type>
> </dependency>
> <dependency>
>
> Modified:
> geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml?rev=1102576&r1=1102575&r2=1102576&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
> Fri May 13 06:37:22 2011
> @@ -7,6 +7,11 @@
> <type>car</type>
> </module-id>
> <dependency>
> + <groupId>commons-dbcp</groupId>
> + <artifactId>commons-dbcp</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>commons-pool</groupId>
> <artifactId>commons-pool</artifactId>
> <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml?rev=1102576&r1=1102575&r2=1102576&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml
> Fri May 13 06:37:22 2011
> @@ -58,6 +58,11 @@
> </dependency>
> <dependency>
> <groupId>org.apache.openwebbeans</groupId>
> + <artifactId>openwebbeans-jsf</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.openwebbeans</groupId>
> <artifactId>openwebbeans-resource</artifactId>
> <type>jar</type>
> </dependency>
>
> Modified:
> geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java?rev=1102576&r1=1102575&r2=1102576&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java
> (original)
> +++
> geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java
> Fri May 13 06:37:22 2011
> @@ -158,6 +158,7 @@ public class SecurityValve extends Valve
> @Override
> public void logout(Request request) throws ServletException {
> authenticator.logout(request);
> + request.setUserPrincipal(null);
> Session session = request.getSessionInternal(false);
> if (session != null) {
> session.removeNote(CACHED_IDENTITY_KEY);
>
> Modified:
> geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml?rev=1102576&r1=1102575&r2=1102576&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
> Fri May 13 06:37:22 2011
> @@ -57,11 +57,6 @@
> <type>jar</type>
> </dependency>
> <dependency>
> - <groupId>org.apache.geronimo.ext.tomcat</groupId>
> - <artifactId>util</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> <groupId>org.apache.geronimo.framework</groupId>
> <artifactId>geronimo-deployment</artifactId>
> <type>jar</type>
>
>
>