Commits

kz  committed 38e8b42

CWS-TOOLING: integrate CWS jl131
2009-09-02 16:42:40 +0200 jl r275720 : #i97896#
2009-08-31 13:01:53 +0200 jl r275599 : CWS-TOOLING: rebase CWS jl131 to trunk@275331 (milestone: DEV300:m56)
2009-07-31 14:35:30 +0200 jl r274531 : CWS-TOOLING: rebase CWS jl131 to trunk@274203 (milestone: DEV300:m53)
2009-07-23 14:20:32 +0200 jl r274272 : #i79839# better error text when trying to modify shared layer without having write permission, eg. unopkg add --shared, unopkg remove --shared, unopkg reinstall --shared
2009-07-22 16:38:02 +0200 jl r274252 : #i97896# localize error message for lock file
2009-07-22 16:37:22 +0200 jl r274251 : #i80462# unprecise wording in updatedialog
2009-07-22 16:36:06 +0200 jl r274250 : #i97896# localize error message for lock file
2009-07-22 16:35:20 +0200 jl r274249 : #i97896# localize error message for lock file
2009-07-22 15:07:30 +0200 jl r274242 : #i98873# minimum java version is 1.5 since OOo 3.0

  • Participants
  • Parent commits 84306ab

Comments (0)

Files changed (7)

File desktop/inc/deployment.hrc

 #define RID_STR_UNOPKG_ACCEPT_LIC_Y          (RID_DEPLOYMENT_UNOPKG_START+6)
 #define RID_STR_UNOPKG_ACCEPT_LIC_NO         (RID_DEPLOYMENT_UNOPKG_START+7)
 #define RID_STR_UNOPKG_ACCEPT_LIC_N          (RID_DEPLOYMENT_UNOPKG_START+8)
-#define RID_STR_CONCURRENTINSTANCE           (RID_DEPLOYMENT_UNOPKG_START+9)
+#define RID_STR_UNOPKG_ERROR                 (RID_DEPLOYMENT_UNOPKG_START+9)
+#define RID_STR_CONCURRENTINSTANCE           (RID_DEPLOYMENT_UNOPKG_START+10)
 
 #define RID_DEPLOYMENT_DEPENDENCIES_START    (RID_DEPLOYMENT_START + 4400)
 #define RID_DEPLYOMENT_DEPENDENCIES_UNKNOWN  RID_DEPLOYMENT_DEPENDENCIES_START

