Updated script to upload EMF

4 files changed, 72 insertions, 17 deletions

diff --git a/build/org.eclipse.emf.teneo.internal.utils/publish-scripts/emf_maven_publish.xml b/build/org.eclipse.emf.teneo.internal.utils/publish-scripts/emf_maven_publish.xml
index 366b0f974..a67ea2258 100644
--- a/build/org.eclipse.emf.teneo.internal.utils/publish-scripts/emf_maven_publish.xml
+++ b/build/org.eclipse.emf.teneo.internal.utils/publish-scripts/emf_maven_publish.xml
@@ -113,7 +113,6 @@
 		<deploy.staging name="org.eclipse.emf.ecore" version="2.9.1-v20130827-0309" jarFileLocation="${mainLocation}/2.9.1"/>	
 		<deploy.staging name="org.eclipse.emf.ecore.xmi" version="2.9.1-v20130827-0309" jarFileLocation="${mainLocation}/2.9.1"/>
 		<deploy.staging name="org.eclipse.emf.common" version="2.9.1-v20130827-0309" jarFileLocation="${mainLocation}/2.9.1"/>	
--->	
 		<deploy.staging name="org.eclipse.emf.codegen.ecore" version="2.10.0-v20140519-0339" jarFileLocation="${mainLocation}/2.10RC1"/>
 		<deploy.staging name="org.eclipse.emf.codegen" version="2.10.0-v20140519-0339" jarFileLocation="${mainLocation}/2.10RC1"/>
 		<deploy.staging name="org.eclipse.emf.common" version="2.10.0-v20140514-1158" jarFileLocation="${mainLocation}/2.10RC1"/>
@@ -121,22 +120,36 @@
 		<deploy.staging name="org.eclipse.emf.ecore.xmi" version="2.10.0-v20140514-1158" jarFileLocation="${mainLocation}/2.10RC1"/>
 		<deploy.staging name="org.eclipse.xsd" version="2.10.0-v20140519-0339" jarFileLocation="${mainLocation}/2.10RC1"/>
 		<deploy.staging name="org.eclipse.emf.mapping.ecore2xml" version="2.8.0-v20140519-0339" jarFileLocation="${mainLocation}/2.10RC1"/>
+-->	
+		<deploy.staging name="org.eclipse.emf.codegen.ecore" version="2.10.1" jarFileLocation="${mainLocation}/2.10.1"/>
+		<deploy.staging name="org.eclipse.emf.codegen" version="2.10.0" jarFileLocation="${mainLocation}/2.10.1"/>
+		<deploy.staging name="org.eclipse.emf.common" version="2.10.1" jarFileLocation="${mainLocation}/2.10.1"/>
+		<deploy.staging name="org.eclipse.emf.ecore" version="2.10.1" jarFileLocation="${mainLocation}/2.10.1"/>
+		<deploy.staging name="org.eclipse.emf.ecore.xmi" version="2.10.1" jarFileLocation="${mainLocation}/2.10.1"/>
+		<deploy.staging name="org.eclipse.emf.mapping.ecore2xml" version="2.8.0" jarFileLocation="${mainLocation}/2.10.1"/>
+		<deploy.staging name="org.eclipse.emf.edit" version="2.10.1" jarFileLocation="${mainLocation}/2.10.1"/>
+		<deploy.staging name="org.eclipse.emf.databinding" version="1.3.0" jarFileLocation="${mainLocation}/2.10.1"/>
+		<deploy.staging name="org.eclipse.emf.databinding.edit" version="1.3.0" jarFileLocation="${mainLocation}/2.10.1"/>
 	</target>
 	
 	<target name="deploy.snapshot.xsd">
 		<!--deploy.snapshot name="org.eclipse.xsd" version="2.7.0-v20110606-0949" jarFileLocation="${mainLocation}/2.7.0"/>		
 		<deploy.snapshot name="org.eclipse.xsd" version="2.8.0-v20120319-0555" jarFileLocation="${mainLocation}/2.8.0"/		
 		<deploy.snapshot name="org.eclipse.xsd" version="2.9.0-v20130610-0406" jarFileLocation="${mainLocation}/2.9.0"/
-		<deploy.snapshot name="org.eclipse.xsd" version="2.10.0-v20130930-SNAPSHOT" jarFileLocation="${mainLocation}/2.10M2"/>-->
+		<deploy.snapshot name="org.eclipse.xsd" version="2.10.0-v20130930-SNAPSHOT" jarFileLocation="${mainLocation}/2.10M2"/>
 		<deploy.snapshot name="org.eclipse.xsd" version="2.10.0-v20140127-SNAPSHOT" jarFileLocation="${mainLocation}/2.10M5"/>
