From pluto-scmsandrahenderson@example.org Thu May 12 14:13:28 2005
Return-Path: <pluto-scmsandrahenderson@example.org>
Delivered-To: sandrahenderson@example.org
Received: (qmail 64869 invoked from network); 12 May 2005 14:13:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 12 May 2005 14:13:28 -0000
Received: (qmail 1667 invoked by uid 500); 12 May 2005 14:17:28 -0000
Delivered-To: sandrahenderson@example.org
Received: (qmail 1629 invoked by uid 500); 12 May 2005 14:17:27 -0000
Mailing-List: contact sandrahenderson@example.org; run by ezmlm
Precedence: bulk
list-help: <mailto:sandrahenderson@example.org>
list-unsubscribe: <mailto:sandrahenderson@example.org>
List-Post: <mailto:sandrahenderson@example.org>
List-Id: <pluto-scm.portals.apache.org>
Delivered-To: mailing list sandrahenderson@example.org
Delivered-To: moderator for sandrahenderson@example.org
Received: (qmail 48554 invoked by uid 99); 11 May 2005 23:24:37 -0000
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Message-ID: <sandrahenderson@example.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r169718 -
 /portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletSessionImpl.java
Date: Wed, 11 May 2005 23:20:44 -0000
To: sandrahenderson@example.org
From: sandrahenderson@example.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: taylor
Date: Wed May 11 16:20:44 2005
New Revision: 169718

URL: http://svn.apache.org/viewcvs?rev=3D169718&view=3Drev
Log:
http://issues.apache.org/jira/browse/JS2-254

David P, could you please review and see if it works for you
If yes, I'll close the issue

Thanks

Modified:
    portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/Portl=
etSessionImpl.java

Modified: portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl=
/PortletSessionImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/container/src/java/o=
rg/apache/pluto/core/impl/PortletSessionImpl.java?rev=3D169718&r1=3D169717&=
r2=3D169718&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/Portl=
etSessionImpl.java (original)
+++ portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/Portl=
etSessionImpl.java Wed May 11 16:20:44 2005
@@ -246,7 +246,7 @@
         {
             this.portletContext =3D PortletObjectAccess.getPortletContext(
                                                                        get=
ServletContext(),=20
-                                                                       por=
tletWindow.getPortletEntity().getPortletApplicationEntity().getPortletAppli=
cationDefinition()
+                                                                       por=
tletWindow.getPortletEntity().getPortletDefinition().getPortletApplicationD=
efinition()
                                                                        );
         }
         return this.portletContext;



From pluto-scmsandrahenderson@example.org Thu May 19 20:47:21 2005
Return-Path: <pluto-scmsandrahenderson@example.org>
Delivered-To: sandrahenderson@example.org
Received: (qmail 79432 invoked from network); 19 May 2005 20:47:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 19 May 2005 20:47:20 -0000
Received: (qmail 18218 invoked by uid 500); 19 May 2005 18:54:50 -0000
Delivered-To: sandrahenderson@example.org
Received: (qmail 18148 invoked by uid 500); 19 May 2005 18:54:36 -0000
Mailing-List: contact sandrahenderson@example.org; run by ezmlm
Precedence: bulk
list-help: <mailto:sandrahenderson@example.org>
list-unsubscribe: <mailto:sandrahenderson@example.org>
List-Post: <mailto:sandrahenderson@example.org>
List-Id: <pluto-scm.portals.apache.org>
Delivered-To: mailing list sandrahenderson@example.org
Received: (qmail 17895 invoked by uid 99); 19 May 2005 18:53:57 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155)
  by apache.org (qpsmtpd/0.28) with SMTP; Thu, 19 May 2005 11:53:48 -0700
Received: (qmail 89137 invoked by uid 65534); 19 May 2005 14:51:17 -0000
Message-ID: <sandrahenderson@example.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r170942 - /portals/pluto/trunk
Date: Thu, 19 May 2005 14:51:17 -0000
To: sandrahenderson@example.org
From: sandrahenderson@example.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: cziegeler
Date: Thu May 19 07:51:16 2005
New Revision: 170942

URL: http://svn.apache.org/viewcvs?rev=3D170942&view=3Drev
Log:
Add newWeb.xml to svn:ignore

