Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorMarkus Knauer2012-08-21 09:15:34 -0400
committerMarkus Knauer2012-08-21 09:16:20 -0400
commit010769441936e57d2b58c57115796c7fec85c720 (patch)
tree83148a19518805d3708c9ee17372ee632a19849d /releng
parentde1dfe80edd660ce637891a7203add86e2a53ee6 (diff)
downloadorg.eclipse.rap-010769441936e57d2b58c57115796c7fec85c720.tar.gz
org.eclipse.rap-010769441936e57d2b58c57115796c7fec85c720.tar.xz
org.eclipse.rap-010769441936e57d2b58c57115796c7fec85c720.zip
Change name/ID of RAP project features to new naming scheme.
* Renamed old feature projects * Update feature.xml with new dependencies * Adjust build files, pom.xml, and category definition
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.rap.releng/pom.xml2
-rw-r--r--releng/org.eclipse.rap.releng/repository/category.xml2
-rwxr-xr-xreleng/org.eclipse.rap.releng/scripts/runtime-build.sh10
-rw-r--r--releng/org.eclipse.rap.target.releng/pom.xml2
-rw-r--r--releng/org.eclipse.rap.target.releng/repository/category.xml4
5 files changed, 10 insertions, 10 deletions
diff --git a/releng/org.eclipse.rap.releng/pom.xml b/releng/org.eclipse.rap.releng/pom.xml
index 40fb6e448d..43731b5f0d 100644
--- a/releng/org.eclipse.rap.releng/pom.xml
+++ b/releng/org.eclipse.rap.releng/pom.xml
@@ -62,7 +62,7 @@
<module>../../tests/org.eclipse.rap.rwt.cluster.testfixture.test</module>
-->
<!-- Packaging projects -->
- <module>../../features/org.eclipse.rap.runtime</module>
+ <module>../../features/org.eclipse.rap.feature</module>
<module>repository</module>
</modules>
diff --git a/releng/org.eclipse.rap.releng/repository/category.xml b/releng/org.eclipse.rap.releng/repository/category.xml
index f403c81a43..41c252c7e6 100644
--- a/releng/org.eclipse.rap.releng/repository/category.xml
+++ b/releng/org.eclipse.rap.releng/repository/category.xml
@@ -16,7 +16,7 @@
label="Rich Ajax Platform (RAP)" />
<feature url="../runtime-feature"
- id="org.eclipse.rap.runtime"
+ id="org.eclipse.rap.feature"
version="2.0.0.qualifier">
<category name="org.eclipse.rap.category"/>
</feature>
diff --git a/releng/org.eclipse.rap.releng/scripts/runtime-build.sh b/releng/org.eclipse.rap.releng/scripts/runtime-build.sh
index a3eeaefd4e..d32cf8da1a 100755
--- a/releng/org.eclipse.rap.releng/scripts/runtime-build.sh
+++ b/releng/org.eclipse.rap.releng/scripts/runtime-build.sh
@@ -36,8 +36,8 @@ else
mv repository/target/repository "$WORKSPACE/runtimeRepo" || exit 1
fi
-VERSION=$(ls "$WORKSPACE"/runtimeRepo/features/org.eclipse.rap.runtime_*.jar | sed 's/.*_\([0-9.-]\+\)\..*\.jar/\1/')
-TIMESTAMP=$(ls "$WORKSPACE"/runtimeRepo/features/org.eclipse.rap.runtime_*.jar | sed 's/.*\.\([0-9-]\+\)\.jar/\1/')
+VERSION=$(ls "$WORKSPACE"/runtimeRepo/features/org.eclipse.rap.feature_*.jar | sed 's/.*_\([0-9.-]\+\)\..*\.jar/\1/')
+TIMESTAMP=$(ls "$WORKSPACE"/runtimeRepo/features/org.eclipse.rap.feature_*.jar | sed 's/.*\.\([0-9-]\+\)\.jar/\1/')
echo "Version is $VERSION"
echo "Timestamp is $TIMESTAMP"
test -n "$VERSION" || exit 1
@@ -50,9 +50,9 @@ cd "$WORKSPACE/org.eclipse.rap/releng/org.eclipse.rap.target.releng"
echo "Running maven on $PWD, sign=$sign"
$MVN -e clean package -DruntimeRepo="file://$WORKSPACE/runtimeRepo" -Dsign=$sign || exit 1
-# Example: rap-runtime-1.5.0-N-20110814-2110.zip
-zipFileName=rap-runtime-$VERSION-$BUILD_TYPE-$TIMESTAMP.zip
-compatZipFileName=rap-runtime-compatibility-$VERSION-$BUILD_TYPE-$TIMESTAMP.zip
+# Example: rap-1.5.0-N-20110814-2110.zip
+zipFileName=rap-$VERSION-$BUILD_TYPE-$TIMESTAMP.zip
+compatZipFileName=rap-compatibility-$VERSION-$BUILD_TYPE-$TIMESTAMP.zip
if [ -d repository/target/fixedSigned ]; then
mv repository/target/fixedSigned/*.zip "$WORKSPACE/$zipFileName" || exit 1
diff --git a/releng/org.eclipse.rap.target.releng/pom.xml b/releng/org.eclipse.rap.target.releng/pom.xml
index 354523702d..501ee612d4 100644
--- a/releng/org.eclipse.rap.target.releng/pom.xml
+++ b/releng/org.eclipse.rap.target.releng/pom.xml
@@ -32,7 +32,7 @@
</prerequisites>
<modules>
- <module>../../features/org.eclipse.rap.runtime.requirements</module>
+ <module>../../features/org.eclipse.rap.equinox.target.feature</module>
<module>../../features/org.eclipse.rap.runtime.sdk</module>
<module>repository</module>
<module>repository/runtime-feature</module>
diff --git a/releng/org.eclipse.rap.target.releng/repository/category.xml b/releng/org.eclipse.rap.target.releng/repository/category.xml
index 8ae8cfb2a5..19ff8dae4e 100644
--- a/releng/org.eclipse.rap.target.releng/repository/category.xml
+++ b/releng/org.eclipse.rap.target.releng/repository/category.xml
@@ -16,13 +16,13 @@
label="Rich Ajax Platform (RAP)" />
<feature url="http://eclipse.org/rap"
- id="org.eclipse.rap.runtime"
+ id="org.eclipse.rap.feature"
version="2.0.0.qualifier">
<category name="org.eclipse.rap.category"/>
</feature>
<feature url="http://eclipse.org/rap"
- id="org.eclipse.rap.runtime.requirements"
+ id="org.eclipse.rap.equinox.target.feature"
version="2.0.0.qualifier">
<category name="org.eclipse.rap.category"/>
</feature>

Back to the top