+-->
+		<deploy.staging name="org.eclipse.xsd" version="2.10.0-v20140901-1055" jarFileLocation="${mainLocation}/2.10.1"/>
 	</target>
 	
 	<target name="deploy.staging.xsd">
 		<!--deploy.staging name="org.eclipse.xsd" version="2.7.0-v20110606-0949" jarFileLocation="${mainLocation}/2.7.0"/>		
 		<deploy.staging name="org.eclipse.xsd" version="2.8.0-v20120319-0555" jarFileLocation="${mainLocation}/2.8.0"/>		
 		<deploy.staging name="org.eclipse.xsd" version="2.9.0-v20130610-0406" jarFileLocation="${mainLocation}/2.9.0"/
-		<deploy.staging name="org.eclipse.xsd" version="2.9.1-v20130902-0605" jarFileLocation="${mainLocation}/2.9.1"/>-->
+		<deploy.staging name="org.eclipse.xsd" version="2.9.1-v20130902-0605" jarFileLocation="${mainLocation}/2.9.1"/>
 		<deploy.staging name="org.eclipse.xsd" version="2.9.1-v20140203-1126" jarFileLocation="${mainLocation}/2.9.2"/>
+-->
+		<deploy.staging name="org.eclipse.xsd" version="2.10.0" jarFileLocation="${mainLocation}/2.10.1"/>
 	</target>
 	
 </project>
diff --git a/build/org.eclipse.emf.teneo.internal.utils/src/org/eclipse/emf/teneo/internal/utils/EmfMavenFileCreator.java b/build/org.eclipse.emf.teneo.internal.utils/src/org/eclipse/emf/teneo/internal/utils/EmfMavenFileCreator.java
index 8f1cf75a5..5f7fe8a1f 100755
--- a/build/org.eclipse.emf.teneo.internal.utils/src/org/eclipse/emf/teneo/internal/utils/EmfMavenFileCreator.java
+++ b/build/org.eclipse.emf.teneo.internal.utils/src/org/eclipse/emf/teneo/internal/utils/EmfMavenFileCreator.java
@@ -18,7 +18,6 @@
 package org.eclipse.emf.teneo.internal.utils;
 
 import java.io.File;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
@@ -31,20 +30,18 @@ import java.nio.file.Paths;
 
 public class EmfMavenFileCreator {
 	private static final String BASE_DIR = "/home/mtaal/mydata/dev/maven/emfmaven/";
-	private static final String TEMPLATE_DIR = "templates";
 	private static final String PLUGINS_DIR = "eclipse/plugins";
-	private static final String JAVADOC_FILE_PATH = BASE_DIR + TEMPLATE_DIR + File.separator
-			+ "template-javadoc.jar";
-	private static final String POM_FILE_PATH = BASE_DIR + TEMPLATE_DIR + File.separator
-			+ "template.pom";
+	private static final String JAVADOC_TEMPLATE_JAR_FILE = "template-javadoc.jar";
+	private static final String POM_TEMPLATE_FILE = "template.pom";
 
 	private static final String[] plugins = { "org.eclipse.emf.codegen.ecore",
 			"org.eclipse.emf.codegen", "org.eclipse.emf.common", "org.eclipse.emf.ecore",
-			"org.eclipse.emf.ecore.xmi", "org.eclipse.xsd", "org.eclipse.emf.mapping.ecore2xml" };
+			"org.eclipse.emf.ecore.xmi", "org.eclipse.xsd", "org.eclipse.emf.mapping.ecore2xml",
+			"org.eclipse.emf.edit", "org.eclipse.emf.databinding", "org.eclipse.emf.databinding.edit" };
 
 	public static void main(String[] args) throws Exception {
 		final EmfMavenFileCreator creator = new EmfMavenFileCreator();
-		creator.setDirName("2.10RC1");
+		creator.setDirName("2.10.1");
 		creator.setSnapShot(false);
 		creator.process();
 	}
@@ -87,23 +84,35 @@ public class EmfMavenFileCreator {
 						+ "-sources.jar");
 
 				// copy the javadoc template
-				copyFile(JAVADOC_FILE_PATH, outDirPath + plugin + "-" + version + "-javadoc.jar");
+				copyResource(JAVADOC_TEMPLATE_JAR_FILE, outDirPath + plugin + "-" + version
+						+ "-javadoc.jar");
 
 				// copy the pom
