diff --git a/archive/org.eclipse.wtp.releng/maps/jst.map b/archive/org.eclipse.wtp.releng/maps/jst.map
index 43939f2c0508bc233fd260a20c78d8de445ec862..de3bc8256f2c29d5bdd204a388fc7870ce785a5a 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst.map
@@ -1,5 +1,5 @@
-!*************** jst.map
-
-plugin@org.eclipse.jst=v20050705_1500,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/plugins/org.eclipse.jst
-
+!*************** jst.map
+
+plugin@org.eclipse.jst=v20050706_0217,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/plugins/org.eclipse.jst
+
!***************
\ No newline at end of file
diff --git a/archive/org.eclipse.wtp.releng/maps/wst.map b/archive/org.eclipse.wtp.releng/maps/wst.map
index ed4d01a86d39080253cdeeb2ac59f31518e94ac1..cebc65611fc309d9af04ea8e6e3255a1371400f2 100644
--- a/archive/org.eclipse.wtp.releng/maps/wst.map
+++ b/archive/org.eclipse.wtp.releng/maps/wst.map
@@ -1,5 +1,5 @@
-!*************** wst.map
-
-plugin@org.eclipse.wst=v20050705_1500,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/plugins/org.eclipse.wst
-
+!*************** wst.map
+
+plugin@org.eclipse.wst=v20050706_0217,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/plugins/org.eclipse.wst
+
!***************
\ No newline at end of file
diff --git a/assembly/plugins/org.eclipse.jst/.classpath b/assembly/plugins/org.eclipse.jst/.classpath
deleted file mode 100644
index 751c8f2e504c40d1c41ebbd87d8f8968529e9c30..0000000000000000000000000000000000000000
--- a/assembly/plugins/org.eclipse.jst/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/assembly/plugins/org.eclipse.jst/.cvsignore b/assembly/plugins/org.eclipse.jst/.cvsignore
index e4a52efae27669c7758571fcd27b0e7dfd8256b0..e4254b18e09c88eb5650272dbf7cc24d72c27536 100644
--- a/assembly/plugins/org.eclipse.jst/.cvsignore
+++ b/assembly/plugins/org.eclipse.jst/.cvsignore
@@ -1,4 +1,3 @@
-src
bin
temp.folder
build.xml
diff --git a/assembly/plugins/org.eclipse.jst/.project b/assembly/plugins/org.eclipse.jst/.project
index 4c2789605232f114bb0d4d8b031199bacadfc3d7..a20501399be42492358fc67b92501b71ffe97164 100644
--- a/assembly/plugins/org.eclipse.jst/.project
+++ b/assembly/plugins/org.eclipse.jst/.project
@@ -5,11 +5,6 @@
<projects>
</projects>
<buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
@@ -23,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/assembly/plugins/org.eclipse.jst/build.properties b/assembly/plugins/org.eclipse.jst/build.properties
index 585b85c7adcbdddc66ea083e49b22f17196782b1..800e93ad2a9050919a03430af1cfdd47a5cb0720 100644
--- a/assembly/plugins/org.eclipse.jst/build.properties
+++ b/assembly/plugins/org.eclipse.jst/build.properties
@@ -1,7 +1,4 @@
-source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
- .,\
about.ini,\
about.html,\
about.mappings,\
@@ -9,3 +6,4 @@ bin.includes = META-INF/,\
eclipse32.gif,\
eclipse32.png,\
plugin.properties
+jars.compile.order =
diff --git a/assembly/plugins/org.eclipse.wst/.classpath b/assembly/plugins/org.eclipse.wst/.classpath
deleted file mode 100644
index 751c8f2e504c40d1c41ebbd87d8f8968529e9c30..0000000000000000000000000000000000000000
--- a/assembly/plugins/org.eclipse.wst/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/assembly/plugins/org.eclipse.wst/.cvsignore b/assembly/plugins/org.eclipse.wst/.cvsignore
index e4a52efae27669c7758571fcd27b0e7dfd8256b0..e4254b18e09c88eb5650272dbf7cc24d72c27536 100644
--- a/assembly/plugins/org.eclipse.wst/.cvsignore
+++ b/assembly/plugins/org.eclipse.wst/.cvsignore
@@ -1,4 +1,3 @@
-src
bin
temp.folder
build.xml
diff --git a/assembly/plugins/org.eclipse.wst/.project b/assembly/plugins/org.eclipse.wst/.project
index 61cbc701102eff3e65cf597aebac75f7f379ee53..4aaf28a5e75d0f0210e00aabfdcb94fb9cd4eadd 100644
--- a/assembly/plugins/org.eclipse.wst/.project
+++ b/assembly/plugins/org.eclipse.wst/.project
@@ -5,11 +5,6 @@
<projects>
</projects>
<buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
@@ -23,6 +18,5 @@
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/assembly/plugins/org.eclipse.wst/build.properties b/assembly/plugins/org.eclipse.wst/build.properties
index 8b86fdbc05f71d4a6563a86aa275ff8337722bcc..6f902f9fd7022ee4c057a98fe46b2e4b2981b2a0 100644
--- a/assembly/plugins/org.eclipse.wst/build.properties
+++ b/assembly/plugins/org.eclipse.wst/build.properties
@@ -1,7 +1,4 @@
-source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
- .,\
about.html,\
about.ini,\
about.mappings,\
@@ -9,3 +6,4 @@ bin.includes = META-INF/,\
eclipse32.gif,\
eclipse32.png,\
plugin.properties
+jars.compile.order =