Modified:
    portals/pluto/trunk/   (props changed)

Propchange: portals/pluto/trunk/
---------------------------------------------------------------------------=
---
--- svn:ignore (original)
+++ svn:ignore Thu May 19 07:51:16 2005
@@ -4,4 +4,5 @@
 *.log
 build.properties
 bin
-LICENSE.tomcat
+LICENSE.tomcat
+newWeb.xml



From pluto-scmsandrahenderson@example.org Thu May 19 21:05:06 2005
Return-Path: <pluto-scmsandrahenderson@example.org>
Delivered-To: sandrahenderson@example.org
Received: (qmail 2072 invoked from network); 19 May 2005 21:05:06 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 19 May 2005 21:05:06 -0000
Received: (qmail 31097 invoked by uid 500); 19 May 2005 20:20:34 -0000
Delivered-To: sandrahenderson@example.org
Received: (qmail 31030 invoked by uid 500); 19 May 2005 20:20:33 -0000
Mailing-List: contact sandrahenderson@example.org; run by ezmlm
Precedence: bulk
list-help: <mailto:sandrahenderson@example.org>
list-unsubscribe: <mailto:sandrahenderson@example.org>
List-Post: <mailto:sandrahenderson@example.org>
List-Id: <pluto-scm.portals.apache.org>
Delivered-To: mailing list sandrahenderson@example.org
Received: (qmail 30997 invoked by uid 99); 19 May 2005 20:20:33 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155)
  by apache.org (qpsmtpd/0.28) with SMTP; Thu, 19 May 2005 13:20:03 -0700
Received: (qmail 88561 invoked by uid 65534); 19 May 2005 14:48:30 -0000
Message-ID: <sandrahenderson@example.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r170941 - /portals/pluto/trunk/descriptors
Date: Thu, 19 May 2005 14:48:30 -0000
To: sandrahenderson@example.org
From: sandrahenderson@example.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: cziegeler
Date: Thu May 19 07:48:29 2005
New Revision: 170941

URL: http://svn.apache.org/viewcvs?rev=3D170941&view=3Drev
Log:
Add target directory to svn:ignore

Modified:
    portals/pluto/trunk/descriptors/   (props changed)

Propchange: portals/pluto/trunk/descriptors/
---------------------------------------------------------------------------=
---
--- svn:ignore (added)
+++ svn:ignore Thu May 19 07:48:29 2005
@@ -0,0 +1 @@
+target



From pluto-scmsandrahenderson@example.org Thu May 19 23:36:50 2005
Return-Path: <pluto-scmsandrahenderson@example.org>
Delivered-To: sandrahenderson@example.org
Received: (qmail 97074 invoked from network); 19 May 2005 23:36:50 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 19 May 2005 23:36:50 -0000
Received: (qmail 78292 invoked by uid 500); 19 May 2005 23:36:26 -0000
Delivered-To: sandrahenderson@example.org
Received: (qmail 78185 invoked by uid 500); 19 May 2005 23:36:26 -0000
Mailing-List: contact sandrahenderson@example.org; run by ezmlm
Precedence: bulk
list-help: <mailto:sandrahenderson@example.org>
list-unsubscribe: <mailto:sandrahenderson@example.org>
List-Post: <mailto:sandrahenderson@example.org>
List-Id: <pluto-scm.portals.apache.org>
Delivered-To: mailing list sandrahenderson@example.org
Received: (qmail 77982 invoked by uid 99); 19 May 2005 23:36:25 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155)
  by apache.org (qpsmtpd/0.28) with SMTP; Thu, 19 May 2005 16:36:20 -0700
Received: (qmail 86573 invoked by uid 65534); 19 May 2005 14:36:14 -0000
Message-ID: <sandrahenderson@example.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r170934 - in /portals/pluto/trunk:
 deploy/src/java/org/apache/pluto/driver/deploy/Deploy.java
 portal/src/java/org/apache/pluto/portlet/admin/controller/ControllerPortlet.java
 portal/src/java/org/apache/pluto/portlet/admin/services/DeployWarService.java
Date: Thu, 19 May 2005 14:36:13 -0000
To: sandrahenderson@example.org
From: sandrahenderson@example.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: cziegeler
Date: Thu May 19 07:36:13 2005
New Revision: 170934

