Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGianMaria Romanato2018-06-07 06:04:46 -0400
committerGianMaria Romanato2018-06-07 06:04:46 -0400
commit2635f58b5cb1e7e4fc7809bf2b43a7269b0172ac (patch)
treeec112eee6b39f256ea6cdcf6ea50e6fdc8a26b92
parent7cc447e91f26efeb9f37e451e0060ac375125e1c (diff)
downloadorg.eclipse.virgo.ide-2635f58b5cb1e7e4fc7809bf2b43a7269b0172ac.tar.gz
org.eclipse.virgo.ide-2635f58b5cb1e7e4fc7809bf2b43a7269b0172ac.tar.xz
org.eclipse.virgo.ide-2635f58b5cb1e7e4fc7809bf2b43a7269b0172ac.zip
BUILD - remove obsolete files.
-rw-r--r--org.eclipse.virgo.ide.site/composite-site/milestone/compositeArtifacts.xml14
-rw-r--r--org.eclipse.virgo.ide.site/composite-site/milestone/compositeContent.xml14
-rw-r--r--org.eclipse.virgo.ide.site/composite-site/snapshot/compositeArtifacts.xml14
-rw-r--r--org.eclipse.virgo.ide.site/composite-site/snapshot/compositeContent.xml14
-rw-r--r--org.eclipse.virgo.ide.site/pack-and-sign/build.xml165
-rwxr-xr-xorg.eclipse.virgo.ide.site/pack-and-sign/promote.sh37
-rwxr-xr-xorg.eclipse.virgo.ide.site/pack-and-sign/sign-and-wait.sh71
-rwxr-xr-xorg.eclipse.virgo.ide.site/pack-and-sign/update-composite.sh57
-rw-r--r--org.eclipse.virgo.ide.site/pom.xml50
9 files changed, 0 insertions, 436 deletions
diff --git a/org.eclipse.virgo.ide.site/composite-site/milestone/compositeArtifacts.xml b/org.eclipse.virgo.ide.site/composite-site/milestone/compositeArtifacts.xml
deleted file mode 100644
index c6c3853..0000000
--- a/org.eclipse.virgo.ide.site/composite-site/milestone/compositeArtifacts.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='&quot;Eclipse Project Test Site&quot;'
- type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
- <properties size='1'>
- <property name='p2.timestamp' value='1334606143775'/>
- </properties>
- <children size='1'>
- <child location='http://download.eclipse.org/virgo/milestone/IDE'/>
- <child location='http://download.eclipse.org/virgo/release/BNDLR/1.1.2.RELEASE/updatesite'/>
- <child location='http://download.eclipse.org/virgo/updatesite/3.6.0.RELEASE'/>
- <child location='http://download.eclipse.org/libra/milestones'/>
- </children>
-</repository> \ No newline at end of file
diff --git a/org.eclipse.virgo.ide.site/composite-site/milestone/compositeContent.xml b/org.eclipse.virgo.ide.site/composite-site/milestone/compositeContent.xml
deleted file mode 100644
index f19ad62..0000000
--- a/org.eclipse.virgo.ide.site/composite-site/milestone/compositeContent.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='&quot;Eclipse Project Test Site&quot;'
- type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
- <properties size='1'>
- <property name='p2.timestamp' value='1334606143775'/>
- </properties>
- <children size='1'>
- <child location='http://download.eclipse.org/virgo/milestone/IDE'/>
- <child location='http://download.eclipse.org/virgo/release/BNDLR/1.1.2.RELEASE/updatesite'/>
- <child location='http://download.eclipse.org/virgo/updatesite/3.6.0.RELEASE'/>
- <child location='http://download.eclipse.org/libra/milestones'/>
- </children>
-</repository> \ No newline at end of file
diff --git a/org.eclipse.virgo.ide.site/composite-site/snapshot/compositeArtifacts.xml b/org.eclipse.virgo.ide.site/composite-site/snapshot/compositeArtifacts.xml
deleted file mode 100644
index 5b5d955..0000000
--- a/org.eclipse.virgo.ide.site/composite-site/snapshot/compositeArtifacts.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='&quot;Eclipse Project Test Site&quot;'
- type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
- <properties size='1'>
- <property name='p2.timestamp' value='1334606143775'/>
- </properties>
- <children size='1'>
- <child location='http://download.eclipse.org/virgo/snapshot/IDE'/>
- <child location='http://download.eclipse.org/virgo/release/BNDLR/1.1.2.RELEASE/updatesite'/>
- <child location='http://download.eclipse.org/virgo/updatesite/3.6.0.RELEASE'/>
- <child location='http://download.eclipse.org/libra/milestones'/>
- </children>
-</repository> \ No newline at end of file
diff --git a/org.eclipse.virgo.ide.site/composite-site/snapshot/compositeContent.xml b/org.eclipse.virgo.ide.site/composite-site/snapshot/compositeContent.xml
deleted file mode 100644
index 09ebb2d..0000000
--- a/org.eclipse.virgo.ide.site/composite-site/snapshot/compositeContent.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='&quot;Eclipse Project Test Site&quot;'
- type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
- <properties size='1'>
- <property name='p2.timestamp' value='1334606143775'/>
- </properties>
- <children size='1'>
- <child location='http://download.eclipse.org/virgo/snapshot/IDE'/>
- <child location='http://download.eclipse.org/virgo/release/BNDLR/1.1.2.RELEASE/updatesite'/>
- <child location='http://download.eclipse.org/virgo/updatesite/3.6.0.RELEASE'/>
- <child location='http://download.eclipse.org/libra/milestones'/>
- </children>
-</repository> \ No newline at end of file
diff --git a/org.eclipse.virgo.ide.site/pack-and-sign/build.xml b/org.eclipse.virgo.ide.site/pack-and-sign/build.xml
deleted file mode 100644
index 681cdf1..0000000
--- a/org.eclipse.virgo.ide.site/pack-and-sign/build.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<project name="pack-and-sign" default="pack-and-sign" basedir=".">
-
- <dirname property="scriptdir" file="${ant.file.pack-and-sign}"/>
- <property name="pack200" value="${java.home}/bin"/>
- <property name="filter" value=""/>
-
- <target name="pack-and-sign">
- <fail unless="localRepository">Required property localRepository not set</fail>
- <fail unless="projectDir">Required property projectDir not set</fail>
- <fail unless="repositoryName">Required property repositoryName not set</fail>
- <fail unless="signDir">Required property signDir not set</fail>
- <fail unless="dist">Required property dist not set</fail>
-
- <echo>Running on ${os.name} ${os.version} (${os.arch}) / ${ant.version} / ${java.vendor} ${java.vm.name} ${java.version}</echo>
-
- <condition property="sign.skip" value="true"><equals arg1="${skipSign}" arg2="true"/></condition>
- <condition property="pack.skip" value="true"><equals arg1="${skipPack}" arg2="true"/></condition>
- <condition property="promote.skip" value="true"><equals arg1="${skipPromote}" arg2="true"/></condition>
-
- <!-- sign -->
-
- <antcall target="sign"/>
-
- <!-- condition jars -->
-
- <delete dir="${projectDir}/conditioner"/>
- <copy todir="${projectDir}/conditioner">
- <fileset dir="${projectDir}/site">
- <include name="**/*${filter}*.jar"/>
- </fileset>
- </copy>
-
- <antcall target="pack">
- <param name="args" value="-processAll -repack"/>
- <param name="site" value="${projectDir}/conditioner"/>
- </antcall>
-
- <copy todir="${projectDir}/site">
- <fileset dir="${projectDir}/conditioner">
- <include name="**/*${filter}*.jar"/>
- </fileset>
- </copy>
-
- <!-- create site archive -->
-
- <antcall target="publish"/>
-
- <zip file="${projectDir}/site-archive.zip">
- <fileset dir="${projectDir}/site">
- <include name="**/*"/>
- </fileset>
- </zip>
-
- <!-- pack200 -->
-
- <antcall target="pack">
- <param name="args" value="-pack"/>
- <param name="site" value="${projectDir}/site"/>
- </antcall>
-
- <antcall target="publish"/>
-
- <!-- create packed site archive -->
-
- <zip file="${projectDir}/site-packed.zip">
- <fileset dir="${projectDir}/site">
- <include name="**/*"/>
- </fileset>
- </zip>
-
- <!-- promote -->
-
- <antcall target="promote"/>
-
- </target>
-
- <target name="sign" unless="sign.skip">
- <chmod perm="755" file="${scriptdir}/sign-and-wait.sh"/>
- <exec executable="${scriptdir}/sign-and-wait.sh" failonerror="true">
- <arg value="${projectDir}/site"/>
- <arg value="${signDir}"/>
- <arg value="${filter}"/>
- </exec>
- </target>
-
- <target name="promote" unless="promote.skip">
- <chmod perm="755" file="${scriptdir}/promote.sh"/>
- <chmod perm="755" file="${scriptdir}/update-composite.sh"/>
- <exec executable="${scriptdir}/promote.sh" dir="${scriptdir}" failonerror="true">
- <arg value="${dist}"/>
- <arg value="${version}"/>
- <arg value="${qualifier}"/>
- <arg value="${projectDir}"/>
- <arg value="${archiveDir}"/>
- <arg value="${siteDir}"/>
- </exec>
- </target>
-
- <target name="pack" unless="pack.skip">
- <delete file="${site}/content.jar" />
- <delete file="${site}/artifacts.jar" />
-
- <path id="jarprocessor.classpath">
- <fileset dir="${localRepository}/org/eclipse/tycho/tycho-bundles-external">
- <include name="*/eclipse/plugins/org.eclipse.equinox.p2.jarprocessor_*.jar" />
- </fileset>
- </path>
-
- <echo>Using ${pack200} for packing</echo>
-
- <!-- pack200 -->
- <java jvm="${java.home}/bin/java" classname="org.eclipse.equinox.internal.p2.jarprocessor.Main"
- fork="true" classpathref="jarprocessor.classpath" failonerror="true" maxmemory="512m"
- dir="${projectDir}/site">
- <jvmarg line="-Dorg.eclipse.update.jarprocessor.pack200=${pack200}" />
- <arg line="-verbose ${args}" />
- <arg line="-outputDir ${site} ${site}" />
- </java>
-
- <!-- remove corrupted jars -->
- <!--
- <delete>
- <fileset dir="${projectDir}/site">
- <include name="plugins/com.google.gwt*.pack.gz"/>
- </fileset>
- </delete>
- -->
- </target>
-
- <target name="publish">
- <delete file="${projectDir}/site/content.jar" />
- <delete file="${projectDir}/site/artifacts.jar" />
-
- <path id="eclipse.classpath">
- <fileset dir="${localRepository}/org/eclipse/tycho/tycho-bundles-external">
- <include name="*/eclipse/plugins/org.eclipse.equinox.launcher_*.jar" />
- </fileset>
- </path>
-
- <!-- generate metadata -->
- <java jvm="${java.home}/bin/java" classname="org.eclipse.equinox.launcher.Main" fork="true"
- classpathref="eclipse.classpath" failonerror="true" maxmemory="256m"
- dir="${projectDir}/site">
- <arg line="-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" />
- <arg line="-source ${projectDir}/site" />
- <arg line="-metadataRepository file://${projectDir}/site" />
- <arg line="-artifactRepository file://${projectDir}/site" />
- <arg line="-metadataRepositoryName '${repositoryName}'" />
- <arg line="-artifactRepositoryName '${repositoryName}'" />
- <arg line="-compress -reusePackedFiles -reusePack200Files -publishArtifacts" />
- </java>
-
- <!-- publish categories -->
- <java jvm="${java.home}/bin/java" classname="org.eclipse.equinox.launcher.Main" fork="true"
- classpathref="eclipse.classpath" failonerror="true" maxmemory="256m"
- dir="${projectDir}/site">
- <arg line="-application org.eclipse.equinox.p2.publisher.CategoryPublisher" />
- <arg line="-metadataRepository file://${projectDir}/site" />
- <arg line="-categoryDefinition file://${projectDir}/../site.xml" />
- <arg line="-compress -categoryQualifier" />
- </java>
- </target>
-
-</project>
-
diff --git a/org.eclipse.virgo.ide.site/pack-and-sign/promote.sh b/org.eclipse.virgo.ide.site/pack-and-sign/promote.sh
deleted file mode 100755
index 0a6fc5d..0000000
--- a/org.eclipse.virgo.ide.site/pack-and-sign/promote.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-
-DIST=$1
-VERSION=$2
-QUALIFIER=$3
-SRC=$4
-ARCHIVE=$5
-SITE=$6
-
-DST=$ARCHIVE/$VERSION/$QUALIFIER
-
-
-if [ -e $DST ]; then
- echo $DST already exists
- exit 1
-fi
-
-echo Promoting $VERSION.$QUALIFIER
-
-mkdir -p $DST/
-unzip -d $DST/ $SRC/site-packed.zip
-cp $SRC/site-archive.zip $DST/$DIST-$VERSION.$QUALIFIER.zip
-
-chmod g+w -R $DST
-
-cd $(dirname $0)
-BASE=$(pwd)
-
-if [ -n "$SITE" ]; then
- for i in $SITE $SITE/*; do
- if [ -e $i/composite.index ]; then
- echo "Updating $i"
- cd $i
- $BASE/update-composite.sh
- fi
- done
-fi
diff --git a/org.eclipse.virgo.ide.site/pack-and-sign/sign-and-wait.sh b/org.eclipse.virgo.ide.site/pack-and-sign/sign-and-wait.sh
deleted file mode 100755
index 6f5f780..0000000
--- a/org.eclipse.virgo.ide.site/pack-and-sign/sign-and-wait.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash -e
-
-#**********************************************************************
-# Copyright (c) 2009 Tasktop Technologies and others.
-#
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#**********************************************************************
-
-if [ $# -lt 3 ]
-then
- echo "usage: sign-and-wait.sh srcdir signdir filter"
- exit 1
-fi
-
-set -v
-
-SRC=$1
-DST=/home/data/httpd/download-staging.priv/$2
-OUT=$DST/output
-LOG=/home/data/httpd/download-staging.priv/arch/signer.log
-
-# prepare
-
-rm -rf $DST
-mkdir -p $DST
-mkdir -p $OUT
-
-# create zip
-
-echo Creating archive for signing
-
-cd $SRC
-/usr/bin/find -name "*$3*" | zip $DST/site.zip -@
-
-# sign
-
-/usr/bin/sign $DST/site.zip nomail $OUT
-
-# wait up to 30 minutes for signing to complete
-
-tail -f $LOG | grep -E \(Extracting\|Finished\) &
-
-I=0
-while [ $I -lt 60 ] && [ ! -e $OUT/site.zip ]; do
- echo Waiting for $OUT/site.zip
- sleep 30
- let I=I+1
-done
-
-PID=`jobs -l -p`
-kill $PID
-
-if [ ! -e $OUT/site.zip ]
-then
- echo
- echo Signing Failed: Timeout waiting for $OUT/site.zip
- exit 1
-fi
-
-# unzip
-
-echo Unzipping signed files
-/usr/bin/unzip -o -d $SRC $OUT/site.zip
-
-# cleanup
-
-rm $DST/site.zip
diff --git a/org.eclipse.virgo.ide.site/pack-and-sign/update-composite.sh b/org.eclipse.virgo.ide.site/pack-and-sign/update-composite.sh
deleted file mode 100755
index cb06c15..0000000
--- a/org.eclipse.virgo.ide.site/pack-and-sign/update-composite.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash -e
-
-BASE=$(dirname $0)
-source composite.index
-
-if [ "$DIRS" == "" ]; then
- echo "missing DIRS"
- exit 1
-fi
-
-if [ "$NAME" == "" ]; then
- echo "missing NAME"
- exit 1
-fi
-
-TIMESTAMP=$(date +%s)000
-
-compose() {
-cat > $FILE <<EOF
-<?xml version='1.0' encoding='UTF-8'?>
-<?TAG version='1.0.0'?>
-<repository name='NAME' type='TYPE' version='1.0.0'>
- <properties size='2'>
- <property name='p2.compressed' value='true'/>
- <property name='p2.timestamp' value='TIMESTAMP'/>
- </properties>
- <children size='CHILD_COUNT'>
-EOF
-
-sed -i -e "s/TAG/$TAG/" -e "s/TYPE/$TYPE/" $FILE
-sed -i -e "s/NAME/$NAME/" -e "s/TIMESTAMP/$TIMESTAMP/" $FILE
-COUNT=0
-for i in $DIRS; do
- echo " <child location='$i'/>" >> $FILE
- COUNT=$((COUNT+1))
-done
-sed -i -e "s/CHILD_COUNT/$COUNT/" $FILE
-
-cat >> $FILE <<EOF
- </children>
-</repository>
-EOF
-
-echo "Wrote $COUNT entries to $FILE"
-}
-
-FILE=compositeArtifacts.xml
-TAG=compositeArtifactRepository
-TYPE=org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository
-
-compose
-
-FILE=compositeContent.xml
-TAG=compositeMetadataRepository
-TYPE=org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository
-
-compose
diff --git a/org.eclipse.virgo.ide.site/pom.xml b/org.eclipse.virgo.ide.site/pom.xml
index b10840f..b28c336 100644
--- a/org.eclipse.virgo.ide.site/pom.xml
+++ b/org.eclipse.virgo.ide.site/pom.xml
@@ -10,54 +10,4 @@
<artifactId>org.eclipse.virgo.ide.site</artifactId>
<packaging>eclipse-update-site</packaging>
<name>Virgo IDE Tooling</name>
-<!-- <properties> -->
-<!-- <qualifier>${project.unqualifiedVersion}</qualifier> -->
-<!-- <sign-dir>rt/virgo/hudson</sign-dir> -->
-<!-- </properties> -->
-<!-- <build> -->
-<!-- <plugins> -->
-<!-- <plugin> -->
-<!-- <groupId>org.apache.maven.plugins</groupId> -->
-<!-- <artifactId>maven-antrun-plugin</artifactId> -->
-<!-- <executions> -->
-<!-- <execution> -->
-<!-- <id>pack-and-sign</id> -->
-<!-- <phase>install</phase> -->
-<!-- <configuration> -->
-<!-- <target> -->
-<!-- <ant antfile="pack-and-sign/build.xml"> -->
-<!-- <property name="localRepository" value="${settings.localRepository}"/> -->
-<!-- <property name="projectDir" value="${project.build.directory}"/> -->
-<!-- <property name="signDir" value="${sign-dir}"/> -->
-<!-- <property name="archiveDir" value="${archive-dir}"/> -->
-<!-- <property name="siteDir" value="${site-dir}"/> -->
-
-<!-- <property name="dist" value="virgo.ide"/> -->
-<!-- <property name="filter" value="virgo.ide"/> -->
-<!-- <property name="repositoryName" value="${project.name}"/> -->
-<!-- <property name="pack200" value="${pack200}"/> -->
-
-<!-- <property name="skipSign" value="${skip-sign}"/> -->
-<!-- <property name="skipPack" value="${skip-pack}"/> -->
-<!-- <property name="skipPromote" value="${skip-promote}"/> -->
-
-<!-- <property name="version" value="${unqualifiedVersion}"/> -->
-<!-- <property name="qualifier" value="${buildQualifier}"/> -->
-<!-- </ant> -->
-<!-- <echo file="${project.build.directory}/version.properties"> -->
-<!-- <![CDATA[ -->
-<!-- ${unqualifiedVersion} -->
-<!-- ${buildQualifier} -->
-<!-- ]]> -->
-<!-- </echo> -->
-<!-- </target> -->
-<!-- </configuration> -->
-<!-- <goals> -->
-<!-- <goal>run</goal> -->
-<!-- </goals> -->
-<!-- </execution> -->
-<!-- </executions> -->
-<!-- </plugin> -->
-<!-- </plugins> -->
-<!-- </build> -->
</project>

Back to the top