April 2009 - Topia-commits - mailman.cloud.codelutin.com

r1421 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org 12 Apr '09

12 Apr '09

Author: tchemit Date: 2009-04-12 21:21:30 +0000 (Sun, 12 Apr 2009) New Revision: 1421 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaGeneratorUtil.java Log: can skip toString generation Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaGeneratorUtil.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaGeneratorUtil.java 2009-04-12 21:20:39 UTC (rev 1420) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaGeneratorUtil.java 2009-04-12 21:21:30 UTC (rev 1421) @@ -138,6 +138,9 @@ /** Tag pour spécifier le permissions à la suppression */ public static final String TAG_SECURITY_DELETE = "securityDelete"; + /** Tag pour specifier de ne pas generer la methode toString */ + public static final String TAG_NOT_GENERATE_TO_STRING = "notGenerateToString"; + /** Type de persistence Hibernate */ public static final String PERSISTENCE_TYPE_HIBERNATE = "hibernate"; @@ -289,6 +292,26 @@ return result; } + /** + * Cherche et renvoie la liste des attributs constituant la clef metier d'une classe. + * + * @param clazz la classe à tester + * @return la liste des attributs de la clef métier ou null si pas de clef métier. + */ + public static boolean generateToString(ObjectModelClass clazz, + ObjectModel model) { + String value; + value = model.getTagValue(TAG_NOT_GENERATE_TO_STRING); + if (value != null || value.trim().isEmpty()) { + return false; + } + value = clazz.getTagValue(TAG_NOT_GENERATE_TO_STRING); + if (value != null || value.trim().isEmpty()) { + return false; + } + return true; + } + /** * Detecte si un attribut fait partie d'une clef metier. * @@ -683,6 +706,7 @@ if (sort && !classes.isEmpty()) { java.util.Collections.sort(classes, new java.util.Comparator<ObjectModelClass>() { + @Override public int compare(ObjectModelClass o1, ObjectModelClass o2) { return o1.getQualifiedName().compareTo(

1 0

r1420 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org 12 Apr '09

12 Apr '09

Author: tchemit Date: 2009-04-12 21:20:39 +0000 (Sun, 12 Apr 2009) New Revision: 1420 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java Log: can skip toString generation Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2009-04-09 15:59:39 UTC (rev 1419) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2009-04-12 21:20:39 UTC (rev 1420) @@ -791,7 +791,8 @@ } } } - + boolean doGenerateToString = TopiaGeneratorUtil.generateToString(clazz, model); + if (doGenerateToString) { /*{ /* (non-Javadoc) * @see java.lang.Object#toString() *) @@ -817,6 +818,7 @@ return result; } }*/ + } String i18nPrefix = TopiaGeneratorUtil.getI18nPrefix(clazz, model); if (i18nPrefix != null) { // generate i18n prefix

1 0

r1419 - topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator
by chatellier＠users.labs.libre-entreprise.org 09 Apr '09

09 Apr '09

Author: chatellier Date: 2009-04-09 15:59:39 +0000 (Thu, 09 Apr 2009) New Revision: 1419 Modified: topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java Log: Code style (tab & co...) Modified: topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java =================================================================== --- topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java 2009-04-09 12:59:21 UTC (rev 1418) +++ topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java 2009-04-09 15:59:39 UTC (rev 1419) @@ -1,5 +1,5 @@ /* *##% ToPIA - Tools for Portable and Independent Architecture - * Copyright (C) 2004 - 2008 CodeLutin + * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.tapestry5.Link; import org.codelutin.generator.MonitorWriter; import org.codelutin.generator.StateModelGenerator; import org.codelutin.generator.GeneratorUtil; @@ -54,7 +53,7 @@ /** logger */ private static final Log log = LogFactory.getLog(TapestryWebGenerator.class); - + /** Already asssigned use case states names */ protected List<String> assignedUseCaseStateNames; @@ -66,7 +65,7 @@ public TapestryWebGenerator() { assignedUseCaseStateNames = new ArrayList<String>(); } - + /** * Redefintion pour une generation specifique tapestry * @@ -75,18 +74,18 @@ */ @Override public void generate(StateModel stateModel, File destDir) throws IOException { - + this.model = stateModel; // pour tous les diagramme du model for (StateModelStateChart chart : stateModel.getStateCharts()) { generate(chart,chart.getStates(),destDir); - + // generate use case engine generateUseCaseEngineFromModel(stateModel, chart,destDir); } } - + /** * Appele par lutin generator pour tous les etats du model * @param chart @@ -96,7 +95,7 @@ return (getPackageFromState(chart) + '.' + getNameFromState(state)).replace('.', File.separatorChar) + ".java"; } - + /** * Get generated class name from state * @@ -108,7 +107,7 @@ protected String getNameFromState(StateModelState state) { return "Abstract" + GeneratorUtil.toUpperCaseFirstLetter(state.getName()); } - + /** * Return specifique tapestry package name. * @@ -120,7 +119,7 @@ protected String getPackageFromState(StateModelStateChart chart) { return chart.getPackageName().replaceFirst("web", "web.pages"); } - + /** * Return specifique tapestry package name (base) * @@ -133,7 +132,7 @@ protected String getPackageFromComponents(StateModelStateChart chart) { return chart.getPackageName().replaceFirst("web.*", "web.base"); } - + /** * Generate a collection of states * @@ -142,7 +141,7 @@ * @throws IOException */ protected void generate(StateModelStateChart chart, Collection<StateModelState> states, File destDir) throws IOException { - + // et tous les états de ces diagrammes for (Object oState : states.toArray()) { generateFromState(chart,(StateModelState)oState,destDir); @@ -159,7 +158,7 @@ * @throws IOException */ protected void generateFromState(StateModelStateChart chart, StateModelState state, File destDir) throws IOException { - + // complexe if(state.isComplex()) { StateModelComplexState complexeState = (StateModelComplexState)state; @@ -167,13 +166,13 @@ } // simple else { - + StateModelSimpleState simpleState = (StateModelSimpleState)state; - + // les etat initiaux et finaux ne donne pas // pas de generation de fichier if(!simpleState.isFinal() && !simpleState.isInitial()) { - + String filename = getFilenameFromState(chart, simpleState); File outputFile = getDestinationFile(destDir, filename); if (getOverwrite() || !isNewerThanSource(outputFile)) { @@ -193,7 +192,7 @@ } // init && final } } - + /** * Called for each simple state * @@ -203,7 +202,6 @@ * @throws IOException */ protected void generateFromSimpleState(Writer output, StateModelStateChart chart, StateModelState state) throws IOException { - //String copyright = GeneratorGeneratorUtil.getCopyright(model); String copyright = model.getTagValue("copyright"); if (copyright != null && !copyright.isEmpty()) { /*{<%=copyright%> @@ -220,231 +218,233 @@ *) public abstract class <%=getNameFromState(state)%> extends UseCasePage { }*/ - + // generate events - generateInjectionAndEventsFromState(output,chart,state); - - // generate use case name - generateUseCaseNameFromState(output,chart,state); + generateInjectionAndEventsFromState(output,chart,state); + + // generate use case name + generateUseCaseNameFromState(output,chart,state); /*{}}*/ - } + } - /** - * Generate state injections - * @param output - * @param chart - * @param state - */ - @SuppressWarnings("unused") - protected void generateInjectionAndEventsFromState(Writer output, StateModelStateChart chart, StateModelState state) throws IOException { - - // liste les états de destination (pour éviter les doublons) - List<StateModelState> destStates = new ArrayList<StateModelState>(); - - for(StateModelTransition transition : state.getTransitions()) { - - StateModelState toState = transition.getDestinationState(); - - if(toState.isComplex()) { - StateModelState toInitState = ((StateModelComplexState)toState).getInitialState(); - - // l'attribute doit etre private - // sinon tapestry ne le traite pas - - // si l'état de destination n'a pas encore été traité - if(!destStates.contains(toState)){ - destStates.add(toState); + /** + * Generate state injections + * @param output + * @param chart + * @param state + */ + @SuppressWarnings("unused") + protected void generateInjectionAndEventsFromState(Writer output, StateModelStateChart chart, StateModelState state) throws IOException { + + // liste les états de destination (pour éviter les doublons) + List<StateModelState> destStates = new ArrayList<StateModelState>(); + + for(StateModelTransition transition : state.getTransitions()) { + + StateModelState toState = transition.getDestinationState(); + + if(toState.isComplex()) { + StateModelState toInitState = ((StateModelComplexState)toState).getInitialState(); + + // l'attribute doit etre private + // sinon tapestry ne le traite pas + + // si l'état de destination n'a pas encore été traité + if(!destStates.contains(toState)){ + destStates.add(toState); /*{ /* linked state "<%=toState.getName()%>" *) @InjectPage private <%=GeneratorUtil.toUpperCaseFirstLetter(toInitState.getName())%> <%=GeneratorUtil.toLowerCaseFirstLetter(toInitState.getName())%>; }*/ - // l'attribut etant prive, il faut un getter + // l'attribut etant prive, il faut un getter /*{ - /* getter for state "<%=toState.getName()%>" *) - protected <%=GeneratorUtil.toUpperCaseFirstLetter(toInitState.getName())%> get<%=GeneratorUtil.toUpperCaseFirstLetter(toInitState.getName())%>() { - return <%=GeneratorUtil.toLowerCaseFirstLetter(toInitState.getName())%>; - } + /* getter for state "<%=toState.getName()%>" *) + protected <%=GeneratorUtil.toUpperCaseFirstLetter(toInitState.getName())%> get<%=GeneratorUtil.toUpperCaseFirstLetter(toInitState.getName())%>() { + return <%=GeneratorUtil.toLowerCaseFirstLetter(toInitState.getName())%>; + } }*/ - } + } /*{ - /* transition on <%=transition.getEvent()%> event *) - public Object onActionFrom<%=GeneratorUtil.toUpperCaseFirstLetter(transition.getEvent())%>() { - enterUseCase(); - return <%=GeneratorUtil.toLowerCaseFirstLetter(toInitState.getName())%>; - } + /* transition on <%=transition.getEvent()%> event *) + public Object onActionFrom<%=GeneratorUtil.toUpperCaseFirstLetter(transition.getEvent())%>() { + enterUseCase(); + return <%=GeneratorUtil.toLowerCaseFirstLetter(toInitState.getName())%>; + } }*/ - } - else { - - StateModelSimpleState simpleToState = (StateModelSimpleState)toState; - - // si l'etat a injecter n'est pas final - if(!simpleToState.isFinal()) { - - // si l'état de destination n'a pas encore été traité - if(!destStates.contains(toState)){ - destStates.add(toState); + } + else { + + StateModelSimpleState simpleToState = (StateModelSimpleState)toState; + + // si l'etat a injecter n'est pas final + if(!simpleToState.isFinal()) { + + // si l'état de destination n'a pas encore été traité + if(!destStates.contains(toState)){ + destStates.add(toState); /*{ /* linked state "<%=simpleToState.getName()%>" *) - @InjectPage - private <%=GeneratorUtil.toUpperCaseFirstLetter(simpleToState.getName())%> <%=GeneratorUtil.toLowerCaseFirstLetter(simpleToState.getName())%>; + @InjectPage + private <%=GeneratorUtil.toUpperCaseFirstLetter(simpleToState.getName())%> <%=GeneratorUtil.toLowerCaseFirstLetter(simpleToState.getName())%>; }*/ - // l'attribut etant prive, il faut un getter + // l'attribut etant prive, il faut un getter /*{ - /* getter for state "<%=simpleToState.getName()%>" *) - protected <%=GeneratorUtil.toUpperCaseFirstLetter(simpleToState.getName())%> get<%=GeneratorUtil.toUpperCaseFirstLetter(simpleToState.getName())%>() { - return <%=GeneratorUtil.toLowerCaseFirstLetter(simpleToState.getName())%>; - } + /* getter for state "<%=simpleToState.getName()%>" *) + protected <%=GeneratorUtil.toUpperCaseFirstLetter(simpleToState.getName())%> get<%=GeneratorUtil.toUpperCaseFirstLetter(simpleToState.getName())%>() { + return <%=GeneratorUtil.toLowerCaseFirstLetter(simpleToState.getName())%>; + } }*/ - } - } // isFinal + } + } // isFinal /*{ - /* transition on "<%=transition.getEvent()%>" event *) - public Object onActionFrom<%=GeneratorUtil.toUpperCaseFirstLetter(transition.getEvent())%>() { + /* transition on "<%=transition.getEvent()%>" event *) + public Object onActionFrom<%=GeneratorUtil.toUpperCaseFirstLetter(transition.getEvent())%>() { }*/ - if(simpleToState.isFinal()) { -/*{ return leaveUseCase(); + if(simpleToState.isFinal()) { +/*{ return leaveUseCase(); }*/ - } else { -/*{ return <%=GeneratorUtil.toLowerCaseFirstLetter(simpleToState.getName())%>; + } else { +/*{ return <%=GeneratorUtil.toLowerCaseFirstLetter(simpleToState.getName())%>; }*/ - } + } /*{ } }*/ - } - } - } - - /** - * Generate use case name - * - * @param output - * @param chart - * @param state - */ - protected void generateUseCaseNameFromState(Writer output, StateModelStateChart chart, StateModelState state) throws IOException { + } + } + } - String stateId = generateStateUseCaseName(state.getName()); + /** + * Generate use case name + * + * @param output + * @param chart + * @param state + */ + protected void generateUseCaseNameFromState(Writer output, StateModelStateChart chart, StateModelState state) throws IOException { + + String stateId = generateStateUseCaseName(state.getName()); /*{ - /* return a unique state id for model *) - protected final String getUseCaseName() { - return "<%=stateId%>"; - } + /* return a unique state id for model *) + protected final String getUseCaseName() { + return "<%=stateId%>"; + } }*/ - } - - /** - * Genere un nom unique d'etat pour le model courant. - * - * Pour des raisons de debugage, on utilise des lettres particuliere du - * nom de l'etat, suivit d'un numero, s'il y a collision. - * - * @return a unique name - */ - protected String generateStateUseCaseName(String name) { - - String ucsn = getHashStateName(name); - - // test already assigned - String uniqueucsn = ucsn; - int num = 2; - while(assignedUseCaseStateNames.contains(uniqueucsn)) { - uniqueucsn = new StringBuffer(ucsn).append(num++).toString(); - } - - assignedUseCaseStateNames.add(uniqueucsn); - - return uniqueucsn; - } - - /** - * Hash a state name. - * - * On prend la premiere lettre de chaque mot. - * - * ContactList -> cl - * contactList -> cl - * ContactListPage -> clp - * - * @param name - * @return hashed state name - */ - protected String getHashStateName(String name) { - - // bug si moins de 1 caractere - if(name == null || name.length()<1) return name; - - StringBuffer sb = new StringBuffer(); - - // on prend la premiere lettre - sb.append(Character.toLowerCase(name.charAt(0))); - - // ensuite, on prend les majuscules - for(int i = 1 ; i < name.length() ; ++i) { - - // si maj - if(Character.isUpperCase(name.charAt(i))) { - sb.append(Character.toLowerCase(name.charAt(i))); - } - } - - return sb.toString(); - } - - /** - * Generate the engine use case class. - * - * Need to be generated inside client webapp directory to be analysed by - * tapestry (annotations) - * - * @param model model - * @param chart chart - */ - protected void generateUseCaseEngineFromModel(StateModel model,StateModelStateChart chart,File destDir) throws IOException { - String componentPackageName = getPackageFromComponents(chart); - - // UseCasePage - String filename = (componentPackageName + ".UseCasePage").replace('.', File.separatorChar) + ".java"; - File outputFile = getDestinationFile(destDir, filename); - if (getOverwrite() || !isNewerThanSource(outputFile)) { - try { - StringWriter out = new StringWriter(); - MonitorWriter monitorOut = new MonitorWriter(out); - // generate UseCasePage class - generateUseCasePageClass(monitorOut,model,componentPackageName); - write(outputFile, monitorOut); - } catch (Exception e) { - log.warn("Erreur lors de la génération du fichier UseCasePage",e); - throw new RuntimeException( - "Erreur lors de la génération du fichier UseCasePage", e); - } - } - - // UseCaseMap - filename = (componentPackageName + ".UseCaseMap").replace('.', File.separatorChar) + ".java"; - outputFile = getDestinationFile(destDir, filename); - if (getOverwrite() || !isNewerThanSource(outputFile)) { - try { - StringWriter out = new StringWriter(); - MonitorWriter monitorOut = new MonitorWriter(out); - // generate UseCasePage class - generateUseCaseMapClass(monitorOut,componentPackageName); - write(outputFile, monitorOut); - } catch (Exception e) { - log.warn("Erreur lors de la génération du fichier UseCaseMap",e); - throw new RuntimeException( - "Erreur lors de la génération du fichier UseCaseMap", e); - } - } - } + } + + /** + * Genere un nom unique d'etat pour le model courant. + * + * Pour des raisons de debugage, on utilise des lettres particuliere du + * nom de l'etat, suivit d'un numero, s'il y a collision. + * + * @return a unique name + */ + protected String generateStateUseCaseName(String name) { - /** - * Generate base.UseCasePage class - * @param output - * @param componentPackageName - */ - private void generateUseCasePageClass(MonitorWriter output, StateModel model, String componentPackageName) throws IOException { + String ucsn = getHashStateName(name); + + // test already assigned + String uniqueucsn = ucsn; + int num = 2; + while(assignedUseCaseStateNames.contains(uniqueucsn)) { + uniqueucsn = new StringBuffer(ucsn).append(num++).toString(); + } + + assignedUseCaseStateNames.add(uniqueucsn); + + return uniqueucsn; + } + + /** + * Hash a state name. + * + * On prend la premiere lettre de chaque mot. + * + * ContactList -> cl + * contactList -> cl + * ContactListPage -> clp + * + * @param name + * @return hashed state name + */ + protected String getHashStateName(String name) { + + // bug si moins de 1 caractere + if(name == null || name.length()<1) { + return name; + } + + StringBuffer sb = new StringBuffer(); + + // on prend la premiere lettre + sb.append(Character.toLowerCase(name.charAt(0))); + + // ensuite, on prend les majuscules + for(int i = 1 ; i < name.length() ; ++i) { + + // si maj + if(Character.isUpperCase(name.charAt(i))) { + sb.append(Character.toLowerCase(name.charAt(i))); + } + } + + return sb.toString(); + } + + /** + * Generate the engine use case class. + * + * Need to be generated inside client webapp directory to be analysed by + * tapestry (annotations) + * + * @param model model + * @param chart chart + */ + protected void generateUseCaseEngineFromModel(StateModel model,StateModelStateChart chart,File destDir) throws IOException { + String componentPackageName = getPackageFromComponents(chart); + + // UseCasePage + String filename = (componentPackageName + ".UseCasePage").replace('.', File.separatorChar) + ".java"; + File outputFile = getDestinationFile(destDir, filename); + if (getOverwrite() || !isNewerThanSource(outputFile)) { + try { + StringWriter out = new StringWriter(); + MonitorWriter monitorOut = new MonitorWriter(out); + // generate UseCasePage class + generateUseCasePageClass(monitorOut,model,componentPackageName); + write(outputFile, monitorOut); + } catch (Exception e) { + log.warn("Erreur lors de la génération du fichier UseCasePage",e); + throw new RuntimeException( + "Erreur lors de la génération du fichier UseCasePage", e); + } + } + + // UseCaseMap + filename = (componentPackageName + ".UseCaseMap").replace('.', File.separatorChar) + ".java"; + outputFile = getDestinationFile(destDir, filename); + if (getOverwrite() || !isNewerThanSource(outputFile)) { + try { + StringWriter out = new StringWriter(); + MonitorWriter monitorOut = new MonitorWriter(out); + // generate UseCasePage class + generateUseCaseMapClass(monitorOut,componentPackageName); + write(outputFile, monitorOut); + } catch (Exception e) { + log.warn("Erreur lors de la génération du fichier UseCaseMap",e); + throw new RuntimeException( + "Erreur lors de la génération du fichier UseCaseMap", e); + } + } + } + + /** + * Generate base.UseCasePage class + * @param output + * @param componentPackageName + */ + private void generateUseCasePageClass(MonitorWriter output, StateModel model, String componentPackageName) throws IOException { /*{package <%=componentPackageName%>; import org.apache.tapestry5.Link; @@ -456,89 +456,89 @@ import org.apache.tapestry5.services.Request; public abstract class UseCasePage}*/ - - // ajoute un heritage si il a ete specifie dans un fichier de propriete - Map<String,String> tagValues = model.getTagValues(); - if(tagValues != null) { - String tagUseCaseEngineExtendedClass = tagValues.get("usecaseengineextendedclass"); - if(tagUseCaseEngineExtendedClass != null) { - /*{ extends <%=tagUseCaseEngineExtendedClass%>}*/ - } - } + // ajoute un heritage si il a ete specifie dans un fichier de propriete + Map<String,String> tagValues = model.getTagValues(); + if(tagValues != null) { + String tagUseCaseEngineExtendedClass = tagValues.get("usecaseengineextendedclass"); + if(tagUseCaseEngineExtendedClass != null) { + /*{ extends <%=tagUseCaseEngineExtendedClass%>}*/ + } + } + /*{ implements LinkFactoryListener { - private static final String UC_PARAMETER_NAME = "UC"; - private static final String UC_PARAMETER_SEPARATOR = ":"; - - @ApplicationState - private UseCaseMap useCaseManager; - private boolean useCaseManagerExists; - - @Inject - @Service("LinkFactory") - private LinkFactory _linkFactory; - - @Inject - @Service("Request") - private Request _request; + private static final String UC_PARAMETER_NAME = "UC"; + private static final String UC_PARAMETER_SEPARATOR = ":"; + + @ApplicationState + private UseCaseMap useCaseManager; + private boolean useCaseManagerExists; + + @Inject + @Service("LinkFactory") + private LinkFactory _linkFactory; + + @Inject + @Service("Request") + private Request _request; - private String UCName; - - public void onActivate() { - _linkFactory.addListener(this); - - UCName = _request.getParameter(UC_PARAMETER_NAME); - } - - protected abstract String getUseCaseName(); - - /** - * Create stack if not exists - *) - protected void init() { - if(!useCaseManagerExists) { - useCaseManager = new UseCaseMap(); - } - } - /** - * Enter in a new sub use case - *) - protected void enterUseCase() { - init(); - // current - String currentUCN = UCName; - // new - UCName = (currentUCN == null) ? getUseCaseName() : currentUCN + UC_PARAMETER_SEPARATOR + getUseCaseName(); - useCaseManager.enterSubUseCase(UCName, currentUCN, this); - } - - /** - * Leave a sub use case - *) - protected UseCasePage leaveUseCase() { - init(); - - UseCasePage nextPage = null; - - // current UCN - String UC = UCName; + private String UCName; + + public void onActivate() { + _linkFactory.addListener(this); + + UCName = _request.getParameter(UC_PARAMETER_NAME); + } + + protected abstract String getUseCaseName(); + + /** + * Create stack if not exists + *) + protected void init() { + if(!useCaseManagerExists) { + useCaseManager = new UseCaseMap(); + } + } + /** + * Enter in a new sub use case + *) + protected void enterUseCase() { + init(); + // current + String currentUCN = UCName; + // new + UCName = (currentUCN == null) ? getUseCaseName() : currentUCN + UC_PARAMETER_SEPARATOR + getUseCaseName(); + useCaseManager.enterSubUseCase(UCName, currentUCN, this); + } + + /** + * Leave a sub use case + *) + protected UseCasePage leaveUseCase() { + init(); + + UseCasePage nextPage = null; + + // current UCN + String UC = UCName; - // get state - Object[] response = useCaseManager.leaveUseCase(UC); - - // if null, return null, don't change page - if(response != null) { - // get UCN before enter this one - UCName = (String) response[0]; - - nextPage = (UseCasePage) response[1]; - } + // get state + Object[] response = useCaseManager.leaveUseCase(UC); + + // if null, return null, don't change page + if(response != null) { + // get UCN before enter this one + UCName = (String) response[0]; + + nextPage = (UseCasePage) response[1]; + } - return nextPage; - } + return nextPage; + } - /* + /* * @see org.apache.tapestry5.internal.services.LinkFactoryListener#createdComponentEventLink(org.apache.tapestry5.Link) *) @Override @@ -555,61 +555,61 @@ // action addUCParameter(_link); } - - protected void addUCParameter(Link _link) { - if(_link.getParameterValue(UC_PARAMETER_NAME) == null) { + + protected void addUCParameter(Link _link) { + if(_link.getParameterValue(UC_PARAMETER_NAME) == null) { - if(UCName != null) { - _link.addParameter(UC_PARAMETER_NAME, UCName); - } - } - } + if(UCName != null) { + _link.addParameter(UC_PARAMETER_NAME, UCName); + } + } + } } }*/ - } - - /** - * Generate base.UseCaseMap class - * @param output - * @param componentPackageName - */ - private void generateUseCaseMapClass(MonitorWriter output, String componentPackageName) throws IOException { + } + + /** + * Generate base.UseCaseMap class + * @param output + * @param componentPackageName + */ + private void generateUseCaseMapClass(MonitorWriter output, String componentPackageName) throws IOException { /*{package <%=componentPackageName%>; import java.util.HashMap; import java.util.Map; public class UseCaseMap { - - /** - * Map (state name -> state instance) - *) - private Map<String,Object[]> mapUseCase; - - /** - * Constructor - *) - public UseCaseMap () { - mapUseCase = new HashMap<String,Object[]>(); - } - - /** - * New sub use case - *) - public void enterSubUseCase(String newUseCaseName, String previousUseCaseName, Object state) { - mapUseCase.put(newUseCaseName,new Object[]{previousUseCaseName,state}); - } - - /** - * Finish a subusecase - * - * Return the state that init the subuse case - * @return a state - *) - public Object[] leaveUseCase(String useCaseName) { - return mapUseCase.get(useCaseName); - } + + /** + * Map (state name -> state instance) + *) + private Map<String,Object[]> mapUseCase; + + /** + * Constructor + *) + public UseCaseMap () { + mapUseCase = new HashMap<String,Object[]>(); + } + + /** + * New sub use case + *) + public void enterSubUseCase(String newUseCaseName, String previousUseCaseName, Object state) { + mapUseCase.put(newUseCaseName,new Object[]{previousUseCaseName,state}); + } + + /** + * Finish a subusecase + * + * Return the state that init the subuse case + * @return a state + *) + public Object[] leaveUseCase(String useCaseName) { + return mapUseCase.get(useCaseName); + } } }*/ - } + } }

1 0

r1418 - topia-service/trunk
by chatellier＠users.labs.libre-entreprise.org 09 Apr '09

09 Apr '09

Author: chatellier Date: 2009-04-09 12:59:21 +0000 (Thu, 09 Apr 2009) New Revision: 1418 Modified: topia-service/trunk/pom.xml Log: miss (wrong version :) ) Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2009-04-09 12:34:53 UTC (rev 1417) +++ topia-service/trunk/pom.xml 2009-04-09 12:59:21 UTC (rev 1418) @@ -50,7 +50,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.120</version> + <version>1.1.110</version> <scope>test</scope> </dependency>

1 0

r1417 - topia-service/trunk
by chatellier＠users.labs.libre-entreprise.org 09 Apr '09

09 Apr '09

Author: chatellier Date: 2009-04-09 12:34:53 +0000 (Thu, 09 Apr 2009) New Revision: 1417 Modified: topia-service/trunk/pom.xml Log: Update versions, fix xsd location Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2009-04-09 12:33:58 UTC (rev 1416) +++ topia-service/trunk/pom.xml 2009-04-09 12:34:53 UTC (rev 1417) @@ -1,5 +1,5 @@ <?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/maven-v4_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> @@ -35,7 +35,7 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>2.4.0</version> + <version>2.4.1</version> <scope>compile</scope> </dependency> @@ -50,7 +50,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.107</version> + <version>1.1.120</version> <scope>test</scope> </dependency> @@ -80,9 +80,9 @@ <labs.project>topia</labs.project>  - <topia.version>2.1.3</topia.version> + <topia.version>2.1.4</topia.version> <generator.version>0.64</generator.version> - <lutinutil.version>1.0.3</lutinutil.version> + <lutinutil.version>1.0.4</lutinutil.version> </properties>

1 0

r1416 - in topia/trunk: . topia-persistence topia-soa topia-ui
by chatellier＠users.labs.libre-entreprise.org 09 Apr '09

09 Apr '09

Author: chatellier Date: 2009-04-09 12:33:58 +0000 (Thu, 09 Apr 2009) New Revision: 1416 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: Fix xsd location Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-04-09 12:32:35 UTC (rev 1415) +++ topia/trunk/pom.xml 2009-04-09 12:33:58 UTC (rev 1416) @@ -1,5 +1,5 @@ <?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/maven-v4_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> Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-04-09 12:32:35 UTC (rev 1415) +++ topia/trunk/topia-persistence/pom.xml 2009-04-09 12:33:58 UTC (rev 1416) @@ -1,5 +1,5 @@ <?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/maven-v4_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> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2009-04-09 12:32:35 UTC (rev 1415) +++ topia/trunk/topia-soa/pom.xml 2009-04-09 12:33:58 UTC (rev 1416) @@ -1,5 +1,5 @@ <?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/maven-v4_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> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-04-09 12:32:35 UTC (rev 1415) +++ topia/trunk/topia-ui/pom.xml 2009-04-09 12:33:58 UTC (rev 1416) @@ -1,5 +1,5 @@ <?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/maven-v4_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>

1 0

r1415 - in topia/trunk: . topia-persistence topia-soa topia-ui
by chatellier＠users.labs.libre-entreprise.org 09 Apr '09

09 Apr '09

Author: chatellier Date: 2009-04-09 12:32:35 +0000 (Thu, 09 Apr 2009) New Revision: 1415 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: Fix scm values Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-04-09 10:28:23 UTC (rev 1414) +++ topia/trunk/pom.xml 2009-04-09 12:32:35 UTC (rev 1415) @@ -248,9 +248,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/?ro…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm>  Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-04-09 10:28:23 UTC (rev 1414) +++ topia/trunk/topia-persistence/pom.xml 2009-04-09 12:32:35 UTC (rev 1415) @@ -130,9 +130,9 @@   <scm> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/top…</url> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-persistence</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-persistence</developerConnection> + <url>${maven.scm.url.child}</url> + <connection>${maven.scm.connection.child}</connection> + <developerConnection>${maven.scm.developerConnection.child}</developerConnection> </scm> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2009-04-09 10:28:23 UTC (rev 1414) +++ topia/trunk/topia-soa/pom.xml 2009-04-09 12:32:35 UTC (rev 1415) @@ -134,9 +134,9 @@   <scm> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/top…</url> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-soa</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-soa</developerConnection> + <url>${maven.scm.url.child}</url> + <connection>${maven.scm.connection.child}</connection> + <developerConnection>${maven.scm.developerConnection.child}</developerConnection> </scm> </project> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-04-09 10:28:23 UTC (rev 1414) +++ topia/trunk/topia-ui/pom.xml 2009-04-09 12:32:35 UTC (rev 1415) @@ -107,9 +107,9 @@   <scm> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/top…</url> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-ui</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-ui</developerConnection> + <url>${maven.scm.url.child}</url> + <connection>${maven.scm.connection.child}</connection> + <developerConnection>${maven.scm.developerConnection.child}</developerConnection> </scm> </project>

1 0

r1414 - in topia/trunk: . topia-persistence topia-soa topia-ui
by chatellier＠users.labs.libre-entreprise.org 09 Apr '09

09 Apr '09

Author: chatellier Date: 2009-04-09 10:28:23 +0000 (Thu, 09 Apr 2009) New Revision: 1414 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-04-09 10:28:20 UTC (rev 1413) +++ topia/trunk/pom.xml 2009-04-09 10:28:23 UTC (rev 1414) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.1.4</version> + <version>2.1.5-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -248,9 +248,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/topi…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/?ro…</url> </scm>  Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-04-09 10:28:20 UTC (rev 1413) +++ topia/trunk/topia-persistence/pom.xml 2009-04-09 10:28:23 UTC (rev 1414) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.4</version> + <version>2.1.5-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -130,9 +130,9 @@   <scm> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/topi…</url> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-persistence</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-persistence</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/top…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-persistence</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-persistence</developerConnection> </scm> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2009-04-09 10:28:20 UTC (rev 1413) +++ topia/trunk/topia-soa/pom.xml 2009-04-09 10:28:23 UTC (rev 1414) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.4</version> + <version>2.1.5-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -134,9 +134,9 @@   <scm> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/topi…</url> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-soa</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-soa</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/top…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-soa</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-soa</developerConnection> </scm> </project> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-04-09 10:28:20 UTC (rev 1413) +++ topia/trunk/topia-ui/pom.xml 2009-04-09 10:28:23 UTC (rev 1414) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.4</version> + <version>2.1.5-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -107,9 +107,9 @@   <scm> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/topi…</url> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-ui</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-ui</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/trunk/top…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-ui</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/trunk/topia-ui</developerConnection> </scm> </project>

1 0

r1413 - in topia/tags: . topia-2.1.4 topia-2.1.4/topia-persistence topia-2.1.4/topia-soa topia-2.1.4/topia-ui
by chatellier＠users.labs.libre-entreprise.org 09 Apr '09

09 Apr '09

Author: chatellier Date: 2009-04-09 10:28:20 +0000 (Thu, 09 Apr 2009) New Revision: 1413 Added: topia/tags/topia-2.1.4/ topia/tags/topia-2.1.4/pom.xml topia/tags/topia-2.1.4/topia-persistence/pom.xml topia/tags/topia-2.1.4/topia-soa/pom.xml topia/tags/topia-2.1.4/topia-ui/pom.xml Removed: topia/tags/topia-2.1.4/pom.xml topia/tags/topia-2.1.4/topia-persistence/pom.xml topia/tags/topia-2.1.4/topia-soa/pom.xml topia/tags/topia-2.1.4/topia-ui/pom.xml Log: [maven-release-plugin] copy for tag topia-2.1.4 Copied: topia/tags/topia-2.1.4 (from rev 1411, topia/trunk) Deleted: topia/tags/topia-2.1.4/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-04-09 10:24:38 UTC (rev 1411) +++ topia/tags/topia-2.1.4/pom.xml 2009-04-09 10:28:20 UTC (rev 1413) @@ -1,305 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.4</version> - </parent> - - <artifactId>topia</artifactId> - <version>2.1.4-SNAPSHOT</version> - - <modules> - <module>topia-persistence</module> - <module>topia-soa</module> - <module>topia-ui</module> - </modules> - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutingenerator</artifactId> - <version>${generator.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>${lutinutil.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-server</artifactId> - <version>${xmlrpc.version}</version> - <scope>compile</scope> - - </dependency> - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-client</artifactId> - <version>${xmlrpc.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${hibernate.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - <version>5.0.18</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <version>1.5.3</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codehaus.xfire</groupId> - <artifactId>xfire-java5</artifactId> - <version>1.2.6</version> - <scope>compile</scope> - <exclusions> -  - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-ehcache</artifactId> - <version>${hibernate.version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.4.GA</version> - <scope>runtime</scope> - </dependency> - -  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.2</version> - <scope>runtime</scope> - </dependency> - -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.1.110</version> - <scope>test</scope> - </dependency> - -  - <dependency> - <groupId>jetty</groupId> - <artifactId>jetty</artifactId> - <version>5.1.10</version> - <scope>test</scope> - </dependency> - - </dependencies> - </dependencyManagement> - -  -  -  - <name>ToPIA - Tools for Portable and Independent Architecture</name> - <description>Framework de persistance et de distribution d'application.</description> - <inceptionYear>2004</inceptionYear> - -  -  -  - - <packaging>pom</packaging> - - <properties> -  - <labs.id>21</labs.id> - -  - <labs.project>topia</labs.project> - -  - <generator.version>0.64</generator.version> - <processor.version>0.17</processor.version> - <lutinutil.version>1.0.4</lutinutil.version> - <jrst.version>0.8.4</jrst.version> - <license-switcher.version>0.6</license-switcher.version> - <topia.version>${project.version}</topia.version> - - <xmlrpc.version>3.1</xmlrpc.version> - <hibernate.version>3.3.1.GA</hibernate.version> - </properties> - - <build> - - <defaultGoal>install</defaultGoal> - - <pluginManagement> - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-processor-plugin</artifactId> - <version>${processor.version}</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <addCompileDirectory>true</addCompileDirectory> - <includes> - <include>**/*.java</include> - </includes> - <filters> - org.codelutin.processor.filters.GeneratorTemplatesFilter, - org.codelutin.processor.filters.ActiveLogsCodeFilter - </filters> - <verbose>${maven.verbose}</verbose> - </configuration> - </plugin> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> - <version>${generator.version}</version> - <inherited>true</inherited> - <configuration> - <srcDirZuml>${maven.src.dir}/test/xmi</srcDirZuml> - <srcXmiDest>${maven.test.gen.dir}/xmi</srcXmiDest> - <srcGenDest>${maven.test.gen.dir}/models</srcGenDest> - <destDirGen>${maven.test.gen.dir}/java</destDirGen> - </configuration> - </plugin> - - </plugins> - </pluginManagement> - - <plugins> -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> - <configuration> - <defaultLocale>fr</defaultLocale> - </configuration> - <executions> - <execution> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - - </build> - -  -  -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -  - <repositories> - <repository> - <id>codelutin-repository</id> - <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - - <profiles> -  - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>license</goal> - <goal>third-party</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> Copied: topia/tags/topia-2.1.4/pom.xml (from rev 1412, topia/trunk/pom.xml) =================================================================== --- topia/tags/topia-2.1.4/pom.xml (rev 0) +++ topia/tags/topia-2.1.4/pom.xml 2009-04-09 10:28:20 UTC (rev 1413) @@ -0,0 +1,305 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>3.4</version> + </parent> + + <artifactId>topia</artifactId> + <version>2.1.4</version> + + <modules> + <module>topia-persistence</module> + <module>topia-soa</module> + <module>topia-ui</module> + </modules> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutingenerator</artifactId> + <version>${generator.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>${lutinutil.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-server</artifactId> + <version>${xmlrpc.version}</version> + <scope>compile</scope> + + </dependency> + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-client</artifactId> + <version>${xmlrpc.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + <version>5.0.18</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + <version>1.5.3</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-java5</artifactId> + <version>1.2.6</version> + <scope>compile</scope> + <exclusions> +  + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-ehcache</artifactId> + <version>${hibernate.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.2</version> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.1.110</version> + <scope>test</scope> + </dependency> + +  + <dependency> + <groupId>jetty</groupId> + <artifactId>jetty</artifactId> + <version>5.1.10</version> + <scope>test</scope> + </dependency> + + </dependencies> + </dependencyManagement> + +  +  +  + <name>ToPIA - Tools for Portable and Independent Architecture</name> + <description>Framework de persistance et de distribution d'application.</description> + <inceptionYear>2004</inceptionYear> + +  +  +  + + <packaging>pom</packaging> + + <properties> +  + <labs.id>21</labs.id> + +  + <labs.project>topia</labs.project> + +  + <generator.version>0.64</generator.version> + <processor.version>0.17</processor.version> + <lutinutil.version>1.0.4</lutinutil.version> + <jrst.version>0.8.4</jrst.version> + <license-switcher.version>0.6</license-switcher.version> + <topia.version>${project.version}</topia.version> + + <xmlrpc.version>3.1</xmlrpc.version> + <hibernate.version>3.3.1.GA</hibernate.version> + </properties> + + <build> + + <defaultGoal>install</defaultGoal> + + <pluginManagement> + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-processor-plugin</artifactId> + <version>${processor.version}</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + <configuration> + <addCompileDirectory>true</addCompileDirectory> + <includes> + <include>**/*.java</include> + </includes> + <filters> + org.codelutin.processor.filters.GeneratorTemplatesFilter, + org.codelutin.processor.filters.ActiveLogsCodeFilter + </filters> + <verbose>${maven.verbose}</verbose> + </configuration> + </plugin> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <version>${generator.version}</version> + <inherited>true</inherited> + <configuration> + <srcDirZuml>${maven.src.dir}/test/xmi</srcDirZuml> + <srcXmiDest>${maven.test.gen.dir}/xmi</srcXmiDest> + <srcGenDest>${maven.test.gen.dir}/models</srcGenDest> + <destDirGen>${maven.test.gen.dir}/java</destDirGen> + </configuration> + </plugin> + + </plugins> + </pluginManagement> + + <plugins> +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${jrst.version}</version> + <configuration> + <defaultLocale>fr</defaultLocale> + </configuration> + <executions> + <execution> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + </build> + +  +  +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/topi…</url> + </scm> + +  + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + + <profiles> +  + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>${license-switcher.version}</version> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Deleted: topia/tags/topia-2.1.4/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-04-09 10:24:38 UTC (rev 1411) +++ topia/tags/topia-2.1.4/topia-persistence/pom.xml 2009-04-09 10:28:20 UTC (rev 1413) @@ -1,139 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>2.1.4-SNAPSHOT</version> - </parent> - - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-persistence</artifactId> - - <dependencies> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutingenerator</artifactId> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-ehcache</artifactId> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - </dependencies> - -  -  -  - - <name>ToPIA - Persistence</name> - <description>Hibernate based persistence module</description> - -  -  -  - - <packaging>jar</packaging> - - <build> - - <testResources> - - <testResource> - <directory>${maven.test.gen.dir}/java</directory> - <includes> - <include>**/*.hbm.xml</include> - </includes> - </testResource> - - <testResource> - <directory>${maven.test.gen.dir}/java</directory> - <includes> - <include>**/*.hbm.xml</include> - </includes> - </testResource> - - </testResources> - - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-processor-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> - <executions> - <execution> - <id>Test Generator</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> - <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <fullPackagePath>org.codelutin.topia</fullPackagePath> - <extractedPackages>org.codelutin.topia</extractedPackages> - <defaultPackage>org.codelutin.topia</defaultPackage> - <extraClassPathDirectory>target/classes</extraClassPathDirectory> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -  -  -  - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - - -</project> Copied: topia/tags/topia-2.1.4/topia-persistence/pom.xml (from rev 1412, topia/trunk/topia-persistence/pom.xml) =================================================================== --- topia/tags/topia-2.1.4/topia-persistence/pom.xml (rev 0) +++ topia/tags/topia-2.1.4/topia-persistence/pom.xml 2009-04-09 10:28:20 UTC (rev 1413) @@ -0,0 +1,139 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.codelutin</groupId> + <artifactId>topia</artifactId> + <version>2.1.4</version> + </parent> + + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + + <dependencies> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutingenerator</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-ehcache</artifactId> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> + </dependencies> + +  +  +  + + <name>ToPIA - Persistence</name> + <description>Hibernate based persistence module</description> + +  +  +  + + <packaging>jar</packaging> + + <build> + + <testResources> + + <testResource> + <directory>${maven.test.gen.dir}/java</directory> + <includes> + <include>**/*.hbm.xml</include> + </includes> + </testResource> + + <testResource> + <directory>${maven.test.gen.dir}/java</directory> + <includes> + <include>**/*.hbm.xml</include> + </includes> + </testResource> + + </testResources> + + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-processor-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <executions> + <execution> + <id>Test Generator</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <fullPackagePath>org.codelutin.topia</fullPackagePath> + <extractedPackages>org.codelutin.topia</extractedPackages> + <defaultPackage>org.codelutin.topia</defaultPackage> + <extraClassPathDirectory>target/classes</extraClassPathDirectory> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +  +  +  + <scm> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/topi…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-persistence</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-persistence</developerConnection> + </scm> + + +</project> Deleted: topia/tags/topia-2.1.4/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2009-04-09 10:24:38 UTC (rev 1411) +++ topia/tags/topia-2.1.4/topia-soa/pom.xml 2009-04-09 10:28:20 UTC (rev 1413) @@ -1,142 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>2.1.4-SNAPSHOT</version> - </parent> - - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-soa</artifactId> - - <dependencies> - -  - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - </dependency> - -  - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutingenerator</artifactId> - </dependency> - -  - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-server</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-client</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.xfire</groupId> - <artifactId>xfire-java5</artifactId> - </dependency> - -  - <dependency> - <groupId>jetty</groupId> - <artifactId>jetty</artifactId> - </dependency> - -  - <dependency> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </dependency> - - </dependencies> - -  -  -  - - <name>ToPIA - SOA</name> - <description>Service Oriented Architecture module</description> - -  -  -  - - <packaging>jar</packaging> - - <build> - - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-processor-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> - <executions> - <execution> - <id>generate-objectmodel</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> - <fullPackagePath>org.codelutin.soatest</fullPackagePath> - <extractedPackages>org.codelutin.soatest</extractedPackages> - <defaultPackage>org.codelutin.soatest</defaultPackage> - <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaApplicationServiceMetaGenerator</templates> - <extraClassPathDirectory>target/classes</extraClassPathDirectory> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - -  -  -  - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - -</project> Copied: topia/tags/topia-2.1.4/topia-soa/pom.xml (from rev 1412, topia/trunk/topia-soa/pom.xml) =================================================================== --- topia/tags/topia-2.1.4/topia-soa/pom.xml (rev 0) +++ topia/tags/topia-2.1.4/topia-soa/pom.xml 2009-04-09 10:28:20 UTC (rev 1413) @@ -0,0 +1,142 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.codelutin</groupId> + <artifactId>topia</artifactId> + <version>2.1.4</version> + </parent> + + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-soa</artifactId> + + <dependencies> + +  + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + </dependency> + +  + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutingenerator</artifactId> + </dependency> + +  + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-server</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-client</artifactId> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-java5</artifactId> + </dependency> + +  + <dependency> + <groupId>jetty</groupId> + <artifactId>jetty</artifactId> + </dependency> + +  + <dependency> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + </dependency> + + </dependencies> + +  +  +  + + <name>ToPIA - SOA</name> + <description>Service Oriented Architecture module</description> + +  +  +  + + <packaging>jar</packaging> + + <build> + + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-processor-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <executions> + <execution> + <id>generate-objectmodel</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> + <fullPackagePath>org.codelutin.soatest</fullPackagePath> + <extractedPackages>org.codelutin.soatest</extractedPackages> + <defaultPackage>org.codelutin.soatest</defaultPackage> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaApplicationServiceMetaGenerator</templates> + <extraClassPathDirectory>target/classes</extraClassPathDirectory> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + +  +  +  + <scm> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/topi…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-soa</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-soa</developerConnection> + </scm> + +</project> Deleted: topia/tags/topia-2.1.4/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-04-09 10:24:38 UTC (rev 1411) +++ topia/tags/topia-2.1.4/topia-ui/pom.xml 2009-04-09 10:28:20 UTC (rev 1413) @@ -1,115 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>2.1.4-SNAPSHOT</version> - </parent> - - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-ui</artifactId> - - <dependencies> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutingenerator</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-ehcache</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - -  -  -  - - <name>ToPIA - UI</name> - <description>User interface module</description> - -  -  -  - - <packaging>jar</packaging> - - <build> - - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-processor-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> - <executions> - - <execution> - <id>generate-statemodel</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> - <fullPackagePath>org.codelutin.topiauitest</fullPackagePath> - <extractedPackages>org.codelutin.topiauitest</extractedPackages> - <includes>**/*.statemodel</includes> - <templates>org.codelutin.topia.generator.TapestryWebGenerator</templates> - <extraClassPathDirectory>target/classes</extraClassPathDirectory> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2statemodel</goal> - <goal>generate</goal> - </goals> - </execution> - </executions> - - </plugin> - - </plugins> - </build> - -  -  -  - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - -</project> Copied: topia/tags/topia-2.1.4/topia-ui/pom.xml (from rev 1412, topia/trunk/topia-ui/pom.xml) =================================================================== --- topia/tags/topia-2.1.4/topia-ui/pom.xml (rev 0) +++ topia/tags/topia-2.1.4/topia-ui/pom.xml 2009-04-09 10:28:20 UTC (rev 1413) @@ -0,0 +1,115 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.codelutin</groupId> + <artifactId>topia</artifactId> + <version>2.1.4</version> + </parent> + + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-ui</artifactId> + + <dependencies> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutingenerator</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-ehcache</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + +  +  +  + + <name>ToPIA - UI</name> + <description>User interface module</description> + +  +  +  + + <packaging>jar</packaging> + + <build> + + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-processor-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <executions> + + <execution> + <id>generate-statemodel</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> + <fullPackagePath>org.codelutin.topiauitest</fullPackagePath> + <extractedPackages>org.codelutin.topiauitest</extractedPackages> + <includes>**/*.statemodel</includes> + <templates>org.codelutin.topia.generator.TapestryWebGenerator</templates> + <extraClassPathDirectory>target/classes</extraClassPathDirectory> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2statemodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + + </plugin> + + </plugins> + </build> + +  +  +  + <scm> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/topi…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-ui</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-ui</developerConnection> + </scm> + +</project>

1 0

r1412 - in topia/trunk: . topia-persistence topia-soa topia-ui
by chatellier＠users.labs.libre-entreprise.org 09 Apr '09

09 Apr '09

Author: chatellier Date: 2009-04-09 10:28:15 +0000 (Thu, 09 Apr 2009) New Revision: 1412 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: [maven-release-plugin] prepare release topia-2.1.4 Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-04-09 10:24:38 UTC (rev 1411) +++ topia/trunk/pom.xml 2009-04-09 10:28:15 UTC (rev 1412) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.1.4-SNAPSHOT</version> + <version>2.1.4</version> <modules> <module>topia-persistence</module> @@ -248,9 +248,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/topi…</url> </scm>  Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-04-09 10:24:38 UTC (rev 1411) +++ topia/trunk/topia-persistence/pom.xml 2009-04-09 10:28:15 UTC (rev 1412) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.4-SNAPSHOT</version> + <version>2.1.4</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -130,9 +130,9 @@   <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/topi…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-persistence</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-persistence</developerConnection> </scm> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2009-04-09 10:24:38 UTC (rev 1411) +++ topia/trunk/topia-soa/pom.xml 2009-04-09 10:28:15 UTC (rev 1412) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.4-SNAPSHOT</version> + <version>2.1.4</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -134,9 +134,9 @@   <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/topi…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-soa</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-soa</developerConnection> </scm> </project> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-04-09 10:24:38 UTC (rev 1411) +++ topia/trunk/topia-ui/pom.xml 2009-04-09 10:28:15 UTC (rev 1412) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.4-SNAPSHOT</version> + <version>2.1.4</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -107,9 +107,9 @@   <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/topi…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-ui</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.1.4/topia-ui</developerConnection> </scm> </project>

1 0