You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2009/06/22 21:57:22 UTC
svn commit: r787370 - in
/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE:
applications/j2-admin/src/java/org/apache/jetspeed/portlets/admin/
components/serializer/src/java/org/apache/jetspeed/serializer/
installer/etc/database/
Author: rwatler
Date: Mon Jun 22 19:57:22 2009
New Revision: 787370
URL: http://svn.apache.org/viewvc?rev=787370&view=rev
Log:
JS2-1034: correct installer import invocation args; use non-versioned encoding string so that passwords can be encoded/decoded between J2 versions
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerBase.java
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/build.xml
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java?rev=787370&r1=787369&r2=787370&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java Mon Jun 22 19:57:22 2009
@@ -87,7 +87,7 @@
int refCouter = 0;
- private static String ENCODING_STRING = "JETSPEED 2.1 - 2006";
+ private static String ENCODING_STRING = "JETSPEED-SERIALIZER-ENCODING";
private static String JETSPEED = "JETSPEED";
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerBase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerBase.java?rev=787370&r1=787369&r2=787370&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerBase.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerBase.java Mon Jun 22 19:57:22 2009
@@ -64,7 +64,7 @@
/** current indent for XML files - defaults to tab */
private String currentIndent = null;
- private static String ENCODING_STRING = "JETSPEED 2.1 - 2006";
+ private static String ENCODING_STRING = "JETSPEED-SERIALIZER-ENCODING";
private static String JETSPEED = "JETSPEED";
protected final ComponentManager getCM()
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java?rev=787370&r1=787369&r2=787370&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java Mon Jun 22 19:57:22 2009
@@ -130,7 +130,7 @@
int refCouter = 0;
- private static String ENCODING_STRING = "JETSPEED 2.1 - 2006";
+ private static String ENCODING_STRING = "JETSPEED-SERIALIZER-ENCODING";
private static String JETSPEED = "JETSPEED";
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/build.xml?rev=787370&r1=787369&r2=787370&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/build.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/installer/etc/database/build.xml Mon Jun 22 19:57:22 2009
@@ -184,7 +184,7 @@
<java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes">
<classpath refid="assemblyClasspath"/>
- <arg line="-E "${importDataDir}/j2-data.xml"
+ <arg line="-I "${importDataDir}/j2-data.xml"
-a "${basedir}/../webapps/${portalName}"
-b "file:${basedir}/assembly/boot/"
-c "file:${basedir}/assembly/"
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org