1.0 prep

build.sh

diff --git a/build.sh b/build.sh
index 95d5ae0..504bf19 100644
--- a/build.sh
+++ b/build.sh
@@ -16,7 +16,7 @@
 	# We're running on the build server. Configure the environment for there.
 	java=/opt/ibm/java2-ppc-50/bin/java
 	sharedDir=/shared/technology/actf
-	base=${sharedDir}/base
+	base=${sharedDir}/base/
 	eclipseRoot=${base}/eclipse
 	configurationFolder=${HOME}/build/org.eclipse.actf.visualization.releng
 	buildRoot=${HOME}/build/root
@@ -33,6 +33,7 @@
 # Find the launcher JAR and PDE Build Plugin directory for the current platform.
 launcherJar=`find ${eclipseRoot} -type f -name 'org.eclipse.equinox.launcher_*.jar' -print0`
 pdeBuildPlugin=`find ${eclipseRoot} -type d -name 'org.eclipse.pde.build_*' -print0`
+jarprocessorJar=`find ${eclipseRoot} -type f -name 'org.eclipse.equinox.p2.jarprocessor_*.jar' -print0`
 
 tempDir=${buildRoot}/temp
 buildDirectory=${buildRoot}/workspace
@@ -56,17 +57,15 @@
 	-DtempDir=${tempDir} \
 	-DfeatureId=${featureId} \
 	-DlauncherJar=${launcherJar} \
+	-DjarprocessorJar=${jarprocessorJar} \
 	-DOOO_HOME=${prereqDir}/OOo
 
 ${java} -jar ${launcherJar} \
-   -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
-   -updateSite ${updateSite}/ \
-   -site file:${buildDirectory}/repository/site.xml \
+   -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher \
    -metadataRepository file:${updateSite}/ \
-   -metadataRepositoryName "ACTF Update Site" \
    -artifactRepository file:${updateSite}/ \
-   -artifactRepositoryName "ACTF Artifacts" \
-   -reusePack200Files \
+   -source ${buildDirectory}/repository/ \
+   -config win32.win32.x86 \
    -compress \
-   -noDefaultIUs \
-   -vmargs -Xmx256m
\ No newline at end of file
+   -reusePack200Files \
+   -publishArtifacts
\ No newline at end of file

build_eclipse.sh

diff --git a/build_eclipse.sh b/build_eclipse.sh
new file mode 100644
index 0000000..7368900
--- /dev/null
+++ b/build_eclipse.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+#====================================================================================
+#  Copyright (c) 2008 The Eclipse Foundation 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
+#====================================================================================
+
+BUILD_DATE=`date +%Y%m%d`
+BUILD_TIME=`date +%H%M`
+TIMESTAMP=${BUILD_DATE}${BUILD_TIME}
+BUILD_TYPE=R
+
+	# We're running on the build server. Configure the environment for there.
+	java=/shared/common/jdk-1.5.0-22.x86_64/jre/bin/java
+	sharedDir=/shared/technology/actf
+	base=${sharedDir}/base/
+	eclipseRoot=${base}/eclipse
+	configurationFolder=${sharedDir}/build/org.eclipse.actf.visualization.releng
+	buildRoot=${sharedDir}/build/root
+
+# Find the launcher JAR and PDE Build Plugin directory for the current platform.
+launcherJar=`find ${eclipseRoot} -type f -name 'org.eclipse.equinox.launcher_*.jar' -print0`
+pdeBuildPlugin=`find ${eclipseRoot} -type d -name 'org.eclipse.pde.build_*' -print0`
+jarprocessorJar=`find ${eclipseRoot} -type f -name 'org.eclipse.equinox.p2.jarprocessor_*.jar' -print0`
+
+tempDir=${buildRoot}/temp
+buildDirectory=${buildRoot}/workspace
+prereqDir=${sharedDir}/pre-req
+updateSite=${buildDirectory}/repository
+
+
+# What feature are we building?
+featureId=org.eclipse.actf.visualization.sdk
+
+${java} -jar ${launcherJar} \
+	-application org.eclipse.ant.core.antRunner \
+	-buildfile ${pdeBuildPlugin}/scripts/build.xml \
+	-DbuildDirectory=${buildDirectory} \
+	-Dbuilder=${configurationFolder} \
+	-DbuildId=${TIMESTAMP} \
+	-DbuildType=${BUILD_TYPE} \
+	-Dtimestamp=${TIMESTAMP} \
+	-Dbase=${base} \
+	-DupdateSite=${updateSite} \
+	-DtempDir=${tempDir} \
+	-DfeatureId=${featureId} \
+	-DlauncherJar=${launcherJar} \
+	-DjarprocessorJar=${jarprocessorJar} \
+	-DOOO_HOME=${prereqDir}/OOo
+
+${java} -jar ${launcherJar} \
+   -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher \
+   -metadataRepository file:${updateSite}/ \
+   -artifactRepository file:${updateSite}/ \
+   -source ${buildDirectory}/repository/ \
+   -config win32.win32.x86 \
+   -compress \
+   -reusePack200Files \
+   -publishArtifacts
\ No newline at end of file

createUpdateSite.xml

diff --git a/createUpdateSite.xml b/createUpdateSite.xml
index 214183d..b1e5158 100644
--- a/createUpdateSite.xml
+++ b/createUpdateSite.xml
@@ -43,15 +43,14 @@
     <property name="pack200tempDir" value="${tempDir}/pack"/>
     <mkdir dir="${pack200tempDir}" />
     <java 
-      jar="${launcherJar}" 
+      jar="${jarprocessorJar}" 
       fork="true" 
       failonerror="true" 
       dir="${tempDir}"
       append="true"
       output="${tempDir}/pack200.out"
       error="${tempDir}/pack200.err">
-      <arg line="-consolelog -application org.eclipse.update.core.siteOptimizer" />
-      <arg line="-jarProcessor -verbose -outputDir ${pack200tempDir} -processAll -repack -pack ${archiveDir}/${archiveName}"/>      
+      <arg line="-verbose -outputDir ${pack200tempDir} -processAll -repack -pack ${archiveDir}/${archiveName}"/>      
     </java>
     <move file="${pack200tempDir}/${archiveName}" todir="${archiveDir}" overwrite="true" />
   </target>