Eugene-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2005 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2004 -----
- December
- November
- October
- September
- August
November 2009
- 3 participants
- 57 discussions
02 Nov '09
Author: fdesbois
Date: 2009-11-02 13:04:19 +0100 (Mon, 02 Nov 2009)
New Revision: 681
Added:
branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java
branches/1.1.0-Javabuilder/eugene/src/test/java/org/nuiton/eugene/models/object/
branches/1.1.0-Javabuilder/eugene/src/test/java/org/nuiton/eugene/models/object/xml/
branches/1.1.0-Javabuilder/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTest.java
Modified:
branches/1.1.0-Javabuilder/eugene-test/pom.xml
branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java
branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java
branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java
branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java
branches/1.1.0-Javabuilder/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java
Log:
Evol #114 :
- Refactor use of extension for ImportsManager
- Creation of ImportsManagerExtension to manage importsManager in ObjectModel as an extension
- Improve Tests
Added: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java
===================================================================
--- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java (rev 0)
+++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java 2009-11-02 12:04:19 UTC (rev 681)
@@ -0,0 +1,77 @@
+
+package org.nuiton.eugene.java;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.eugene.ImportsManager;
+import org.nuiton.eugene.models.object.ObjectModelClassifier;
+
+/**
+ * ImportsManagerExtension
+ *
+ * Created: 2 nov. 2009
+ *
+ * @author fdesbois
+ * @version $Revision$
+ *
+ * Extension for ObjectModel to manage imports for all classifiers in the model.
+ *
+ * Mise a jour: $Date$
+ * par : $Author$
+ */
+public class ImportsManagerExtension {
+
+ private static final Log log = LogFactory.getLog(ImportsManagerExtension.class);
+
+ /**
+ * Extension static used to identify ImportsManagerExtension in ObjectModel
+ */
+ public static final String OBJECTMODEL_EXTENSION = "imports";
+
+ /**
+ * Map of ImportsManager with key equals to the classifier qualified name associated to
+ * the ImportsManager
+ */
+ protected Map<String, ImportsManager> managers;
+
+ /**
+ * Public constructor for ImportsManagerExtension
+ */
+ public ImportsManagerExtension() {
+ this.managers = new HashMap<String, ImportsManager>();
+ }
+
+ /**
+ * Get the ImportsManager associated to the classifier. If not exist, it will be created.
+ * @param classifier reference for the ImportsManager
+ * @return the importsManager associated to the classifier (never null)
+ */
+ public ImportsManager getManager(ObjectModelClassifier classifier) {
+ ImportsManager manager = this.managers.get(classifier.getQualifiedName());
+ if (manager == null) {
+ manager = new ImportsManager();
+ this.managers.put(classifier.getQualifiedName(), manager);
+ if (log.isDebugEnabled()) {
+ log.debug("Add new importsManager for : " + classifier.getQualifiedName());
+ }
+ }
+ return manager;
+ }
+
+ /**
+ * Get imports for a classifier. The ImportsManager must be defined in the model.
+ * @param classifier reference for the imports
+ * @return a List of String which contains all imports for the classifier
+ * @throws IllegalArgumentException when classifier is not associated with an existing ImportsManager
+ */
+ public List<String> getImports(ObjectModelClassifier classifier) throws IllegalArgumentException {
+ ImportsManager manager = this.managers.get(classifier.getQualifiedName());
+ if (manager == null) {
+ throw new IllegalArgumentException("No importsManager defined for '" + classifier.getQualifiedName() + "'");
+ }
+ return manager.getImports(classifier.getPackageName());
+ }
+}
Modified: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java
===================================================================
--- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2009-11-02 07:36:12 UTC (rev 680)
+++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2009-11-02 12:04:19 UTC (rev 681)
@@ -1,5 +1,7 @@
package org.nuiton.eugene.java;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nuiton.eugene.GeneratorUtil;
@@ -25,39 +27,29 @@
protected ObjectModelImpl model;
+ protected ImportsManagerExtension managers;
+
+ @SuppressWarnings("unchecked")
public JavaBuilder(String modelName) {
this.model = new ObjectModelImpl();
this.model.setName(modelName);
+
+ // initialize ObjectModel extension for ImportsManager
+ try {
+ this.managers = this.model.getExtension(
+ ImportsManagerExtension.OBJECTMODEL_EXTENSION, ImportsManagerExtension.class);
+ } catch (IllegalArgumentException eee) { // "imports" not exist
+ this.managers = new ImportsManagerExtension();
+ this.model.addExtension(ImportsManagerExtension.OBJECTMODEL_EXTENSION, this.managers);
+ }
}
public ObjectModel getModel() {
return this.model;
}
- protected ImportsManager getImportsManager(ObjectModelClassifier classifier) {
- ImportsManager manager = model.getExtension(classifier.getQualifiedName(), ImportsManager.class);
- if (manager == null) {
- manager = new ImportsManager();
- model.addExtension(classifier.getQualifiedName(), manager);
- if (log.isDebugEnabled()) {
- log.debug("Add new importsManager for : " + classifier.getQualifiedName());
- }
- }
- return manager;
- }
-
- /*protected void addImportForClassifier(ObjectModelClassifier classifier, String imports) {
- ImportsManager manager = getImportsManager(classifier);
- manager.addImport(imports);
- }
-
- protected void addImportForClassifier(ObjectModelClassifier classifier, Class<?> imports) {
- ImportsManager manager = getImportsManager(classifier);
- manager.addImport(imports);
- }*/
-
public void addImport(ObjectModelClassifier classifier, String imports) {
- ImportsManager manager = getImportsManager(classifier);
+ ImportsManager manager = managers.getManager(classifier);
for (String oneType : GeneratorUtil.getTypesList(imports)) {
manager.addImport(oneType);
if (log.isDebugEnabled()) {
Modified: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java
===================================================================
--- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2009-11-02 07:36:12 UTC (rev 680)
+++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2009-11-02 12:04:19 UTC (rev 681)
@@ -6,6 +6,7 @@
import java.io.Writer;
import java.util.Collection;
import java.util.Iterator;
+import java.util.Map;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -100,10 +101,11 @@
/*{package <%=packageName%>;
}*/
- // potentiel crash si imports non defini
- // dans ce cas, probleme de config utilisateur ! obligation de passer par un builder ?
- ImportsManager manager = getModel().getExtension(classifier.getQualifiedName(), ImportsManager.class);
- for (String imports : manager.getImports(classifier.getPackageName())) {
+ // potentiel crash si imports non defini -> IllegalArgumentException on "imports"
+ ImportsManagerExtension managers = getModel().getExtension(ImportsManagerExtension.OBJECTMODEL_EXTENSION,
+ ImportsManagerExtension.class);
+
+ for (String imports : managers.getImports(classifier)) {
/*{import <%=imports%>;
}*/
}
Modified: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java
===================================================================
--- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java 2009-11-02 07:36:12 UTC (rev 680)
+++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java 2009-11-02 12:04:19 UTC (rev 681)
@@ -127,8 +127,10 @@
* @param reference unique corresponding to the extension to get
* @param extensionClass class of the extension
* @return the object value for the extension
- * @throws ClassCastException
+ * @throws ClassCastException when extensionClass is not valid
+ * @throws IllegalArgumentException for non existing extension with reference
*/
- public <O> O getExtension(String reference, Class<O> extensionClass) throws ClassCastException;
+ public <O> O getExtension(String reference, Class<O> extensionClass)
+ throws ClassCastException, IllegalArgumentException;
} //ObjectModel
Modified: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java
===================================================================
--- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2009-11-02 07:36:12 UTC (rev 680)
+++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2009-11-02 12:04:19 UTC (rev 681)
@@ -494,13 +494,18 @@
* @param reference unique corresponding to the extension to get
* @param extensionClass class of the extension
* @return the object value for the extension
- * @throws ClassCastException
+ * @throws ClassCastException when extensionClass is not valid
+ * @throws IllegalArgumentException for non existing extension with reference
*/
@Override
@SuppressWarnings("unchecked")
- public <O> O getExtension(String reference, Class<O> extensionClass) throws ClassCastException {
+ public <O> O getExtension(String reference, Class<O> extensionClass)
+ throws ClassCastException, IllegalArgumentException {
Object result = extensions.get(reference);
- if (result != null && !extensionClass.isAssignableFrom(result.getClass())) {
+ if (result == null) {
+ throw new IllegalArgumentException("Extension '" + reference + "' is not defined in model '" + getName() + "'");
+ }
+ if (!extensionClass.isAssignableFrom(result.getClass())) {
throw new ClassCastException("Invalid cast for " + extensionClass.getName());
}
return (O) result;
Modified: branches/1.1.0-Javabuilder/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java
===================================================================
--- branches/1.1.0-Javabuilder/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java 2009-11-02 07:36:12 UTC (rev 680)
+++ branches/1.1.0-Javabuilder/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java 2009-11-02 12:04:19 UTC (rev 681)
@@ -9,8 +9,8 @@
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.nuiton.eugene.models.object.ObjectModel;
import static org.junit.Assert.*;
-import org.nuiton.eugene.ImportsManager;
import org.nuiton.eugene.models.object.ObjectModelAttribute;
import org.nuiton.eugene.models.object.ObjectModelClass;
import org.nuiton.eugene.models.object.ObjectModelClassifier;
@@ -58,26 +58,6 @@
}
/**
- * Test of getImportsManager.
- * Prerequisite : existing classifier in model.
- * - The manager is associated to a classifier. The manager will be created in the model
- * linked to the builder. The manager is empty, no imports is added yet.
- */
- @Test
- public void testGetImportsManager() {
- System.out.println("getImportsManager");
- JavaBuilder builder = new JavaBuilder("TestModel");
-
- ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms");
-
- ImportsManager result = builder.getImportsManager(classifier);
- assertNotNull(result);
- List<String> imports = result.getImports("org.chorem.bonzoms");
- assertNotNull(imports);
- assertEquals(imports.size(), 0);
- }
-
- /**
* Test of addImport method, of class JavaBuilder.
* Prerequisite : existing classifier in model.
* - Add a simple type to import.
@@ -95,11 +75,13 @@
String imports = "java.beans.PropertyChangeListener";
builder.addImport(classifier, imports);
- ImportsManager manager = builder.getImportsManager(classifier);
+ ObjectModel model = builder.getModel();
+ ImportsManagerExtension importsExtension =
+ model.getExtension(ImportsManagerExtension.OBJECTMODEL_EXTENSION, ImportsManagerExtension.class);
String type = "java.util.List<org.chorem.cash.Category>"; // type add : 2 imports added
builder.addImport(classifier, type);
- assertEquals(manager.getImports("org.chorem.bonzoms").size(), 3);
+ assertEquals(importsExtension.getImports(classifier).size(), 3);
}
/**
Added: branches/1.1.0-Javabuilder/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTest.java
===================================================================
--- branches/1.1.0-Javabuilder/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTest.java (rev 0)
+++ branches/1.1.0-Javabuilder/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTest.java 2009-11-02 12:04:19 UTC (rev 681)
@@ -0,0 +1,395 @@
+
+package org.nuiton.eugene.models.object.xml;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.nuiton.eugene.ImportsManager;
+import org.nuiton.eugene.java.ImportsManagerExtension;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author fdesbois
+ */
+public class ObjectModelImplTest {
+
+ private static final Log log = LogFactory.getLog(ObjectModelImplTest.class);
+
+ public ObjectModelImplTest() {
+ }
+
+ @BeforeClass
+ public static void setUpClass() throws Exception {
+ }
+
+ @AfterClass
+ public static void tearDownClass() throws Exception {
+ }
+
+ @Before
+ public void setUp() {
+ }
+
+ @After
+ public void tearDown() {
+ }
+
+// /**
+// * Test of setName method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testSetName() {
+// System.out.println("setName");
+// String name = "";
+// ObjectModelImpl instance = new ObjectModelImpl();
+// instance.setName(name);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of addClass method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testAddClass() {
+// System.out.println("addClass");
+// ObjectModelClassImpl clazz = null;
+// ObjectModelImpl instance = new ObjectModelImpl();
+// instance.addClass(clazz);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of addAssociationClass method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testAddAssociationClass() {
+// System.out.println("addAssociationClass");
+// ObjectModelAssociationClassImpl clazz = null;
+// ObjectModelImpl instance = new ObjectModelImpl();
+// instance.addAssociationClass(clazz);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of addComment method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testAddComment() {
+// System.out.println("addComment");
+// String comment = "";
+// ObjectModelImpl instance = new ObjectModelImpl();
+// instance.addComment(comment);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of getName method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testGetName() {
+// System.out.println("getName");
+// ObjectModelImpl instance = new ObjectModelImpl();
+// String expResult = "";
+// String result = instance.getName();
+// assertEquals(expResult, result);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of getClassifiers method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testGetClassifiers() {
+// System.out.println("getClassifiers");
+// ObjectModelImpl instance = new ObjectModelImpl();
+// Collection expResult = null;
+// Collection result = instance.getClassifiers();
+// assertEquals(expResult, result);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of getClassifier method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testGetClassifier() {
+// System.out.println("getClassifier");
+// String qualifiedClassifierName = "";
+// ObjectModelImpl instance = new ObjectModelImpl();
+// ObjectModelClassifier expResult = null;
+// ObjectModelClassifier result = instance.getClassifier(qualifiedClassifierName);
+// assertEquals(expResult, result);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of getClasses method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testGetClasses() {
+// System.out.println("getClasses");
+// ObjectModelImpl instance = new ObjectModelImpl();
+// Collection expResult = null;
+// Collection result = instance.getClasses();
+// assertEquals(expResult, result);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of getClass method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testGetClass() {
+// System.out.println("getClass");
+// String qualifiedClassName = "";
+// ObjectModelImpl instance = new ObjectModelImpl();
+// ObjectModelClass expResult = null;
+// ObjectModelClass result = instance.getClass(qualifiedClassName);
+// assertEquals(expResult, result);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of hasClass method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testHasClass() {
+// System.out.println("hasClass");
+// String qualifiedClassName = "";
+// ObjectModelImpl instance = new ObjectModelImpl();
+// boolean expResult = false;
+// boolean result = instance.hasClass(qualifiedClassName);
+// assertEquals(expResult, result);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of addInterface method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testAddInterface() {
+// System.out.println("addInterface");
+// ObjectModelInterfaceImpl interfacez = null;
+// ObjectModelImpl instance = new ObjectModelImpl();
+// instance.addInterface(interfacez);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of getInterface method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testGetInterface() {
+// System.out.println("getInterface");
+// String qualifiedInterfaceName = "";
+// ObjectModelImpl instance = new ObjectModelImpl();
+// ObjectModelInterface expResult = null;
+// ObjectModelInterface result = instance.getInterface(qualifiedInterfaceName);
+// assertEquals(expResult, result);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of getInterfaces method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testGetInterfaces() {
+// System.out.println("getInterfaces");
+// ObjectModelImpl instance = new ObjectModelImpl();
+// Collection expResult = null;
+// Collection result = instance.getInterfaces();
+// assertEquals(expResult, result);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of addEnumeration method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testAddEnumeration() {
+// System.out.println("addEnumeration");
+// ObjectModelEnumerationImpl enumeration = null;
+// ObjectModelImpl instance = new ObjectModelImpl();
+// instance.addEnumeration(enumeration);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of getEnumerations method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testGetEnumerations() {
+// System.out.println("getEnumerations");
+// ObjectModelImpl instance = new ObjectModelImpl();
+// Collection expResult = null;
+// Collection result = instance.getEnumerations();
+// assertEquals(expResult, result);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of getEnumeration method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testGetEnumeration() {
+// System.out.println("getEnumeration");
+// String qualifiedEnumerationName = "";
+// ObjectModelImpl instance = new ObjectModelImpl();
+// ObjectModelEnumeration expResult = null;
+// ObjectModelEnumeration result = instance.getEnumeration(qualifiedEnumerationName);
+// assertEquals(expResult, result);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of getComments method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testGetComments() {
+// System.out.println("getComments");
+// ObjectModelImpl instance = new ObjectModelImpl();
+// List expResult = null;
+// List result = instance.getComments();
+// assertEquals(expResult, result);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of mergeClassifiers method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testMergeClassifiers() {
+// System.out.println("mergeClassifiers");
+// ObjectModelClassifierImpl initialClazzifier = null;
+// ObjectModelClassifierImpl additionalClazzifier = null;
+// ObjectModelImpl instance = new ObjectModelImpl();
+// instance.mergeClassifiers(initialClazzifier, additionalClazzifier);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of addTagValue method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testAddTagValue() {
+// System.out.println("addTagValue");
+// ObjectModelImplTagValue tagValue = null;
+// ObjectModelImpl instance = new ObjectModelImpl();
+// ObjectModelImplTagValue expResult = null;
+// ObjectModelImplTagValue result = instance.addTagValue(tagValue);
+// assertEquals(expResult, result);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of getTagValues method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testGetTagValues() {
+// System.out.println("getTagValues");
+// ObjectModelImpl instance = new ObjectModelImpl();
+// Map expResult = null;
+// Map result = instance.getTagValues();
+// assertEquals(expResult, result);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+//
+// /**
+// * Test of getTagValue method, of class ObjectModelImpl.
+// */
+// @Test
+// public void testGetTagValue() {
+// System.out.println("getTagValue");
+// String tagValue = "";
+// ObjectModelImpl instance = new ObjectModelImpl();
+// String expResult = "";
+// String result = instance.getTagValue(tagValue);
+// assertEquals(expResult, result);
+// // TODO review the generated test code and remove the default call to fail.
+// fail("The test case is a prototype.");
+// }
+
+ /**
+ * Test of addExtension method, of class ObjectModelImpl.
+ * - Ajout ImportsManager extension : Map<String, ImportsManager>
+ */
+ @Test
+ public void testAddExtension() {
+ System.out.println("addExtension");
+
+ ObjectModelImpl model = new ObjectModelImpl();
+
+ ImportsManagerExtension extension = new ImportsManagerExtension();
+
+ model.addExtension(ImportsManagerExtension.OBJECTMODEL_EXTENSION, extension);
+
+ ImportsManagerExtension result =
+ model.getExtension(ImportsManagerExtension.OBJECTMODEL_EXTENSION, ImportsManagerExtension.class);
+
+ assertNotNull(result);
+ }
+
+ /**
+ * Test of getExtension method, of class ObjectModelImpl.
+ * - Get an existing importsManager from the ObjectModel extension "imports"
+ * - IllegalArgumentException for non existing extension
+ */
+ @Test
+ public void testGetExtension() {
+ System.out.println("getExtension");
+
+ ObjectModelImpl model = new ObjectModelImpl();
+ model.setName("TestModel");
+
+ ObjectModelClassImpl classifier = new ObjectModelClassImpl();
+ classifier.setName("Person");
+ classifier.setPackage("org.chorem.bonzoms");
+ model.addClass(classifier);
+
+ ImportsManagerExtension extension = new ImportsManagerExtension();
+
+ extension.getManager(classifier); // creation if not exist
+
+ model.addExtension(ImportsManagerExtension.OBJECTMODEL_EXTENSION, extension);
+
+ ImportsManagerExtension result =
+ model.getExtension(ImportsManagerExtension.OBJECTMODEL_EXTENSION, ImportsManagerExtension.class);
+
+ assertNotNull(result.getImports(classifier));
+
+ try {
+ String unknownExtension =
+ model.getExtension("unknown", String.class);
+ } catch (IllegalArgumentException eee) {
+ log.debug("unknown extension", eee);
+ }
+ }
+
+}
\ No newline at end of file
Modified: branches/1.1.0-Javabuilder/eugene-test/pom.xml
===================================================================
--- branches/1.1.0-Javabuilder/eugene-test/pom.xml 2009-11-02 07:36:12 UTC (rev 680)
+++ branches/1.1.0-Javabuilder/eugene-test/pom.xml 2009-11-02 12:04:19 UTC (rev 681)
@@ -27,7 +27,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -173,3 +172,4 @@
</project>
+
1
0
Author: tchemit
Date: 2009-11-02 08:36:12 +0100 (Mon, 02 Nov 2009)
New Revision: 680
Modified:
branches/1.1.0-Javabuilder/eugene-test/LICENSE.txt
Log:
update license
Modified: branches/1.1.0-Javabuilder/eugene-test/LICENSE.txt
===================================================================
--- branches/1.1.0-Javabuilder/eugene-test/LICENSE.txt 2009-11-02 06:48:42 UTC (rev 679)
+++ branches/1.1.0-Javabuilder/eugene-test/LICENSE.txt 2009-11-02 07:36:12 UTC (rev 680)
@@ -1,280 +1,166 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+ 0. Additional Definitions.
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
- The precise terms and conditions for copying, distribution and
-modification follow.
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ 1. Exception to Section 3 of the GNU GPL.
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+ 2. Conveying Modified Versions.
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
+ 3. Object Code Incorporating Material from Library Header Files.
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+ 4. Combined Works.
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
+ d) Do one of the following:
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+ 5. Combined Libraries.
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+ 6. Revised Versions of the GNU Lesser General Public License.
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
1
0
r679 - in branches/1.1.0-Javabuilder: . eugene eugene-test maven-eugene-plugin
by tchemit@users.nuiton.org 02 Nov '09
by tchemit@users.nuiton.org 02 Nov '09
02 Nov '09
Author: tchemit
Date: 2009-11-02 07:48:42 +0100 (Mon, 02 Nov 2009)
New Revision: 679
Modified:
branches/1.1.0-Javabuilder/eugene-test/pom.xml
branches/1.1.0-Javabuilder/eugene/pom.xml
branches/1.1.0-Javabuilder/maven-eugene-plugin/pom.xml
branches/1.1.0-Javabuilder/pom.xml
Log:
use mavenpom 1.1.0 + improve pom (must process all classes)
Modified: branches/1.1.0-Javabuilder/eugene/pom.xml
===================================================================
--- branches/1.1.0-Javabuilder/eugene/pom.xml 2009-11-02 06:47:02 UTC (rev 678)
+++ branches/1.1.0-Javabuilder/eugene/pom.xml 2009-11-02 06:48:42 UTC (rev 679)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -11,7 +12,7 @@
<artifactId>eugene</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
-
+
<groupId>org.nuiton.eugene</groupId>
<artifactId>eugene</artifactId>
@@ -70,7 +71,7 @@
</exclusion>
</exclusions-->
</dependency>
-
+
<!-- Meta model uml d'eclipse -->
<dependency>
<groupId>org.eclipse.uml2.uml</groupId>
@@ -186,13 +187,33 @@
<resources>
<resource>
- <directory>${maven.src.dir}/main/xsl</directory>
+ <directory>${basedir}/src/main/xsl</directory>
<includes>
<include>**/*.xsl</include>
</includes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <groupId>org.nuiton.processor</groupId>
+ <artifactId>maven-processor-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includes>**/*.java</includes>
+ <!--<includes>org/nuiton/eugene/java/JavaGenerator.java</includes>-->
+ <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter</filters>
+ </configuration>
+ </plugin>
+ </plugins>
+
</build>
<!-- ************************************************************* -->
@@ -233,25 +254,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.nuiton.processor</groupId>
- <artifactId>maven-processor-plugin</artifactId>
- <version>${processor.version}</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>process</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>org/nuiton/eugene/java/JavaGenerator.java</includes>
- <filters>
- org.nuiton.processor.filters.GeneratorTemplatesFilter
- </filters>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/1.1.0-Javabuilder/eugene-test/pom.xml
===================================================================
--- branches/1.1.0-Javabuilder/eugene-test/pom.xml 2009-11-02 06:47:02 UTC (rev 678)
+++ branches/1.1.0-Javabuilder/eugene-test/pom.xml 2009-11-02 06:48:42 UTC (rev 679)
@@ -64,112 +64,111 @@
</properties>
<build>
-
- <plugins>
- <plugin>
- <groupId>org.nuiton.processor</groupId>
- <artifactId>maven-processor-plugin</artifactId>
- <version>${processor.version}</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>process</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>**/*.java</includes>
- <filters>
- org.nuiton.processor.filters.GeneratorTemplatesFilter
- </filters>
- </configuration>
- </plugin>
+ <plugins>
- <plugin>
- <groupId>org.nuiton.eugene</groupId>
- <artifactId>maven-eugene-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>Test Regression Generator</id>
- <phase>generate-test-sources</phase>
- <configuration>
- <reader>org.nuiton.eugene.ObjectModelReader</reader>
- <includes>dtotest.objectmodel</includes>
- <templates>org.nuiton.eugene.test.generator.BeanGenerator</templates>
- <defaultPackage>org.nuiton.eugene.test</defaultPackage>
- <extraClassPathDirectory>target/classes</extraClassPathDirectory>
- <generateResources>
- <input>src/main/models</input>
- </generateResources>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>Test Java Generator</id>
- <phase>generate-test-sources</phase>
- <configuration>
- <reader>org.nuiton.eugene.test.generator.TestReader</reader>
- <templates>org.nuiton.eugene.java.JavaGenerator</templates>
- <defaultPackage>org.nuiton.eugene.test</defaultPackage>
- <extraClassPathDirectory>target/classes</extraClassPathDirectory>
- <generateResources>
- <input>src/main/models</input>
- </generateResources>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>Test Bean Transformer</id>
- <phase>generate-test-sources</phase>
- <configuration>
- <reader>org.nuiton.eugene.ObjectModelReader</reader>
- <includes>dtotest2.objectmodel</includes>
- <templates>org.nuiton.eugene.test.generator.BeanTransformer</templates>
- <defaultPackage>org.nuiton.eugene.test</defaultPackage>
- <extraClassPathDirectory>target/classes</extraClassPathDirectory>
- <generateResources>
- <input>src/main/models</input>
- </generateResources>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
- </plugin>
+ <plugin>
+ <groupId>org.nuiton.processor</groupId>
+ <artifactId>maven-processor-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includes>**/*.java</includes>
+ <filters>
+ org.nuiton.processor.filters.GeneratorTemplatesFilter
+ </filters>
+ </configuration>
+ </plugin>
- <!--plugin>
- <groupId>org.nuiton.i18n</groupId>
- <artifactId>maven-i18n-plugin</artifactId>
- <version>${i18n.version}</version>
- </plugin>
+ <plugin>
+ <groupId>org.nuiton.eugene</groupId>
+ <artifactId>maven-eugene-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>Test Regression Generator</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+ <reader>org.nuiton.eugene.ObjectModelReader</reader>
+ <includes>dtotest.objectmodel</includes>
+ <templates>org.nuiton.eugene.test.generator.BeanGenerator</templates>
+ <defaultPackage>org.nuiton.eugene.test</defaultPackage>
+ <extraClassPathDirectory>target/classes</extraClassPathDirectory>
+ <generateResources>
+ <input>src/main/models</input>
+ </generateResources>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>Test Java Generator</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+ <reader>org.nuiton.eugene.test.generator.TestReader</reader>
+ <templates>org.nuiton.eugene.java.JavaGenerator</templates>
+ <defaultPackage>org.nuiton.eugene.test</defaultPackage>
+ <extraClassPathDirectory>target/classes</extraClassPathDirectory>
+ <generateResources>
+ <input>src/main/models</input>
+ </generateResources>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>Test Bean Transformer</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+ <reader>org.nuiton.eugene.ObjectModelReader</reader>
+ <includes>dtotest2.objectmodel</includes>
+ <templates>org.nuiton.eugene.test.generator.BeanTransformer</templates>
+ <defaultPackage>org.nuiton.eugene.test</defaultPackage>
+ <extraClassPathDirectory>target/classes</extraClassPathDirectory>
+ <generateResources>
+ <input>src/main/models</input>
+ </generateResources>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+ </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.nuiton.jrst</groupId>
- <artifactId>doxia-module-jrst</artifactId>
- <version>${jrst.version}</version>
- </dependency>
- </dependencies>
- </plugin-->
+ <!--plugin>
+ <groupId>org.nuiton.i18n</groupId>
+ <artifactId>maven-i18n-plugin</artifactId>
+ <version>${i18n.version}</version>
+ </plugin>
- </plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.nuiton.jrst</groupId>
+ <artifactId>doxia-module-jrst</artifactId>
+ <version>${jrst.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin-->
+
+ </plugins>
</build>
</project>
Modified: branches/1.1.0-Javabuilder/maven-eugene-plugin/pom.xml
===================================================================
--- branches/1.1.0-Javabuilder/maven-eugene-plugin/pom.xml 2009-11-02 06:47:02 UTC (rev 678)
+++ branches/1.1.0-Javabuilder/maven-eugene-plugin/pom.xml 2009-11-02 06:48:42 UTC (rev 679)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -59,7 +60,7 @@
<name>EUGene - plugin maven</name>
<inceptionYear>2006</inceptionYear>
<description>maven plugin to use the eugene library</description>
-
+
<!-- ************************************************************* -->
<!-- *** Build Settings ****************************************** -->
<!-- ************************************************************* -->
@@ -68,7 +69,7 @@
<build>
<defaultGoal>install</defaultGoal>
-
+
<plugins>
<!-- plugin plugin -->
<plugin>
@@ -84,15 +85,402 @@
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc.version}</version>
+ <configuration>
+ <docencoding>${project.reporting.outputEncoding}</docencoding>
+ <encoding>${project.reporting.outputEncoding}</encoding>
+ <charset>${project.reporting.outputEncoding}</charset>
+ <quiet>true</quiet>
+ <skip>${maven.javadoc.skip}</skip>
+ <taglets>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>
+ org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>
+ org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </taglet>
+ </taglets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
</build>
<!--Site-->
<reporting>
<plugins>
- <!--Site report's plugin-->
+ <!--Site report's plugin-->
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
</plugin>
+
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc.version}</version>
+ <configuration>
+ <quiet>true</quiet>
+ <skip>${maven.javadoc.skip}</skip>
+ <docencoding>${project.build.sourceEncoding}</docencoding>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <charset>${project.reporting.outputEncoding}</charset>
+ <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames>
+ <taglets>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>
+ org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet
+ </tagletClass>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>2.4.2</version>
+ </tagletArtifact>
+ </taglet>
+
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </taglet>
+ <taglet>
+ <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </taglet>
+ </taglets>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>javadoc</report>
+ <report>test-javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
</reporting>
Modified: branches/1.1.0-Javabuilder/pom.xml
===================================================================
--- branches/1.1.0-Javabuilder/pom.xml 2009-11-02 06:47:02 UTC (rev 678)
+++ branches/1.1.0-Javabuilder/pom.xml 2009-11-02 06:48:42 UTC (rev 679)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -9,7 +10,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<artifactId>eugene</artifactId>
@@ -27,7 +28,7 @@
<dependency>
<groupId>org.nuiton</groupId>
<artifactId>nuiton-utils</artifactId>
- <version>1.1.0</version>
+ <version>${nuiton-utils.version}</version>
<scope>compile</scope>
</dependency>
@@ -242,7 +243,9 @@
<!-- TODO TC-20090823 remove ant deps -->
<ant.version>1.7.1</ant.version>
-
+ <processor.version>1.0.2-SNAPSHOT</processor.version>
+ <nuiton-utils.version>1.1.0</nuiton-utils.version>
+
</properties>
<build>
@@ -263,9 +266,15 @@
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.nuiton.processor</groupId>
+ <artifactId>maven-processor-plugin</artifactId>
+ <version>${processor.version}</version>
+ </plugin>
+
</plugins>
</pluginManagement>
-
+
</build>
<!-- ************************************************************* -->
@@ -279,6 +288,6 @@
<developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection>
<url>http://www.nuiton.org/repositories/browse/eugene/trunk</url>
</scm>
-
+
</project>
1
0
r678 - branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene
by tchemit@users.nuiton.org 02 Nov '09
by tchemit@users.nuiton.org 02 Nov '09
02 Nov '09
Author: tchemit
Date: 2009-11-02 07:47:02 +0100 (Mon, 02 Nov 2009)
New Revision: 678
Modified:
branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java
Log:
remove redundant initializer
Modified: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java
===================================================================
--- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java 2009-11-02 06:46:02 UTC (rev 677)
+++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java 2009-11-02 06:47:02 UTC (rev 678)
@@ -131,7 +131,7 @@
write0utputFile = outputFile.getCanonicalFile();
write0utputFile.getParentFile().mkdirs();
- Writer output = null;
+ Writer output;
if (encoding != null) {
if (log.isDebugEnabled()) {
1
0
r677 - branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene
by tchemit@users.nuiton.org 02 Nov '09
by tchemit@users.nuiton.org 02 Nov '09
02 Nov '09
Author: tchemit
Date: 2009-11-02 07:46:02 +0100 (Mon, 02 Nov 2009)
New Revision: 677
Modified:
branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java
Log:
fix javadoc
Modified: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java
===================================================================
--- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java 2009-11-02 03:46:08 UTC (rev 676)
+++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java 2009-11-02 06:46:02 UTC (rev 677)
@@ -1,12 +1,9 @@
package org.nuiton.eugene;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
import org.nuiton.eugene.models.Model;
+import java.io.*;
+
/**
* AbstractGenerator
*
@@ -87,8 +84,8 @@
/**
* Test if given package is allowed for generation.
*
- * An element can be generated if his package is in the {@link generatedPackages} list
- * or if {@link generatedPackages} is null or empty.
+ * An element can be generated if his package is in the {@link #generatedPackages} list
+ * or if {@link #generatedPackages} is null or empty.
*
* @param packageName package name to test
* @return generation allowed
1
0
Author: tchemit
Date: 2009-11-02 04:46:08 +0100 (Mon, 02 Nov 2009)
New Revision: 676
Modified:
trunk/pom.xml
Log:
use mavenpom 1.1.0
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-11-02 03:33:40 UTC (rev 675)
+++ trunk/pom.xml 2009-11-02 03:46:08 UTC (rev 676)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -9,7 +10,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<artifactId>eugene</artifactId>
@@ -245,7 +246,7 @@
<!--Multilanguage maven-site -->
<maven.site.locales>es,en,fr</maven.site.locales>
-
+
</properties>
<build>
@@ -268,7 +269,7 @@
</plugins>
</pluginManagement>
-
+
</build>
<!-- ************************************************************* -->
@@ -282,6 +283,6 @@
<developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection>
<url>http://www.nuiton.org/repositories/browse/eugene/trunk</url>
</scm>
-
+
</project>
1
0
02 Nov '09
Author: tchemit
Date: 2009-11-02 04:33:40 +0100 (Mon, 02 Nov 2009)
New Revision: 675
Modified:
trunk/
trunk/eugene-demo/
trunk/eugene/
trunk/maven-eugene-plugin/
Log:
svn ignore idea files
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- target
.settings
bin
.classpath
.project
+ target
.settings
bin
.classpath
.project
*.iml
Property changes on: trunk/eugene
___________________________________________________________________
Modified: svn:ignore
- maven.log
target
velocity.log
.eclipse
lutingenerator.ipr
.classpath
.project
.settings
+ maven.log
target
velocity.log
.eclipse
*.ipr
.classpath
.project
.settings
*.iml
Property changes on: trunk/eugene-demo
___________________________________________________________________
Modified: svn:ignore
- target
.classpath
.project
.settings
+ target
.classpath
.project
.settings
*.iml
Property changes on: trunk/maven-eugene-plugin
___________________________________________________________________
Modified: svn:ignore
- target
target/*
*.ipr
*.iws
.settings
.classpath
.project
+ target
target/*
*.ipr
*.iws
*.iml
.settings
.classpath
.project
1
0