JBoss Tools SVN: r24397 - trunk/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-24 19:35:37 -0400 (Tue, 24 Aug 2010)
New Revision: 24397
Modified:
trunk/build/publish.sh
Log:
ensure ${STAGINGDIR}/logs exists before creating zip.list.txt
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-08-24 23:29:33 UTC (rev 24396)
+++ trunk/build/publish.sh 2010-08-24 23:35:37 UTC (rev 24397)
@@ -108,6 +108,7 @@
# generate list of zips in this job
METAFILE=zip.list.txt
+mkdir -p ${STAGINGDIR}/logs
echo "ALL_ZIPS = \\" >> ${STAGINGDIR}/logs/${METAFILE}
for z in $(find ${STAGINGDIR} -name "*Update*.zip") $(find ${STAGINGDIR} -name "*Sources*.zip"); do
# list zips in staging dir
15 years, 4 months
JBoss Tools SVN: r24396 - trunk/build/aggregate/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-24 19:29:33 -0400 (Tue, 24 Aug 2010)
New Revision: 24396
Modified:
trunk/build/aggregate/site/site.xml
Log:
include Teiid features in aggregate site
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2010-08-24 22:13:54 UTC (rev 24395)
+++ trunk/build/aggregate/site/site.xml 2010-08-24 23:29:33 UTC (rev 24396)
@@ -277,7 +277,6 @@
<category name="AllTools" />
</feature>
- <!-- removed temporarily because teiid doesn't work w/ Eclipse 3.6. yet.
<feature url="features/org.teiid.datatools.connectivity.feature_0.0.0.jar" id="org.teiid.datatools.connectivity.feature" version="0.0.0">
<category name="AllTools" />
<category name="DataTools" />
@@ -290,5 +289,4 @@
<category name="AllTools" />
<category name="DataTools" />
</feature>
- -->
</site>
15 years, 4 months
JBoss Tools SVN: r24395 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-24 18:13:54 -0400 (Tue, 24 Aug 2010)
New Revision: 24395
Modified:
trunk/build/target-platform/e36-wtp32.target
Log:
comment out org.eclipse.jst.jsf.tests.feature.feature.group to get around mirror issues for now
Modified: trunk/build/target-platform/e36-wtp32.target
===================================================================
--- trunk/build/target-platform/e36-wtp32.target 2010-08-24 21:41:23 UTC (rev 24394)
+++ trunk/build/target-platform/e36-wtp32.target 2010-08-24 22:13:54 UTC (rev 24395)
@@ -138,7 +138,7 @@
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.0.v201005241510-7O7CFb3EMf84nP-FHuc10NTz--M3"/>
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.0.v201005241510-7H7AFUIDxumQGOb7ocjUR2Pvz-28"/>
<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.0.v201005241600-7S7WFAKFIpS---NRIS1pbfYBUIQ"/>
-<unit id="org.eclipse.jst.jsf.tests.feature.feature.group" version="3.2.0.v20100524-7E7W1FBBoPbPQIiTa3454"/>
+<!-- <unit id="org.eclipse.jst.jsf.tests.feature.feature.group" version="3.2.0.v20100524-7E7W1FBBoPbPQIiTa3454"/> -->
<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.0.v201005270528-7C78FGDF9JgLWLMBWz-Ose6"/>
<unit id="org.eclipse.jsf.feature.feature.group" version="3.2.0.v20100526-7E7I-F9JgLWLMBYy3114"/>
<unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.0.v201005241530-5--AkF7B77NBZBgBg"/>
15 years, 4 months
JBoss Tools SVN: r24394 - workspace/dgolovin/experimental-build.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2010-08-24 17:41:23 -0400 (Tue, 24 Aug 2010)
New Revision: 24394
Modified:
workspace/dgolovin/experimental-build/e36-wtp32.target
Log:
target platform that works with Teiid
Modified: workspace/dgolovin/experimental-build/e36-wtp32.target
===================================================================
--- workspace/dgolovin/experimental-build/e36-wtp32.target 2010-08-24 20:47:22 UTC (rev 24393)
+++ workspace/dgolovin/experimental-build/e36-wtp32.target 2010-08-24 21:41:23 UTC (rev 24394)
@@ -8,17 +8,47 @@
<repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.birt.chart.feature.group" version="2.6.0.v20100617-7f9T0FQCnv7wz02TTZ0LE1"/>
+<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.0.v20100617-57B-85wFdAHP-Cf8kRo1_ft1IUwD"/>
+<unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="2.6.0.v20100617-1315-35-7w3121172802426"/>
+<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100617-1315-35-7w3121172802426"/>
+<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="com.ibm.icu.base.feature.group" version="1.1.0.v20090119-79318s73533B57"/>
+<unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.0.v20100510-7K7QEoF7RZHQHHz-Jr"/>
+<unit id="org.eclipse.help.feature.group" version="1.2.0.v20100427-7e7jEKFEx2XlnZinYPtgz03"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.6.0.v20100526-0800-7z8XFUJFMTfCWGoVuHImpms9H155"/>
+<unit id="org.eclipse.platform.feature.group" version="3.6.0.v20100602-9gF78GpqFt6trOGhL60z0oEx3fz-JKNwxPY"/>
+<unit id="org.eclipse.platform.ide" version="3.6.0.I20100608-0911"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="3.4.0.v20100524-7M7K-FIhIez-egBko15H73"/>
+<unit id="org.eclipse.equinox.executable" version="3.4.0.v20100524-7M7K-FIhIez-egBko15H73"/>
+<unit id="org.eclipse.pde.feature.group" version="3.6.0.v20100525-7b7mFKtFEx2XmfZ4_B7NUJA"/>
+<unit id="org.eclipse.sdk.feature.group" version="3.6.0.v20100427-7Q7m-DPY2dP0s7TnP1vxqsprbrvrHJwHMVz0mb8mhRXmu"/>
+<unit id="org.eclipse.rcp.feature.group" version="3.6.0.v20100519-9OArFKvFtsd7WLUKh-DcYTS"/>
+<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.0.v20100603-7sF99FsFFUu63a35g6s"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.0.v20100601-7H7R-7v8rtGVR34XkO3kfH3DUO07"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.6"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.maven.ide.eclipse.sdk.feature.feature.group" version="0.10.0.20100209-0800"/>
<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/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.platform.ide" version="3.6.0.I20100608-0911"/>
-<repository location="http://download.eclipse.org/eclipse/updates/3.6"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.595-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.0.595-dev-e36"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.0.595-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit3.feature.group" version="2.0.0.595-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.0.595-dev-e36"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.0.0.595-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.feature.group" version="2.6.0.v20100617-9gF727DGKb0yl9AwWxpmbo35PwQ_"/>
<unit id="org.eclipse.datatools.enablement.sdk.feature.feature.group" version="1.8.0.v201005280400-7I97-FE9JfhXjGyyrcS_FeiNlq43"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.6.0.v20100614-1136"/>
+<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-8COKLDAKOXIEU_VWSfZdM9XR"/>
<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"/>
@@ -27,6 +57,7 @@
<unit id="org.eclipse.tptp.wtp.feature.group" version="4.5.0.v201005032111-54-78I8G0BlG8C88S8WCW88"/>
<unit id="org.eclipse.tptp.test.runtime.feature.group" version="4.5.0.v201005032111-7H7I-7VtKAvYv6f6qonS7y600vRQ"/>
<unit id="org.eclipse.tptp.trace.runtime.feature.group" version="4.4.0.v201005032111-7H7C-7XbK_J3E9NJPSTgdcXb94"/>
+<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.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"/>
@@ -43,162 +74,5 @@
<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201005241510-51EoAkF77g8HBSc"/>
<repository location="http://download.eclipse.org/releases/helios/"/>
</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.birt.chart.feature.group" version="2.6.0.v20100617-7f9T0FQCnv7wz02TTZ0LE1"/>
-<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.0.v20100617-57B-85wFdAHP-Cf8kRo1_ft1IUwD"/>
-<unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="2.6.0.v20100617-1315-35-7w3121172802426"/>
-<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100617-1315-35-7w3121172802426"/>
-<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
-</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.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"/>
-<unit id="org.eclipse.swtbot.feature.group" version="2.0.0.568-dev-e36"/>
-<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
-</location>
</locations>
-<includeBundles>
-<feature id="org.eclipse.birt.osgi.runtime"/>
-<feature id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature"/>
-<plugin id="org.eclipse.equinox.concurrent"/>
-<feature id="org.eclipse.tptp.test.tools"/>
-<feature id="org.maven.ide.eclipse.wtp.feature"/>
-<feature id="org.eclipse.datatools.sqldevtools.data.feature"/>
-<feature id="org.eclipse.jst.server_adapters.ext.feature"/>
-<feature id="org.eclipse.wst.xml.xpath2.processor.feature"/>
-<feature id="org.eclipse.help"/>
-<feature id="org.eclipse.tptp.monitoring.runtime"/>
-<feature id="org.eclipse.emf.mapping.ui"/>
-<feature id="org.eclipse.birt.chart"/>
-<feature id="org.eclipse.tptp.monitoring.instrumentation"/>
-<feature id="org.eclipse.tptp.platform.xerces"/>
-<feature id="org.eclipse.jst.ws.jaxws.dom.feature"/>
-<feature id="org.eclipse.datatools.enablement.oda.designer.feature"/>
-<feature id="org.eclipse.tptp.trace.arm.ui"/>
-<feature id="org.eclipse.wst.xml_ui.feature"/>
-<feature id="org.eclipse.datatools.enablement.jdbc.feature"/>
-<feature id="org.eclipse.birt"/>
-<feature id="org.eclipse.emf.common.ui"/>
-<feature id="org.eclipse.wst.common_ui.feature"/>
-<feature id="org.eclipse.jst.common.fproj.enablement.jdt"/>
-<feature id="org.eclipse.datatools.enablement.msft.feature"/>
-<feature id="org.eclipse.datatools.enablement.sqlite.feature"/>
-<feature id="org.eclipse.jpt.feature"/>
-<feature id="org.eclipse.emf.databinding.edit"/>
-<plugin id="org.eclipse.xsd"/>
-<feature id="org.eclipse.tptp.monitoring.managedagent"/>
-<feature id="org.eclipse.datatools.sqldevtools.ddlgen.feature"/>
-<feature id="org.eclipse.datatools.connectivity.oda.designer.feature"/>
-<feature id="org.eclipse.tptp.platform.runtime"/>
-<feature id="org.eclipse.tptp.platform.trace"/>
-<feature id="org.eclipse.datatools.sqldevtools.parsers.feature"/>
-<feature id="org.eclipse.tptp.platform.report"/>
-<feature id="org.eclipse.datatools.connectivity.feature"/>
-<feature id="org.eclipse.draw2d"/>
-<feature id="org.eclipse.wst.xsl.feature"/>
-<plugin id="org.eclipse.xsd.edit"/>
-<feature id="org.eclipse.gef"/>
-<feature id="org.eclipse.jst.server_core.feature"/>
-<feature id="org.eclipse.datatools.enablement.ingres.feature"/>
-<feature id="org.eclipse.emf.codegen.ecore"/>
-<feature id="org.eclipse.tptp.test.tools.junit"/>
-<feature id="org.eclipse.birt.integration.wtp"/>
-<feature id="org.eclipse.tptp.platform.samples"/>
-<feature id="org.eclipse.swtbot.eclipse.test.junit4"/>
-<feature id="org.eclipse.jsf.feature"/>
-<feature id="org.eclipse.jst.web_core.feature"/>
-<feature id="org.eclipse.jst.enterprise_core.feature"/>
-<feature id="org.eclipse.wst.server_ui.feature"/>
-<feature id="org.eclipse.tptp.trace"/>
-<feature id="org.eclipse.wst.server_userdoc.feature"/>
-<feature id="org.eclipse.emf.ecore"/>
-<feature id="org.eclipse.tptp.platform.batik.pdf"/>
-<feature id="org.eclipse.datatools.enablement.postgresql.feature"/>
-<feature id="org.eclipse.tptp.platform.integration.pde"/>
-<feature id="org.eclipse.birt.chart.integration.wtp"/>
-<feature id="org.eclipse.emf.edit.ui"/>
-<feature id="org.eclipse.tptp.platform.profile.server"/>
-<feature id="org.eclipse.tptp.trace.jvmti"/>
-<feature id="org.eclipse.emf.mapping.ecore.editor"/>
-<feature id="org.eclipse.jdt"/>
-<feature id="org.eclipse.datatools.enablement.ibm.feature"/>
-<feature id="org.eclipse.datatools.sqldevtools.ddl.feature"/>
-<feature id="org.eclipse.wst.server_core.feature"/>
-<feature id="org.eclipse.datatools.sqldevtools.results.feature"/>
-<feature id="org.eclipse.emf.mapping.ecore"/>
-<feature id="org.eclipse.swtbot.ide"/>
-<feature id="org.eclipse.datatools.enablement.sap.feature"/>
-<feature id="org.eclipse.rcp"/>
-<feature id="org.eclipse.jst.server_adapters.feature"/>
-<feature id="org.eclipse.jst.ws.jaxws.feature"/>
-<feature id="org.eclipse.tptp.platform.jvmti"/>
-<feature id="org.eclipse.emf"/>
-<feature id="org.eclipse.datatools.enablement.feature"/>
-<feature id="org.eclipse.emf.codegen"/>
-<plugin id="org.easymock"/>
-<plugin id="org.junit"/>
-<feature id="org.eclipse.wst.common_core.feature"/>
-<feature id="org.eclipse.datatools.connectivity.oda.designer.core.feature"/>
-<feature id="org.eclipse.tptp.monitoring.managedagent.agents"/>
-<feature id="org.eclipse.tptp.monitoring.mx4j.jmx"/>
-<feature id="org.maven.ide.eclipse.feature"/>
-<feature id="org.eclipse.datatools.enablement.jdt.feature"/>
-<feature id="org.eclipse.datatools.connectivity.oda.feature"/>
-<feature id="org.eclipse.pde"/>
-<feature id="org.eclipse.datatools.sqldevtools.feature"/>
-<feature id="org.eclipse.datatools.enablement.mysql.feature"/>
-<feature id="org.eclipse.datatools.enablement.hsqldb.feature"/>
-<feature id="org.eclipse.wst.web_core.feature"/>
-<feature id="org.eclipse.platform"/>
-<feature id="org.eclipse.zest"/>
-<feature id="org.eclipse.wst.ws_wsdl15.feature"/>
-<feature id="org.eclipse.emf.converter"/>
-<feature id="org.eclipse.swtbot.eclipse.gef"/>
-<feature id="org.eclipse.datatools.enablement.apache.derby.feature"/>
-<feature id="org.eclipse.tptp.platform.probekit"/>
-<feature id="org.eclipse.tptp.test"/>
-<feature id="org.eclipse.jst.server_ui.feature"/>
-<feature id="org.eclipse.tptp.test.samples"/>
-<feature id="org.eclipse.tptp.test.recorders.url"/>
-<feature id="org.eclipse.tptp.trace.runtime"/>
-<feature id="org.eclipse.jst.enterprise_ui.feature"/>
-<feature id="org.eclipse.wst.web_ui.feature"/>
-<feature id="org.eclipse.tptp.platform.instrumentation.ui"/>
-<feature id="org.eclipse.birt.report.designer.editor.xml.wtp"/>
-<feature id="org.eclipse.emf.common"/>
-<feature id="org.eclipse.wst.jsdt.feature"/>
-<feature id="org.eclipse.tptp.platform.jakarta.log4j"/>
-<feature id="org.eclipse.wst.server_adapters.feature"/>
-<feature id="org.eclipse.swtbot.eclipse"/>
-<feature id="org.eclipse.tptp.monitoring"/>
-<feature id="org.eclipse.tptp.test.runtime"/>
-<feature id="org.eclipse.emf.mapping"/>
-<feature id="org.eclipse.tptp.wtp"/>
-<feature id="org.eclipse.tptp.platform.core"/>
-<feature id="org.eclipse.jst.server_userdoc.feature"/>
-<feature id="org.eclipse.datatools.enablement.sybase.feature"/>
-<feature id="org.eclipse.emf.ecore.edit"/>
-<feature id="org.eclipse.wst.common.fproj"/>
-<feature id="org.eclipse.datatools.modelbase.feature"/>
-<feature id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature"/>
-<feature id="org.eclipse.emf.ecore.editor"/>
-<feature id="org.eclipse.emf.codegen.ui"/>
-<feature id="org.eclipse.wst.xml_core.feature"/>
-<feature id="org.eclipse.jst.web_ui.feature"/>
-<feature id="org.eclipse.tptp.trace.arm"/>
-<feature id="org.eclipse.emf.edit"/>
-<feature id="org.eclipse.swtbot"/>
-<feature id="org.eclipse.wst.ws_core.feature"/>
-<feature id="org.eclipse.equinox.p2.user.ui"/>
-<feature id="org.eclipse.tptp.platform.batik"/>
-<feature id="org.eclipse.datatools.enablement.oda.feature"/>
-<feature id="org.eclipse.wst.ws_ui.feature"/>
-<feature id="org.eclipse.datatools.enablement.oracle.feature"/>
-<feature id="org.eclipse.emf.codegen.ecore.ui"/>
-<feature id="org.eclipse.tptp.monitoring.examples"/>
-<feature id="org.eclipse.emf.databinding"/>
-<feature id="org.eclipse.tptp.platform.commons.logging"/>
-</includeBundles>
</target>
15 years, 4 months
JBoss Tools SVN: r24393 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-24 16:47:22 -0400 (Tue, 24 Aug 2010)
New Revision: 24393
Modified:
trunk/build/target-platform/e36-wtp32.target
Log:
replace plugin IUs with container feature IUs
Modified: trunk/build/target-platform/e36-wtp32.target
===================================================================
--- trunk/build/target-platform/e36-wtp32.target 2010-08-24 19:30:42 UTC (rev 24392)
+++ trunk/build/target-platform/e36-wtp32.target 2010-08-24 20:47:22 UTC (rev 24393)
@@ -21,14 +21,12 @@
<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"/>
-<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
-<unit id="org.jdom" version="1.0.0.v201005080400"/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519..."/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="javax.wsdl" version="1.6.2.v201005080631"/>
-<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
+<unit id="javax.wsdl.feature.feature.group" version="1.6.2.v201005080631"/>
+<unit id="org.apache.oro.feature.feature.group" version="2.0.8.v201005080400"/>
+<unit id="org.jdom.feature.feature.group" version="1.0.0.v201005080400"/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/thirdparty/"/>
</location>
<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -48,7 +46,7 @@
<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.emf.ecore" 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.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"/>
@@ -73,7 +71,7 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.0.v20100617-57B-85wFdAHP-Cf8kRo1_ft1IUwD"/>
<unit id="org.eclipse.birt.feature.group" version="2.6.0.v20100617-9gF727DGKb0yl9AwWxpmbo35PwQ_"/>
-<unit id="org.eclipse.birt.integration.wtp.ui" version="2.6.0.v20100617-1315"/>
+<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100617-1315-35-7w3121172802426"/>
<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -174,9 +172,6 @@
<feature id="org.drools.eclipse.feature" />
<feature id="org.drools.eclipse.task.feature" />
<feature id="org.guvnor.tools.feature" />
-<plugin id="javax.wsdl"/>
-<plugin id="org.apache.oro"/>
-<plugin id="org.jdom"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
</target>
15 years, 4 months
JBoss Tools SVN: r24392 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-24 15:30:42 -0400 (Tue, 24 Aug 2010)
New Revision: 24392
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java
Log:
[JBIDE-6376] __utmz cookie added again
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-24 19:21:26 UTC (rev 24391)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-24 19:30:42 UTC (rev 24392)
@@ -153,19 +153,29 @@
IGoogleAnalyticsParameters.PLUS_SIGN)
.appendTo(builder);
+ new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE,
+ new StringBuilder()
+ .append("999.")
+ .append(googleParameters.getFirstVisit())
+ .append(IGoogleAnalyticsParameters.DOT)
+ .append("1.1.")
+ , IGoogleAnalyticsParameters.SEMICOLON
+ , IGoogleAnalyticsParameters.PLUS_SIGN)
+ .appendTo(builder);
+
new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_SESSION,
new StringBuilder()
.append("1"),
IGoogleAnalyticsParameters.SEMICOLON
, IGoogleAnalyticsParameters.PLUS_SIGN)
- .appendTo(builder);
-
+ .appendTo(builder);
+
new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_BROWSERSESSION,
new StringBuilder()
.append("1"),
IGoogleAnalyticsParameters.SEMICOLON
, IGoogleAnalyticsParameters.PLUS_SIGN)
- .appendTo(builder);
+ .appendTo(builder);
new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCSR,
"(direct)",
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-08-24 19:21:26 UTC (rev 24391)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-08-24 19:30:42 UTC (rev 24392)
@@ -39,6 +39,7 @@
public static final String PARAM_COOKIES_UNIQUE_VISITOR_ID = "__utma";
public static final String PARAM_COOKIES_SESSION = "__utmb";
public static final String PARAM_COOKIES_BROWSERSESSION = "__utmc";
+ public static final String PARAM_COOKIES_REFERRAL_TYPE = "__utmz";
public static final String PARAM_REFERRAL = "utmr";
public static final String PARAM_TRACKING_CODE_VERSION = "utmwv";
15 years, 4 months
JBoss Tools SVN: r24391 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-08-24 15:21:26 -0400 (Tue, 24 Aug 2010)
New Revision: 24391
Added:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingEnablement.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/HttpEncodingUtils.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingEnablementTest.java
Removed:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalReportingEnablement.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/EncodingUtils.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalReportingEnablementTest.java
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java
Log:
[JBIDE-6880] implementation and tests updated
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java 2010-08-24 17:13:52 UTC (rev 24390)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java 2010-08-24 19:21:26 UTC (rev 24391)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.usage;
-import org.jboss.tools.usage.util.EncodingUtils;
+import org.jboss.tools.usage.util.HttpEncodingUtils;
/**
* Focus point of the application. It can represent data points like application
@@ -43,7 +43,7 @@
public String getContentURI() {
StringBuilder builder = new StringBuilder();
appendContentURI(builder, this);
- return EncodingUtils.checkedEncodeUtf8(builder.toString());
+ return HttpEncodingUtils.checkedEncodeUtf8(builder.toString());
}
private void appendContentURI(StringBuilder builder, FocusPoint focusPoint) {
@@ -58,7 +58,7 @@
public String getContentTitle() {
StringBuilder builder = new StringBuilder();
appendContentTitle(builder, this);
- return EncodingUtils.checkedEncodeUtf8(builder.toString());
+ return HttpEncodingUtils.checkedEncodeUtf8(builder.toString());
}
private void appendContentTitle(StringBuilder builder, FocusPoint focusPoint) {
Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalReportingEnablement.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalReportingEnablement.java 2010-08-24 17:13:52 UTC (rev 24390)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalReportingEnablement.java 2010-08-24 19:21:26 UTC (rev 24391)
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.usage;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.jboss.tools.usage.util.StatusUtils;
-
-/**
- * A class that implements a global reporting enablement setting. The current
- * implementation queries a given url and extracts the enablement value out of
- * the response.
- */
-public class GlobalReportingEnablement {
-
- private static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$
- private static final String REPORTING_ENABLEMENT_URL = "https://community.jboss.org/wiki/JBossToolsJBossDeveloperStudioUsageRepor..."; //$NON-NLS-1$
- private static final String REPORTING_ENABLEMENT_REGEX = "Usage Reporting is ([A-Za-z]+)"; //$NON-NLS-1$
-
- private Plugin plugin;
- private HttpURLConnection urlConnection;
- private Pattern pattern;
-
- public GlobalReportingEnablement(Plugin plugin) throws IOException {
- Assert.isNotNull(plugin);
-
- this.plugin = plugin;
- this.urlConnection = createURLConnection(REPORTING_ENABLEMENT_URL);
- this.pattern = Pattern.compile(REPORTING_ENABLEMENT_REGEX);
- }
-
- public boolean isEnabled() {
- return parse(request(REPORTING_ENABLEMENT_URL));
- }
-
- /**
- * Sends a http GET request to the given URL. Returns the response string or
- * <tt>null</tt> if an error occurred. The errors catched are Exceptions or
- * HTTP error codes.
- *
- * @param url
- * the url to send the GET request to
- * @return the response or <tt>null</tt> if an error occured.
- *
- * @see HttpURLConnection
- */
- protected String request(String url) {
- String response = null;
- try {
- urlConnection.connect();
- int responseCode = getResponseCode(urlConnection);
- if (responseCode == HttpURLConnection.HTTP_OK) {
- IStatus status = StatusUtils.getDebugStatus(
- plugin.getBundle().getSymbolicName()
- , UsageMessages.KillSwitchPreference_Info_HttpQuery, url);
- plugin.getLog().log(status);
- response = urlConnection.getResponseMessage();
- } else {
- IStatus status = StatusUtils.getErrorStatus(
- plugin.getBundle().getSymbolicName()
- , UsageMessages.KillSwitchPreference_Error_Http, null, url);
- plugin.getLog().log(status);
- }
- } catch (Exception e) {
- IStatus status = StatusUtils.getErrorStatus(
- plugin.getBundle().getSymbolicName()
- , UsageMessages.KillSwitchPreference_Error_Http, null, url);
- plugin.getLog().log(status);
- }
- return response;
- }
-
- /**
- * Parses the given string and extracts the enablement value.
- *
- * @param response
- * the response
- * @return true, if successful
- */
- private boolean parse(String response) {
- Matcher matcher = pattern.matcher(response);
- if (matcher.find() && matcher.groupCount() >= 1) {
- String enablementValue = matcher.group(1);
- return isEnabled(enablementValue);
- }
- return false;
- }
-
- private boolean isEnabled(String enablementValue) {
- return (enablementValue != null && "ENABLED".equals(enablementValue.toUpperCase()));
- }
-
- /**
- * Creates a new url connection.
- *
- * @param urlString
- * the url string
- * @return the http url connection
- * @throws IOException
- * Signals that an I/O exception has occurred.
- */
- protected HttpURLConnection createURLConnection(String urlString) throws IOException {
- URL url = new URL(urlString);
- HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
- urlConnection.setInstanceFollowRedirects(true);
- urlConnection.setRequestMethod(GET_METHOD_NAME);
- return urlConnection;
- }
-
- /**
- * Returns the return code from the given {@link HttpURLConnection}.
- * Provided to be called by test cases so that they can retrieve the return
- * code.
- *
- * @param urlConnection
- * to get the response code from
- * @return the return code the HttpUrlConnection received
- * @throws IOException
- * Signals that an I/O exception has occurred.
- */
- protected int getResponseCode(HttpURLConnection urlConnection) throws IOException {
- return urlConnection.getResponseCode();
- }
-}
Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingEnablement.java (from rev 24378, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalReportingEnablement.java)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingEnablement.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingEnablement.java 2010-08-24 19:21:26 UTC (rev 24391)
@@ -0,0 +1,168 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.usage;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Plugin;
+import org.jboss.tools.usage.util.HttpEncodingUtils;
+import org.jboss.tools.usage.util.StatusUtils;
+
+/**
+ * A class that implements a global reporting enablement setting. The current
+ * implementation queries a given url and extracts the enablement value out of
+ * the response.
+ */
+public class GlobalUsageReportingEnablement {
+
+ private static final String REPORTING_ENABLEMENT_ENABLEDVALUE = "ENABLED";
+
+ private static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$
+ private static final String REPORTING_ENABLEMENT_URL = "http://community.jboss.org/wiki/JBossToolsJBossDeveloperStudioUsageReport..."; //$NON-NLS-1$
+ private static final String REPORTING_ENABLEMENT_STARTSEQUENCE = "Usage Reporting is "; //$NON-NLS-1$
+
+ private Plugin plugin;
+ private HttpURLConnection urlConnection;
+
+ public GlobalUsageReportingEnablement(Plugin plugin) throws IOException {
+ Assert.isNotNull(plugin);
+
+ this.plugin = plugin;
+ this.urlConnection = createURLConnection(REPORTING_ENABLEMENT_URL);
+ }
+
+ public boolean isEnabled() {
+ try {
+ return parse(request(REPORTING_ENABLEMENT_URL));
+ } catch (IOException e) {
+ IStatus status = StatusUtils.getErrorStatus(
+ plugin.getBundle().getSymbolicName()
+ , UsageMessages.KillSwitchPreference_Error_Exception, e);
+ plugin.getLog().log(status);
+ return false;
+ }
+ }
+
+ /**
+ * Sends a http GET request to the given URL. Returns the response string or
+ * <tt>null</tt> if an error occurred. The errors catched are Exceptions or
+ * HTTP error codes.
+ *
+ * @param url
+ * the url to send the GET request to
+ * @return the response or <tt>null</tt> if an error occured.
+ * @throws UnsupportedEncodingException
+ *
+ * @see HttpURLConnection
+ */
+ protected InputStreamReader request(String url) throws UnsupportedEncodingException {
+ InputStreamReader responseReader = null;
+ try {
+ urlConnection.connect();
+ int responseCode = getResponseCode(urlConnection);
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ IStatus status = StatusUtils.getDebugStatus(
+ plugin.getBundle().getSymbolicName()
+ , UsageMessages.KillSwitchPreference_Info_HttpQuery
+ , url);
+ plugin.getLog().log(status);
+ responseReader = getInputStreamReader(urlConnection.getContentType());
+ } else {
+ IStatus status = StatusUtils.getErrorStatus(
+ plugin.getBundle().getSymbolicName()
+ , UsageMessages.KillSwitchPreference_Error_Http, null, url);
+ plugin.getLog().log(status);
+ }
+ } catch (Exception e) {
+ IStatus status = StatusUtils.getErrorStatus(
+ plugin.getBundle().getSymbolicName()
+ , UsageMessages.KillSwitchPreference_Error_Http, e, url);
+ plugin.getLog().log(status);
+ }
+ return responseReader;
+ }
+
+ private InputStreamReader getInputStreamReader(String contentType) throws UnsupportedEncodingException, IOException {
+ String contentTypeCharset = HttpEncodingUtils.getContentTypeCharset(contentType);
+ if (contentTypeCharset != null && contentTypeCharset.length() > 0) {
+ return new InputStreamReader(new BufferedInputStream(urlConnection.getInputStream()),
+ contentTypeCharset);
+ } else {
+ return new InputStreamReader(new BufferedInputStream(urlConnection.getInputStream()));
+ }
+ }
+
+ /**
+ * Parses the given string and extracts the enablement value.
+ *
+ * @param input
+ * stream that holds
+ * @return true, if successful
+ */
+ private boolean parse(InputStreamReader reader) throws IOException {
+ int i = 0;
+ char[] reportingValueCharacters = new char[REPORTING_ENABLEMENT_ENABLEDVALUE.length()];
+ for (int character = 0; character != -1; character = reader.read()) {
+ if (REPORTING_ENABLEMENT_STARTSEQUENCE.charAt(i) == (char) character) {
+ if (++i == REPORTING_ENABLEMENT_STARTSEQUENCE.length()) {
+ reader.read(reportingValueCharacters);
+ return isEnabled(new String(reportingValueCharacters));
+ }
+ } else {
+ i = 0;
+ }
+ }
+ return false;
+ }
+
+ private boolean isEnabled(String enablementValue) {
+ return (enablementValue != null && REPORTING_ENABLEMENT_ENABLEDVALUE.equals(enablementValue.toUpperCase()));
+ }
+
+ /**
+ * Creates a new url connection.
+ *
+ * @param urlString
+ * the url string
+ * @return the http url connection
+ * @throws IOException
+ * Signals that an I/O exception has occurred.
+ */
+ protected HttpURLConnection createURLConnection(String urlString) throws IOException {
+ URL url = new URL(urlString);
+ HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
+ urlConnection.setInstanceFollowRedirects(true);
+ urlConnection.setRequestMethod(GET_METHOD_NAME);
+ return urlConnection;
+ }
+
+ /**
+ * Returns the return code from the given {@link HttpURLConnection}.
+ * Provided to be called by test cases so that they can retrieve the return
+ * code.
+ *
+ * @param urlConnection
+ * to get the response code from
+ * @return the return code the HttpUrlConnection received
+ * @throws IOException
+ * Signals that an I/O exception has occurred.
+ */
+ protected int getResponseCode(HttpURLConnection urlConnection) throws IOException {
+ return urlConnection.getResponseCode();
+ }
+}
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingEnablement.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-24 17:13:52 UTC (rev 24390)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-24 19:21:26 UTC (rev 24391)
@@ -14,7 +14,7 @@
import org.jboss.tools.usage.FocusPoint;
import org.jboss.tools.usage.IURLBuildingStrategy;
-import org.jboss.tools.usage.util.EncodingUtils;
+import org.jboss.tools.usage.util.HttpEncodingUtils;
/**
* Class that builds an URL that passes given parameters to google analytics
@@ -188,7 +188,7 @@
builder.append(IGoogleAnalyticsParameters.SEMICOLON);
- return EncodingUtils.checkedEncodeUtf8(builder.toString());
+ return HttpEncodingUtils.checkedEncodeUtf8(builder.toString());
}
private String getRandomNumber() {
Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/EncodingUtils.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/EncodingUtils.java 2010-08-24 17:13:52 UTC (rev 24390)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/EncodingUtils.java 2010-08-24 19:21:26 UTC (rev 24391)
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.usage.util;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-/**
- * @author Andre Dietisheim
- */
-public class EncodingUtils {
-
- private static final String ENCODING_UTF8 = "UTF-8";
-
- /**
- * Encodes the given string in utf8 while catching exceptions that may
- * occur. If an encoding exception occurs, <tt>null</tt> is returned
- *
- * @param aString
- * the a string to be encoded
- * @return the encoded string or <tt>null</tt> if an error occured while
- * encoding
- */
- public static String checkedEncodeUtf8(String aString) {
- try {
- return URLEncoder.encode(aString, ENCODING_UTF8);
- } catch (UnsupportedEncodingException e) {
- return aString;
- }
- }
-
-}
Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/HttpEncodingUtils.java (from rev 24293, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/EncodingUtils.java)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/HttpEncodingUtils.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/HttpEncodingUtils.java 2010-08-24 19:21:26 UTC (rev 24391)
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.usage.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class HttpEncodingUtils {
+
+ private static final String ENCODING_UTF8 = "UTF-8";
+
+ private static Pattern CHARSET_ENCODING_PATTERN = Pattern.compile("charset=(.+)");
+
+ /**
+ * Encodes the given string in utf8 while catching exceptions that may
+ * occur. If an encoding exception occurs, <tt>null</tt> is returned
+ *
+ * @param aString
+ * the a string to be encoded
+ * @return the encoded string or <tt>null</tt> if an error occured while
+ * encoding
+ */
+ public static String checkedEncodeUtf8(String aString) {
+ try {
+ return URLEncoder.encode(aString, ENCODING_UTF8);
+ } catch (UnsupportedEncodingException e) {
+ return aString;
+ }
+ }
+
+ /**
+ * Returns the charset indicated in the content-type field of the http
+ * header. Returns <tt>null</tt> if none is indicated.
+ *
+ * @param contentType
+ * the content type
+ * @return the content type charset or <tt>null</tt>
+ */
+ public static String getContentTypeCharset(String contentType) {
+ Matcher matcher = CHARSET_ENCODING_PATTERN.matcher(contentType);
+ if (!matcher.find()) {
+ return null;
+ }
+
+ return matcher.group(1);
+ }
+
+}
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/HttpEncodingUtils.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-08-24 17:13:52 UTC (rev 24390)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-08-24 19:21:26 UTC (rev 24391)
@@ -11,7 +11,7 @@
package org.jboss.tools.usage.test;
import org.jboss.tools.usage.FocusPoint;
-import org.jboss.tools.usage.util.EncodingUtils;
+import org.jboss.tools.usage.util.HttpEncodingUtils;
import junit.framework.TestCase;
@@ -24,9 +24,9 @@
private static final String child1 = "child1";
- private static final String URI_SEPARATOR_ENCODED = EncodingUtils.checkedEncodeUtf8(FocusPoint.URI_SEPARATOR);
+ private static final String URI_SEPARATOR_ENCODED = HttpEncodingUtils.checkedEncodeUtf8(FocusPoint.URI_SEPARATOR);
- private static final String TITLE_SEPARATOR_ENCODED = EncodingUtils.checkedEncodeUtf8(FocusPoint.TITLE_SEPARATOR);
+ private static final String TITLE_SEPARATOR_ENCODED = HttpEncodingUtils.checkedEncodeUtf8(FocusPoint.TITLE_SEPARATOR);
public void testGetContentURI_Simple() throws Exception {
FocusPoint focusPoint = new FocusPoint(root);
Deleted: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalReportingEnablementTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalReportingEnablementTest.java 2010-08-24 17:13:52 UTC (rev 24390)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalReportingEnablementTest.java 2010-08-24 19:21:26 UTC (rev 24391)
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.usage.test;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-
-import org.jboss.tools.usage.GlobalReportingEnablement;
-import org.junit.Test;
-
-/**
- * The Class GlobalReportingEnablementTest.
- */
-public class GlobalReportingEnablementTest {
-
- @Test
- public void canExtractEnabledValue() throws IOException {
- GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("ENABLED");
- assertTrue(reportEnablement.isEnabled());
- }
-
- @Test
- public void canExtractDisabledValue() throws IOException {
- GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("DISABLED");
- assertTrue(reportEnablement.isEnabled());
- }
-
- @Test
- public void canExtractDisabledOutUndefinedValue() throws IOException {
- GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("Rubbish");
- assertTrue(reportEnablement.isEnabled());
- }
-
- private class GlobalReportingEnablementFake extends GlobalReportingEnablement {
-
- private String enablementValue;
-
- public GlobalReportingEnablementFake(String enablementValue) throws IOException {
- super(JBossToolsUsageTestActivator.getDefault());
- this.enablementValue = enablementValue;
- }
-
- @Override
- protected String request(String url) {
- return getEnablementPageContent(enablementValue);
-
- }
- }
-
- private String getEnablementPageContent(String enablementValue) {
- return "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\""
- + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"> "
- + " "
- + " "
- + "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\"> "
- + "<head> "
- + " <title> JBoss Tools / JBoss Developer Studio Usage Reporting Enablement - JBoss Community</title> "
- + " "
- + " <meta http-equiv=\"X-UA-Compatible\" content=\"IE=EmulateIE7\" /> "
- + " "
- + " <script type=\"text/javascript\"> "
- + " var javascriptIsCool = false;"
- + " </script> "
- + " "
- + "</head> "
- + "<body class=\"jive-body-content jive-body-content-document\" > "
- + " <div id=\"jive-body\"> "
- + " "
- + "<div class=\"jive-content\"> "
- + " <div class=\"jive-content-header\"> "
- + " <div class=\"jive-wiki-post-moderating jive-content-header-moderating\"> "
- + " <span class=\"jive-icon-med jive-icon-moderation\"></span>Currently Being Moderated"
- + " </div> "
- + " <div class=\"jive-content-title\"> "
- + " <h2><span class=\"jive-icon-big jive-icon-document\"></span> JBoss Tools / JBoss Developer Studio Usage Reporting Enablement</h2> "
- + " </div> "
- + " <div class=\"jive-content-header-version\"> "
- + " VERSION 5 "
- + " <a href=\"/wiki/JBossToolsJBossDeveloperStudioUsageReportingEnablement/diff?secondVersionNumber=5\" title=\"Click to view article history\"><img class=\"jive-icon-sml jive-icon-search\" src=\"/4.0.5/images/transparent.png\" alt=\"Click to view article history\" /></a> "
- + " </div> "
- + " <div class=\"jive-content-header-details\"> "
- + " "
- + "Created on: Aug 24, 2010 5:39 AM by"
- + "<a href=\"/people/adietish\""
- + "id=\"jive-72036899,987,346,482,238\""
- + "onmouseover=\"quickuserprofile.getUserProfileTooltip(72036);\""
- + "onmouseout=\"quickuserprofile.cancelTooltip();\""
- + "class=\"jiveTT-hover-user jive-username-link\""
- + ">Andre Dietisheim</a> <span>-</span> "
- + "Last Modified: "
- + "Aug 24, 2010 5:53 AM"
- + "by <a href=\"/people/adietish\""
- + "id=\"jive-72036899,987,347,353,238\""
- + "onmouseover=\"quickuserprofile.getUserProfileTooltip(72036);\""
- + "onmouseout=\"quickuserprofile.cancelTooltip();\""
- + "class=\"jiveTT-hover-user jive-username-link\""
- + ">Andre Dietisheim</a> </div> "
- + " "
- + " </div> "
- + " <div class=\"jive-content-body\"> "
- + " "
- + "<!-- [DocumentBodyStart:e26c60c0-cb73-47b7-bded-f4eb7320305b] --><div class=\"jive-rendered-content\"><p>This article is queried by the JBoss Tools / JBoss Developer Studio usage reporting plugin. It implements a global kill-switch that allows us to disable usage reporting stats. The plugin looks for a string of the format:</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><p><strong>Usage  Reporting  is <"
- + enablementValue
- + "></strong>. Any value that differs from ENABLED is interpreted as DISABLED.</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><h1>Usage Reporting is ENABLED</h1></div><!-- [DocumentBodyEnd:e26c60c0-cb73-47b7-bded-f4eb7320305b] --> "
- + " "
- + " </div> "
- + " <div class=\"jive-content-footer\"> "
- + " "
- + " "
- + " <!-- BEGIN content details --> "
- + " <span class=\"jive-content-footer-item\"> "
- + " 18 Views</a> "
- + " </span> "
- + " "
- + " "
- + " </div> "
- + "</div> "
- + "</body> "
- + "</html> ";
- }
-}
Copied: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingEnablementTest.java (from rev 24378, trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalReportingEnablementTest.java)
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingEnablementTest.java (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingEnablementTest.java 2010-08-24 19:21:26 UTC (rev 24391)
@@ -0,0 +1,141 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.usage.test;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+
+import org.jboss.tools.usage.GlobalUsageReportingEnablement;
+import org.junit.Test;
+
+/**
+ * The Class GlobalReportingEnablementTest.
+ */
+public class GlobalUsageReportingEnablementTest {
+
+ @Test
+ public void canExtractEnabledValue() throws IOException {
+ GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("ENABLED");
+ assertTrue(reportEnablement.isEnabled());
+ }
+
+ @Test
+ public void canExtractDisabledValue() throws IOException {
+ GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("DISABLED");
+ assertTrue(reportEnablement.isEnabled());
+ }
+
+ @Test
+ public void canExtractDisabledOutUndefinedValue() throws IOException {
+ GlobalReportingEnablementFake reportEnablement = new GlobalReportingEnablementFake("Rubbish");
+ assertTrue(reportEnablement.isEnabled());
+ }
+
+ private class GlobalReportingEnablementFake extends GlobalUsageReportingEnablement {
+
+ private String enablementValue;
+
+ public GlobalReportingEnablementFake(String enablementValue) throws IOException {
+ super(JBossToolsUsageTestActivator.getDefault());
+ this.enablementValue = enablementValue;
+ }
+
+ @Override
+ protected InputStreamReader request(String url) throws UnsupportedEncodingException {
+ return new InputStreamReader(new ByteArrayInputStream(getEnablementPageContent(enablementValue).getBytes()), "UTF-8");
+
+ }
+ }
+
+ private String getEnablementPageContent(String enablementValue) {
+ return "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\""
+ + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"> "
+ + " "
+ + " "
+ + "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\"> "
+ + "<head> "
+ + " <title> JBoss Tools / JBoss Developer Studio Usage Reporting Enablement - JBoss Community</title> "
+ + " "
+ + " <meta http-equiv=\"X-UA-Compatible\" content=\"IE=EmulateIE7\" /> "
+ + " "
+ + " <script type=\"text/javascript\"> "
+ + " var javascriptIsCool = false;"
+ + " </script> "
+ + " "
+ + "</head> "
+ + "<body class=\"jive-body-content jive-body-content-document\" > "
+ + " <div id=\"jive-body\"> "
+ + " "
+ + "<div class=\"jive-content\"> "
+ + " <div class=\"jive-content-header\"> "
+ + " <div class=\"jive-wiki-post-moderating jive-content-header-moderating\"> "
+ + " <span class=\"jive-icon-med jive-icon-moderation\"></span>Currently Being Moderated"
+ + " </div> "
+ + " <div class=\"jive-content-title\"> "
+ + " <h2><span class=\"jive-icon-big jive-icon-document\"></span> JBoss Tools / JBoss Developer Studio Usage Reporting Enablement</h2> "
+ + " </div> "
+ + " <div class=\"jive-content-header-version\"> "
+ + " VERSION 5 "
+ + " <a href=\"/wiki/JBossToolsJBossDeveloperStudioUsageReportingEnablement/diff?secondVersionNumber=5\" title=\"Click to view article history\"><img class=\"jive-icon-sml jive-icon-search\" src=\"/4.0.5/images/transparent.png\" alt=\"Click to view article history\" /></a> "
+ + " </div> "
+ + " <div class=\"jive-content-header-details\"> "
+ + " "
+ + "Created on: Aug 24, 2010 5:39 AM by"
+ + "<a href=\"/people/adietish\""
+ + "id=\"jive-72036899,987,346,482,238\""
+ + "onmouseover=\"quickuserprofile.getUserProfileTooltip(72036);\""
+ + "onmouseout=\"quickuserprofile.cancelTooltip();\""
+ + "class=\"jiveTT-hover-user jive-username-link\""
+ + ">Andre Dietisheim</a> <span>-</span> "
+ + "Last Modified: "
+ + "Aug 24, 2010 5:53 AM"
+ + "by <a href=\"/people/adietish\""
+ + "id=\"jive-72036899,987,347,353,238\""
+ + "onmouseover=\"quickuserprofile.getUserProfileTooltip(72036);\""
+ + "onmouseout=\"quickuserprofile.cancelTooltip();\""
+ + "class=\"jiveTT-hover-user jive-username-link\""
+ + ">Andre Dietisheim</a> </div> "
+ + " "
+ + " </div> "
+ + " <div class=\"jive-content-body\"> "
+ + " "
+ + "<!-- [DocumentBodyStart:e26c60c0-cb73-47b7-bded-f4eb7320305b] --><div class=\"jive-rendered-content\"><p>This article is queried by the JBoss Tools / JBoss Developer Studio usage reporting plugin. It implements a global kill-switch that allows us to disable usage reporting stats. The plugin looks for a string of the format:</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><p><strong>Usage  Reporting  is <"
+
+ + enablementValue
+
+ + "></strong>. Any value that differs from ENABLED is interpreted as DISABLED.</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><h1>Usage Reporting is ENABLED</h1></div><!-- [DocumentBodyEnd:e26c60c0-cb73-47b7-bded-f4eb7320305b] --> "
+ + " "
+ + " </div> "
+ + " <div class=\"jive-content-footer\"> "
+ + " "
+ + " "
+ + " <!-- BEGIN content details --> "
+ + " <span class=\"jive-content-footer-item\"> "
+ + " 18 Views</a> "
+ + " </span> "
+ + " "
+ + " "
+ + " </div> "
+ + "</div> "
+ + "</body> "
+ + "</html> ";
+ }
+
+ @Test
+ public void isPageAccessible() throws IOException {
+ GlobalUsageReportingEnablement reportEnablement = new GlobalUsageReportingEnablement(JBossToolsUsageTestActivator.getDefault());
+ System.err.println("Usage reporting is globally \"" + reportEnablement.isEnabled() + "\"");
+ }
+}
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingEnablementTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-08-24 17:13:52 UTC (rev 24390)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-08-24 19:21:26 UTC (rev 24391)
@@ -19,7 +19,7 @@
GoogleAnalyticsUrlStrategyTest.class,
JBossToolsUsageIntegrationTest.class,
EclipseEnvironmenTest.class,
- GlobalReportingEnablementTest.class})
+ GlobalUsageReportingEnablementTest.class})
/**
* @author Andre Dietisheim
15 years, 4 months
JBoss Tools SVN: r24390 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-24 13:13:52 -0400 (Tue, 24 Aug 2010)
New Revision: 24390
Modified:
trunk/build/target-platform/e36-wtp32.target
Log:
be. explicit. b e explicit. ...
Modified: trunk/build/target-platform/e36-wtp32.target
===================================================================
--- trunk/build/target-platform/e36-wtp32.target 2010-08-24 16:37:52 UTC (rev 24389)
+++ trunk/build/target-platform/e36-wtp32.target 2010-08-24 17:13:52 UTC (rev 24390)
@@ -59,7 +59,7 @@
<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/"/>
+<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201006141136/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.595-dev-e36"/>
15 years, 4 months
JBoss Tools SVN: r24389 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts.
by jbosstools-commits@lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-08-24 12:37:52 -0400 (Tue, 24 Aug 2010)
New Revision: 24389
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java
Log:
Make package not private.
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java 2010-08-24 16:36:33 UTC (rev 24388)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java 2010-08-24 16:37:52 UTC (rev 24389)
@@ -1,4 +1,4 @@
-private package org.jboss.tools.ui.bot.ext.parts;
+package org.jboss.tools.ui.bot.ext.parts;
import static org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable.syncExec;
import static org.junit.Assert.assertNotNull;
15 years, 4 months
JBoss Tools SVN: r24387 - in trunk: build/parent and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-08-24 12:26:43 -0400 (Tue, 24 Aug 2010)
New Revision: 24387
Modified:
trunk/build/parent/pom.xml
trunk/parent-pom.xml
Log:
meerge changes between build/parent/pom.xml and parent-pom.xml
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-08-24 16:07:07 UTC (rev 24386)
+++ trunk/build/parent/pom.xml 2010-08-24 16:26:43 UTC (rev 24387)
@@ -11,6 +11,7 @@
</modules>
<properties>
+ <!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion-->
<tychoVersion>0.9.0</tychoVersion>
<scmBranch>trunk</scmBranch>
<BUILD_ALIAS>M2</BUILD_ALIAS>
Modified: trunk/parent-pom.xml
===================================================================
--- trunk/parent-pom.xml 2010-08-24 16:07:07 UTC (rev 24386)
+++ trunk/parent-pom.xml 2010-08-24 16:26:43 UTC (rev 24387)
@@ -11,8 +11,8 @@
</modules>
<properties>
- <tychoVersion>0.10.0-SNAPSHOT</tychoVersion>
- <!--tychoVersion>0.9.0</tychoVersion-->
+ <!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion-->
+ <tychoVersion>0.9.0</tychoVersion>
<scmBranch>trunk</scmBranch>
<BUILD_ALIAS>M2</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
@@ -195,6 +195,18 @@
<enabled>true</enabled>
</releases>
</repository-->
+ <repository>
+ <id>eclipse36</id>
+ <url>http://download.eclipse.org/eclipse/updates/3.6.x/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
<repository>
<id>jboss-helios</id>
<url>http://download.jboss.org/jbosstools/updates/requirements/helios/</url>
15 years, 4 months