Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features/org.eclipse.rap.equinox.target.feature/.project (renamed from features/org.eclipse.rap.runtime.requirements/.project)2
-rw-r--r--features/org.eclipse.rap.equinox.target.feature/build.properties (renamed from features/org.eclipse.rap.runtime.requirements/build.properties)0
-rw-r--r--features/org.eclipse.rap.equinox.target.feature/epl-v10.html (renamed from features/org.eclipse.rap.runtime.requirements/epl-v10.html)0
-rw-r--r--features/org.eclipse.rap.equinox.target.feature/feature.properties (renamed from features/org.eclipse.rap.runtime.requirements/feature.properties)0
-rw-r--r--features/org.eclipse.rap.equinox.target.feature/feature.xml (renamed from features/org.eclipse.rap.runtime.requirements/feature.xml)6
-rw-r--r--features/org.eclipse.rap.equinox.target.feature/license.html (renamed from features/org.eclipse.rap.runtime.requirements/license.html)0
-rw-r--r--features/org.eclipse.rap.equinox.target.feature/pom.xml (renamed from features/org.eclipse.rap.runtime.requirements/pom.xml)2
-rw-r--r--features/org.eclipse.rap.feature/.project (renamed from features/org.eclipse.rap.runtime/.project)2
-rw-r--r--features/org.eclipse.rap.feature/build.properties (renamed from features/org.eclipse.rap.runtime/build.properties)0
-rw-r--r--features/org.eclipse.rap.feature/epl-v10.html (renamed from features/org.eclipse.rap.runtime/epl-v10.html)0
-rw-r--r--features/org.eclipse.rap.feature/feature.properties (renamed from features/org.eclipse.rap.runtime/feature.properties)0
-rw-r--r--features/org.eclipse.rap.feature/feature.xml (renamed from features/org.eclipse.rap.runtime/feature.xml)6
-rw-r--r--features/org.eclipse.rap.feature/license.html (renamed from features/org.eclipse.rap.runtime/license.html)0
-rw-r--r--features/org.eclipse.rap.feature/pom.xml (renamed from features/org.eclipse.rap.runtime/pom.xml)2
-rw-r--r--features/org.eclipse.rap.runtime.sdk/feature.xml8
-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
20 files changed, 24 insertions, 24 deletions
diff --git a/features/org.eclipse.rap.runtime.requirements/.project b/features/org.eclipse.rap.equinox.target.feature/.project
index 3cba5f5244..07210e56f5 100644
--- a/features/org.eclipse.rap.runtime.requirements/.project
+++ b/features/org.eclipse.rap.equinox.target.feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.rap.runtime.requirements</name>
+ <name>org.eclipse.rap.equinox.target.feature</name>
<comment></comment>
<projects>
</projects>
diff --git a/features/org.eclipse.rap.runtime.requirements/build.properties b/features/org.eclipse.rap.equinox.target.feature/build.properties
index f5851c864e..f5851c864e 100644
--- a/features/org.eclipse.rap.runtime.requirements/build.properties
+++ b/features/org.eclipse.rap.equinox.target.feature/build.properties
diff --git a/features/org.eclipse.rap.runtime.requirements/epl-v10.html b/features/org.eclipse.rap.equinox.target.feature/epl-v10.html
index 3998fcebee..3998fcebee 100644
--- a/features/org.eclipse.rap.runtime.requirements/epl-v10.html
+++ b/features/org.eclipse.rap.equinox.target.feature/epl-v10.html
diff --git a/features/org.eclipse.rap.runtime.requirements/feature.properties b/features/org.eclipse.rap.equinox.target.feature/feature.properties
index 39d6908270..39d6908270 100644
--- a/features/org.eclipse.rap.runtime.requirements/feature.properties
+++ b/features/org.eclipse.rap.equinox.target.feature/feature.properties
diff --git a/features/org.eclipse.rap.runtime.requirements/feature.xml b/features/org.eclipse.rap.equinox.target.feature/feature.xml
index c25cb535f0..c5812cd9b2 100644
--- a/features/org.eclipse.rap.runtime.requirements/feature.xml
+++ b/features/org.eclipse.rap.equinox.target.feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.eclipse.rap.runtime.requirements"
- label="Rich Ajax Platform (RAP) Basic Target Requirements"
+ id="org.eclipse.rap.equinox.target.feature"
+ label="Rich Ajax Platform (RAP) Basic Equinox Target Feature"
version="2.0.0.qualifier"
provider-name="Eclipse.org - RAP">
@@ -18,7 +18,7 @@
</license>
<url>
- <update label="Rich Ajax Platform (RAP) 2.0 Runtime Repository" url="http://download.eclipse.org/rt/rap/2.0/runtime/"/>
+ <update label="Rich Ajax Platform (RAP) 2.0 Repository" url="http://download.eclipse.org/rt/rap/2.0/"/>
</url>
<plugin
diff --git a/features/org.eclipse.rap.runtime.requirements/license.html b/features/org.eclipse.rap.equinox.target.feature/license.html
index f19c483b9c..f19c483b9c 100644
--- a/features/org.eclipse.rap.runtime.requirements/license.html
+++ b/features/org.eclipse.rap.equinox.target.feature/license.html
diff --git a/features/org.eclipse.rap.runtime.requirements/pom.xml b/features/org.eclipse.rap.equinox.target.feature/pom.xml
index 0b6b42517c..24a054429b 100644
--- a/features/org.eclipse.rap.runtime.requirements/pom.xml
+++ b/features/org.eclipse.rap.equinox.target.feature/pom.xml
@@ -21,7 +21,7 @@
<relativePath>../../releng/org.eclipse.rap.target.releng/pom.xml</relativePath>
</parent>
- <artifactId>org.eclipse.rap.runtime.requirements</artifactId>
+ <artifactId>org.eclipse.rap.equinox.target.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.rap.runtime/.project b/features/org.eclipse.rap.feature/.project
index c6128a068f..fc31e9b8fb 100644
--- a/features/org.eclipse.rap.runtime/.project
+++ b/features/org.eclipse.rap.feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.rap.runtime</name>
+ <name>org.eclipse.rap.feature</name>
<comment></comment>
<projects>
</projects>
diff --git a/features/org.eclipse.rap.runtime/build.properties b/features/org.eclipse.rap.feature/build.properties
index 03f013b4aa..03f013b4aa 100644
--- a/features/org.eclipse.rap.runtime/build.properties
+++ b/features/org.eclipse.rap.feature/build.properties
diff --git a/features/org.eclipse.rap.runtime/epl-v10.html b/features/org.eclipse.rap.feature/epl-v10.html
index 3998fcebee..3998fcebee 100644
--- a/features/org.eclipse.rap.runtime/epl-v10.html
+++ b/features/org.eclipse.rap.feature/epl-v10.html
diff --git a/features/org.eclipse.rap.runtime/feature.properties b/features/org.eclipse.rap.feature/feature.properties
index 7a0c6899c9..7a0c6899c9 100644
--- a/features/org.eclipse.rap.runtime/feature.properties
+++ b/features/org.eclipse.rap.feature/feature.properties
diff --git a/features/org.eclipse.rap.runtime/feature.xml b/features/org.eclipse.rap.feature/feature.xml
index 1c2d58ed81..6f49e9ee3c 100644
--- a/features/org.eclipse.rap.runtime/feature.xml
+++ b/features/org.eclipse.rap.feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.eclipse.rap.runtime"
- label="Rich Ajax Platform (RAP) Target Components"
+ id="org.eclipse.rap.feature"
+ label="RAP Runtime Target Components"
version="2.0.0.qualifier"
provider-name="Eclipse.org - RAP">
@@ -18,7 +18,7 @@
</license>
<url>
- <update label="Rich Ajax Platform (RAP) 2.0 Runtime Repository" url="http://download.eclipse.org/rt/rap/2.0/runtime/"/>
+ <update label="Rich Ajax Platform (RAP) 2.0 Repository" url="http://download.eclipse.org/rt/rap/2.0/"/>
</url>
<plugin
diff --git a/features/org.eclipse.rap.runtime/license.html b/features/org.eclipse.rap.feature/license.html
index f19c483b9c..f19c483b9c 100644
--- a/features/org.eclipse.rap.runtime/license.html
+++ b/features/org.eclipse.rap.feature/license.html
diff --git a/features/org.eclipse.rap.runtime/pom.xml b/features/org.eclipse.rap.feature/pom.xml
index d8adf89f99..9c90033674 100644
--- a/features/org.eclipse.rap.runtime/pom.xml
+++ b/features/org.eclipse.rap.feature/pom.xml
@@ -21,7 +21,7 @@
<relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
</parent>
- <artifactId>org.eclipse.rap.runtime</artifactId>
+ <artifactId>org.eclipse.rap.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.rap.runtime.sdk/feature.xml b/features/org.eclipse.rap.runtime.sdk/feature.xml
index e51b5bb385..c602461618 100644
--- a/features/org.eclipse.rap.runtime.sdk/feature.xml
+++ b/features/org.eclipse.rap.runtime.sdk/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.rap.runtime.sdk"
- label="Rich Ajax Platform (RAP) Target (Compatibility feature for Tooling)"
+ label="Rich Ajax Platform (RAP) Target (Compatibility feature for RAP Tools)"
version="2.0.0.qualifier"
provider-name="Eclipse.org - RAP">
@@ -20,14 +20,14 @@
<url>
<update
label="Rich Ajax Platform (RAP) 2.0 Runtime Repository"
- url="http://download.eclipse.org/rt/rap/2.0/runtime/"/>
+ url="http://download.eclipse.org/rt/rap/2.0/"/>
</url>
<includes
- id="org.eclipse.rap.runtime"
+ id="org.eclipse.rap.feature"
version="0.0.0"/>
<includes
- id="org.eclipse.rap.runtime.requirements"
+ id="org.eclipse.rap.equinox.target.feature"
version="0.0.0"/>
</feature>
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