taylor 2002/07/28 19:25:28
Modified: src/java/org/apache/jetspeed/modules/actions/portlets/browser
DatabaseBrowserAction.java
src/java/org/apache/jetspeed/om/dbpsml/map
JetspeedGroupProfileMapBuilder.java
JetspeedRoleProfileMapBuilder.java
JetspeedUserProfileMapBuilder.java
src/java/org/apache/jetspeed/portal
JetspeedPortletInstance.java
src/java/org/apache/jetspeed/services/psmlmanager
CastorPsmlManagerService.java PsmlImporter.java
src/java/org/apache/jetspeed/services/psmlmanager/db
DatabasePsmlManagerService.java
src/java/org/apache/jetspeed/services/rundata
DefaultJetspeedRunData.java
src/java/org/apache/jetspeed/util/template JetspeedTool.java
webapp/WEB-INF/conf JetspeedSecurity.properties
Log:
- PSML Importer now updates if it fails to create
- Added option to PSML Importer to check for existing input (optional)
- Cleaned up error msgs, null pointer checks
Revision Changes Path
1.22 +2 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser/DatabaseBrowserAction.java
Index: DatabaseBrowserAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser/DatabaseBrowserAction.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DatabaseBrowserAction.java 28 Jun 2002 05:37:29 -0000 1.21
+++ DatabaseBrowserAction.java 29 Jul 2002 02:25:27 -0000 1.22
@@ -205,7 +205,7 @@
}
else
{
- Log.error("The sql query is null, hence not generating the
result set.");
+ Log.info("The sql query is null, hence not generating the
result set.");
}
}
else
1.10 +1 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedGroupProfileMapBuilder.java
Index: JetspeedGroupProfileMapBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedGroupProfileMapBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JetspeedGroupProfileMapBuilder.java 26 Jul 2002 01:47:20 -0000 1.9
+++ JetspeedGroupProfileMapBuilder.java 29 Jul 2002 02:25:27 -0000 1.10
@@ -11,7 +11,7 @@
/**
* This class was autogenerated by Torque on:
*
- * [Wed Jul 24 09:58:29 PDT 2002]
+ * [Thu Jul 25 18:56:56 PDT 2002]
*
*/
public class JetspeedGroupProfileMapBuilder implements MapBuilder
1.10 +1 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedRoleProfileMapBuilder.java
Index: JetspeedRoleProfileMapBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedRoleProfileMapBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JetspeedRoleProfileMapBuilder.java 26 Jul 2002 01:47:20 -0000 1.9
+++ JetspeedRoleProfileMapBuilder.java 29 Jul 2002 02:25:27 -0000 1.10
@@ -11,7 +11,7 @@
/**
* This class was autogenerated by Torque on:
*
- * [Wed Jul 24 09:58:29 PDT 2002]
+ * [Thu Jul 25 18:56:56 PDT 2002]
*
*/
public class JetspeedRoleProfileMapBuilder implements MapBuilder
1.10 +1 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedUserProfileMapBuilder.java
Index: JetspeedUserProfileMapBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedUserProfileMapBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JetspeedUserProfileMapBuilder.java 26 Jul 2002 01:47:20 -0000 1.9
+++ JetspeedUserProfileMapBuilder.java 29 Jul 2002 02:25:27 -0000 1.10
@@ -11,7 +11,7 @@
/**
* This class was autogenerated by Torque on:
*
- * [Wed Jul 24 09:58:29 PDT 2002]
+ * [Thu Jul 25 18:56:56 PDT 2002]
*
*/
public class JetspeedUserProfileMapBuilder implements MapBuilder
1.4 +6 -4
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/JetspeedPortletInstance.java
Index: JetspeedPortletInstance.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/JetspeedPortletInstance.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JetspeedPortletInstance.java 24 Jul 2002 03:21:17 -0000 1.3
+++ JetspeedPortletInstance.java 29 Jul 2002 02:25:27 -0000 1.4
@@ -126,9 +126,11 @@
this.profile = profile;
- doc = profile.getDocument();
-
- entry = doc.getEntryById(portlet.getID());
+ if (profile != null)
+ {
+ doc = profile.getDocument();
+ entry = doc.getEntryById(portlet.getID());
+ }
}
1.28 +10 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java
Index: CastorPsmlManagerService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- CastorPsmlManagerService.java 26 Jul 2002 01:47:21 -0000 1.27
+++ CastorPsmlManagerService.java 29 Jul 2002 02:25:27 -0000 1.28
@@ -1242,7 +1242,15 @@
}
catch (Exception ex)
{
- Log.error("Failed to export profiles to DB: " + profile, ex );
+ try
+ {
+ consumer.store(profile);
+ count++;
+ }
+ catch (Exception e)
+ {
+ Log.error("Failed to export profiles to DB: " + profile, ex
);
+ }
}
}
}
1.13 +26 -5
jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/PsmlImporter.java
Index: PsmlImporter.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/PsmlImporter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PsmlImporter.java 26 Jul 2002 01:47:21 -0000 1.12
+++ PsmlImporter.java 29 Jul 2002 02:25:27 -0000 1.13
@@ -86,6 +86,8 @@
*/
public class PsmlImporter
{
+ protected boolean check = true;
+
public PsmlImporter()
{
}
@@ -93,7 +95,8 @@
public static void main(String args[])
{
System.out.println("***** PSML Importer *****");
-
+ boolean checkImport = true;
+
//
// initialize and bootstrap services
//
@@ -103,11 +106,18 @@
String properties = "/WEB-INF/conf/TurbineResources.properties";
if (args.length > 0)
{
- root = args[0];
+ if (args[0].equalsIgnoreCase("true"))
+ checkImport = true;
+ else
+ checkImport = false;
}
if (args.length > 1)
{
- properties = args[1];
+ root = args[1];
+ }
+ if (args.length > 2)
+ {
+ properties = args[2];
}
TurbineConfig config = new TurbineConfig( root, properties);
config.init();
@@ -165,6 +175,7 @@
}
PsmlImporter importer = new PsmlImporter();
+ importer.setCheck(checkImport);
boolean ran = importer.run(exporterService, importerService);
if (ran)
@@ -183,7 +194,7 @@
int count = 0;
try
{
- if (alreadyImported())
+ if (check && alreadyImported())
return false;
msg = "Running with Importer Service: " + importerService.getClass();
@@ -246,6 +257,16 @@
System.out.println(msg + e.toString());
return true;
}
+ }
+
+ public void setCheck(boolean check)
+ {
+ this.check = check;
+ }
+
+ public boolean getCheck()
+ {
+ return this.check;
}
}
1.21 +10 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java
Index: DatabasePsmlManagerService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DatabasePsmlManagerService.java 26 Jul 2002 01:47:21 -0000 1.20
+++ DatabasePsmlManagerService.java 29 Jul 2002 02:25:27 -0000 1.21
@@ -1046,7 +1046,15 @@
}
catch (Exception ex)
{
- Log.error("Failed to export profile to File System: " +
profile, ex);
+ try
+ {
+ consumer.store(profile);
+ count++;
+ }
+ catch (Exception e)
+ {
+ Log.error("Failed to export profile to File System: " +
profile, ex);
+ }
}
}
}
1.15 +2 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/rundata/DefaultJetspeedRunData.java
Index: DefaultJetspeedRunData.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/rundata/DefaultJetspeedRunData.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultJetspeedRunData.java 26 Jul 2002 01:47:21 -0000 1.14
+++ DefaultJetspeedRunData.java 29 Jul 2002 02:25:27 -0000 1.15
@@ -284,7 +284,7 @@
try
{
Object object = this.getUser().getTemp("profile");
- if (object != null)
+ if (object != null && object instanceof Profile)
{
return (Profile)this.getUser().getTemp("profile");
}
1.19 +9 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java
Index: JetspeedTool.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- JetspeedTool.java 14 May 2002 06:32:59 -0000 1.18
+++ JetspeedTool.java 29 Jul 2002 02:25:27 -0000 1.19
@@ -144,6 +144,7 @@
public ConcreteElement getPane(String name)
{
ConcreteElement result = null;
+ String msg = "";
if (null != rundata)
{
@@ -153,6 +154,10 @@
if (null == profile)
{
profile = Profiler.getProfile(rundata);
+ if (profile == null)
+ {
+ throw new ProfileException("Profile not found.");
+ }
rundata.setProfile(profile);
}
@@ -170,12 +175,14 @@
catch (Exception e)
{
Log.error(e);
+ msg = e.getMessage();
}
+
}
if (result == null)
{
- result = new StringElement("Error fetching pane");
+ result = new StringElement("Error retrieving Portal Page: " + msg);
}
return result;
1.24 +0 -0 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties
Index: JetspeedSecurity.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
