portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r640298 - in /portals/jetspeed-2/portal/trunk/components/jetspeed-portal: ./ src/main/java/org/apache/jetspeed/layout/impl/ src/test/resources/ src/test/resources/webapp/ src/test/resources/webapp/WEB-INF/ src/test/resources/webapp/WEB-INF/...
Date Mon, 24 Mar 2008 03:01:32 GMT
Author: ate
Date: Sun Mar 23 20:01:30 2008
New Revision: 640298

URL: http://svn.apache.org/viewvc?rev=640298&view=rev
Log:
Fixing last portal testcases
All tests now pass again on trunk!

Added:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/jetspeed-production.properties
  (with props)
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/jetspeed.properties
  (with props)
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/override.properties
  (with props)
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/pages/
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/pages/ignore.txt
  (with props)
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/templates/
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/templates/ignore.txt
  (with props)
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/decorations/
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/decorations/ignore.txt
  (with props)
Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/   (props
changed)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=640298&r1=640297&r2=640298&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Sun Mar 23 20:01:30
2008
@@ -270,6 +270,10 @@
                                         <path>assembly</path>
                                     </resource>
                                     <resource>
+                                        <path>assembly</path>
+                                        <destination>webapp/WEB-INF/assembly</destination>
+                                    </resource>
+                                    <resource>
                                         <path>db-ojb</path>
                                     </resource>
                                     <resource>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java?rev=640298&r1=640297&r2=640298&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java
Sun Mar 23 20:01:30 2008
@@ -42,10 +42,11 @@
        while in trunk the JetspeedSerializer has been refactored largely so it doesn't even
compile.
        Additionally, some related new 2.1.3 features haven't been ported over to trunk yet
either (e.g. r592266 and more)
        Will revisit this class and the JetspeedSerializer enhancements once 2.1.3 is released
-       
+*/       
 public class ExportJetspeedSchema extends BaseGetResourceAction implements
         AjaxAction, AjaxBuilder, Constants
 {
+/*    
 
     protected Log log = LogFactory.getLog(GetFolderAction.class);
 
@@ -65,21 +66,22 @@
     private static final String PREFS = "prefs";
 
     String pathSeprator = System.getProperty("file.separator");
-
+*/
     public ExportJetspeedSchema(String template, String errorTemplate,
             PageManager pageManager,
             PortletActionSecurityBehavior securityBehavior,
-            JetspeedSerializerFactory serializerFactory,
+            JetspeedSerializer serializer,
             String dir)
     {
         super(template, errorTemplate, pageManager, securityBehavior);
-        this.serializerFactory = serializerFactory;
-        this.pageRoot = dir;
+//        this.serializerFactory = serializerFactory;
+//        this.pageRoot = dir;
     }
 
     public boolean run(RequestContext requestContext, Map resultMap)
     {
         boolean success = true;
+        /*        
         String status = "success";
         String userName = requestContext.getUserPrincipal().toString();
         Map settings = new HashMap();
@@ -142,9 +144,10 @@
             // Return a failure indicator
             success = false;
         }
+*/        
         return success;
     }
-
+/*
     private String getDownloadLink(RequestContext requestContext,
             String ObjectName, String userName) throws Exception
     {
@@ -205,5 +208,5 @@
             return pageRoot + pathSeprator + userName;
         }
     }
-}
 */
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Mar 23 20:01:30 2008
@@ -1,2 +1,2 @@
-target
+target
 surefire*.properties

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/jetspeed-production.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/jetspeed-production.properties?rev=640298&view=auto
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/jetspeed-production.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/jetspeed-production.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/jetspeed-production.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/jetspeed.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/jetspeed.properties?rev=640298&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/jetspeed.properties
(added)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/jetspeed.properties
Sun Mar 23 20:01:30 2008
@@ -0,0 +1,19 @@
+supported.portletmode.autoswitch.config = false
+supported.portletmode.autoswitch.edit_defaults = false
+supported.portletmode.autoswitch.config.surrogate.portlet = j2-admin::CustomConfigModePortlet
+
+portal.name = Jetspeed
+portal.version = 2.2-SNAPSHOT
+
+autodeployment.catalina.version.major=5
+autodeployment.catalina.base=${applicationRoot}/../../
+autodeployment.catalina.engine=Catalina
+autodeployment.server=@AUTODEPLOYMENT_SERVER@
+autodeployment.port=8080
+autodeployment.user=@AUTODEPLOYMENT_USER@
+autodeployment.password=@AUTODEPLOYMENT_PASSWORD@
+autodeployment.staging.dir=${applicationRoot}/WEB-INF/deploy
+autodeployment.target.dir=${applicationRoot}/../
+autodeployment.delay=10000
+autodeployment.earlyInit = true
+

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/jetspeed.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/jetspeed.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/jetspeed.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/override.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/override.properties?rev=640298&view=auto
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/override.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/override.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/conf/override.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/pages/ignore.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/pages/ignore.txt?rev=640298&view=auto
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/pages/ignore.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/pages/ignore.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/pages/ignore.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/templates/ignore.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/templates/ignore.txt?rev=640298&view=auto
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/templates/ignore.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/templates/ignore.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/templates/ignore.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/decorations/ignore.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/decorations/ignore.txt?rev=640298&view=auto
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/decorations/ignore.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/decorations/ignore.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/decorations/ignore.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message