-				String pom = new String(Files.readAllBytes(Paths.get(POM_FILE_PATH)));
+				String pom = new String(Files.readAllBytes(Paths.get(this.getClass()
+						.getResource(POM_TEMPLATE_FILE).toURI())));
 				pom = pom.replace("${version}", version);
 				pom = pom.replace("${name}", plugin);
 				pom = pom.replace("${artifactId}", plugin);
 				pom = pom.replace("${groupId}", groupId);
 				Files.write(Paths.get(outDirPath + plugin + "-" + version + ".pom"), pom.getBytes());
 
-				System.err.println("<deploy.snapshot name=\"" + plugin + "\" version=\"" + version
-						+ "\" jarFileLocation=\"${mainLocation}/" + dirName + "\"/>");
+				if (isSnapShot()) {
+					System.err.println("<deploy.snapshot name=\"" + plugin + "\" version=\"" + version
+							+ "\" jarFileLocation=\"${mainLocation}/" + dirName + "\"/>");
+				} else {
+					System.err.println("<deploy.staging name=\"" + plugin + "\" version=\"" + version
+							+ "\" jarFileLocation=\"${mainLocation}/" + dirName + "\"/>");
+				}
 			}
 		}
 	}
 
-	private void copyFile(String sourceFilePath, String destFilePath) throws IOException {
+	private void copyResource(String sourceFilePath, String destFilePath) throws Exception {
+		Files.copy(Paths.get(this.getClass().getResource(sourceFilePath).toURI()),
+				Paths.get(destFilePath));
+	}
+
+	private void copyFile(String sourceFilePath, String destFilePath) throws Exception {
 		Files.copy(Paths.get(sourceFilePath), Paths.get(destFilePath));
 	}
 
@@ -119,10 +128,12 @@ public class EmfMavenFileCreator {
 		version = version.substring(0, version.length() - ".jar".length());
 		// get rid of the 4th dot
 		final int vIndex = version.indexOf("v");
-		version = version.substring(0, vIndex - 1) + "-" + version.substring(vIndex);
 		if (isSnapShot) {
+			version = version.substring(0, vIndex - 1) + "-" + version.substring(vIndex);
 			final int lastDashIndex = version.lastIndexOf("-");
 			version = version.substring(0, lastDashIndex) + "-SNAPSHOT";
+		} else {
+			version = version.substring(0, vIndex - 1);
 		}
 		return version;
 	}
diff --git a/build/org.eclipse.emf.teneo.internal.utils/src/org/eclipse/emf/teneo/internal/utils/template-javadoc.jar b/build/org.eclipse.emf.teneo.internal.utils/src/org/eclipse/emf/teneo/internal/utils/template-javadoc.jar
new file mode 100644
index 000000000..3959a5c19
--- /dev/null
+++ b/build/org.eclipse.emf.teneo.internal.utils/src/org/eclipse/emf/teneo/internal/utils/template-javadoc.jar
@@ -0,0 +1 @@
+http://wiki.eclipse.org/Teneo/Hibernate
diff --git a/build/org.eclipse.emf.teneo.internal.utils/src/org/eclipse/emf/teneo/internal/utils/template.pom b/build/org.eclipse.emf.teneo.internal.utils/src/org/eclipse/emf/teneo/internal/utils/template.pom
new file mode 100644
index 000000000..95179b9b9
--- /dev/null
+++ b/build/org.eclipse.emf.teneo.internal.utils/src/org/eclipse/emf/teneo/internal/utils/template.pom
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>jar</packaging>
+	<name>${name}</name>
+	<version>${version}</version>
+	<description>http://www.eclipse.org</description>
+	<url>http://www.eclipse.org/emf</url>
+	<licenses>
+		<license>
+	    	<name>The Eclipse Public License Version 1.0</name>
+	     	<url>http://www.eclipse.org/legal/epl-v10.html</url>
+	     	<distribution>repo</distribution>
+	   	</license>
+	 </licenses>
+	 <scm>
+	 <url>http://git.eclipse.org/c/emf/org.eclipse.emf.git/</url>
+	    <connection>git://git.eclipse.org/gitroot/emf/org.eclipse.emf.git/</connection>
+	 </scm>
+	 <developers>
+	 	<developer>
+	      	<id>eclipse</id>
+	      	<name>Eclipse.org</name>
+	    	<email>info@eclipse.org</email>
+	 	</developer>
+	 </developers>
+</project> 
+