portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r721513 - /portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-db-tools/src/main/java/org/apache/jetspeed/tools/page/serializer/JetspeedPageSerializerApplicationImpl.java
Date Fri, 28 Nov 2008 15:00:25 GMT
Author: woonsan
Date: Fri Nov 28 07:00:25 2008
New Revision: 721513

URL: http://svn.apache.org/viewvc?rev=721513&view=rev
Log:
Fixed one more invocation error which Jeroen Hoffman provided before.
Thanks and cheers!

Modified:
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-db-tools/src/main/java/org/apache/jetspeed/tools/page/serializer/JetspeedPageSerializerApplicationImpl.java

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-db-tools/src/main/java/org/apache/jetspeed/tools/page/serializer/JetspeedPageSerializerApplicationImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-db-tools/src/main/java/org/apache/jetspeed/tools/page/serializer/JetspeedPageSerializerApplicationImpl.java?rev=721513&r1=721512&r2=721513&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-db-tools/src/main/java/org/apache/jetspeed/tools/page/serializer/JetspeedPageSerializerApplicationImpl.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-db-tools/src/main/java/org/apache/jetspeed/tools/page/serializer/JetspeedPageSerializerApplicationImpl.java
Fri Nov 28 07:00:25 2008
@@ -68,7 +68,7 @@
         {
             if (args[n].equals("-c"))
                 categories = args[++n];
-            if (args[n].equals("-p"))
+            else if (args[n].equals("-p"))
                 propertyFileName = args[++n];
             else if (args[n].equals("-a"))
                 applicationRootPath = args[++n];
@@ -90,40 +90,40 @@
             {
                 throw new IllegalArgumentException("Unknown argument: " + args[n]);
             }
+        }
         
-            if ((!doImport) && (!doExport))
-            {
-              throw new IllegalArgumentException("Either import or export have to be defined
(-I or -E followed by the rootFolder");
-            }
+        if ((!doImport) && (!doExport))
+        {
+          throw new IllegalArgumentException("Either import or export have to be defined
(-I or -E followed by the rootFolder");
+        }
 
-            if ((doImport) && (doExport))
-            {
-                throw new IllegalArgumentException("Only one - either import or export -
can be requested");
-            }
-            
+        if ((doImport) && (doExport))
+        {
+            throw new IllegalArgumentException("Only one - either import or export - can
be requested");
+        }
+        
 
-            if (categories == null)
-            {
-                throw new IllegalArgumentException("Argument -c defining the assembly categories
filters (or the propertyFile key to it) is required");
-            }
-            
-            if (applicationRootPath == null)
-            {
-                throw new IllegalArgumentException("Argument -a specifying the path to (web)application
root, is required");
-            }
-            Properties initProperties = new Properties();
-            if (psmlPagesPath != null)
-            {
-                initProperties.put("psml.pages.path", psmlPagesPath);
-            }
-            if (doImport)
-            {
-                app.execute(logger, applicationRootPath, categories, propertyFileName, initProperties,
rootFolder, true);
-            }
-            if (doExport)
-            {
-                app.execute(logger, applicationRootPath, categories, propertyFileName, initProperties,
rootFolder, false);
-            }
+        if (categories == null)
+        {
+            throw new IllegalArgumentException("Argument -c defining the assembly categories
filters (or the propertyFile key to it) is required");
+        }
+        
+        if (applicationRootPath == null)
+        {
+            throw new IllegalArgumentException("Argument -a specifying the path to (web)application
root, is required");
+        }
+        Properties initProperties = new Properties();
+        if (psmlPagesPath != null)
+        {
+            initProperties.put("psml.pages.path", psmlPagesPath);
+        }
+        if (doImport)
+        {
+            app.execute(logger, applicationRootPath, categories, propertyFileName, initProperties,
rootFolder, true);
+        }
+        if (doExport)
+        {
+            app.execute(logger, applicationRootPath, categories, propertyFileName, initProperties,
rootFolder, false);
         }
     }            
 



---------------------------------------------------------------------
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