JBoss Tools SVN: r23887 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/preferences.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-08-03 15:55:27 -0400 (Tue, 03 Aug 2010)
New Revision: 23887
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/preferences/SeverityPreferences.java
Log:
https://jira.jboss.org/browse/JBIDE-6507 Enable/disable checkbox has been added to CDI/EL/Seam validation preference pages.
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/preferences/SeverityPreferences.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/preferences/SeverityPreferences.java 2010-08-03 19:54:23 UTC (rev 23886)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/preferences/SeverityPreferences.java 2010-08-03 19:55:27 UTC (rev 23887)
@@ -44,6 +44,8 @@
*/
public abstract class SeverityPreferences {
+ public static String ENABLE_BLOCK_PREFERENCE_NAME = "enableBlock";
+
public static final String ERROR = "error"; //$NON-NLS-1$
public static final String WARNING = "warning"; //$NON-NLS-1$
public static final String IGNORE = "ignore"; //$NON-NLS-1$
@@ -78,6 +80,24 @@
return value != null ? value : getInstancePreference(key);
}
+ public boolean isEnabled(IProject project) {
+ IEclipsePreferences p = getProjectPreferences(project);
+ if(p == null) {
+ return false;
+ }
+ String value = p.get(ENABLE_BLOCK_PREFERENCE_NAME, null);
+ if(value!=null) {
+ return p.getBoolean(ENABLE_BLOCK_PREFERENCE_NAME, false);
+ }
+ p = getInstancePreferences();
+ value = p == null ? null : p.get(ENABLE_BLOCK_PREFERENCE_NAME, null);
+ if(value!=null) {
+ return p.getBoolean(ENABLE_BLOCK_PREFERENCE_NAME, false);
+ }
+ p = getDefaultPreferences();
+ return p.getBoolean(ENABLE_BLOCK_PREFERENCE_NAME, false);
+ }
+
public String getInstancePreference(String key) {
IEclipsePreferences p = getInstancePreferences();
String value = p == null ? null : p.get(key, null);
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r23886 - in trunk: jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-08-03 15:54:23 -0400 (Tue, 03 Aug 2010)
New Revision: 23886
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/preferences/JSFPreferenceInitializer.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/preferences/JSFSeverityPreferences.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/IValidator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamPreferences.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
Log:
https://jira.jboss.org/browse/JBIDE-6507 Enable/disable checkbox has been added to CDI/EL/Seam validation preference pages.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/preferences/JSFPreferenceInitializer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/preferences/JSFPreferenceInitializer.java 2010-08-03 19:25:10 UTC (rev 23885)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/preferences/JSFPreferenceInitializer.java 2010-08-03 19:54:23 UTC (rev 23886)
@@ -14,6 +14,7 @@
import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.jboss.tools.common.preferences.SeverityPreferences;
import org.jboss.tools.jsf.JSFModelPlugin;
/**
@@ -27,6 +28,7 @@
public void initializeDefaultPreferences() {
IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(JSFModelPlugin.PLUGIN_ID);
+ defaultPreferences.putBoolean(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, true);
for (String name : JSFSeverityPreferences.SEVERITY_OPTION_NAMES) {
defaultPreferences.put(name, JSFSeverityPreferences.ERROR);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/preferences/JSFSeverityPreferences.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/preferences/JSFSeverityPreferences.java 2010-08-03 19:25:10 UTC (rev 23885)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/preferences/JSFSeverityPreferences.java 2010-08-03 19:54:23 UTC (rev 23886)
@@ -77,6 +77,10 @@
return SEVERITY_OPTION_NAMES;
}
+ public static boolean isValidationEnabled(IProject project) {
+ return INSTANCE.isEnabled(project);
+ }
+
public static boolean shouldValidateEL(IProject project) {
return !(SeverityPreferences.IGNORE.equals(INSTANCE.getProjectPreference(project, UNKNOWN_EL_VARIABLE_NAME)) &&
SeverityPreferences.IGNORE.equals(INSTANCE.getProjectPreference(project, UNKNOWN_EL_VARIABLE_PROPERTY_NAME)) &&
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2010-08-03 19:25:10 UTC (rev 23885)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2010-08-03 19:54:23 UTC (rev 23886)
@@ -88,8 +88,12 @@
public ELValidator() {
}
- private boolean isEnabled(IProject project) {
- return JSFSeverityPreferences.shouldValidateEL(project);
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.validation.IValidator#isEnabled(org.eclipse.core.resources.IProject)
+ */
+ public boolean isEnabled(IProject project) {
+ return JSFSeverityPreferences.isValidationEnabled(project) && JSFSeverityPreferences.shouldValidateEL(project);
}
/*
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2010-08-03 19:25:10 UTC (rev 23885)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2010-08-03 19:54:23 UTC (rev 23886)
@@ -140,6 +140,7 @@
id="cd"
name="JBoss KB Project Validator">
<validator>
+ <runStrategy project="true"/>
<projectNature id="org.eclipse.jdt.core.javanature" />
<filter
objectClass="org.eclipse.core.resources.IFile"
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/IValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/IValidator.java 2010-08-03 19:25:10 UTC (rev 23885)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/IValidator.java 2010-08-03 19:54:23 UTC (rev 23886)
@@ -60,4 +60,11 @@
* @return true if this validator should validate given project.
*/
boolean shouldValidate(IProject project);
+
+ /**
+ * Returns "true" if this validator is enabled in the preferences store.
+ * @param project
+ * @return
+ */
+ boolean isEnabled(IProject project);
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamPreferences.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamPreferences.java 2010-08-03 19:25:10 UTC (rev 23885)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamPreferences.java 2010-08-03 19:54:23 UTC (rev 23886)
@@ -170,4 +170,8 @@
public static boolean shouldValidateSettings(IProject project) {
return !SeamPreferences.IGNORE.equals(INSTANCE.getProjectPreference(project, INVALID_PROJECT_SETTINGS));
}
+
+ public static boolean isValidationEnabled(IProject project) {
+ return INSTANCE.isEnabled(project);
+ }
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java 2010-08-03 19:25:10 UTC (rev 23885)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java 2010-08-03 19:54:23 UTC (rev 23886)
@@ -14,6 +14,7 @@
import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.jboss.tools.common.preferences.SeverityPreferences;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamPreferences;
@@ -28,6 +29,7 @@
public void initializeDefaultPreferences() {
IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(SeamCorePlugin.PLUGIN_ID);
+ defaultPreferences.putBoolean(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, true);
for (String name : SeamPreferences.SEVERITY_OPTION_NAMES) {
defaultPreferences.put(name, SeamPreferences.ERROR);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-08-03 19:25:10 UTC (rev 23885)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-08-03 19:54:23 UTC (rev 23886)
@@ -136,12 +136,20 @@
/*
* (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.validation.IValidator#isEnabled(org.eclipse.core.resources.IProject)
+ */
+ public boolean isEnabled(IProject project) {
+ return SeamPreferences.isValidationEnabled(project);
+ }
+
+ /*
+ * (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.validation.IValidator#shouldValidate(org.eclipse.core.resources.IProject)
*/
public boolean shouldValidate(IProject project) {
try {
- // TODO check preferences
- return project!=null && project.isAccessible() && project.hasNature(ISeamProject.NATURE_ID);
+ // TODO check preferences for root web project only
+ return project!=null && project.isAccessible() && project.hasNature(ISeamProject.NATURE_ID) && isPreferencesEnabled(project);
} catch (CoreException e) {
SeamCorePlugin.getDefault().logError(e);
}
@@ -165,7 +173,7 @@
}
private boolean isPreferencesEnabled(IProject project) {
- return SeamPreferences.shouldValidateCore(project);
+ return isEnabled(project) && SeamPreferences.shouldValidateCore(project);
}
/*
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r23885 - in trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner: chrome and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-08-03 15:25:10 -0400 (Tue, 03 Aug 2010)
New Revision: 23885
Modified:
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/classic.jar
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/comm.jar
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/en-US.jar
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/pippki.jar
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/toolkit.jar
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/components.list
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/jsconsole-clhandler.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libdbusservice.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libimgicon.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsAddonRepository.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsBlocklistService.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsDefaultCLH.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsExtensionManager.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsFilePicker.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsHelperAppDlg.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsLivemarkService.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsSearchService.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsURLFormatter.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateService.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateServiceStub.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateTimerManager.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsXULAppInstall.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/crashreporter
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/defaults/pref/xulrunner.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/all.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/security-prefs.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/javaxpcom.jar
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libfreebl3.chk
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libfreebl3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libjavaxpcomglue.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libmozjs.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnspr4.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnss3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssckbi.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.chk
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssutil3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplc4.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplds4.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsmime3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.chk
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsqlite3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libssl3.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxpcom.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxul.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/DownloadLastDir.jsm
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/LightweightThemeManager.jsm
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/XPCOMUtils.jsm
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/debug.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/utils.js
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/mozilla-xremote-client
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/platform.ini
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libnullplugin.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libunixprintplugin.so
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/charsetalias.properties
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/html.css
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/updater
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpcshell
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpidl
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpt_dump
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpt_link
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner-bin
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner-stub
Log:
https://jira.jboss.org/browse/JBIDE-6769 XULRunner 1.9.2 binaries downloaded from mozilla site is not working OOB under RHEL5 with SELinux in restricted mode
xulrunner binaries built under RHEL5 x86 and tested under ubuntu 10.04 x86 distribution
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/classic.jar
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/comm.jar
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/en-US.jar
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/pippki.jar
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/toolkit.jar
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/components.list
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/components.list 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/components.list 2010-08-03 19:25:10 UTC (rev 23885)
@@ -3,8 +3,8 @@
nsWebHandlerApp.js
NetworkGeolocationProvider.js
GPSDGeolocationProvider.js
-txEXSLTRegExFunctions.js
nsBadCertHandler.js
+txEXSLTRegExFunctions.js
nsHelperAppDlg.js
nsProgressDialog.js
nsURLFormatter.js
@@ -35,8 +35,6 @@
nsUpdateServiceStub.js
pluginGlue.js
nsContentDispatchChooser.js
-libmozgnome.so
libdbusservice.so
libimgicon.so
-libnkgnomevfs.so
nsXULAppInstall.js
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/jsconsole-clhandler.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/jsconsole-clhandler.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/jsconsole-clhandler.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -1,4 +1,4 @@
-//@line 41 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/console/jsconsole-clhandler.js"
+//@line 41 "/home/eskimo/Projects/mozilla-1.9.2/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/xulrunner/components/libdbusservice.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libimgicon.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsAddonRepository.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsAddonRepository.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsAddonRepository.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
-//@line 38 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsAddonRepository.js"
+//@line 38 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsAddonRepository.js"
*/
const Cc = Components.classes;
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsBlocklistService.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsBlocklistService.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsBlocklistService.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
-//@line 41 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsBlocklistService.js"
+//@line 41 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsBlocklistService.js"
+//@line 113 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsBlocklistService.js"
return abi;
});
@@ -495,7 +495,7 @@
},
/**
-//@line 592 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsBlocklistService.js"
+//@line 592 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsBlocklistService.js"
*/
_loadBlocklistFromFile: function(file) {
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsDefaultCLH.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsDefaultCLH.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsDefaultCLH.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -1,4 +1,4 @@
-//@line 38 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/nsDefaultCLH.js"
+//@line 38 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/nsDefaultCLH.js"
const nsISupports = Components.interfaces.nsISupports;
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsExtensionManager.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsExtensionManager.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsExtensionManager.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
-//@line 44 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
+//@line 44 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
*/
//
@@ -1399,7 +1399,7 @@
QueryInterface: XPCOMUtils.generateQI([Ci.nsIInstallLocation])
};
-//@line 1592 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
+//@line 1592 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
/**
* Safely attempt to install or uninstall a given item ID in an install
@@ -2053,7 +2053,7 @@
InstallLocations.put(systemLocation);
}
-//@line 2260 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
+//@line 2260 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
// Register Additional Install Locations
var categoryManager = Cc["@mozilla.org/categorymanager;1"].
@@ -4949,13 +4949,13 @@
// count to 0 to prevent this dialog from being displayed again.
this._downloadCount = 0;
var result;
-//@line 5156 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
+//@line 5156 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
result = this._confirmCancelDownloads(this._downloadCount,
"quitCancelDownloadsAlertTitle",
"quitCancelDownloadsAlertMsgMultiple",
"quitCancelDownloadsAlertMsg",
"dontQuitButtonWin");
-//@line 5168 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
+//@line 5168 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
if (subject instanceof Ci.nsISupportsPRBool)
subject.data = result;
}
@@ -5498,7 +5498,7 @@
_listener : null,
/* ExtensionItemUpdater
-//@line 5736 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
+//@line 5736 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
*/
checkForUpdates: function ExtensionItemUpdater_checkForUpdates(aItems,
aItemCount,
@@ -5897,7 +5897,7 @@
onDatasourceLoaded: function RDFItemUpdater_onDatasourceLoaded(aDatasource, aLocalItem) {
/*
-//@line 6175 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in"
+//@line 6175 "/home/eskimo/Projects/mozilla-1.9.2/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/xulrunner/components/nsFilePicker.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsFilePicker.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsFilePicker.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -277,9 +277,9 @@
compMgr.registerFactoryLocation(FILEPICKER_CID,
"FilePicker JS Component",
-//@line 283 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/filepicker/src/nsFilePicker.js.in"
+//@line 283 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/filepicker/src/nsFilePicker.js.in"
"",
-//@line 285 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/filepicker/src/nsFilePicker.js.in"
+//@line 285 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/filepicker/src/nsFilePicker.js.in"
fileSpec,
location,
type);
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsHelperAppDlg.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsHelperAppDlg.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsHelperAppDlg.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -1,5 +1,5 @@
/*
-//@line 45 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 45 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
*/
///////////////////////////////////////////////////////////////////////////////
@@ -290,7 +290,7 @@
this.makeFileUnique(aLocalFile);
-//@line 354 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 354 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 549 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 699 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 704 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
},
// Set "default" application description field.
@@ -633,9 +633,9 @@
// getPath:
getPath: function (aFile) {
-//@line 727 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 727 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
return aFile.path;
-//@line 729 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 729 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
},
// initAppAndSaveToDiskValues:
@@ -677,9 +677,9 @@
otherHandler.setAttribute("path",
this.getPath(this.chosenApp.executable));
-//@line 774 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 774 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
otherHandler.label = this.chosenApp.executable.leafName;
-//@line 776 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 776 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 977 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 1039 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
return file.leafName;
},
// chooseApp: Open file picker and prompt user for application.
chooseApp: function() {
-//@line 1110 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 1110 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 1140 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
otherHandler.label = this.chosenApp.executable.leafName;
-//@line 1142 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 1142 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
+//@line 1155 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in"
},
// Turn this on to get debugging messages.
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsLivemarkService.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsLivemarkService.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsLivemarkService.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -48,7 +48,7 @@
const Ci = Components.interfaces;
const Cr = Components.results;
-//@line 36 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/url-classifier/content/moz/lang.js"
+//@line 36 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/url-classifier/content/moz/lang.js"
/**
@@ -128,7 +128,7 @@
this.superClass_ = parentCtor.prototype;
this.prototype = new tempCtor();
}
-//@line 36 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/url-classifier/content/moz/observer.js"
+//@line 36 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/url-classifier/content/moz/observer.js"
// A couple of classes to simplify creating observers.
@@ -228,7 +228,7 @@
this.unregister();
}
-//@line 36 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/url-classifier/content/moz/alarm.js"
+//@line 36 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/places/src/nsLivemarkService.js"
+//@line 54 "/home/eskimo/Projects/mozilla-1.9.2/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/xulrunner/components/nsSearchService.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsSearchService.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsSearchService.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -1,4 +1,4 @@
-//@line 40 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/search/nsSearchService.js"
+//@line 40 "/home/eskimo/Projects/mozilla-1.9.2/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 150 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/search/nsSearchService.js"
-const MOZ_OFFICIAL = "official";
-//@line 154 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/search/nsSearchService.js"
+//@line 152 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/search/nsSearchService.js"
+const MOZ_OFFICIAL = "unofficial";
+//@line 154 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/search/nsSearchService.js"
+//@line 258 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/search/nsSearchService.js"
+//@line 266 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/search/nsSearchService.js"
/**
* Presents an assertion dialog in non-release builds and throws.
@@ -3699,7 +3699,7 @@
return gModule;
}
-//@line 44 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/content/debug.js"
+//@line 44 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/content/debug.js"
var EXPORTED_SYMBOLS = ["NS_ASSERT"];
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsURLFormatter.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsURLFormatter.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsURLFormatter.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -1,4 +1,4 @@
-//@line 37 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/urlformatter/src/nsURLFormatter.js"
+//@line 37 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/urlformatter/src/nsURLFormatter.js"
/**
* @class nsURLFormatterService
*
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateService.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateService.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateService.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
-//@line 44 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 44 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in"
*/
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/FileUtils.jsm");
@@ -39,7 +39,7 @@
const KEY_APPDIR = "XCurProcD";
const KEY_GRED = "GreD";
-//@line 87 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 87 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in"
const DIR_UPDATES = "updates";
const FILE_UPDATE_STATUS = "update.status";
@@ -111,7 +111,7 @@
catch (e) {
LOG("gABI - XPCOM ABI unknown: updates are not possible.");
}
-//@line 167 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 167 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in"
return abi;
});
@@ -147,7 +147,7 @@
updateTestFile.remove(false);
updateTestFile.create(NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
updateTestFile.remove(false);
-//@line 276 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 276 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in"
}
catch (e) {
LOG("gCanApplyUpdates - unable to apply updates. Exception: " + e);
@@ -200,7 +200,7 @@
}
/**
-//@line 338 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 338 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in"
*/
function getPref(func, preference, defaultValue) {
try {
@@ -230,10 +230,10 @@
}
/**
-//@line 373 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 373 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in"
*/
function getUpdateDirCreate(pathArray) {
-//@line 384 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 384 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in"
return FileUtils.getDir(KEY_APPDIR, pathArray, true);
}
@@ -321,7 +321,7 @@
}
/**
-//@line 485 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 485 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in"
*/
function writeVersionFile(dir, version) {
var versionFile = dir.clone();
@@ -1148,7 +1148,7 @@
}
/**
-//@line 1323 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 1323 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in"
*/
// Encode version since it could be a non-ascii string (bug 359093)
@@ -1177,7 +1177,7 @@
}
/**
-//@line 1367 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 1367 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in"
*/
if (update.type == "major") {
LOG("Checker:_selectAndInstallUpdate - prompting because it is a major " +
@@ -1256,7 +1256,7 @@
if (currentAddons.length > 0) {
/**
-//@line 1463 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in"
+//@line 1463 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in"
*/
this._incompatAddonsCount = currentAddons.length;
LOG("UpdateService:_checkAddonCompatibility - checking for " +
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateServiceStub.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateServiceStub.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateServiceStub.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
-//@line 38 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
+//@line 38 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
+//@line 53 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
/**
-//@line 61 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
+//@line 61 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
*/
function getUpdateDirNoCreate(pathArray) {
-//@line 72 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
+//@line 72 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateServiceStub.js"
return FileUtils.getDir(KEY_APPDIR, pathArray, false);
}
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateTimerManager.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateTimerManager.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateTimerManager.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
-//@line 39 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
+//@line 39 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
*/
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -30,7 +30,7 @@
}
/**
-//@line 78 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
+//@line 78 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
*/
function getPref(func, preference, defaultValue) {
try {
@@ -42,7 +42,7 @@
}
/**
-//@line 92 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
+//@line 92 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
*/
function LOG(string) {
if (gLogEnabled) {
@@ -52,7 +52,7 @@
}
/**
-//@line 104 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
+//@line 104 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
*/
function TimerManager() {
getObserverService().addObserver(this, "xpcom-shutdown", false);
@@ -64,7 +64,7 @@
_timer: null,
/**
-//@line 117 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
+//@line 117 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
*/
_timerInterval: null,
@@ -74,7 +74,7 @@
_timers: { },
/**
-//@line 132 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
+//@line 132 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
+//@line 171 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateTimerManager.js"
*/
notify: function TM_notify(timer) {
var prefLastUpdate;
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsXULAppInstall.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsXULAppInstall.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsXULAppInstall.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -1,5 +1,5 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-//@line 41 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/setup/nsXULAppInstall.js"
+//@line 41 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/setup/nsXULAppInstall.js"
+//@line 244 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/setup/nsXULAppInstall.js"
+//@line 251 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/setup/nsXULAppInstall.js"
}
else {
aDirectory = aDirectory.clone();
@@ -210,9 +210,9 @@
}
if (aLeafName == "") {
-//@line 267 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/setup/nsXULAppInstall.js"
+//@line 267 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/setup/nsXULAppInstall.js"
aLeafName = appName.toLowerCase();
-//@line 270 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/setup/nsXULAppInstall.js"
+//@line 270 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/setup/nsXULAppInstall.js"
}
aDirectory.append(aLeafName);
@@ -220,14 +220,14 @@
aDirectory.create(nsIFile.DIRECTORY_TYPE, 0755);
}
-//@line 341 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/setup/nsXULAppInstall.js"
+//@line 341 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/setup/nsXULAppInstall.js"
extractor.copyTo(aDirectory);
var xulrunnerBinary = getDirectoryKey("GreD");
xulrunnerBinary.append("xulrunner-stub");
xulrunnerBinary.copyTo(aDirectory, appName.toLowerCase() + "");
-//@line 348 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/setup/nsXULAppInstall.js"
+//@line 348 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/setup/nsXULAppInstall.js"
}
};
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/crashreporter
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/defaults/pref/xulrunner.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/defaults/pref/xulrunner.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/defaults/pref/xulrunner.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -34,7 +34,7 @@
*
* ***** END LICENSE BLOCK ***** */
-//@line 38 "/builds/slave/xulrunner_linux_build/build/xulrunner/app/xulrunner.js"
+//@line 38 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/xulrunner_linux_build/build/xulrunner/app/xulrunner.js"
+//@line 65 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/app/xulrunner.js"
pref("browser.preferences.instantApply", true);
-//@line 70 "/builds/slave/xulrunner_linux_build/build/xulrunner/app/xulrunner.js"
+//@line 70 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/app/xulrunner.js"
pref("browser.preferences.animateFadeIn", false);
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/all.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/all.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/all.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -59,9 +59,9 @@
pref("browser.bookmarks.max_backups", 5);
pref("browser.cache.disk.enable", true);
-//@line 63 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 63 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
pref("browser.cache.disk.capacity", 51200);
-//@line 67 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 67 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 76 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 92 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 156 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
pref("media.ogg.enabled", true);
-//@line 159 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 159 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
pref("media.wave.enabled", true);
-//@line 161 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 161 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
// Whether to autostart a media element with an |autoplay| attribute
pref("media.autoplay.enabled", true);
@@ -167,7 +167,7 @@
pref("accessibility.browsewithcaret_shortcut.enabled", true);
-//@line 179 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 179 "/home/eskimo/Projects/mozilla-1.9.2/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.
@@ -180,7 +180,7 @@
// unless this preference was set manually
pref("ui.scrollToClick", 0);
-//@line 195 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 195 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
pref("accessibility.usetexttospeech", "");
pref("accessibility.usebrailledisplay", "");
@@ -524,9 +524,9 @@
pref("dom.storage.default_quota", 5120);
// Parsing perf prefs. For now just mimic what the old code did.
-//@line 539 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 539 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
pref("content.sink.pending_event_mode", 0);
-//@line 541 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 541 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
// Disable popups from plugins by default
// 0 = openAllowed
@@ -575,7 +575,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 592 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 592 "/home/eskimo/Projects/mozilla-1.9.2/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);
@@ -718,10 +718,7 @@
pref("network.IDN.whitelist.kr", true);
pref("network.IDN.whitelist.li", true);
pref("network.IDN.whitelist.lt", true);
-pref("network.IDN.whitelist.lu", true);
pref("network.IDN.whitelist.no", true);
-pref("network.IDN.whitelist.nu", true);
-pref("network.IDN.whitelist.nz", true);
pref("network.IDN.whitelist.pl", true);
pref("network.IDN.whitelist.pr", true);
pref("network.IDN.whitelist.se", true);
@@ -731,21 +728,12 @@
pref("network.IDN.whitelist.tw", true);
pref("network.IDN.whitelist.vn", true);
-// IDN ccTLDs
-// sa, Saudi Arabia, .<al-Saudiah>
-pref("network.IDN.whitelist.xn--mgberp4a5d4ar", true);
-// ru, Russian Federation, .<RF>
-pref("network.IDN.whitelist.xn--p1ai", true);
-// jo, Jordan, .<Al-Ordon>
-pref("network.IDN.whitelist.xn--mgbayh7gpa", true);
-
-// gTLDs
+// non-ccTLDs
pref("network.IDN.whitelist.biz", true);
pref("network.IDN.whitelist.cat", true);
pref("network.IDN.whitelist.info", true);
pref("network.IDN.whitelist.museum", true);
pref("network.IDN.whitelist.org", true);
-pref("network.IDN.whitelist.tel", true);
// NOTE: Before these can be removed, one of bug 414812's tests must be updated
// or it will likely fail! Please CC jwalden+bmo on the bug associated
@@ -825,7 +813,7 @@
// Specify if the gss lib comes standard with the OS
pref("network.negotiate-auth.using-native-gsslib", true);
-//@line 847 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 835 "/home/eskimo/Projects/mozilla-1.9.2/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
@@ -853,7 +841,9 @@
pref("permissions.default.image", 1); // 1-Accept, 2-Deny, 3-dontAcceptForeign
+//@line 864 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
pref("network.proxy.type", 5);
+//@line 871 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
pref("network.proxy.ftp", "");
pref("network.proxy.ftp_port", 0);
@@ -1204,10 +1194,6 @@
pref("dom.max_chrome_script_run_time", 20);
pref("dom.max_script_run_time", 10);
-// How long a plugin is allowed to process a synchronous IPC message
-// before we consider it "hung".
-pref("dom.ipc.plugins.timeoutSecs", 45);
-
pref("svg.enabled", true);
pref("svg.smil.enabled", false);
@@ -1243,15 +1229,15 @@
pref("font.minimum-size.x-unicode", 0);
pref("font.minimum-size.x-user-def", 0);
-//@line 1662 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 1654 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
-//@line 2086 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 2078 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
-//@line 2289 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 2281 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
-//@line 2385 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 2377 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
-//@line 2388 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 2380 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
// Handled differently under Mac/Windows
pref("network.hosts.smtp_server", "localhost");
pref("network.hosts.pop_server", "pop");
@@ -1521,15 +1507,15 @@
pref("mousewheel.system_scroll_override_on_root_content.enabled", false);
-//@line 2660 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 2652 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
-//@line 2728 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 2720 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
-//@line 2754 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 2746 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
-//@line 2774 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 2766 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
-//@line 2782 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 2774 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
// Login Manager prefs
pref("signon.rememberSignons", true);
@@ -1566,15 +1552,12 @@
// 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 2824 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 2816 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
-//@line 2829 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js"
+//@line 2821 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js"
// Enable/Disable the geolocation API for content
pref("geo.enabled", true);
-// Enable/Disable the orientation API for content
-pref("accelerometer.enabled", true);
-
// Enable/Disable HTML5 parser
pref("html5.enable", false);
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/security-prefs.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/security-prefs.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/security-prefs.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -5,11 +5,6 @@
pref("security.enable_tls", true);
pref("security.enable_tls_session_tickets", true);
-pref("security.ssl.allow_unrestricted_renego_everywhere__temporarily_available_pref", true);
-pref("security.ssl.renego_unrestricted_hosts", "");
-pref("security.ssl.treat_unsafe_negotiation_as_broken", false);
-pref("security.ssl.require_safe_negotiation", false);
-
pref("security.ssl2.rc4_128", false);
pref("security.ssl2.rc2_128", false);
pref("security.ssl2.des_ede3_192", false);
@@ -27,14 +22,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 "/builds/slave/xulrunner_linux_build/build/netwerk/base/public/security-prefs.js"
+//@line 26 "/home/eskimo/Projects/mozilla-1.9.2/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 "/builds/slave/xulrunner_linux_build/build/netwerk/base/public/security-prefs.js"
+//@line 33 "/home/eskimo/Projects/mozilla-1.9.2/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/xulrunner/javaxpcom.jar
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libfreebl3.chk
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libfreebl3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libjavaxpcomglue.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libmozjs.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnspr4.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnss3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssckbi.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.chk
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssutil3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplc4.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplds4.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsmime3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.chk
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsqlite3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libssl3.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxpcom.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxul.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/DownloadLastDir.jsm
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/DownloadLastDir.jsm 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/DownloadLastDir.jsm 2010-08-03 19:25:10 UTC (rev 23885)
@@ -34,13 +34,8 @@
*
* ***** END LICENSE BLOCK ***** */
-const LAST_DIR_PREF = "browser.download.lastDir";
-
var EXPORTED_SYMBOLS = [ "gDownloadLastDir" ];
-let prefSvc = Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefBranch);
-
let observer = {
QueryInterface: function (aIID) {
if (aIID.equals(Components.interfaces.nsIObserver) ||
@@ -50,23 +45,13 @@
throw Components.results.NS_NOINTERFACE;
},
observe: function (aSubject, aTopic, aData) {
- switch (aTopic) {
- case "private-browsing":
- gDownloadLastDirFile = null;
- break;
- case "browser:purge-session-history":
- gDownloadLastDirFile = null;
- if (prefSvc.prefHasUserValue(LAST_DIR_PREF))
- prefSvc.clearUserPref(LAST_DIR_PREF);
- break;
- }
+ gDownloadLastDirFile = null;
}
};
-let os = Components.classes["@mozilla.org/observer-service;1"]
- .getService(Components.interfaces.nsIObserverService);
-os.addObserver(observer, "private-browsing", true);
-os.addObserver(observer, "browser:purge-session-history", true);
+Components.classes["@mozilla.org/observer-service;1"]
+ .getService(Components.interfaces.nsIObserverService)
+ .addObserver(observer, "private-browsing", true);
let gDownloadLastDirFile = null;
let gDownloadLastDir = {
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/LightweightThemeManager.jsm
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/LightweightThemeManager.jsm 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/LightweightThemeManager.jsm 2010-08-03 19:25:10 UTC (rev 23885)
@@ -109,8 +109,6 @@
},
set currentTheme (aData) {
- aData = _sanitizeTheme(aData);
-
let cancel = Cc["@mozilla.org/supports-PRBool;1"].createInstance(Ci.nsISupportsPRBool);
cancel.data = false;
_observerService.notifyObservers(cancel, "lightweight-theme-change-requested",
@@ -192,10 +190,39 @@
parseTheme: function (aString, aBaseURI) {
try {
- return _sanitizeTheme(JSON.parse(aString), aBaseURI);
+ var data = JSON.parse(aString);
} catch (e) {
return null;
}
+
+ if (!data || typeof data != "object")
+ return null;
+
+ for (let prop in data) {
+ if (typeof data[prop] == "string" &&
+ (data[prop] = data[prop].trim()) &&
+ (MANDATORY.indexOf(prop) > -1 || OPTIONAL.indexOf(prop) > -1)) {
+ if (!/URL$/.test(prop))
+ continue;
+
+ try {
+ data[prop] = _makeURI(data[prop], _makeURI(aBaseURI)).spec;
+ if (/^https:/.test(data[prop]))
+ continue;
+ if (prop != "updateURL" && /^http:/.test(data[prop]))
+ continue;
+ } catch (e) {}
+ }
+
+ delete data[prop];
+ }
+
+ for (let i = 0; i < MANDATORY.length; i++) {
+ if (!(MANDATORY[i] in data))
+ return null;
+ }
+
+ return data;
},
updateCurrentTheme: function () {
@@ -237,55 +264,8 @@
}
};
-function _sanitizeTheme(aData, aBaseURI) {
- if (!aData || typeof aData != "object")
- return null;
-
- function sanitizeProperty(prop) {
- if (!(prop in aData))
- return null;
- if (typeof aData[prop] != "string")
- return null;
- let val = aData[prop].trim();
- if (!val)
- return null;
-
- if (!/URL$/.test(prop))
- return val;
-
- try {
- val = _makeURI(val, aBaseURI ? _makeURI(aBaseURI) : null).spec;
- if (/^https:/.test(val))
- return val;
- if (prop != "updateURL" && /^http:/.test(val))
- return val;
- return null;
- }
- catch (e) {
- return null;
- }
- }
-
- let result = {};
- for (let i = 0; i < MANDATORY.length; i++) {
- let val = sanitizeProperty(MANDATORY[i]);
- if (!val)
- throw Components.results.NS_ERROR_INVALID_ARG;
- result[MANDATORY[i]] = val;
- }
-
- for (let i = 0; i < OPTIONAL.length; i++) {
- let val = sanitizeProperty(OPTIONAL[i]);
- if (!val)
- continue;
- result[OPTIONAL[i]] = val;
- }
-
- return result;
-}
-
function _usedThemesExceptId(aId)
- LightweightThemeManager.usedThemes.filter(function (t) "id" in t && t.id != aId);
+ LightweightThemeManager.usedThemes.filter(function (t) t.id != aId);
function _version(aThemeData)
aThemeData.version || "";
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/XPCOMUtils.jsm
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/XPCOMUtils.jsm 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/XPCOMUtils.jsm 2010-08-03 19:25:10 UTC (rev 23885)
@@ -271,28 +271,6 @@
},
/**
- * Helper which iterates over a nsISimpleEnumerator.
- * @param e The nsISimpleEnumerator to iterate over.
- * @param i The expected interface for each element.
- */
- IterSimpleEnumerator: function XPCU_IterSimpleEnumerator(e, i)
- {
- while (e.hasMoreElements())
- yield e.getNext().QueryInterface(i);
- },
-
- /**
- * Helper which iterates over a string enumerator.
- * @param e The string enumerator (nsIUTF8StringEnumerator or
- * nsIStringEnumerator) over which to iterate.
- */
- IterStringEnumerator: function XPCU_IterStringEnumerator(e)
- {
- while (e.hasMore())
- yield e.getNext();
- },
-
- /**
* Convenience access to category manager
*/
get categoryManager() {
@@ -333,4 +311,3 @@
throw Cr.NS_ERROR_NO_INTERFACE;
};
}
-
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/debug.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/debug.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/debug.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -1,4 +1,4 @@
-//@line 44 "/builds/slave/xulrunner_linux_build/build/toolkit/content/debug.js"
+//@line 44 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/content/debug.js"
var EXPORTED_SYMBOLS = ["NS_ASSERT"];
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/utils.js
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/utils.js 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/utils.js 2010-08-03 19:25:10 UTC (rev 23885)
@@ -68,10 +68,10 @@
const RESTORE_FAILED_NSIOBSERVER_TOPIC = "bookmarks-restore-failed";
const RESTORE_NSIOBSERVER_DATA = "json";
-//@line 76 "/builds/slave/xulrunner_linux_build/build/toolkit/components/places/src/utils.js"
+//@line 76 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/places/src/utils.js"
// On other platforms, the transferable system converts "\r\n" to "\n".
const NEWLINE = "\r\n";
-//@line 79 "/builds/slave/xulrunner_linux_build/build/toolkit/components/places/src/utils.js"
+//@line 79 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/places/src/utils.js"
function QI_node(aNode, aIID) {
var result = null;
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/mozilla-xremote-client
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/platform.ini
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/platform.ini 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/platform.ini 2010-08-03 19:25:10 UTC (rev 23885)
@@ -1,5 +1,3 @@
[Build]
-BuildID=20100222070631
+BuildID=20100803022546
Milestone=1.9.2
-SourceStamp=448d0d2d310c
-SourceRepository=http://hg.mozilla.org/releases/mozilla-1.9.2
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libnullplugin.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libunixprintplugin.so
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/charsetalias.properties
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/charsetalias.properties 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/charsetalias.properties 2010-08-03 19:25:10 UTC (rev 23885)
@@ -297,7 +297,6 @@
ms_kanji=Shift_JIS
csshiftjis=Shift_JIS
windows-31j=Shift_JIS
-cp932=Shift_JIS
#
# Aliases for EUC_JP
#
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/html.css
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/html.css 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/html.css 2010-08-03 19:25:10 UTC (rev 23885)
@@ -483,14 +483,14 @@
}
/* focusable content: anything w/ tabindex >=0 is focusable */
-abbr:focus, acronym:focus, address:focus, b:focus,
+abbr:focus, acronym:focus, address:focus, applet:focus, b:focus,
base:focus, big:focus, blockquote:focus, br:focus, canvas:focus, caption:focus,
center:focus, cite:focus, code:focus, col:focus, colgroup:focus, dd:focus,
del:focus, dfn:focus, dir:focus, div:focus, dl:focus, dt:focus, em:focus,
fieldset:focus, font:focus, form:focus, h1:focus, h2:focus, h3:focus, h4:focus,
h5:focus, h6:focus, hr:focus, i:focus, img:focus, ins:focus,
kbd:focus, label:focus, legend:focus, li:focus, link:focus, menu:focus,
-ol:focus, p:focus, pre:focus, q:focus, s:focus, samp:focus,
+object:focus, ol:focus, p:focus, pre:focus, q:focus, s:focus, samp:focus,
small:focus, span:focus, strike:focus, strong:focus, sub:focus, sup:focus,
table:focus, tbody:focus, td:focus, tfoot:focus, th:focus, thead:focus,
tr:focus, tt:focus, u:focus, ul:focus, var:focus {
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/updater
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpcshell
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpidl
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpt_dump
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpt_link
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner 2010-08-03 18:49:00 UTC (rev 23884)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner 2010-08-03 19:25:10 UTC (rev 23885)
@@ -50,7 +50,7 @@
#uncomment for debugging
#set -x
-moz_libdir=/usr/local/lib/xulrunner-1.9.2.6
+moz_libdir=/usr/local/lib/xulrunner-1.9.2
# Use run-mozilla.sh in the current dir if it exists
# If not, then start resolving symlinks until we find run-mozilla.sh
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner-bin
===================================================================
(Binary files differ)
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner-stub
===================================================================
(Binary files differ)
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r23884 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-03 14:49:00 -0400 (Tue, 03 Aug 2010)
New Revision: 23884
Modified:
trunk/build/target-platform/e36-wtp32.target
Log:
https://jira.jboss.org/browse/JBIDE-6429 add xulrunner 1.9.2 as binary update site dep
Modified: trunk/build/target-platform/e36-wtp32.target
===================================================================
--- trunk/build/target-platform/e36-wtp32.target 2010-08-03 18:44:57 UTC (rev 23883)
+++ trunk/build/target-platform/e36-wtp32.target 2010-08-03 18:49:00 UTC (rev 23884)
@@ -43,6 +43,11 @@
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/r..."/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.mozilla.xulrunner.feature" version="1.9.2"/>
+<unit id="org.mozilla.xpcom.feature" version="1.9.2"/>
+<repository location="http://download.jboss.org/jbosstools/updates/xulrunner-1.9.2/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.birt.feature.group" version="2.6.0.v20100531-9gF727DGKb0yl9AwWxpmbo35PwQ_"/>
<unit id="org.eclipse.ecf.core.feature.group" version="3.3.0.v20100607-0607"/>
<unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.8.0.v201005280400-7P9i0FDxNYrk4QYG-9qpz0N-vbEp"/>
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r23883 - in trunk/download.jboss.org/jbosstools/requirements/helios: OLD and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-03 14:44:57 -0400 (Tue, 03 Aug 2010)
New Revision: 23883
Added:
trunk/download.jboss.org/jbosstools/requirements/helios/OLD/
trunk/download.jboss.org/jbosstools/requirements/helios/xulrunner/
trunk/download.jboss.org/jbosstools/requirements/helios/xulrunner/README.txt
Log:
update readme for xulrunner; add OLD folder for storage of previous versions of deps
Property changes on: trunk/download.jboss.org/jbosstools/requirements/helios/OLD
___________________________________________________________________
Name: svn:ignore
+ *.zip
*.gz
*.jar
Property changes on: trunk/download.jboss.org/jbosstools/requirements/helios/xulrunner
___________________________________________________________________
Name: svn:ignore
+ *.zip
*.gz
*.jar
Added: trunk/download.jboss.org/jbosstools/requirements/helios/xulrunner/README.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/xulrunner/README.txt (rev 0)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/xulrunner/README.txt 2010-08-03 18:44:57 UTC (rev 23883)
@@ -0,0 +1,14 @@
+To build xpcom and xulrunner 1.9.2, use:
+
+ http://hudson.qa.jboss.com/hudson/view/DevStudio_Tycho/job/xulrunner-1.9.2/
+
+Results will be posted here:
+
+ http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/xulrunner-...
+
+and can be manually copied to here:
+
+ http://download.jboss.org/jbosstools/updates/xulrunner-1.9.2/
+
+for use in downstream builds.
+
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r23882 - in trunk/build/target-platform: OLD and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-03 12:27:01 -0400 (Tue, 03 Aug 2010)
New Revision: 23882
Added:
trunk/build/target-platform/OLD/
trunk/build/target-platform/OLD/e36-wtp32-svn.target
trunk/build/target-platform/OLD/e36-wtp32-svn.unversioned.target
trunk/build/target-platform/OLD/e36-wtp32.unversioned.target
trunk/build/target-platform/OLD/m2e-e36.target
Removed:
trunk/build/target-platform/e36-wtp32-svn.target
trunk/build/target-platform/e36-wtp32-svn.unversioned.target
trunk/build/target-platform/e36-wtp32.unversioned.target
trunk/build/target-platform/m2e-e36.target
Log:
move old target files into OLD subdir to unclutter/simplify
Added: trunk/build/target-platform/OLD/e36-wtp32-svn.target
===================================================================
--- trunk/build/target-platform/OLD/e36-wtp32-svn.target (rev 0)
+++ trunk/build/target-platform/OLD/e36-wtp32-svn.target 2010-08-03 16:27:01 UTC (rev 23882)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.6"?>
+
+<target includeMode="feature" name="e36-wtp32">
+<locations>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.0.20100209-0800"/>
+<repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.0.568-dev-e36"/>
+<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100617-1315-35-7w3121172802426"/>
+<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.0.v20100427-57B-85wFdAHO16f8kRo1_ft1IUwD"/>
+<unit id="org.eclipse.birt.feature.group" version="2.6.0.v20100531-9gF727DGKb0yl9AwWxpmbo35PwQ_"/>
+<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
+</location>
+<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/birt/update-site/2.6-interim/"/>
+</location> -->
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.10.0.20100209-0800"/>
+<repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
+<unit id="org.maven.ide.eclipse.sdk.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.subclipse.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.cvs.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.scm.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.temporary.mojos.feature.feature.group" version="0.10.0.20100209-0800"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.tmatesoft.svnkit.feature.group" version="1.3.3.6648"/>
+<unit id="com.sun.jna.feature.group" version="3.2.3"/>
+<repository location="http://eclipse.svnkit.com/1.3.x/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.polarion.eclipse.team.svn.connector.svnkit15.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl15.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl15.win32.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.svnkit16.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl16.win32.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl16.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl.win32.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.svnkit.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.source.feature.group" version="2.2.2.I20100512-1900"/>
+<repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.team.svn.mylyn.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.source.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.resource.ignore.rules.jdt.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.revision.graph.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.nl1.feature.group" version="0.7.9.I20100512-1900"/>
+<repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="javax.wsdl" version="1.6.2.v201005080631"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u..."/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.birt.feature.group" version="2.6.0.v20100531-9gF727DGKb0yl9AwWxpmbo35PwQ_"/>
+<unit id="org.eclipse.ecf.core.feature.group" version="3.3.0.v20100607-0607"/>
+<unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.8.0.v201005280400-7P9i0FDxNYrk4QYG-9qpz0N-vbEp"/>
+<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.0.v20100427-57B-85wFdAHO16f8kRo1_ft1IUwD"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.6.0.v20100607-0756"/>
+<unit id="org.eclipse.pde.junit.runtime.standalone.feature.group" version="1.0.0.v20100526"/>
+<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.0.v20100427-7C-7BF9JgLWLMBMMAMsLL"/>
+<unit id="org.eclipse.gef.sdk.feature.group" version="3.6.0.v20100519-2050-7G7R-A5WNc7QL_fXBGjRZPUUiKPJ"/>
+<unit id="org.eclipse.zest.sdk.feature.group" version="1.2.0.v20100519-2050-679-8COKLDAKOXIET_YWTacZM9XR"/>
+<unit id="org.eclipse.xsd.sdk.feature.group" version="2.6.0.v20100607-0756"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.6.0.v20100526-0800-7z8XFUJFMTfCWGoVuHImpms9H155"/>
+<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.0.v201005241510-7H7AFUIDxumQGOb7ocjUR2Pvz-28"/>
+<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.0.v201005270528-7C78FGDF9JgLWLMBWz-Ose6"/>
+<unit id="org.eclipse.tptp.platform.runtime.feature.group" version="4.7.0.v201005032111-7u84-8ksiNsksbQ6UTB7dcy3RUlT"/>
+<unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.100.v20100526-208Z7w312114252964"/>
+<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj"/>
+<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.0.v201005241530-7H777BFAKlOiOX8lGdLp-67BD"/>
+<unit id="org.eclipse.jpt.feature.feature.group" version="2.3.0.v201005260000-7N7UEwFD3wTgbU_dxVnWV"/>
+<unit id="org.eclipse.jpt.eclipselink.feature.feature.group" version="2.3.0.v201005260000-7778BgBgJ9E99RIX999A"/>
+<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.0.v201005290030-377A78s73533D5L355B"/>
+<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.2.0.v201005241600-377A78s73533C6A6B39"/>
+<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.0.v201005241530-7b7GHTYFSK2W9kPaFClvz0O_NQmN"/>
+<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.0.v201005241510-7O7CFb3EMf84nP-FHuc10NTz--M3"/>
+<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.0.v201005241600-7S7WFAKFIpS---NRIS1pbfYBUIQ"/>
+<unit id="org.eclipse.jsf.feature.feature.group" version="3.2.0.v20100526-7E7I-F9JgLWLMBYy3114"/>
+<unit id="org.eclipse.jpt.feature.feature.group" version="2.3.0.v201005260000-7N7UEwFD3wTgbU_dxVnWV"/>
+<unit id="org.eclipse.jpt.eclipselink.feature.feature.group" version="2.3.0.v201005260000-7778BgBgJ9E99RIX999A"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.6.0.v20100526-0800-7z8XFUJFMTfCWGoVuHImpms9H155"/>
+<unit id="org.eclipse.gef.sdk.feature.group" version="3.6.0.v20100519-2050-7G7R-A5WNc7QL_fXBGjRZPUUiKPJ"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.6.0.v20100607-0756"/>
+<unit id="org.eclipse.ecf.core.feature.group" version="3.3.0.v20100607-0607"/>
+<unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.8.0.v201005280400-7P9i0FDxNYrk4QYG-9qpz0N-vbEp"/>
+<repository location="http://download.eclipse.org/releases/helios/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/tptp/4.7.0/TPTP-4.7.0/repo/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="3.6.0.I20100603-1500"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
+</location>
+<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/eclipse/updates/3.6milestones/"/>
+</location> -->
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.emf.feature.group" version="2.6.0.v20100614-1136"/>
+<unit id="org.eclipse.emf.codegen.feature.group" version="2.6.0.v20100614-1136"/>
+<unit id="org.eclipse.emf.common.feature.group" version="2.6.0.v20100614-1136"/>
+<unit id="org.eclipse.emf.databinding.feature.group" version="1.2.0.v20100614-1136"/>
+<unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.6.0.v20100614-1136"/>
+<unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.6.0.v20100614-1136"/>
+<unit id="org.eclipse.emf.ecore.editor.feature.group" version="2.6.0.v20100614-1136"/>
+<unit id="org.eclipse.emf.ecore.feature.group" version="2.6.0.v20100614-1136"/>
+<unit id="org.eclipse.emf.edit.feature.group" version="2.6.0.v20100614-1136"/>
+<unit id="org.eclipse.xsd.feature.group" version="2.6.0.v20100614-1136"/>
+<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/"/>
+</location>
+</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+</target>
Added: trunk/build/target-platform/OLD/e36-wtp32-svn.unversioned.target
===================================================================
--- trunk/build/target-platform/OLD/e36-wtp32-svn.unversioned.target (rev 0)
+++ trunk/build/target-platform/OLD/e36-wtp32-svn.unversioned.target 2010-08-03 16:27:01 UTC (rev 23882)
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.6"?>
+
+<target includeMode="feature" name="e36-wtp32">
+<locations>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
+</location>
+<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/birt/update-site/2.6-interim/"/>
+</location> -->
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://eclipse.svnkit.com/1.3.x/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u..."/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/releases/helios/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/tptp/4.7.0/TPTP-4.7.0/repo/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
+</location>
+<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/eclipse/updates/3.6milestones/"/>
+</location> -->
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/"/>
+</location>
+</locations>
+<includeBundles>
+<plugin id="org.hamcrest.generator" />
+<plugin id="org.eclipse.tptp.platform.profile.server.core" />
+<plugin id="org.eclipse.platform.ide" />
+<plugin id="org.easymock" />
+<plugin id="javax.wsdl" />
+<plugin id="com.thoughtworks.qdox" />
+<feature id="org.maven.ide.eclipse.wtp.feature" />
+<feature id="org.maven.ide.eclipse.feature" />
+<feature id="org.eclipse.zest.sdk" />
+<feature id="org.eclipse.zest" />
+<feature id="org.eclipse.xsd.sdk" />
+<feature id="org.eclipse.xsd.mapping.editor" />
+<feature id="org.eclipse.xsd.mapping" />
+<feature id="org.eclipse.xsd.editor" />
+<feature id="org.eclipse.xsd.edit" />
+<feature id="org.eclipse.xsd.ecore.converter" />
+<feature id="org.eclipse.xsd.doc" />
+<feature id="org.eclipse.xsd" />
+<feature id="org.eclipse.wst.xsl.feature" />
+<feature id="org.eclipse.wst.xml.xpath2.processor.feature" />
+<feature id="org.eclipse.wst.xml_userdoc.feature" />
+<feature id="org.eclipse.wst.xml_ui.feature" />
+<feature id="org.eclipse.wst.xml_core.feature" />
+<feature id="org.eclipse.wst.ws_wsdl15.feature" />
+<feature id="org.eclipse.wst.ws_userdoc.feature" />
+<feature id="org.eclipse.wst.ws_ui.feature" />
+<feature id="org.eclipse.wst.ws_core.feature" />
+<feature id="org.eclipse.wst.web_userdoc.feature" />
+<feature id="org.eclipse.wst.web_ui.feature" />
+<feature id="org.eclipse.wst.web_core.feature" />
+<feature id="org.eclipse.wst.server_userdoc.feature" />
+<feature id="org.eclipse.wst.server_ui.feature" />
+<feature id="org.eclipse.wst.server_core.feature" />
+<feature id="org.eclipse.wst.server_adapters.feature" />
+<feature id="org.eclipse.wst.jsdt.feature" />
+<feature id="org.eclipse.wst.common_ui.feature" />
+<feature id="org.eclipse.wst.common.fproj" />
+<feature id="org.eclipse.wst.common_core.feature" />
+<feature id="org.eclipse.tptp.platform.xerces" />
+<feature id="org.eclipse.tptp.platform.trace" />
+<feature id="org.eclipse.tptp.platform.samples" />
+<feature id="org.eclipse.tptp.platform.runtime" />
+<feature id="org.eclipse.tptp.platform.report" />
+<feature id="org.eclipse.tptp.platform.profile.server" />
+<feature id="org.eclipse.tptp.platform.probekit.doc.user" />
+<feature id="org.eclipse.tptp.platform.probekit" />
+<feature id="org.eclipse.tptp.platform.jvmti" />
+<feature id="org.eclipse.tptp.platform.jakarta.log4j" />
+<feature id="org.eclipse.tptp.platform.integration.pde" />
+<feature id="org.eclipse.tptp.platform.instrumentation.ui" />
+<feature id="org.eclipse.tptp.platform.doc.user" />
+<feature id="org.eclipse.tptp.platform.core.doc.user" />
+<feature id="org.eclipse.tptp.platform.core" />
+<feature id="org.eclipse.tptp.platform.commons.logging" />
+<feature id="org.eclipse.tptp.platform.batik.pdf" />
+<feature id="org.eclipse.tptp.platform.batik" />
+<feature id="org.eclipse.swtbot.ide" />
+<feature id="org.eclipse.swtbot.eclipse.test.junit4" />
+<feature id="org.eclipse.swtbot.eclipse.gef" />
+<feature id="org.eclipse.swtbot.eclipse" />
+<feature id="org.eclipse.swtbot" />
+<feature id="org.eclipse.rcp" />
+<feature id="org.eclipse.rap.tooling" />
+<feature id="org.eclipse.platform" />
+<feature id="org.eclipse.pde.junit.runtime.standalone" />
+<feature id="org.eclipse.pde.api.tools.ee.fragments" />
+<feature id="org.eclipse.pde" />
+<feature id="org.eclipse.jst.ws.jaxws_userdoc.feature" />
+<feature id="org.eclipse.jst.ws.jaxws.feature" />
+<feature id="org.eclipse.jst.ws.jaxws.dom.feature" />
+<feature id="org.eclipse.jst.ws.cxf.feature" />
+<feature id="org.eclipse.jst.ws.axis2tools.feature" />
+<feature id="org.eclipse.jst.web_userdoc.feature" />
+<feature id="org.eclipse.jst.web_ui.feature" />
+<feature id="org.eclipse.jst.webpageeditor.feature" />
+<feature id="org.eclipse.jst.web_core.feature" />
+<feature id="org.eclipse.jst.server_userdoc.feature" />
+<feature id="org.eclipse.jst.server_ui.feature" />
+<feature id="org.eclipse.jst.server_core.feature" />
+<feature id="org.eclipse.jst.server_adapters.feature" />
+<feature id="org.eclipse.jst.server_adapters.ext.feature" />
+<feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature" />
+<feature id="org.eclipse.jst.enterprise_userdoc.feature" />
+<feature id="org.eclipse.jst.enterprise_ui.feature" />
+<feature id="org.eclipse.jst.enterprise_core.feature" />
+<feature id="org.eclipse.jst.common.fproj.enablement.jdt" />
+<feature id="org.eclipse.jsf.feature" />
+<feature id="org.eclipse.jpt.feature" />
+<feature id="org.eclipse.jpt.eclipselink.feature" />
+<feature id="org.eclipse.jdt" />
+<feature id="org.eclipse.help" />
+<feature id="org.eclipse.gef.sdk" />
+<feature id="org.eclipse.gef" />
+<feature id="org.eclipse.equinox.p2.user.ui" />
+<feature id="org.eclipse.emf.sdk" />
+<feature id="org.eclipse.emf.mapping.ui" />
+<feature id="org.eclipse.emf.mapping.ecore.editor" />
+<feature id="org.eclipse.emf.mapping.ecore" />
+<feature id="org.eclipse.emf.mapping" />
+<feature id="org.eclipse.emf.edit.ui" />
+<feature id="org.eclipse.emf.edit" />
+<feature id="org.eclipse.emf.ecore.editor" />
+<feature id="org.eclipse.emf.ecore.edit" />
+<feature id="org.eclipse.emf.ecore" />
+<feature id="org.eclipse.emf.doc" />
+<feature id="org.eclipse.emf.databinding.edit" />
+<feature id="org.eclipse.emf.databinding" />
+<feature id="org.eclipse.emf.converter" />
+<feature id="org.eclipse.emf.common.ui" />
+<feature id="org.eclipse.emf.common" />
+<feature id="org.eclipse.emf.codegen.ui" />
+<feature id="org.eclipse.emf.codegen.ecore.ui" />
+<feature id="org.eclipse.emf.codegen.ecore" />
+<feature id="org.eclipse.emf.codegen" />
+<feature id="org.eclipse.emf" />
+<feature id="org.eclipse.ecf.server.generic.feature" />
+<feature id="org.eclipse.ecf.remoteservice.soap.feature" />
+<feature id="org.eclipse.ecf.remoteservice.sdk.feature" />
+<feature id="org.eclipse.ecf.remoteservice.rosgi.feature" />
+<feature id="org.eclipse.ecf.remoteservice.rest.feature" />
+<feature id="org.eclipse.ecf.remoteservice.feature" />
+<feature id="org.eclipse.ecf.remoteservice.examples.feature" />
+<feature id="org.eclipse.ecf.osgi.services.feature" />
+<feature id="org.eclipse.ecf.eventadmin.feature" />
+<feature id="org.eclipse.ecf.eventadmin.examples.feature" />
+<feature id="org.eclipse.ecf.discovery.zookeeper.feature" />
+<feature id="org.eclipse.ecf.discovery.slp.feature" />
+<feature id="org.eclipse.ecf.discovery.local.feature" />
+<feature id="org.eclipse.ecf.discovery.jmdns.feature" />
+<feature id="org.eclipse.ecf.discovery.feature" />
+<feature id="org.eclipse.ecf.datashare.feature" />
+<feature id="org.eclipse.ecf.core" />
+<feature id="org.eclipse.draw2d.sdk" />
+<feature id="org.eclipse.draw2d" />
+<feature id="org.eclipse.datatools.sqltools.doc.user" />
+<feature id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature" />
+<feature id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature" />
+<feature id="org.eclipse.datatools.sqldevtools.results.feature" />
+<feature id="org.eclipse.datatools.sqldevtools.parsers.feature" />
+<feature id="org.eclipse.datatools.sqldevtools.feature" />
+<feature id="org.eclipse.datatools.sqldevtools.ddlgen.feature" />
+<feature id="org.eclipse.datatools.sqldevtools.ddl.feature" />
+<feature id="org.eclipse.datatools.sqldevtools.data.feature" />
+<feature id="org.eclipse.datatools.sdk.feature" />
+<feature id="org.eclipse.datatools.modelbase.feature" />
+<feature id="org.eclipse.datatools.intro" />
+<feature id="org.eclipse.datatools.enablement.sybase.feature" />
+<feature id="org.eclipse.datatools.enablement.sqlite.feature" />
+<feature id="org.eclipse.datatools.enablement.sap.feature" />
+<feature id="org.eclipse.datatools.enablement.postgresql.feature" />
+<feature id="org.eclipse.datatools.enablement.oracle.feature" />
+<feature id="org.eclipse.datatools.enablement.oda.feature" />
+<feature id="org.eclipse.datatools.enablement.oda.designer.feature" />
+<feature id="org.eclipse.datatools.enablement.mysql.feature" />
+<feature id="org.eclipse.datatools.enablement.msft.feature" />
+<feature id="org.eclipse.datatools.enablement.jdt.feature" />
+<feature id="org.eclipse.datatools.enablement.jdbc.feature" />
+<feature id="org.eclipse.datatools.enablement.ingres.feature" />
+<feature id="org.eclipse.datatools.enablement.ibm.feature" />
+<feature id="org.eclipse.datatools.enablement.hsqldb.feature" />
+<feature id="org.eclipse.datatools.enablement.feature" />
+<feature id="org.eclipse.datatools.enablement.apache.derby.feature" />
+<feature id="org.eclipse.datatools.doc.user" />
+<feature id="org.eclipse.datatools.connectivity.oda.feature" />
+<feature id="org.eclipse.datatools.connectivity.oda.designer.feature" />
+<feature id="org.eclipse.datatools.connectivity.oda.designer.core.feature" />
+<feature id="org.eclipse.datatools.connectivity.feature" />
+<feature id="org.eclipse.datatools.connectivity.doc.user" />
+<feature id="org.eclipse.datatools.common.doc.user" />
+<feature id="org.eclipse.birt.report.designer.editor.xml.wtp" />
+<feature id="org.eclipse.birt.osgi.runtime.sdk" />
+<feature id="org.eclipse.birt.osgi.runtime" />
+<feature id="org.eclipse.birt.integration.wtp" />
+<feature id="org.eclipse.birt" />
+<feature id="org.maven.ide.eclipse.sdk.feature"/>
+<feature id="org.maven.ide.eclipse.subclipse.feature"/>
+<feature id="org.maven.ide.eclipse.cvs.feature"/>
+<feature id="org.maven.ide.eclipse.scm.feature"/>
+<feature id="org.maven.ide.eclipse.temporary.mojos.feature"/>
+<feature id="org.tmatesoft.svnkit"/>
+<feature id="com.sun.jna"/>
+<feature id="org.eclipse.team.svn.mylyn"/>
+<feature id="org.eclipse.team.svn"/>
+<feature id="org.eclipse.team.svn.resource.ignore.rules.jdt"/>
+<feature id="org.eclipse.team.svn.revision.graph"/>
+<feature id="org.eclipse.team.svn.nl1"/>
+<feature id="org.polarion.eclipse.team.svn.connector.svnkit15"/>
+<feature id="org.polarion.eclipse.team.svn.connector.javahl15"/>
+<feature id="org.polarion.eclipse.team.svn.connector.javahl15.win32"/>
+<feature id="org.polarion.eclipse.team.svn.connector"/>
+<feature id="org.polarion.eclipse.team.svn.connector.svnkit16"/>
+<feature id="org.polarion.eclipse.team.svn.connector.javahl16.win32"/>
+<feature id="org.polarion.eclipse.team.svn.connector.javahl"/>
+<feature id="org.polarion.eclipse.team.svn.connector.javahl16"/>
+<feature id="org.polarion.eclipse.team.svn.connector.javahl.win32"/>
+<feature id="org.polarion.eclipse.team.svn.connector.svnkit"/>
+</includeBundles>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+</target>
Added: trunk/build/target-platform/OLD/e36-wtp32.unversioned.target
===================================================================
--- trunk/build/target-platform/OLD/e36-wtp32.unversioned.target (rev 0)
+++ trunk/build/target-platform/OLD/e36-wtp32.unversioned.target 2010-08-03 16:27:01 UTC (rev 23882)
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.6"?>
+
+<target includeMode="feature" name="e36-wtp32">
+<locations>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
+</location>
+<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/birt/update-site/2.6-interim/"/>
+</location> -->
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://eclipse.svnkit.com/1.3.x/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u..."/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/releases/helios/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/tptp/4.7.0/TPTP-4.7.0/repo/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/eclipse/updates/3.6.x/"/>
+</location>
+<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/eclipse/updates/3.6milestones/"/>
+</location> -->
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/webtools/downloads/drops/R3.2.0/R-3.2.0-20100..."/>
+</location>
+</locations>
+<includeBundles>
+<plugin id="org.hamcrest.generator" />
+<plugin id="org.eclipse.wst.common.emfworkbench.integration" />
+<plugin id="org.eclipse.tptp.platform.profile.server.core" />
+<plugin id="org.eclipse.platform.ide" />
+<plugin id="org.eclipse.core.runtime" />
+<plugin id="org.easymock" />
+<plugin id="javax.wsdl" />
+<plugin id="com.thoughtworks.qdox" />
+<feature id="org.maven.ide.eclipse.wtp.feature" />
+<feature id="org.maven.ide.eclipse.feature" />
+<feature id="org.eclipse.zest.sdk" />
+<feature id="org.eclipse.zest" />
+<feature id="org.eclipse.xsd.sdk" />
+<feature id="org.eclipse.xsd.mapping.editor" />
+<feature id="org.eclipse.xsd.mapping" />
+<feature id="org.eclipse.xsd.editor" />
+<feature id="org.eclipse.xsd.edit" />
+<feature id="org.eclipse.xsd.ecore.converter" />
+<feature id="org.eclipse.xsd.doc" />
+<feature id="org.eclipse.xsd" />
+<feature id="org.eclipse.wst.xsl.feature" />
+<feature id="org.eclipse.wst.xml.xpath2.processor.feature" />
+<feature id="org.eclipse.wst.xml_userdoc.feature" />
+<feature id="org.eclipse.wst.xml_ui.feature" />
+<feature id="org.eclipse.wst.xml_core.feature" />
+<feature id="org.eclipse.wst.ws_wsdl15.feature" />
+<feature id="org.eclipse.wst.ws_userdoc.feature" />
+<feature id="org.eclipse.wst.ws_ui.feature" />
+<feature id="org.eclipse.wst.ws_core.feature" />
+<feature id="org.eclipse.wst.web_userdoc.feature" />
+<feature id="org.eclipse.wst.web_ui.feature" />
+<feature id="org.eclipse.wst.web_core.feature" />
+<feature id="org.eclipse.wst.server_userdoc.feature" />
+<feature id="org.eclipse.wst.server_ui.feature" />
+<feature id="org.eclipse.wst.server_core.feature" />
+<feature id="org.eclipse.wst.server_adapters.feature" />
+<feature id="org.eclipse.wst.jsdt.feature" />
+<feature id="org.eclipse.wst.common_ui.feature" />
+<feature id="org.eclipse.wst.common.fproj" />
+<feature id="org.eclipse.wst.common_core.feature" />
+<feature id="org.eclipse.tptp.platform.xerces" />
+<feature id="org.eclipse.tptp.platform.trace" />
+<feature id="org.eclipse.tptp.platform.samples" />
+<feature id="org.eclipse.tptp.platform.runtime" />
+<feature id="org.eclipse.tptp.platform.report" />
+<feature id="org.eclipse.tptp.platform.profile.server" />
+<feature id="org.eclipse.tptp.platform.probekit.doc.user" />
+<feature id="org.eclipse.tptp.platform.probekit" />
+<feature id="org.eclipse.tptp.platform.jvmti" />
+<feature id="org.eclipse.tptp.platform.jakarta.log4j" />
+<feature id="org.eclipse.tptp.platform.integration.pde" />
+<feature id="org.eclipse.tptp.platform.instrumentation.ui" />
+<feature id="org.eclipse.tptp.platform.doc.user" />
+<feature id="org.eclipse.tptp.platform.core.doc.user" />
+<feature id="org.eclipse.tptp.platform.core" />
+<feature id="org.eclipse.tptp.platform.commons.logging" />
+<feature id="org.eclipse.tptp.platform.batik.pdf" />
+<feature id="org.eclipse.tptp.platform.batik" />
+<feature id="org.eclipse.swtbot.ide" />
+<feature id="org.eclipse.swtbot.eclipse.test.junit4" />
+<feature id="org.eclipse.swtbot.eclipse.gef" />
+<feature id="org.eclipse.swtbot.eclipse" />
+<feature id="org.eclipse.swtbot" />
+<feature id="org.eclipse.rcp" />
+<feature id="org.eclipse.rap.tooling" />
+<feature id="org.eclipse.platform" />
+<feature id="org.eclipse.pde.junit.runtime.standalone" />
+<feature id="org.eclipse.pde.api.tools.ee.fragments" />
+<feature id="org.eclipse.pde" />
+<feature id="org.eclipse.jst.ws.jaxws_userdoc.feature" />
+<feature id="org.eclipse.jst.ws.jaxws.feature" />
+<feature id="org.eclipse.jst.ws.jaxws.dom.feature" />
+<feature id="org.eclipse.jst.ws.cxf.feature" />
+<feature id="org.eclipse.jst.ws.axis2tools.feature" />
+<feature id="org.eclipse.jst.web_userdoc.feature" />
+<feature id="org.eclipse.jst.web_ui.feature" />
+<feature id="org.eclipse.jst.webpageeditor.feature" />
+<feature id="org.eclipse.jst.web_core.feature" />
+<feature id="org.eclipse.jst.server_userdoc.feature" />
+<feature id="org.eclipse.jst.server_ui.feature" />
+<feature id="org.eclipse.jst.server_core.feature" />
+<feature id="org.eclipse.jst.server_adapters.feature" />
+<feature id="org.eclipse.jst.server_adapters.ext.feature" />
+<feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature" />
+<feature id="org.eclipse.jst.enterprise_userdoc.feature" />
+<feature id="org.eclipse.jst.enterprise_ui.feature" />
+<feature id="org.eclipse.jst.enterprise_core.feature" />
+<feature id="org.eclipse.jst.common.fproj.enablement.jdt" />
+<feature id="org.eclipse.jsf.feature" />
+<feature id="org.eclipse.jpt.feature" />
+<feature id="org.eclipse.jpt.eclipselink.feature" />
+<feature id="org.eclipse.jdt" />
+<feature id="org.eclipse.help" />
+<feature id="org.eclipse.gef.sdk" />
+<feature id="org.eclipse.gef" />
+<feature id="org.eclipse.equinox.p2.user.ui" />
+<feature id="org.eclipse.emf.sdk" />
+<feature id="org.eclipse.emf.mapping.ui" />
+<feature id="org.eclipse.emf.mapping.ecore.editor" />
+<feature id="org.eclipse.emf.mapping.ecore" />
+<feature id="org.eclipse.emf.mapping" />
+<feature id="org.eclipse.emf.edit.ui" />
+<feature id="org.eclipse.emf.edit" />
+<feature id="org.eclipse.emf.ecore.editor" />
+<feature id="org.eclipse.emf.ecore.edit" />
+<feature id="org.eclipse.emf.ecore" />
+<feature id="org.eclipse.emf.doc" />
+<feature id="org.eclipse.emf.databinding.edit" />
+<feature id="org.eclipse.emf.databinding" />
+<feature id="org.eclipse.emf.converter" />
+<feature id="org.eclipse.emf.common.ui" />
+<feature id="org.eclipse.emf.common" />
+<feature id="org.eclipse.emf.codegen.ui" />
+<feature id="org.eclipse.emf.codegen.ecore.ui" />
+<feature id="org.eclipse.emf.codegen.ecore" />
+<feature id="org.eclipse.emf.codegen" />
+<feature id="org.eclipse.emf" />
+<feature id="org.eclipse.ecf.server.generic.feature" />
+<feature id="org.eclipse.ecf.remoteservice.soap.feature" />
+<feature id="org.eclipse.ecf.remoteservice.sdk.feature" />
+<feature id="org.eclipse.ecf.remoteservice.rosgi.feature" />
+<feature id="org.eclipse.ecf.remoteservice.rest.feature" />
+<feature id="org.eclipse.ecf.remoteservice.feature" />
+<feature id="org.eclipse.ecf.remoteservice.examples.feature" />
+<feature id="org.eclipse.ecf.osgi.services.feature" />
+<feature id="org.eclipse.ecf.eventadmin.feature" />
+<feature id="org.eclipse.ecf.eventadmin.examples.feature" />
+<feature id="org.eclipse.ecf.discovery.zookeeper.feature" />
+<feature id="org.eclipse.ecf.discovery.slp.feature" />
+<feature id="org.eclipse.ecf.discovery.local.feature" />
+<feature id="org.eclipse.ecf.discovery.jmdns.feature" />
+<feature id="org.eclipse.ecf.discovery.feature" />
+<feature id="org.eclipse.ecf.datashare.feature" />
+<feature id="org.eclipse.ecf.core" />
+<feature id="org.eclipse.draw2d.sdk" />
+<feature id="org.eclipse.draw2d" />
+<feature id="org.eclipse.datatools.sqltools.doc.user" />
+<feature id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature" />
+<feature id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature" />
+<feature id="org.eclipse.datatools.sqldevtools.results.feature" />
+<feature id="org.eclipse.datatools.sqldevtools.parsers.feature" />
+<feature id="org.eclipse.datatools.sqldevtools.feature" />
+<feature id="org.eclipse.datatools.sqldevtools.ddlgen.feature" />
+<feature id="org.eclipse.datatools.sqldevtools.ddl.feature" />
+<feature id="org.eclipse.datatools.sqldevtools.data.feature" />
+<feature id="org.eclipse.datatools.sdk.feature" />
+<feature id="org.eclipse.datatools.modelbase.feature" />
+<feature id="org.eclipse.datatools.intro" />
+<feature id="org.eclipse.datatools.enablement.sybase.feature" />
+<feature id="org.eclipse.datatools.enablement.sqlite.feature" />
+<feature id="org.eclipse.datatools.enablement.sap.feature" />
+<feature id="org.eclipse.datatools.enablement.postgresql.feature" />
+<feature id="org.eclipse.datatools.enablement.oracle.feature" />
+<feature id="org.eclipse.datatools.enablement.oda.feature" />
+<feature id="org.eclipse.datatools.enablement.oda.designer.feature" />
+<feature id="org.eclipse.datatools.enablement.mysql.feature" />
+<feature id="org.eclipse.datatools.enablement.msft.feature" />
+<feature id="org.eclipse.datatools.enablement.jdt.feature" />
+<feature id="org.eclipse.datatools.enablement.jdbc.feature" />
+<feature id="org.eclipse.datatools.enablement.ingres.feature" />
+<feature id="org.eclipse.datatools.enablement.ibm.feature" />
+<feature id="org.eclipse.datatools.enablement.hsqldb.feature" />
+<feature id="org.eclipse.datatools.enablement.feature" />
+<feature id="org.eclipse.datatools.enablement.apache.derby.feature" />
+<feature id="org.eclipse.datatools.doc.user" />
+<feature id="org.eclipse.datatools.connectivity.oda.feature" />
+<feature id="org.eclipse.datatools.connectivity.oda.designer.feature" />
+<feature id="org.eclipse.datatools.connectivity.oda.designer.core.feature" />
+<feature id="org.eclipse.datatools.connectivity.feature" />
+<feature id="org.eclipse.datatools.connectivity.doc.user" />
+<feature id="org.eclipse.datatools.common.doc.user" />
+<feature id="org.eclipse.birt.report.designer.editor.xml.wtp" />
+<feature id="org.eclipse.birt.osgi.runtime.sdk" />
+<feature id="org.eclipse.birt.osgi.runtime" />
+<feature id="org.eclipse.birt.integration.wtp" />
+<feature id="org.eclipse.birt" />
+</includeBundles>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+</target>
Added: trunk/build/target-platform/OLD/m2e-e36.target
===================================================================
--- trunk/build/target-platform/OLD/m2e-e36.target (rev 0)
+++ trunk/build/target-platform/OLD/m2e-e36.target 2010-08-03 16:27:01 UTC (rev 23882)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+
+<target name="m2e-e36">
+<locations>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.sdk.ide" version="3.6.0.I20100527-1700"/>
+<unit id="org.eclipse.emf.common.feature.group" version="2.6.0.v20100527-1920"/>
+<unit id="org.eclipse.wst.common.emf" version="1.2.0.v201005200700"/>
+<unit id="org.eclipse.wst.sse.core" version="1.1.500.v201005261534"/>
+<unit id="org.eclipse.wst.xml.core" version="1.1.500.v201005271618"/>
+<unit id="org.eclipse.zest.sdk.feature.group" version="1.2.0.v20100519-2050-679-8COKLDAKOXIET_YWTacZM9XR"/>
+<unit id="org.eclipse.wst.sse.ui" version="1.2.0.v201005130131"/>
+<unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.6.0.v20100527-1920"/>
+<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.6.0.v20100527-1920"/>
+<unit id="org.eclipse.wst.xsd.core" version="1.1.501.v201004110600"/>
+<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.0.v201005241510-7O7CFb3EMf84nOyJKuT05LU72RId"/>
+<repository location="http://download.eclipse.org/releases/helios"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit3.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.0.568-dev-e36"/>
+<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
+</location>
+</locations>
+</target>
Deleted: trunk/build/target-platform/e36-wtp32-svn.target
===================================================================
--- trunk/build/target-platform/e36-wtp32-svn.target 2010-08-03 16:07:13 UTC (rev 23881)
+++ trunk/build/target-platform/e36-wtp32-svn.target 2010-08-03 16:27:01 UTC (rev 23882)
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.6"?>
-
-<target includeMode="feature" name="e36-wtp32">
-<locations>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.0.20100209-0800"/>
-<repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.568-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.0.568-dev-e36"/>
-<unit id="org.eclipse.swtbot.feature.group" version="2.0.0.568-dev-e36"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.0.568-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.0.568-dev-e36"/>
-<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100617-1315-35-7w3121172802426"/>
-<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.0.v20100427-57B-85wFdAHO16f8kRo1_ft1IUwD"/>
-<unit id="org.eclipse.birt.feature.group" version="2.6.0.v20100531-9gF727DGKb0yl9AwWxpmbo35PwQ_"/>
-<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
-</location>
-<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/birt/update-site/2.6-interim/"/>
-</location> -->
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.10.0.20100209-0800"/>
-<repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
-<unit id="org.maven.ide.eclipse.sdk.feature.feature.group" version="0.10.0.20100209-0800"/>
-<unit id="org.maven.ide.eclipse.subclipse.feature.feature.group" version="0.10.0.20100209-0800"/>
-<unit id="org.maven.ide.eclipse.cvs.feature.feature.group" version="0.10.0.20100209-0800"/>
-<unit id="org.maven.ide.eclipse.scm.feature.feature.group" version="0.10.0.20100209-0800"/>
-<unit id="org.maven.ide.eclipse.temporary.mojos.feature.feature.group" version="0.10.0.20100209-0800"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.tmatesoft.svnkit.feature.group" version="1.3.3.6648"/>
-<unit id="com.sun.jna.feature.group" version="3.2.3"/>
-<repository location="http://eclipse.svnkit.com/1.3.x/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.polarion.eclipse.team.svn.connector.svnkit15.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.javahl15.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.javahl15.win32.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.svnkit16.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.javahl16.win32.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.javahl.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.javahl16.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.javahl.win32.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.svnkit.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.source.feature.group" version="2.2.2.I20100512-1900"/>
-<repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.team.svn.mylyn.feature.group" version="0.7.9.I20100512-1900"/>
-<unit id="org.eclipse.team.svn.source.feature.group" version="0.7.9.I20100512-1900"/>
-<unit id="org.eclipse.team.svn.feature.group" version="0.7.9.I20100512-1900"/>
-<unit id="org.eclipse.team.svn.resource.ignore.rules.jdt.feature.group" version="0.7.9.I20100512-1900"/>
-<unit id="org.eclipse.team.svn.revision.graph.feature.group" version="0.7.9.I20100512-1900"/>
-<unit id="org.eclipse.team.svn.nl1.feature.group" version="0.7.9.I20100512-1900"/>
-<repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="javax.wsdl" version="1.6.2.v201005080631"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u..."/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.birt.feature.group" version="2.6.0.v20100531-9gF727DGKb0yl9AwWxpmbo35PwQ_"/>
-<unit id="org.eclipse.ecf.core.feature.group" version="3.3.0.v20100607-0607"/>
-<unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.8.0.v201005280400-7P9i0FDxNYrk4QYG-9qpz0N-vbEp"/>
-<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.0.v20100427-57B-85wFdAHO16f8kRo1_ft1IUwD"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.6.0.v20100607-0756"/>
-<unit id="org.eclipse.pde.junit.runtime.standalone.feature.group" version="1.0.0.v20100526"/>
-<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.0.v20100427-7C-7BF9JgLWLMBMMAMsLL"/>
-<unit id="org.eclipse.gef.sdk.feature.group" version="3.6.0.v20100519-2050-7G7R-A5WNc7QL_fXBGjRZPUUiKPJ"/>
-<unit id="org.eclipse.zest.sdk.feature.group" version="1.2.0.v20100519-2050-679-8COKLDAKOXIET_YWTacZM9XR"/>
-<unit id="org.eclipse.xsd.sdk.feature.group" version="2.6.0.v20100607-0756"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.6.0.v20100526-0800-7z8XFUJFMTfCWGoVuHImpms9H155"/>
-<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.0.v201005241510-7H7AFUIDxumQGOb7ocjUR2Pvz-28"/>
-<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.0.v201005270528-7C78FGDF9JgLWLMBWz-Ose6"/>
-<unit id="org.eclipse.tptp.platform.runtime.feature.group" version="4.7.0.v201005032111-7u84-8ksiNsksbQ6UTB7dcy3RUlT"/>
-<unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.100.v20100526-208Z7w312114252964"/>
-<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj"/>
-<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.0.v201005241530-7H777BFAKlOiOX8lGdLp-67BD"/>
-<unit id="org.eclipse.jpt.feature.feature.group" version="2.3.0.v201005260000-7N7UEwFD3wTgbU_dxVnWV"/>
-<unit id="org.eclipse.jpt.eclipselink.feature.feature.group" version="2.3.0.v201005260000-7778BgBgJ9E99RIX999A"/>
-<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.0.v201005290030-377A78s73533D5L355B"/>
-<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.2.0.v201005241600-377A78s73533C6A6B39"/>
-<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.0.v201005241530-7b7GHTYFSK2W9kPaFClvz0O_NQmN"/>
-<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.0.v201005241510-7O7CFb3EMf84nP-FHuc10NTz--M3"/>
-<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.0.v201005241600-7S7WFAKFIpS---NRIS1pbfYBUIQ"/>
-<unit id="org.eclipse.jsf.feature.feature.group" version="3.2.0.v20100526-7E7I-F9JgLWLMBYy3114"/>
-<unit id="org.eclipse.jpt.feature.feature.group" version="2.3.0.v201005260000-7N7UEwFD3wTgbU_dxVnWV"/>
-<unit id="org.eclipse.jpt.eclipselink.feature.feature.group" version="2.3.0.v201005260000-7778BgBgJ9E99RIX999A"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.6.0.v20100526-0800-7z8XFUJFMTfCWGoVuHImpms9H155"/>
-<unit id="org.eclipse.gef.sdk.feature.group" version="3.6.0.v20100519-2050-7G7R-A5WNc7QL_fXBGjRZPUUiKPJ"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.6.0.v20100607-0756"/>
-<unit id="org.eclipse.ecf.core.feature.group" version="3.3.0.v20100607-0607"/>
-<unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.8.0.v201005280400-7P9i0FDxNYrk4QYG-9qpz0N-vbEp"/>
-<repository location="http://download.eclipse.org/releases/helios/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/tptp/4.7.0/TPTP-4.7.0/repo/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.platform.ide" version="3.6.0.I20100603-1500"/>
-<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
-</location>
-<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/eclipse/updates/3.6milestones/"/>
-</location> -->
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.emf.feature.group" version="2.6.0.v20100614-1136"/>
-<unit id="org.eclipse.emf.codegen.feature.group" version="2.6.0.v20100614-1136"/>
-<unit id="org.eclipse.emf.common.feature.group" version="2.6.0.v20100614-1136"/>
-<unit id="org.eclipse.emf.databinding.feature.group" version="1.2.0.v20100614-1136"/>
-<unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.6.0.v20100614-1136"/>
-<unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.6.0.v20100614-1136"/>
-<unit id="org.eclipse.emf.ecore.editor.feature.group" version="2.6.0.v20100614-1136"/>
-<unit id="org.eclipse.emf.ecore.feature.group" version="2.6.0.v20100614-1136"/>
-<unit id="org.eclipse.emf.edit.feature.group" version="2.6.0.v20100614-1136"/>
-<unit id="org.eclipse.xsd.feature.group" version="2.6.0.v20100614-1136"/>
-<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/"/>
-</location>
-</locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
Deleted: trunk/build/target-platform/e36-wtp32-svn.unversioned.target
===================================================================
--- trunk/build/target-platform/e36-wtp32-svn.unversioned.target 2010-08-03 16:07:13 UTC (rev 23881)
+++ trunk/build/target-platform/e36-wtp32-svn.unversioned.target 2010-08-03 16:27:01 UTC (rev 23882)
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.6"?>
-
-<target includeMode="feature" name="e36-wtp32">
-<locations>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
-</location>
-<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/birt/update-site/2.6-interim/"/>
-</location> -->
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://eclipse.svnkit.com/1.3.x/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u..."/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/releases/helios/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/tptp/4.7.0/TPTP-4.7.0/repo/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
-</location>
-<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/eclipse/updates/3.6milestones/"/>
-</location> -->
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/"/>
-</location>
-</locations>
-<includeBundles>
-<plugin id="org.hamcrest.generator" />
-<plugin id="org.eclipse.tptp.platform.profile.server.core" />
-<plugin id="org.eclipse.platform.ide" />
-<plugin id="org.easymock" />
-<plugin id="javax.wsdl" />
-<plugin id="com.thoughtworks.qdox" />
-<feature id="org.maven.ide.eclipse.wtp.feature" />
-<feature id="org.maven.ide.eclipse.feature" />
-<feature id="org.eclipse.zest.sdk" />
-<feature id="org.eclipse.zest" />
-<feature id="org.eclipse.xsd.sdk" />
-<feature id="org.eclipse.xsd.mapping.editor" />
-<feature id="org.eclipse.xsd.mapping" />
-<feature id="org.eclipse.xsd.editor" />
-<feature id="org.eclipse.xsd.edit" />
-<feature id="org.eclipse.xsd.ecore.converter" />
-<feature id="org.eclipse.xsd.doc" />
-<feature id="org.eclipse.xsd" />
-<feature id="org.eclipse.wst.xsl.feature" />
-<feature id="org.eclipse.wst.xml.xpath2.processor.feature" />
-<feature id="org.eclipse.wst.xml_userdoc.feature" />
-<feature id="org.eclipse.wst.xml_ui.feature" />
-<feature id="org.eclipse.wst.xml_core.feature" />
-<feature id="org.eclipse.wst.ws_wsdl15.feature" />
-<feature id="org.eclipse.wst.ws_userdoc.feature" />
-<feature id="org.eclipse.wst.ws_ui.feature" />
-<feature id="org.eclipse.wst.ws_core.feature" />
-<feature id="org.eclipse.wst.web_userdoc.feature" />
-<feature id="org.eclipse.wst.web_ui.feature" />
-<feature id="org.eclipse.wst.web_core.feature" />
-<feature id="org.eclipse.wst.server_userdoc.feature" />
-<feature id="org.eclipse.wst.server_ui.feature" />
-<feature id="org.eclipse.wst.server_core.feature" />
-<feature id="org.eclipse.wst.server_adapters.feature" />
-<feature id="org.eclipse.wst.jsdt.feature" />
-<feature id="org.eclipse.wst.common_ui.feature" />
-<feature id="org.eclipse.wst.common.fproj" />
-<feature id="org.eclipse.wst.common_core.feature" />
-<feature id="org.eclipse.tptp.platform.xerces" />
-<feature id="org.eclipse.tptp.platform.trace" />
-<feature id="org.eclipse.tptp.platform.samples" />
-<feature id="org.eclipse.tptp.platform.runtime" />
-<feature id="org.eclipse.tptp.platform.report" />
-<feature id="org.eclipse.tptp.platform.profile.server" />
-<feature id="org.eclipse.tptp.platform.probekit.doc.user" />
-<feature id="org.eclipse.tptp.platform.probekit" />
-<feature id="org.eclipse.tptp.platform.jvmti" />
-<feature id="org.eclipse.tptp.platform.jakarta.log4j" />
-<feature id="org.eclipse.tptp.platform.integration.pde" />
-<feature id="org.eclipse.tptp.platform.instrumentation.ui" />
-<feature id="org.eclipse.tptp.platform.doc.user" />
-<feature id="org.eclipse.tptp.platform.core.doc.user" />
-<feature id="org.eclipse.tptp.platform.core" />
-<feature id="org.eclipse.tptp.platform.commons.logging" />
-<feature id="org.eclipse.tptp.platform.batik.pdf" />
-<feature id="org.eclipse.tptp.platform.batik" />
-<feature id="org.eclipse.swtbot.ide" />
-<feature id="org.eclipse.swtbot.eclipse.test.junit4" />
-<feature id="org.eclipse.swtbot.eclipse.gef" />
-<feature id="org.eclipse.swtbot.eclipse" />
-<feature id="org.eclipse.swtbot" />
-<feature id="org.eclipse.rcp" />
-<feature id="org.eclipse.rap.tooling" />
-<feature id="org.eclipse.platform" />
-<feature id="org.eclipse.pde.junit.runtime.standalone" />
-<feature id="org.eclipse.pde.api.tools.ee.fragments" />
-<feature id="org.eclipse.pde" />
-<feature id="org.eclipse.jst.ws.jaxws_userdoc.feature" />
-<feature id="org.eclipse.jst.ws.jaxws.feature" />
-<feature id="org.eclipse.jst.ws.jaxws.dom.feature" />
-<feature id="org.eclipse.jst.ws.cxf.feature" />
-<feature id="org.eclipse.jst.ws.axis2tools.feature" />
-<feature id="org.eclipse.jst.web_userdoc.feature" />
-<feature id="org.eclipse.jst.web_ui.feature" />
-<feature id="org.eclipse.jst.webpageeditor.feature" />
-<feature id="org.eclipse.jst.web_core.feature" />
-<feature id="org.eclipse.jst.server_userdoc.feature" />
-<feature id="org.eclipse.jst.server_ui.feature" />
-<feature id="org.eclipse.jst.server_core.feature" />
-<feature id="org.eclipse.jst.server_adapters.feature" />
-<feature id="org.eclipse.jst.server_adapters.ext.feature" />
-<feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature" />
-<feature id="org.eclipse.jst.enterprise_userdoc.feature" />
-<feature id="org.eclipse.jst.enterprise_ui.feature" />
-<feature id="org.eclipse.jst.enterprise_core.feature" />
-<feature id="org.eclipse.jst.common.fproj.enablement.jdt" />
-<feature id="org.eclipse.jsf.feature" />
-<feature id="org.eclipse.jpt.feature" />
-<feature id="org.eclipse.jpt.eclipselink.feature" />
-<feature id="org.eclipse.jdt" />
-<feature id="org.eclipse.help" />
-<feature id="org.eclipse.gef.sdk" />
-<feature id="org.eclipse.gef" />
-<feature id="org.eclipse.equinox.p2.user.ui" />
-<feature id="org.eclipse.emf.sdk" />
-<feature id="org.eclipse.emf.mapping.ui" />
-<feature id="org.eclipse.emf.mapping.ecore.editor" />
-<feature id="org.eclipse.emf.mapping.ecore" />
-<feature id="org.eclipse.emf.mapping" />
-<feature id="org.eclipse.emf.edit.ui" />
-<feature id="org.eclipse.emf.edit" />
-<feature id="org.eclipse.emf.ecore.editor" />
-<feature id="org.eclipse.emf.ecore.edit" />
-<feature id="org.eclipse.emf.ecore" />
-<feature id="org.eclipse.emf.doc" />
-<feature id="org.eclipse.emf.databinding.edit" />
-<feature id="org.eclipse.emf.databinding" />
-<feature id="org.eclipse.emf.converter" />
-<feature id="org.eclipse.emf.common.ui" />
-<feature id="org.eclipse.emf.common" />
-<feature id="org.eclipse.emf.codegen.ui" />
-<feature id="org.eclipse.emf.codegen.ecore.ui" />
-<feature id="org.eclipse.emf.codegen.ecore" />
-<feature id="org.eclipse.emf.codegen" />
-<feature id="org.eclipse.emf" />
-<feature id="org.eclipse.ecf.server.generic.feature" />
-<feature id="org.eclipse.ecf.remoteservice.soap.feature" />
-<feature id="org.eclipse.ecf.remoteservice.sdk.feature" />
-<feature id="org.eclipse.ecf.remoteservice.rosgi.feature" />
-<feature id="org.eclipse.ecf.remoteservice.rest.feature" />
-<feature id="org.eclipse.ecf.remoteservice.feature" />
-<feature id="org.eclipse.ecf.remoteservice.examples.feature" />
-<feature id="org.eclipse.ecf.osgi.services.feature" />
-<feature id="org.eclipse.ecf.eventadmin.feature" />
-<feature id="org.eclipse.ecf.eventadmin.examples.feature" />
-<feature id="org.eclipse.ecf.discovery.zookeeper.feature" />
-<feature id="org.eclipse.ecf.discovery.slp.feature" />
-<feature id="org.eclipse.ecf.discovery.local.feature" />
-<feature id="org.eclipse.ecf.discovery.jmdns.feature" />
-<feature id="org.eclipse.ecf.discovery.feature" />
-<feature id="org.eclipse.ecf.datashare.feature" />
-<feature id="org.eclipse.ecf.core" />
-<feature id="org.eclipse.draw2d.sdk" />
-<feature id="org.eclipse.draw2d" />
-<feature id="org.eclipse.datatools.sqltools.doc.user" />
-<feature id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature" />
-<feature id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature" />
-<feature id="org.eclipse.datatools.sqldevtools.results.feature" />
-<feature id="org.eclipse.datatools.sqldevtools.parsers.feature" />
-<feature id="org.eclipse.datatools.sqldevtools.feature" />
-<feature id="org.eclipse.datatools.sqldevtools.ddlgen.feature" />
-<feature id="org.eclipse.datatools.sqldevtools.ddl.feature" />
-<feature id="org.eclipse.datatools.sqldevtools.data.feature" />
-<feature id="org.eclipse.datatools.sdk.feature" />
-<feature id="org.eclipse.datatools.modelbase.feature" />
-<feature id="org.eclipse.datatools.intro" />
-<feature id="org.eclipse.datatools.enablement.sybase.feature" />
-<feature id="org.eclipse.datatools.enablement.sqlite.feature" />
-<feature id="org.eclipse.datatools.enablement.sap.feature" />
-<feature id="org.eclipse.datatools.enablement.postgresql.feature" />
-<feature id="org.eclipse.datatools.enablement.oracle.feature" />
-<feature id="org.eclipse.datatools.enablement.oda.feature" />
-<feature id="org.eclipse.datatools.enablement.oda.designer.feature" />
-<feature id="org.eclipse.datatools.enablement.mysql.feature" />
-<feature id="org.eclipse.datatools.enablement.msft.feature" />
-<feature id="org.eclipse.datatools.enablement.jdt.feature" />
-<feature id="org.eclipse.datatools.enablement.jdbc.feature" />
-<feature id="org.eclipse.datatools.enablement.ingres.feature" />
-<feature id="org.eclipse.datatools.enablement.ibm.feature" />
-<feature id="org.eclipse.datatools.enablement.hsqldb.feature" />
-<feature id="org.eclipse.datatools.enablement.feature" />
-<feature id="org.eclipse.datatools.enablement.apache.derby.feature" />
-<feature id="org.eclipse.datatools.doc.user" />
-<feature id="org.eclipse.datatools.connectivity.oda.feature" />
-<feature id="org.eclipse.datatools.connectivity.oda.designer.feature" />
-<feature id="org.eclipse.datatools.connectivity.oda.designer.core.feature" />
-<feature id="org.eclipse.datatools.connectivity.feature" />
-<feature id="org.eclipse.datatools.connectivity.doc.user" />
-<feature id="org.eclipse.datatools.common.doc.user" />
-<feature id="org.eclipse.birt.report.designer.editor.xml.wtp" />
-<feature id="org.eclipse.birt.osgi.runtime.sdk" />
-<feature id="org.eclipse.birt.osgi.runtime" />
-<feature id="org.eclipse.birt.integration.wtp" />
-<feature id="org.eclipse.birt" />
-<feature id="org.maven.ide.eclipse.sdk.feature"/>
-<feature id="org.maven.ide.eclipse.subclipse.feature"/>
-<feature id="org.maven.ide.eclipse.cvs.feature"/>
-<feature id="org.maven.ide.eclipse.scm.feature"/>
-<feature id="org.maven.ide.eclipse.temporary.mojos.feature"/>
-<feature id="org.tmatesoft.svnkit"/>
-<feature id="com.sun.jna"/>
-<feature id="org.eclipse.team.svn.mylyn"/>
-<feature id="org.eclipse.team.svn"/>
-<feature id="org.eclipse.team.svn.resource.ignore.rules.jdt"/>
-<feature id="org.eclipse.team.svn.revision.graph"/>
-<feature id="org.eclipse.team.svn.nl1"/>
-<feature id="org.polarion.eclipse.team.svn.connector.svnkit15"/>
-<feature id="org.polarion.eclipse.team.svn.connector.javahl15"/>
-<feature id="org.polarion.eclipse.team.svn.connector.javahl15.win32"/>
-<feature id="org.polarion.eclipse.team.svn.connector"/>
-<feature id="org.polarion.eclipse.team.svn.connector.svnkit16"/>
-<feature id="org.polarion.eclipse.team.svn.connector.javahl16.win32"/>
-<feature id="org.polarion.eclipse.team.svn.connector.javahl"/>
-<feature id="org.polarion.eclipse.team.svn.connector.javahl16"/>
-<feature id="org.polarion.eclipse.team.svn.connector.javahl.win32"/>
-<feature id="org.polarion.eclipse.team.svn.connector.svnkit"/>
-</includeBundles>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
Deleted: trunk/build/target-platform/e36-wtp32.unversioned.target
===================================================================
--- trunk/build/target-platform/e36-wtp32.unversioned.target 2010-08-03 16:07:13 UTC (rev 23881)
+++ trunk/build/target-platform/e36-wtp32.unversioned.target 2010-08-03 16:27:01 UTC (rev 23882)
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.6"?>
-
-<target includeMode="feature" name="e36-wtp32">
-<locations>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
-</location>
-<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/birt/update-site/2.6-interim/"/>
-</location> -->
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://eclipse.svnkit.com/1.3.x/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u..."/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/releases/helios/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/tptp/4.7.0/TPTP-4.7.0/repo/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/eclipse/updates/3.6.x/"/>
-</location>
-<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/eclipse/updates/3.6milestones/"/>
-</location> -->
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/"/>
-</location>
-</locations>
-<includeBundles>
-<plugin id="org.hamcrest.generator" />
-<plugin id="org.eclipse.tptp.platform.profile.server.core" />
-<plugin id="org.eclipse.platform.ide" />
-<plugin id="org.eclipse.core.runtime"/>
-<plugin id="org.easymock" />
-<plugin id="javax.wsdl" />
-<plugin id="com.thoughtworks.qdox" />
-<feature id="org.maven.ide.eclipse.wtp.feature" />
-<feature id="org.maven.ide.eclipse.feature" />
-<feature id="org.eclipse.zest.sdk" />
-<feature id="org.eclipse.zest" />
-<feature id="org.eclipse.xsd.sdk" />
-<feature id="org.eclipse.xsd.mapping.editor" />
-<feature id="org.eclipse.xsd.mapping" />
-<feature id="org.eclipse.xsd.editor" />
-<feature id="org.eclipse.xsd.edit" />
-<feature id="org.eclipse.xsd.ecore.converter" />
-<feature id="org.eclipse.xsd.doc" />
-<feature id="org.eclipse.xsd" />
-<feature id="org.eclipse.wst.xsl.feature" />
-<feature id="org.eclipse.wst.xml.xpath2.processor.feature" />
-<feature id="org.eclipse.wst.xml_userdoc.feature" />
-<feature id="org.eclipse.wst.xml_ui.feature" />
-<feature id="org.eclipse.wst.xml_core.feature" />
-<feature id="org.eclipse.wst.ws_wsdl15.feature" />
-<feature id="org.eclipse.wst.ws_userdoc.feature" />
-<feature id="org.eclipse.wst.ws_ui.feature" />
-<feature id="org.eclipse.wst.ws_core.feature" />
-<feature id="org.eclipse.wst.web_userdoc.feature" />
-<feature id="org.eclipse.wst.web_ui.feature" />
-<feature id="org.eclipse.wst.web_core.feature" />
-<feature id="org.eclipse.wst.server_userdoc.feature" />
-<feature id="org.eclipse.wst.server_ui.feature" />
-<feature id="org.eclipse.wst.server_core.feature" />
-<feature id="org.eclipse.wst.server_adapters.feature" />
-<feature id="org.eclipse.wst.jsdt.feature" />
-<feature id="org.eclipse.wst.common_ui.feature" />
-<feature id="org.eclipse.wst.common.fproj" />
-<feature id="org.eclipse.wst.common_core.feature" />
-<feature id="org.eclipse.tptp.platform.xerces" />
-<feature id="org.eclipse.tptp.platform.trace" />
-<feature id="org.eclipse.tptp.platform.samples" />
-<feature id="org.eclipse.tptp.platform.runtime" />
-<feature id="org.eclipse.tptp.platform.report" />
-<feature id="org.eclipse.tptp.platform.profile.server" />
-<feature id="org.eclipse.tptp.platform.probekit.doc.user" />
-<feature id="org.eclipse.tptp.platform.probekit" />
-<feature id="org.eclipse.tptp.platform.jvmti" />
-<feature id="org.eclipse.tptp.platform.jakarta.log4j" />
-<feature id="org.eclipse.tptp.platform.integration.pde" />
-<feature id="org.eclipse.tptp.platform.instrumentation.ui" />
-<feature id="org.eclipse.tptp.platform.doc.user" />
-<feature id="org.eclipse.tptp.platform.core.doc.user" />
-<feature id="org.eclipse.tptp.platform.core" />
-<feature id="org.eclipse.tptp.platform.commons.logging" />
-<feature id="org.eclipse.tptp.platform.batik.pdf" />
-<feature id="org.eclipse.tptp.platform.batik" />
-<feature id="org.eclipse.swtbot.ide" />
-<feature id="org.eclipse.swtbot.eclipse.test.junit4" />
-<feature id="org.eclipse.swtbot.eclipse.gef" />
-<feature id="org.eclipse.swtbot.eclipse" />
-<feature id="org.eclipse.swtbot" />
-<feature id="org.eclipse.rcp" />
-<feature id="org.eclipse.rap.tooling" />
-<feature id="org.eclipse.platform" />
-<feature id="org.eclipse.pde.junit.runtime.standalone" />
-<feature id="org.eclipse.pde.api.tools.ee.fragments" />
-<feature id="org.eclipse.pde" />
-<feature id="org.eclipse.jst.ws.jaxws_userdoc.feature" />
-<feature id="org.eclipse.jst.ws.jaxws.feature" />
-<feature id="org.eclipse.jst.ws.jaxws.dom.feature" />
-<feature id="org.eclipse.jst.ws.cxf.feature" />
-<feature id="org.eclipse.jst.ws.axis2tools.feature" />
-<feature id="org.eclipse.jst.web_userdoc.feature" />
-<feature id="org.eclipse.jst.web_ui.feature" />
-<feature id="org.eclipse.jst.webpageeditor.feature" />
-<feature id="org.eclipse.jst.web_core.feature" />
-<feature id="org.eclipse.jst.server_userdoc.feature" />
-<feature id="org.eclipse.jst.server_ui.feature" />
-<feature id="org.eclipse.jst.server_core.feature" />
-<feature id="org.eclipse.jst.server_adapters.feature" />
-<feature id="org.eclipse.jst.server_adapters.ext.feature" />
-<feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature" />
-<feature id="org.eclipse.jst.enterprise_userdoc.feature" />
-<feature id="org.eclipse.jst.enterprise_ui.feature" />
-<feature id="org.eclipse.jst.enterprise_core.feature" />
-<feature id="org.eclipse.jst.common.fproj.enablement.jdt" />
-<feature id="org.eclipse.jsf.feature" />
-<feature id="org.eclipse.jpt.feature" />
-<feature id="org.eclipse.jpt.eclipselink.feature" />
-<feature id="org.eclipse.jdt" />
-<feature id="org.eclipse.help" />
-<feature id="org.eclipse.gef.sdk" />
-<feature id="org.eclipse.gef" />
-<feature id="org.eclipse.equinox.p2.user.ui" />
-<feature id="org.eclipse.emf.sdk" />
-<feature id="org.eclipse.emf.mapping.ui" />
-<feature id="org.eclipse.emf.mapping.ecore.editor" />
-<feature id="org.eclipse.emf.mapping.ecore" />
-<feature id="org.eclipse.emf.mapping" />
-<feature id="org.eclipse.emf.edit.ui" />
-<feature id="org.eclipse.emf.edit" />
-<feature id="org.eclipse.emf.ecore.editor" />
-<feature id="org.eclipse.emf.ecore.edit" />
-<feature id="org.eclipse.emf.ecore" />
-<feature id="org.eclipse.emf.doc" />
-<feature id="org.eclipse.emf.databinding.edit" />
-<feature id="org.eclipse.emf.databinding" />
-<feature id="org.eclipse.emf.converter" />
-<feature id="org.eclipse.emf.common.ui" />
-<feature id="org.eclipse.emf.common" />
-<feature id="org.eclipse.emf.codegen.ui" />
-<feature id="org.eclipse.emf.codegen.ecore.ui" />
-<feature id="org.eclipse.emf.codegen.ecore" />
-<feature id="org.eclipse.emf.codegen" />
-<feature id="org.eclipse.emf" />
-<feature id="org.eclipse.ecf.server.generic.feature" />
-<feature id="org.eclipse.ecf.remoteservice.soap.feature" />
-<feature id="org.eclipse.ecf.remoteservice.sdk.feature" />
-<feature id="org.eclipse.ecf.remoteservice.rosgi.feature" />
-<feature id="org.eclipse.ecf.remoteservice.rest.feature" />
-<feature id="org.eclipse.ecf.remoteservice.feature" />
-<feature id="org.eclipse.ecf.remoteservice.examples.feature" />
-<feature id="org.eclipse.ecf.osgi.services.feature" />
-<feature id="org.eclipse.ecf.eventadmin.feature" />
-<feature id="org.eclipse.ecf.eventadmin.examples.feature" />
-<feature id="org.eclipse.ecf.discovery.zookeeper.feature" />
-<feature id="org.eclipse.ecf.discovery.slp.feature" />
-<feature id="org.eclipse.ecf.discovery.local.feature" />
-<feature id="org.eclipse.ecf.discovery.jmdns.feature" />
-<feature id="org.eclipse.ecf.discovery.feature" />
-<feature id="org.eclipse.ecf.datashare.feature" />
-<feature id="org.eclipse.ecf.core" />
-<feature id="org.eclipse.draw2d.sdk" />
-<feature id="org.eclipse.draw2d" />
-<feature id="org.eclipse.datatools.sqltools.doc.user" />
-<feature id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature" />
-<feature id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature" />
-<feature id="org.eclipse.datatools.sqldevtools.results.feature" />
-<feature id="org.eclipse.datatools.sqldevtools.parsers.feature" />
-<feature id="org.eclipse.datatools.sqldevtools.feature" />
-<feature id="org.eclipse.datatools.sqldevtools.ddlgen.feature" />
-<feature id="org.eclipse.datatools.sqldevtools.ddl.feature" />
-<feature id="org.eclipse.datatools.sqldevtools.data.feature" />
-<feature id="org.eclipse.datatools.sdk.feature" />
-<feature id="org.eclipse.datatools.modelbase.feature" />
-<feature id="org.eclipse.datatools.intro" />
-<feature id="org.eclipse.datatools.enablement.sybase.feature" />
-<feature id="org.eclipse.datatools.enablement.sqlite.feature" />
-<feature id="org.eclipse.datatools.enablement.sap.feature" />
-<feature id="org.eclipse.datatools.enablement.postgresql.feature" />
-<feature id="org.eclipse.datatools.enablement.oracle.feature" />
-<feature id="org.eclipse.datatools.enablement.oda.feature" />
-<feature id="org.eclipse.datatools.enablement.oda.designer.feature" />
-<feature id="org.eclipse.datatools.enablement.mysql.feature" />
-<feature id="org.eclipse.datatools.enablement.msft.feature" />
-<feature id="org.eclipse.datatools.enablement.jdt.feature" />
-<feature id="org.eclipse.datatools.enablement.jdbc.feature" />
-<feature id="org.eclipse.datatools.enablement.ingres.feature" />
-<feature id="org.eclipse.datatools.enablement.ibm.feature" />
-<feature id="org.eclipse.datatools.enablement.hsqldb.feature" />
-<feature id="org.eclipse.datatools.enablement.feature" />
-<feature id="org.eclipse.datatools.enablement.apache.derby.feature" />
-<feature id="org.eclipse.datatools.doc.user" />
-<feature id="org.eclipse.datatools.connectivity.oda.feature" />
-<feature id="org.eclipse.datatools.connectivity.oda.designer.feature" />
-<feature id="org.eclipse.datatools.connectivity.oda.designer.core.feature" />
-<feature id="org.eclipse.datatools.connectivity.feature" />
-<feature id="org.eclipse.datatools.connectivity.doc.user" />
-<feature id="org.eclipse.datatools.common.doc.user" />
-<feature id="org.eclipse.birt.report.designer.editor.xml.wtp" />
-<feature id="org.eclipse.birt.osgi.runtime.sdk" />
-<feature id="org.eclipse.birt.osgi.runtime" />
-<feature id="org.eclipse.birt.integration.wtp" />
-<feature id="org.eclipse.birt" />
-</includeBundles>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
Deleted: trunk/build/target-platform/m2e-e36.target
===================================================================
--- trunk/build/target-platform/m2e-e36.target 2010-08-03 16:07:13 UTC (rev 23881)
+++ trunk/build/target-platform/m2e-e36.target 2010-08-03 16:27:01 UTC (rev 23882)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-
-<target name="m2e-e36">
-<locations>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="3.6.0.I20100527-1700"/>
-<unit id="org.eclipse.emf.common.feature.group" version="2.6.0.v20100527-1920"/>
-<unit id="org.eclipse.wst.common.emf" version="1.2.0.v201005200700"/>
-<unit id="org.eclipse.wst.sse.core" version="1.1.500.v201005261534"/>
-<unit id="org.eclipse.wst.xml.core" version="1.1.500.v201005271618"/>
-<unit id="org.eclipse.zest.sdk.feature.group" version="1.2.0.v20100519-2050-679-8COKLDAKOXIET_YWTacZM9XR"/>
-<unit id="org.eclipse.wst.sse.ui" version="1.2.0.v201005130131"/>
-<unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.6.0.v20100527-1920"/>
-<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.6.0.v20100527-1920"/>
-<unit id="org.eclipse.wst.xsd.core" version="1.1.501.v201004110600"/>
-<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.0.v201005241510-7O7CFb3EMf84nOyJKuT05LU72RId"/>
-<repository location="http://download.eclipse.org/releases/helios"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.568-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.0.568-dev-e36"/>
-<unit id="org.eclipse.swtbot.feature.group" version="2.0.0.568-dev-e36"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.0.568-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.test.junit3.feature.group" version="2.0.0.568-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.0.568-dev-e36"/>
-<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
-</location>
-</locations>
-</target>
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r23881 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-08-03 12:07:13 -0400 (Tue, 03 Aug 2010)
New Revision: 23881
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/SeamPdf.xml
Log:
https://jira.jboss.org/browse/JBIDE-5231
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/SeamPdf.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/SeamPdf.xml 2010-08-03 16:02:51 UTC (rev 23880)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/SeamPdf.xml 2010-08-03 16:07:13 UTC (rev 23881)
@@ -3,9 +3,9 @@
<tag-lib defaultPrefix="p">
<component name="document">
- <description><CDATA[Documents are generated by facelets documents using tags in the http://jboss.com/products/seam/pdf namespace. Documents should always have the document tag at the root of the document. The document tag prepares Seam to generate a document into the DocumentStore and renders an HTML redirect to that stored content.]CDATA></description>
+ <description>Documents are generated by facelets documents using tags in the http://jboss.com/products/seam/pdf namespace. Documents should always have the document tag at the root of the document. The document tag prepares Seam to generate a document into the DocumentStore and renders an HTML redirect to that stored content.</description>
<attribute name="type">
- <description><CDATA[The type of the document to be produced. Valid values are PDF, RTF and HTML modes. Seam defaults to PDF generation, and many of the features only work correctly when generating PDF documents.]CDATA></description>
+ <description>The type of the document to be produced. Valid values are PDF, RTF and HTML modes. Seam defaults to PDF generation, and many of the features only work correctly when generating PDF documents.</description>
<proposal type="enumeration">
<param value="PDF" />
<param value="RTF" />
@@ -13,24 +13,24 @@
</proposal>
</attribute>
<attribute name="pageSize">
- <description><CDATA[The size of the page to be generate. The most commonly used values would be LETTER and A4. A full list of supported pages sizes can be found in com.lowagie.text.PageSize class. Alternatively, pageSize can provide the width and height of the page directly. The value "612 792", for example, is equivalent to the LETTER page size.]CDATA></description>
+ <description>The size of the page to be generate. The most commonly used values would be LETTER and A4. A full list of supported pages sizes can be found in com.lowagie.text.PageSize class. Alternatively, pageSize can provide the width and height of the page directly. The value "612 792", for example, is equivalent to the LETTER page size.</description>
<proposal type="enumeration">
<param value="LETTER" />
<param value="A4" />
</proposal>
</attribute>
<attribute name="orientation">
- <description><CDATA[The orientation of the page. Valid values are portrait and landscape. In landscape mode, the height and width page size values are reversed.]CDATA></description>
+ <description>The orientation of the page. Valid values are portrait and landscape. In landscape mode, the height and width page size values are reversed.</description>
<proposal type="enumeration">
<param value="portrait" />
<param value="landscape" />
</proposal>
</attribute>
<attribute name="margins">
- <description><CDATA[The left, right, top and bottom margin values.]CDATA></description>
+ <description>The left, right, top and bottom margin values.</description>
</attribute>
<attribute name="marginMirroring">
- <description><CDATA[Indicates that margin settings should be reversed an alternating pages.]CDATA></description>
+ <description>Indicates that margin settings should be reversed an alternating pages.</description>
</attribute>
<attribute name="title" />
<attribute name="subject" />
@@ -40,16 +40,16 @@
</component>
<component name="paragraph">
- <description><CDATA[Most uses of text should be sectioned into paragraphs so that text fragments can be flowed, formatted and styled in logical groups.]CDATA></description>
+ <description>Most uses of text should be sectioned into paragraphs so that text fragments can be flowed, formatted and styled in logical groups.</description>
<attribute name="firstLineIndent" />
<attribute name="extraParagraphSpace" />
<attribute name="leading" />
<attribute name="multipliedLeading" />
<attribute name="spacingBefore">
- <description><CDATA[The blank space to be inserted before the element.]CDATA></description>
+ <description>The blank space to be inserted before the element.</description>
</attribute>
<attribute name="spacingAfter">
- <description><CDATA[The blank space to be inserted after the element.]CDATA></description>
+ <description>The blank space to be inserted after the element.</description>
</attribute>
<attribute name="indentationLeft" />
<attribute name="indentationRight" />
@@ -57,22 +57,22 @@
</component>
<component name="text">
- <description><CDATA[The text tag allows text fragments to be produced from application data using normal JSF converter mechanisms. It is very similar to the outputText tag used when rendering HTML documents.]CDATA></description>
+ <description>The text tag allows text fragments to be produced from application data using normal JSF converter mechanisms. It is very similar to the outputText tag used when rendering HTML documents.</description>
<attribute name="value">
- <description><CDATA[The value to be displayed. This will typically be a value binding expression.]CDATA></description>
+ <description>The value to be displayed. This will typically be a value binding expression.</description>
</attribute>
</component>
<component name="font">
- <description><CDATA[The font tag defines the default font to be used for all text inside of it.]CDATA></description>
+ <description>The font tag defines the default font to be used for all text inside of it.</description>
<attribute name="name">
- <description><CDATA[The font name, for example: COURIER, HELVETICA, TIMES-ROMAN, SYMBOL or ZAPFDINGBATS.]CDATA></description>
+ <description>The font name, for example: COURIER, HELVETICA, TIMES-ROMAN, SYMBOL or ZAPFDINGBATS.</description>
</attribute>
<attribute name="size">
- <description><CDATA[The point size of the font.]CDATA></description>
+ <description>The point size of the font.</description>
</attribute>
<attribute name="style">
- <description><CDATA[The font styles. Any combination of : NORMAL, BOLD, ITALIC, OBLIQUE, UNDERLINE, LINE-THROUGH]CDATA></description>
+ <description>The font styles. Any combination of : NORMAL, BOLD, ITALIC, OBLIQUE, UNDERLINE, LINE-THROUGH</description>
<proposal type="enumeration">
<param value="NORMAL" />
<param value="BOLD" />
@@ -83,31 +83,31 @@
</proposal>
</attribute>
<attribute name="encoding">
- <description><CDATA[The character set encoding.]CDATA></description>
+ <description>The character set encoding.</description>
</attribute>
</component>
<component name="newPage">
- <description><CDATA[p:newPage inserts a page break.]CDATA></description>
+ <description>p:newPage inserts a page break.</description>
</component>
<component name="image">
- <description><CDATA[p:image inserts an image into the document. Images can be be loaded from the classpath or from the web application context using the value attribute.
-Resources can also be dynamically generated by application code. The imageData attribute can specify a value binding expression whose value is a java.awt.Image object.]CDATA></description>
+ <description>p:image inserts an image into the document. Images can be be loaded from the classpath or from the web application context using the value attribute.
+Resources can also be dynamically generated by application code. The imageData attribute can specify a value binding expression whose value is a java.awt.Image object.</description>
<attribute name="value">
- <description><CDATA[A resource name or a method expression binding to an application-generated image.]CDATA></description>
+ <description>A resource name or a method expression binding to an application-generated image.</description>
</attribute>
<attribute name="rotation">
- <description><CDATA[The rotation of the image in degrees.]CDATA></description>
+ <description>The rotation of the image in degrees.</description>
</attribute>
<attribute name="height">
- <description><CDATA[The height of the image.]CDATA></description>
+ <description>The height of the image.</description>
</attribute>
<attribute name="width">
- <description><CDATA[The width of the image.]CDATA></description>
+ <description>The width of the image.</description>
</attribute>
<attribute name="alignment">
- <description><CDATA[The alignment of the image. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.]CDATA></description>
+ <description>The alignment of the image. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.</description>
<proposal type="enumeration">
<param value="left" />
<param value="right" />
@@ -121,40 +121,40 @@
</proposal>
</attribute>
<attribute name="alt">
- <description><CDATA[Alternative text representation for the image.]CDATA></description>
+ <description>Alternative text representation for the image.</description>
</attribute>
<attribute name="indentationLeft" />
<attribute name="indentationRight" />
<attribute name="spacingBefore">
- <description><CDATA[The blank space to be inserted before the element.]CDATA></description>
+ <description>The blank space to be inserted before the element.</description>
</attribute>
<attribute name="spacingAfter">
- <description><CDATA[The blank space to be inserted after the element.]CDATA></description>
+ <description>The blank space to be inserted after the element.</description>
</attribute>
<attribute name="widthPercentage" />
<attribute name="initialRotation" />
<attribute name="dpi" />
<attribute name="scalePercent">
- <description><CDATA[The scaling factor (as a percentage) to use for the image. This can be expressed as a single percentage value or as two percentage values representing separate x and y scaling percentages.]CDATA></description>
+ <description>The scaling factor (as a percentage) to use for the image. This can be expressed as a single percentage value or as two percentage values representing separate x and y scaling percentages.</description>
</attribute>
<attribute name="wrap" />
<attribute name="underlying" />
</component>
<component name="anchor">
- <description><CDATA[p:anchor defines clickable links from a document.]CDATA></description>
+ <description>p:anchor defines clickable links from a document.</description>
<attribute name="name">
- <description><CDATA[The name of an in-document anchor destination.]CDATA></description>
+ <description>The name of an in-document anchor destination.</description>
</attribute>
<attribute name="reference">
- <description><CDATA[The destination the link refers to. Links to other points in the document should begin with a "#". For example, "#link1" to refer to an anchor postion with a name of link1. Links may also be a full URL to point to a resource outside of the document.]CDATA></description>
+ <description>The destination the link refers to. Links to other points in the document should begin with a "#". For example, "#link1" to refer to an anchor postion with a name of link1. Links may also be a full URL to point to a resource outside of the document.</description>
</attribute>
</component>
<component name="header">
- <description><CDATA[The p:header and p:footer components provide the ability to place header and footer text on each page of a generated document, with the exception of the first page. Header and footer declarations should appear near the top of a document.]CDATA></description>
+ <description>The p:header and p:footer components provide the ability to place header and footer text on each page of a generated document, with the exception of the first page. Header and footer declarations should appear near the top of a document.</description>
<attribute name="alignment">
- <description><CDATA[The alignment of the image. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.]CDATA></description>
+ <description>The alignment of the image. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.</description>
<proposal type="enumeration">
<param value="left" />
<param value="right" />
@@ -168,7 +168,7 @@
</proposal>
</attribute>
<attribute name="backgroundColor">
- <description><CDATA[The background color of the header/footer box. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <description>The background color of the header/footer box. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description>
<proposal type="enumeration">
<param value="white" />
<param value="gray" />
@@ -185,7 +185,7 @@
</proposal>
</attribute>
<attribute name="borderColor">
- <description><CDATA[The border color of the header/footer box. Individual border sides can be set using borderColorLeft, borderColorRight, borderColorTop and borderColorBottom. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <description>The border color of the header/footer box. Individual border sides can be set using borderColorLeft, borderColorRight, borderColorTop and borderColorBottom. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description>
<proposal type="enumeration">
<param value="white" />
<param value="gray" />
@@ -202,7 +202,7 @@
</proposal>
</attribute>
<attribute name="borderColorLeft">
- <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description>
<proposal type="enumeration">
<param value="white" />
<param value="gray" />
@@ -219,7 +219,7 @@
</proposal>
</attribute>
<attribute name="borderColorRight">
- <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description>
<proposal type="enumeration">
<param value="white" />
<param value="gray" />
@@ -236,7 +236,7 @@
</proposal>
</attribute>
<attribute name="borderColorTop">
- <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description>
<proposal type="enumeration">
<param value="white" />
<param value="gray" />
@@ -253,7 +253,7 @@
</proposal>
</attribute>
<attribute name="borderColorBottom">
- <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description>
<proposal type="enumeration">
<param value="white" />
<param value="gray" />
@@ -270,7 +270,7 @@
</proposal>
</attribute>
<attribute name="borderWidth">
- <description><CDATA[The width of the border. Inidvidual border sides can be specified using borderWidthLeft, borderWidthRight, borderWidthTop and borderWidthBottom.]CDATA></description>
+ <description>The width of the border. Inidvidual border sides can be specified using borderWidthLeft, borderWidthRight, borderWidthTop and borderWidthBottom.</description>
</attribute>
<attribute name="borderWidthLeft" />
<attribute name="borderWidthRight" />
@@ -279,9 +279,9 @@
</component>
<component name="footer">
- <description><CDATA[The p:header and p:footer components provide the ability to place header and footer text on each page of a generated document, with the exception of the first page. Header and footer declarations should appear near the top of a document.]CDATA></description>
+ <description>The p:header and p:footer components provide the ability to place header and footer text on each page of a generated document, with the exception of the first page. Header and footer declarations should appear near the top of a document.</description>
<attribute name="alignment">
- <description><CDATA[The alignment of the image. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.]CDATA></description>
+ <description>The alignment of the image. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.</description>
<proposal type="enumeration">
<param value="left" />
<param value="right" />
@@ -295,7 +295,7 @@
</proposal>
</attribute>
<attribute name="backgroundColor">
- <description><CDATA[The background color of the header/footer box. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <description>The background color of the header/footer box. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description>
<proposal type="enumeration">
<param value="white" />
<param value="gray" />
@@ -312,7 +312,7 @@
</proposal>
</attribute>
<attribute name="borderColor">
- <description><CDATA[The border color of the header/footer box. Individual border sides can be set using borderColorLeft, borderColorRight, borderColorTop and borderColorBottom. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <description>The border color of the header/footer box. Individual border sides can be set using borderColorLeft, borderColorRight, borderColorTop and borderColorBottom. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description>
<proposal type="enumeration">
<param value="white" />
<param value="gray" />
@@ -329,7 +329,7 @@
</proposal>
</attribute>
<attribute name="borderColorLeft">
- <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description>
<proposal type="enumeration">
<param value="white" />
<param value="gray" />
@@ -346,7 +346,7 @@
</proposal>
</attribute>
<attribute name="borderColorRight">
- <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description>
<proposal type="enumeration">
<param value="white" />
<param value="gray" />
@@ -363,7 +363,7 @@
</proposal>
</attribute>
<attribute name="borderColorTop">
- <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description>
<proposal type="enumeration">
<param value="white" />
<param value="gray" />
@@ -380,7 +380,7 @@
</proposal>
</attribute>
<attribute name="borderColorBottom">
- <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description>
<proposal type="enumeration">
<param value="white" />
<param value="gray" />
@@ -397,7 +397,7 @@
</proposal>
</attribute>
<attribute name="borderWidth">
- <description><CDATA[The width of the border. Inidvidual border sides can be specified using borderWidthLeft, borderWidthRight, borderWidthTop and borderWidthBottom.]CDATA></description>
+ <description>The width of the border. Inidvidual border sides can be specified using borderWidthLeft, borderWidthRight, borderWidthTop and borderWidthBottom.</description>
</attribute>
<attribute name="borderWidthLeft" />
<attribute name="borderWidthRight" />
@@ -406,7 +406,7 @@
</component>
<component name="pageNumber">
- <description><CDATA[The current page number can be placed inside of a header or footer using the p:pageNumber tag. The page number tag can only be used in the context of a header or footer and can only be used once.]CDATA></description>
+ <description>The current page number can be placed inside of a header or footer using the p:pageNumber tag. The page number tag can only be used in the context of a header or footer and can only be used once.</description>
</component>
</tag-lib>
\ No newline at end of file
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r23880 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb: taglibs and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-08-03 12:02:51 -0400 (Tue, 03 Aug 2010)
New Revision: 23880
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/SeamPdf.xml
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
Log:
https://jira.jboss.org/browse/JBIDE-5231
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2010-08-03 15:56:20 UTC (rev 23879)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2010-08-03 16:02:51 UTC (rev 23880)
@@ -67,6 +67,11 @@
name="Struts HTML"
location="platform:/plugin/org.jboss.tools.jst.web.kb/taglibs/StrutsHtml.xml"
uri="http://struts.apache.org/tags-html"/>
+ <tag-lib
+ location="platform:/plugin/org.jboss.tools.jst.web.kb/taglibs/SeamPdf.xml"
+ name="Seam PDF"
+ uri="http://jboss.com/products/seam/pdf"/>
+
<component-extension
location="platform:/plugin/org.jboss.tools.jst.web.kb/taglibs/componentExtension.xml"/>
</extension>
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/SeamPdf.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/SeamPdf.xml (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/SeamPdf.xml 2010-08-03 16:02:51 UTC (rev 23880)
@@ -0,0 +1,412 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE tag-lib PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 2.0//EN" "http://anonsvn.jboss.org/repos/jbosstools/trunk/jst/plugins/org.jboss.too...">
+<tag-lib defaultPrefix="p">
+
+ <component name="document">
+ <description><CDATA[Documents are generated by facelets documents using tags in the http://jboss.com/products/seam/pdf namespace. Documents should always have the document tag at the root of the document. The document tag prepares Seam to generate a document into the DocumentStore and renders an HTML redirect to that stored content.]CDATA></description>
+ <attribute name="type">
+ <description><CDATA[The type of the document to be produced. Valid values are PDF, RTF and HTML modes. Seam defaults to PDF generation, and many of the features only work correctly when generating PDF documents.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="PDF" />
+ <param value="RTF" />
+ <param value="HTML" />
+ </proposal>
+ </attribute>
+ <attribute name="pageSize">
+ <description><CDATA[The size of the page to be generate. The most commonly used values would be LETTER and A4. A full list of supported pages sizes can be found in com.lowagie.text.PageSize class. Alternatively, pageSize can provide the width and height of the page directly. The value "612 792", for example, is equivalent to the LETTER page size.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="LETTER" />
+ <param value="A4" />
+ </proposal>
+ </attribute>
+ <attribute name="orientation">
+ <description><CDATA[The orientation of the page. Valid values are portrait and landscape. In landscape mode, the height and width page size values are reversed.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="portrait" />
+ <param value="landscape" />
+ </proposal>
+ </attribute>
+ <attribute name="margins">
+ <description><CDATA[The left, right, top and bottom margin values.]CDATA></description>
+ </attribute>
+ <attribute name="marginMirroring">
+ <description><CDATA[Indicates that margin settings should be reversed an alternating pages.]CDATA></description>
+ </attribute>
+ <attribute name="title" />
+ <attribute name="subject" />
+ <attribute name="keywords" />
+ <attribute name="author" />
+ <attribute name="creator" />
+ </component>
+
+ <component name="paragraph">
+ <description><CDATA[Most uses of text should be sectioned into paragraphs so that text fragments can be flowed, formatted and styled in logical groups.]CDATA></description>
+ <attribute name="firstLineIndent" />
+ <attribute name="extraParagraphSpace" />
+ <attribute name="leading" />
+ <attribute name="multipliedLeading" />
+ <attribute name="spacingBefore">
+ <description><CDATA[The blank space to be inserted before the element.]CDATA></description>
+ </attribute>
+ <attribute name="spacingAfter">
+ <description><CDATA[The blank space to be inserted after the element.]CDATA></description>
+ </attribute>
+ <attribute name="indentationLeft" />
+ <attribute name="indentationRight" />
+ <attribute name="keepTogether" />
+ </component>
+
+ <component name="text">
+ <description><CDATA[The text tag allows text fragments to be produced from application data using normal JSF converter mechanisms. It is very similar to the outputText tag used when rendering HTML documents.]CDATA></description>
+ <attribute name="value">
+ <description><CDATA[The value to be displayed. This will typically be a value binding expression.]CDATA></description>
+ </attribute>
+ </component>
+
+ <component name="font">
+ <description><CDATA[The font tag defines the default font to be used for all text inside of it.]CDATA></description>
+ <attribute name="name">
+ <description><CDATA[The font name, for example: COURIER, HELVETICA, TIMES-ROMAN, SYMBOL or ZAPFDINGBATS.]CDATA></description>
+ </attribute>
+ <attribute name="size">
+ <description><CDATA[The point size of the font.]CDATA></description>
+ </attribute>
+ <attribute name="style">
+ <description><CDATA[The font styles. Any combination of : NORMAL, BOLD, ITALIC, OBLIQUE, UNDERLINE, LINE-THROUGH]CDATA></description>
+ <proposal type="enumeration">
+ <param value="NORMAL" />
+ <param value="BOLD" />
+ <param value="ITALIC" />
+ <param value="OBLIQUE" />
+ <param value="UNDERLINE" />
+ <param value="LINE-THROUGH" />
+ </proposal>
+ </attribute>
+ <attribute name="encoding">
+ <description><CDATA[The character set encoding.]CDATA></description>
+ </attribute>
+ </component>
+
+ <component name="newPage">
+ <description><CDATA[p:newPage inserts a page break.]CDATA></description>
+ </component>
+
+ <component name="image">
+ <description><CDATA[p:image inserts an image into the document. Images can be be loaded from the classpath or from the web application context using the value attribute.
+Resources can also be dynamically generated by application code. The imageData attribute can specify a value binding expression whose value is a java.awt.Image object.]CDATA></description>
+ <attribute name="value">
+ <description><CDATA[A resource name or a method expression binding to an application-generated image.]CDATA></description>
+ </attribute>
+ <attribute name="rotation">
+ <description><CDATA[The rotation of the image in degrees.]CDATA></description>
+ </attribute>
+ <attribute name="height">
+ <description><CDATA[The height of the image.]CDATA></description>
+ </attribute>
+ <attribute name="width">
+ <description><CDATA[The width of the image.]CDATA></description>
+ </attribute>
+ <attribute name="alignment">
+ <description><CDATA[The alignment of the image. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="left" />
+ <param value="right" />
+ <param value="center" />
+ <param value="justify" />
+ <param value="justifyall" />
+ <param value="top" />
+ <param value="middle" />
+ <param value="bottom" />
+ <param value="baseline" />
+ </proposal>
+ </attribute>
+ <attribute name="alt">
+ <description><CDATA[Alternative text representation for the image.]CDATA></description>
+ </attribute>
+ <attribute name="indentationLeft" />
+ <attribute name="indentationRight" />
+ <attribute name="spacingBefore">
+ <description><CDATA[The blank space to be inserted before the element.]CDATA></description>
+ </attribute>
+ <attribute name="spacingAfter">
+ <description><CDATA[The blank space to be inserted after the element.]CDATA></description>
+ </attribute>
+ <attribute name="widthPercentage" />
+ <attribute name="initialRotation" />
+ <attribute name="dpi" />
+ <attribute name="scalePercent">
+ <description><CDATA[The scaling factor (as a percentage) to use for the image. This can be expressed as a single percentage value or as two percentage values representing separate x and y scaling percentages.]CDATA></description>
+ </attribute>
+ <attribute name="wrap" />
+ <attribute name="underlying" />
+ </component>
+
+ <component name="anchor">
+ <description><CDATA[p:anchor defines clickable links from a document.]CDATA></description>
+ <attribute name="name">
+ <description><CDATA[The name of an in-document anchor destination.]CDATA></description>
+ </attribute>
+ <attribute name="reference">
+ <description><CDATA[The destination the link refers to. Links to other points in the document should begin with a "#". For example, "#link1" to refer to an anchor postion with a name of link1. Links may also be a full URL to point to a resource outside of the document.]CDATA></description>
+ </attribute>
+ </component>
+
+ <component name="header">
+ <description><CDATA[The p:header and p:footer components provide the ability to place header and footer text on each page of a generated document, with the exception of the first page. Header and footer declarations should appear near the top of a document.]CDATA></description>
+ <attribute name="alignment">
+ <description><CDATA[The alignment of the image. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="left" />
+ <param value="right" />
+ <param value="center" />
+ <param value="justify" />
+ <param value="justifyall" />
+ <param value="top" />
+ <param value="middle" />
+ <param value="bottom" />
+ <param value="baseline" />
+ </proposal>
+ </attribute>
+ <attribute name="backgroundColor">
+ <description><CDATA[The background color of the header/footer box. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="white" />
+ <param value="gray" />
+ <param value="lightgray" />
+ <param value="darkgray" />
+ <param value="black" />
+ <param value="red" />
+ <param value="pink" />
+ <param value="yellow" />
+ <param value="green" />
+ <param value="magenta" />
+ <param value="cyan" />
+ <param value="blue" />
+ </proposal>
+ </attribute>
+ <attribute name="borderColor">
+ <description><CDATA[The border color of the header/footer box. Individual border sides can be set using borderColorLeft, borderColorRight, borderColorTop and borderColorBottom. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="white" />
+ <param value="gray" />
+ <param value="lightgray" />
+ <param value="darkgray" />
+ <param value="black" />
+ <param value="red" />
+ <param value="pink" />
+ <param value="yellow" />
+ <param value="green" />
+ <param value="magenta" />
+ <param value="cyan" />
+ <param value="blue" />
+ </proposal>
+ </attribute>
+ <attribute name="borderColorLeft">
+ <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="white" />
+ <param value="gray" />
+ <param value="lightgray" />
+ <param value="darkgray" />
+ <param value="black" />
+ <param value="red" />
+ <param value="pink" />
+ <param value="yellow" />
+ <param value="green" />
+ <param value="magenta" />
+ <param value="cyan" />
+ <param value="blue" />
+ </proposal>
+ </attribute>
+ <attribute name="borderColorRight">
+ <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="white" />
+ <param value="gray" />
+ <param value="lightgray" />
+ <param value="darkgray" />
+ <param value="black" />
+ <param value="red" />
+ <param value="pink" />
+ <param value="yellow" />
+ <param value="green" />
+ <param value="magenta" />
+ <param value="cyan" />
+ <param value="blue" />
+ </proposal>
+ </attribute>
+ <attribute name="borderColorTop">
+ <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="white" />
+ <param value="gray" />
+ <param value="lightgray" />
+ <param value="darkgray" />
+ <param value="black" />
+ <param value="red" />
+ <param value="pink" />
+ <param value="yellow" />
+ <param value="green" />
+ <param value="magenta" />
+ <param value="cyan" />
+ <param value="blue" />
+ </proposal>
+ </attribute>
+ <attribute name="borderColorBottom">
+ <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="white" />
+ <param value="gray" />
+ <param value="lightgray" />
+ <param value="darkgray" />
+ <param value="black" />
+ <param value="red" />
+ <param value="pink" />
+ <param value="yellow" />
+ <param value="green" />
+ <param value="magenta" />
+ <param value="cyan" />
+ <param value="blue" />
+ </proposal>
+ </attribute>
+ <attribute name="borderWidth">
+ <description><CDATA[The width of the border. Inidvidual border sides can be specified using borderWidthLeft, borderWidthRight, borderWidthTop and borderWidthBottom.]CDATA></description>
+ </attribute>
+ <attribute name="borderWidthLeft" />
+ <attribute name="borderWidthRight" />
+ <attribute name="borderWidthTop" />
+ <attribute name="borderWidthBottom" />
+ </component>
+
+ <component name="footer">
+ <description><CDATA[The p:header and p:footer components provide the ability to place header and footer text on each page of a generated document, with the exception of the first page. Header and footer declarations should appear near the top of a document.]CDATA></description>
+ <attribute name="alignment">
+ <description><CDATA[The alignment of the image. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="left" />
+ <param value="right" />
+ <param value="center" />
+ <param value="justify" />
+ <param value="justifyall" />
+ <param value="top" />
+ <param value="middle" />
+ <param value="bottom" />
+ <param value="baseline" />
+ </proposal>
+ </attribute>
+ <attribute name="backgroundColor">
+ <description><CDATA[The background color of the header/footer box. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="white" />
+ <param value="gray" />
+ <param value="lightgray" />
+ <param value="darkgray" />
+ <param value="black" />
+ <param value="red" />
+ <param value="pink" />
+ <param value="yellow" />
+ <param value="green" />
+ <param value="magenta" />
+ <param value="cyan" />
+ <param value="blue" />
+ </proposal>
+ </attribute>
+ <attribute name="borderColor">
+ <description><CDATA[The border color of the header/footer box. Individual border sides can be set using borderColorLeft, borderColorRight, borderColorTop and borderColorBottom. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="white" />
+ <param value="gray" />
+ <param value="lightgray" />
+ <param value="darkgray" />
+ <param value="black" />
+ <param value="red" />
+ <param value="pink" />
+ <param value="yellow" />
+ <param value="green" />
+ <param value="magenta" />
+ <param value="cyan" />
+ <param value="blue" />
+ </proposal>
+ </attribute>
+ <attribute name="borderColorLeft">
+ <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="white" />
+ <param value="gray" />
+ <param value="lightgray" />
+ <param value="darkgray" />
+ <param value="black" />
+ <param value="red" />
+ <param value="pink" />
+ <param value="yellow" />
+ <param value="green" />
+ <param value="magenta" />
+ <param value="cyan" />
+ <param value="blue" />
+ </proposal>
+ </attribute>
+ <attribute name="borderColorRight">
+ <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="white" />
+ <param value="gray" />
+ <param value="lightgray" />
+ <param value="darkgray" />
+ <param value="black" />
+ <param value="red" />
+ <param value="pink" />
+ <param value="yellow" />
+ <param value="green" />
+ <param value="magenta" />
+ <param value="cyan" />
+ <param value="blue" />
+ </proposal>
+ </attribute>
+ <attribute name="borderColorTop">
+ <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="white" />
+ <param value="gray" />
+ <param value="lightgray" />
+ <param value="darkgray" />
+ <param value="black" />
+ <param value="red" />
+ <param value="pink" />
+ <param value="yellow" />
+ <param value="green" />
+ <param value="magenta" />
+ <param value="cyan" />
+ <param value="blue" />
+ </proposal>
+ </attribute>
+ <attribute name="borderColorBottom">
+ <description><CDATA[Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.]CDATA></description>
+ <proposal type="enumeration">
+ <param value="white" />
+ <param value="gray" />
+ <param value="lightgray" />
+ <param value="darkgray" />
+ <param value="black" />
+ <param value="red" />
+ <param value="pink" />
+ <param value="yellow" />
+ <param value="green" />
+ <param value="magenta" />
+ <param value="cyan" />
+ <param value="blue" />
+ </proposal>
+ </attribute>
+ <attribute name="borderWidth">
+ <description><CDATA[The width of the border. Inidvidual border sides can be specified using borderWidthLeft, borderWidthRight, borderWidthTop and borderWidthBottom.]CDATA></description>
+ </attribute>
+ <attribute name="borderWidthLeft" />
+ <attribute name="borderWidthRight" />
+ <attribute name="borderWidthTop" />
+ <attribute name="borderWidthBottom" />
+ </component>
+
+ <component name="pageNumber">
+ <description><CDATA[The current page number can be placed inside of a header or footer using the p:pageNumber tag. The page number tag can only be used in the context of a header or footer and can only be used once.]CDATA></description>
+ </component>
+
+</tag-lib>
\ No newline at end of file
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/SeamPdf.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r23879 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/internal/deltacloud/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-08-03 11:56:20 -0400 (Tue, 03 Aug 2010)
New Revision: 23879
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
Log:
2010-08-03 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (getURLValid): New
method.
(setURLValid): Ditto.
(checkURL): Ditto. Used to check URL is valid and to get the driver info.
(isPageComplete): Override to check URL in addition to normal page complete flag.
(.handleException): New method of ISafeRunnable to use to run checkURL in thread.
(.run): Ditto.
(createControl): Change how type label gets initially set.
(validate): Change to use checkURL method in safe thread when the URL at least
ends in "api". Otherwise, don't bother checking the URL and don't mark the page
as complete.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: Change
error message for URL as it now appears in the type label and not the error message
area.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-03 15:42:49 UTC (rev 23878)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-03 15:56:20 UTC (rev 23879)
@@ -1,3 +1,20 @@
+2010-08-03 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (getURLValid): New
+ method.
+ (setURLValid): Ditto.
+ (checkURL): Ditto. Used to check URL is valid and to get the driver info.
+ (isPageComplete): Override to check URL in addition to normal page complete flag.
+ (.handleException): New method of ISafeRunnable to use to run checkURL in thread.
+ (.run): Ditto.
+ (createControl): Change how type label gets initially set.
+ (validate): Change to use checkURL method in safe thread when the URL at least
+ ends in "api". Otherwise, don't bother checking the URL and don't mark the page
+ as complete.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: Change
+ error message for URL as it now appears in the type label and not the error message
+ area.
+
2010-07-28 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java: New file.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java 2010-08-03 15:42:49 UTC (rev 23878)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java 2010-08-03 15:56:20 UTC (rev 23879)
@@ -12,6 +12,8 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.eclipse.core.runtime.ISafeRunnable;
+import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -62,7 +64,10 @@
private String url;
private String username;
private String password;
+ private String cloudType;
+ private boolean urlValid;
+
private Listener linkListener = new Listener() {
public void handleEvent(Event event) {
@@ -119,6 +124,56 @@
} else {
complete = false;
}
+
+ // Run check for valid DeltaCloud URL in separate thread
+ String urlValue = urlText.getText();
+ if (urlValue.endsWith("api")) {
+ ISafeRunnable runner = new ISafeRunnable() {
+
+ @Override
+ public void handleException(Throwable exception) {
+ setURLValid(false);
+ }
+
+ @Override
+ public void run() throws Exception {
+ // TODO Auto-generated method stub
+ checkURL();
+ }
+ };
+ SafeRunner.run(runner);
+ } else if (urlValue.length() > 0){
+ typeText.setText(WizardMessages.getString(NONCLOUD_URL));
+ complete = false;
+ } else {
+ typeText.setText(WizardMessages.getString(UNKNOWN_TYPE_LABEL));
+ complete = false;
+ }
+
+ username = usernameText.getText();
+ if (username.length() <= 0) {
+ complete = false;
+ }
+ password = passwordText.getText();
+ if (password.length() <= 0) {
+ complete = false;
+ }
+ if (errorFree)
+ setErrorMessage(null);
+ setPageComplete(complete & errorFree);
+ }
+
+ @Override
+ public boolean isPageComplete() {
+ return super.isPageComplete() & getURLValid();
+ }
+
+
+ // Method to check the URL for validity as Delta-cloud API specifier.
+ // Since this is run in thread, it does not use the setErrorMessage()
+ // method and instead writes error messages to the typeText label.
+ private synchronized void checkURL() {
+ boolean valid = false;
String oldurl = url;
url = urlText.getText();
if (url.length() > 0) {
@@ -158,42 +213,47 @@
Node n = elements.item(0);
Node driver = n.getAttributes().getNamedItem("driver"); //$NON-NLS-1$
if (driver != null) {
+ valid = true;
String driverValue = driver.getNodeValue();
- typeText.setText(driverValue.toUpperCase());
+ cloudType = driverValue.toUpperCase();
+ } else {
+ cloudType = WizardMessages.getString(UNKNOWN_TYPE_LABEL);
}
}
}
} catch (MalformedURLException e) {
- errorFree = false;
- setErrorMessage(WizardMessages.getString(INVALID_URL));
+ cloudType = WizardMessages.getString(INVALID_URL);
} catch (IOException e) {
- // TODO Auto-generated catch block
- errorFree = false;
- setErrorMessage(WizardMessages.getString(NONCLOUD_URL));
+ cloudType = WizardMessages.getString(NONCLOUD_URL);
} catch (ParserConfigurationException e) {
- errorFree = false;
- setErrorMessage(WizardMessages.getString(NONCLOUD_URL));
+ cloudType = WizardMessages.getString(NONCLOUD_URL);
} catch (SAXException e) {
- errorFree = false;
- setErrorMessage(WizardMessages.getString(NONCLOUD_URL));
+ cloudType = WizardMessages.getString(NONCLOUD_URL);
}
+ setURLValid(valid);
}
- } else {
- complete = false;
+ typeText.setText(cloudType);
}
- username = usernameText.getText();
- if (username.length() <= 0) {
- complete = false;
- }
- password = passwordText.getText();
- if (password.length() <= 0) {
- complete = false;
- }
- if (errorFree)
- setErrorMessage(null);
- setPageComplete(complete & errorFree);
}
+ /**
+ * Set whether the URL is a valid Delta-cloud API URL.
+ *
+ * @param value boolean to set
+ */
+ private synchronized void setURLValid(boolean value) {
+ urlValid = value;
+ }
+
+ /**
+ * Return the validity of the Delta-cloud URL.
+ *
+ * @return true if URL valid, false otherwise
+ */
+ private synchronized boolean getURLValid() {
+ return urlValid;
+ }
+
@Override
public void createControl(Composite parent) {
// TODO Auto-generated method stub
@@ -221,7 +281,8 @@
typeLabel.setText(WizardMessages.getString(TYPE_LABEL));
typeText = new Label(container, SWT.NULL);
- typeText.setText(WizardMessages.getString(UNKNOWN_TYPE_LABEL));
+ cloudType = WizardMessages.getString(UNKNOWN_TYPE_LABEL);
+ typeText.setText(cloudType);
Label usernameLabel = new Label(container, SWT.NULL);
usernameLabel.setText(WizardMessages.getString(USERNAME_LABEL));
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-08-03 15:42:49 UTC (rev 23878)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-08-03 15:56:20 UTC (rev 23879)
@@ -15,4 +15,4 @@
ErrorNameInUse.text=Error: the name chosen is already in use
ErrorInvalidURL.text=Error: the URL specified is invalid
-ErrorNonCloudURL.text=Error: the URL specified is not a valid cloud address
\ No newline at end of file
+ErrorNonCloudURL.text=URL specified is not a valid Delta-cloud address
\ No newline at end of file
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r23878 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-03 11:42:49 -0400 (Tue, 03 Aug 2010)
New Revision: 23878
Modified:
trunk/parent-pom.xml
trunk/pom.xml
Log:
https://jira.jboss.org/browse/JBIDE-6429 add xulrunner to parent-pom.xml and remove from pom.xml
Modified: trunk/parent-pom.xml
===================================================================
--- trunk/parent-pom.xml 2010-08-03 14:50:37 UTC (rev 23877)
+++ trunk/parent-pom.xml 2010-08-03 15:42:49 UTC (rev 23878)
@@ -24,7 +24,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
</plugin>
-
+
<plugin>
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-packaging-plugin</artifactId>
@@ -55,9 +55,12 @@
<ws>cocoa</ws>
<arch>x86</arch>
</environment>
- <!-- <environment> <os>macosx</os> <ws>carbon</ws> <arch>x86</arch>
- </environment> -->
<environment>
+ <os>macosx</os>
+ <ws>carbon</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
@@ -170,10 +173,9 @@
</profile>
<!-- Time saver: to build everything from scratch (without target platform);
- To enable it use -P helios-no-target in command line.
- Do not remove repos that contains the same artefacts, it is done for purpose
- to make build more stable in case one of the repos is offline.
- -->
+ To enable it use -P helios-no-target in command line. Do not remove repos
+ that contains the same artefacts, it is done for purpose to make build more
+ stable in case one of the repos is offline. -->
<profile>
<id>helios-no-target</id>
<activation>
@@ -214,6 +216,129 @@
</releases>
</repository>
<repository>
+ <id>birt26</id>
+ <url>http://download.eclipse.org/birt/update-site/2.6/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>swtbot-helios</id>
+ <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>m2eclipse</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>m2eclipse-extras</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>orbit</id>
+ <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u...
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>jboss-xulrunner-1.9.2</id>
+ <url>http://download.jboss.org/jbosstools/updates/xulrunner-1.9.2/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>google eclipse plugins</id>
+ <url>http://dl.google.com/eclipse/plugin/3.6</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+
+ <profile>
+ <id>helios-sp1-no-target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>helios-jboss-mirror</id>
+ <url>http://download.jboss.org/jbosstools/updates/helios/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>helios</id>
+ <url>http://download.eclipse.org/releases/helios/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>webtools32</id>
+ <url>http://download.eclipse.org/webtools/repository/helios</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
<id>eclipse36</id>
<url>http://download.eclipse.org/eclipse/updates/3.6.x/
</url>
@@ -284,18 +409,19 @@
</releases>
</repository>
<repository>
- <id>google eclipse plugins</id>
- <url>http://dl.google.com/eclipse/plugin/3.6</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
+ <id>google eclipse plugins</id>
+ <url>http://dl.google.com/eclipse/plugin/3.6</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
</profile>
+
<profile>
<id>hudson</id>
<activation>
@@ -470,33 +596,18 @@
</property>
</activation>
<properties>
- <emma.session.out.file>${project.build.directory}/emma/coverage.es</emma.session.out.file>
+ <emma.session.out.file>${project.build.directory}/emma/coverage.es
+ </emma.session.out.file>
<emma.filter />
<emma.instrument.bundles />
</properties>
<build>
<plugins>
- <!-- plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${emma.session.out.file}</file>
- <type>es</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin-->
+ <!-- plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId>
+ <executions> <execution> <id>attach-artifacts</id> <phase>package</phase>
+ <goals> <goal>attach-artifact</goal> </goals> <configuration> <artifacts>
+ <artifact> <file>${emma.session.out.file}</file> <type>es</type> </artifact>
+ </artifacts> </configuration> </execution> </executions> </plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
@@ -515,9 +626,11 @@
<version>${tychoVersion}</version>
<configuration>
<systemProperties combine.children="append">
- <emma.session.out.file>${emma.session.out.file}</emma.session.out.file>
+ <emma.session.out.file>${emma.session.out.file}
+ </emma.session.out.file>
<emma.filter>${emma.filter}</emma.filter>
- <eclemma.instrument.bundles>${emma.instrument.bundles}</eclemma.instrument.bundles>
+ <eclemma.instrument.bundles>${emma.instrument.bundles}
+ </eclemma.instrument.bundles>
</systemProperties>
<frameworkExtensions>
<frameworkExtension>
@@ -555,6 +668,12 @@
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<executions>
@@ -569,15 +688,17 @@
<taskdef resource="emma_ant.properties" />
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<if>
- <available file="${project.build.directory}/emma" type="dir" />
+ <available file="${project.build.directory}/emma"
+ type="dir" />
<then>
<echo>Process emma report...</echo>
- <!-- emma enabled="true">
- <instr metadatafile="${project.build.directory}/coverage.em" mode="overwrite" instrpath="${project.build.directory}/../../../plugins/${emma.instrument.bundles}/target/classes" />
- </emma-->
+ <!-- emma enabled="true"> <instr metadatafile="${project.build.directory}/coverage.em"
+ mode="overwrite" instrpath="${project.build.directory}/../../../plugins/${emma.instrument.bundles}/target/classes"
+ /> </emma -->
<emma enabled="true">
<report>
- <infileset dir="${project.build.directory}/emma" includes="*.es,*.em" />
+ <infileset dir="${project.build.directory}/emma"
+ includes="*.es,*.em" />
<txt outfile="${project.build.directory}/emma/coverage.txt" />
<xml outfile="${project.build.directory}/emma/coverage.xml" />
<html outfile="${project.build.directory}/emma/coverage.html" />
@@ -605,12 +726,27 @@
</file>
</activation>
<properties>
- <requirements.root>${basedir}/../../../requirements</requirements.root>
- <requirement.build.root>${requirements.root}/target</requirement.build.root>
+ <requirements.root>${basedir}/../../../requirements
+ </requirements.root>
+ <requirement.build.root>${requirements.root}/target
+ </requirement.build.root>
</properties>
<build>
<plugins>
<plugin>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version>
<executions>
@@ -622,13 +758,19 @@
</goals>
<configuration>
<tasks>
- <property file="requirements.properties" />
- <echo>Requirements build</echo>
- <ant dir="${basedir}/../../../requirements" inheritAll="true" >
- <property name="requirements" value="${requirements}" />
- <property name="settings.offline" value="${settings.offline}" />
- <property name="skipDownload" value="${skipDownload}" />
- </ant>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+ <if>
+ <available file="${requirements.root}" type="dir" />
+ <then>
+ <property file="requirements.properties" />
+ <echo>Requirements build</echo>
+ <ant dir="${requirements.root}" inheritAll="true">
+ <property name="requirements" value="${requirements}" />
+ <property name="settings.offline" value="${settings.offline}" />
+ <property name="skipDownload" value="${skipDownload}" />
+ </ant>
+ </then>
+ </if>
</tasks>
</configuration>
</execution>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-08-03 14:50:37 UTC (rev 23877)
+++ trunk/pom.xml 2010-08-03 15:42:49 UTC (rev 23878)
@@ -1,67 +1,69 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
-<groupId>org.jboss</groupId>
-<artifactId>jbosstools</artifactId>
-<version>0.0.1-SNAPSHOT</version>
-<packaging>pom</packaging>
-<modules>
- <module>build/target-platform</module>
- <module>build/libs</module>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbosstools</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>build/target-platform</module>
+ <module>build/libs</module>
- <!-- this order is important! make sure you've run genpom.xml first! -->
- <!-- dgolovin's order -->
- <module>tests</module>
- <module>freemarker</module>
- <module>jmx</module>
- <module>archives</module>
- <module>as</module>
- <module>common</module>
- <module>jst</module>
- <module>xulrunner</module>
- <module>vpe</module>
- <module>jsf</module>
+ <!-- this order is important! make sure you've run genpom.xml first! -->
+ <!-- dgolovin's order -->
+ <module>tests</module>
+ <module>freemarker</module>
+ <module>jmx</module>
+ <module>archives</module>
+ <module>as</module>
+ <module>common</module>
+ <module>jst</module>
+ <!-- Built as external Hudson job, http://hudson.qa.jboss.com/hudson/view/DevStudio_Tycho/job/xulrunner-1.9.2/,
+ so not needed here <module>xulrunner</module> -->
+ <module>vpe</module>
+ <module>jsf</module>
- <module>hibernatetools</module>
- <module>portlet</module>
- <module>workingset</module>
+ <module>hibernatetools</module>
+ <module>portlet</module>
+ <module>workingset</module>
- <module>struts</module>
+ <module>struts</module>
- <module>profiler</module>
- <module>smooks</module>
- <module>cdi</module>
- <module>birt</module>
- <module>bpel</module>
- <module>esb</module>
- <module>seam</module>
- <module>examples</module>
- <module>maven</module>
- <module>tptp</module>
- <module>ws</module>
- <module>modeshape</module>
- <module>flow</module>
- <module>jbpm</module>
- <!-- NOTE: To build drools, must first bootstrap with ant script: cd drools;
- ant -q -->
- <!-- IF YOU REMOVE A MODULE, be sure to also remove it from site/site.xml and build/aggregate/site/site.xml
- or the build will break! -->
- <module>drools</module>
-
- <module>site</module>
-</modules>
-<profiles>
-<profile>
- <id>emma-coverage</id>
- <activation>
- <property>
- <name>coverage</name>
- </property>
- </activation>
- <modules>
- <module>build/reports/emma-coverage</module>
+ <module>profiler</module>
+ <module>smooks</module>
+ <module>cdi</module>
+ <module>birt</module>
+ <module>bpel</module>
+ <module>esb</module>
+ <module>seam</module>
+ <module>examples</module>
+ <module>maven</module>
+ <module>tptp</module>
+ <module>ws</module>
+ <module>modeshape</module>
+ <module>flow</module>
+ <module>jbpm</module>
+ <!-- NOTE: To build drools, must first bootstrap with ant script: cd drools;
+ ant -q -->
+ <!-- IF YOU REMOVE A MODULE, be sure to also remove it from site/site.xml
+ and build/aggregate/site/site.xml or the build will break! -->
+ <module>drools</module>
+
+ <module>site</module>
</modules>
-</profile>
-</profiles>
+ <profiles>
+ <profile>
+ <id>emma-coverage</id>
+ <activation>
+ <property>
+ <name>coverage</name>
+ </property>
+ </activation>
+ <modules>
+ <module>build/reports/emma-coverage</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
13 years, 9 months
- 1
- 0