File desktop/source/deployment/gui/dp_gui_updatedialog.src

         Text[en-US] = "No descriptions available for this extension.";
     };
     String RID_DLG_UPDATE_NOINSTALL {
-        Text[en-US] = "The extension cannot be installed because:";
+        Text[en-US] = "The extension cannot be updated because:";
     };
     String RID_DLG_UPDATE_NODEPENDENCY {
         Text[en-US] = "Required OpenOffice.org version doesn't match:";

File desktop/source/deployment/manager/dp_manager.cxx

 {
     check();
     if (m_readOnly)
+	{
+		OUString message;
+		if (m_context == OUSTR("shared"))
+			message = OUSTR("You need write permissions to install a shared extension!");
+		else
+			message = OUSTR("You need write permissions to install this extension!");
         throw deployment::DeploymentException(
-            OUSTR("operating on read-only context!"),
-            static_cast<OWeakObject *>(this), Any() );
-    
+            message, static_cast<OWeakObject *>(this), Any() );
+	}
     Reference<XCommandEnvironment> xCmdEnv;
     if (m_xLogFile.is())
         xCmdEnv.set( new CmdEnvWrapperImpl( xCmdEnv_, m_xLogFile ) );
 {
     check();
     if (m_readOnly)
-        throw deployment::DeploymentException(
-            OUSTR("operating on read-only context!"),
-            static_cast<OWeakObject *>(this), Any() );
+	{
+		OUString message;
+		if (m_context == OUSTR("shared"))
+			message = OUSTR("You need write permissions in order to remove a shared extension!");
+		else
+			message = OUSTR("You need write permissions in order to remove this extension!");
+		throw deployment::DeploymentException(
+			message, static_cast<OWeakObject *>(this), Any() );
+	}
     
     Reference<XCommandEnvironment> xCmdEnv;
     if (m_xLogFile.is())
 {
     check();
     if (m_readOnly)
+	{
+		OUString message;
+		if (m_context == OUSTR("shared"))
+			message = OUSTR("You need write permissions in order to install shared extensions!");
+		else
+			message = OUSTR("You need write permissions in order to install extensions!");
         throw deployment::DeploymentException(
-            OUSTR("operating on read-only context!"),
-            static_cast<OWeakObject *>(this), Any() );
+            message, static_cast<OWeakObject *>(this), Any() );
+	}
     
     if (office_is_running())
         throw RuntimeException(

File desktop/source/deployment/unopkg/unopkg.src

 
 String RID_STR_CONCURRENTINSTANCE
 {
-	Text [ en-US ] = "You need to close the already opened Extension Manager to continue.";	
+	Text [ en-US ] = "unopkg cannot be started. The lock file indicates it as already running. "
+        "If this does not apply, delete the lock file at:";
 };
+
+String RID_STR_UNOPKG_ERROR
+{
+    Text [ en-US ] = "ERROR: ";
+};
+

File desktop/source/pkgchk/unopkg/unopkg_app.cxx

     }
     catch (deployment::DeploymentException & exc) 
     {
-        dp_misc::writeConsoleError(
-            OUSTR("\nERROR: ") +
-            exc.Message + OUSTR("\n") +
-            OUSTR("       Cause: ") + 
-            OUString(option_verbose ? ::comphelper::anyToString(exc.Cause): 
-                reinterpret_cast< css::uno::Exception const *>(
-                         exc.Cause.getValue())->Message) +
-            OUSTR("\n"));
+		OUString cause;
+		if (option_verbose)
+		{
+			cause = ::comphelper::anyToString(exc.Cause);
+		}
+		else
+		{
+			css::uno::Exception e;
+			if (exc.Cause >>= e)
+				cause = e.Message; 
+		}
+
+		dp_misc::writeConsoleError(
+            OUSTR("\nERROR: ") + exc.Message + OUSTR("\n"));
+		if (cause.getLength())
+			dp_misc::writeConsoleError(
+				OUSTR("       Cause: ") + cause + OUSTR("\n"));
     }
     catch (LockFileException & e) 
     {

File desktop/source/pkgchk/unopkg/unopkg_misc.cxx

     {
         if (! s_lockfile.check( 0 ))
         {
-            //String sMsg(ResId(RID_STR_CONCURRENTINSTANCE, *DeploymentResMgr::get()));
-            OUString sMsg(RTL_CONSTASCII_USTRINGPARAM(
-                              "unopkg cannot be started. The lock file indicates it as already running. "
-                              "If this does not apply, delete the lock file at:"));	
+            String sMsg(ResId(RID_STR_CONCURRENTINSTANCE, *DeploymentResMgr::get()));
+            //Create this string before we call DeInitVCL, because this will kill
+            //the ResMgr
+            String sError(ResId(RID_STR_UNOPKG_ERROR, *DeploymentResMgr::get())); 
 
             sMsg = sMsg + OUSTR("\n") + getLockFilePath();
 
                 DeInitVCL();
             }
 
-//            String sError(ResId(RID_STR_UNOPKG_ERROR, *DeploymentResMgr::get())); 
             throw LockFileException(
-                OUSTR("\n") + OUSTR("ERROR: ") + sMsg + OUSTR("\n"));
+                OUSTR("\n") + sError + sMsg + OUSTR("\n"));
         }
     }
     

File jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml

  
  <vendorInfos> 
   <vendor name="Sun Microsystems Inc.">
-    <minVersion>1.3.1</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
   <vendor name="The FreeBSD Foundation">
     <minVersion>1.6.0</minVersion>
   </vendor>
   <vendor name="Free Software Foundation, Inc.">
-    <minVersion>1.4.2</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
  </vendorInfos>