JBoss Tools SVN: r32680 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: projects/TwoWebContentFolders/src/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-06 19:17:43 -0400 (Wed, 06 Jul 2011)
New Revision: 32680
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean2.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java
Log:
JBIDE-9289
https://issues.jboss.org/browse/JBIDE-9289
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/beans.xml (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/beans.xml 2011-07-06 23:17:43 UTC (rev 32680)
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
+<alternatives>
+ <class>test.AlternativeBean2</class>
+</alternatives>
+</beans>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/beans.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml 2011-07-06 23:08:07 UTC (rev 32679)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml 2011-07-06 23:17:43 UTC (rev 32680)
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:s="urn:java:ee"
- xmlns:test="urn:java:test"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
-
-<test:BeanA>
- <s:Named>myBeanA</s:Named>
-</test:BeanA>
-
-</beans>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java 2011-07-06 23:08:07 UTC (rev 32679)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java 2011-07-06 23:17:43 UTC (rev 32680)
@@ -1,7 +1,9 @@
package test;
import javax.enterprise.inject.Alternative;
+import javax.inject.Named;
+@Named("bean1")
@Alternative
public class AlternativeBean {
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean2.java 2011-07-06 23:17:43 UTC (rev 32680)
@@ -0,0 +1,10 @@
+package test;
+
+import javax.enterprise.inject.Alternative;
+import javax.inject.Named;
+
+@Named("bean2")
+@Alternative
+public class AlternativeBean2 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java 2011-07-06 23:08:07 UTC (rev 32679)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java 2011-07-06 23:17:43 UTC (rev 32680)
@@ -1,10 +0,0 @@
-package test;
-
-public class BeanA {
- String s = "#{myBeanA.s}";
-
- public String getS() {
- return s;
- }
-
-}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java 2011-07-06 23:08:07 UTC (rev 32679)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java 2011-07-06 23:17:43 UTC (rev 32680)
@@ -37,10 +37,15 @@
JobUtils.waitForIdle();
}
- public void testBeansXML() throws CoreException, IOException {
+ public void testBeansXMLInDifferentWebContentFolders() throws CoreException, IOException {
ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
- Set<IBean> bs = cdi.getBeans("myBeanA", false);
+ Set<IBean> bs = cdi.getBeans("bean1", false);
assertEquals(1, bs.size());
+ assertTrue(bs.iterator().next().isSelectedAlternative());
+
+ bs = cdi.getBeans("bean2", false);
+ assertEquals(1, bs.size());
+ assertTrue(bs.iterator().next().isSelectedAlternative());
}
public void tearDown() throws Exception {
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32679 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-07-06 19:08:07 -0400 (Wed, 06 Jul 2011)
New Revision: 32679
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-9305
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-07-06 22:58:53 UTC (rev 32678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-07-06 23:08:07 UTC (rev 32679)
@@ -55,6 +55,7 @@
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.jboss.tools.cdi.internal.core.impl.ClassBean;
+import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.java.IAnnotated;
import org.jboss.tools.common.java.IAnnotationDeclaration;
@@ -113,6 +114,7 @@
public static void disableCDI(IProject project) {
try {
EclipseUtil.removeNatureFromProject(project, CDICoreNature.NATURE_ID);
+ CDICoreValidator.cleanProject(project);
} catch (CoreException e) {
CDICorePlugin.getDefault().logError(e);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-06 22:58:53 UTC (rev 32678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-06 23:08:07 UTC (rev 32679)
@@ -47,6 +47,7 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
import org.eclipse.wst.validation.internal.core.ValidationException;
+import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICoreBuilder;
@@ -388,6 +389,14 @@
}
/**
+ * Removes all the validation problems created by this validator
+ * @param project
+ */
+ public static void cleanProject(IProject project) {
+ WorkbenchReporter.removeAllMessages(project, new String[]{CDICoreValidator.class.getName()}, null);
+ }
+
+ /**
* Validates a resource.
*
* @param file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-06 22:58:53 UTC (rev 32678)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-06 23:08:07 UTC (rev 32679)
@@ -50,6 +50,7 @@
import org.jboss.tools.cdi.core.test.tck.validation.DefenitionErrorsValidationTest;
import org.jboss.tools.cdi.core.test.tck.validation.DependentProjectValidationTest;
import org.jboss.tools.cdi.core.test.tck.validation.DeploymentProblemsValidationTests;
+import org.jboss.tools.cdi.core.test.tck.validation.DisableCDISupportTest;
import org.jboss.tools.cdi.core.test.tck.validation.ELValidationTest;
import org.jboss.tools.test.util.ProjectImportTestSetup;
@@ -122,7 +123,8 @@
new String[]{"CDITestBrokenBuilderOrder"});
suiteAll.addTest(testSetup);
+ suiteAll.addTestSuite(DisableCDISupportTest.class);
+
return suiteAll;
}
-
}
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java 2011-07-06 23:08:07 UTC (rev 32679)
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core.test.tck.validation;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.jboss.tools.cdi.core.CDIUtil;
+import org.jboss.tools.cdi.core.test.tck.TCKTest;
+import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.tests.AbstractResourceMarkerTest;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class DisableCDISupportTest extends ValidationTest {
+
+ protected IProject tckProject;
+
+ /*
+ * (non-Javadoc)
+ * @see junit.framework.TestCase#setUp()
+ */
+ @Override
+ protected void setUp() throws Exception {
+ tckProject = TCKTest.importPreparedProject("/");
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see junit.framework.TestCase#tearDown()
+ */
+ @Override
+ protected void tearDown() throws Exception {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+ tckProject.delete(true, true, null);
+ JobUtils.waitForIdle();
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+
+ /**
+ * https://issues.jboss.org/browse/JBIDE-9305
+ * @throws Exception
+ */
+ public void testRemovingProblemMarkers() throws Exception {
+ IMarker[] markers = tckProject.findMarkers(CDICoreValidator.PROBLEM_TYPE, true, IResource.DEPTH_INFINITE);
+ assertFalse(markers.length==0);
+ CDIUtil.disableCDI(tckProject);
+ markers = tckProject.findMarkers(CDICoreValidator.PROBLEM_TYPE, true, IResource.DEPTH_INFINITE);
+ assertEquals(0, markers.length);
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32678 - in workspace/snjeza/org.jboss.tools.remote.debug.updatesite: features and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-07-06 18:58:53 -0400 (Wed, 06 Jul 2011)
New Revision: 32678
Added:
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/.project
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/artifacts.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/content.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107070055.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107070055.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107070055.jar
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml
Log:
JBIDE-8548 Support auto discovery of remote processes for debugging
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/.project
===================================================================
--- workspace/snjeza/org.jboss.tools.remote.debug.updatesite/.project (rev 0)
+++ workspace/snjeza/org.jboss.tools.remote.debug.updatesite/.project 2011-07-06 22:58:53 UTC (rev 32678)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.remote.debug.updatesite</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.UpdateSiteBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.UpdateSiteNature</nature>
+ </natures>
+</projectDescription>
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/artifacts.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/artifacts.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/content.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/content.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107070055.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/features/org.jboss.tools.remote.debug.feature_1.0.0.201107070055.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107070055.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug.ui_1.0.0.201107070055.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107070055.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/plugins/org.jboss.tools.remote.debug_1.0.0.201107070055.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml
===================================================================
--- workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml (rev 0)
+++ workspace/snjeza/org.jboss.tools.remote.debug.updatesite/site.xml 2011-07-06 22:58:53 UTC (rev 32678)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.jboss.tools.remote.debug.feature_1.0.0.201107070055.jar" id="org.jboss.tools.remote.debug.feature" version="1.0.0.201107070055">
+ <category name="org.jboss.tools.remote.debug"/>
+ </feature>
+ <category-def name="org.jboss.tools.remote.debug" label="JBoss Tools Launching Support"/>
+</site>
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32677 - workspace/snjeza.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-07-06 18:57:26 -0400 (Wed, 06 Jul 2011)
New Revision: 32677
Added:
workspace/snjeza/org.jboss.tools.remote.debug.updatesite/
Log:
Initial import.
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32676 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-07-06 18:23:25 -0400 (Wed, 06 Jul 2011)
New Revision: 32676
Modified:
trunk/build/parent/pom.xml
Log:
fix for parent pom:
1. Removed unnecessary update sites and plugin repositories
2. Changed product that should be started by default and requirement to intsall to org.eclipse.platfrom.ide to avoid sources and documentation downloading during tests
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-07-06 21:55:11 UTC (rev 32675)
+++ trunk/build/parent/pom.xml 2011-07-06 22:23:25 UTC (rev 32676)
@@ -155,12 +155,12 @@
<!-- TODO: add new profile to permit running against JBDS product/application
for JBDS tests, against Eclipse SDK for JBT -->
- <product>org.eclipse.sdk.ide</product>
+ <product>org.eclipse.platform.ide</product>
<application>org.eclipse.ui.ide.workbench</application>
<dependencies>
<dependency>
<type>p2-installable-unit</type>
- <artifactId>org.eclipse.sdk.ide</artifactId>
+ <artifactId>org.eclipse.platform.ide</artifactId>
<version>0.0.0</version>
</dependency>
<!-- http://www.jmock.org/maven.html -->
@@ -246,10 +246,11 @@
<!-- Latest JBT work-in-progress component builds (CI builds), not yet pushed to the above nightly update site -->
+ <!-- disabled by default because it causes local compilation problems -->
<profile>
<id>jbosstools-nightly-staging-composite</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<repositories>
<repository>
@@ -311,10 +312,11 @@
<!-- Contains all the Eclipse.org deps, mirrored onto download.jboss.org.
This is the superset of sites from which the TP is created. Should be
disabled closer to GA so we're only using the TP contents exclusively. -->
+ <!-- deactivated by default, because target platform should be enough to compile everything -->
<profile>
<id>jboss-requirements-composite-mirror</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<repositories>
<repository>
@@ -652,9 +654,10 @@
</build>
</profile>
- <profile>
+ <!-- commented, because group/aitifacts ids generated by this plugin should be adjusted first with approach used in jbosstools/trunk first -->
+ <!-- profile -->
<!-- this plugin is available from https://github.com/nickboldt/maven-plugins/tree/master/unique-GAV-plugin/ -->
- <id>GAV</id>
+ <!-- id>GAV</id>
<build>
<plugins>
<plugin>
@@ -679,39 +682,26 @@
</plugin>
</plugins>
</build>
- </profile>
+ </profile -->
</profiles>
<repositories>
<!-- Single repo containing contents of unified.target, but without using the target file -->
- <repository>
- <id>jbosstools-target-site</id>
- <url>${jbosstools-target-site}</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
-
- <!-- Latest JBT nightly published update site (nightly builds) -->
- <repository>
- <id>jbosstools-nightly</id>
- <url>${jbosstools-nightly}</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
-
<repository>
+ <id>jbosstools-target-site</id>
+ <url>${jbosstools-target-site}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <!-- do not needed because parent pom is not required anymore -->
+ <!-- repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Repository Group</name>
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
@@ -724,9 +714,11 @@
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
- </repository>
+ </repository -->
</repositories>
- <pluginRepositories>
+
+ <!-- commented to check if it is added by default on hudson but with https:// -->
+ <!-- pluginRepositories>
<pluginRepository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Repository Group</name>
@@ -738,7 +730,7 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
- </pluginRepositories>
+ </pluginRepositories -->
<distributionManagement>
<repository>
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32675 - trunk/ws/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-06 17:55:11 -0400 (Wed, 06 Jul 2011)
New Revision: 32675
Modified:
trunk/ws/docs/reference/en-US/Book_Info.xml
Log:
updated for publican
Modified: trunk/ws/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/ws/docs/reference/en-US/Book_Info.xml 2011-07-06 21:54:26 UTC (rev 32674)
+++ trunk/ws/docs/reference/en-US/Book_Info.xml 2011-07-06 21:55:11 UTC (rev 32675)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>2</pubsnumber>
+ <pubsnumber>3</pubsnumber>
<abstract>
<para>The JBoss Web Services User Guide explains how to use the JBoss Web Services module to implement web services in Java.</para>
</abstract>
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32674 - trunk/ws/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-06 17:54:26 -0400 (Wed, 06 Jul 2011)
New Revision: 32674
Modified:
trunk/ws/docs/reference/en-US/Author_Group.xml
trunk/ws/docs/reference/en-US/master.xml
Log:
updated
Modified: trunk/ws/docs/reference/en-US/Author_Group.xml
===================================================================
--- trunk/ws/docs/reference/en-US/Author_Group.xml 2011-07-06 21:53:44 UTC (rev 32673)
+++ trunk/ws/docs/reference/en-US/Author_Group.xml 2011-07-06 21:54:26 UTC (rev 32674)
@@ -1,15 +1,13 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<authorgroup><author><firstname>Denny</firstname><surname>Xu</surname><email>dxu(a)redhat.com</email></author>
- <author><firstname>Grid</firstname><surname>Qian</surname><email>fqian(a)redhat.com</email></author><author>
+<authorgroup><author><firstname>Denny</firstname><surname>Xu</surname></author>
+ <author><firstname>Grid</firstname><surname>Qian</surname></author><author>
<firstname>Brian </firstname>
<surname>Fitzpatrick</surname>
- <email>bfitzpat(a)redhat.com</email>
</author>
<author>
<firstname>Ben </firstname>
<surname>Clare</surname>
- <email>bclare(a)redhat.com</email>
</author>
- <editor><firstname>Isaac</firstname><surname>Rooskov</surname><email>irooskov(a)redhat.com</email></editor></authorgroup>
+ <editor><firstname>Isaac</firstname><surname>Rooskov</surname></editor></authorgroup>
Modified: trunk/ws/docs/reference/en-US/master.xml
===================================================================
--- trunk/ws/docs/reference/en-US/master.xml 2011-07-06 21:53:44 UTC (rev 32673)
+++ trunk/ws/docs/reference/en-US/master.xml 2011-07-06 21:54:26 UTC (rev 32674)
@@ -28,31 +28,29 @@
</imageobject>
</inlinemediaobject>
</corpauthor>
- <author><firstname>Denny</firstname><surname>Xu</surname><email>dxu(a)redhat.com</email></author>
+ <author><firstname>Denny</firstname><surname>Xu</surname></author>
<author>
<firstname>Grid</firstname>
<surname>Qian</surname>
- <email>fqian(a)redhat.com</email>
</author>
<author>
<firstname>Brian </firstname>
<surname>Fitzpatrick</surname>
- <email>bfitzpatrick(a)redhat.com</email>
</author>
<author>
<firstname>Ben </firstname>
<surname>Clare</surname>
- <email>bclare(a)redhat.com</email>
</author>
-
+ <editor>
+ <firstname>Isaac</firstname>
+ <surname>Rooskov</surname>
+ </editor>
<copyright>
- <year>2008</year>
- <year>2009</year>
- <year>2010</year>
+ <year>2011</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 3.2.0.GA
+ Version: 3.2.1.GA
</releaseinfo>
<!--<abstract>
<title/>
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32673 - trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-07-06 17:53:44 -0400 (Wed, 06 Jul 2011)
New Revision: 32673
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
Log:
adjusted max xulrunner version from 1.9.2.16 to 1.9.2.19 to test if new version of xulrunner downloaded from mozilla nightly build area fixed the RHEL5 x86_64 problems
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2011-07-06 21:24:34 UTC (rev 32672)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2011-07-06 21:53:44 UTC (rev 32673)
@@ -56,7 +56,7 @@
public class XulRunnerBrowser implements nsIWebBrowserChrome,
nsIWebProgressListener, nsITooltipListener {
private static final String XULRUNNER_LOWER_VERSION = "1.9.1.0"; //$NON-NLS-1$
- private static final String XULRUNNER_HIGHER_VERSION = "1.9.2.16"; //$NON-NLS-1$
+ private static final String XULRUNNER_HIGHER_VERSION = "1.9.2.19"; //$NON-NLS-1$
// TODO Sergey Vasilyev Think. May be XULRUNNER_BUNDLE shouldn't be final?
private static final String XULRUNNER_BUNDLE;
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32672 - trunk/xulrunner/features/org.mozilla.xulrunner.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-07-06 17:24:34 -0400 (Wed, 06 Jul 2011)
New Revision: 32672
Modified:
trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml
Log:
fix version in pom.xml to match manifest.mf
Modified: trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml
===================================================================
--- trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml 2011-07-06 21:15:18 UTC (rev 32671)
+++ trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml 2011-07-06 21:24:34 UTC (rev 32672)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.xulrunner.features</groupId>
<artifactId>org.mozilla.xulrunner.feature</artifactId>
- <version>1.9.216-SNAPSHOT</version>
+ <version>1.9.218-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32671 - in trunk/xulrunner: plugins/org.mozilla.xulrunner.gtk.linux.x86_64 and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-07-06 17:15:18 -0400 (Wed, 06 Jul 2011)
New Revision: 32671
Added:
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/Throbber-small.gif
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/crashreporter
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/crashreporter.ini
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/modules/CrashSubmit.jsm
Removed:
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/plugins/libunixprintplugin.so
Modified:
trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/chrome/classic.jar
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/chrome/comm.jar
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/chrome/en-US.jar
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/chrome/pippki.jar
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/chrome/toolkit.jar
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/jsconsole-clhandler.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/libdbusservice.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/libimgicon.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/libmozgnome.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/libnkgnomevfs.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsAddonRepository.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsBlocklistService.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsDefaultCLH.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsExtensionManager.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsFilePicker.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsHelperAppDlg.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsLivemarkService.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsSearchService.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsURLFormatter.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsUpdateService.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsUpdateServiceStub.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsUpdateTimerManager.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsXULAppInstall.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/defaults/pref/xulrunner.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/greprefs/all.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/greprefs/security-prefs.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/javaxpcom.jar
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libfreebl3.chk
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libfreebl3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libjavaxpcomglue.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libmozjs.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libnspr4.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libnss3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libnssckbi.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libnssdbm3.chk
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libnssdbm3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libnssutil3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libplc4.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libplds4.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libsmime3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libsoftokn3.chk
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libsoftokn3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libsqlite3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libssl3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libxpcom.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libxul.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/modules/debug.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/modules/utils.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/mozilla-xremote-client
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/nspr-config
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/platform.ini
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/plugin-container
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/plugins/
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/run-mozilla.sh
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/updater
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xpcshell
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xpidl
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xpt_dump
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xpt_link
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xulrunner
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xulrunner-bin
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xulrunner-stub
Log:
Xulrunner for Linux x86_64 replaced with nightly 1.9.2.19pre build from http://ftp.mozilla.org/pub/mozilla.org/xulrunner/nightly/latest-mozilla-1... to test if it solves problem on x86_64 bit hudson
verified this on unbuntu 11.04 x86_64 and redhat 5.6 x86_64
Modified: trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
===================================================================
--- trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2011-07-06 21:15:18 UTC (rev 32671)
@@ -2,7 +2,7 @@
<feature
id="org.mozilla.xulrunner.feature"
label="XulRunner Feature"
- version="1.9.216.qualifier"
+ version="1.9.218.qualifier"
provider-name="JBoss by Red Hat"
os="linux,macosx,win32"
ws="cocoa,gtk,win32"
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF 2011-07-06 21:15:18 UTC (rev 32671)
@@ -3,7 +3,7 @@
Bundle-Name: Mozilla Xulrunner Linux x86_64
Bundle-SymbolicName: org.mozilla.xulrunner.gtk.linux.x86_64;singleton:
=true
-Bundle-Version: 1.9.2.16b
+Bundle-Version: 1.9.2.19pre
Bundle-Vendor: mozilla.org
Eclipse-PlatformFilter: (& (osgi.ws=gtk)(osgi.os=linux)(osgi.arch=x86_64))
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml 2011-07-06 21:15:18 UTC (rev 32671)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools.xulrunner.plugins</groupId>
<artifactId>org.mozilla.xulrunner.gtk.linux.x86_64</artifactId>
- <version>1.9.2.16b</version>
+ <version>1.9.2.19pre</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/Throbber-small.gif
===================================================================
(Binary files differ)
Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/Throbber-small.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/chrome/classic.jar
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/chrome/comm.jar
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/chrome/en-US.jar
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/chrome/pippki.jar
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/chrome/toolkit.jar
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/jsconsole-clhandler.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/jsconsole-clhandler.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/jsconsole-clhandler.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -1,4 +1,4 @@
-//@line 41 "/home/yradtsevich/jboss/192src-copy/toolkit/components/console/jsconsole-clhandler.js"
+//@line 41 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/console/jsconsole-clhandler.js"
const Cc = Components.classes;
const Ci = Components.interfaces;
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/libdbusservice.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/libimgicon.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/libmozgnome.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/libnkgnomevfs.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsAddonRepository.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsAddonRepository.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsAddonRepository.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
-//@line 38 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/extensions/src/nsAddonRepository.js"
+//@line 38 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/extensions/src/nsAddonRepository.js"
*/
const Cc = Components.classes;
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsBlocklistService.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsBlocklistService.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsBlocklistService.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
-//@line 41 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/extensions/src/nsBlocklistService.js"
+//@line 41 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/extensions/src/nsBlocklistService.js"
*/
const Cc = Components.classes;
@@ -64,7 +64,7 @@
catch (e) {
LOG("BlockList Global gABI: XPCOM ABI unknown.");
}
-//@line 113 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/extensions/src/nsBlocklistService.js"
+//@line 113 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/extensions/src/nsBlocklistService.js"
return abi;
});
@@ -495,7 +495,7 @@
},
/**
-//@line 592 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/extensions/src/nsBlocklistService.js"
+//@line 592 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/extensions/src/nsBlocklistService.js"
*/
_loadBlocklistFromFile: function(file) {
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsDefaultCLH.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsDefaultCLH.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsDefaultCLH.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -1,4 +1,4 @@
-//@line 38 "/home/yradtsevich/jboss/192src-copy/toolkit/components/nsDefaultCLH.js"
+//@line 38 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/nsDefaultCLH.js"
const nsISupports = Components.interfaces.nsISupports;
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsExtensionManager.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsExtensionManager.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsExtensionManager.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
-//@line 44 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
+//@line 44 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
*/
//
@@ -1400,7 +1400,7 @@
QueryInterface: XPCOMUtils.generateQI([Ci.nsIInstallLocation])
};
-//@line 1593 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
+//@line 1593 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
/**
* Safely attempt to install or uninstall a given item ID in an install
@@ -2054,7 +2054,7 @@
InstallLocations.put(systemLocation);
}
-//@line 2261 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
+//@line 2261 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
// Register Additional Install Locations
var categoryManager = Cc["@mozilla.org/categorymanager;1"].
@@ -4959,13 +4959,13 @@
// count to 0 to prevent this dialog from being displayed again.
this._downloadCount = 0;
var result;
-//@line 5166 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
+//@line 5166 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
result = this._confirmCancelDownloads(this._downloadCount,
"quitCancelDownloadsAlertTitle",
"quitCancelDownloadsAlertMsgMultiple",
"quitCancelDownloadsAlertMsg",
"dontQuitButtonWin");
-//@line 5178 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
+//@line 5178 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
if (subject instanceof Ci.nsISupportsPRBool)
subject.data = result;
}
@@ -5508,7 +5508,7 @@
_listener : null,
/* ExtensionItemUpdater
-//@line 5746 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
+//@line 5746 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
*/
checkForUpdates: function ExtensionItemUpdater_checkForUpdates(aItems,
aItemCount,
@@ -5692,11 +5692,19 @@
if (aDS.getItemProperty(aItem.id, "compatible") == "false")
itemStatus += ",incompatible";
- if (aDS.getItemProperty(aItem.id, "blocklisted") == "true")
- itemStatus += ",blocklisted";
if (aDS.getItemProperty(aItem.id, "satisfiesDependencies") == "false")
itemStatus += ",needsDependencies";
+ var version = aDS.getItemProperty(aItem.id, "version");
+ if (!gBlocklist)
+ gBlocklist = Cc["@mozilla.org/extensions/blocklist;1"].
+ getService(Ci.nsIBlocklistService);
+ var blockState = gBlocklist.getAddonBlocklistState(aItem.id, version);
+ if (blockState == Ci.nsIBlocklistService.STATE_BLOCKED)
+ itemStatus += ",blocklisted";
+ else if (blockState == Ci.nsIBlocklistService.STATE_SOFTBLOCKED)
+ itemStatus += ",softblocked";
+
aURI = aURI.replace(/%ITEM_ID%/g, aItem.id);
aURI = aURI.replace(/%ITEM_VERSION%/g, aItem.version);
aURI = aURI.replace(/%ITEM_MAXAPPVERSION%/g, aItem.maxAppVersion);
@@ -5907,7 +5915,7 @@
onDatasourceLoaded: function RDFItemUpdater_onDatasourceLoaded(aDatasource, aLocalItem) {
/*
-//@line 6185 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
+//@line 6193 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
*/
if (!aDatasource.GetAllResources().hasMoreElements()) {
LOG("RDFItemUpdater:onDatasourceLoaded: Datasource empty.\r\n" +
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsFilePicker.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsFilePicker.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsFilePicker.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -277,9 +277,9 @@
compMgr.registerFactoryLocation(FILEPICKER_CID,
"FilePicker JS Component",
-//@line 283 "/home/yradtsevich/jboss/192src-copy/toolkit/components/filepicker/src/nsFilePicker.js.in"
+//@line 283 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/filepicker/src/nsFilePicker.js.in"
"",
-//@line 285 "/home/yradtsevich/jboss/192src-copy/toolkit/components/filepicker/src/nsFilePicker.js.in"
+//@line 285 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/filepicker/src/nsFilePicker.js.in"
fileSpec,
location,
type);
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsHelperAppDlg.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsHelperAppDlg.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsHelperAppDlg.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -1,5 +1,5 @@
/*
-//@line 45 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 45 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
*/
///////////////////////////////////////////////////////////////////////////////
@@ -290,7 +290,7 @@
this.makeFileUnique(aLocalFile);
-//@line 354 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 354 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
return aLocalFile;
},
@@ -467,7 +467,7 @@
// want users to be able to autodownload .exe files.
var rememberChoice = this.dialogElement("rememberChoice");
-//@line 549 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 549 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
if (shouldntRememberChoice) {
rememberChoice.checked = false;
rememberChoice.disabled = true;
@@ -607,12 +607,12 @@
// Returns true if opening the default application makes sense.
openWithDefaultOK: function() {
// The checking is different on Windows...
-//@line 699 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 699 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
// On other platforms, default is Ok if there is a default app.
// Note that nsIMIMEInfo providers need to ensure that this holds true
// on each platform.
return this.mLauncher.MIMEInfo.hasDefaultHandler;
-//@line 704 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 704 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
},
// Set "default" application description field.
@@ -633,9 +633,9 @@
// getPath:
getPath: function (aFile) {
-//@line 727 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 727 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
return aFile.path;
-//@line 729 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 729 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
},
// initAppAndSaveToDiskValues:
@@ -677,9 +677,9 @@
otherHandler.setAttribute("path",
this.getPath(this.chosenApp.executable));
-//@line 774 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 774 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
otherHandler.label = this.chosenApp.executable.leafName;
-//@line 776 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 776 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
otherHandler.hidden = false;
}
@@ -867,7 +867,7 @@
// for the file to be saved to to pass to |saveToDisk| - otherwise
// we must ask the user to pick a save name.
-//@line 977 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 977 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
// see @notify
// we cannot use opener's setTimeout, see bug 420405
@@ -922,13 +922,13 @@
// Retrieve the pretty description from the file
getFileDisplayName: function getFileDisplayName(file)
{
-//@line 1039 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 1039 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
return file.leafName;
},
// chooseApp: Open file picker and prompt user for application.
chooseApp: function() {
-//@line 1110 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 1110 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
var nsIFilePicker = Components.interfaces.nsIFilePicker;
var fp = Components.classes["@mozilla.org/filepicker;1"]
.createInstance(nsIFilePicker);
@@ -954,9 +954,9 @@
var otherHandler = this.dialogElement("otherHandler");
otherHandler.removeAttribute("hidden");
otherHandler.setAttribute("path", this.getPath(this.chosenApp.executable));
-//@line 1140 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 1140 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
otherHandler.label = this.chosenApp.executable.leafName;
-//@line 1142 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 1142 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
this.dialogElement("openHandler").selectedIndex = 1;
this.dialogElement("openHandler").setAttribute("lastSelectedItemID", "otherHandler");
@@ -969,7 +969,7 @@
lastSelectedID = "defaultHandler";
openHandler.selectedItem = this.dialogElement(lastSelectedID);
}
-//@line 1155 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 1155 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
},
// Turn this on to get debugging messages.
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsLivemarkService.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsLivemarkService.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsLivemarkService.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -48,7 +48,7 @@
const Ci = Components.interfaces;
const Cr = Components.results;
-//@line 36 "/home/yradtsevich/jboss/192src-copy/toolkit/components/url-classifier/content/moz/lang.js"
+//@line 36 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/url-classifier/content/moz/lang.js"
/**
@@ -128,7 +128,7 @@
this.superClass_ = parentCtor.prototype;
this.prototype = new tempCtor();
}
-//@line 36 "/home/yradtsevich/jboss/192src-copy/toolkit/components/url-classifier/content/moz/observer.js"
+//@line 36 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/url-classifier/content/moz/observer.js"
// A couple of classes to simplify creating observers.
@@ -228,7 +228,7 @@
this.unregister();
}
-//@line 36 "/home/yradtsevich/jboss/192src-copy/toolkit/components/url-classifier/content/moz/alarm.js"
+//@line 36 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/url-classifier/content/moz/alarm.js"
// An Alarm fires a callback after a certain amount of time, or at
@@ -374,7 +374,7 @@
this.cancel();
}
}
-//@line 54 "/home/yradtsevich/jboss/192src-copy/toolkit/components/places/src/nsLivemarkService.js"
+//@line 54 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/places/src/nsLivemarkService.js"
const LS_CLASSID = Components.ID("{dca61eb5-c7cd-4df1-b0fb-d0722baba251}");
const LS_CLASSNAME = "Livemark Service";
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsSearchService.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsSearchService.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsSearchService.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -1,4 +1,4 @@
-//@line 40 "/home/yradtsevich/jboss/192src-copy/toolkit/components/search/nsSearchService.js"
+//@line 40 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/search/nsSearchService.js"
const Ci = Components.interfaces;
const Cc = Components.classes;
@@ -108,9 +108,9 @@
const USER_DEFINED = "{searchTerms}";
// Custom search parameters
-//@line 152 "/home/yradtsevich/jboss/192src-copy/toolkit/components/search/nsSearchService.js"
-const MOZ_OFFICIAL = "unofficial";
-//@line 154 "/home/yradtsevich/jboss/192src-copy/toolkit/components/search/nsSearchService.js"
+//@line 150 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/search/nsSearchService.js"
+const MOZ_OFFICIAL = "official";
+//@line 154 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/search/nsSearchService.js"
const MOZ_DISTRIBUTION_ID = "org.mozilla";
const MOZ_PARAM_LOCALE = /\{moz:locale\}/g;
@@ -203,7 +203,7 @@
consoleService.logStringMessage(aText);
}
-//@line 258 "/home/yradtsevich/jboss/192src-copy/toolkit/components/search/nsSearchService.js"
+//@line 258 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/search/nsSearchService.js"
/**
* Otherwise, don't log at all by default. This can be overridden at startup
@@ -211,7 +211,7 @@
*/
var LOG = function(){};
-//@line 266 "/home/yradtsevich/jboss/192src-copy/toolkit/components/search/nsSearchService.js"
+//@line 266 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/search/nsSearchService.js"
/**
* Presents an assertion dialog in non-release builds and throws.
@@ -3699,7 +3699,7 @@
return gModule;
}
-//@line 44 "/home/yradtsevich/jboss/192src-copy/toolkit/content/debug.js"
+//@line 44 "/builds/slave/m-192-lnx64-xr/build/toolkit/content/debug.js"
var EXPORTED_SYMBOLS = ["NS_ASSERT"];
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsURLFormatter.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsURLFormatter.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsURLFormatter.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -1,4 +1,4 @@
-//@line 37 "/home/yradtsevich/jboss/192src-copy/toolkit/components/urlformatter/src/nsURLFormatter.js"
+//@line 37 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/urlformatter/src/nsURLFormatter.js"
/**
* @class nsURLFormatterService
*
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsUpdateService.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsUpdateService.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsUpdateService.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
-//@line 44 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 44 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
*/
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/FileUtils.jsm");
@@ -40,7 +40,7 @@
const KEY_APPDIR = "XCurProcD";
const KEY_GRED = "GreD";
-//@line 88 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 88 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
const DIR_UPDATES = "updates";
const FILE_UPDATE_STATUS = "update.status";
@@ -116,7 +116,7 @@
catch (e) {
LOG("gABI - XPCOM ABI unknown: updates are not possible.");
}
-//@line 177 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 177 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
return abi;
});
@@ -152,7 +152,7 @@
updateTestFile.remove(false);
updateTestFile.create(NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
updateTestFile.remove(false);
-//@line 286 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 286 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
}
catch (e) {
LOG("gCanApplyUpdates - unable to apply updates. Exception: " + e);
@@ -205,7 +205,7 @@
}
/**
-//@line 348 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 348 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
*/
function getPref(func, preference, defaultValue) {
try {
@@ -235,10 +235,10 @@
}
/**
-//@line 383 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 383 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
*/
function getUpdateDirCreate(pathArray) {
-//@line 394 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 394 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
return FileUtils.getDir(KEY_APPDIR, pathArray, true);
}
@@ -326,7 +326,7 @@
}
/**
-//@line 495 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 495 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
*/
function writeVersionFile(dir, version) {
var versionFile = dir.clone();
@@ -1149,7 +1149,7 @@
}
/**
-//@line 1329 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 1329 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
*/
var neverPrefName = PREF_APP_UPDATE_NEVER_BRANCH + update.extensionVersion;
@@ -1176,7 +1176,7 @@
}
/**
-//@line 1371 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 1371 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
*/
if (update.type == "major") {
LOG("Checker:_selectAndInstallUpdate - prompting because it is a major " +
@@ -1252,7 +1252,7 @@
if (currentAddons.length > 0) {
/**
-//@line 1464 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 1464 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
*/
this._incompatAddonsCount = currentAddons.length;
LOG("UpdateService:_checkAddonCompatibility - checking for " +
@@ -1464,8 +1464,18 @@
// Ensure the Active Update file is loaded
var updates = this._loadXMLFileIntoArray(getUpdateFile(
[FILE_UPDATE_ACTIVE]));
- if (updates.length > 0)
- this._activeUpdate = updates[0];
+ if (updates.length > 0) {
+ // Under some edgecases such as Windows system restore the active-update.xml
+ // will contain a pending update without the status file which will return
+ // STATE_NONE. To recover from this situation clean the updates dir and
+ // rewrite the active-update.xml file without the broken update.
+ if (readStatusFile(getUpdatesDir()) == STATE_NONE) {
+ cleanUpUpdatesDir();
+ this._writeUpdatesToXMLFile([], getUpdateFile([FILE_UPDATE_ACTIVE]));
+ }
+ else
+ this._activeUpdate = updates[0];
+ }
}
UpdateManager.prototype = {
/**
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsUpdateServiceStub.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsUpdateServiceStub.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsUpdateServiceStub.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
-//@line 38 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
+//@line 38 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
*/
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/FileUtils.jsm");
@@ -11,13 +11,13 @@
const FILE_UPDATE_STATUS = "update.status";
const KEY_APPDIR = "XCurProcD";
-//@line 53 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
+//@line 53 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
/**
-//@line 61 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
+//@line 61 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
*/
function getUpdateDirNoCreate(pathArray) {
-//@line 72 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
+//@line 72 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
return FileUtils.getDir(KEY_APPDIR, pathArray, false);
}
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsUpdateTimerManager.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsUpdateTimerManager.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsUpdateTimerManager.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
-//@line 39 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
+//@line 39 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
*/
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -30,7 +30,7 @@
}
/**
-//@line 78 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
+//@line 78 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
*/
function getPref(func, preference, defaultValue) {
try {
@@ -42,7 +42,7 @@
}
/**
-//@line 92 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
+//@line 92 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
*/
function LOG(string) {
if (gLogEnabled) {
@@ -52,7 +52,7 @@
}
/**
-//@line 104 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
+//@line 104 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
*/
function TimerManager() {
getObserverService().addObserver(this, "xpcom-shutdown", false);
@@ -64,7 +64,7 @@
_timer: null,
/**
-//@line 117 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
+//@line 117 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
*/
_timerInterval: null,
@@ -74,7 +74,7 @@
_timers: { },
/**
-//@line 132 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
+//@line 132 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
*/
get _fudge() {
return Math.round(Math.random() * this._timerInterval / 1000);
@@ -111,7 +111,7 @@
Ci.nsITimer.TYPE_REPEATING_SLACK);
},
/**
-//@line 171 "/home/yradtsevich/jboss/192src-copy/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
+//@line 171 "/builds/slave/m-192-lnx64-xr/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
*/
notify: function TM_notify(timer) {
var prefLastUpdate;
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsXULAppInstall.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsXULAppInstall.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/components/nsXULAppInstall.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -1,5 +1,5 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-//@line 41 "/home/yradtsevich/jboss/192src-copy/xulrunner/setup/nsXULAppInstall.js"
+//@line 41 "/builds/slave/m-192-lnx64-xr/build/xulrunner/setup/nsXULAppInstall.js"
const nsIFile = Components.interfaces.nsIFile;
const nsIINIParser = Components.interfaces.nsIINIParser;
@@ -193,13 +193,13 @@
catch (e) { }
if (aDirectory == null) {
-//@line 244 "/home/yradtsevich/jboss/192src-copy/xulrunner/setup/nsXULAppInstall.js"
+//@line 244 "/builds/slave/m-192-lnx64-xr/build/xulrunner/setup/nsXULAppInstall.js"
aDirectory = Components.classes["@mozilla.org/file/local;1"].
createInstance(nsILocalFile);
aDirectory.initWithPath("/usr/lib");
if (vendor)
aDirectory.append(vendor.toLowerCase());
-//@line 251 "/home/yradtsevich/jboss/192src-copy/xulrunner/setup/nsXULAppInstall.js"
+//@line 251 "/builds/slave/m-192-lnx64-xr/build/xulrunner/setup/nsXULAppInstall.js"
}
else {
aDirectory = aDirectory.clone();
@@ -210,9 +210,9 @@
}
if (aLeafName == "") {
-//@line 267 "/home/yradtsevich/jboss/192src-copy/xulrunner/setup/nsXULAppInstall.js"
+//@line 267 "/builds/slave/m-192-lnx64-xr/build/xulrunner/setup/nsXULAppInstall.js"
aLeafName = appName.toLowerCase();
-//@line 270 "/home/yradtsevich/jboss/192src-copy/xulrunner/setup/nsXULAppInstall.js"
+//@line 270 "/builds/slave/m-192-lnx64-xr/build/xulrunner/setup/nsXULAppInstall.js"
}
aDirectory.append(aLeafName);
@@ -220,14 +220,14 @@
aDirectory.create(nsIFile.DIRECTORY_TYPE, 0755);
}
-//@line 341 "/home/yradtsevich/jboss/192src-copy/xulrunner/setup/nsXULAppInstall.js"
+//@line 341 "/builds/slave/m-192-lnx64-xr/build/xulrunner/setup/nsXULAppInstall.js"
extractor.copyTo(aDirectory);
var xulrunnerBinary = getDirectoryKey("GreD");
xulrunnerBinary.append("xulrunner-stub");
xulrunnerBinary.copyTo(aDirectory, appName.toLowerCase() + "");
-//@line 348 "/home/yradtsevich/jboss/192src-copy/xulrunner/setup/nsXULAppInstall.js"
+//@line 348 "/builds/slave/m-192-lnx64-xr/build/xulrunner/setup/nsXULAppInstall.js"
}
};
Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/crashreporter
===================================================================
(Binary files differ)
Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/crashreporter
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/crashreporter.ini
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/crashreporter.ini (rev 0)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/crashreporter.ini 2011-07-06 21:15:18 UTC (rev 32671)
@@ -0,0 +1,56 @@
+# This file is in the UTF-8 encoding
+[Strings]
+# LOCALIZATION NOTE (isRTL):
+# Leave this entry empty unless your language requires right-to-left layout,
+# for example like Arabic, Hebrew, Persian. If your language needs RTL, please
+# use the untranslated English word "yes" as value
+isRTL=
+CrashReporterTitle=Crash Reporter
+# LOCALIZATION NOTE (CrashReporterVendorTitle): %s is replaced with the vendor name. (i.e. "Mozilla")
+CrashReporterVendorTitle=%s Crash Reporter
+# LOCALIZATION NOTE (CrashReporterErrorText): %s is replaced with another string containing detailed information.
+CrashReporterErrorText=The application had a problem and crashed.\n\nUnfortunately the crash reporter is unable to submit a report for this crash.\n\nDetails: %s
+# LOCALIZATION NOTE (CrashReporterProductErrorText2): The first %s is replaced with the product name (i.e. "Firefox"), the second is replaced with another string containing detailed information. These two substitutions can not be reordered!
+CrashReporterProductErrorText2=%s had a problem and crashed.\n\nUnfortunately the crash reporter is unable to submit a crash report.\n\nDetails: %s
+CrashReporterSorry=We're Sorry
+# LOCALIZATION NOTE (CrashReporterDescriptionText2): The %s is replaced with the product name.
+CrashReporterDescriptionText2=%s had a problem and crashed.\n\nTo help us diagnose and fix the problem, you can send us a crash report.
+CrashReporterDefault=This application is run after a crash to report the problem to the application vendor. It should not be run directly.
+Details=Details…
+ViewReportTitle=Report Contents
+CommentGrayText=Add a comment (comments are publicly visible)
+ExtraReportInfo=This report also contains technical information about the state of the application when it crashed.
+# LOCALIZATION NOTE (CheckSendReport): The %s is replaced with the vendor name.
+CheckSendReport=Tell %s about this crash so they can fix it
+CheckIncludeURL=Include the address of the page I was on
+CheckSendEmail=Email me when more information is available
+EmailGrayText=Enter your email address here
+ReportPreSubmit2=Your crash report will be submitted before you quit or restart.
+ReportDuringSubmit2=Submitting your report…
+ReportSubmitSuccess=Report submitted successfully!
+ReportSubmitFailed=There was a problem submitting your report.
+ReportResubmit=Resending reports that previously failed to send…
+# LOCALIZATION NOTE (Quit2): The %s is replaced with the product name.
+Quit2=Quit %s
+# LOCALIZATION NOTE (Restart): The %s is replaced with the product name.
+Restart=Restart %s
+Ok=OK
+Close=Close
+
+# LOCALIZATION NOTE (CrashID): The %s is replaced with the Crash ID from the server, which is a string like abc12345-6789-0abc-def1-23456abcdef1
+CrashID=Crash ID: %s
+# LOCALIZATION NOTE (CrashDetailsURL): The %s is replaced with a URL that the user can visit to view the crash details.
+CrashDetailsURL=You can view details of this crash at %s
+ErrorBadArguments=The application passed an invalid argument.
+ErrorExtraFileExists=The application didn't leave an application data file.
+ErrorExtraFileRead=Couldn't read the application data file.
+ErrorExtraFileMove=Couldn't move application data file.
+ErrorDumpFileExists=The application did not leave a crash dump file.
+ErrorDumpFileMove=Couldn't move crash dump.
+ErrorNoProductName=The application did not identify itself.
+ErrorNoServerURL=The application did not specify a crash reporting server.
+ErrorNoSettingsPath=Couldn't find the crash reporter's settings.
+ErrorCreateDumpDir=Couldn't create pending dump directory.
+# LOCALIZATION NOTE (ErrorEndOfLife): The %s is replaced with the product name.
+ErrorEndOfLife=The version of %s you are using is no longer supported. Crash reports are no longer being accepted for this version. Please consider upgrading to a supported version.
+
Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/crashreporter.ini
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/defaults/pref/xulrunner.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/defaults/pref/xulrunner.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/defaults/pref/xulrunner.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -34,7 +34,7 @@
*
* ***** END LICENSE BLOCK ***** */
-//@line 38 "/home/yradtsevich/jboss/192src-copy/xulrunner/app/xulrunner.js"
+//@line 38 "/builds/slave/m-192-lnx64-xr/build/xulrunner/app/xulrunner.js"
// We need to override the default values of these preferences since all.js
// assumes these are in the navigator package, which for us is non-existant.
@@ -59,7 +59,7 @@
pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager");
pref("xpinstall.dialog.progress.type.skin", "Extension:Manager");
pref("xpinstall.enabled", true);
-//@line 65 "/home/yradtsevich/jboss/192src-copy/xulrunner/app/xulrunner.js"
+//@line 65 "/builds/slave/m-192-lnx64-xr/build/xulrunner/app/xulrunner.js"
pref("browser.preferences.instantApply", true);
-//@line 70 "/home/yradtsevich/jboss/192src-copy/xulrunner/app/xulrunner.js"
+//@line 70 "/builds/slave/m-192-lnx64-xr/build/xulrunner/app/xulrunner.js"
pref("browser.preferences.animateFadeIn", false);
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/greprefs/all.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/greprefs/all.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/greprefs/all.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -59,9 +59,9 @@
pref("browser.bookmarks.max_backups", 5);
pref("browser.cache.disk.enable", true);
-//@line 63 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 63 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
pref("browser.cache.disk.capacity", 51200);
-//@line 67 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 67 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
pref("browser.cache.memory.enable", true);
//pref("browser.cache.memory.capacity", -1);
// -1 = determine dynamically, 0 = none, n = memory capacity in kilobytes
@@ -70,7 +70,7 @@
pref("browser.cache.check_doc_frequency", 3);
pref("browser.cache.offline.enable", true);
-//@line 76 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 76 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
// offline cache capacity in kilobytes
pref("browser.cache.offline.capacity", 512000);
@@ -81,7 +81,7 @@
// the user should be warned if offline app disk usage exceeds this amount
// (in kilobytes)
pref("offline-apps.quota.warn", 51200);
-//@line 92 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 92 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
// Fastback caching - if this pref is negative, then we calculate the number
// of content viewers to cache based on the amount of available memory.
@@ -145,11 +145,11 @@
// Media cache size in kilobytes
pref("media.cache_size", 51200);
-//@line 156 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 156 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
pref("media.ogg.enabled", true);
-//@line 159 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 159 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
pref("media.wave.enabled", true);
-//@line 161 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 161 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
// Whether to autostart a media element with an |autoplay| attribute
pref("media.autoplay.enabled", true);
@@ -162,16 +162,16 @@
pref("gfx.downloadable_fonts.enabled", true);
pref("gfx.downloadable_fonts.sanitize", true);
-//@line 176 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 176 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
pref("gfx.downloadable_fonts.sanitize.preserve_otl_tables", true);
-//@line 178 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 178 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
pref("accessibility.browsewithcaret", false);
pref("accessibility.warn_on_browsewithcaret", true);
pref("accessibility.browsewithcaret_shortcut.enabled", true);
-//@line 185 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 185 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
// Tab focus model bit field:
// 1 focuses text controls, 2 focuses other form elements, 4 adds links.
// Most users will want 1, 3, or 7.
@@ -184,7 +184,7 @@
// unless this preference was set manually
pref("ui.scrollToClick", 0);
-//@line 201 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 201 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
pref("accessibility.usetexttospeech", "");
pref("accessibility.usebrailledisplay", "");
@@ -528,9 +528,9 @@
pref("dom.storage.default_quota", 5120);
// Parsing perf prefs. For now just mimic what the old code did.
-//@line 545 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 545 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
pref("content.sink.pending_event_mode", 0);
-//@line 547 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 547 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
// Disable popups from plugins by default
// 0 = openAllowed
@@ -579,7 +579,7 @@
pref("network.protocol-handler.external.ms-help", false);
pref("network.protocol-handler.external.shell", false);
pref("network.protocol-handler.external.vnd.ms.radio", false);
-//@line 598 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 598 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
pref("network.protocol-handler.external.disk", false);
pref("network.protocol-handler.external.disks", false);
pref("network.protocol-handler.external.afp", false);
@@ -724,6 +724,7 @@
pref("network.IDN.whitelist.li", true);
pref("network.IDN.whitelist.lt", true);
pref("network.IDN.whitelist.lu", true);
+pref("network.IDN.whitelist.lv", true);
pref("network.IDN.whitelist.no", true);
pref("network.IDN.whitelist.nu", true);
pref("network.IDN.whitelist.nz", true);
@@ -734,6 +735,7 @@
pref("network.IDN.whitelist.th", true);
pref("network.IDN.whitelist.tm", true);
pref("network.IDN.whitelist.tw", true);
+pref("network.IDN.whitelist.ua", true);
pref("network.IDN.whitelist.vn", true);
// IDN ccTLDs
@@ -742,6 +744,8 @@
// cn, China, .<China> with variants
pref("network.IDN.whitelist.xn--fiqz9s", true); // Traditional
pref("network.IDN.whitelist.xn--fiqs8s", true); // Simplified
+// eg, Egypt, .<Masr>
+pref("network.IDN.whitelist.xn--wgbh1c", true);
// hk, Hong Kong, .<Hong Kong>
pref("network.IDN.whitelist.xn--j6w193g", true);
// ir, Iran, <.Iran> with variants
@@ -749,6 +753,9 @@
pref("network.IDN.whitelist.xn--mgba3a4fra", true);
// jo, Jordan, .<Al-Ordon>
pref("network.IDN.whitelist.xn--mgbayh7gpa", true);
+// lk, Sri Lanka, .<Lanka> and .<Ilangai>
+pref("network.IDN.whitelist.xn--fzc2c9e2c", true);
+pref("network.IDN.whitelist.xn--xkc2al3hye2a", true);
// qa, Qatar, .<Qatar>
pref("network.IDN.whitelist.xn--wgbl6a", true);
// ru, Russian Federation, .<RF>
@@ -758,11 +765,14 @@
pref("network.IDN.whitelist.xn--mgberp4a5d4a87g", true);
pref("network.IDN.whitelist.xn--mgbqly7c0a67fbc", true);
pref("network.IDN.whitelist.xn--mgbqly7cvafr", true);
+// sy, Syria, .<Souria>
+pref("network.IDN.whitelist.xn--ogbpf8fl", true);
// tw, Taiwan, <.Taiwan> with variants
pref("network.IDN.whitelist.xn--kpry57d", true); // Traditional
pref("network.IDN.whitelist.xn--kprw13d", true); // Simplified
// gTLDs
+pref("network.IDN.whitelist.asia", true);
pref("network.IDN.whitelist.biz", true);
pref("network.IDN.whitelist.cat", true);
pref("network.IDN.whitelist.info", true);
@@ -848,7 +858,7 @@
// Specify if the gss lib comes standard with the OS
pref("network.negotiate-auth.using-native-gsslib", true);
-//@line 872 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 882 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
// Controls which NTLM authentication implementation we default to. True forces
// the use of our generic (internal) NTLM authentication implementation vs. any
@@ -1269,15 +1279,15 @@
pref("font.minimum-size.x-unicode", 0);
pref("font.minimum-size.x-user-def", 0);
-//@line 1690 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 1700 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
-//@line 2114 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 2124 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
-//@line 2317 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 2327 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
-//@line 2413 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 2423 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
-//@line 2416 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 2426 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
// Handled differently under Mac/Windows
pref("network.hosts.smtp_server", "localhost");
pref("network.hosts.pop_server", "pop");
@@ -1547,15 +1557,15 @@
pref("mousewheel.system_scroll_override_on_root_content.enabled", false);
-//@line 2688 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 2698 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
-//@line 2756 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 2766 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
-//@line 2782 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 2792 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
-//@line 2802 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 2812 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
-//@line 2810 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 2820 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
// Login Manager prefs
pref("signon.rememberSignons", true);
@@ -1592,9 +1602,9 @@
// The default Accept header sent for images loaded over HTTP(S)
pref("image.http.accept", "image/png,image/*;q=0.8,*/*;q=0.5");
-//@line 2852 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 2862 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
-//@line 2857 "/home/yradtsevich/jboss/192src-copy/modules/libpref/src/init/all.js"
+//@line 2867 "/builds/slave/m-192-lnx64-xr/build/modules/libpref/src/init/all.js"
// Enable/Disable the geolocation API for content
pref("geo.enabled", true);
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/greprefs/security-prefs.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/greprefs/security-prefs.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/greprefs/security-prefs.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -27,14 +27,14 @@
pref("security.ssl3.rsa_rc4_40_md5", false);
pref("security.ssl3.rsa_rc2_40_md5", false);
// Camellia is broken on Windows CE for now, see bug 508113
-//@line 31 "/home/yradtsevich/jboss/192src-copy/netwerk/base/public/security-prefs.js"
+//@line 31 "/builds/slave/m-192-lnx64-xr/build/netwerk/base/public/security-prefs.js"
pref("security.ssl3.dhe_rsa_camellia_256_sha", true);
pref("security.ssl3.dhe_dss_camellia_256_sha", true);
pref("security.ssl3.rsa_camellia_256_sha", true);
pref("security.ssl3.dhe_rsa_camellia_128_sha", true);
pref("security.ssl3.dhe_dss_camellia_128_sha", true);
pref("security.ssl3.rsa_camellia_128_sha", true);
-//@line 38 "/home/yradtsevich/jboss/192src-copy/netwerk/base/public/security-prefs.js"
+//@line 38 "/builds/slave/m-192-lnx64-xr/build/netwerk/base/public/security-prefs.js"
pref("security.ssl3.dhe_rsa_aes_256_sha", true);
pref("security.ssl3.dhe_dss_aes_256_sha", true);
pref("security.ssl3.rsa_aes_256_sha", true);
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/javaxpcom.jar
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libfreebl3.chk
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libfreebl3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libjavaxpcomglue.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libmozjs.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libnspr4.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libnss3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libnssckbi.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libnssdbm3.chk
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libnssdbm3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libnssutil3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libplc4.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libplds4.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libsmime3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libsoftokn3.chk
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libsoftokn3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libsqlite3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libssl3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libxpcom.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/libxul.so
===================================================================
(Binary files differ)
Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/modules/CrashSubmit.jsm
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/modules/CrashSubmit.jsm (rev 0)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/modules/CrashSubmit.jsm 2011-07-06 21:15:18 UTC (rev 32671)
@@ -0,0 +1,421 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Ted Mielczarek <ted.mielczarek(a)gmail.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+let EXPORTED_SYMBOLS = [
+ "CrashSubmit"
+];
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const STATE_START = Ci.nsIWebProgressListener.STATE_START;
+const STATE_STOP = Ci.nsIWebProgressListener.STATE_STOP;
+
+const SUCCESS = "success";
+const FAILED = "failed";
+const SUBMITTING = "submitting";
+
+let reportURL = null;
+let strings = null;
+let myListener = null;
+
+function parseKeyValuePairs(text) {
+ var lines = text.split('\n');
+ var data = {};
+ for (let i = 0; i < lines.length; i++) {
+ if (lines[i] == '')
+ continue;
+
+ // can't just .split() because the value might contain = characters
+ let eq = lines[i].indexOf('=');
+ if (eq != -1) {
+ let [key, value] = [lines[i].substring(0, eq),
+ lines[i].substring(eq + 1)];
+ if (key && value)
+ data[key] = value.replace("\\n", "\n", "g").replace("\\\\", "\\", "g");
+ }
+ }
+ return data;
+}
+
+function parseKeyValuePairsFromFile(file) {
+ var fstream = Cc["@mozilla.org/network/file-input-stream;1"].
+ createInstance(Ci.nsIFileInputStream);
+ fstream.init(file, -1, 0, 0);
+ var is = Cc["@mozilla.org/intl/converter-input-stream;1"].
+ createInstance(Ci.nsIConverterInputStream);
+ is.init(fstream, "UTF-8", 1024, Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
+ var str = {};
+ var contents = '';
+ while (is.readString(4096, str) != 0) {
+ contents += str.value;
+ }
+ is.close();
+ fstream.close();
+ return parseKeyValuePairs(contents);
+}
+
+function parseINIStrings(file) {
+ var factory = Cc["@mozilla.org/xpcom/ini-parser-factory;1"].
+ getService(Ci.nsIINIParserFactory);
+ var parser = factory.createINIParser(file);
+ var obj = {};
+ var en = parser.getKeys("Strings");
+ while (en.hasMore()) {
+ var key = en.getNext();
+ obj[key] = parser.getString("Strings", key);
+ }
+ return obj;
+}
+
+// Since we're basically re-implementing part of the crashreporter
+// client here, we'll just steal the strings we need from crashreporter.ini
+function getL10nStrings() {
+ let dirSvc = Cc["@mozilla.org/file/directory_service;1"].
+ getService(Ci.nsIProperties);
+ let path = dirSvc.get("GreD", Ci.nsIFile);
+ path.append("crashreporter.ini");
+ if (!path.exists()) {
+ // see if we're on a mac
+ path = path.parent;
+ path.append("crashreporter.app");
+ path.append("Contents");
+ path.append("MacOS");
+ path.append("crashreporter.ini");
+ if (!path.exists()) {
+ // very bad, but I don't know how to recover
+ return;
+ }
+ }
+ let crstrings = parseINIStrings(path);
+ strings = {
+ 'crashid': crstrings.CrashID,
+ 'reporturl': crstrings.CrashDetailsURL
+ };
+
+ path = dirSvc.get("XCurProcD", Ci.nsIFile);
+ path.append("crashreporter-override.ini");
+ if (path.exists()) {
+ crstrings = parseINIStrings(path);
+ if ('CrashID' in crstrings)
+ strings['crashid'] = crstrings.CrashID;
+ if ('CrashDetailsURL' in crstrings)
+ strings['reporturl'] = crstrings.CrashDetailsURL;
+ }
+}
+
+function getPendingMinidump(id) {
+ let directoryService = Cc["@mozilla.org/file/directory_service;1"].
+ getService(Ci.nsIProperties);
+ let pendingDir = directoryService.get("UAppData", Ci.nsIFile);
+ pendingDir.append("Crash Reports");
+ pendingDir.append("pending");
+ let dump = pendingDir.clone();
+ let extra = pendingDir.clone();
+ dump.append(id + ".dmp");
+ extra.append(id + ".extra");
+ return [dump, extra];
+}
+
+function addFormEntry(doc, form, name, value) {
+ var input = doc.createElement("input");
+ input.type = "hidden";
+ input.name = name;
+ input.value = value;
+ form.appendChild(input);
+}
+
+function writeSubmittedReport(crashID, viewURL) {
+ let directoryService = Cc["@mozilla.org/file/directory_service;1"].
+ getService(Ci.nsIProperties);
+ let reportFile = directoryService.get("UAppData", Ci.nsIFile);
+ reportFile.append("Crash Reports");
+ reportFile.append("submitted");
+ if (!reportFile.exists())
+ reportFile.create(Ci.nsIFile.DIRECTORY_TYPE, 0700);
+ reportFile.append(crashID + ".txt");
+ var fstream = Cc["@mozilla.org/network/file-output-stream;1"].
+ createInstance(Ci.nsIFileOutputStream);
+ // open, write, truncate
+ fstream.init(reportFile, -1, -1, 0);
+ var os = Cc["@mozilla.org/intl/converter-output-stream;1"].
+ createInstance(Ci.nsIConverterOutputStream);
+ os.init(fstream, "UTF-8", 0, 0x0000);
+
+ var data = strings.crashid.replace("%s", crashID);
+ if (viewURL)
+ data += "\n" + strings.reporturl.replace("%s", viewURL);
+
+ os.writeString(data);
+ os.close();
+ fstream.close();
+}
+
+// the Submitter class represents an individual submission.
+function Submitter(id, element, submitSuccess, submitError, noThrottle) {
+ this.id = id;
+ this.element = element;
+ this.document = element.ownerDocument;
+ this.successCallback = submitSuccess;
+ this.errorCallback = submitError;
+ this.noThrottle = noThrottle;
+}
+
+Submitter.prototype = {
+ submitSuccess: function Submitter_submitSuccess(ret)
+ {
+ if (!ret.CrashID) {
+ this.notifyStatus(FAILED);
+ this.cleanup();
+ return;
+ }
+
+ // Write out the details file to submitted/
+ writeSubmittedReport(ret.CrashID, ret.ViewURL);
+
+ // Delete from pending dir
+ try {
+ this.dump.remove(false);
+ this.extra.remove(false);
+ }
+ catch (ex) {
+ // report an error? not much the user can do here.
+ }
+
+ this.notifyStatus(SUCCESS, ret);
+ this.cleanup();
+ },
+
+ cleanup: function Submitter_cleanup() {
+ // drop some references just to be nice
+ this.element = null;
+ this.document = null;
+ this.successCallback = null;
+ this.errorCallback = null;
+ this.iframe = null;
+ this.dump = null;
+ this.extra = null;
+ // remove this object from the list of active submissions
+ let idx = CrashSubmit._activeSubmissions.indexOf(this);
+ if (idx != -1)
+ CrashSubmit._activeSubmissions.splice(idx, 1);
+ },
+
+ submitForm: function Submitter_submitForm()
+ {
+ let reportData = parseKeyValuePairsFromFile(this.extra);
+ let form = this.iframe.contentDocument.forms[0];
+ if ('ServerURL' in reportData) {
+ form.action = reportData.ServerURL;
+ delete reportData.ServerURL;
+ }
+ else {
+ return false;
+ }
+ // add the other data
+ for (let [name, value] in Iterator(reportData)) {
+ addFormEntry(this.iframe.contentDocument, form, name, value);
+ }
+ if (this.noThrottle) {
+ // tell the server not to throttle this, since it was manually submitted
+ addFormEntry(this.iframe.contentDocument, form, "Throttleable", "0");
+ }
+ // add the minidump
+ this.iframe.contentDocument.getElementById('minidump').value
+ = this.dump.path;
+ this.iframe.docShell.QueryInterface(Ci.nsIWebProgress);
+ this.iframe.docShell.addProgressListener(this, Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
+ form.submit();
+ return true;
+ },
+
+ // web progress listener
+ QueryInterface: function(aIID)
+ {
+ if (aIID.equals(Ci.nsIWebProgressListener) ||
+ aIID.equals(Ci.nsISupportsWeakReference) ||
+ aIID.equals(Ci.nsISupports))
+ return this;
+ throw Components.results.NS_NOINTERFACE;
+ },
+
+ onStateChange: function(aWebProgress, aRequest, aFlag, aStatus)
+ {
+ if(aFlag & STATE_STOP) {
+ this.iframe.docShell.QueryInterface(Ci.nsIWebProgress);
+ this.iframe.docShell.removeProgressListener(this);
+
+ // check general request status first
+ if (!Components.isSuccessCode(aStatus)) {
+ this.element.removeChild(this.iframe);
+ this.notifyStatus(FAILED);
+ this.cleanup();
+ return 0;
+ }
+ // check HTTP status
+ if (aRequest instanceof Ci.nsIHttpChannel &&
+ aRequest.responseStatus != 200) {
+ this.element.removeChild(this.iframe);
+ this.notifyStatus(FAILED);
+ this.cleanup();
+ return 0;
+ }
+
+ var ret = parseKeyValuePairs(this.iframe.contentDocument.documentElement.textContent);
+ this.element.removeChild(this.iframe);
+ this.submitSuccess(ret);
+ }
+ return 0;
+ },
+
+ onLocationChange: function(aProgress, aRequest, aURI) {return 0;},
+ onProgressChange: function() {return 0;},
+ onStatusChange: function() {return 0;},
+ onSecurityChange: function() {return 0;},
+
+ notifyStatus: function Submitter_notify(status, ret)
+ {
+ let propBag = Cc["@mozilla.org/hash-property-bag;1"].
+ createInstance(Ci.nsIWritablePropertyBag2);
+ propBag.setPropertyAsAString("minidumpID", this.id);
+ if (status == SUCCESS) {
+ propBag.setPropertyAsAString("serverCrashID", ret.CrashID);
+ }
+
+ Cc["@mozilla.org/observer-service;1"]
+ .getService(Ci.nsIObserverService)
+ .notifyObservers(propBag, "crash-report-status", status);
+
+ switch (status) {
+ case SUCCESS:
+ if (this.successCallback)
+ this.successCallback(this.id, ret);
+ break;
+ case FAILED:
+ if (this.errorCallback)
+ this.errorCallback(this.id);
+ break;
+ default:
+ // no callbacks invoked.
+ }
+ },
+
+ submit: function Submitter_submit()
+ {
+ let [dump, extra] = getPendingMinidump(this.id);
+ if (!dump.exists() || !extra.exists()) {
+ this.notifyStatus(FAILED);
+ this.cleanup();
+ return false;
+ }
+
+ this.notifyStatus(SUBMITTING);
+
+ this.dump = dump;
+ this.extra = extra;
+ let iframe = this.document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "iframe");
+ iframe.setAttribute("type", "content");
+ iframe.style.width = 0;
+ iframe.style.minWidth = 0;
+
+ let self = this;
+ function loadHandler() {
+ if (iframe.contentWindow.location == "about:blank")
+ return;
+ iframe.removeEventListener("load", loadHandler, true);
+ if (!self.submitForm()) {
+ this.notifyStatus(FAILED);
+ self.cleanup();
+ }
+ }
+
+ iframe.addEventListener("load", loadHandler, true);
+ this.element.appendChild(iframe);
+ this.iframe = iframe;
+ iframe.webNavigation.loadURI("chrome://global/content/crash-submit-form.xhtml", 0, null, null, null);
+ return true;
+ }
+};
+
+//===================================
+// External API goes here
+let CrashSubmit = {
+ /**
+ * Submit the crash report named id.dmp from the "pending" directory.
+ *
+ * @param id
+ * Filename (minus .dmp extension) of the minidump to submit.
+ * @param element
+ * A DOM element to which an iframe can be appended as a child,
+ * used for form submission.
+ * @param submitSuccess
+ * A function that will be called if the report is submitted
+ * successfully with two parameters: the id that was passed
+ * to this function, and an object containing the key/value
+ * data returned from the server in its properties.
+ * @param submitError
+ * A function that will be called with one parameter if the
+ * report fails to submit: the id that was passed to this
+ * function.
+ * @param noThrottle
+ * If true, this crash report should be submitted with
+ * an extra parameter of "Throttleable=0" indicating that
+ * it should be processed right away. This should be set
+ * when the report is being submitted and the user expects
+ * to see the results immediately.
+ *
+ * @return true if the submission began successfully, or false if
+ * it failed for some reason. (If the dump file does not
+ * exist, for example.)
+ */
+ submit: function CrashSubmit_submit(id, element, submitSuccess, submitError,
+ noThrottle)
+ {
+ let submitter = new Submitter(id,
+ element,
+ submitSuccess,
+ submitError,
+ noThrottle);
+ CrashSubmit._activeSubmissions.push(submitter);
+ return submitter.submit();
+ },
+
+ // List of currently active submit objects
+ _activeSubmissions: []
+};
+
+// Run this when first loaded
+getL10nStrings();
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/modules/debug.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/modules/debug.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/modules/debug.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -1,4 +1,4 @@
-//@line 44 "/home/yradtsevich/jboss/192src-copy/toolkit/content/debug.js"
+//@line 44 "/builds/slave/m-192-lnx64-xr/build/toolkit/content/debug.js"
var EXPORTED_SYMBOLS = ["NS_ASSERT"];
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/modules/utils.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/modules/utils.js 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/modules/utils.js 2011-07-06 21:15:18 UTC (rev 32671)
@@ -68,10 +68,10 @@
const RESTORE_FAILED_NSIOBSERVER_TOPIC = "bookmarks-restore-failed";
const RESTORE_NSIOBSERVER_DATA = "json";
-//@line 76 "/home/yradtsevich/jboss/192src-copy/toolkit/components/places/src/utils.js"
+//@line 76 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/places/src/utils.js"
// On other platforms, the transferable system converts "\r\n" to "\n".
const NEWLINE = "\r\n";
-//@line 79 "/home/yradtsevich/jboss/192src-copy/toolkit/components/places/src/utils.js"
+//@line 79 "/builds/slave/m-192-lnx64-xr/build/toolkit/components/places/src/utils.js"
function QI_node(aNode, aIID) {
var result = null;
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/mozilla-xremote-client
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/nspr-config
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/nspr-config 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/nspr-config 2011-07-06 21:15:18 UTC (rev 32671)
@@ -4,7 +4,7 @@
major_version=4
minor_version=8
-patch_version=6
+patch_version=7
usage()
{
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/platform.ini
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/platform.ini 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/platform.ini 2011-07-06 21:15:18 UTC (rev 32671)
@@ -1,5 +1,5 @@
[Build]
-BuildID=20110419194251
-Milestone=1.9.2.16
-SourceStamp=53907aa2199a
+BuildID=20110706033610
+Milestone=1.9.2.19pre
+SourceStamp=7976c26c70e8
SourceRepository=http://hg.mozilla.org/releases/mozilla-1.9.2
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/plugin-container
===================================================================
(Binary files differ)
Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/plugins
___________________________________________________________________
Added: svn:ignore
+ libnullplugin.so
Deleted: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/plugins/libunixprintplugin.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/run-mozilla.sh
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/run-mozilla.sh 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/run-mozilla.sh 2011-07-06 21:15:18 UTC (rev 32671)
@@ -42,7 +42,7 @@
MOZ_VIEWER_NAME="./viewer"
MOZ_PROGRAM=""
-exitcode=0
+exitcode=1
#
##
## Functions
@@ -140,7 +140,7 @@
##
## Run the program
##
- "$prog" ${1+"$@"}
+ exec "$prog" ${1+"$@"}
exitcode=$?
}
##########################################################################
@@ -168,33 +168,24 @@
fi
if [ -x "$debugger" ]
then
- tmpfile=`mktemp /tmp/mozargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; }
- trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
- # echo -n isn't portable, so pipe through perl -pe chomp instead
- echo "set args" | perl -pe 'chomp' > $tmpfile
- for PARAM in "$@"
- do
- echo " '$PARAM'" | perl -pe 'chomp' >> $tmpfile
- done
- echo >> $tmpfile
# If you are not using ddd, gdb and know of a way to convey the arguments
# over to the prog then add that here- Gagan Saksena 03/15/00
case `basename $debugger` in
- gdb) echo "$debugger $prog -x $tmpfile"
- $debugger "$prog" -x $tmpfile
+ gdb) echo "$debugger --args $prog" ${1+"$@"}
+ exec "$debugger" --args "$prog" ${1+"$@"}
exitcode=$?
;;
- ddd) echo "$debugger --debugger \"gdb -x $tmpfile\" $prog"
- $debugger --debugger "gdb -x $tmpfile" "$prog"
+ ddd) echo "$debugger --gdb -- --args $prog" ${1+"$@"}
+ exec "$debugger" --gdb -- --args "$prog" ${1+"$@"}
exitcode=$?
;;
*) echo "$debugger $prog ${1+"$@"}"
- $debugger "$prog" ${1+"$@"}
+ exec $debugger "$prog" ${1+"$@"}
exitcode=$?
;;
esac
else
- echo "Could not find a debugger on your system."
+ moz_bail "Could not find a debugger on your system."
fi
}
##########################################################################
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/updater
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xpcshell
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xpidl
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xpt_dump
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xpt_link
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xulrunner
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xulrunner 2011-07-06 21:00:20 UTC (rev 32670)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xulrunner 2011-07-06 21:15:18 UTC (rev 32671)
@@ -50,7 +50,7 @@
#uncomment for debugging
#set -x
-moz_libdir=/usr/local/lib/xulrunner-1.9.2.16
+moz_libdir=/usr/local/lib/xulrunner-1.9.2.19pre
# Use run-mozilla.sh in the current dir if it exists
# If not, then start resolving symlinks until we find run-mozilla.sh
@@ -136,8 +136,5 @@
then
echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
fi
-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
-exitcode=$?
-
-exit $exitcode
+exec "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
# EOF.
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xulrunner-bin
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/xulrunner/xulrunner-stub
===================================================================
(Binary files differ)
14 years, 9 months
- 1
- 0