URL: http://svn.apache.org/viewcvs?rev=3D170934&view=3Drev
Log:
Remove unused imports and access static methods directly

Modified:
    portals/pluto/trunk/deploy/src/java/org/apache/pluto/driver/deploy/Depl=
oy.java
    portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/cont=
roller/ControllerPortlet.java
    portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/serv=
ices/DeployWarService.java

Modified: portals/pluto/trunk/deploy/src/java/org/apache/pluto/driver/deplo=
y/Deploy.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/deploy/src/java/org/=
apache/pluto/driver/deploy/Deploy.java?rev=3D170934&r1=3D170933&r2=3D170934=
&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- portals/pluto/trunk/deploy/src/java/org/apache/pluto/driver/deploy/Depl=
oy.java (original)
+++ portals/pluto/trunk/deploy/src/java/org/apache/pluto/driver/deploy/Depl=
oy.java Thu May 19 07:36:13 2005
@@ -17,10 +17,7 @@
 package org.apache.pluto.driver.deploy;
=20
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -37,7 +34,6 @@
 import org.apache.pluto.descriptors.servlet.ServletDD;
 import org.apache.pluto.descriptors.servlet.ServletMappingDD;
 import org.apache.pluto.descriptors.servlet.WebAppDD;
-import org.apache.pluto.driver.deploy.impl.PortletEntityRegistryRegistrarS=
ervice;
=20
 public class Deploy {
=20

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admi=
n/controller/ControllerPortlet.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/=
apache/pluto/portlet/admin/controller/ControllerPortlet.java?rev=3D170934&r=
1=3D170933&r2=3D170934&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/cont=
roller/ControllerPortlet.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/cont=
roller/ControllerPortlet.java Thu May 19 07:36:13 2005
@@ -104,14 +104,14 @@
 			log("Help include: " + _incHelp);
=20
 			//load properties
-			_properties =3D PlutoAdminContext.getInstance().getProperties();
+			_properties =3D PlutoAdminContext.getProperties();
=20
 			//Configure the paths to the container home dir,
 			//	Pluto's dir and the deployment dir. This needs to
 			//	be done before any admin portlets are called.
 			String plutoPath =3D _ctx.getRealPath("");//Path with single slash is a=
lso allowed
 //			String plutoPath =3D null;//for testing
-			PlutoAdminContext.getInstance().parseDeploymentPaths(plutoPath);
+			PlutoAdminContext.parseDeploymentPaths(plutoPath);
 		} catch (Throwable e) {
 			log("Error thrown in ControllerPortlet.init()", e);
 		}

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admi=
n/services/DeployWarService.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/=
apache/pluto/portlet/admin/services/DeployWarService.java?rev=3D170934&r1=
=3D170933&r2=3D170934&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/serv=
ices/DeployWarService.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/serv=
ices/DeployWarService.java Thu May 19 07:36:13 2005
@@ -226,13 +226,13 @@
 	 */
 	private ArrayList createDeploymentArgs(String serverFileName, String temp=
Dir, ActionRequest request, boolean appExists) throws Exception {
 	  	final String METHOD_NAME =3D "createDeploymentArgs(serverFileName,temp=
Dir,request)";
-	  	Properties props =3D PlutoAdminContext.getInstance().getProperties();
-	    final String CONTAINER_HOME =3D  PlutoAdminContext.getInstance().getC=
ontainerHome();
+	  	Properties props =3D PlutoAdminContext.getProperties();
+	    final String CONTAINER_HOME =3D  PlutoAdminContext.getContainerHome()=
;
 	    final String PORTLET_DEPLOY_DIR =3D props.getProperty("portlet-deploy=
-dir");
 =09
 	    ArrayList  args =3D new ArrayList();
-	    args.add(PlutoAdminContext.getInstance().getDeploymentPath());
-	    args.add(PlutoAdminContext.getInstance().getPlutoWebContext());
+	    args.add(PlutoAdminContext.getDeploymentPath());
+	    args.add(PlutoAdminContext.getPlutoWebContext());
 	    args.add(tempDir + PlutoAdminConstants.FS + serverFileName);
 	    //This is probably not used???, but left here to as to not change
 	    //	args indexing used by Deploy class.




{'source': 'Apache Software Foundation Public Mail Archives'}