Author: jaydm
Date: Tue Feb 19 17:52:12 2008
New Revision: 629312
URL: http://svn.apache.org/viewvc?rev=629312&view=rev
Log:
GERONIMO-3855
Replace pinned copy of Pluto to stop the exception that is being thrown
whenever the admin console is being accessed over https and a two (or
more)
page deep portlet is accessed.
Added:
geronimo/server/branches/2.1/repository/org/apache/pluto/1.2.0-G601061.README.TXT
geronimo/server/branches/2.1/repository/org/apache/pluto/geronimo-3855.patch
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-container/1.2.0-G601061/
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-container/1.2.0-G601061/pluto-container-1.2.0-G601061.jar
(with props)
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-descriptor-api/1.2.0-G601061/
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-descriptor-api/1.2.0-G601061/pluto-descriptor-api-1.2.0-G601061.jar
(with props)
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-descriptor-impl/1.2.0-G601061/
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-descriptor-impl/1.2.0-G601061/pluto-descriptor-impl-1.2.0-G601061.jar
(with props)
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-portal-driver/1.2.0-G601061/
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-portal-driver/1.2.0-G601061/pluto-portal-driver-1.2.0-G601061.jar
(with props)
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-taglib/1.2.0-G601061/
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-taglib/1.2.0-G601061/pluto-taglib-1.2.0-G601061.jar
(with props)
Removed:
geronimo/server/branches/2.1/repository/org/apache/pluto/1.2.0-G601060.README.TXT
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-container/1.2.0-G601060/
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-descriptor-api/1.2.0-G601060/
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-descriptor-impl/1.2.0-G601060/
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-portal-driver-impl/1.2.0-G601060/
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-portal-driver/1.2.0-G601060/
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-taglib/1.2.0-G601060/
Modified:
geronimo/server/branches/2.1/pom.xml
Modified: geronimo/server/branches/2.1/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=629312&r1=629311&r2=629312&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Tue Feb 19 17:52:12 2008
@@ -97,7 +97,7 @@
<axis2Version>1.3</axis2Version>
<axiomVersion>1.2.5</axiomVersion>
<springVersion>2.0.5</springVersion>
- <plutoVersion>1.2.0-G601060</plutoVersion>
+ <plutoVersion>1.2.0-G601061</plutoVersion>
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car</gbeanDeployerBootstrap>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
Added:
geronimo/server/branches/2.1/repository/org/apache/pluto/1.2.0-G601061.README.TXT
URL:
http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/pluto/1.2.0-G601061.README.TXT?rev=629312&view=auto
==============================================================================
---
geronimo/server/branches/2.1/repository/org/apache/pluto/1.2.0-G601061.README.TXT
(added)
+++
geronimo/server/branches/2.1/repository/org/apache/pluto/1.2.0-G601061.README.TXT
Tue Feb 19 17:52:12 2008
@@ -0,0 +1,33 @@
+Private Build of Pluto for
Geronimo. +
+How to build Pluto 1.2.0 (w/ local modification to disable throwing
of PortletSecurityException) for Geronimo:
+
+Checkout pluto 1.2.0
+ svn co -r 601061
https://svn.apache.org/repos/asf/portals/pluto/trunk pluto
+
+svn info for Pluto image:
+Path: .
+URL: http://svn.apache.org/repos/asf/portals/pluto/trunk
+Repository Root: http://svn.apache.org/repos/asf
+Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
+Revision: 601061
+Node Kind: directory
+Schedule: normal
+Last Changed Author: cdoremus
+Last Changed Rev: 586586
+Last Changed Date: 2007-10-19 14:33:58 -0500 (Fri, 19 Oct 2007)
+
+Build pluto
+ cd pluto
+ patch -Np0 -i geronimo-3855.patch
+ mvn install
+
+Copy to appropriate jars and rename into geronimo/repository
+ cd pluto
+ cp
pluto-container/target/pluto-container-1.2.0-SNAPSHOT.jar
<geronimo-root>/repository/org/apache/pluto/pluto-container/1.2.0-G601061/pluto-container-1.2.0-G601061.jar
+ cp
pluto-descriptor-api/target/pluto-descriptor-api-1.2.0-SNAPSHOT.jar
<geronimo-root>/repository/org/apache/pluto/pluto-descriptor-api/1.2.0-G601061/pluto-descriptor-api-1.2.0-G601061.jar
+ cp
pluto-descriptor-impl/target/pluto-descriptor-impl-1.2.0-SNAPSHOT.jar
<geronimo-root>/repository/org/apache/pluto/pluto-descriptor-impl/1.2.0-G601061/pluto-descriptor-impl-1.2.0-G601061.jar
+ cp
pluto-portal-driver/target/pluto-portal-driver-1.2.0-SNAPSHOT.jar
<geronimo-root>/repository/org/apache/pluto/pluto-portal-driver/1.2.0-G601061/pluto-portal-driver-1.2.0-G601061.jar
+ cp
pluto-portal-driver-impl/target/pluto-portal-driver-impl-1.2.0-SNAPSHOT.jar
<geronimo-root>/repository/org/apache/pluto/pluto-portal-driver-impl/1.2.0-G601061/pluto-portal-driver-impl-1.2.0-G601061.jar
+ cp
pluto-taglib/target/pluto-taglib-1.2.0-SNAPSHOT.jar
<geronimo-root>/repository//org/apache/pluto/pluto-taglib/1.2.0-G601061/pluto-taglib-1.2.0-G601061.jar
+
Added:
geronimo/server/branches/2.1/repository/org/apache/pluto/geronimo-3855.patch
URL:
http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/pluto/geronimo-3855.patch?rev=629312&view=auto
==============================================================================
---
geronimo/server/branches/2.1/repository/org/apache/pluto/geronimo-3855.patch
(added)
+++
geronimo/server/branches/2.1/repository/org/apache/pluto/geronimo-3855.patch
Tue Feb 19 17:52:12 2008
@@ -0,0 +1,14 @@
+Index:
pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java
+===================================================================
+---
pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java
(revision 601061)
++++
pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java
(working copy)
+@@ -64,7 +64,8 @@
+ }
+ + public void setSecure() throws PortletSecurityException {
+- throw new PortletSecurityException("No Supported");
++ if (false)
++ throw new PortletSecurityException("No Supported");
+ }
+ + public boolean isSecureSupported() {
Added:
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-container/1.2.0-G601061/pluto-container-1.2.0-G601061.jar
URL:
http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-container/1.2.0-G601061/pluto-container-1.2.0-G601061.jar?rev=629312&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-container/1.2.0-G601061/pluto-container-1.2.0-G601061.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-descriptor-api/1.2.0-G601061/pluto-descriptor-api-1.2.0-G601061.jar
URL:
http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-descriptor-api/1.2.0-G601061/pluto-descriptor-api-1.2.0-G601061.jar?rev=629312&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-descriptor-api/1.2.0-G601061/pluto-descriptor-api-1.2.0-G601061.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-descriptor-impl/1.2.0-G601061/pluto-descriptor-impl-1.2.0-G601061.jar
URL:
http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-descriptor-impl/1.2.0-G601061/pluto-descriptor-impl-1.2.0-G601061.jar?rev=629312&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-descriptor-impl/1.2.0-G601061/pluto-descriptor-impl-1.2.0-G601061.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-portal-driver/1.2.0-G601061/pluto-portal-driver-1.2.0-G601061.jar
URL:
http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-portal-driver/1.2.0-G601061/pluto-portal-driver-1.2.0-G601061.jar?rev=629312&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-portal-driver/1.2.0-G601061/pluto-portal-driver-1.2.0-G601061.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-taglib/1.2.0-G601061/pluto-taglib-1.2.0-G601061.jar
URL:
http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-taglib/1.2.0-G601061/pluto-taglib-1.2.0-G601061.jar?rev=629312&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
geronimo/server/branches/2.1/repository/org/apache/pluto/pluto-taglib/1.2.0-G601061/pluto-taglib-1.2.0-G601061.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
