JBoss Tools SVN: r36016 - in branches/jbosstools-3.3.0.M4/build/aggregate: soa-site and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-26 13:44:59 -0400 (Wed, 26 Oct 2011)
New Revision: 36016
Modified:
branches/jbosstools-3.3.0.M4/build/aggregate/site/site.xml
branches/jbosstools-3.3.0.M4/build/aggregate/soa-site/site.xml
Log:
JBIDE-10029 rename All to Abridged for 2 JBT sites
Modified: branches/jbosstools-3.3.0.M4/build/aggregate/site/site.xml
===================================================================
--- branches/jbosstools-3.3.0.M4/build/aggregate/site/site.xml 2011-10-26 16:21:25 UTC (rev 36015)
+++ branches/jbosstools-3.3.0.M4/build/aggregate/site/site.xml 2011-10-26 17:44:59 UTC (rev 36016)
@@ -4,30 +4,30 @@
<!-- only in JBDS
<feature url="features/com.jboss.jbds.product.feature_0.0.0.jar" id="com.jboss.jbds.product.feature" version="0.0.0" patch="false">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
</feature>
-->
<!-- only in JBT for now (JBIDE-9784), eventually in JBDS (JBDS-1867) -->
<feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.central.feature" version="0.0.0">
- <category name="AllTools"/>
+ <category name="AbridgedTools"/>
</feature>
<feature url="features/org.jboss.tools.central.discovery.feature_0.0.0.jar" id="org.jboss.tools.central.discovery.feature" version="0.0.0">
</feature>
<feature url="features/org.jboss.tools.richfaces.feature_0.0.0.jar" id="org.jboss.tools.richfaces.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
</feature>
<!-- include and categorize in JBT -->
<feature url="features/org.jboss.tools.jst.feature_0.0.0.jar" id="org.jboss.tools.jst.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
</feature>
<feature url="features/org.jboss.tools.vpe.feature_0.0.0.jar" id="org.jboss.tools.vpe.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
</feature>
<feature url="features/org.jboss.tools.jsf.feature_0.0.0.jar" id="org.jboss.tools.jsf.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
</feature>
<!-- include but do not categorize -->
@@ -35,69 +35,69 @@
<feature url="features/org.mozilla.xulrunner.feature_0.0.0.jar" id="org.mozilla.xulrunner.feature" version="0.0.0"></feature>
<feature url="features/org.jboss.tools.seam.feature_0.0.0.jar" id="org.jboss.tools.seam.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
</feature>
<feature url="features/org.jboss.tools.cdi.feature_0.0.0.jar" id="org.jboss.tools.cdi.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
<category name="GeneralTools" />
</feature>
<feature url="features/org.jboss.tools.cdi.seam.feature_0.0.0.jar" id="org.jboss.tools.cdi.seam.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
<category name="GeneralTools" />
</feature>
<feature url="features/org.jboss.tools.jmx.feature_0.0.0.jar" id="org.jboss.tools.jmx.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="GeneralTools" />
</feature>
<feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
</feature>
<!-- only in JBT -->
<feature url="features/org.jboss.tools.openshift.express.feature_0.0.0.jar" id="org.jboss.tools.openshift.express.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
</feature>
<feature url="features/org.jboss.ide.eclipse.as.server.egit.integration.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.server.egit.integration.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
</feature>
<feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="GeneralTools" />
</feature>
<feature url="features/org.hibernate.eclipse.feature_0.0.0.jar" id="org.hibernate.eclipse.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
<category name="DataTools" />
<category name="GeneralTools" />
</feature>
<feature url="features/org.jboss.ide.eclipse.freemarker.feature_0.0.0.jar" id="org.jboss.ide.eclipse.freemarker.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="GeneralTools" />
</feature>
<feature url="features/org.jboss.tools.struts.feature_0.0.0.jar" id="org.jboss.tools.struts.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
</feature>
<feature url="features/org.jboss.tools.ws.feature_0.0.0.jar" id="org.jboss.tools.ws.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
</feature>
<!-- only in JBT -->
<feature url="features/org.jboss.tools.ws.jaxrs.feature_0.0.0.jar" id="org.jboss.tools.ws.jaxrs.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
</feature>
<feature url="features/org.jboss.tools.portlet.feature_0.0.0.jar" id="org.jboss.tools.portlet.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="WebTools" />
</feature>
<feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar" id="org.jboss.tools.project.examples.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="GeneralTools" />
</feature>
@@ -106,7 +106,7 @@
<category name="WebTools" />
</feature>
<feature url="features/org.jboss.tools.community.project.examples.feature_0.0.0.jar" id="org.jboss.tools.community.project.examples.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="GeneralTools" />
</feature>
<feature url="features/org.jboss.tools.birt.feature_0.0.0.jar" id="org.jboss.tools.birt.feature" version="0.0.0">
@@ -147,7 +147,7 @@
</feature>
<feature url="features/org.jboss.tools.common.jdt.feature_0.0.0.jar" id="org.jboss.tools.common.jdt.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
</feature>
<!-- include but do not categorize -->
<feature url="features/org.jboss.tools.common.feature_0.0.0.jar" id="org.jboss.tools.common.feature" version="0.0.0"></feature>
@@ -157,23 +157,23 @@
<feature url="features/org.jboss.tools.common.verification.feature_0.0.0.jar" id="org.jboss.tools.common.verification.feature" version="0.0.0"></feature>
<feature url="features/org.jboss.tools.runtime.feature_0.0.0.jar" id="org.jboss.tools.runtime.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
</feature>
<feature url="features/org.jboss.tools.runtime.core.feature_0.0.0.jar" id="org.jboss.tools.runtime.core.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
</feature>
<feature url="features/org.jboss.tools.runtime.as.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.as.detector.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
</feature>
<feature url="features/org.jboss.tools.runtime.seam.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.seam.detector.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
</feature>
<feature url="features/org.jboss.tools.usage.feature_0.0.0.jar" id="org.jboss.tools.usage.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
</feature>
<!-- categories - see also ../../../common/aggregateRepos.*.properties -->
@@ -184,13 +184,11 @@
</description>
</category-def>
- <category-def name="AllTools" label="All JBoss Tools 3.3">
- <description>Contains ALL the plugins that are available from
- JBoss Tools except those
- related to integration with 3rd party
- plugins. Selecting this
- category will give you all tools needed for
- both Web and Seam Development.
+ <category-def name="AbridgedTools" label="Abridged JBoss Tools 3.3">
+ <description>Contains most of the JBoss Tools features.
+ Excluded are those related to integration with 3rd party
+ plugins. Selecting this category will give you all tools
+ needed for Web and Seam Development.
</description>
</category-def>
Modified: branches/jbosstools-3.3.0.M4/build/aggregate/soa-site/site.xml
===================================================================
--- branches/jbosstools-3.3.0.M4/build/aggregate/soa-site/site.xml 2011-10-26 16:21:25 UTC (rev 36015)
+++ branches/jbosstools-3.3.0.M4/build/aggregate/soa-site/site.xml 2011-10-26 17:44:59 UTC (rev 36016)
@@ -5,18 +5,18 @@
</description>
<feature url="features/org.jboss.tools.esb.feature_0.0.0.jar" id="org.jboss.tools.esb.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="SOATools" />
</feature>
<feature url="features/org.jboss.tools.smooks.feature_0.0.0.jar" id="org.jboss.tools.smooks.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="SOATools" />
<category name="DataTools" />
<category name="GeneralTools" />
</feature>
<feature url="features/org.jboss.tools.jbpm4.feature_0.0.0.jar" id="org.jboss.tools.jbpm4.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="SOATools" />
</feature>
<feature url="features/org.jboss.tools.bpel.feature_0.0.0.jar" id="org.jboss.tools.bpel.feature" version="0.0.0">
@@ -25,50 +25,48 @@
<!-- jBPM Tools & Flow features -->
<feature url="features/org.jboss.tools.jbpm.convert.feature_0.0.0.jar" id="org.jboss.tools.jbpm.convert.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="SOATools" />
</feature>
<feature url="features/org.jboss.tools.jbpm.common.feature_0.0.0.jar" id="org.jboss.tools.jbpm.common.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="SOATools" />
</feature>
<feature url="features/org.jboss.tools.jbpm3.feature_0.0.0.jar" id="org.jboss.tools.jbpm3.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="SOATools" />
</feature>
<feature url="features/org.jboss.tools.modeshape.rest.feature_0.0.0.jar" id="org.jboss.tools.modeshape.rest.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="GeneralTools" />
</feature>
<feature url="features/org.jboss.tools.runtime.feature_0.0.0.jar" id="org.jboss.tools.runtime.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
</feature>
<feature url="features/org.jboss.tools.runtime.core.feature_0.0.0.jar" id="org.jboss.tools.runtime.core.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
</feature>
<feature url="features/org.jboss.tools.runtime.drools.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.drools.detector.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
</feature>
<feature url="features/org.jboss.tools.runtime.esb.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.esb.detector.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
</feature>
<feature url="features/org.jboss.tools.runtime.jbpm.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.jbpm.detector.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
</feature>
<feature url="features/org.jboss.tools.usage.feature_0.0.0.jar" id="org.jboss.tools.usage.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
</feature>
- <category-def name="AllTools" label="All JBoss Tools - SOA Tooling 3.3">
+ <category-def name="AbridgedTools" label="Abridged JBoss Tools - SOA Tooling 3.3">
<description>
- Contains ALL the plugins that are available from
- JBoss Tools - SOA Tooling - except those
- related to integration with 3rd party
- plugins. Selecting this
- category will give you all tools needed for
- SOA Development.
+ Contains most of the JBoss Tools - SOA Tooling features.
+ Excluded are those related to integration with 3rd party
+ plugins. Selecting this category will give you all tools
+ needed for SOA Development.
</description>
</category-def>
@@ -105,16 +103,16 @@
<!-- aggregated from other sources -->
<feature url="features/org.drools.eclipse.feature_0.0.0.jar" id="org.drools.eclipse.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="SOATools" />
<category name="GeneralTools" />
</feature>
<feature url="features/org.drools.eclipse.task.feature_0.0.0.jar" id="org.drools.eclipse.task.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="SOATools" />
</feature>
<feature url="features/org.guvnor.tools.feature_0.0.0.jar" id="org.guvnor.tools.feature" version="0.0.0">
- <category name="AllTools" />
+ <category name="AbridgedTools" />
<category name="SOATools" />
</feature>
14 years, 2 months
JBoss Tools SVN: r36014 - workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-10-26 11:56:48 -0400 (Wed, 26 Oct 2011)
New Revision: 36014
Modified:
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT-sources.jar
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.jar
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.pom
Log:
New version of ear archetype
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT-sources.jar
===================================================================
(Binary files differ)
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.pom
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.pom 2011-10-26 15:39:23 UTC (rev 36013)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.pom 2011-10-26 15:56:48 UTC (rev 36014)
@@ -23,7 +23,7 @@
<packaging>maven-archetype</packaging>
<name>JBoss AS 7 / Java EE 6 EAR Webapp</name>
- <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7. The project is an EAR, with an EJB-JAR and WAR</description>
+ <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7 / EAP 6. The project is an EAR, with an EJB-JAR and WAR</description>
<url>http://jboss.org/jbossas</url>
14 years, 2 months
JBoss Tools SVN: r36013 - in branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/ui/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-26 11:39:23 -0400 (Wed, 26 Oct 2011)
New Revision: 36013
Modified:
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java
Log:
[JNIDE-10032] fixed loading ssh private keys from preferences
Modified: branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-26 14:16:49 UTC (rev 36012)
+++ branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-26 15:39:23 UTC (rev 36013)
@@ -10,6 +10,7 @@
org.eclipse.egit.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.jgit;bundle-version="[1.1.0,2.1.0)",
com.jcraft.jsch;bundle-version="0.1.44",
+ org.eclipse.jsch.core;bundle-version="[1.1.300,2.0.0)",
org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",
org.eclipse.m2e.core;bundle-version="1.0.100",
org.eclipse.ui,
Modified: branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java
===================================================================
--- branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2011-10-26 14:16:49 UTC (rev 36012)
+++ branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2011-10-26 15:39:23 UTC (rev 36013)
@@ -14,6 +14,9 @@
import java.io.FileNotFoundException;
import java.io.IOException;
+import org.eclipse.core.runtime.Preferences;
+import org.eclipse.jsch.internal.core.IConstants;
+import org.eclipse.jsch.internal.core.JSchCorePlugin;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
import org.jboss.tools.common.ui.ssh.SshPrivateKeysPreferences;
import org.jboss.tools.openshift.express.client.IDomain;
@@ -62,10 +65,25 @@
public void createSShKeyPair(String passPhrase) throws FileNotFoundException, OpenShiftException {
String sshKeysDirectory = SshPrivateKeysPreferences.getSshKeyDirectory();
SSHKeyPair keyPair = createSshKeyPair(passPhrase, sshKeysDirectory);
- SshPrivateKeysPreferences.add(keyPair.getPrivateKeyPath());
+ addToPrivateKeysPreferences(keyPair);
setSshKey(keyPair.getPublicKeyPath());
}
+ private void addToPrivateKeysPreferences(SSHKeyPair keyPair) {
+ Preferences preferences = JSchCorePlugin.getPlugin().getPluginPreferences();
+ String privateKeys = preferences.getString(IConstants.KEY_PRIVATEKEY);
+ if (privateKeys != null
+ && privateKeys.trim().length() > 0) {
+ privateKeys = privateKeys + "," + keyPair.getPrivateKeyPath();
+ } else {
+ privateKeys = keyPair.getPrivateKeyPath();
+ }
+ preferences.setValue(IConstants.KEY_PRIVATEKEY, privateKeys);
+ JSchCorePlugin.getPlugin().setNeedToLoadKnownHosts(true);
+ JSchCorePlugin.getPlugin().setNeedToLoadKeys(true);
+ JSchCorePlugin.getPlugin().savePluginPreferences();
+ }
+
private SSHKeyPair createSshKeyPair(String passPhrase, String sshKeysDirectory) throws OpenShiftException {
String privateKeyPath = getKeyPairFileName(sshKeysDirectory);
String publicKeyPath = getPublicKeyPath(privateKeyPath);
14 years, 2 months
JBoss Tools SVN: r36012 - in workspace/fred: repositories and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-10-26 10:16:49 -0400 (Wed, 26 Oct 2011)
New Revision: 36012
Added:
workspace/fred/repositories/
workspace/fred/repositories/snapshot/
workspace/fred/repositories/snapshot/org/
workspace/fred/repositories/snapshot/org/jboss/
workspace/fred/repositories/snapshot/org/jboss/spec/
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT-sources.jar
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.jar
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.pom
Log:
Adding forked EAR archetype to temp repo
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT-sources.jar
===================================================================
(Binary files differ)
Property changes on: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT-sources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.pom
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.pom (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-ear-webapp/7.0.2-SNAPSHOT/jboss-javaee6-ear-webapp-7.0.2-SNAPSHOT.pom 2011-10-26 14:16:49 UTC (rev 36012)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); you
+ may not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
+ required by applicable law or agreed to in writing, software distributed
+ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the License. -->
+<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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>6-beta-2</version>
+ </parent>
+
+ <groupId>org.jboss.spec.archetypes</groupId>
+ <artifactId>jboss-javaee6-ear-webapp</artifactId>
+ <version>7.0.2-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
+
+ <name>JBoss AS 7 / Java EE 6 EAR Webapp</name>
+ <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7. The project is an EAR, with an EJB-JAR and WAR</description>
+
+ <url>http://jboss.org/jbossas</url>
+
+ <developers>
+ <developer>
+ <name>Steven Boscarine</name>
+ <email>stevenboscarine(a)gmail.com</email>
+ </developer>
+ <developer>
+ <name>Dan Allen</name>
+ <email>dan.j.allen(a)gmail.com</email>
+ <organization>JBoss, by Red Hat</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://community.jboss.org/people/dan.j.allen</url>
+ </developer>
+ <developer>
+ <name>Pete Muir</name>
+ <email>pete.muir(a)jboss.org</email>
+ <organization>Red Hat Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://in.relation.to/Bloggers/Pete</url>
+ </developer>
+ <developer>
+ <id>fbricon</id>
+ <name>Fred Bricon</name>
+ <email>fbricon(a)gmail.com</email>
+ <organization>Red Hat, Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://community.jboss.org/people/fbricon</url>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.1</version>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.1</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
14 years, 2 months
JBoss Tools SVN: r36011 - workspace.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-10-26 09:56:23 -0400 (Wed, 26 Oct 2011)
New Revision: 36011
Added:
workspace/fred/
Log:
Creating Fred's workspace
14 years, 2 months
JBoss Tools SVN: r36010 - branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-26 09:13:31 -0400 (Wed, 26 Oct 2011)
New Revision: 36010
Modified:
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-10045 - m4
Modified: branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-10-26 13:12:32 UTC (rev 36009)
+++ branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-10-26 13:13:31 UTC (rev 36010)
@@ -51,8 +51,8 @@
return IServer.PUBLISH_STATE_UNKNOWN;
}
- int changed = EGitUtils.countCommitableChanges(p, new NullProgressMonitor() );
- if( changed == 0 || (kind == IServer.PUBLISH_FULL || state == IServer.PUBLISH_STATE_FULL)) {
+ if( kind == IServer.PUBLISH_FULL || state == IServer.PUBLISH_STATE_FULL) {
+ int changed = EGitUtils.countCommitableChanges(p, new NullProgressMonitor() );
if( changed != 0 && requestCommitAndPushApproval(module, changed)) {
monitor.beginTask("Publishing " + p.getName(), 200);
EGitUtils.commit(p, new SubProgressMonitor(monitor, 100));
@@ -66,7 +66,7 @@
return IServer.PUBLISH_STATE_NONE;
}
}
- return IServer.PUBLISH_STATE_INCREMENTAL;
+ return state;
}
private boolean requestCommitAndPushApproval(final IModule[] module, int changed) {
14 years, 2 months
JBoss Tools SVN: r36009 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-26 09:12:32 -0400 (Wed, 26 Oct 2011)
New Revision: 36009
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-10045 - trunk
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-10-26 12:54:43 UTC (rev 36008)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-10-26 13:12:32 UTC (rev 36009)
@@ -66,8 +66,8 @@
return IServer.PUBLISH_STATE_UNKNOWN;
}
- int changed = EGitUtils.countCommitableChanges(p, new NullProgressMonitor() );
- if( changed == 0 || (kind == IServer.PUBLISH_FULL || state == IServer.PUBLISH_STATE_FULL)) {
+ if((kind == IServer.PUBLISH_FULL || state == IServer.PUBLISH_STATE_FULL)) {
+ int changed = EGitUtils.countCommitableChanges(p, new NullProgressMonitor() );
if( changed != 0 && requestCommitAndPushApproval(module, changed)) {
monitor.beginTask("Publishing " + p.getName(), 200);
EGitUtils.commit(p, new SubProgressMonitor(monitor, 100));
@@ -81,7 +81,7 @@
return IServer.PUBLISH_STATE_NONE;
}
}
- return IServer.PUBLISH_STATE_INCREMENTAL;
+ return state;
}
private void shareProjects(final IProject[] projects) {
14 years, 2 months
JBoss Tools SVN: r36008 - in trunk/maven/features: org.jboss.tools.maven.hibernate.feature and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-10-26 08:54:43 -0400 (Wed, 26 Oct 2011)
New Revision: 36008
Modified:
trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.properties
trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.properties
Log:
JBIDE-10026 : fixed invalid descriptions for Maven CDI and Maven Hibernate features
Modified: trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.properties
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.properties 2011-10-26 11:45:06 UTC (rev 36007)
+++ trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.properties 2011-10-26 12:54:43 UTC (rev 36008)
@@ -24,7 +24,7 @@
updateSiteName=JBossTools Update Site
# "description" property - description of the feature
-description=JBoss Maven Seam Integration
+description=JBoss Maven CDI Configurator
# "copyright" property - text of the "Feature Update Copyright"
copyright=Copyright (c) 2010-2011 Red Hat, Inc. and others.\n\
Modified: trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.properties
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.properties 2011-10-26 11:45:06 UTC (rev 36007)
+++ trunk/maven/features/org.jboss.tools.maven.hibernate.feature/feature.properties 2011-10-26 12:54:43 UTC (rev 36008)
@@ -24,7 +24,7 @@
updateSiteName=JBossTools Update Site
# "description" property - description of the feature
-description=JBoss Maven Seam Integration
+description=JBoss Maven Hibernate Configurator
# "copyright" property - text of the "Feature Update Copyright"
copyright=Copyright (c) 2010-2011 Red Hat, Inc. and others.\n\
14 years, 2 months
JBoss Tools SVN: r36007 - in workspace/yradtsevich/browsersim/swt-webkit-browsersim: org.jboss.tools.browsersim.webkit.gtk.linux.x86_64 and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-10-26 07:45:06 -0400 (Wed, 26 Oct 2011)
New Revision: 36007
Added:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.classpath
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.project
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.settings/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.settings/org.eclipse.jdt.core.prefs
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.settings/org.eclipse.pde.core.prefs
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/META-INF/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/META-INF/MANIFEST.MF
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/build.properties
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/org/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/org/jboss/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/org/jboss/tools/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/org/jboss/tools/browsersim/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/org/jboss/tools/browsersim/webkit/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- added Linux x86_64 fragment
Property changes on: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64
___________________________________________________________________
Added: svn:ignore
+ bin
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.classpath
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.classpath (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.classpath 2011-10-26 11:45:06 UTC (rev 36007)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.project
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.project (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.project 2011-10-26 11:45:06 UTC (rev 36007)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.browsersim.webkit.gtk.linux.x86_64</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.settings/org.eclipse.jdt.core.prefs 2011-10-26 11:45:06 UTC (rev 36007)
@@ -0,0 +1,12 @@
+#Wed Oct 26 14:35:24 EEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.settings/org.eclipse.pde.core.prefs
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.settings/org.eclipse.pde.core.prefs (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/.settings/org.eclipse.pde.core.prefs 2011-10-26 11:45:06 UTC (rev 36007)
@@ -0,0 +1,4 @@
+#Wed Oct 26 14:30:24 EEST 2011
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/META-INF/MANIFEST.MF
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/META-INF/MANIFEST.MF (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/META-INF/MANIFEST.MF 2011-10-26 11:45:06 UTC (rev 36007)
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: WebKit
+Bundle-SymbolicName: org.jboss.tools.browsersim.webkit.gtk.linux.x86_64;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: org.jboss.tools.browsersim.webkit;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Eclipse-PlatformFilter: (& (osgi.ws=gtk)(osgi.os=linux)(osgi.arch=x86_64))
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/build.properties
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/build.properties (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/build.properties 2011-10-26 11:45:06 UTC (rev 36007)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86_64/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java 2011-10-26 11:45:06 UTC (rev 36007)
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.browsersim.webkit;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.internal.Converter;
+import org.eclipse.swt.internal.gtk.OS;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * @author Yahor Radtsevich (yradtsevich)
+ */
+public class WebKitBrowser extends AbstractWebKitBrowser {
+ private static final byte[] USER_AGENT; // = WebKitGTK.user_agent
+ static {
+ int length = "user-agent".length();
+ char [] chars = new char[length];
+ "user-agent".getChars(0, length, chars, 0);
+ USER_AGENT = new byte[length + 1];
+ for (int i = 0; i < length; i++) {
+ USER_AGENT[i] = (byte) chars [i];
+ }
+ }
+
+ public WebKitBrowser(Composite parent, int style) {
+ super(parent, style);
+ }
+
+ protected void setCustomUserAgent(String userAgent) {
+ try {
+ Field webBrowserField = Browser.class.getDeclaredField("webBrowser");
+ webBrowserField.setAccessible(true);
+ Object webKit = webBrowserField.get(this);
+
+ Field webViewField = webKit.getClass().getDeclaredField("webView");
+ webViewField.setAccessible(true);
+ long webView = (Long) webViewField.get(webKit);
+
+// long settings = WebKitGTK.webkit_web_view_get_settings(webView);
+ Class webKitGTKClass = Browser.class.getClassLoader().loadClass("org.eclipse.swt.internal.webkit.WebKitGTK");
+ Method webkit_web_view_get_settingsMethod = webKitGTKClass.getDeclaredMethod("webkit_web_view_get_settings", long.class);
+ long settings = (Long) webkit_web_view_get_settingsMethod.invoke(null, webView);
+
+ if (userAgent == null) {
+ OS.g_object_set(settings, USER_AGENT, 0, 0);
+ } else {
+ byte[] bytes = Converter.wcsToMbcs(null, userAgent, true);
+ OS.g_object_set(settings, USER_AGENT, bytes, 0);
+ }
+ } catch (SecurityException e) {
+ e.printStackTrace();
+ } catch (NoSuchFieldException e) {
+ e.printStackTrace();
+ } catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ }
+ }
+}
14 years, 2 months