Author: taylor
Date: Wed Nov 25 04:27:13 2015
New Revision: 1716298
URL: http://svn.apache.org/viewvc?rev=1716298&view=rev
Log:
JS2-1344: data migration bug fix from 2.1.3/2.1.4
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/tools/migration/JetspeedRegistryMigration.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java?rev=1716298&r1=1716297&r2=1716298&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java
Wed Nov 25 04:27:13 2015
@@ -76,7 +76,9 @@ public class SecurityConstraintsAction
public boolean run(RequestContext requestContext, Map<String,Object>
resultMap)
throws AJAXException
{
- System.out.println( "SecurityConstraintsAction run" );
+ if (log.isDebugEnabled()) {
+ log.debug("SecurityConstraintsAction run");
+ }
boolean success = true;
String status = "success";
try
@@ -123,13 +125,13 @@ public class SecurityConstraintsAction
}
catch (Exception e)
{
- System.out.println( "SecurityConstraintsAction run failure
caused by " + e.getClass().getName() + " " + e.getMessage() );
- e.printStackTrace();
log.error("exception administering portal permissions", e);
resultMap.put(REASON, e.toString());
success = false;
}
- System.out.println( "SecurityConstraintsAction complete " +
resultMap.toString() );
+ if (log.isDebugEnabled()) {
+ log.debug("SecurityConstraintsAction complete " +
resultMap.toString());
+ }
return success;
}
@@ -163,8 +165,9 @@ public class SecurityConstraintsAction
protected int updateConstraintDefinition(RequestContext requestContext,
Map<String,Object> resultMap)
throws AJAXException
{
- System.out.println( "SecurityConstraintsAction
updateConstraintDefinition started" );
-
+ if (log.isDebugEnabled()) {
+ log.debug("SecurityConstraintsAction updateConstraintDefinition
started");
+ }
int count = 0;
boolean added = false;
String xml = getActionParameter(requestContext, "xml");
@@ -243,8 +246,6 @@ public class SecurityConstraintsAction
}
catch (Exception e)
{
- System.out.println( "SecurityConstraintsAction
updateConstraintDefinition failure caused by " + e.getClass().getName() + " " +
e.getMessage() );
- e.printStackTrace();
log.error( "SecurityConstraintsAction
updateConstraintDefinition failure caused by " + e.getClass().getName() + " " +
e.getMessage(), e );
throw new AJAXException(e);
}
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/tools/migration/JetspeedRegistryMigration.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/tools/migration/JetspeedRegistryMigration.java?rev=1716298&r1=1716297&r2=1716298&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/tools/migration/JetspeedRegistryMigration.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/tools/migration/JetspeedRegistryMigration.java
Wed Nov 25 04:27:13 2015
@@ -16,6 +16,9 @@
*/
package org.apache.jetspeed.tools.migration;
+import org.apache.jetspeed.util.JetspeedLocale;
+import org.apache.jetspeed.util.ojb.LocaleFieldConversion;
+
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -25,9 +28,6 @@ import java.sql.Types;
import java.util.ArrayList;
import java.util.List;
-import org.apache.jetspeed.util.JetspeedLocale;
-import org.apache.jetspeed.util.ojb.LocaleFieldConversion;
-
/**
* Jetspeed Migration for Registry component.
*
@@ -366,7 +366,7 @@ public class JetspeedRegistryMigration i
{
parameterInsertStatement.setInt(1,
parameterResultSet.getInt(1));
parameterInsertStatement.setInt(2,
parameterResultSet.getInt(2));
- parameterInsertStatement.setString(3,
parameterResultSet.getString(3));
+ parameterInsertStatement.setString(3,
"org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl");
//parameterResultSet.getString(3));
parameterInsertStatement.setString(4,
parameterResultSet.getString(4));
parameterInsertStatement.setString(5,
parameterResultSet.getString(5));
parameterInsertStatement.executeUpdate();
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
