You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/03/30 02:11:27 UTC
svn commit: r389935 - in /geronimo/devtools/eclipse-plugin/trunk: ./
maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/
maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/
Author: sppatel
Date: Wed Mar 29 16:11:26 2006
New Revision: 389935
URL: http://svn.apache.org/viewcvs?rev=389935&view=rev
Log:
genModel attribute fix and useful params for handling eclipse distro
Removed:
geronimo/devtools/eclipse-plugin/trunk/maven.xml
Modified:
geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GenModelModifierMojo.java
geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java
geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java
Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GenModelModifierMojo.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GenModelModifierMojo.java?rev=389935&r1=389934&r2=389935&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GenModelModifierMojo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GenModelModifierMojo.java Wed Mar 29 16:11:26 2006
@@ -34,6 +34,8 @@
import org.apache.maven.plugin.MojoFailureException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* Utility mojo that sets attributes in the generated .genmodel that are not
@@ -43,11 +45,14 @@
*/
public class GenModelModifierMojo extends AbstractMojo {
+ public static final String EMF = "/Users/sppatel/work/geronimo-emf-common/target/classes/emf/";
+ public static final String G = "geronimo-web.genmodel";
+
/**
* @parameter
* @required
*/
- private File genmodel;
+ private File genmodel = new File(EMF + G);
/**
* @parameter
@@ -55,33 +60,51 @@
*/
private Map attributes;
+ public static void main(String[] args) {
+ GenModelModifierMojo mojo = new GenModelModifierMojo();
+ try {
+ mojo.execute();
+ } catch (MojoExecutionException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (MojoFailureException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
/*
* (non-Javadoc)
*
* @see org.apache.maven.plugin.Mojo#execute()
*/
public void execute() throws MojoExecutionException, MojoFailureException {
-
- if(!genmodel.exists())
- throw new MojoFailureException(genmodel.getAbsolutePath() + " " + "does not exist.");
-
+
+ if (!genmodel.exists())
+ throw new MojoFailureException(genmodel.getAbsolutePath() + " "
+ + "does not exist.");
+
DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
TransformerFactory transformerFactory = TransformerFactory.newInstance();
try {
DocumentBuilder builder = docBuilderFactory.newDocumentBuilder();
Transformer transformer = transformerFactory.newTransformer();
Document doc = builder.parse(genmodel);
- Element root = doc.getDocumentElement();
- Iterator j = attributes.keySet().iterator();
- while (j.hasNext()) {
- String attribute = (String) j.next();
- String value = (String) attributes.get(attribute);
- root.setAttribute(attribute, value);
- getLog().debug("Attribute " + attribute + " : " + value);
+
+ NodeList nodeList = doc.getElementsByTagName("genmodel:GenModel");
+ Element element = (Element) nodeList.item(0);
+ if (element != null) {
+ Iterator j = attributes.keySet().iterator();
+ while (j.hasNext()) {
+ String attribute = (String) j.next();
+ String value = (String) attributes.get(attribute);
+ element.setAttribute(attribute, value);
+ getLog().debug("Attribute " + attribute + " : " + value);
+ }
+ Source src = new DOMSource(doc);
+ Result result = new StreamResult(new FileOutputStream(genmodel));
+ transformer.transform(src, result);
}
- Source src = new DOMSource(doc);
- Result result = new StreamResult(new FileOutputStream(genmodel));
- transformer.transform(src, result);
} catch (Exception e) {
e.printStackTrace();
throw new MojoFailureException(e.getMessage());
Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java?rev=389935&r1=389934&r2=389935&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java Wed Mar 29 16:11:26 2006
@@ -44,17 +44,17 @@
/**
* @parameter
*/
- protected String modelProject;
+ protected File modelProject;
/**
* @parameter
*/
- protected String editProject;
+ protected File editProject;
/**
* @parameter
*/
- protected String editorProject;
+ protected File editorProject;
/**
* @parameter
Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java?rev=389935&r1=389934&r2=389935&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java Wed Mar 29 16:11:26 2006
@@ -74,9 +74,14 @@
private File propsFile;
/**
- * @parameter expression="${install}"
+ * @parameter expression="${forceInstall}"
*/
- private boolean install = true;
+ private boolean forceInstall = false;
+
+ /**
+ * @parameter expression="${checkModified}"
+ */
+ private boolean checkModified = true;
private Properties props;
private long propLastModified = -1;
@@ -126,19 +131,17 @@
}
}
- if (install) {
- int identifier = generateInstallIdentifier(images);
+ int identifier = generateInstallIdentifier(images);
+ if (forceInstall || shouldExtract(identifier)) {
load();
- if (shouldExtract(identifier)) {
- clean();
- Iterator i = images.iterator();
- while (i.hasNext())
- install((File) i.next());
- }
-
+ clean();
+ Iterator i = images.iterator();
+ while (i.hasNext())
+ install((File) i.next());
setProperties(System.currentTimeMillis(), identifier);
save();
}
+
}
private int generateInstallIdentifier(List images) {
@@ -223,14 +226,17 @@
File installImage = new File(installLocation.getAbsolutePath()
+ File.separator + "eclipse");
- if (!installImage.exists()
- || installImage.lastModified() > getModified())
+
+ if (!installImage.exists())
return true;
- return isModified(installImage);
+ return checkModified
+ && isModified(new File(installImage.getAbsolutePath()
+ + File.separator + "plugins"));
}
private boolean isModified(File file) {
+
boolean modified = file.lastModified() > getModified();
File[] children = file.listFiles();
if (!modified && children != null) {