portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r643962 - in /portals/jetspeed-2/applications/j2-admin/trunk: pom.xml src/java/ src/main/ src/main/java/ src/main/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java
Date Wed, 02 Apr 2008 16:34:48 GMT
Author: ddam
Date: Wed Apr  2 09:34:47 2008
New Revision: 643962

URL: http://svn.apache.org/viewvc?rev=643962&view=rev
Log:
- move source folder to default Maven 2 source folder
- disable serializer in JetspeedDataImporter (replace later with new serializer)

Added:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/
      - copied from r643945, portals/jetspeed-2/applications/j2-admin/trunk/src/java/
Removed:
    portals/jetspeed-2/applications/j2-admin/trunk/src/java/
Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java

Modified: portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/pom.xml?rev=643962&r1=643961&r2=643962&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/pom.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/pom.xml Wed Apr  2 09:34:47 2008
@@ -352,10 +352,9 @@
 
     <build>
         <finalName>j2-admin</finalName>
-        <sourceDirectory>${basedir}/src/java</sourceDirectory>
         <resources>
             <resource>
-            <directory>${basedir}/src/java</directory>
+            <directory>${basedir}/src/main/java</directory>
             <includes>
                 <include>**/*.properties</include>
                 <include>**/*.html</include>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java?rev=643962&r1=643945&r2=643962&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java
Wed Apr  2 09:34:47 2008
@@ -24,8 +24,8 @@
 import org.apache.jetspeed.security.GroupManager;
 import org.apache.jetspeed.security.RoleManager;
 import org.apache.jetspeed.security.UserManager;
-import org.apache.jetspeed.serializer.JetspeedSerializer;
-import org.apache.jetspeed.serializer.JetspeedSerializerFactory;
+//import org.apache.jetspeed.serializer.JetspeedSerializer;
+//import org.apache.jetspeed.serializer.JetspeedSerializerFactory;
 import org.apache.portals.gems.dojo.AbstractDojoVelocityPortlet;
 
 /**
@@ -75,7 +75,7 @@
 
     private static String JETSPEED = "JETSPEED";
     
-    protected JetspeedSerializerFactory serializerFactory;    
+    // protected JetspeedSerializerFactory serializerFactory;    
 
     protected void includeHeaderContent(HeaderResource headerResource)
     {
@@ -137,6 +137,7 @@
                     "Failed to find the Group Manager on SiteViewController initialization");
             throw new RuntimeException(pe);
         }
+        /*
         serializerFactory = (JetspeedSerializerFactory) getPortletContext().getAttribute(
                 CommonPortletServices.CPS_JETSPEED_SERIALIZER_FACTORY);
         if (null == serializerFactory)
@@ -145,7 +146,7 @@
                     "Failed to find the SerializerFactory on SiteViewController initialization");
             throw new RuntimeException(pe);
         }
-        
+        */
     }
 
     public void doView(RenderRequest request, RenderResponse response)
@@ -219,7 +220,9 @@
 
     private boolean importJetspeedData(String filePath)
     {
-        try
+        /*
+         *  TODO : replace SerializerFactory with newer (to be built) version
+         try
         {
             Map settings = new HashMap();
             settings.put(JetspeedSerializer.KEY_PROCESS_USERS, Boolean.TRUE);
@@ -248,7 +251,9 @@
         {
             return false;
         }
-
+* 
+         */
+    	return false;
     }
 
     private boolean cleanUserFolder(String userName)



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