Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-07-15 00:08:00 -0400
committerEike Stepper2011-07-15 00:08:00 -0400
commitd2d1b4394e5bbb3c3656b709f4c17bda53ee0ab6 (patch)
treea7586cc792a75422773b36240bfe59f652a95785
parent631bb448246d44890d4a0b74396dbf0ecc5907e2 (diff)
downloadcdo-d2d1b4394e5bbb3c3656b709f4c17bda53ee0ab6.tar.gz
cdo-d2d1b4394e5bbb3c3656b709f4c17bda53ee0ab6.tar.xz
cdo-d2d1b4394e5bbb3c3656b709f4c17bda53ee0ab6.zip
[351616] [releng] Provide platform-specific CDOServer + CDOExplorer downloads
https://bugs.eclipse.org/bugs/show_bug.cgi?id=351616
-rw-r--r--features/org.eclipse.emf.cdo.explorer.product-feature/CDOExplorer.product7
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/build.properties5
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/content/concept1.xhtml15
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/content/concept2.xhtml15
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/content/link_obj.gifbin2381 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/content/root.css28
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/content/root.xhtml28
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/content/shared.css45
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/content/titlebanner.gifbin1136 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/introContent.xml6
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/plugin.xml26
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.xml8
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/hudson/hudson.ant38
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/hudson/promote-integration.sh46
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/hudson/promote-milestone.sh51
17 files changed, 45 insertions, 278 deletions
diff --git a/features/org.eclipse.emf.cdo.explorer.product-feature/CDOExplorer.product b/features/org.eclipse.emf.cdo.explorer.product-feature/CDOExplorer.product
index bd68cfa685..498146a95d 100644
--- a/features/org.eclipse.emf.cdo.explorer.product-feature/CDOExplorer.product
+++ b/features/org.eclipse.emf.cdo.explorer.product-feature/CDOExplorer.product
@@ -7,8 +7,7 @@
</configIni>
<launcherArgs>
- <programArgs>-showsplash
---launcher.XXMaxPermSize
+ <programArgs>--launcher.XXMaxPermSize
128M</programArgs>
<vmArgs>-Xms256M
-Xmx1024M</vmArgs>
@@ -18,9 +17,7 @@
<windowImages/>
- <splash
- location="org.eclipse.emf.cdo.explorer"
- startupProgressRect="148,605,327,10" />
+
<launcher name="cdo-explorer">
<solaris/>
<win useIco="false">
diff --git a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
index 91300966f7..caaf525c63 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.intro;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.cdo.ui.ide;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)",
org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)"
diff --git a/plugins/org.eclipse.emf.cdo.explorer/build.properties b/plugins/org.eclipse.emf.cdo.explorer/build.properties
index 68f2ced1e1..b334d3494a 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/build.properties
+++ b/plugins/org.eclipse.emf.cdo.explorer/build.properties
@@ -18,9 +18,6 @@ bin.includes = META-INF/,\
.options,\
about.html,\
copyright.txt,\
- content/,\
- icons/,\
- introContent.xml,\
- splash.bmp
+ icons/
src.includes = about.html,\
copyright.txt
diff --git a/plugins/org.eclipse.emf.cdo.explorer/content/concept1.xhtml b/plugins/org.eclipse.emf.cdo.explorer/content/concept1.xhtml
deleted file mode 100644
index 7666fe51d9..0000000000
--- a/plugins/org.eclipse.emf.cdo.explorer/content/concept1.xhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!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">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Concept1.xhtml</title>
- <link rel="stylesheet" href="shared.css" type="text/css" />
- </head>
-
-<body>
-<h1>Welcome to CDO Explorer</h1>
-<h4>Concept One</h4>
-<p>This is where Concept One is explained.</p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.emf.cdo.explorer/content/concept2.xhtml b/plugins/org.eclipse.emf.cdo.explorer/content/concept2.xhtml
deleted file mode 100644
index af1ec66c10..0000000000
--- a/plugins/org.eclipse.emf.cdo.explorer/content/concept2.xhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!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">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Concept2.xhtml</title>
- <link rel="stylesheet" href="shared.css" type="text/css" />
- </head>
-
-<body>
-<h1>Welcome to CDO Explorer</h1>
-<h4>Concept Two</h4>
-<p>This is where Concept Two is explained.</p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.emf.cdo.explorer/content/link_obj.gif b/plugins/org.eclipse.emf.cdo.explorer/content/link_obj.gif
deleted file mode 100644
index a4b07882c0..0000000000
--- a/plugins/org.eclipse.emf.cdo.explorer/content/link_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.explorer/content/root.css b/plugins/org.eclipse.emf.cdo.explorer/content/root.css
deleted file mode 100644
index 7cf89fce73..0000000000
--- a/plugins/org.eclipse.emf.cdo.explorer/content/root.css
+++ /dev/null
@@ -1,28 +0,0 @@
-img {
- width: 48px;
- height: 48px;
- vertical-align: middle;
- }
-
-/* Give some space for main div.*/
-.page-style {
- text-align: center;
- margin-top:100px;
- }
-
-/* satisfy Mozilla */
-body > div.page-style {
- padding-left:30%;
- }
-
-
-#content {
- text-align:left;
- width:23em;
- }
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.emf.cdo.explorer/content/root.xhtml b/plugins/org.eclipse.emf.cdo.explorer/content/root.xhtml
deleted file mode 100644
index cc14d79656..0000000000
--- a/plugins/org.eclipse.emf.cdo.explorer/content/root.xhtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>root.xhtml</title>
- <link rel="stylesheet" href="shared.css" type="text/css" />
- <link rel="stylesheet" href="root.css" type="text/css" />
- </head>
-
-<body>
-<h1>Welcome to CDO Explorer</h1>
-<div class="page-style">
- <div id="content">
-
- <a href="http://org.eclipse.ui.intro/showPage?id=concept1" id="firstLink">
- <img border="0" src="link_obj.gif" alt="Concept1" />
- Learn about Concept One...
- </a>
-
- <a href="http://org.eclipse.ui.intro/showPage?id=concept2">
- <img border="0" src="link_obj.gif" alt="Concept2" />
- Learn about Concept Two...</a>
- <anchor id="anchor1" />
- </div>
-</div>
-</body>
-</html>
diff --git a/plugins/org.eclipse.emf.cdo.explorer/content/shared.css b/plugins/org.eclipse.emf.cdo.explorer/content/shared.css
deleted file mode 100644
index 8a05736202..0000000000
--- a/plugins/org.eclipse.emf.cdo.explorer/content/shared.css
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Shared style applied to all pages */
-/* trick to get desired scroll bar behavior on all browsers */
-html {
- overflow:auto;
- border:0px;
- height:100%;
- }
-
-
-body {
- margin-left:14px;
- margin-top:10px;
- font-family:Tahoma;
- font-size: 12px;
- color:#000000;
- background-image:url("./titlebanner.gif");
- background-repeat: repeat-x;
- }
-
-h1 {
- text-align:left;
- font-size: 16pt;
- font-weight:normal;
- color:#E5E5E5;
- }
-
-h4 {
- color:#787878;
- }
-
-a {
- display:block;
- font-family:Tahoma;
- font-size: 12px;
- color:#000000;
- font-weight:normal;
- text-decoration:none;
- padding-bottom:20px;
- }
-
-p {
- padding-left:14px;
- }
-
-
diff --git a/plugins/org.eclipse.emf.cdo.explorer/content/titlebanner.gif b/plugins/org.eclipse.emf.cdo.explorer/content/titlebanner.gif
deleted file mode 100644
index 6737f76025..0000000000
--- a/plugins/org.eclipse.emf.cdo.explorer/content/titlebanner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.explorer/introContent.xml b/plugins/org.eclipse.emf.cdo.explorer/introContent.xml
deleted file mode 100644
index c5dff2d66e..0000000000
--- a/plugins/org.eclipse.emf.cdo.explorer/introContent.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<introContent>
- <page id="root" content="content/root.xhtml"/>
- <page id="concept1" content="content/concept1.xhtml"/>
- <page id="concept2" content="content/concept2.xhtml"/>
-</introContent>
diff --git a/plugins/org.eclipse.emf.cdo.explorer/plugin.xml b/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
index 7a280629aa..02ee2b2263 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
@@ -29,30 +29,4 @@
</product>
</extension>
- <extension point="org.eclipse.ui.intro">
- <intro
- class="org.eclipse.ui.intro.config.CustomizableIntroPart"
- id="org.eclipse.emf.cdo.explorer.intro">
- </intro>
- <introProductBinding
- introId="org.eclipse.emf.cdo.explorer.intro"
- productId="org.eclipse.emf.cdo.explorer.product">
- </introProductBinding>
- </extension>
-
- <extension point="org.eclipse.ui.intro.config">
- <config
- introId="org.eclipse.emf.cdo.explorer.intro"
- content="introContent.xml"
- id="org.eclipse.emf.cdo.explorer.configId">
- <presentation
- home-page-id="root">
- <implementation
- kind="html"
- os="win32,linux,macosx">
- </implementation>
- </presentation>
- </config>
- </extension>
-
</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.properties b/plugins/org.eclipse.emf.cdo.releng/build.properties
index b0639a4390..b8cf05d8ec 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng/build.properties
@@ -14,6 +14,10 @@ eclipse=3.7
emf=2.7
weekly=I
+# This build can be optimized by setting these properties externally:
+# checkout = "/existing/source/checkout/to/copy/from"
+# platform = "Windows" | "Linux" | "Mac"
+
svn.repository=http://dev.eclipse.org/svnroot/modeling/org.eclipse.emf.cdo
eclipse.downloads=http://download.eclipse.org
cloudsmith.downloads=http://download.cloudsmith.com
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.xml b/plugins/org.eclipse.emf.cdo.releng/build.xml
index f5babdb259..c3d108d1a5 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.xml
+++ b/plugins/org.eclipse.emf.cdo.releng/build.xml
@@ -11,14 +11,6 @@
-->
<project name="CDO">
- <!--
- ###################################################################
- This build can be optimized by setting these properties externally:
- checkout = "/existing/source/checkout/to/copy/from"
- platform = "Windows" | "Linux" | "Mac"
- ###################################################################
- -->
-
<property file="build.properties" />
<property environment="hudson" />
diff --git a/plugins/org.eclipse.emf.cdo.releng/hudson/hudson.ant b/plugins/org.eclipse.emf.cdo.releng/hudson/hudson.ant
new file mode 100644
index 0000000000..9ecc0fdc88
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng/hudson/hudson.ant
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+ Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are 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:
+ Eike Stepper - initial API and implementation
+-->
+<project name="Hudson" basedir=".">
+
+ <target name="-init.properties">
+ <!-- Build Parameters -->
+ <property name="BUILD_TYPE" value="N" />
+ <property name="LOGLEVEL" value="INFO" />
+ <property name="CLEAN_TOOLS" value="false" />
+ <property name="CLEAN_TP" value="false" />
+
+ <!-- Job Settings -->
+ <property name="checkout" location="/develop/ws/cdo" />
+ <property name="platform" value="Windows" />
+
+ <!-- Hudson Variables -->
+ <property name="hudson.root" location="temp" />
+
+ <property name="WORKSPACE" location="hudson" />
+ <property name="HUDSON_URL" value="value" />
+ <property name="JOB_URL" value="value" />
+ <property name="JOB_NAME" value="value" />
+ <property name="BUILD_URL" value="value" />
+ <property name="BUILD_ID" value="value" />
+ <property name="BUILD_NUMBER" value="value" />
+ <property name="SVN_REVISION" value="value" />
+ </target >
+
+</project>
diff --git a/plugins/org.eclipse.emf.cdo.releng/hudson/promote-integration.sh b/plugins/org.eclipse.emf.cdo.releng/hudson/promote-integration.sh
deleted file mode 100644
index 931514adda..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng/hudson/promote-integration.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-stream=4.0
-buildID=1356
-
-rm -rf promote.tmp
-mkdir promote.tmp
-pushd promote.tmp
-
-/shared/common/apache-ant-1.7.1/bin/ant -f /shared/modeling/tools/promotion/download-artifacts.xml -Dbuild.url=https://hudson.eclipse.org/hudson/job/emf-cdo-integration/$buildID -Dartifact.prefix=result/site.p2/
-
-label=`ls`
-pushd $label
-
-/shared/common/apache-ant-1.7.1/bin/ant -f /shared/modeling/tools/promotion/unpack-iu.xml -Dunpack.iu=org.apache.derby
-
-PROBLEM_BUNDLES="$(
- for P in plugins/*.jar.pack.gz; do
- /shared/common/jdk-1.5.0-22.x86_64/bin/unpack200 --quiet "$P" /dev/null > /dev/null || basename "$P"
- done
-)"
-
-if [ -n "$PROBLEM_BUNDLES" ]; then
- echo "Problems encountered unpacking the following bundles:"
- echo "$PROBLEM_BUNDLES"
- exit 2
-fi
-
-JAR=/shared/common/jdk-1.5.0-22.x86_64/bin/jar
-for F in artifacts content
-do
- $JAR xf $F.jar
- sed -i "/<property name='p2\.compressed'/a \ \ \ \ <property name='p2.mirrorsURL' value='http://www.eclipse.org/downloads/download.php?file=/modeling/emf/cdo/updates/$stream/$stream-$label&amp;protocol=http&amp;format=xml'/>'>" $F.xml
- $JAR cf $F.jar $F.xml
-done
-
-cp -R . /home/data/httpd/download.eclipse.org/modeling/emf/cdo/updates/$stream/$stream-$label
-
-popd
-popd
-
-pushd /home/data/httpd/download.eclipse.org/modeling/emf/cdo/updates/$stream-integration
-/shared/common/apache-ant-1.7.1/bin/ant -f /shared/modeling/tools/promotion/manage-composite.xml add -Dchild.repository=../$stream/$stream-$label
-popd
-
-rm -rf promote.tmp
-
-svn cp -m "Tagging trunk as $stream-$label" https://dev.eclipse.org/svnroot/modeling/org.eclipse.emf.cdo/trunk https://dev.eclipse.org/svnroot/modeling/org.eclipse.emf.cdo/tags/$stream-$label
diff --git a/plugins/org.eclipse.emf.cdo.releng/hudson/promote-milestone.sh b/plugins/org.eclipse.emf.cdo.releng/hudson/promote-milestone.sh
deleted file mode 100644
index 0605f52575..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng/hudson/promote-milestone.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-stream=4.0
-milestone=RC4c
-buildID=1544
-
-rm -rf promote.tmp
-mkdir promote.tmp
-pushd promote.tmp
-
-/shared/common/apache-ant-1.7.1/bin/ant -f /shared/modeling/tools/promotion/download-artifacts.xml -Dbuild.url=https://hudson.eclipse.org/hudson/job/emf-cdo-integration/$buildID -Dartifact.prefix=result/site.p2/
-
-label=`ls`
-pushd $label
-
-/shared/common/apache-ant-1.7.1/bin/ant -f /shared/modeling/tools/promotion/unpack-iu.xml -Dunpack.iu=org.apache.derby
-
-PROBLEM_BUNDLES="$(
- for P in plugins/*.jar.pack.gz; do
- /shared/common/jdk-1.5.0-22.x86_64/bin/unpack200 --quiet "$P" /dev/null > /dev/null || basename "$P"
- done
-)"
-
-if [ -n "$PROBLEM_BUNDLES" ]; then
- echo "Problems encountered unpacking the following bundles:"
- echo "$PROBLEM_BUNDLES"
-# exit 2
-fi
-
-JAR=/shared/common/jdk-1.5.0-22.x86_64/bin/jar
-for F in artifacts content
-do
- $JAR xf $F.jar
- sed -i "/<property name='p2\.compressed'/a \ \ \ \ <property name='p2.mirrorsURL' value='http://www.eclipse.org/downloads/download.php?file=/modeling/emf/cdo/updates/$stream/$stream-$milestone-$label&amp;protocol=http&amp;format=xml'/>'>" $F.xml
- $JAR cf $F.jar $F.xml
-done
-
-cp -R . /home/data/httpd/download.eclipse.org/modeling/emf/cdo/updates/$stream/$stream-$milestone-$label
-
-popd
-popd
-
-pushd /home/data/httpd/download.eclipse.org/modeling/emf/cdo/updates/$stream-milestones
-/shared/common/apache-ant-1.7.1/bin/ant -f /shared/modeling/tools/promotion/manage-composite.xml add -Dchild.repository=../$stream/$stream-$milestone-$label
-popd
-
-rm -rf promote.tmp
-
-svn cp -m "Tagging trunk as $stream-$label-$milestone" https://dev.eclipse.org/svnroot/modeling/org.eclipse.emf.cdo/trunk https://dev.eclipse.org/svnroot/modeling/org.eclipse.emf.cdo/tags/$stream-$label-$milestone
-
-
-# ONLY FOR RELEASE TRAIN CONTRIBUTIONS:
-pushd /home/data/httpd/download.eclipse.org/modeling/emf/cdo/updates/$stream; cp -R $stream-$milestone-$label staging.tmp; mv staging staging.old; mv staging.tmp staging; rm -rf staging.old; popd

Back to the top