Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 71722 invoked from network); 22 Jun 2009 19:57:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Jun 2009 19:57:37 -0000 Received: (qmail 46182 invoked by uid 500); 22 Jun 2009 19:57:48 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 46132 invoked by uid 500); 22 Jun 2009 19:57:47 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 45892 invoked by uid 99); 22 Jun 2009 19:57:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jun 2009 19:57:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jun 2009 19:57:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BF4192388893; Mon, 22 Jun 2009 19:57:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Mon, 22 Jun 2009 19:57:22 -0000 To: jetspeed-dev@portals.apache.org From: rwatler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090622195722.BF4192388893@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ -